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

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r1310 | dmorgan | 2011-05-14 01:22:07 +0100 (Sat, 14 May 2011) | 1 line

Import cleaned mgaonline
------------------------------------------------------------------------

101 files changed, 5302 insertions, 5304 deletions

diff --git a/.perl_checker b/.perl_checker
index 80680ba0..e9fc793a 100644
--- a/.perl_checker
+++ b/.perl_checker
@@ -21,6 +21,7 @@ File::MimeInfo::Magic
 File::Path
 File::Sync
 File::Temp
+Filesys::Df
 Gtk2::Gdk::Keysyms
 Gtk2::Pango
 HTTP::Message
diff --git a/Discover.pm b/Discover.pm
index e2dff77d..c6e5a34e 100644
--- a/Discover.pm
+++ b/Discover.pm
@@ -1,7 +1,7 @@
 package Discover; # $Id$
 
 ################################################################################
-# Part of Mandriva Online                                                      #
+# Part of Mageia Online                                                        #
 # Online service discovery library:                                            #
 # - autodetects nameservers and domains,                                       #
 # - and checks for DNS-declared Online service,                                #
@@ -30,7 +30,7 @@ use strict;
 use Net::DNS;
 use Data::Dumper;
 use MDK::Common;
-use Config::Auto; # CPAN Module. Seems not to be part of Mandriva packages yet.
+use Config::Auto; # CPAN Module. Seems not to be part of Mageia packages yet.
 use Switch;
 
 use Log::Agent; # use settings from main file
@@ -67,7 +67,7 @@ sub commify_series {
 sub search {
 	my $this = shift;
 	
-	logsay "searching for a locally declared Mandriva Online service";
+	logsay "searching for a locally declared Mageia Online service";
 
 	my $resolv      = Config::Auto::parse('/etc/resolv.conf');
 	my $servicetype = '_mdvonline._http._tcp.bonjour.';
diff --git a/Makefile b/Makefile
index 892ac9c7..63ff8244 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-PACKAGE = mdkonline
-VERSION:=2.77.21
+PACKAGE = mgaonline
+VERSION:=2.77.22
 SVNROOT = svn+ssh://svn.mandriva.com/svn/soft/$(PACKAGE)
 
-NAME = mdkonline
-MDKUPDATE = mdkupdate
-MDKAPPLET = mdkapplet
+NAME = mgaonline
+MGAUPDATE = mgaupdate
+MGAAPPLET = mgaapplet
 SUBDIRS = po
 
 MANDRIVA_VERSION = $(shell awk 'BEGIN { RS=","; FS="=" } $$1 == "version" { print $$2 }' /etc/product.id)
@@ -24,7 +24,7 @@ localedir = $(PREFIX)/usr/share/locale
 override CFLAGS += -DPACKAGE=\"$(NAME)\" -DLOCALEDIR=\"$(localedir)\"
 
 all:
-	(find -name .svn -prune -name '*.pm' -o -name mdkapplet\* -o -name mdkupdate -o -name mdvonline_agent.pl -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
+	(find -name .svn -prune -name '*.pm' -o -name mgaapplet\* -o -name mgaupdate -o -name mgaonline_agent.pl -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g'
 	for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
 
 clean:
@@ -35,29 +35,29 @@ clean:
 
 install: all
 	install -d $(PREFIX)/usr/{sbin,bin,share/{mime/packages,$(NAME)/pixmaps,autostart,gnome/autostart,icons/{mini,large}},lib/libDrakX/drakfirsttime}
-	install -m755 $(MDKUPDATE) $(SBINDIR)
-	install -m755 $(MDKAPPLET) $(BINDIR)
+	install -m755 $(MGAUPDATE) $(SBINDIR)
+	install -m755 $(MGAAPPLET) $(BINDIR)
 	install -d $(SYSCONFDIR)
-	install -m644 mdkapplet.conf $(SYSCONFDIR)/mdkapplet
+	install -m644 mgaapplet.conf $(SYSCONFDIR)/mgaapplet
 	install -m644 icons/$(NAME)16.png $(ICONSDIR)/mini/$(NAME).png
 	install -m644 icons/$(NAME)32.png $(ICONSDIR)/$(NAME).png
 	install -m644 icons/$(NAME)48.png $(ICONSDIR)/large/$(NAME).png
 	install -m644 pixmaps/*.png $(PIXDIR)/pixmaps
-	perl -pi -e "s/version = 1/version = '$(VERSION)'/" mdkonline.pm
-	install -m644 mdkonline.pm $(FBLIBDIR)
-	install -m644 mdkapplet_gui.pm $(FBLIBDIR)
-	install -m644 mdkapplet_urpm.pm $(FBLIBDIR)
+	perl -pi -e "s/version = 1/version = '$(VERSION)'/" mgaonline.pm
+	install -m644 mgaonline.pm $(FBLIBDIR)
+	install -m644 mgaapplet_gui.pm $(FBLIBDIR)
+	install -m644 mgaapplet_urpm.pm $(FBLIBDIR)
 	for d in $(SUBDIRS); do make -C $$d $@; done
 # mime
-	install -m644 mdkonline.xml $(DATADIR)/mime/packages/mdkonline.xml
+	install -m644 mgaonline.xml $(DATADIR)/mime/packages/mgaonline.xml
 	mkdir -p $(DATADIR)/mimelnk/application/
-	install -m644 x-mdv-exec.desktop $(DATADIR)/mimelnk/application/
+	install -m644 x-mga-exec.desktop $(DATADIR)/mimelnk/application/
 	mkdir -p $(PREFIX)/etc/security/console.apps/
 	install -m644 console.apps_urpmi.update $(PREFIX)/etc/security/console.apps/urpmi.update
 	mkdir -p $(PREFIX)/etc/pam.d
 	install -m644 pam.d_urpmi.update $(PREFIX)/etc/pam.d/urpmi.update
 	ln -sf consolehelper $(PREFIX)/usr/bin/urpmi.update
-	for i in mdkapplet-config mdkapplet-add-media-helper mdkapplet-upgrade-helper; do \
+	for i in mgaapplet-config mgaapplet-add-media-helper mgaapplet-upgrade-helper; do \
 		install -m755 $$i $(SBINDIR); \
 		ln -sf consolehelper $(PREFIX)/usr/bin/$$i; \
 	done
diff --git a/NEWS b/NEWS
index 1dd5bbf2..10188254 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Version 2.77.22 - 13 Mae 2010, Thierry Vignaud
+- rename as mgaonline
+- use MGA API
+- unbreak one year of "mdv maintenance"
+
 Version 2.77.21 - 29 Jul 2010, João Victor Duarte Martins
 - Correctly add '--testing' when calling mdkapplet-add-media-helper.
 
diff --git a/TODO b/TODO
index c0deb0b6..27877635 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id$
+$Id: TODO 53482 2005-11-23 17:18:57Z rdalverny $
 Things to do on mdkonline
 -------------------------------------------------------------------------------
 
@@ -76,4 +76,4 @@ Things to do on mdkonline
    * MAILTO to the email of the user instead of root, if possible.
 
 -------------------------------------------------------------------------------
-$Id$
+$Id: TODO 53482 2005-11-23 17:18:57Z rdalverny $
diff --git a/apps.mdkonline b/apps.mdkonline
index 559c51bd..3906e482 100644
--- a/apps.mdkonline
+++ b/apps.mdkonline
@@ -1,4 +1,4 @@
 USER=root
-PROGRAM=/usr/sbin/mdkonline.real
+PROGRAM=/usr/sbin/mgaonline.real
 SESSION=true
 FALLBACK=false
diff --git a/gnome-mandrakeonline.desktop b/gnome-mandrakeonline.desktop
index 237aa778..e14ad9d3 100644
--- a/gnome-mandrakeonline.desktop
+++ b/gnome-mandrakeonline.desktop
@@ -1,8 +1,8 @@
 
 [Desktop Entry]
 Name=Mandriva Online
-Icon=mdkonline.png
-Exec=/usr/sbin/mdkonline
+Icon=mgaonline.png
+Exec=/usr/sbin/mgaonline
 Terminal=false
 MultipleArgs=false
 Type=Application
diff --git a/icons/mdkonline16.png b/icons/mgaonline16.png
index 1898a51a..1898a51a 100644
--- a/icons/mdkonline16.png
+++ b/icons/mgaonline16.png
diff --git a/icons/mdkonline32.png b/icons/mgaonline32.png
index 3ad86442..3ad86442 100644
--- a/icons/mdkonline32.png
+++ b/icons/mgaonline32.png
diff --git a/icons/mdkonline48.png b/icons/mgaonline48.png
index a2629877..a2629877 100644
--- a/icons/mdkonline48.png
+++ b/icons/mgaonline48.png
diff --git a/mdkapplet b/mgaapplet
index 4eac408d..a440ef49 100755
--- a/mdkapplet
+++ b/mgaapplet
@@ -28,28 +28,28 @@ use standalone; # for explanations
 use common;
 use run_program;
 
-BEGIN { unshift @::textdomains, 'mdkonline' }
+BEGIN { unshift @::textdomains, 'mgaonline' }
 
 use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
 use ugtk2 qw(:all);
 use lib qw(/usr/lib/libDrakX/drakfirsttime);
-use mdkonline;
-use mdkapplet_gui;
-use Gtk2::Notify '-init', 'mdkapplet';
+use mgaonline;
+use mgaapplet_gui;
+use Gtk2::Notify '-init', 'mgaapplet';
 use Rpmdrake::open_db;
 
 if (!find { $_ eq '--auto-update' } @ARGV) {
-    if (my $pid = mdkonline::is_running('mdkapplet')) {
+    if (my $pid = mgaonline::is_running('mgaapplet')) {
         if ($::testing) {
-            warn "mdkapplet already running ($pid)\n";
+            warn "mgaapplet already running ($pid)\n";
         } else {
-            die "mdkapplet already running ($pid)\n";
+            die "mgaapplet already running ($pid)\n";
         }
     }
 }
 
 
-my $online_site = "http://www.mandrivalinux.com/";
+my $online_site = "http://www.mageia.org/";
 my ($menu, $timeout, $network_timeout, $state_global, $sub_state);
 
 read_sys_config();
@@ -81,7 +81,7 @@ my %state = (
  	     critical => {
 		      colour => [ 'noconf' ],
 		      menu => [ 'check' ],
-		      tt => [ N_("Service configuration problem. Please check logs and send mail to support\@mandrivaonline.com") ]
+		      tt => [ N_("Service configuration problem. Please check logs and send mail to support\@mageiaonline.com") ]
 		     },
 	     busy => {
 		      colour => [ 'busy' ], 
@@ -98,7 +98,7 @@ my %state = (
                  colour => [ 'bundle' ],
                  menu => [ 'upgrade_distro', 'check' ],
                  urgency => 'low',
-                 tt => [ N("A new version of Mandriva Linux distribution has been released") ]
+                 tt => [ N("A new version of Mageia Linux distribution has been released") ]
              },
              no_more_supported => {
                  colour => [ 'disabled' ],
@@ -122,7 +122,7 @@ my %state = (
 		      colour => [ 'disconnect' ],
 		      menu => [ 'confNetwork' ],
 		      tt => [ N_("Network is down. Please configure your network") ],
- 		      do_not_use_bubble => mdkonline::is_running('net_applet'),
+ 		      do_not_use_bubble => mgaonline::is_running('net_applet'),
 		     },
 	     disabled => {
 		      colour => [ 'disabled' ],
@@ -168,7 +168,7 @@ all of them are currently disabled. You should run the Software
 Media Manager to enable at least one (check it in the \"%s\"
 column).
 
-Then, restart \"%s\".", N("Enabled"), 'mdkapplet') ],
+Then, restart \"%s\".", N("Enabled"), 'mgaapplet') ],
           },
 	    );
 
@@ -298,7 +298,7 @@ Gtk2->main;
 
 ugtk2::exit(0);
 
-sub is_extended_support_not_ended {
+sub is_extended_support_not_ended() {
     return if !is_extmaint_supported();
     require POSIX;
     my $d = POSIX::strftime("%G%m%d", localtime(time()));
@@ -434,7 +434,7 @@ sub harvester {
     return @pids;
 }
 
-sub restart_applet {
+sub restart_applet() {
     local $SIG{CHLD} = 'DEFAULT';
     log::explanations(N("Received SIGHUP (probably an upgrade has finished), restarting applet."));
     { redo if wait() > 0 }
@@ -456,7 +456,7 @@ sub is_download_all_enabled() {
 sub confirm_upgrade() {
     local $mygtk2::left_padding = 0;
     my $warn_me = text2bool($local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE});
-    my $w = new_portable_dialog(N("New version of Mandriva Linux distribution"));
+    my $w = new_portable_dialog(N("New version of Mageia Linux distribution"));
     my ($temp_dir, $box);
     
     my $browse;
@@ -470,7 +470,7 @@ sub confirm_upgrade() {
     my $res = fill_n_run_portable_dialog($w,
                                       [
                get_banner(),
-               gtknew('Label_Left', text => N("A new version of Mandriva Linux distribution has been released."), @common),
+               gtknew('Label_Left', text => N("A new version of Mageia Linux distribution has been released."), @common),
                gtknew('HButtonBox', layout => 'start', children_tight => [
                    new_link_button($new_distro->{url}, N("More info about this new version")),
                ]),
@@ -505,7 +505,7 @@ sub confirm_upgrade() {
 
 
 sub get_obsolete_message_() {
-    N("Maintenance for this Mandriva Linux version has ended. No more updates will be delivered for this system."),
+    N("Maintenance for this Mageia Linux version has ended. No more updates will be delivered for this system.");
 }
 
 sub get_obsolete_message() {
@@ -517,7 +517,7 @@ sub get_obsolete_message() {
       
 sub refresh_no_more_supported_msg() {
     my $basic_msg = get_obsolete_message_();
-    my $distro = N("Mandriva Linux");
+    my $distro = N("Mageia Linux");
     my $msg;
 
     # is extended maintenance available?
@@ -538,7 +538,7 @@ sub no_more_supported_choice() {
     local $mygtk2::left_padding = 0;
     my $warn_me = text2bool($local_config{DO_NOT_ASK_FOR_NO_MORE_SUPPORTED});
     # FIXME: just tell radio buttons' children to wrap instead:
-    local $mdkapplet_gui::width = 580;
+    local $mgaapplet_gui::width = 580;
     my $w = new_portable_dialog(N("Your distribution is no longer supported"));
     my ($b1, $b2, $b3);
     my $choice = $extended_maintenance_url ? 'extended' : ($no_more_supported ne 'none' ? 'upgrade' : undef);
@@ -620,7 +620,7 @@ sub no_more_supported() {
 
 
 sub get_extended_maintenance() {
-    $mdv_update_pid = fork_exec('mdkapplet-add-media-helper', 
+    $mdv_update_pid = fork_exec('mgaapplet-add-media-helper', 
                                 if_($::testing, '--testing'),
                                 if_($root, "--urpmi-root=$root"),
                                 '--product=extended',
@@ -630,7 +630,7 @@ sub get_extended_maintenance() {
 
 sub really_confirm_upgrade() {
     local $mygtk2::left_padding = 0;
-    my $w = ugtk2->new(N("New version of Mandriva Linux distribution"), width => $width + 20);
+    my $w = ugtk2->new(N("New version of Mageia Linux distribution"), width => $width + 20);
 
     # estimated package size:
     my $c;
@@ -671,7 +671,7 @@ sub upgrade() {
 }
 
 sub real_upgrade() {
-    $mdv_update_pid = fork_exec('mdkapplet-upgrade-helper', "--new_distro_version=$new_distro->{version}",
+    $mdv_update_pid = fork_exec('mgaapplet-upgrade-helper', "--new_distro_version=$new_distro->{version}",
                                 if_($::testing, '--testing'),
                                 if_($download_all, "--download-all=$download_dir"),
                                 if_($root, "--urpmi-root=$root"));
@@ -685,7 +685,7 @@ sub add_media() {
 
 sub installUpdates() {
     return if $mdv_update_pid;
-    log::explanations(N_("Launching MandrivaUpdate\n"));
+    log::explanations(N_("Launching MageiaUpdate\n"));
     $mdv_update_pid = fork_exec('MandrivaUpdate', '--no-media-update', '--no-confirmation', '--no-splash',
                                 if_($root, "--urpmi-root=$root"));
     silentCheck(); gtkflush();
@@ -718,7 +718,6 @@ sub silentCheck() {
 
     return if $mdv_update_pid || $checker_pid;
     log::explanations(N_("Computing new updates...\n"));
-    my $w = $::main_window ? $::main_window->window : undef;
     go2State('busy');
 
     # are there any updates ?
@@ -730,7 +729,7 @@ sub silentCheck() {
         # immediate exit, else forked gtk+ object destructors will badly catch up parent applet
         my $_safe = before_leaving {
             my $err = $@;
-            log::explanations("mdkapplet check crashed: $err ");
+            log::explanations("mgaapplet check crashed: $err ");
             warn "Error: $err\n" . common::backtrace();
             POSIX::_exit(0);
         };
@@ -891,11 +890,12 @@ sub about_dialog() {
     my $ver = 1;                # automatically set from spec file
     my $url = $online_site;
     $url =~ s/^https:/http:/;
-    my $w = gtknew('AboutDialog', name => N("Mandriva Online %s", $ver),
-                   copyright => N("Copyright (C) %s by Mandriva", '2001-2010'),
+    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'),
                    license => join('', cat_('/usr/share/common-licenses/GPL')),
-                   icon => '/usr/share/icons/mini/mdkonline.png',
-                   comments => N("Mandriva Online gives access to Mandriva web services."),
+                   icon => '/usr/share/icons/mini/mgaonline.png',
+                   comments => N("Mageia Online gives access to Mageia web services."),
                    website => $url,
                    website_label => N("Online WebSite"),
                    authors => 'Thierry Vignaud <vignaud@mandriva.com>',
@@ -931,7 +931,7 @@ sub setState {
 
     if ($state{$state}{tt}[0] && $icon->isa('Gtk2::StatusIcon') && !$state{$state}{do_not_use_bubble}) {
         my $bubble = Gtk2::Notify->new_with_status_icon(N("Warning"), formatAlaTeX(translate($state{$state}{tt}[0])) . "\n",
-                                                        '/usr/share/icons/mdkonline.png', $icon);
+                                                        '/usr/share/icons/mgaonline.png', $icon);
         if ($state eq 'new_distribution') {
             $bubble->add_action('clicked', N("More Information"), \&upgrade);
             if ($sub_state eq 'updates') {
@@ -968,7 +968,7 @@ sub setState {
     $menu->append(gtksignal_connect(gtkshow(Gtk2::MenuItem->new_with_label(N("About..."))),
                                     activate => \&about_dialog));
     $menu->append(gtksignal_connect(gtkshow(Gtk2::MenuItem->new_with_label(N("Updates Configuration"))), 
-                                    activate => sub { run_program::raw({ detach => 1 }, 'mdkapplet-config') }));
+                                    activate => sub { run_program::raw({ detach => 1 }, 'mgaapplet-config') }));
     $menu->append(gtksignal_connect(gtkset_active($checkme = Gtk2::CheckMenuItem->new_with_label(N("Always launch on startup")), shouldStart()), toggled => sub { setAutoStart(uc(bool2text($checkme->get_active))) }));
     $checkme->show;
     $menu->append(gtksignal_connect(gtkshow(Gtk2::MenuItem->new_with_label(N("Quit"))), activate => sub { mainQuit() }));
@@ -1007,14 +1007,14 @@ sub is_restricted_media_configured {
     my @restricted_media = get_enabled_restricted_media($urpm);
     my @names = map { $_->{name} } @restricted_media;
     # we need both 'Restricted' & 'Restricted Updates' media
-    # those who did online update trough mdkapplet do not have restricted medium, hence the test for 2 medium:
+    # those who did online update trough mgaapplet do not have restricted medium, hence the test for 2 medium:
     @restricted_media >= (urpm::cfg::get_arch() =~ /64/ ? 4 : 2)
       && (grep { /Restricted Updates/ } @names) && (grep { /Restricted/ && !/Updates/ } @names);
 }
 
 sub really_prepare_add_restricted() {
     $mdv_update_pid = run_program::raw({ detach => 1 }, 
-				       'mdkapplet-add-media-helper', 
+				       'mgaapplet-add-media-helper', 
 				       $product_id->{version});
 }
 
@@ -1029,7 +1029,7 @@ sub prepare_add_restricted() {
               get_banner(N("New medium available")),
               gtknew('Label_Left', text => 
                        N("You use '%s' distribution and therefore have privileged access to additional software.",
-                         translate_product()) . "\n\n" .
+                         translate_product($product_id->{version})) . "\n\n" .
                            N("Do you want to install this additional software repository?"), @common),
               gtknew('CheckButton', text => N("Do not ask me next time"), active_ref => \$warn_me),
               create_okcancel($w, N("Next"), N("Cancel")),
@@ -1043,7 +1043,7 @@ sub prepare_add_restricted() {
 sub really_prepare_add_enterprise() {
     $mdv_update_pid = run_program::raw(
 	{ detach => 1 },
-	'mdkapplet-add-media-helper',
+	'mgaapplet-add-media-helper',
 	join('', @$product_id{qw(type product version)})
 	);
 }
@@ -1059,7 +1059,7 @@ sub prepare_add_enterprise_update_media() {
               get_banner(N("New medium available")),
               gtknew('Label_Left', text => 
                        N("You use '%s' distribution and therefore have privileged access to additional software.",
-                         N_("Mandriva Enterprise Server")) . "\n\n" .
+                         N_("Mageia Enterprise Server")) . "\n\n" .
                            N("Do you want to install this additional software repository?"), @common),
               gtknew('CheckButton', text => N("Do not ask me next time"), active_ref => \$warn_me),
               create_okcancel($w, N("Next"), N("Cancel")),
diff --git a/mdkapplet-add-media-helper b/mgaapplet-add-media-helper
index 6afbba2b..cd6e747b 100755
--- a/mdkapplet-add-media-helper
+++ b/mgaapplet-add-media-helper
@@ -20,7 +20,7 @@
 # Boston, MA 02111-1307, USA.
 ###########################################################################
 
-BEGIN { unshift @::textdomains, 'mdkonline' }
+BEGIN { unshift @::textdomains, 'mgaonline' }
 
 use strict;
 use lib qw(/usr/lib/libDrakX /usr/lib/libDrakX/drakfirsttime);
@@ -31,8 +31,8 @@ use interactive;
 use interactive::gtk;
 use mygtk2 qw(gtknew);	# only gtknew, any other stuff would break ugtk2
 use ugtk2 qw(:all);
-use mdkonline qw($product_id);
-use mdkapplet_gui;
+use mgaonline qw($product_id);
+use mgaapplet_gui;
 use urpm::cfg;
 use utf8;
 
@@ -46,7 +46,7 @@ my %product = (
 	    $profile->{data}{'can-access-restricted-repositories'} eq 'YES';
 	},
 	media_name => 'Restricted',
-        add_medium => \&mdkonline::add_medium_powerpack 
+        add_medium => \&mgaonline::add_medium_powerpack 
 	    
     },
     server => { 
@@ -57,7 +57,7 @@ my %product = (
 		$profile->{data}{groups}{'es5-demo'};
 	},
 	media_name => 'Update',
-        add_medium => \&mdkonline::add_medium_enterprise
+        add_medium => \&mgaonline::add_medium_enterprise
     },
     extended => {
         info_url => 'https://my.mandriva.com/',
@@ -66,12 +66,12 @@ my %product = (
             return ! ref $profile->{data}{groups}{'ext-maint-' . $version};
         },
         media_name => 'Extended Maintenance',
-        add_medium => \&mdkonline::add_medium_extended,
+        add_medium => \&mgaonline::add_medium_extended,
         success_callback => sub {
-            mdkonline::read_sys_config();
-            $mdkonline::config{EXTENDED_SUPPORT} = bool2yesno(1);
-            mdkonline::setVarsInSh($mdkonline::config_file, 
-                                   \%mdkonline::config);
+            mgaonline::read_sys_config();
+            $mgaonline::config{EXTENDED_SUPPORT} = bool2yesno(1);
+            mgaonline::setVarsInSh($mgaonline::config_file, 
+                                   \%mgaonline::config);
         }
     }
     );
@@ -115,8 +115,8 @@ my $current_apimdv_distro;
     }
     $up_version or die $usage;
 
-    # FIXME Couldn't that be automatic called when mdkonline.pm is used?
-    $product_id or mdkonline::get_product_id();
+    # FIXME Couldn't that be automatic called when mgaonline.pm is used?
+    $product_id or mgaonline::get_product_id();
 
     # Product id data should be used in lowercase.
     $up_product ||= lc $product_id->{product};
@@ -158,14 +158,14 @@ sub run_authentication_dialog {
                             #     "2009/11/28" in english but "28/11/2009"
                             #     for brazil or "28 Nov. "2009" for
                             #     french:
-                            N("Mandriva provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions.",
-                              mdkapplet_gui::iso8601_date_to_locale(
+                            N("Mageia provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions.",
+                              mgaapplet_gui::iso8601_date_to_locale(
                                   $desktop_update_end),
-                              mdkapplet_gui::iso8601_date_to_locale(
+                              mgaapplet_gui::iso8601_date_to_locale(
                                   $basic_update_end)
                             ),
                             N("Extended maintenance is now available to get 18 months of additional updates (until %s).",
-                              mdkapplet_gui::iso8601_date_to_locale(
+                              mgaapplet_gui::iso8601_date_to_locale(
                                   $extmaint_end)),
                             N("You can subscribe <b>right now</b> to get extended maintenance:"),
                        ),
@@ -176,7 +176,7 @@ sub run_authentication_dialog {
               ];
     }
 
-    mdkapplet_gui::run_ask_credentials_dialog($title, 
+    mgaapplet_gui::run_ask_credentials_dialog($title, 
 					      $description, 
 					      \&authenticate_callback,
                                               top_extra => $extra_info);
@@ -186,7 +186,7 @@ sub run_authentication_dialog {
 sub authenticate_callback {
     my ($email, $passwd) = @_;
     my $product = $product{$up_product};
-    my $profile = mdkonline::get_my_mdv_profile($email, $passwd);
+    my $profile = mgaonline::get_my_mdv_profile($email, $passwd);
 
     if ($profile->{code} != 0) {
         my $in = interactive->vnew;
@@ -195,10 +195,10 @@ sub authenticate_callback {
         goto &run_authentication_dialog;
     } 
     elsif (!$product->{has_rights}->($profile)) {
-        mdkapplet_gui::run_no_rights_dialog(
+        mgaapplet_gui::run_no_rights_dialog(
             $title, 
-            N("Your Mandriva account does not have %s download subscription enabled.", 
-              mdkonline::translate_product($up_product)),
+            N("Your Mageia account does not have %s download subscription enabled.", 
+              mgaonline::translate_product($up_product)),
             $product{$up_product}{info_url}
             );
     } 
@@ -244,9 +244,9 @@ sub add_medium_for_product {
 sub get_extended_maintenance_data() {
     if (not $current_apimdv_distro) {
         require Rpmdrake::open_db;
-        my @distros = mdkonline::get_distro_list();
+        my @distros = mgaonline::get_distro_list();
         return if !@distros;
-        $current_apimdv_distro = mdkonline::find_current_distro(@distros);
+        $current_apimdv_distro = mgaonline::find_current_distro(@distros);
     }
     return @$current_apimdv_distro{ qw(extended-maintenance 
                                        extended-maintenance-end
diff --git a/mdkapplet-config b/mgaapplet-config
index adffac92..c7959425 100755
--- a/mdkapplet-config
+++ b/mgaapplet-config
@@ -25,12 +25,12 @@ use lib qw(/usr/lib/libDrakX /usr/lib/libDrakX/drakfirsttime);
 use standalone; # for explanations
 use common;
 
-BEGIN { unshift @::textdomains, 'mdkonline' }
+BEGIN { unshift @::textdomains, 'mgaonline' }
 
 use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
 use ugtk2 qw(:all);
-use mdkonline;
-use mdkapplet_gui;
+use mgaonline;
+use mgaapplet_gui;
 use interactive;
 
 get_product_id();
diff --git a/mdkapplet-upgrade-helper b/mgaapplet-upgrade-helper
index 0231051a..a045aa09 100755
--- a/mdkapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -29,17 +29,17 @@ BEGIN { require_root_capability() }
 use run_program;
 use feature 'state';
 
-BEGIN { unshift @::textdomains, 'mdkonline' }
+BEGIN { unshift @::textdomains, 'mgaonline' }
 
 use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
 use ugtk2 qw(:all);
 use lib qw(/usr/lib/libDrakX/drakfirsttime);
-use mdkonline;
+use mgaonline;
 use Rpmdrake::open_db;
 use lang;
-use mdkapplet_gui qw(run_ask_credentials_dialog);
+use mgaapplet_gui qw(run_ask_credentials_dialog);
 
-ugtk2::add_icon_path("/usr/share/mdkonline/pixmaps/");
+ugtk2::add_icon_path("/usr/share/mgaonline/pixmaps/");
 my ($log_file);
 
 my ($new_distro_version, $download_dir);
@@ -112,9 +112,9 @@ sub run_gurpmi() {
                 $failed_win->main && upgrade();
             } else {
                 rm_rf(get_stale_upgrade_filename());
-                $succeeded_win->main && !$::testing && any::reboot();
-                my $mdkapp_pid = common::is_running('mdkapplet');
-                defined($mdkapp_pid) && kill('HUP', $mdkapp_pid);
+                $succeeded_win->main and !$::testing and any::reboot();
+                my $mgaapp_pid = common::is_running('mgaapplet');
+                defined($mgaapp_pid) && kill('HUP', $mgaapp_pid);
             }
         }
     }
@@ -149,7 +149,7 @@ sub create_upgrade_succeeded_window() {
     gtkadd($w->{window},
            gtknew('VBox', children_tight => [
                get_banner(),
-               gtknew('Label_Left', text => N("Upgrade to Mandriva %s release was successfull.", $new_distro_version),
+               gtknew('Label_Left', text => N("Upgrade to Mageia %s release was successfull.", $new_distro_version),
                       @common),
                gtknew('Label_Left', text => N("You must restart your system."), @common),
                create_okcancel($w, N("Reboot"), N("Cancel")),
@@ -162,13 +162,13 @@ sub create_upgrade_succeeded_window() {
 # Returns: undef if failed to authenticate, [$email, $passwd] otherwise
 sub powerpack_auth_callback {
     my ($email, $passwd) = @_;
-    my $profile = mdkonline::get_my_mdv_profile($email, $passwd);
+    my $profile = mgaonline::get_my_mdv_profile($email, $passwd);
     
     # Checking for profile retrieving errors...
     if ($profile->{code} != 0) {
         my $in = interactive->vnew;
-        $in->ask_warn(N('Error'), 
-                      N('An error occurred') . "\n" . $profile->{message});
+        $in->ask_warn(N("Error"), 
+                      N("An error occurred") . "\n" . $profile->{message});
         return;
     } 
 
@@ -180,36 +180,32 @@ sub powerpack_auth_callback {
     #                  powerpack-VERSION
     #
     my $level = $profile->{data}{club}{level};
-    if ($level == 2 or $level == 6) {
+    if ($level == 2 || $level == 6) {
         return [$email, $passwd];
     }
-    elsif ($profile->{data}{families} 
-               =~ /powerpack-$new_distro_version/i) {
+    elsif ($profile->{data}{families} =~ /powerpack-$new_distro_version/i) {
         return [$email, $passwd];
     }
     else {
-        mdkapplet_gui::run_no_rights_dialog(
-            N('Powerpack Media Configuration'),
-            N('You current Mandriva account does not have Powerpack ' .
-              'subscription enabled.'),
+        mgaapplet_gui::run_no_rights_dialog(
+            N("Powerpack Media Configuration"),
+            N("You current Mageia account does not have Powerpack subscription enabled."),
             'https://my.mandriva.com/powerpack/',
             );
         return;
     }
 }
 
-sub try_to_add_powerpack_media {
-    my $is_powerpack = mdkonline::is_restricted_media_supported();
+sub try_to_add_powerpack_media() {
+    my $is_powerpack = mgaonline::is_restricted_media_supported();
     my $auth_info;
 
     # Validating current product for offering powerpack medias...
 
     if ($is_powerpack) {
         # Verifying rights of current powerpack users...
-        my $title = N('Powerpack Media Configuration');
-        my $description = N('Please fill your My.Mandriva login and ' .
-                            'password to add additional package media '.
-                            'for Powerpack.');
+        my $title = N("Powerpack Media Configuration");
+        my $description = N("Please fill your My.Mageia login and password to add additional package media for Powerpack.");
 
         # If no rights @auth_info == ()...
         $auth_info = run_ask_credentials_dialog(
@@ -224,22 +220,20 @@ sub try_to_add_powerpack_media {
 
     my $choice;    # will be 'powerpack', 'free' or undef
     while ($auth_info 
-               or ($choice = mdkapplet_gui::open_ask_powerpack_dialog(
+               || ($choice = mgaapplet_gui::open_ask_powerpack_dialog(
                                  $product_id->{product},
                                  $new_distro_version))) {
         $auth_info and return $auth_info;
 
         # Get the new authentication info from user...
-        my $title = N('Powerpack Media Configuration');
-        my $description = N('Please fill your account ID to add ' .
-                            'Powerpack %s version packages media once ' .
-                            'you have subscribed online',
+        my $title = N("Powerpack Media Configuration");
+        my $description = N("Please fill your account ID to add Powerpack %s version packages media once you have subscribed online",
                             $new_distro_version);
         $auth_info = run_ask_credentials_dialog(
             $title,
             $description,
             \&powerpack_auth_callback,
-            top_extra => $mdkapplet_gui::powerpack_ad,
+            top_extra => $mgaapplet_gui::powerpack_ad,
         );       
     }
     defined $choice or exit 0;    # means user has canceled upgrade
@@ -296,7 +290,7 @@ packages as well?)."))
 
     log::explanations("adding urpmi media for new distribution");
 
-    $ENV{URPMI_ADDMEDIA_REASON} = join(',', 'reason=upgrade', 'upgrade_by=mdkapplet', "upgrade_from=$product_id->{version}");
+    $ENV{URPMI_ADDMEDIA_REASON} = join(',', 'reason=upgrade', 'upgrade_by=mgaapplet', "upgrade_from=$product_id->{version}");
     # the following modifies $MIRRORLIST expansion in urpm/mirrors.pm,
     # it must be set for gurpmi.addmedia, but also for gurpmi
     $ENV{URPMI_ADDMEDIA_PRODUCT_VERSION} = $new_distro_version;
@@ -318,7 +312,7 @@ packages as well?)."))
         log::explanations("adding restricted (powerpack) media");
 
         my ($email, $passwd) = @$add_pwp_auth;
-        unless (mdkonline::add_medium_powerpack(
+        unless (mgaonline::add_medium_powerpack(
                     $email, 
                     $passwd, 
                     $new_distro_version, 
@@ -330,10 +324,9 @@ packages as well?)."))
             log::explanations("restoringing urpmi configuration from $file");
             cp_af($file, "$root/etc/urpmi/urpmi.cfg");
             update_media();
-            ugtk2::ask_warn(N('Error'),
-                            N('Installation failed'),
-                            N('Failed to add powerpack restricted ' .
-                              'medium'),
+            ugtk2::ask_warn(N("Error"),
+                            N("Installation failed"),
+                            N("Failed to add powerpack restricted medium"),
                 );
             exit(2);            
         }
diff --git a/mdkapplet.conf b/mgaapplet.conf
index b51a541b..b51a541b 100644
--- a/mdkapplet.conf
+++ b/mgaapplet.conf
diff --git a/mdkapplet_gui.pm b/mgaapplet_gui.pm
index 89da5d60..802a70ed 100644
--- a/mdkapplet_gui.pm
+++ b/mgaapplet_gui.pm
@@ -1,4 +1,4 @@
-package mdkapplet_gui;
+package mgaapplet_gui;
 
 ################################################################################
 # Mandriva Online                                                              # 
@@ -50,19 +50,19 @@ our @EXPORT_OK = qw(
 
 use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version
 use ugtk2 qw(:all);
-use mdkonline qw();	# you don't want to polute the namespace
+use mgaonline qw();	# you don't want to polute the namespace
 use interactive;
 use interactive::gtk;
 use lib qw(/usr/lib/libDrakX/drakfirsttime);
 
-ugtk2::add_icon_path("/usr/share/mdkonline/pixmaps/");
+ugtk2::add_icon_path("/usr/share/mgaonline/pixmaps/");
 
-our $localdir = "$ENV{HOME}/.MdkOnline";
-our $localfile = "$localdir/mdkonline";
+our $localdir = "$ENV{HOME}/.MgaOnline";
+our $localfile = "$localdir/mgaonline";
 
 #compatibility
 mkdir_p($localdir) if !-d $localdir;
--e "$ENV{HOME}/.mdkonline" and system("mv", "$ENV{HOME}/.mdkonline", $localfile);
+-e "$ENV{HOME}/.mgaonline" and system("mv", "$ENV{HOME}/.mgaonline", $localfile);
 
 # make it work on 2008.X:
 eval { interactive::gtk::add_padding(Gtk2::Label->new) };
@@ -84,14 +84,14 @@ our @common = (
 # List of widgets advertising Powerpack
 our $powerpack_ad = [
     gtknew('Label_Left',
-           text => N("Mandriva Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mandriva official support."),
+           text => N("Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."),
            @common),
     gtknew('HButtonBox',
            layout => 'center',
            children_tight => [
                new_link_button(
-                   'http://www2.mandriva.com/linux/features/',
-                   N("Mandriva Linux Features")
+                   'http://www.mageia.org/', # FIXME: URL!
+                   N("Mageia Linux Features")
                )
            ]),
     gtknew('Label_Left',
@@ -101,7 +101,7 @@ our $powerpack_ad = [
            layout => 'center',
            children_tight => [
                new_link_button(
-                   'http://store.mandriva.com/pwp/',
+                   'http://www.mageia.org/', # FIXME: URL!
                    N("Online subscription")
                )
            ]),
@@ -196,7 +196,7 @@ sub run_ask_credentials_dialog {
     };
 
     my @widgets = (
-	if_(!$::isEmbedded, mdkonline::get_banner($title)),
+	if_(!$::isEmbedded, mgaonline::get_banner($title)),
         if_($options{top_extra},
             @{ $options{top_extra} },
             gtknew('HSeparator'),
@@ -209,7 +209,7 @@ sub run_ask_credentials_dialog {
 	       children_tight => [
 		   interactive::gtk::add_padding(
 		       new_link_button(
-			   'https://my.mandriva.com/info',
+                           'http://www.mageia.org/', # FIXME: URL!
 			   N("More information on your user account")
 		       )
 		   )
@@ -224,7 +224,7 @@ sub run_ask_credentials_dialog {
 	       children_tight => [
 		   interactive::gtk::add_padding(
 		       new_link_button(
-			   'https://my.mandriva.com/reset/password/',
+                           'http://www.mageia.org/', # FIXME: URL!
 			   N("Forgotten password")
 		       )
 		   )
@@ -253,10 +253,10 @@ sub run_no_rights_dialog {
     my ($title, $info, $info_url) = @_;
     my $w = new_portable_dialog($title);
     my @widgets = (
-	mdkonline::get_banner($title),
+	mgaonline::get_banner($title),
 	gtknew('Label_Left',
 	       text => $info,
-	       @mdkapplet_gui::common),
+	       @mgaapplet_gui::common),
 	gtknew('HButtonBox',
 	       layout => 'start',
 	       children_tight => [
@@ -279,9 +279,9 @@ sub open_ask_powerpack_dialog {
     my $rbutton;
     # pwp/flash users will be offered powerpack by default
     my $want_powerpack = $current_product =~ /powerpack|flash/i;
-    for my $product ($want_powerpack
+    foreach my $product ($want_powerpack
                          ? ('powerpack', 'free') : ('free', 'powerpack')) {
-        my $info = mdkonline::get_product_info($product);
+        my $info = mgaonline::get_product_info($product);
         $rbutton 
             = Gtk2::RadioButton->new_with_label($rbutton
                                                     ? $rbutton->get_group
@@ -291,7 +291,7 @@ sub open_ask_powerpack_dialog {
                                  sub {
                                      my ($button, $is_pwp) = @_;
                                      $want_powerpack = $is_pwp 
-                                         unless not $button->get_active();
+                                         if $button->get_active;
                                  }, 
                                  $product eq 'powerpack');
         push @radio_widgets, [ $rbutton, $info->{description} ];
@@ -302,7 +302,7 @@ sub open_ask_powerpack_dialog {
     my $title = N("Choose your upgrade version");
     my $w = new_portable_dialog($title);
     my @widgets 
-        = (mdkonline::get_banner($current_product =~ /powerpack/i
+        = (mgaonline::get_banner($current_product =~ /powerpack/i
                                      ? N("Your Powerpack access has ended")
                                      : $title),
            gtknew('Label_Left',
diff --git a/mdkapplet_urpm.pm b/mgaapplet_urpm.pm
index 203a968e..304f3352 100644
--- a/mdkapplet_urpm.pm
+++ b/mgaapplet_urpm.pm
@@ -1,4 +1,4 @@
-package mdkapplet_urpm;
+package mgaapplet_urpm;
 
 # taken from urpmi:
 
diff --git a/mdkonline.pm b/mgaonline.pm
index d3889ed8..2bb78efc 100644
--- a/mdkonline.pm
+++ b/mgaonline.pm
@@ -21,7 +21,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.   #
 ################################################################################
 
-package mdkonline;
+package mgaonline;
 
 use strict;
 
@@ -69,8 +69,8 @@ our $version = 1;
 
 use log;
 
-our $config_file = '/etc/sysconfig/mdkapplet';
-my $release_file = find { -f $_ } '/etc/mandriva-release', '/etc/mandrakelinux-release', '/etc/mandrake-release', '/etc/redhat-release';
+our $config_file = '/etc/sysconfig/mgaapplet';
+my $release_file = find { -f $_ } map { "/etc/${_}release" } '', qw(mageia- mandriva- mandrakelinux- mandrake- redhat-);
 
 sub read_sys_config() {
     %config = getVarsFromSh($config_file);
@@ -117,9 +117,10 @@ sub get_distro_list_() {
     my $extra_path = $::testing || uc($config{TEST_DISTRO_UPGRADE}) eq 'YES' ? 'testing-' : '';
     my $list = 
       join('&',
-           "https://api.mandriva.com/distributions/$extra_path$type.$product_id->{arch}.list?product=$product_id->{product}",
-           "version=$product_id->{version}",
-           "mdkonline_version=$mdkonline::version",
+           # now at http://mirrors.mageia.org/api/{name}.{version}.i586.list
+           "http://releases.mageia.org/api/a/$extra_path$product_id->{arch}?product=$product_id->{product}",
+          "version=$product_id->{version}",
+           "mgaonline_version=$mgaonline::version",
        );
     log::explanations("trying distributions list from $list");
 
@@ -132,9 +133,9 @@ sub get_distro_list_() {
 
         # old API:
         if (member($product_id->{version}, qw(2007.1 2008.0 2008.1))) {
-            require mdkapplet_urpm;
-            mdkapplet_urpm::ensure_valid_cachedir($urpm);
-            mdkapplet_urpm::get_content($urpm, $list);
+            require mgaapplet_urpm;
+            mgaapplet_urpm::ensure_valid_cachedir($urpm);
+            mgaapplet_urpm::get_content($urpm, $list);
         } else {
             urpm::ensure_valid_cachedir($urpm);
             urpm::download::get_content($urpm, $list);
@@ -174,12 +175,12 @@ sub fork_exec {
 sub translate_product {
     my ($product) = @_;
     my %strings = (
-        flash => N("Mandriva Flash"),
-        free => N("Mandriva Free"),
-        mini => N("Mandriva Mini"),
-        one => N("Mandriva One"),
-        powerPack => N("Mandriva PowerPack"),
-        server => N("Mandriva Enterprise Server"),
+        flash => N("Mageia Flash"),
+        free => N("Mageia Free"),
+        mini => N("Mageia Mini"),
+        one => N("Mageia One"),
+        powerPack => N("Mageia PowerPack"),
+        server => N("Mageia Enterprise Server"),
     );
     $product ||= lc $product_id->{product};
     $strings{$product} || $product;
@@ -191,11 +192,11 @@ sub get_product_info {
     my ($product) = @_;
     my %info = (
         powerpack => {
-            name => N("Mandriva PowerPack"),
-            description => N("The Mandriva Linux distribution with even more softwares and official support."),
+            name => N("Mageia PowerPack"),
+            description => N("The Mageia Linux distribution with even more softwares and official support."),
         },
         free => {
-            name => N("Mandriva Free"),
+            name => N("Mageia Free"),
             description => N("The 100%% Open Source distribution freely available."),
         },
     );
@@ -205,7 +206,7 @@ sub get_product_info {
 
 sub get_banner_icon() {
     find { -e $_ } 
-      qw(/usr/share/mcc/themes/default/rpmdrake-mdk.png /usr/share/icons/large/mdkonline.png);
+      qw(/usr/share/mcc/themes/default/rpmdrake-mga.png /usr/share/icons/large/mgaonline.png);
 }
 
 sub get_banner {
@@ -219,7 +220,7 @@ sub get_urpmi_options() {
 
 sub add_medium_enterprise {
     my ($email, $password, $version, $arch) = @_;
-    my $uri = sprintf('https://%s:%s@download.mandriva.com/%s/rpms/%s/',
+    my $uri = sprintf('https://%s:%s@download.FIXME.com/%s/rpms/%s/',
                       uri_escape($email),
                       uri_escape($password),
                       $version,
@@ -230,7 +231,7 @@ sub add_medium_enterprise {
 
 sub add_medium_powerpack {
     my ($email, $password, $version, $arch) = @_;
-    my $uri = sprintf('https://%s:%s@dl.mandriva.com/rpm/comm/%s/',
+    my $uri = sprintf('https://%s:%s@dl.FIXME.com/rpm/comm/%s/',
                       uri_escape($email),
                       uri_escape($password),
                       $version);
@@ -249,7 +250,7 @@ sub add_medium_powerpack {
 
 sub add_medium_extended {
     my ($email, $password, $version, $arch) = @_;
-    my $uri = sprintf("https://%s:%s\@dl.mandriva.com/extended/%s/%s",
+    my $uri = sprintf("https://%s:%s\@dl.FIXME.com/extended/%s/%s",
                       uri_escape($email),
                       uri_escape($password),
                       $version,
@@ -278,8 +279,8 @@ sub get_from {
     my ($link, $header) = @_;
     
     my $ua = LWP::UserAgent->new;
-    $ua->agent(sprintf('mdkapplet (mdkonline-%s; distribution: %s)',
-                       $mdkonline::version, $version));
+    $ua->agent(sprintf('mgaapplet (mgaonline-%s; distribution: %s)',
+                       $mgaonline::version, $version));
     $ua->env_proxy;
 
     my $response = $ua->post($link, $header);
@@ -288,7 +289,7 @@ sub get_from {
 
 sub get_my_mdv_profile {
     my ($email, $password) = @_;
-    xml2perl(get_from('https://my.mandriva.com/rest/authenticate',
+    xml2perl(get_from('https://my.FIXME.com/rest/authenticate',
                       [ 'username', $email, 'password', $password, 
                         'return', 'userdata' ]));
 }
diff --git a/mdkonline.xml b/mgaonline.xml
index a7361251..a7361251 100644
--- a/mdkonline.xml
+++ b/mgaonline.xml
diff --git a/mdvonline_agent.pl b/mgaonline_agent.pl
index 980a366e..bd687a36 100644..100755
--- a/mdvonline_agent.pl
+++ b/mgaonline_agent.pl
@@ -26,7 +26,7 @@ use strict;
 use POSIX;
 use lib qw(/usr/lib/libDrakX /usr/lib/libDrakX/drakfirsttime);
 use common;
-use mdkonline;
+use mgaonline;
 use Switch;
 use Data::Dumper;
 use Error qw(:try);
@@ -48,17 +48,17 @@ logconfig(
 );
 
 logsay "==================";
-mdkonline::is_running('mdvonline_agent') and die "mdvonline_agent already running\n";
+mgaonline::is_running('mdvonline_agent') and die "mdvonline_agent already running\n";
 require_root_capability();
 
-my %conf = mdkonline::get_configuration();
+my %conf = mgaonline::get_configuration();
 print Dumper(%conf);
 
 ! defined %conf and logwarn "no configuration set", exit 0;
 
 logsay "checking for tasks";
 print Dumper(%conf);
-my $answer = mdkonline::soap_get_task($conf{HOST_ID}, $conf{HOST_KEY});
+my $answer = mgaonline::soap_get_task($conf{HOST_ID}, $conf{HOST_KEY});
 
 print Dumper($answer);
 
@@ -68,7 +68,7 @@ if ($answer->{code} == 0) {
 	}
 	else {
 		logsay "got something";
-		mdkonline::run_and_return_task($answer->{data});
+		mgaonline::run_and_return_task($answer->{data});
 	}
 	exit 1;
 }
diff --git a/mdkupdate b/mgaupdate
index 9335e9a8..7c1623ab 100755
--- a/mdkupdate
+++ b/mgaupdate
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ################################################################################
-# Mdkupdate                                                                    # 
+# Mgaupdate                                                                    # 
 #                                                                              #
 # Copyright (C) 2002-2006 Mandriva                                             #
 #                                                                              #
@@ -33,38 +33,40 @@ use interactive;
 use URI::Escape;
 use run_program;
 
-use mdkonline;
+use mgaonline;
 
 use Getopt::Long;
 
-BEGIN { unshift @::textdomains, 'mdkupdate' }
+BEGIN { unshift @::textdomains, 'mgaupdate' }
 
 require_root_capability();
 
 my $confdir = '/root/.MdkOnline';
-my $conffile = "$confdir/mdkupdate";
+my $conffile = "$confdir/mgaupdate";
 
-my $logfile = '/var/tmp/mdkupdate.log';
+my $logfile = '/var/tmp/mgaupdate.log';
 
 
 my $CLIENT_VERSION = "4";
 my $YEARS = "2002-2006";
+my $MGA_YEARS = "2010-2011";
 
 #for compatibilities with former versions
 mkdir_p($confdir) if !-d $confdir;
--e '/root/.mdkupdate' and system "/bin/mv", "/root/.mdkupdate", $conffile;
+-e '/root/.mgaupdate' and system "/bin/mv", "/root/.mgaupdate", $conffile;
 
 
 sub usage() {
-    print STDERR N("mdkupdate version %s
+    print STDERR N("mgaupdate version %s
 Copyright (C) %s Mandriva.
+Copyright (C) %s Mageia.
 This is free software and may be redistributed under the terms of the GNU GPL.
 
 usage:
-", $CLIENT_VERSION, $YEARS) . N("  --help		- print this help message.
-") . N("  --auto		- Mandriva Update launched automatically.
+", $CLIENT_VERSION, $YEARS, $MGA_YEARS) . N("  --help		- print this help message.
+") . N("  --auto		- Mageia Update launched automatically.
 ") . N("  --mnf			- launch mnf specific scripts.
-") . N("  --noX			- text mode version of Mandriva Update.
+") . N("  --noX			- text mode version of Mageia Update.
 ") . N("  --debug			- log what is done
 ");
     exit(0);
@@ -85,8 +87,8 @@ GetOptions(%options);
 
 my $ret = update_pkgs();
 if ($ret != 1) {
-    output_p($logfile, "[mdkupdate] Error 100: Packages failed to upgrade");
-    log::explanations("[mdkupdate] Error 100: Packages failed to upgrade");
+    output_p($logfile, "[mgaupdate] Error 100: Packages failed to upgrade");
+    log::explanations("[mgaupdate] Error 100: Packages failed to upgrade");
 }
 clean_dir();
 
@@ -97,11 +99,11 @@ sub update_pkgs {
 	run_program::raw({ timeout => 'never' }, '/usr/sbin/urpmi', '--auto-update', '--auto', '--keep', '--update', map { if_(/(.*)-[^-]*-[^-]*\.[^-.]*?\.rpm$/, $1) } @pkgs);
 	$? == 0 or die N("Unable to update packages from update_source medium.\n");
     };
-    $@ and output_p($logfile, "[mdkupdate] Error 99: $@"), return 0;
+    $@ and output_p($logfile, "[mgaupdate] Error 99: $@"), return 0;
     return 1;
 }
 
 sub clean_dir() {
-    mdkonline::clean_confdir();
+    mgaonline::clean_confdir();
     output_p($logfile, 'OK');
 }
diff --git a/pam.mdkonline b/pam.mgaonline
index bc9a8d61..bc9a8d61 100644
--- a/pam.mdkonline
+++ b/pam.mgaonline
diff --git a/po/Makefile b/po/Makefile
index 1ed7b9fe..0db50a50 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,7 +1,7 @@
 # Installation directories
 localedir = $(PREFIX)/usr/share/locale
 
-PGOAL = mdkonline
+PGOAL = mgaonline
 
 PL_FILES = $(shell cat POTFILES.in | sed 's,^,../,' )
 POFILES = $(shell ls *.po)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8af7ffeb..c1e654a6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
-mdkupdate
-mdkapplet-config
-mdkapplet-add-media-helper
-mdkapplet
-mdkapplet_gui.pm
-mdkapplet_urpm.pm
-mdkonline.pm
+mgaupdate
+mgaapplet-config
+mgaapplet-add-media-helper
+mgaapplet
+mgaapplet_gui.pm
+mgaapplet_urpm.pm
+mgaonline.pm
diff --git a/po/af.po b/po/af.po
index ec3a0639..b13ade43 100644
--- a/po/af.po
+++ b/po/af.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-af\n"
+"Project-Id-Version: mgaonline-af\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2004-02-27 21:12+0200\n"
@@ -32,8 +32,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
-msgstr "Vir enige probleem stuur 'n e-pos na support@mandrivaonline.com\n"
+"support@mageiaonline.com"
+msgstr "Vir enige probleem stuur 'n e-pos na support@mageiaonline.com\n"
 
 #: ../mdkapplet:90
 #, c-format
@@ -47,7 +47,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -152,7 +152,7 @@ msgstr ""
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -162,7 +162,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -210,7 +210,7 @@ msgstr "Kanselleer"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -221,8 +221,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux Online Span"
+msgid "Mageia Linux"
+msgstr "Mageia Linux Online Span"
 
 #: ../mdkapplet:526
 #, c-format
@@ -284,7 +284,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -304,17 +304,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -383,7 +383,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -416,7 +416,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr "'n Fout het voorgekom"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -510,15 +510,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux Online Span"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux Online Span"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -567,33 +567,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Linux Online Span"
+msgid "Mageia Free"
+msgstr "Mageia Linux Online Span"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Linux Online Span"
+msgid "Mageia Mini"
+msgstr "Mageia Linux Online Span"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -611,14 +611,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"Kopiereg (C) %s Mageia.\n"
 "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
 "GPL.\n"
 "\n"
@@ -631,8 +631,8 @@ msgstr "  --help\t\t- druk hierdie help boodskap.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --applet\t\t- loods Mandriva Update.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --applet\t\t- loods Mageia Update.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -641,8 +641,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - loods Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - loods Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -656,7 +656,7 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Linux Online Span"
+#~ msgstr "Mageia Linux Online Span"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -685,8 +685,8 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Konneksie probleem"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux Updates Applet"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -807,8 +807,8 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgstr "Verkeerde wagwoord\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Welkom by Mandriva Online"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Welkom by Mageia Online"
 
 #, fuzzy
 #~ msgid "No check"
@@ -822,14 +822,14 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline uitgawe %s\n"
-#~ "Kopiereg (C) %s Mandriva.\n"
+#~ "Kopiereg (C) %s Mageia.\n"
 #~ "Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
 #~ "GPL.\n"
 #~ "\n"
@@ -847,8 +847,8 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ "(pakkette, hardeware konfigurasie) na 'n sentrale databasis sodat\n"
 #~ "jy op datum gehou kan word met sekuriteit en ander waardevolle nuus.\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Sleutel in jou Mandriva Online inteken, wagwoord, en masjiennaam:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Sleutel in jou Mageia Online inteken, wagwoord, en masjiennaam:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -865,14 +865,14 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgstr "Hegpunte kan slegs alfa-numeriese karakters bevat"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Welkom by Mandriva Online"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Welkom by Mageia Online"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -887,10 +887,10 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Om jou die beste Mandriva Online diens te lewer,\n"
+#~ "Om jou die beste Mageia Online diens te lewer,\n"
 #~ "gaan ons nou jou konfigurasie oplaai.\n"
 #~ "\n"
-#~ "Die assistent sal die volgende inligting stuur na Mandriva:\n"
+#~ "Die assistent sal die volgende inligting stuur na Mageia:\n"
 #~ "\n"
 #~ "1) Lys van pakkette wat jy geinstalleer het op jou stelsel,\n"
 #~ "\n"
@@ -905,8 +905,8 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgid "Connection problem"
 #~ msgstr "Konneksie probleem"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Skep 'n Mandriva Online Rekening"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Skep 'n Mageia Online Rekening"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -946,16 +946,16 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Van nou af sal jy sekuritiets en opgradeerings nuus kry\n"
-#~ "vanaf Mandriva Online."
+#~ "vanaf Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online gee jou die vermoë op die opgradeerings te automatiseer.\n"
+#~ "Mageia Online gee jou die vermoë op die opgradeerings te automatiseer.\n"
 #~ "'n Program sal gereeld op jou stelsel loop en wag vir nuwe opgradeerings\n"
 
 #, fuzzy
@@ -966,15 +966,15 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Lees konfigurasie\n"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- loods Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- loods Mageia Update.\n"
 
 #~ msgid "Sending configuration..."
 #~ msgstr "Stuur konfigurasie..."
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update kon nie die webruimte kontak nie, ons sal weer probeer"
+#~ "Mageia Update kon nie die webruimte kontak nie, ons sal weer probeer"
 
 #~ msgid "Login:"
 #~ msgstr "Inteken:"
@@ -989,17 +989,17 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "You intekennaam of wagwoord was verkeerd.\n"
-#~ "Of jy moet dit weer intik, of jy moet 'n rekening skep by Mandriva "
+#~ "Of jy moet dit weer intik, of jy moet 'n rekening skep by Mageia "
 #~ "Online.\n"
 #~ "Indien laasgenoemde, gaan terug na die eerste stap om te konnekteer na\n"
-#~ "Mandriva Online. Hou ingedagte dat jy ook 'n Masjiennaam sal moet "
+#~ "Mageia Online. Hou ingedagte dat jy ook 'n Masjiennaam sal moet "
 #~ "spesifiseer\n"
 #~ "(net alfabetiese karakters word toegelaat)"
 
@@ -1034,15 +1034,15 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgid "Previous"
 #~ msgstr "Vorige"
 
-#~ msgid "Welcome to Mandriva Online"
-#~ msgstr "Welkom by Mandriva Online"
+#~ msgid "Welcome to Mageia Online"
+#~ msgstr "Welkom by Mageia Online"
 
 #, fuzzy
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "Ek het nie 'n Mandriva Online rekening nie en ek wil "
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "Ek het nie 'n Mageia Online rekening nie en ek wil "
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Mandriva Linux se Privaatheidsbeleid"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Mageia Linux se Privaatheidsbeleid"
 
 #~ msgid "Authentification"
 #~ msgstr "Identifikasie"
@@ -1060,9 +1060,9 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgstr "Beëndig Assistent\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
+#~ "Mageia Online could not be contacted, please try again at a later time"
 #~ msgstr ""
-#~ "Mandriva Update kon nie die webruimte kontak nie, ons sal weer probeer"
+#~ "Mageia Update kon nie die webruimte kontak nie, ons sal weer probeer"
 
 #~ msgid "Skip Wizard"
 #~ msgstr "Verlaar Wysgeer"
@@ -1070,8 +1070,8 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgid "Subscribe"
 #~ msgstr "Inskryf"
 
-#~ msgid "Launch Mandriva Linux Update"
-#~ msgstr "Loods \"Mandriva Linux Update\""
+#~ msgid "Launch Mageia Linux Update"
+#~ msgstr "Loods \"Mageia Linux Update\""
 
 #~ msgid "Available"
 #~ msgstr "Beskikbaar"
@@ -1096,8 +1096,8 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgstr "Bediener probleem"
 
 #, fuzzy
-#~ msgid "Launching Mandriva Update\n"
-#~ msgstr "Loods \"Mandriva Linux Update\""
+#~ msgid "Launching Mageia Update\n"
+#~ msgstr "Loods \"Mageia Linux Update\""
 
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Ja ek soek automatiese nuus"
@@ -1108,8 +1108,8 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgid "About Online Applet"
 #~ msgstr "Omtrent \"Online Applet\""
 
-#~ msgid "Mandriva Linux Update Notification Applet"
-#~ msgstr "Mandriva Linux Update Notification Applet"
+#~ msgid "Mageia Linux Update Notification Applet"
+#~ msgstr "Mageia Linux Update Notification Applet"
 
 #~ msgid "Team:"
 #~ msgstr "Span:"
@@ -1120,8 +1120,8 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgid "Version:"
 #~ msgstr "Weergawe:"
 
-#~ msgid "Start Mandriva Update"
-#~ msgstr "Begin \"Mandriva Update\""
+#~ msgid "Start Mageia Update"
+#~ msgstr "Begin \"Mageia Update\""
 
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - gebruik net sekuriteit media.\n"
@@ -1130,10 +1130,10 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgstr "  -v             - woordryke modus.\n"
 
 #~ msgid ""
-#~ "You need to have an account on Mandriva Online, or update your "
+#~ "You need to have an account on Mageia Online, or update your "
 #~ "subscription."
 #~ msgstr ""
-#~ "Jy sal 'n rekening by Mandriva Online moet hê, of jou subskripsie "
+#~ "Jy sal 'n rekening by Mageia Online moet hê, of jou subskripsie "
 #~ "opdateer."
 
 #~ msgid "Your login or password may be wrong"
@@ -1188,13 +1188,13 @@ msgstr "Kon nie pakette vanaf update_source media opgradeer nie.\n"
 #~ msgstr "Reg"
 
 #~ msgid ""
-#~ "Do you really want to abort Mandriva Online?\n"
+#~ "Do you really want to abort Mageia Online?\n"
 #~ "To return to the Wizard press 'Cancel',\n"
 #~ "to really quit it press 'Quit'."
 #~ msgstr ""
-#~ "Wil jy rerig Mandriva Online staak?\n"
+#~ "Wil jy rerig Mageia Online staak?\n"
 #~ "Om terug te keer na die Assistent, kliek 'Kanselleer',\n"
 #~ "om rerig te staak, kliek 'Eindig'."
 
-#~ msgid "Really abort? - Mandriva Online"
-#~ msgstr "Rerig staak? - Mandriva Online"
+#~ msgid "Really abort? - Mageia Online"
+#~ msgstr "Rerig staak? - Mageia Online"
diff --git a/po/am.po b/po/am.po
index 65474f50..b8836ace 100644
--- a/po/am.po
+++ b/po/am.po
@@ -28,7 +28,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 
 #: ../mdkapplet:90
@@ -43,7 +43,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -143,7 +143,7 @@ msgstr ""
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -153,7 +153,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -201,7 +201,7 @@ msgstr "ተወው"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -212,7 +212,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr ""
 
 #: ../mdkapplet:526
@@ -275,7 +275,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -295,17 +295,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr ""
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -374,7 +374,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -407,7 +407,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -440,7 +440,7 @@ msgstr "ስህተት ተፈጥሯል"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -501,15 +501,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -558,33 +558,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr ""
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -602,7 +602,7 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -616,7 +616,7 @@ msgstr ""
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
 #: ../mdkupdate:66
@@ -626,7 +626,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
 #: ../mdkupdate:68
@@ -641,7 +641,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Installation failed"
diff --git a/po/ar.po b/po/ar.po
index 5e6ee068..43a0d602 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@
 # Yaser Ammar <linux.uae@gawab.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2009-11-26 16:15+0100\n"
@@ -35,10 +35,10 @@ msgstr "نظامك محدّث"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "مشكلة في ضبط الخدمة. رجاء تحقّق من السجلّ وأرسل رسالة "
-"إلىsupport@mandrivaonline.com"
+"إلىsupport@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -52,7 +52,7 @@ msgstr "هناك تحديثات متوفّرة لنظامك"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr "يتوفر إصدار جديد من توزيعة لينكس ماندريفا"
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -157,7 +157,7 @@ msgstr "يُقدح drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr "إصدار جديد من توزيعة لينكس ماندريفا"
 
 #: ../mdkapplet:464
@@ -167,7 +167,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr "أُطلق إصدار جديد من توزيعة لينكس ماندريفا."
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -215,7 +215,7 @@ msgstr "ألغِ"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "ماندريفا أونلاين %s"
 
 #: ../mdkapplet:526
@@ -293,8 +293,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "محدّث ماندريفا (MandrivaUpdate) يُقدح\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "محدّث ماندريفا (MageiaUpdate) يُقدح\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -313,17 +313,17 @@ msgstr "فحص الشّبكة: تبدو معطّلة\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr "ماندريفا أونلاين %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr "حقوق النشر (C) %s لماندريفا"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr "ماندريفا أونلاين تقدم وصولا إلى خدمات ماندريفا على الشبكة"
 
 #: ../mdkapplet:899
@@ -397,7 +397,7 @@ msgstr "هل تريد تثبيت مستودع البرامج الإضافي هذ
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -430,7 +430,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -463,7 +463,7 @@ msgstr "حدث خطأ"
 
 #: ../mdkapplet-add-media-helper:200
 #, fuzzy, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
 
 #: ../mdkapplet-add-media-helper:226
@@ -524,14 +524,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "ماندريفا أونلاين %s"
 
 #: ../mdkapplet_gui.pm:213
@@ -581,33 +581,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "ماندريفا أونلاين %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "ماندريفا أونلاين %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "ماندريفا أونلاين %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "ماندريفا أونلاين %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr "ماندريفا بَور باك"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -625,7 +625,7 @@ msgstr "ترقية التوزيعة"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -644,7 +644,7 @@ msgstr "  --help\t\t- إظهار رسالة المساعدة هذه.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- تشغيل برنامج تحديث ماندريفا تلقائيّاً.\n"
 
 #: ../mdkupdate:66
@@ -654,7 +654,7 @@ msgstr "  --mnf\t\t\t- تشغيل مسطورات mnf معينة.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- الوضع النصي من برنامج تحديث ماندريفا.\n"
 
 #: ../mdkupdate:68
@@ -675,7 +675,7 @@ msgstr "لا يمكن تحديث الحزم من وسيط التحديث.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
 
@@ -688,7 +688,7 @@ msgstr "لا يمكن تحديث الحزم من وسيط التحديث.\n"
 #~ msgstr "موقع ماندريفا على الإنترنت"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr "حسابك في ماندريفا لا يتضمن اشتراك تنزيل بَور باك مفعلاً."
 
@@ -709,7 +709,7 @@ msgstr "لا يمكن تحديث الحزم من وسيط التحديث.\n"
 #~ msgid "Congratulations"
 #~ msgstr "تهانينا"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgid "Upgrade to Mageia %s release was successfull."
 #~ msgstr "نجحت الترقية إلى إصدار ماندريفا %s"
 
 #~ msgid "You must restart your system."
@@ -733,6 +733,6 @@ msgstr "لا يمكن تحديث الحزم من وسيط التحديث.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr "أُطلق إصدار جديد من توزيعة لينكس ماندريفا."
diff --git a/po/ast.po b/po/ast.po
index 25e66e4d..25470c92 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline_es\n"
+"Project-Id-Version: mgaonline_es\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-01-28 18:05+0100\n"
@@ -29,10 +29,10 @@ msgstr "El sistema ta anováu a día de güei"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problema de configuración del serviciu. Por favor verifica los ficheros de "
-"rexistru y unvie un corréu a support@mandrivaonline.com"
+"rexistru y unvie un corréu a support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -46,8 +46,8 @@ msgstr "Hai nuevos anovamientos disponibles pal sistema"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Foi llanzáu una nueva versión de Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Foi llanzáu una nueva versión de Mageia Linux"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -158,8 +158,8 @@ msgstr "Llanzando drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nueva versión de Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nueva versión de Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -168,8 +168,8 @@ msgstr "Restolar"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Una nueva versión de Mandriva Linux ta disponible"
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Una nueva versión de Mageia Linux ta disponible"
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -216,10 +216,10 @@ msgstr "Encaboxar"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Finó'l caltenimientu del sistema Mandriva Linux. Esto significa que nun "
+"Finó'l caltenimientu del sistema Mageia Linux. Esto significa que nun "
 "recibirás nengún anovamientu nuevu de software."
 
 #: ../mdkapplet:514
@@ -229,8 +229,8 @@ msgstr "Pa caltener el to sistema seguru, puedes:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -301,8 +301,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Llanzando MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Llanzando MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -321,18 +321,18 @@ msgstr "Verificando rede: paez tar desactivada\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandiva Online da accesu a los servicios web de Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mandiva Online da accesu a los servicios web de Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -402,8 +402,8 @@ msgstr "¿Quies amestar esti repositoriu de programes adicionales?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -435,7 +435,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -468,8 +468,8 @@ msgstr "Hebo un fallu"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "La to cuenta de Mandriva nun tien soscripción pa baxar %s "
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "La to cuenta de Mageia nun tien soscripción pa baxar %s "
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -529,15 +529,15 @@ msgstr "Empresa"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -586,33 +586,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -630,14 +630,14 @@ msgstr "Anovamientu de la Distribución"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versión %s\n"
-"Copyright © %s Mandriva.\n"
+"Copyright © %s Mageia.\n"
 "Esto ye software llibre y puede volver a ser distribuyíu embaxo los términos "
 "de la GNU GPL.\n"
 "\n"
@@ -650,8 +650,8 @@ msgstr "  --help\t\t- amosar esti mensax d'aida.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update llanzáu automáticamente.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update llanzáu automáticamente.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -660,8 +660,8 @@ msgstr "  --mnf\t\t\t- lanzar scripts específicos mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update en versión testu.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update en versión testu.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -681,22 +681,22 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "La to cuenta de Mandriva nun tien soscripción pa baxar %s "
+#~ msgstr "La to cuenta de Mageia nun tien soscripción pa baxar %s "
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Descripción de la máquina:"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "La cuenta de Mandriva nun tien soscripción pa baxar el Powerpack "
+#~ msgstr "La cuenta de Mageia nun tien soscripción pa baxar el Powerpack "
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -715,8 +715,8 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Felicidaes"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Anovamientu pa Mandriva %s fináu con ésitu."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Anovamientu pa Mageia %s fináu con ésitu."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Tienes que reaniciar el sistema."
@@ -740,9 +740,9 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Una nueva versión de Mandriva Linux ta disponible"
+#~ msgstr "Una nueva versión de Mageia Linux ta disponible"
 
 #, fuzzy
 #~ msgid "You are using '%s' distribution."
@@ -757,9 +757,9 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgid "No"
 #~ msgstr "No"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online paez haber sido reinstalado, volviendo a cargar applet..."
+#~ "Mageia Online paez haber sido reinstalado, volviendo a cargar applet..."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Verificando... Están disponibles actualizaciones\n"
@@ -773,8 +773,8 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Conectando con"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Applet Mandriva Linux Update"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Applet Mageia Linux Update"
 
 #~ msgid "Security error"
 #~ msgstr "Error de seguridad"
@@ -831,7 +831,7 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgstr "Error del serviciu"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
 #~ "Los servicios web de mandriva tan inaccesibles de intre\n"
@@ -841,7 +841,7 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgstr "Les contraseñas no concasen"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
 #~ "Los servicios web de mandriva tan en caltenimientu\n"
@@ -850,13 +850,13 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgid "User Forbidden"
 #~ msgstr "Nome de usuariu prohibido"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Cuenta de usuariu prohibida polos servicios web de Mandriva"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Cuenta de usuariu prohibida polos servicios web de Mageia"
 
 #~ msgid "Connection error"
 #~ msgstr "Error de conexón"
 
-#~ msgid "Mandriva web services not reachable"
+#~ msgid "Mageia web services not reachable"
 #~ msgstr "Los servicios web de mandriva tan inaccesibles de intre"
 
 #~ msgid ""
@@ -889,12 +889,12 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "La versión del veceru Mandriva Online es enforma antigua.\n"
+#~ "La versión del veceru Mageia Online es enforma antigua.\n"
 #~ "\n"
 #~ "Necesita anovar a una nueva versión. Puede obtenerla de http://start."
 #~ "mandriva.com"
@@ -960,9 +960,9 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Estáu desconocíu"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Servicios en llinia deshabilitaos. Contacte al sitiu Mandriva Online\n"
+#~ "Servicios en llinia deshabilitaos. Contacte al sitiu Mageia Online\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Contraseña incorrecta\n"
@@ -984,8 +984,8 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ "Un problema ocurrió durante la conexón col sirvidor, por favor, póngase "
 #~ "en contacto col equipu de apoyo"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Rempuesta dende el sirvidor de Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Rempuesta dende el sirvidor de Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Sin verificación"
@@ -1001,14 +1001,14 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versión %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Esti es software llibre y puede volver a ser distribuido baxo los "
 #~ "términos de la GNU GPL.\n"
 #~ "\n"
@@ -1059,9 +1059,9 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Creación de cuentas o autentificación"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Introduza su nome de usuariu, contraseña y nome de máquina de Mandriva "
+#~ "Introduza su nome de usuariu, contraseña y nome de máquina de Mageia "
 #~ "Online:"
 
 #~ msgid "Email address:"
@@ -1080,14 +1080,14 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgstr ""
 #~ "El nome de máquina puede namái caltener de 1 a 40 carauteres alfanuméricos"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Conectando al sitiu web Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Conectando al sitiu web Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1102,10 +1102,10 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Parar beneficiase de los servicios de Mandriva Online,\n"
+#~ "Parar beneficiase de los servicios de Mageia Online,\n"
 #~ "vamos a tresferir su configuración.\n"
 #~ "\n"
-#~ "El asistente enviará agora la siguiente información a Mandriva:\n"
+#~ "El asistente enviará agora la siguiente información a Mageia:\n"
 #~ "\n"
 #~ "1) los paquetes que tien instalados en su sistema.\n"
 #~ "\n"
@@ -1125,8 +1125,8 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgstr ""
 #~ "Ocurrieron problemes al unviar ficheros, por favor intentelo de nuevu"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Criar una cuenta en Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Criar una cuenta en Mageia Online"
 
 #~ msgid "Greeting:"
 #~ msgstr "Tratamiento:"
@@ -1157,10 +1157,10 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgstr "¡Falló la cración de la cuenta!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Cuenta de Mandriva Online creada con éxito.\n"
+#~ "Cuenta de Mageia Online creada con éxito.\n"
 #~ "Por favor, calca \"Siguiente\" pa autentificase y unviar su "
 #~ "configuración\n"
 
@@ -1169,22 +1169,22 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Dende agora, recibirá anuncions de seguridad\n"
-#~ "y actualizaciones gracias a Mandriva Online."
+#~ "y actualizaciones gracias a Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online le ufierta la posibilidad de automatizar les "
+#~ "Mageia Online le ufierta la posibilidad de automatizar les "
 #~ "actualizaciones.\n"
 #~ "Se ejecutará regularmente un programa  en su sistema a la espera de "
 #~ "nueves actualizaciones\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Su cuenta de Mandriva Online se ha configuráu con éxito\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Su cuenta de Mageia Online se ha configuráu con éxito\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Configuración enviada con éxito"
@@ -1193,7 +1193,7 @@ msgstr "Nun pudieron anovase los paquetes dende'l mediu update_source.\n"
 #~ msgstr "Problema enviando la configuración"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "No se pudo coneutar col sitiu web de mandrivaonline: nome de usuariu/"
diff --git a/po/az.po b/po/az.po
index 81b616d9..1a5a251e 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-az\n"
+"Project-Id-Version: mgaonline-az\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2004-09-12 19:12+0300\n"
@@ -32,10 +32,10 @@ msgstr "Sisteminiz yenidir"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Xidmət qurğu xətası. Xahiş edirik qeydlərdəki xətanı tapın və "
-"support@mandrivaonline.com ünvanına məktub göndərin."
+"support@mageiaonline.com ünvanına məktub göndərin."
 
 #: ../mdkapplet:90
 #, c-format
@@ -49,7 +49,7 @@ msgstr "Sisteminiz üçün yeniləmələr mövcuddur"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -156,7 +156,7 @@ msgstr "Drakconnect başladılır\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -166,7 +166,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -214,7 +214,7 @@ msgstr "Ləğv et"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -288,8 +288,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate başladılır\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate başladılır\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -308,17 +308,17 @@ msgstr "Şəbəkə Yoxlanır: deyəsən qeyri-fəaldır\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -387,7 +387,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -420,7 +420,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -453,7 +453,7 @@ msgstr "Bir xəta oldu"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -514,15 +514,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -571,33 +571,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -615,14 +615,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate buraxılış %s\n"
-"Tə'lif Hüququ (C) %s Mandriva.\n"
+"Tə'lif Hüququ (C) %s Mageia.\n"
 "Bu sərbəst proqram tə'minatıdır və GNU GPL şərtləri altında paylana bilər.\n"
 "\n"
 "istifadə qaydası:\n"
@@ -634,8 +634,8 @@ msgstr "  --help\t\t- bu yardım ismarışını göstər.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update launched automatically.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -644,8 +644,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - launch Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - launch Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -659,7 +659,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -693,8 +693,8 @@ msgstr ""
 #~ msgid "No"
 #~ msgstr "Xeyir"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-#~ msgstr "Mandriva Online yenidən qurulub, applet yenidən yüklənir ..."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
+#~ msgstr "Mageia Online yenidən qurulub, applet yenidən yüklənir ..."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Yoxlanır... Yeniləmələr mövcuddur\n"
@@ -706,8 +706,8 @@ msgstr ""
 #~ msgid "Connecting to"
 #~ msgstr "Bağlanır"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux Yeniləmələr Appleti"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux Yeniləmələr Appleti"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -830,8 +830,8 @@ msgstr ""
 #~ msgid "Unknown state"
 #~ msgstr "Naməlum vəziyyət"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Online xidmətlər qeyri-fəaldır. Mandriva Online ilə əlaqə qurun\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Online xidmətlər qeyri-fəaldır. Mageia Online ilə əlaqə qurun\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Səhv Şifrə.\n"
@@ -847,8 +847,8 @@ msgstr ""
 #~ "qurğularınızı yoxlayın)\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Mandriva Online-a Xoş Gəldiniz"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Mageia Online-a Xoş Gəldiniz"
 
 #~ msgid "No check"
 #~ msgstr "Yoxlama"
@@ -864,14 +864,14 @@ msgstr ""
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline buraxılış %s\n"
-#~ "Tə'lif Hüququ (C) %s Mandriva.\n"
+#~ "Tə'lif Hüququ (C) %s Mageia.\n"
 #~ "Bu sərbəst proqram tə'minatıdır və GNU GPL şərtləri altında paylana "
 #~ "bilər.\n"
 #~ "\n"
@@ -894,8 +894,8 @@ msgstr ""
 #~ "sərfəli güncəlləmələri xəbər vermək üçün\n"
 #~ "mərkəzi verilənlər bazasına göndərəcəkdir.\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Mandriva Online giriş adı, parolunuzu və kompüter adını girin:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Mageia Online giriş adı, parolunuzu və kompüter adını girin:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -912,14 +912,14 @@ msgstr ""
 #~ msgstr "Bağlama nöqtələri ancaq alfanumerik hərf daxil edə bilər"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Mandriva Online-a Xoş Gəldiniz"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Mageia Online-a Xoş Gəldiniz"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -934,10 +934,10 @@ msgstr ""
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Mandriva Online xitmətlərindən faydalanmağınıza ikan vermək üçün,\n"
+#~ "Mageia Online xitmətlərindən faydalanmağınıza ikan vermək üçün,\n"
 #~ "sizin qurğularınızı mərkəzə göndərməliyik.\n"
 #~ "\n"
-#~ "Sehirbaz indi aşağıdakı məlumatları Mandriva vericimizə göndərəcəkdir:\n"
+#~ "Sehirbaz indi aşağıdakı məlumatları Mageia vericimizə göndərəcəkdir:\n"
 #~ "\n"
 #~ "1) sistemə qurulu paketlər,\n"
 #~ "\n"
@@ -958,8 +958,8 @@ msgstr ""
 #~ "Fayllar göndərilirkən xəta yaranır, xahiş edirik daha sonra yenidən "
 #~ "sınayın"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Online Hesabı Yaradılır"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Online Hesabı Yaradılır"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -994,16 +994,16 @@ msgstr ""
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "İndidən etibarən Mandriva Online vasitəsilə güncəlləmə və\n"
+#~ "İndidən etibarən Mageia Online vasitəsilə güncəlləmə və\n"
 #~ "təhlükəsizlik elanları alacaqsınız."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online sizə avtokatik güncəlləmə imkanı verir.\n"
+#~ "Mageia Online sizə avtokatik güncəlləmə imkanı verir.\n"
 #~ "Proqram sürəkli olaraq sisteminizdə yeni göncəlləmələri gözləyəcək "
 #~ "şəkildə işləyəcəkdir\n"
 
@@ -1015,8 +1015,8 @@ msgstr ""
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Qurğularınız oxunur\n"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- launch Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Sistem məşğuldur. Xahiş edirik gözləyin..."
@@ -1025,9 +1025,9 @@ msgstr ""
 #~ msgstr "Qurğular yollanır..."
 
 #, fuzzy
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Online ilə əlaqə qurula bilmədi, xahiş edirik daha sonra sınayın"
+#~ "Mageia Online ilə əlaqə qurula bilmədi, xahiş edirik daha sonra sınayın"
 
 #~ msgid "Login:"
 #~ msgstr "Giriş Adı:"
@@ -1042,16 +1042,16 @@ msgstr ""
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Sizin giriş adınız və ya parolunuz səhvdir.\n"
-#~ " Ya yenidən yazmalısınız, ya da Mandriva Online xitmətlərində yeni  hesab "
+#~ " Ya yenidən yazmalısınız, ya da Mageia Online xitmətlərində yeni  hesab "
 #~ "açın.\n"
-#~ " Son halda Mandriva Online xitmətinə bağlanmaq üçün dala gedin.\n"
+#~ " Son halda Mageia Online xitmətinə bağlanmaq üçün dala gedin.\n"
 #~ " Yaddan çıxartmayın ki, ayrıca KOMPÜTER adını \n"
 #~ " girməlisiniz (təkcə hərflərə icazə verilir)"
 
@@ -1072,11 +1072,11 @@ msgstr ""
 #~ msgstr "Əvvəlki"
 
 #, fuzzy
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "Mandriva Online hesabım yoxdur və olmasını istəyirəm "
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "Mageia Online hesabım yoxdur və olmasını istəyirəm "
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Mandriva Linux Mülkiyyət Siyasəti"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Mageia Linux Mülkiyyət Siyasəti"
 
 #~ msgid "Authentification"
 #~ msgstr "Tanıtma"
@@ -1094,9 +1094,9 @@ msgstr ""
 #~ msgstr "Sehirbazdan Çıxılır\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
+#~ "Mageia Online could not be contacted, please try again at a later time"
 #~ msgstr ""
-#~ "Mandriva Online ilə əlaqə qurula bilmədi, xahiş edirik daha sonra sınayın"
+#~ "Mageia Online ilə əlaqə qurula bilmədi, xahiş edirik daha sonra sınayın"
 
 #~ msgid "  --update        - Update keys\n"
 #~ msgstr "  --update        - Update keys\n"
diff --git a/po/be.po b/po/be.po
index d5af05ce..6c40e215 100644
--- a/po/be.po
+++ b/po/be.po
@@ -28,7 +28,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 
 #: ../mdkapplet:90
@@ -43,7 +43,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -143,7 +143,7 @@ msgstr ""
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -153,7 +153,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -201,7 +201,7 @@ msgstr "Адмена"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -212,7 +212,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr ""
 
 #: ../mdkapplet:526
@@ -275,7 +275,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -295,17 +295,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr ""
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -374,7 +374,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -407,7 +407,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -440,7 +440,7 @@ msgstr ""
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -501,14 +501,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr ""
 
 #: ../mdkapplet_gui.pm:213
@@ -558,33 +558,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr ""
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr ""
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr ""
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr ""
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr ""
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -602,7 +602,7 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -616,7 +616,7 @@ msgstr ""
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
 #: ../mdkupdate:66
@@ -626,7 +626,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
 #: ../mdkupdate:68
diff --git a/po/bg.po b/po/bg.po
index d9f14d67..9cc1f41b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-bg\n"
+"Project-Id-Version: mgaonline-bg\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-10-21 19:34+0300\n"
@@ -33,10 +33,10 @@ msgstr "Вашата система е обновена"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Проблем в конфигурация на услуга. Моля проверете журналните файлове и "
-"изпратете е-поща на support@mandrivaonline.com"
+"изпратете е-поща на support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -52,7 +52,7 @@ msgstr "Налични са актуализации за вашата сист�
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -158,7 +158,7 @@ msgstr "Стартиране на drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -168,7 +168,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -216,7 +216,7 @@ msgstr "Отказ"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -227,8 +227,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -290,8 +290,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Стартиране на MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Стартиране на MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -310,17 +310,17 @@ msgstr "Проверка на мрежата: изглежда забранен�
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -389,7 +389,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -422,7 +422,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -455,7 +455,7 @@ msgstr "Появи се грешка"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -516,15 +516,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -573,33 +573,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -617,14 +617,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate версия %s\n"
-"Mandriva %s, всички права запазени.\n"
+"Mageia %s, всички права запазени.\n"
 "Това е свободен софтуер и може да бъде разпространяван според условията на "
 "GNU GPL.\n"
 "\n"
@@ -637,8 +637,8 @@ msgstr " --help\t\t- показва това помощно съобщение.\
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- стартира автоматично Mandriva Update.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- стартира автоматично Mageia Update.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -647,8 +647,8 @@ msgstr "  --mnf\t\t\t- стартиране на mnf скриптове.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- обновяване на Mandriva в текстов режим.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- обновяване на Mageia в текстов режим.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -662,7 +662,7 @@ msgstr "Не е възможна актуализацията на пакети�
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -696,8 +696,8 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgid "No"
 #~ msgstr "Не"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-#~ msgstr "Mandriva Online може би е преинсталиран, презареждане на аплета...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
+#~ msgstr "Mageia Online може би е преинсталиран, презареждане на аплета...."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Проверка... Налични са актуализации\n"
@@ -709,8 +709,8 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgid "Connecting to"
 #~ msgstr "Свързване с"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Аплет за актуализации на Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Аплет за актуализации на Mageia Linux"
 
 #~ msgid "Security error"
 #~ msgstr "Грешка в сигурността"
@@ -764,33 +764,33 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgstr "Грешка в услугата"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Web сървъра на Mandriva в момента е недостъпен\n"
+#~ "Web сървъра на Mageia в момента е недостъпен\n"
 #~ "Опитайте по-късно"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Паролите не съвпадат"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Web сървъра на Mandriva в момента е в профилактика\n"
+#~ "Web сървъра на Mageia в момента е в профилактика\n"
 #~ "Опитайте по-късно"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Забранен потребител"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Потребителският акаунт е забранен от Mandriva web services"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Потребителският акаунт е забранен от Mageia web services"
 
 #~ msgid "Connection error"
 #~ msgstr "Грешка при свързване"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Web сървъра на Mandriva не отговаря"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Web сървъра на Mageia не отговаря"
 
 #~ msgid "Please wait"
 #~ msgstr "Моля изчакайте"
@@ -856,8 +856,8 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgid "Unknown state"
 #~ msgstr "Неизвестно състояние"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Online услугите са забранени. Свържете се с Mandriva Online\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Online услугите са забранени. Свържете се с Mageia Online\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Грешна парола\n"
@@ -879,8 +879,8 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ "Възникнал е проблем при връзка със сървъра, моля свържете се с екипа по "
 #~ "поддръжка"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Отговор от Mandriva Online сървър\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Отговор от Mageia Online сървър\n"
 
 #~ msgid "No check"
 #~ msgstr "Няма проверка"
@@ -896,14 +896,14 @@ msgstr "Не е възможна актуализацията на пакети�
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline версия %s\n"
-#~ "Mandriva %s, всички права запазени.\n"
+#~ "Mageia %s, всички права запазени.\n"
 #~ "Това е свободен софтуер и може да бъде разпространяван според условията "
 #~ "на GNU GPL.\n"
 #~ "\n"
@@ -936,9 +936,9 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgid "Account creation or authentication"
 #~ msgstr "Създаване на регистрация или идентификация"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Въведете вашите Mandriva Online име, парола и псевдоним на машината:"
+#~ "Въведете вашите Mageia Online име, парола и псевдоним на машината:"
 
 #~ msgid "Email address:"
 #~ msgstr "E-mail адрес:"
@@ -952,14 +952,14 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Името на компютъра трябва да бъде между 1 и 40 символа."
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Свързване с Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Свързване с Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -974,10 +974,10 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "За да се възползвате от услугите на Mandriva Online,\n"
+#~ "За да се възползвате от услугите на Mageia Online,\n"
 #~ "трябва да качите Вашата конфигурация.\n"
 #~ "\n"
-#~ "Тази програма ще изпрати следната информация на Mandriva:\n"
+#~ "Тази програма ще изпрати следната информация на Mageia:\n"
 #~ "\n"
 #~ "1) списък с пакетите, които са инсталирани на системата Ви,\n"
 #~ "\n"
@@ -998,8 +998,8 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Възникнал е проблем при изпращане на файловете, опитайте отново"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Създаване на регистрация в Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Създаване на регистрация в Mageia Online"
 
 #~ msgid "Greeting:"
 #~ msgstr "Поздрав:"
@@ -1027,10 +1027,10 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgstr "Невалиден адрес за е-поща!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Успешно е създадена регистрация в Mandriva Online.\n"
+#~ "Успешно е създадена регистрация в Mageia Online.\n"
 #~ "Натиснете \"Напред\" за идентификация и изпращане на конфигурацията\n"
 
 #~ msgid "Your upload was successful!"
@@ -1038,21 +1038,21 @@ msgstr "Не е възможна актуализацията на пакети�
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "От сега нататък, Вие ще получавате информация\n"
-#~ "относно сигурността и новостите, благодарение на Mandriva Online."
+#~ "относно сигурността и новостите, благодарение на Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online Ви предлага автоматизиране на актуализациите.\n"
+#~ "Mageia Online Ви предлага автоматизиране на актуализациите.\n"
 #~ "Програмата ще се пуска периодично на системата Ви и ще следи за "
 #~ "актуализации\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Вашата регистрация в Mandriva Online е успешно конфигурирана\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Вашата регистрация в Mageia Online е успешно конфигурирана\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Конфигурацията е качена успешно"
@@ -1061,14 +1061,14 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgstr "Грешка при качване на конфигурацията"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "Не е възможна връза с mandrivaonline: грешно име/парола или грешно "
 #~ "конфигуриран маршрутизатор/огнена стена"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t-  стартира Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t-  стартира Mageia Update.\n"
 
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "Изберете пакетите, които ще инсталирате и натиснете OK"
@@ -1085,5 +1085,5 @@ msgstr "Не е възможна актуализацията на пакети�
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Файлът %s не е намерен. Първо стартирайте помощникът mdkonline"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update не е успя да се свърже със сайта, опитайте отново."
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update не е успя да се свърже със сайта, опитайте отново."
diff --git a/po/bn.po b/po/bn.po
index ea2993be..30872bf3 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-02-03 20:01+0600\n"
@@ -32,10 +32,10 @@ msgstr "আপনার সিস্টেম আপ-টু-ডেট আছে"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "পরিসেবা (service) কনফিগার করতে সমস্যা হয়েছে। অনুগ্রহ করে লগ গুলো পরীক্ষা করুন এবং "
-"support@mandrivaonline.com এ মেইল করুন"
+"support@mageiaonline.com এ মেইল করুন"
 
 # উপলব্ধ
 #: ../mdkapplet:90
@@ -50,7 +50,7 @@ msgstr "আপনার সিস্টেমের জন্য নতুন �
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -158,7 +158,7 @@ msgstr "drakconnect চালু করা হচ্ছে\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -168,7 +168,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -216,7 +216,7 @@ msgstr "বাতিল"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -227,7 +227,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
 #: ../mdkapplet:526
@@ -290,8 +290,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate চালু করা হচ্ছে\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate চালু করা হচ্ছে\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -310,17 +310,17 @@ msgstr "নেটওয়ার্ক পরীক্ষা করা হচ্ছ
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -389,7 +389,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -422,7 +422,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -455,7 +455,7 @@ msgstr "একটি ত্রুটি সম্পাদিত হয়েছে
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -516,14 +516,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
 #: ../mdkapplet_gui.pm:213
@@ -573,33 +573,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr "ম্যান্ড্রিব অনলাইন"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -617,14 +617,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate version %s\n"
-"কপিরাইট %s Mandriva.\n"
+"কপিরাইট %s Mageia.\n"
 "এই সফ্‌টওয়ারটি ফ্রি এবং গনুহ্‌ (GNU) GPL terms এর মাধ্যমে বিতরণ করা যাবে।\n"
 "\n"
 "ব্যবহার বিধি:\n"
@@ -636,8 +636,8 @@ msgstr " --help\t\t- এই সহায়িকা বার্তা প্র�
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update স্বয়ংক্রিয়ভাবে চালু করা হয়েছে।\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update স্বয়ংক্রিয়ভাবে চালু করা হয়েছে।\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -646,8 +646,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - Mandriva Update চালু করো।\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - Mageia Update চালু করো।\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -699,7 +699,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgid "No"
 #~ msgstr "না"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
 #~ "মনে হচ্ছে ম্যান্ড্রেকঅনলাইন পুনরায় ইনস্টল করা হয়েছে, পুনরায় applet চালানো "
 #~ "হচ্ছে ...."
@@ -714,7 +714,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgid "Connecting to"
 #~ msgstr "এর সাথে সংযোগ করা হচ্ছে"
 
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "ম্যান্ড্রেক আপডেট অ্যাপ্লেট"
 
 #, fuzzy
@@ -843,7 +843,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgid "Unknown state"
 #~ msgstr "অজ্ঞাত অবস্হা"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
 #~ "অনলাইন পরিসেবা নিষ্ক্রিয় করা রয়েছে। ম্যান্ড্রেকঅনলাইন সাইটের সাথে যোগাযোগ করুন\n"
 
@@ -867,7 +867,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ "সার্ভারের সাথে সংযোগের সময় সমস্যা হয়েছে, অনুগ্রহ করে পরিসেবা দলের সাথে "
 #~ "যোগাযোগ করুন"
 
-#~ msgid "Response from Mandriva Online server\n"
+#~ msgid "Response from Mageia Online server\n"
 #~ msgstr "ম্যান্ড্রিব অনলাইন সার্ভারের উত্তর\n"
 
 #~ msgid "No check"
@@ -884,14 +884,14 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline version %s\n"
-#~ "কপিরাইট %s Mandriva.\n"
+#~ "কপিরাইট %s Mageia.\n"
 #~ "এই সফ্‌টওয়ারটি ফ্রি এবং গনুহ্‌ (GNU) GPL terms এর মাধ্যমে বিতরণ করা যাবে।\n"
 #~ "\n"
 #~ "ব্যবহার বিধি:\n"
@@ -926,7 +926,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgid "Account creation or authentication"
 #~ msgstr "একাউন্ট তৈরি অথবা পরিচয় প্রমাণ প্রক্রিয়া"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr "আপনার ম্যান্ড্রেকঅনলাইন লগ-ইন, পাসওয়ার্ড এবং মেশিনের নাম লিখুন:"
 
 #, fuzzy
@@ -943,14 +943,14 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "মাউন্ট পয়েন্টগুলিতে শুধু * অক্ষর থাকবে"
 
-#~ msgid "Connecting to Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
 #~ msgstr "ম্যান্ড্রিব অনলাইন ওয়েবসাইটের সাথে সংযুক্ত হচ্ছি..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -968,7 +968,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ "ম্যান্ড্রেকঅনলাইন-এর পরিসেবা থেকে উপকৃত হওয়ার আশায়,\n"
 #~ "আপনার কনফিগারেশনটি এখন আপলোড করা হবে।\n"
 #~ "\n"
-#~ "উইজার্ডটি নিম্নোক্ত তথ্যগুলো Mandriva-এ এখন প্রেরণ করবে:\n"
+#~ "উইজার্ডটি নিম্নোক্ত তথ্যগুলো Mageia-এ এখন প্রেরণ করবে:\n"
 #~ "\n"
 #~ "১) আপনার সিস্টেমে ইনস্টল করা প্যাকেজের তালিকা,\n"
 #~ "\n"
@@ -987,7 +987,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "ফাইল আপলোড করার সময় সমস্যা হয়েছে, অনুগ্রহ করে পুনরায় চেষ্টা করুন"
 
-#~ msgid "Create a Mandriva Online Account"
+#~ msgid "Create a Mageia Online Account"
 #~ msgstr "ম্যান্ড্রেকঅনলাইনে একটি অ্যাকাউন্ট তৈরি করো"
 
 #, fuzzy
@@ -1019,7 +1019,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgstr "এটি বৈধ ই-মেইল ঠিকানা নয়!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
 #~ "ম্যান্ড্রেকঅনলাইন একাউন্ট সাফল্যের সাথে তৈরি হয়েছে।\n"
@@ -1031,19 +1031,19 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "ম্যান্ড্রেকঅনলাইন-এর জন্য, এখন থেকে আপনি নিরাপত্তা এবং \n"
 #~ "আপডেট সংক্রান্ত ঘোষনাগুলো নিয়মিত পাবেন।"
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
 #~ "ম্যান্ড্রেকঅনলাইন আপনাকে স্বয়ংক্রিয়ভাবে আপডেট পেতে সাহায্য করে।\n"
 #~ "একটি প্রোগ্রাম নুতন আপডেটের অপেক্ষায় আপনার সিস্টেমে নিয়মিত চলবে\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
 #~ msgstr "আপনার ম্যান্ড্রেকঅনলাইন একাউন্ট সাফল্যের সাথে কনফিগার করা হয়েছে\n"
 
 #~ msgid "Configuration uploaded successfully"
@@ -1053,14 +1053,14 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgstr "আপলোড করতে সমস্যা হয়েছে"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "ম্যান্ড্রেকঅনলাইন ওয়েবসাইটের সাথে সংযোগ করা যাচ্ছ না: ভুল লগ-ইন/পাসওয়ার্ড অথবা "
 #~ "রুটার/ফায়ারওয়াল মন্দ বৈশিষ্ট্যাবলী"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- Mandriva Update চালু করো।\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- Mageia Update চালু করো।\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "সিস্টেম বর্তমানে ব্যস্ত রয়েছে। অনুগ্রহ করে অপেক্ষা করুন..."
@@ -1071,7 +1071,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "কোন %s ফাইল পাওয়া যায় নি। mdkonline উইজার্ডটি প্রথমে চালান"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
 #~ "ম্যান্ড্রেকআপডেট সাইটটির সাথে যোগাযোগ করতে পারে নি, আমরা কিছুক্ষণ পর পুনরায় "
 #~ "চেষ্টা করবো।"
@@ -1088,8 +1088,8 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
@@ -1138,10 +1138,10 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgstr "পূর্ববর্তী"
 
 #, fuzzy
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
 #~ msgstr "আমার কোনো ম্যান্ড্রেকানলাইন অ্যাকাউন্ট নেই কিন্তু আমি একটি তৈরি করতে ইচ্ছুক "
 
-#~ msgid "Mandriva Linux Privacy Policy"
+#~ msgid "Mageia Linux Privacy Policy"
 #~ msgstr "ম্যান্ড্রেকলিনাক্স প্রাইভেসি পলিসি"
 
 #~ msgid "Authentification"
@@ -1160,7 +1160,7 @@ msgstr "update_source মাধ্যম থেকে প্যাকেজ আ�
 #~ msgstr "উইজার্ড থেকে প্রস্থান করা হচ্ছে\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
+#~ "Mageia Online could not be contacted, please try again at a later time"
 #~ msgstr ""
 #~ "ম্যান্ড্রেকঅনলাইন-এর সাথে সংযোগ করা সম্ভব হয় নি, অনুগ্রহ করে কিছুক্ষণ পর পুনরায় "
 #~ "চেষ্টা করুন"
diff --git a/po/br.po b/po/br.po
index e3dc97d2..c4c4ecf3 100644
--- a/po/br.po
+++ b/po/br.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-01-27 00:02+0100\n"
@@ -30,7 +30,7 @@ msgstr "Bremañaet eo ho reiziad"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 
 #: ../mdkapplet:90
@@ -45,7 +45,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -145,7 +145,7 @@ msgstr "O loc'hañ drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -155,7 +155,7 @@ msgstr "Furchal"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -203,7 +203,7 @@ msgstr "Nullañ"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -214,8 +214,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -277,8 +277,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "O loc'hañ MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "O loc'hañ MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -297,17 +297,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s gant Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s gant %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -378,7 +378,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -411,7 +411,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -444,7 +444,7 @@ msgstr "Ur fazi zo bet"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -505,15 +505,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -562,33 +562,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -606,14 +606,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
 "GPL.\n"
 "\n"
@@ -626,7 +626,7 @@ msgstr ""
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
 #: ../mdkupdate:66
@@ -636,7 +636,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
 #: ../mdkupdate:68
@@ -651,7 +651,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -744,8 +744,8 @@ msgstr ""
 #~ msgid "Connection error"
 #~ msgstr "Fazi gant ar gevreadenn"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "N'eo ket bet tizhet servijoù gwiad Mandriva"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "N'eo ket bet tizhet servijoù gwiad Mageia"
 
 #~ msgid "Please wait"
 #~ msgstr "Gortozit mar plij"
@@ -790,8 +790,8 @@ msgstr ""
 #~ msgid "Wrong Password.\n"
 #~ msgstr "N'eo ket un tremenger mat.\n"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Respont ar servijer Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Respont ar servijer Mageia Online\n"
 
 #~ msgid "Logs"
 #~ msgstr "Kazetennoù"
@@ -801,14 +801,14 @@ msgstr ""
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
 #~ "GPL.\n"
 #~ "\n"
@@ -832,8 +832,8 @@ msgstr ""
 #~ msgid "Account creation or authentication"
 #~ msgstr "Krouidigezh pe dilesadur ar gont"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Roit hoc'h ereañ, tremenger hag ho anv ardivink Mandriva Online :"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Roit hoc'h ereañ, tremenger hag ho anv ardivink Mageia Online :"
 
 #~ msgid "Email address:"
 #~ msgstr "Chomlec'h postel :"
@@ -847,8 +847,8 @@ msgstr ""
 #~ msgid "(Ex: My Home Office's Computer)"
 #~ msgstr "(ds: Urhziataer burev ma zi)"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "O kevreañ ouzh al lec'hienn Mandriva Online ..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "O kevreañ ouzh al lec'hienn Mageia Online ..."
 
 #~ msgid "Connection problem"
 #~ msgstr "Kudenn ar gevreadenn"
@@ -856,8 +856,8 @@ msgstr ""
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Fazi en ur ezkargañ ar restroù; klaskit adarre mar plij"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Krouiñ ur gont Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Krouiñ ur gont Mageia Online"
 
 #~ msgid "First name:"
 #~ msgstr "Anv-bihan :"
diff --git a/po/bs.po b/po/bs.po
index 85e2fd84..c0fb21c0 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -37,10 +37,10 @@ msgstr "Vaš sistem je up-to-date"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problem kod podešavanja servisa. Provjerite logove i pošaljite mail za "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -54,7 +54,7 @@ msgstr "Nove ispravke su dostupne za vaš sistem"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -160,7 +160,7 @@ msgstr "Pokrećem drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -170,7 +170,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -218,7 +218,7 @@ msgstr "Odustani"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -229,8 +229,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:526
 #, c-format
@@ -292,8 +292,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Pokrećem MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Pokrećem MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -312,18 +312,18 @@ msgstr "Provjeravam mrežu: čini se da je isključena\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Autorska prava (C) %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Autorska prava (C) %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online vam omogućuje pristup Mandriva web uslugama."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online vam omogućuje pristup Mageia web uslugama."
 
 #: ../mdkapplet:899
 #, c-format
@@ -391,7 +391,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -424,7 +424,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -457,7 +457,7 @@ msgstr "Došlo je do greške"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -518,15 +518,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -575,33 +575,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online %s"
+msgid "Mageia Free"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online %s"
+msgid "Mageia Mini"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -619,14 +619,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate verzija %s\n"
-"Autorska prava (C) %s Mandriva.\n"
+"Autorska prava (C) %s Mageia.\n"
 "Ovo je slobodan softver i možete ga distribuirati pod uslovima GNU GPL-a.\n"
 "\n"
 "upotreba:\n"
@@ -638,8 +638,8 @@ msgstr "  --help\t\t- štampa ovu poruku.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update se automatski pokreće.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update se automatski pokreće.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -648,8 +648,8 @@ msgstr "  --mnf\t\t\t- pokreni skripte specifične za mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- tekstualna verzija Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- tekstualna verzija Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -663,7 +663,7 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online %s"
+#~ msgstr "Mageia Online %s"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -700,7 +700,7 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "No"
 #~ msgstr "Ne"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr "Madrakeonline je izgleda ponovo instaliran, pokrećem aplet..."
 
 #~ msgid "Checking... Updates are available\n"
@@ -713,8 +713,8 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Vežem se na"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux aplet sa ispravkama"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux aplet sa ispravkama"
 
 #~ msgid "Security error"
 #~ msgstr "Sigurnosna greška"
@@ -771,33 +771,33 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgstr "Greška u usluzi"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva web servisi su trenutno nedostupni\n"
+#~ "Mageia web servisi su trenutno nedostupni\n"
 #~ "Molim probajte opet kasnije"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Šifre se ne poklapaju"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "U toku je redovno održavanje Mandriva web servisa\n"
+#~ "U toku je redovno održavanje Mageia web servisa\n"
 #~ "Molim probajte opet kasnije"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Korisnik zabranjen"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Korisnički račun je zabranjen na Mandriva web servisima"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Korisnički račun je zabranjen na Mageia web servisima"
 
 #~ msgid "Connection error"
 #~ msgstr "Greška u konekciji"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Mandriva web servisi su nedostupni"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Mageia web servisi su nedostupni"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -829,12 +829,12 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Verzija vašeg Mandriva Online klijenta je prestara.\n"
+#~ "Verzija vašeg Mageia Online klijenta je prestara.\n"
 #~ "\n"
 #~ "Morate nabaviti noviju verziju. Možete je preuzeti sa adrese http://start."
 #~ "mandriva.com"
@@ -899,9 +899,9 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Nepoznato stanje"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Online servisi su isključeni. Kontaktirajte Mandriva Online stranicu\n"
+#~ "Online servisi su isključeni. Kontaktirajte Mageia Online stranicu\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Pogrešna šifra\n"
@@ -923,8 +923,8 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ "Došlo je do problema prilikom spajanja na server, molim kontaktirajte tim "
 #~ "za podršku"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Odgovor sa Mandriva Online servera\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Odgovor sa Mageia Online servera\n"
 
 #~ msgid "No check"
 #~ msgstr "Bez provjere"
@@ -940,14 +940,14 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline verzija %s\n"
-#~ "Autorska prava (C) %s Mandriva.\n"
+#~ "Autorska prava (C) %s Mageia.\n"
 #~ "Ovo je slobodan softver i možete ga distribuirati pod uslovima GNU GPL-"
 #~ "a.\n"
 #~ "\n"
@@ -999,9 +999,9 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Kreiranje računa ili identifikacija"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Upišite svoje Mandriva Online korisničko ime, šifru i naziv računara:"
+#~ "Upišite svoje Mageia Online korisničko ime, šifru i naziv računara:"
 
 #~ msgid "Email address:"
 #~ msgstr "E-mail adresa:"
@@ -1018,14 +1018,14 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Naziv računara mora biti dugačak od 1 do 40 znakova"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Povezujem se sa Mandriva Online web stranicom..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Povezujem se sa Mageia Online web stranicom..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1040,10 +1040,10 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Da bi imali koristi od Mandriva Online servisa,\n"
+#~ "Da bi imali koristi od Mageia Online servisa,\n"
 #~ "mi ćemo poslati vaše postavke.\n"
 #~ "\n"
-#~ "Ovaj će Čarobnjak poslati sljedeće informacije Mandriva-u:\n"
+#~ "Ovaj će Čarobnjak poslati sljedeće informacije Mageia-u:\n"
 #~ "\n"
 #~ "1) listu paketa koje imate instalirane na sistemu,\n"
 #~ "\n"
@@ -1063,8 +1063,8 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Pojavio se problem prilikom slanja datoteka, pokušajte ponovo"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Napravi račun na Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Napravi račun na Mageia Online"
 
 #~ msgid "Greeting:"
 #~ msgstr "Pozdrav:"
@@ -1095,10 +1095,10 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgstr "Pravljenje računa nije uspjelo!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Račun za Mandriva Online je uspješno napravljen.\n"
+#~ "Račun za Mageia Online je uspješno napravljen.\n"
 #~ "Kliknite na \"Dalje\" za identifikaciju i slanje vaših postavki\n"
 
 #~ msgid "Your upload was successful!"
@@ -1106,20 +1106,20 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Od sada ćete primati obavještenja o sigurnosti i\n"
-#~ "ispravkama zahvaljujući Mandriva Online."
+#~ "ispravkama zahvaljujući Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online daje vam priliku da automatizirate ispravke.\n"
+#~ "Mageia Online daje vam priliku da automatizirate ispravke.\n"
 #~ "Program će se pokrenuti na vašem sistemu i čekati nove ispravke\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Vaš račun za Mandriva Online je uspješno podešen\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Vaš račun za Mageia Online je uspješno podešen\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Konfiguracija uspješno poslana"
@@ -1128,14 +1128,14 @@ msgstr "Nisam u mogućnosti da uradim update paketa sa update_source medija.\n"
 #~ msgstr "Problem pri slanju konfiguracije"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "Ne mogu se spojiti na mandrivaonline website: pogrešno korisničko ime ili "
 #~ "šifra ili problemi sa postavkama routera/firewalla"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- pokreće Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- pokreće Mageia Update.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Ne mogu preuzeti spisak updatea: %s"
diff --git a/po/ca.po b/po/ca.po
index 00b922d1..d070656b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -34,10 +34,10 @@ msgstr "El vostre sistema està actualitzat"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problema de configuració del servei. Comproveu els logs i envieu un correu a "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -51,7 +51,7 @@ msgstr "Hi ha actualitzacions disponibles pel vostre sistema"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -157,7 +157,7 @@ msgstr "S'està executant drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -167,7 +167,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -215,7 +215,7 @@ msgstr "Cancel·la"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -226,8 +226,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "L'equip Mandriva Linux Online"
+msgid "Mageia Linux"
+msgstr "L'equip Mageia Linux Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -289,8 +289,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "S'està executant MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "S'està executant MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -309,17 +309,17 @@ msgstr "S'està comprovant la xarxa: sembla estar desactivada\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -388,7 +388,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -421,7 +421,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -454,7 +454,7 @@ msgstr "S'ha produït un error"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -515,15 +515,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "L'equip Mandriva Linux Online"
+msgid "Mageia Linux Features"
+msgstr "L'equip Mageia Linux Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -572,33 +572,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "L'equip Mandriva Linux Online"
+msgid "Mageia Free"
+msgstr "L'equip Mageia Linux Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "L'equip Mandriva Linux Online"
+msgid "Mageia Mini"
+msgstr "L'equip Mageia Linux Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -616,14 +616,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versió %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Aquest programari és lliure i es pot redistribuir sota els termes de la GPL "
 "de GNU.\n"
 "\n"
@@ -636,8 +636,8 @@ msgstr "  --help\t\t- mostra aquest missatge d'ajuda.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update es llança automàticament.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update es llança automàticament.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -646,8 +646,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- versió en mode text de Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- versió en mode text de Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -661,7 +661,7 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "L'equip Mandriva Linux Online"
+#~ msgstr "L'equip Mageia Linux Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -706,8 +706,8 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "S'està connectant a"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Applet Mandriva Linux Update"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Applet Mageia Linux Update"
 
 #~ msgid "Security error"
 #~ msgstr "Error de seguretat"
@@ -831,8 +831,8 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Contrasenya incorrecta.\n"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Resposta del servidor de Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Resposta del servidor de Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "No comprovis"
@@ -850,14 +850,14 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versió %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Aquest programari és lliure i es pot redistribuir sota els termes de la "
 #~ "GPL de GNU.\n"
 #~ "\n"
@@ -885,10 +885,10 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Creació o autenticació del compte"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
 #~ "Introduïu el vostre nom d'usuari, contrasenya i nom de màquina de "
-#~ "Mandriva Online:"
+#~ "Mageia Online:"
 
 #~ msgid "Email address:"
 #~ msgstr "Adreça del correu-e:"
@@ -903,14 +903,14 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Els punts de muntatge només poden contenir caràcters alfanumèrics"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "S'està connectant a la web de Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "S'està connectant a la web de Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -925,10 +925,10 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Per poder gaudir dels serveis de Mandriva Online,\n"
+#~ "Per poder gaudir dels serveis de Mageia Online,\n"
 #~ "ara penjarem la vostra configuració.\n"
 #~ "\n"
-#~ "L'auxiliar enviarà a Mandriva la informació següent:\n"
+#~ "L'auxiliar enviarà a Mageia la informació següent:\n"
 #~ "\n"
 #~ "1) la llista de paquets que heu instal·lat al sistema,\n"
 #~ "\n"
@@ -945,8 +945,8 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Connection problem"
 #~ msgstr "Problema de connexió"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Crea un compte a Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Crea un compte a Mageia Online"
 
 #~ msgid "First name:"
 #~ msgstr "Nom:"
@@ -977,28 +977,28 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "A partir d'ara, gràcies a Mandriva Online, rebreu\n"
+#~ "A partir d'ara, gràcies a Mageia Online, rebreu\n"
 #~ "avisos d'actualitzacions i millores de seguretat."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online us ofereix la possibilitat d'automatitzar les "
+#~ "Mageia Online us ofereix la possibilitat d'automatitzar les "
 #~ "actualitzacions.\n"
 #~ "S'executarà regularment un programa per comprovar si hi ha noves "
 #~ "actualitzacions\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "El vostre compte Mandriva Online s'ha configurat amb èxit\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "El vostre compte Mageia Online s'ha configurat amb èxit\n"
 
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Problema al pujar la configuració"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- actualitza Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- actualitza Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "El sistema està ocupat. Espereu ..."
@@ -1006,9 +1006,9 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Sending configuration..."
 #~ msgstr "S'està enviant la configuració..."
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update no ha pogut contactar amb el lloc, ho provarem més tard."
+#~ "Mageia Update no ha pogut contactar amb el lloc, ho provarem més tard."
 
 #~ msgid "Login:"
 #~ msgstr "Nom d'usuari:"
@@ -1022,16 +1022,16 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "El nom d'usuari o la contrasenya són incorrectes.\n"
-#~ " Us caldrà tornar-los a escriure, o bé crear un compte a Mandriva "
+#~ " Us caldrà tornar-los a escriure, o bé crear un compte a Mageia "
 #~ "Online.\n"
-#~ " En aquest darrer cas, torneu al primer pas per connectar amb Mandriva "
+#~ " En aquest darrer cas, torneu al primer pas per connectar amb Mageia "
 #~ "Online.\n"
 #~ " Estigueu avisat de que també cal proporcionar un nom de màquina \n"
 #~ " (només s'admeten caràcters de l'alfabet)"
@@ -1069,14 +1069,14 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Previous"
 #~ msgstr "Anterior"
 
-#~ msgid "Welcome to Mandriva Online"
-#~ msgstr "Benvingut a Mandriva Online"
+#~ msgid "Welcome to Mageia Online"
+#~ msgstr "Benvingut a Mageia Online"
 
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "No tinc cap compte de Mandriva Online i en vull un"
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "No tinc cap compte de Mageia Online i en vull un"
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Normes de privacitat de Mandriva Linux"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Normes de privacitat de Mageia Linux"
 
 #~ msgid "Authentification"
 #~ msgstr "Autenticació"
@@ -1094,9 +1094,9 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgstr "S'està sortint de l'auxiliar\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
+#~ "Mageia Online could not be contacted, please try again at a later time"
 #~ msgstr ""
-#~ "No s'ha pogut contactar amb Mandriva Online, si us plau, provi-ho més tard"
+#~ "No s'ha pogut contactar amb Mageia Online, si us plau, provi-ho més tard"
 
 #~ msgid "  --update       - Update keys\n"
 #~ msgstr "  --update       - Actualitza les claus\n"
@@ -1116,8 +1116,8 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Service deactivated. Waiting for payment..."
 #~ msgstr "Servei desactivat. S'està esperant el pagament..."
 
-#~ msgid "Launch Mandriva Linux Update"
-#~ msgstr "Executa Mandriva Linux Update"
+#~ msgid "Launch Mageia Linux Update"
+#~ msgstr "Executa Mageia Linux Update"
 
 #~ msgid "Available"
 #~ msgstr "Disponible"
@@ -1125,8 +1125,8 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Checking ..."
 #~ msgstr "S'està comprovant ..."
 
-#~ msgid "Attempting to connect to mandrivaonline.com\n"
-#~ msgstr "S'està intentant la connexió a mandrivaonline.com\n"
+#~ msgid "Attempting to connect to mageiaonline.com\n"
+#~ msgstr "S'està intentant la connexió a mageiaonline.com\n"
 
 #~ msgid "Creation"
 #~ msgstr "Creació"
@@ -1143,8 +1143,8 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Server Problem"
 #~ msgstr "Problema del servidor"
 
-#~ msgid "Launching Mandriva Update\n"
-#~ msgstr "S'està executant Mandriva Update\n"
+#~ msgid "Launching Mageia Update\n"
+#~ msgstr "S'està executant Mageia Update\n"
 
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Sí, vull actualitzacions automàtiques"
@@ -1155,8 +1155,8 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "About Online Applet"
 #~ msgstr "Quant a l'applet en línia"
 
-#~ msgid "Mandriva Linux Update Notification Applet"
-#~ msgstr "Applet de notificacions Mandriva Linux Update"
+#~ msgid "Mageia Linux Update Notification Applet"
+#~ msgstr "Applet de notificacions Mageia Linux Update"
 
 #~ msgid "Team:"
 #~ msgstr "Equip:"
@@ -1167,8 +1167,8 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgid "Version:"
 #~ msgstr "Versió:"
 
-#~ msgid "Start Mandriva Update"
-#~ msgstr "Inicia Mandriva Update"
+#~ msgid "Start Mageia Update"
+#~ msgstr "Inicia Mageia Update"
 
 #~ msgid "  --security     - use only security media.\n"
 #~ msgstr "  --security     - utilitza només suports de seguretat.\n"
@@ -1177,10 +1177,10 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgstr "  -v             - mode detallat.\n"
 
 #~ msgid ""
-#~ "You need to have an account on Mandriva Online, or update your "
+#~ "You need to have an account on Mageia Online, or update your "
 #~ "subscription."
 #~ msgstr ""
-#~ "Us cal tenir un compte a Mandriva Online, o actualitzar la vostra "
+#~ "Us cal tenir un compte a Mageia Online, o actualitzar la vostra "
 #~ "subscripció."
 
 #~ msgid "Your login or password may be wrong"
@@ -1242,38 +1242,38 @@ msgstr "No es poden actualitzar els paquets des del suport update_source.\n"
 #~ msgstr "D'acord"
 
 #~ msgid ""
-#~ "Do you really want to abort Mandriva Online?\n"
+#~ "Do you really want to abort Mageia Online?\n"
 #~ "To return to the Wizard press 'Cancel',\n"
 #~ "to really quit it press 'Quit'."
 #~ msgstr ""
-#~ "Segur que voleu avortar Mandriva Online?\n"
+#~ "Segur que voleu avortar Mageia Online?\n"
 #~ "Per tornar a l'auxiliar, feu clic a 'Cancel·la';\n"
 #~ "per sortir feu clic a 'Surt'."
 
-#~ msgid "Really abort? - Mandriva Online"
-#~ msgstr "Segur que voleu avortat? - Mandriva Online"
+#~ msgid "Really abort? - Mageia Online"
+#~ msgstr "Segur que voleu avortat? - Mageia Online"
 
 #~ msgid ""
-#~ " You are just starting our Free Mandriva Linux Download Edition for the "
+#~ " You are just starting our Free Mageia Linux Download Edition for the "
 #~ "first time. \n"
 #~ "\n"
-#~ "There are now over three million Mandriva Linux users all over the "
+#~ "There are now over three million Mageia Linux users all over the "
 #~ "world!\n"
 #~ "\n"
 #~ "Please take a few seconds to fill a short questionnaire. The data from "
 #~ "this \n"
 #~ "questionnaire will be used only for aggregate market studies.\n"
-#~ "The text below is the privacy policy of Mandriva about your personal data."
+#~ "The text below is the privacy policy of Mageia about your personal data."
 #~ msgstr ""
-#~ " Esteu iniciant la edició de descarrega gratuïta de Mandriva Linux per "
+#~ " Esteu iniciant la edició de descarrega gratuïta de Mageia Linux per "
 #~ "primera vegada.\n"
 #~ "\n"
-#~ "Hi ha més de tres milions d'usuaris de Mandriva Linux al món!\n"
+#~ "Hi ha més de tres milions d'usuaris de Mageia Linux al món!\n"
 #~ "\n"
 #~ "Si us plau pren-te uns segons per omplir un petit qüestionari. Les dades "
 #~ "del\n"
 #~ "qüestionari es faran servir per estudis interns de mercat.\n"
-#~ "El text de sota és la política de privacitat de Mandriva en quant a les "
+#~ "El text de sota és la política de privacitat de Mageia en quant a les "
 #~ "vostres dades personals."
 
 #~ msgid "Sans Italic 17"
diff --git a/po/cs.po b/po/cs.po
index 537d8052..d8524a85 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -36,10 +36,10 @@ msgstr "Váš systém je plně aktuální"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problém s nastavením služby. Zkontrolujte prosím záznamy a pošlete email na "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -53,8 +53,8 @@ msgstr "Pro váš systém jsou k dispozici nové aktualizace"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Byla vydána nová verze distribuce Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Byla vydána nová verze distribuce Mageia Linux"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -163,8 +163,8 @@ msgstr "Spouští se drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nová verze distribuce Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nová verze distribuce Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -173,8 +173,8 @@ msgstr "Prohlížet"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Byla vydána nová verze distribuce Mandriva Linux."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Byla vydána nová verze distribuce Mageia Linux."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -221,10 +221,10 @@ msgstr "Zrušit"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Podpora tohoto systému Mandriva Linux skončila. To znamená, že již nebudou k "
+"Podpora tohoto systému Mageia Linux skončila. To znamená, že již nebudou k "
 "dispozici žádné nové aktualizace softwaru."
 
 #: ../mdkapplet:514
@@ -234,8 +234,8 @@ msgstr "Pokud chcete udržet svůj systém bezpečný, můžete:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -306,8 +306,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Spouští se MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Spouští se MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -326,19 +326,19 @@ msgstr "Kontroluji síť: zdá se nedostupná\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright ©%s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright ©%s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
-"Mandriva Online umožňuje přístup k webovým službám společnosti Mandriva."
+"Mageia Online umožňuje přístup k webovým službám společnosti Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -410,8 +410,8 @@ msgstr "Chcete nainstalovat tento dodatečný zdroj software?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -443,10 +443,10 @@ msgstr "Selhalo získávání seznamu distribucí:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Společnost Mandriva poskytuje u distribucí 12 měsíců aktualizací pro "
+"Společnost Mageia poskytuje u distribucí 12 měsíců aktualizací pro "
 "desktopy (do %s) a 18 měsíců základních aktualizací (až do %s)."
 
 #: ../mdkapplet-add-media-helper:167
@@ -480,8 +480,8 @@ msgstr "Vyskytla se chyba"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Váš účet Mandriva nemá aktivní předplacené stažení verze %s."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Váš účet Mageia nemá aktivní předplacené stažení verze %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -541,18 +541,18 @@ msgstr "Enterprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack vám přináší tu nejlepší zkušenost s Linuxem na desktopu: "
+"Mageia Powerpack vám přináší tu nejlepší zkušenost s Linuxem na desktopu: "
 "stabilitu a efektivitu řešení s otevřenými zdroji spolu s exkluzivním "
-"softwarem a oficiální podporou společnosti Mandriva."
+"softwarem a oficiální podporou společnosti Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Vlastnosti Mandriva Linuxu"
+msgid "Mageia Linux Features"
+msgstr "Vlastnosti Mageia Linuxu"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -601,35 +601,35 @@ msgstr "Nyní je k dispozici %s, můžete povýšit na:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
-msgstr "Distribuce Mandriva Linux s dalším softwarem a oficiální podporou."
+msgstr "Distribuce Mageia Linux s dalším softwarem a oficiální podporou."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -645,14 +645,14 @@ msgstr "Povýšení distribuce"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "MDKUpdate verze %s\n"
-"Copyright ©%s Mandriva.\n"
+"Copyright ©%s Mageia.\n"
 "Toto je volně šiřitelný software a může být šířen v souladu s licencí GNU "
 "GPL.\n"
 "\n"
@@ -665,8 +665,8 @@ msgstr "  --help\t\t- vytiskne tuto nápovědu.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- automatické spuštění Mandriva Update.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- automatické spuštění Mageia Update.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -675,8 +675,8 @@ msgstr "  --mnf\t\t\t- spustí skripty specifické pro MNF.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- textová verze Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- textová verze Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -696,13 +696,13 @@ msgstr "Nelze aktualizovat balíčky ze zdroje update_source.\n"
 #~ "přidejte dodatečný zdroj balíčků"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Váš účet Mandriva nemá aktivní předplacenou rozšířenou podporu."
+#~ msgstr "Váš účet Mageia nemá aktivní předplacenou rozšířenou podporu."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Rádi byste Powerpack?"
@@ -711,7 +711,7 @@ msgstr "Nelze aktualizovat balíčky ze zdroje update_source.\n"
 #~ "Since you don't have Powerpack rights you may visit mandriva store now "
 #~ "and get Powerpack subscription."
 #~ msgstr ""
-#~ "Protože nemáte práva na Powerpack, můžete nyní navštívit obchod Mandriva "
+#~ "Protože nemáte práva na Powerpack, můžete nyní navštívit obchod Mageia "
 #~ "a získat předplatné na Powerpack."
 
 #~ msgid "Get Powerpack subscription!"
@@ -731,9 +731,9 @@ msgstr "Nelze aktualizovat balíčky ze zdroje update_source.\n"
 #~ msgstr "Zrušit, povýšit na edici Free"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Váš účet Mandriva nemá aktivní předplacené stažení verze Powerpack."
+#~ msgstr "Váš účet Mageia nemá aktivní předplacené stažení verze Powerpack."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -753,8 +753,8 @@ msgstr "Nelze aktualizovat balíčky ze zdroje update_source.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Gratulujeme"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Povýšení na verzi Mandriva %s bylo úspěšné."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Povýšení na verzi Mageia %s bylo úspěšné."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Váš systém musí být restartován."
@@ -778,6 +778,6 @@ msgstr "Nelze aktualizovat balíčky ze zdroje update_source.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Byla vydána nová verze distribuce Mandriva Linux."
+#~ msgstr "Byla vydána nová verze distribuce Mageia Linux."
diff --git a/po/cy.po b/po/cy.po
index b3a50d54..aced7ba7 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -3,7 +3,7 @@
 # Rhoslyn Prys <rprys@yahoo.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline 0.15\n"
+"Project-Id-Version: mgaonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2009-10-01 16:32+0100\n"
@@ -33,10 +33,10 @@ msgstr "Mae'r system yn gyfredol"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problemau ffurfweddu'r gwasanaethwr. Gwiriwch gofnodion ac anfon e-byst at "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,8 +50,8 @@ msgstr "Mae diweddariadau newydd ar gael ar gyfer eich system"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mae dosbarthiad newydd o Mandriva Linux wedi ei ryddhau"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mae dosbarthiad newydd o Mageia Linux wedi ei ryddhau"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -159,8 +159,8 @@ msgstr "Cychwyn drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Fersiwn newydd o ddosbarthiad Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Fersiwn newydd o ddosbarthiad Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -169,8 +169,8 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mae dosbarthiad newydd o Mandriva Linux wedi ei ryddhau."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mae dosbarthiad newydd o Mageia Linux wedi ei ryddhau."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -217,7 +217,7 @@ msgstr "Diddymu"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -228,8 +228,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -297,8 +297,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Cychwyn MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Cychwyn MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -317,18 +317,18 @@ msgstr "Gwirio'r Rhwydwaith: i weld wedi ei anablu\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Hawlfraint (C) %s  Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Hawlfraint (C) %s  %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online yw gwasanaethau gwe Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online yw gwasanaethau gwe Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -398,8 +398,8 @@ msgstr "Hoffech chi osod y storfa o feddalwedd ychwanegol?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -431,7 +431,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -464,8 +464,8 @@ msgstr "Digwyddodd gwall"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Nid yw eich cyfrif Mandriva yn cynnwystanysgrifiad llwytho %s i lawr."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Nid yw eich cyfrif Mageia yn cynnwystanysgrifiad llwytho %s i lawr."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -525,15 +525,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -582,33 +582,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Linux"
+msgid "Mageia Free"
+msgstr "Mageia Linux"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Linux"
+msgid "Mageia Mini"
+msgstr "Mageia Linux"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -626,14 +626,14 @@ msgstr "Diweddaru'r Dosbarthiad"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "fersiwn %s mdkupdate  \n"
-"Hawlfraint (H) %s Mandriva.\n"
+"Hawlfraint (H) %s Mageia.\n"
 "Mae hwn yn feddalwedd rhydd ac mae modd ei ail ddosbarthu o dan amodau GNU "
 "GPL.\n"
 "\n"
@@ -646,8 +646,8 @@ msgstr "  --help\t\t- argraffu'r neges cymorth hon.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- cychwyn Mandriva Update yn awtomatig\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- cychwyn Mageia Update yn awtomatig\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -656,8 +656,8 @@ msgstr "  --mnf\t\t\t- cychwyn sgriptiau mnf penodol.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- fersiwn modd testun o Mandriva Update\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- fersiwn modd testun o Mageia Update\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -677,24 +677,24 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Nid yw eich cyfrif Mandriva yn cynnwystanysgrifiad llwytho %s i lawr."
+#~ "Nid yw eich cyfrif Mageia yn cynnwystanysgrifiad llwytho %s i lawr."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Linux"
+#~ msgstr "Mageia Linux"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Disgrifiad y peiriant:"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Nid yw eich cyfrif Mandriva yn cynnwystanysgrifiad llwytho PowerPack i "
+#~ "Nid yw eich cyfrif Mageia yn cynnwystanysgrifiad llwytho PowerPack i "
 #~ "lawr."
 
 #~ msgid ""
@@ -714,8 +714,8 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Llongyfarchiadau"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Mae diweddaru i Mandriva %s wedi bod yn llwyddiant."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Mae diweddaru i Mageia %s wedi bod yn llwyddiant."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Rhaid ailgychwyn eich system."
@@ -739,9 +739,9 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Mae dosbarthiad newydd o Mandriva Linux wedi ei ryddhau."
+#~ msgstr "Mae dosbarthiad newydd o Mageia Linux wedi ei ryddhau."
 
 #, fuzzy
 #~ msgid "You are using '%s' distribution."
@@ -756,9 +756,9 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgid "No"
 #~ msgstr "Na"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mae Mandriva Online i'w weld wedi ei ail osod, ail lwytho'r rhaglennig..."
+#~ "Mae Mageia Online i'w weld wedi ei ail osod, ail lwytho'r rhaglennig..."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Gwirio... Mae diweddariadau ar gael\n"
@@ -772,8 +772,8 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Cysylltu â"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Rhaglennig Diweddaru Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Rhaglennig Diweddaru Mageia Linux"
 
 #~ msgid "Security error"
 #~ msgstr "Gwall diogelwch"
@@ -830,33 +830,33 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgstr "Gwall gwasanaeth"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Nid yw gwasanaethau Mandrivaar gael ar hyn o bryd\n"
+#~ "Nid yw gwasanaethau Mageiaar gael ar hyn o bryd\n"
 #~ "Ceisiwch eto'n hwyrach"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Anghydweddiad cyfrinair"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mae gwasanaethau gwe Mandriva yn cael eu trwsio\n"
+#~ "Mae gwasanaethau gwe Mageia yn cael eu trwsio\n"
 #~ "Ceisiwch eto"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Gwahardd Defnyddiwr"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Cyfrif defnyddiwr wedi ei wahardd gan wasanaethau gwe Mandriva"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Cyfrif defnyddiwr wedi ei wahardd gan wasanaethau gwe Mageia"
 
 #~ msgid "Connection error"
 #~ msgstr "Gwall cysylltiad"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Methu cyrraedd gwasanaethau gwe Mandriva"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Methu cyrraedd gwasanaethau gwe Mageia"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -887,12 +887,12 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Mae'r fersiwn o gleient Mandriva Online yn rhy hen.\n"
+#~ "Mae'r fersiwn o gleient Mageia Online yn rhy hen.\n"
 #~ "\n"
 #~ "Rhaid diweddaru i fersiwn newydd. Gallwch ei gael o http://start.mandriva."
 #~ "com"
@@ -959,9 +959,9 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Cyflwr anhysbys"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Mae'r gwasanaethau ar-lein wedi eu hatal. Cysylltwch â safle Mandriva "
+#~ "Mae'r gwasanaethau ar-lein wedi eu hatal. Cysylltwch â safle Mageia "
 #~ "Online\n"
 
 #~ msgid "Wrong Password.\n"
@@ -984,8 +984,8 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ "Digwyddodd anhawster wrth gysylltu â'r gweinydd, cysylltwch â'r tîm "
 #~ "cefnogi"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Ymateb gan weinydd Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Ymateb gan weinydd Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Dim gwiriad"
@@ -1001,14 +1001,14 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "fersiwn %s mdonline  \n"
-#~ "Hawlfraint (H) %s Mandriva.\n"
+#~ "Hawlfraint (H) %s Mageia.\n"
 #~ "Mae hwn yn feddalwedd rhydd ac mae modd ei ail ddosbarthu o dan amodau "
 #~ "GNU GPL.\n"
 #~ "\n"
@@ -1059,9 +1059,9 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Creu cyfrif neu ddilysiad"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Rhowch eich mewngofnod Mandriva Online, eich cyfrinair ac enw'r peiriant :"
+#~ "Rhowch eich mewngofnod Mageia Online, eich cyfrinair ac enw'r peiriant :"
 
 #~ msgid "Email address:"
 #~ msgstr "Cyfeiriad e-bost:"
@@ -1078,14 +1078,14 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Rhaid i enw'r peiriant fod 1 i 40 nod rhifol"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Cysylltu â safle gwe Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Cysylltu â safle gwe Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1100,10 +1100,10 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Er mwyn manteisio ar wasanaethau Mandriva Online,\n"
+#~ "Er mwyn manteisio ar wasanaethau Mageia Online,\n"
 #~ "rydym ar fin llwytho eich ffurfweddiad i fyny.\n"
 #~ "\n"
-#~ "Bydd y Dewin yn anfon y wybodaeth ganlynol at Mandriva:\n"
+#~ "Bydd y Dewin yn anfon y wybodaeth ganlynol at Mageia:\n"
 #~ "\n"
 #~ "1) rhestr y pecynnau sydd ar eich system,\n"
 #~ "\n"
@@ -1123,8 +1123,8 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Mae problem yn digwydd wrth lwytho ffeiliau i fyny, ceisiwch eto."
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Creu cyfrif Mandriva Online "
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Creu cyfrif Mageia Online "
 
 #~ msgid "Greeting:"
 #~ msgstr "Cyfarchiad:"
@@ -1155,10 +1155,10 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgstr "Methodd creu cyfrif y defnyddiwr!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Crëwyd Cyfrif Mandriva Online yn llwyddiannus.\n"
+#~ "Crëwyd Cyfrif Mageia Online yn llwyddiannus.\n"
 #~ "Cliciwch \"Nesaf\" i ddilysu a llwytho'ch ffurfweddiad i fyny\n"
 
 #~ msgid "Your upload was successful!"
@@ -1166,21 +1166,21 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "O hyn ymlaen byddwch yn derbyn cyhoeddiadau\n"
-#~ "diogelwch a diweddariadau gan Mandriva Online."
+#~ "diogelwch a diweddariadau gan Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mae Mandriva Online yn cynnig y dewis i chi ddiweddaru'n awtomatig,\n"
+#~ "Mae Mageia Online yn cynnig y dewis i chi ddiweddaru'n awtomatig,\n"
 #~ "Bydd rhaglen yn rhedeg yn rheolaidd yn eich system i gasglu "
 #~ "diweddariadau.\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Mae eich cyfrif Mandriva Online wedi ei ffurfweddu'n llwyddiannus\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Mae eich cyfrif Mageia Online wedi ei ffurfweddu'n llwyddiannus\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Llwytho'r ffurfweddiad yn llwyddiannus"
@@ -1189,14 +1189,14 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgstr "Anhawster llwytho'r ffurfweddiad"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "Methu cysylltu â safle gwe Mandriva Online: mewngofnod/cyfrinair anghywir "
+#~ "Methu cysylltu â safle gwe Mageia Online: mewngofnod/cyfrinair anghywir "
 #~ "neu osodiadau llwybrydd/mur cadarn anghywir."
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- cychwyn Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- cychwyn Mageia Update.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Methu estyn rhestr y diweddariadau: %s"
@@ -1216,23 +1216,23 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgid "  --help         - print this help message.\n"
 #~ msgstr "  --help         - argraffu'r neges cymorth hon.\n"
 
-#~ msgid "  --auto         - Mandriva Update launched automatically.\n"
-#~ msgstr "  --auto         - cychwyn Mandriva Update yn awtomatig\n"
+#~ msgid "  --auto         - Mageia Update launched automatically.\n"
+#~ msgstr "  --auto         - cychwyn Mageia Update yn awtomatig\n"
 
-#~ msgid "  --applet       - launch Mandriva Update.\n"
-#~ msgstr "  --applet       - cychwyn Mandriva Update.\n"
+#~ msgid "  --applet       - launch Mageia Update.\n"
+#~ msgstr "  --applet       - cychwyn Mageia Update.\n"
 
 #~ msgid "  --mnf          - launch mnf specific scripts.\n"
 #~ msgstr "  --mnf          - cychwyn sgriptiau mnf penodol.\n"
 
-#~ msgid "  --noX          - text mode version of Mandriva Update.\n"
-#~ msgstr "  --noX          - fersiwn modd testun o Mandriva Update\n"
+#~ msgid "  --noX          - text mode version of Mageia Update.\n"
+#~ msgstr "  --noX          - fersiwn modd testun o Mageia Update\n"
 
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Heb ganfod unrhyw ffeiliau %s. Rhedwch ddewin mdkonline yn gyntaf"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update yn methu cysylltu â'r safle, byddwn yn ceisio eto"
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update yn methu cysylltu â'r safle, byddwn yn ceisio eto"
 
 #~ msgid "Login:"
 #~ msgstr "Mewngofnod:"
@@ -1246,15 +1246,15 @@ msgstr "Methu diweddaru pecynnau o gyfrwng update_source.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Mae eich mewngofnod neu gyfrinair yn anghywir\n"
-#~ "Un ai rhaid i chi ei ail deipio neu greu cyfrif Mandriva Online newydd.\n"
-#~ "Os yr olaf, ewch yn ôl i'r cam cyntaf â chysylltu â Mandriva Online.\n"
+#~ "Un ai rhaid i chi ei ail deipio neu greu cyfrif Mageia Online newydd.\n"
+#~ "Os yr olaf, ewch yn ôl i'r cam cyntaf â chysylltu â Mageia Online.\n"
 #~ "cofiwch y bydd angen darparu enw Peiriant \n"
 #~ "(gyda dim ond llythrennau)"
 
diff --git a/po/da.po b/po/da.po
index d1dd0fa3..1b549912 100644
--- a/po/da.po
+++ b/po/da.po
@@ -35,10 +35,10 @@ msgstr "Dit system er opdateret"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problem med konfiguration af tjeneste. Tjek venligst loggene og send post "
-"til support@mandrivaonline.com"
+"til support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -52,8 +52,8 @@ msgstr "Nye opdateringer er tilgængelige for dit system"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "En ny version af Mandriva Linux distributionen er blevet udgivet"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "En ny version af Mageia Linux distributionen er blevet udgivet"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -165,8 +165,8 @@ msgstr "Begynder på drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Ny version af Mandriva Linux distributionen"
+msgid "New version of Mageia Linux distribution"
+msgstr "Ny version af Mageia Linux distributionen"
 
 #: ../mdkapplet:464
 #, c-format
@@ -175,8 +175,8 @@ msgstr "Gennemsé"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "En ny version af Mandriva Linux distributionen er blevet udgivet."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "En ny version af Mageia Linux distributionen er blevet udgivet."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -223,10 +223,10 @@ msgstr "Annullér"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Vedligeholdelsen for dette Mandriva Linux-system er udløbet. Dette betyderr "
+"Vedligeholdelsen for dette Mageia Linux-system er udløbet. Dette betyderr "
 "at det ikke vil komme flere programopdateringer."
 
 #: ../mdkapplet:514
@@ -236,8 +236,8 @@ msgstr "For at holde systemet sikkert, kan du:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -307,8 +307,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Start MandrivaUpdate op\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Start MageiaUpdate op\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -327,18 +327,18 @@ msgstr "Tjekker netværk: ser ud til at være deaktiveret\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Ophavsret © %s ved Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Ophavsret © %s ved %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online giver adgang til Mandrivas webtjenester."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online giver adgang til Mageias webtjenester."
 
 #: ../mdkapplet:899
 #, c-format
@@ -408,8 +408,8 @@ msgstr "Ønsker du at installere dette ekstra programmel-repositorie?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -441,10 +441,10 @@ msgstr "Fejl ved hentning af distributionsliste:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva tilbyder tolv måneder med skrivebordsopdateringer (frem til %s) og "
+"Mageia tilbyder tolv måneder med skrivebordsopdateringer (frem til %s) og "
 "atten måneder med basisopdateringer (frem til %s) for distributioner."
 
 #: ../mdkapplet-add-media-helper:167
@@ -479,8 +479,8 @@ msgstr "En fejl indtraf"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Din Mandriva-konto har ikke aktiveret %s download abonnement."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Din Mageia-konto har ikke aktiveret %s download abonnement."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -540,18 +540,18 @@ msgstr "Virksomhed"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Linux giver dig den bedste oplevelse med skrivebordet. Stabilitet "
+"Mageia Linux giver dig den bedste oplevelse med skrivebordet. Stabilitet "
 "og effektivitet fra åben kildetekst-løsninger, sammen med eksklusivt "
-"programmel and officiel understøttelse fra Mandriva."
+"programmel and officiel understøttelse fra Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux faciliteter"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux faciliteter"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -600,36 +600,36 @@ msgstr "%s er nu tilgængelig, du kan opgradere til:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"Mandriva Linux-distributionen med endnu mere programmel og officiel "
+"Mageia Linux-distributionen med endnu mere programmel og officiel "
 "understøttelse."
 
 #: ../mdkonline.pm:199
@@ -646,14 +646,14 @@ msgstr "Opgradering af distribution"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Dette er frit programmel og må distribueres ifølge vilkårene i GNU GPL.\n"
 "\n"
 "brug:\n"
@@ -665,8 +665,8 @@ msgstr "  --help\t\t- udskriv denne hjælpebesked.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update startes automatisk.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update startes automatisk.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -675,8 +675,8 @@ msgstr "  --mnf\t\t\t - start mnf-specifikke skripter.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- teksttilstandsversion af Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- teksttilstandsversion af Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -696,7 +696,7 @@ msgstr "Kan ikke opdatere pakker fra update_source-medie.\n"
 #~ "du har tegnet abonnement på nettet."
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Din Mandriva-konto har ikke aktiveret udvidet vedligeholdelses-abonnement."
+#~ "Din Mageia-konto har ikke aktiveret udvidet vedligeholdelses-abonnement."
diff --git a/po/de.po b/po/de.po
index d1ff6cff..4f7dcf02 100644
--- a/po/de.po
+++ b/po/de.po
@@ -40,10 +40,10 @@ msgstr "Ihr System ist aktuell"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Konfigurationsproblem des Dienstes. Bitte überprüfen Sie die Log-Datei und "
-"senden Sie eine Mail an support@mandrivaonline.com"
+"senden Sie eine Mail an support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -57,8 +57,8 @@ msgstr "Neue Aktualisierungen für Ihr System verfügbar"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Eine neue Version von Mandriva Linux ist erschienen"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Eine neue Version von Mageia Linux ist erschienen"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -169,8 +169,8 @@ msgstr "Starte drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Neue Version der Mandriva Linux Distribution"
+msgid "New version of Mageia Linux distribution"
+msgstr "Neue Version der Mageia Linux Distribution"
 
 #: ../mdkapplet:464
 #, fuzzy, c-format
@@ -179,8 +179,8 @@ msgstr "Durchsuchen"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Eine neue Version von Mandriva Linux ist erschienen."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Eine neue Version von Mageia Linux ist erschienen."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -227,10 +227,10 @@ msgstr "Abbrechen"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Die Wartungsdauer für diese Mandriva-Ausgabe ist beendet. Für dieses System "
+"Die Wartungsdauer für diese Mageia-Ausgabe ist beendet. Für dieses System "
 "werden keine Aktualisierungen mehr geliefert."
 
 #: ../mdkapplet:514
@@ -240,8 +240,8 @@ msgstr "Um Ih System sicher zu erhalten, können Sie:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, fuzzy, c-format
@@ -312,8 +312,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Starte MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Starte MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -332,19 +332,19 @@ msgstr "Überprüfe Netzwerk: Scheint abgeschaltet\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
-"Durch Mandriva Online erhalten Sie Zugriff auf Internetangebote von Mandriva"
+"Durch Mageia Online erhalten Sie Zugriff auf Internetangebote von Mageia"
 
 #: ../mdkapplet:899
 #, c-format
@@ -416,8 +416,8 @@ msgstr "Wollen Sie diese zusätzliche Softwarequelle einrichten?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -451,10 +451,10 @@ msgstr "Holen der Distributionslisten fehlgeschlagen:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva bietet 12 Monate Desktop-Aktualisierungen (bis zum %s) und 18 "
+"Mageia bietet 12 Monate Desktop-Aktualisierungen (bis zum %s) und 18 "
 "Monate Basis-Aktualisierungen (bis zum %s) für seine Distributionen."
 
 #: ../mdkapplet-add-media-helper:167
@@ -490,8 +490,8 @@ msgstr "Ein Fehler ist aufgetreten"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "In Ihrem Mandriva Account ist kein %s Download-Abonnement aktiviert."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "In Ihrem Mageia Account ist kein %s Download-Abonnement aktiviert."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -551,15 +551,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -608,33 +608,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -652,14 +652,14 @@ msgstr "Distributionsaktualisierung"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate Version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter "
 "vertrieben werden.\n"
 "\n"
@@ -672,8 +672,8 @@ msgstr "  --help\t\t- Ausgabe dieser Hilfe.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Aktualisierung startet automatisch.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Aktualisierung startet automatisch.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -682,8 +682,8 @@ msgstr "  --mnf\t\t\t- starte mnf spezifische Skripte.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Textmodus Version der Mandriva Aktualisierung.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Textmodus Version der Mageia Aktualisierung.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -704,24 +704,24 @@ msgstr "Aktualisieren der Pakete vom Update-Medium nicht möglich.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "In Ihrem Mandriva Account ist kein Wartungs-Registrierung aktiviert."
+#~ "In Ihrem Mageia Account ist kein Wartungs-Registrierung aktiviert."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Online Registrierung"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "In Ihrem Mandriva Account ist kein Powerpack Download-Abonnement "
+#~ "In Ihrem Mageia Account ist kein Powerpack Download-Abonnement "
 #~ "aktiviert."
 
 #~ msgid ""
@@ -743,8 +743,8 @@ msgstr "Aktualisieren der Pakete vom Update-Medium nicht möglich.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Herzlichen Glückwunsch"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Eine Aktualisierung auf die Mandriva-Version %s war erfolgreich."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Eine Aktualisierung auf die Mageia-Version %s war erfolgreich."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Sie müssen Ihr System neustarten."
@@ -768,6 +768,6 @@ msgstr "Aktualisieren der Pakete vom Update-Medium nicht möglich.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Eine neue Version von Mandriva Linux ist erschienen."
+#~ msgstr "Eine neue Version von Mageia Linux ist erschienen."
diff --git a/po/el.po b/po/el.po
index e81b0246..ccf25f74 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@
 # Dimitrios Glentadakis, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-el\n"
+"Project-Id-Version: mgaonline-el\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-12 09:56+0200\n"
@@ -40,10 +40,10 @@ msgstr "Το σύστημα σας είναι ενημερωμένο "
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Πρόβλημα υπηρεσίας ρυθμίσεων. Παρακαλώ ελέγξτε τις καταγραφές και στείλτε "
-"μήνυμα στο support@mandrivaonline.com"
+"μήνυμα στο support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -57,8 +57,8 @@ msgstr "Υπάρχουν νέες ενημερώσεις για το σύστη�
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Μια νέα έκδοση της διανομής Mandriva Linux είναι διαθέσιμη"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Μια νέα έκδοση της διανομής Mageia Linux είναι διαθέσιμη"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -75,7 +75,7 @@ msgstr "Το δίκτυο δεν λειτουργεί.Παρακαλώ διαμ�
 msgid "Service is not activated. Please click on \"Online Website\""
 msgstr ""
 "Η υπηρεσία δεν είναι ενεργοποιημένη. Παρακαλώ κάντε κλικ στην «Ιστοσελίδα "
-"Mandriva Online» "
+"Mageia Online» "
 
 #: ../mdkapplet:135 ../mdkapplet:141
 #, c-format
@@ -107,7 +107,7 @@ msgid ""
 msgstr ""
 "Έχεις ήδη, ένα ή περισσότερα μέσα ενημέρωσης ρυθμισμένα,\n"
 "αλλά προς το παρόν, είναι όλα, ανενεργά. Μπορείς να ενεργοποιήσεις\n"
-"ένα από αυτά από το «Πηγές λογισμικού» στο Κέντρο Ελέγχου Mandriva\n"
+"ένα από αυτά από το «Πηγές λογισμικού» στο Κέντρο Ελέγχου Mageia\n"
 "(επιλέξτε το στη στήλη «%s»).\n"
 "\n"
 "Έπειτα, εκκινήστε ξανά το «%s»."
@@ -172,8 +172,8 @@ msgstr "Εκτέλεση drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Νέα έκδοση της διανομής Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Νέα έκδοση της διανομής Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -182,8 +182,8 @@ msgstr "Περιήγηση"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Μια νέα έκδοση της διανομής Mandriva Linux είναι διαθέσιμη."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Μια νέα έκδοση της διανομής Mageia Linux είναι διαθέσιμη."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -230,10 +230,10 @@ msgstr "Άκυρο"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Η συντήρηση αυτού του συστήματος Mandriva Linux έχει σταματήσει. Σημαίνει "
+"Η συντήρηση αυτού του συστήματος Mageia Linux έχει σταματήσει. Σημαίνει "
 "πως δεν θα λαμβάνεται νέες ενημερώσεις πλέον."
 
 #: ../mdkapplet:514
@@ -243,8 +243,8 @@ msgstr "Για να διατηρηθεί το σύστημα σας ασφαλέ
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -315,8 +315,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr " Εκτέλεση μικροεφαρμογής MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr " Εκτέλεση μικροεφαρμογής MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -335,19 +335,19 @@ msgstr "Έλεγχος δικτύου: φαίνεται απενεργοποιη
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr "Copyright (C)%s by mandriva"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
-"Η Mandriva Online παρέχει πρόσβαση στις διαδικτυακές υπηρεσίες της Mandriva."
+"Η Mageia Online παρέχει πρόσβαση στις διαδικτυακές υπηρεσίες της Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -419,8 +419,8 @@ msgstr "Θέλετε να εγκαταστήσετε αυτό το νέο απο
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -454,10 +454,10 @@ msgstr "Η ανάκτηση της λίστας των διανομών απέτ
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Η Mandriva παρέχει 12 μήνες ενημερώσεις για την επιφάνεια εργασίας (μέχρι "
+"Η Mageia παρέχει 12 μήνες ενημερώσεις για την επιφάνεια εργασίας (μέχρι "
 "τις %s) και 18 μήνες βασικές ενημερώσεις (μέχρι τις %s) για τις διανομές."
 
 #: ../mdkapplet-add-media-helper:167
@@ -493,9 +493,9 @@ msgstr "Προκλήθηκε σφάλμα"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
-"Ο λογαριασμός σας Mandriva δεν έχει συνδρομή στην υπηρεσία λήψης του %s."
+"Ο λογαριασμός σας Mageia δεν έχει συνδρομή στην υπηρεσία λήψης του %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -555,18 +555,18 @@ msgstr "Enterprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Η Mandriva Powerpack σας προσφέρει την καλύτερη εμπειρία επιφάνειας εργασίας "
+"Η Mageia Powerpack σας προσφέρει την καλύτερη εμπειρία επιφάνειας εργασίας "
 "Linux: την σταθερότητα και αποτελεσματικότητα του ανοιχτού λογισμικού σε "
-"συνδυασμό με αποκλειστικές εφαρμογές και επίσημη υποστήριξη Mandriva."
+"συνδυασμό με αποκλειστικές εφαρμογές και επίσημη υποστήριξη Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Χαρακτηριστικά της Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Χαρακτηριστικά της Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -615,33 +615,33 @@ msgstr "η %s είναι τώρα διαθέσιμη, μπορείτε να αν
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 "Η διανομή Mandrfiva Linux με ακόμα περισσότερες εφαρμογές και επίσημη "
@@ -661,14 +661,14 @@ msgstr "Αναβάθμιση διανομής"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "έκδοση mdkupdate %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους του "
 "GNU GPL.\n"
 "\n"
@@ -681,8 +681,8 @@ msgstr "  --help\t\t- εκτύπωση αυτού του μηνύματος βο
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Αυτόματη εκτέλεση του Mandriva Update.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Αυτόματη εκτέλεση του Mageia Update.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -691,8 +691,8 @@ msgstr "  --mnf\t\t\t- εκτέλεση ειδικών mnf σεναρίων.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- έκδοση του Mandriva Update σε μορφή κειμένου.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- έκδοση του Mageia Update σε μορφή κειμένου.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -712,15 +712,15 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ "ένα νέο μέσο πακέτων αφού ολοκληρώσετε την εγγραφή σας στο διαδίκτυο"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Ο λογαριασμός σας Mandriva δεν έχει συνδρομή στην υπηρεσία εκτεταμένης "
+#~ "Ο λογαριασμός σας Mageia δεν έχει συνδρομή στην υπηρεσία εκτεταμένης "
 #~ "συντήρησης."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Θα θέλατε την Powerpack;"
@@ -730,7 +730,7 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ "and get Powerpack subscription."
 #~ msgstr ""
 #~ "Δεδομένου ότι δεν έχετε δικαιώματα Powerpack μπορείτε να επισκεφτείτε το "
-#~ "κατάστημα της Mandriva τώρα και να αποκτήσετε μια εγγραφή Powerpack."
+#~ "κατάστημα της Mageia τώρα και να αποκτήσετε μια εγγραφή Powerpack."
 
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Απόκτηση εγγραφής Powerpack!"
@@ -749,10 +749,10 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgstr "Ακύρωση, αναβάθμιση στην έκδοση Free"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Ο λογαριασμός σας Mandriva δεν έχει συνδρομή στην υπηρεσία λήψης του "
+#~ "Ο λογαριασμός σας Mageia δεν έχει συνδρομή στην υπηρεσία λήψης του "
 #~ "Powerpack."
 
 #~ msgid ""
@@ -774,8 +774,8 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgid "Congratulations"
 #~ msgstr "Συγχαρητήρια"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Η αναβάθμιση σε Mandriva %s ολοκληρώθηκε με επιτυχία."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Η αναβάθμιση σε Mageia %s ολοκληρώθηκε με επιτυχία."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Πρέπει να επανεκκινήστε το σύστημά σας."
@@ -799,10 +799,10 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgstr "Αποτυχία κατά την προσθήκη μέσου"
 
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""
-#~ "Η έκδοση Mandriva Linux που έχετε εγκατεστημένη δεν υποστηρίζεται πλέον."
+#~ "Η έκδοση Mageia Linux που έχετε εγκατεστημένη δεν υποστηρίζεται πλέον."
 
 #~ msgid "Get long term support for your currently installed distribution"
 #~ msgstr ""
@@ -825,9 +825,9 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgid "No"
 #~ msgstr "Όχι"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Η υπηρεσία Mandriva Online φαίνεται πώς έχει επανεγκατασταθεί. "
+#~ "Η υπηρεσία Mageia Online φαίνεται πώς έχει επανεγκατασταθεί. "
 #~ "Επαναφόρτωση της μικροεφαρμογής...  "
 
 #~ msgid "Checking... Updates are available\n"
@@ -842,8 +842,8 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgid "Connecting to"
 #~ msgstr "Σύνδεση με"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Μικροεφαρμογή αναβαθμίσεων της Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Μικροεφαρμογή αναβαθμίσεων της Mageia Linux"
 
 #~ msgid "Security error"
 #~ msgstr "Σφάλμα ασφαλείας"
@@ -900,34 +900,34 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgstr "Σφάλμα υπηρεσίας"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Οι δικτυακές υπηρεσίες της Mandriva είναι προς το παρόν μη διαθέσιμες\n"
+#~ "Οι δικτυακές υπηρεσίες της Mageia είναι προς το παρόν μη διαθέσιμες\n"
 #~ "Παρακαλώ προσπαθήστε ξανά αργότερα"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Το συνθηματικό δεν ταιριάζει."
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Οι δικτυακές υπηρεσίες της Mandriva είναι υπό συντήρηση\n"
+#~ "Οι δικτυακές υπηρεσίες της Mageia είναι υπό συντήρηση\n"
 #~ "Παρακαλώ προσπαθήστε ξανά αργότερα"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Ο χρήστης είναι απαγορευμένος"
 
-#~ msgid "User account forbidden by Mandriva web services"
+#~ msgid "User account forbidden by Mageia web services"
 #~ msgstr ""
-#~ "Λογαριασμός χρήστη απαγορευμένος από τις δικτυακές υπηρεσίες της Mandriva"
+#~ "Λογαριασμός χρήστη απαγορευμένος από τις δικτυακές υπηρεσίες της Mageia"
 
 #~ msgid "Connection error"
 #~ msgstr "Σφάλμα σύνδεσης"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Οι δικτυακές υπηρεσίες της Mandriva δεν είναι προσβάσιμες"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Οι δικτυακές υπηρεσίες της Mageia δεν είναι προσβάσιμες"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -959,12 +959,12 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Η έκδοση του Mandriva online client είναι πολύ παλιά\n"
+#~ "Η έκδοση του Mageia online client είναι πολύ παλιά\n"
 #~ "\n"
 #~ "Πρέπει να γίνει αναβάθμιση σε νεότερη έκδοση.Μπορείτε να πάρετε μια νέα "
 #~ "από το http:// star.mandriva.com"
@@ -1031,7 +1031,7 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgid "Unknown state"
 #~ msgstr "Αγνωστη κατάσταση"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
 #~ "Υπηρεσία Online απενεργοποιημένη. Επικοινωνήστε με δικτυακό τόπο Manriva "
 #~ "Online\n"
@@ -1057,8 +1057,8 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ "Υπήρξε πρόβλημα κατά τη σύνδεση σας με τον διακομιστή,παρακαλώ "
 #~ "επικοινωνήστε με την ομάδα υποστήριξης"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Απάντηση απο τόν διακομιστή της Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Απάντηση απο τόν διακομιστή της Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Μη έλεγχος"
@@ -1074,14 +1074,14 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdkonline έκδοση %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους του "
 #~ "GNU GPL.\n"
 #~ "\n"
@@ -1132,10 +1132,10 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgid "Account creation or authentication"
 #~ msgstr "Δημιουργία λογαριασμού ή πιστοποίηση ταυτότητας"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
 #~ "Εισάγετε το όνομα χρήστη ,κωδικό πρόσβασης και το Όνομα μηχανήματος για "
-#~ "το Mandriva Online:"
+#~ "το Mageia Online:"
 
 #~ msgid "Email address:"
 #~ msgstr "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
@@ -1154,14 +1154,14 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ "Το όνομα μηχανήματος πρέπει να είναι απο 1 εώς 40 αλφαριθμητικούς "
 #~ "χαρακτήρες"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Σύνδεση με τον δικτυακό τόπο Mandriva Online"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Σύνδεση με τον δικτυακό τόπο Mageia Online"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1176,10 +1176,10 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Για να επωφεληθείτε από τις υπηρεσίες Mandriva Online\n"
+#~ "Για να επωφεληθείτε από τις υπηρεσίες Mageia Online\n"
 #~ "θα αποστείλουμε τις ρυθμίσεις σας καθώς και τα εγκατεστημένα πακέτα\n"
 #~ "\n"
-#~ "Ο οδηγός θα στείλει τώρα τα παρακάτω στοιχεία στην Mandriva:\n"
+#~ "Ο οδηγός θα στείλει τώρα τα παρακάτω στοιχεία στην Mageia:\n"
 #~ "\n"
 #~ "1) τα πακέτα που έχετε εγκατεστημένα στο σύστημά σας,\n"
 #~ "\n"
@@ -1201,8 +1201,8 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ "Παρουσιάστηκε πρόβλημα κατά την αποστολή των αρχείων,παρακαλώ δοκιμάστε "
 #~ "ξανά"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Δημιουργήστε ένα λογαριασμό Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Δημιουργήστε ένα λογαριασμό Mageia Online"
 
 #~ msgid "Greeting:"
 #~ msgstr "Χαιρετισμός:"
@@ -1233,10 +1233,10 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgstr "Αποτυχία δημιουργίας λογαριασμού !"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Επιτυχής δημιουργία λογαριασμού Mandriva Online\n"
+#~ "Επιτυχής δημιουργία λογαριασμού Mageia Online\n"
 #~ "Παρακαλώ κάντε κλικ \"Next/Επόμενο\"για πιστοποίηση ταυτότητας και "
 #~ "αποστολή ρυθμίσεων\n"
 
@@ -1245,23 +1245,23 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Από εδώ και πέρα θα παραλαμβάνετε ανακοινώσεις\n"
-#~ "σχετικά με ενημερώσεις ασφαλείας και αναβαθμίσεις χάρη στο Mandriva "
+#~ "σχετικά με ενημερώσεις ασφαλείας και αναβαθμίσεις χάρη στο Mageia "
 #~ "Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Το Mandriva Online σας παρέχει τη δυνατότητα αυτοματοποιημένων "
+#~ "Το Mageia Online σας παρέχει τη δυνατότητα αυτοματοποιημένων "
 #~ "ενημερώσεων.\n"
 #~ "Ένα πρόγραμμα θα εκτελείται τακτικά στο σύστημά σας αναμένοντας νέες "
 #~ "αναβαθμίσεις\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Ο λογαριασμός σας Mandriva Online ρυθμίστηκε επιτυχώς\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Ο λογαριασμός σας Mageia Online ρυθμίστηκε επιτυχώς\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Η αποστολή ρυθμίσεων ήταν επιτυχής!"
@@ -1270,15 +1270,15 @@ msgstr "Αδύνατη η ενημέρωση των πακέτων από το �
 #~ msgstr "Πρόβλημα στην αποστολή Ρυθμίσεων"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "Η σύνδεση με τον δικτυακό τόπο της Mandriva Online δεν είναι εφικτή:λάθος "
+#~ "Η σύνδεση με τον δικτυακό τόπο της Mageia Online δεν είναι εφικτή:λάθος "
 #~ "σύνδεση/κωδικός ή δρομολογητής/εσφαλμένες ρυθμίσεις  δικτυακού φίλτρου "
 #~ "ασφάλειας"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- εκτέλεση Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- εκτέλεση Mageia Update.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Αδυναμία λήψης καταλόγου αναβαθμίσεων:%s"
diff --git a/po/eo.po b/po/eo.po
index 8e7433c3..6dcc1cab 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-eo\n"
+"Project-Id-Version: mgaonline-eo\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-01-13 10:13+0100\n"
@@ -32,10 +32,10 @@ msgstr "Via sistemo estas ĝisdata"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problemo pri serva konfigurado. Bonvole sendu retmesaĝon al "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -49,7 +49,7 @@ msgstr "Novaj ĝisdatigojn estas haveblajn por via sistemo"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -156,7 +156,7 @@ msgstr "Lanĉu drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -166,7 +166,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -214,7 +214,7 @@ msgstr "Nuligu"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -288,8 +288,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Lanĉu MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Lanĉu MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -308,17 +308,17 @@ msgstr "Kontrolante Reton: ĝi ŝajnas haltita\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Kopirajto (C) %s ĉe Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Kopirajto (C) %s ĉe %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -387,7 +387,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -420,7 +420,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -453,7 +453,7 @@ msgstr "Eraro okazis"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -514,15 +514,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -571,33 +571,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -615,14 +615,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versio %s\n"
-"Kopirajto © %s Mandriva.\n"
+"Kopirajto © %s Mageia.\n"
 "Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
 "GNU GPL.\n"
 "\n"
@@ -635,8 +635,8 @@ msgstr "  --help\t\t- presu tiun helpmesaĝon.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update startos aŭtomate.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update startos aŭtomate.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -645,8 +645,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - startas Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - startas Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -660,7 +660,7 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -697,8 +697,8 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgid "No"
 #~ msgstr "Ne"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-#~ msgstr "Mandriva Online ŝajnas reinstalita, reŝarĝas programeton ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
+#~ msgstr "Mageia Online ŝajnas reinstalita, reŝarĝas programeton ...."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Kontrolante... Ĝisdatigojn haveblas\n"
@@ -710,8 +710,8 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Konektiĝas al"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux-Ĝisdatigajn programeto"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux-Ĝisdatigajn programeto"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -840,8 +840,8 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Nekonata stato"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Retaj servoj haltitaj. Kontaktu Mandriva Online-retejon\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Retaj servoj haltitaj. Kontaktu Mageia Online-retejon\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Malĝusta pasvorto\n"
@@ -856,8 +856,8 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ "Io fuŝas en via reta konfigurado (kontrolu la retan kurson, fajroŝirmilon "
 #~ "aŭ la parametrojn de la prokura servilo)\n"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Respondo el Mandriva Online-servilo\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Respondo el Mageia Online-servilo\n"
 
 #~ msgid "No check"
 #~ msgstr "Neniu kontrolo"
@@ -873,14 +873,14 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versio %s\n"
-#~ "Kopirajto © %s Mandriva.\n"
+#~ "Kopirajto © %s Mageia.\n"
 #~ "Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj "
 #~ "de GNU GPL.\n"
 #~ "\n"
@@ -913,8 +913,8 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Kontokreado aŭ identiĝado"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Enigu vian Mandriva Online salutnomon, pasvorton kaj maŝinnomon:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Enigu vian Mageia Online salutnomon, pasvorton kaj maŝinnomon:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -930,14 +930,14 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Surmetingoj devas enteni nur alfanumerajn signojn"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Konektiĝas al Mandriva Online-retejo..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Konektiĝas al Mageia Online-retejo..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -952,10 +952,10 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Por ke vi profitu el Mandriva Online-servoj,\n"
+#~ "Por ke vi profitu el Mageia Online-servoj,\n"
 #~ "ni tuj alŝutos vian konfiguradon.\n"
 #~ "\n"
-#~ "Tiu programo sendos la sekvaj informoj al Mandriva:\n"
+#~ "Tiu programo sendos la sekvaj informoj al Mageia:\n"
 #~ "\n"
 #~ "1) la listo de pakaĵoj instalitaj,\n"
 #~ "\n"
@@ -973,8 +973,8 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Problemo okazis kiam alŝutante dosierojn, bonvole provu denove"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Kreu Mandriva Online-konton"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Kreu Mageia Online-konton"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -1006,10 +1006,10 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgstr "Nevalida retpoŝta adreso!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Mandriva Online konto sukcese kreita.\n"
+#~ "Mageia Online konto sukcese kreita.\n"
 #~ "Bonvole musklaku \"Sekva\" por enigi kaj alŝuti vian konfiguradon\n"
 
 #~ msgid "Your upload was successful!"
@@ -1017,20 +1017,20 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Ekde nun, vi ricevos anoncojn pri sekureco kaj ĝisdatigojn\n"
-#~ "danke al Mandriva Online."
+#~ "danke al Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online alportas al vi la aŭtomatigado de la ĝisdatigoj.\n"
+#~ "Mageia Online alportas al vi la aŭtomatigado de la ĝisdatigoj.\n"
 #~ "Programo startos regule en via sistemo kaj atendos novaj ĝisdatigoj\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Via Mandriva Online-konto estis sukcese konfigurata\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Via Mageia Online-konto estis sukcese konfigurata\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Konfigurado sukcese alŝutita"
@@ -1039,14 +1039,14 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgstr "Problemo por alŝuti la konfiguradon"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "Ne povas konekti al Mandriva Online-retejo: eraraj salutnomo/pasvorto "
+#~ "Ne povas konekti al Mageia Online-retejo: eraraj salutnomo/pasvorto "
 #~ "aŭeraraj enkursigila/fajroŝirmila konfiguradoj"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- startas Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- startas Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "La sistemo laboras. Bonvole atendu ..."
@@ -1057,8 +1057,8 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Neniu %s dosiero trovita. Startu mdkonline helpilo antaŭe."
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update ne povis kontakti la retejon, ni reprovos."
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update ne povis kontakti la retejon, ni reprovos."
 
 #~ msgid "Login:"
 #~ msgstr "Salutnomo:"
@@ -1072,15 +1072,15 @@ msgstr "Ne kapablas ĝisdatigi pakaĵojn el 'update_source medium'.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Via salutnomo aŭ via pasvorto eraris.\n"
-#~ " Vi povas tajpi ili denove, aŭ vi devos krei konton ĉe Mandriva Online.\n"
-#~ " Por la dua ebleco, revenu al la unua etapo por konekti al Mandriva "
+#~ " Vi povas tajpi ili denove, aŭ vi devos krei konton ĉe Mageia Online.\n"
+#~ " Por la dua ebleco, revenu al la unua etapo por konekti al Mageia "
 #~ "Online.\n"
 #~ " Notu ke vi devas ankaŭ indiki maŝinnomon \n"
 #~ " (nur alfabetaj literoj estas permesataj)"
diff --git a/po/es.po b/po/es.po
index 4abfb8db..bdf649c6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@
 # Andre Paulo Machado <andre.panm@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline_es\n"
+"Project-Id-Version: mgaonline_es\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-08 09:18-0300\n"
@@ -36,8 +36,8 @@ msgstr "Su sistema está actualizado"
 
 #: ../mdkapplet:84
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
-msgstr "Problema de configuración del servicio. Por favor verifique sus archivos de registro y envie un correo a support@mandrivaonline.com"
+msgid "Service configuration problem. Please check logs and send mail to support@mageiaonline.com"
+msgstr "Problema de configuración del servicio. Por favor verifique sus archivos de registro y envie un correo a support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -51,8 +51,8 @@ msgstr "Hay nuevas actualizaciones disponibles para su sistema"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Ha sido publicada una nueva versión de Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Ha sido publicada una nueva versión de Mageia Linux"
 
 #: ../mdkapplet:119
 #: ../mdkapplet:161
@@ -159,8 +159,8 @@ msgstr "Lanzando drakconnect\n"
 #: ../mdkapplet:459
 #: ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nueva versión de Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nueva versión de Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -169,8 +169,8 @@ msgstr "Examinar"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Una nueva versión de Mandriva Linux está disponible"
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Una nueva versión de Mageia Linux está disponible"
 
 #: ../mdkapplet:475
 #: ../mdkapplet:572
@@ -231,8 +231,8 @@ msgstr "Cancelar"
 
 #: ../mdkapplet:508
 #, c-format
-msgid "Maintenance for this Mandriva Linux version has ended. No more updates will be delivered for this system."
-msgstr "El mantenimiento de esta versión de Mandriva Linux ha finalizado. No se entregarán mas actualizaciones para este sistema."
+msgid "Maintenance for this Mageia Linux version has ended. No more updates will be delivered for this system."
+msgstr "El mantenimiento de esta versión de Mageia Linux ha finalizado. No se entregarán mas actualizaciones para este sistema."
 
 #: ../mdkapplet:514
 #, c-format
@@ -241,8 +241,8 @@ msgstr "Para mantener su sistema seguro, usted puede:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -296,8 +296,8 @@ msgstr "Recomendamos que conecte su portátil a la red eléctrica y si es posibl
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Lanzando MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Lanzando MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -316,18 +316,18 @@ msgstr "Verificando red: parece estar deshabilitada\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s por Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright © %s por %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandiva Online da acceso a los servicios web de Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mandiva Online da acceso a los servicios web de Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -403,8 +403,8 @@ msgstr "¿Desea añadir este soporte para acceder programas adicionales?"
 #: ../mdkapplet:1061
 #: ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84
 #: ../mdkapplet-config:43
@@ -438,8 +438,8 @@ msgstr "Error al obtener lista de distribuciones:"
 #. -PO: Here '%s' will be a localized date (eg:
 #: ../mdkapplet-add-media-helper:161
 #, c-format
-msgid "Mandriva provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
-msgstr "Mandriva provee 12 meses de actualizaciones de escritorio (hasta %s) y 18 meses de actualizaciones base (hasta el %s) para las distribuciones."
+msgid "Mageia provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
+msgstr "Mageia provee 12 meses de actualizaciones de escritorio (hasta %s) y 18 meses de actualizaciones base (hasta el %s) para las distribuciones."
 
 #: ../mdkapplet-add-media-helper:167
 #, c-format
@@ -469,8 +469,8 @@ msgstr "Ha ocurrido un error"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Su cuenta de Mandriva no tiene suscripción para descarga %s "
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Su cuenta de Mageia no tiene suscripción para descarga %s "
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -530,13 +530,13 @@ msgstr "Empresarial"
 
 #: ../mdkapplet_gui.pm:87
 #, c-format
-msgid "Mandriva Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mandriva official support."
-msgstr "Mandriva Powerpack le brinda la mejor de la experiencia Linux para el escritorio: estabilidad y eficiencia de soluciones de código abierto junto con aplicaciones exclusivas y soporte oficial de Mandriva."
+msgid "Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."
+msgstr "Mageia Powerpack le brinda la mejor de la experiencia Linux para el escritorio: estabilidad y eficiencia de soluciones de código abierto junto con aplicaciones exclusivas y soporte oficial de Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Características de Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Características de Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -585,35 +585,35 @@ msgstr "%s está ahora disponible, puede actualizarlo a:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178
 #: ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181
 #: ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
-msgid "The Mandriva Linux distribution with even more softwares and official support."
-msgstr "La distribución Mandriva Linux con incluso más aplicaciones y soporte oficial."
+msgid "The Mageia Linux distribution with even more softwares and official support."
+msgstr "La distribución Mageia Linux con incluso más aplicaciones y soporte oficial."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -629,13 +629,13 @@ msgstr "Actualización de Distribución"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versión %s\n"
-"Copyright © %s Mandriva.\n"
+"Copyright © %s Mageia.\n"
 "Este es software libre y puede volver a ser distribuido bajo los términos de la GNU GPL.\n"
 "\n"
 "uso:\n"
@@ -647,8 +647,8 @@ msgstr "  --help\t\t- mostrar este mensaje de ayuda.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update ejecutado automáticamente.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update ejecutado automáticamente.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -657,8 +657,8 @@ msgstr "  --mnf\t\t\t- ejecutar scripts específicos de mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update en versión texto.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update en versión texto.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -677,15 +677,15 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ "Por favor ingrese el nombre de usuario de su cuenta para añadir un medio "
 #~ "de paquetes adicional una vez que se ha suscrito en línea"
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Su cuenta de Mandriva no tiene una suscripción de Ampliación de "
+#~ "Su cuenta de Mageia no tiene una suscripción de Ampliación de "
 #~ "Mantenimiento habilitada."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "¿Le gustaría obtener Powerpack?"
 #~ msgid ""
@@ -693,7 +693,7 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ "and get Powerpack subscription."
 #~ msgstr ""
 #~ "Ya que usted no cuenta con derechos Powerpack, debería visitar la tienda "
-#~ "Mandriva ahora y obtener una suscripción Powerpack."
+#~ "Mageia ahora y obtener una suscripción Powerpack."
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "¡Obtenga una suscripción a Powerpack!"
 #~ msgid ""
@@ -707,9 +707,9 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgid "Cancel, upgrade to Free Edition"
 #~ msgstr "Cancelar, actualizar a la Edición Free"
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Su cuenta de Mandriva no tiene suscripción para descarga Powerpack "
+#~ msgstr "Su cuenta de Mageia no tiene suscripción para descarga Powerpack "
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
 #~ "dMB)"
@@ -723,8 +723,8 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgstr "Reintentar"
 #~ msgid "Congratulations"
 #~ msgstr "Felicitaciones"
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "La actualización a Mandriva %s ha sido exitosa."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "La actualización a Mageia %s ha sido exitosa."
 #~ msgid "You must restart your system."
 #~ msgstr "Debe reiniciar su sistema."
 #~ msgid "Reboot"
@@ -744,9 +744,9 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Una nueva versión de Mandriva Linux está disponible"
+#~ msgstr "Una nueva versión de Mageia Linux está disponible"
 
 #, fuzzy
 #~ msgid "You are using '%s' distribution."
@@ -757,9 +757,9 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgstr "Sí"
 #~ msgid "No"
 #~ msgstr "No"
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online parece haber sido reinstalado, volviendo a cargar "
+#~ "Mageia Online parece haber sido reinstalado, volviendo a cargar "
 #~ "applet..."
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Verificando... Están disponibles actualizaciones\n"
@@ -769,8 +769,8 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgstr "Falló la apertura de la base de datos urpmi"
 #~ msgid "Connecting to"
 #~ msgstr "Conectando con"
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Applet Mandriva Linux Update"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Applet Mageia Linux Update"
 #~ msgid "Security error"
 #~ msgstr "Error de seguridad"
 #~ msgid "Generic error (machine already registered)"
@@ -812,7 +812,7 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgid "Service error"
 #~ msgstr "Error del servicio"
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
 #~ "Los servicios web de mandriva están inaccesibles de momento\n"
@@ -820,18 +820,18 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgid "Password mismatch"
 #~ msgstr "Las contraseñas no coinciden"
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
 #~ "Los servicios web de mandriva están en mantenimiento\n"
 #~ "Inténtelo más luego por favor"
 #~ msgid "User Forbidden"
 #~ msgstr "Nombre de usuario prohibido"
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Cuenta de usuario prohibida por los servicios web de Mandriva"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Cuenta de usuario prohibida por los servicios web de Mageia"
 #~ msgid "Connection error"
 #~ msgstr "Error de conexión"
-#~ msgid "Mandriva web services not reachable"
+#~ msgid "Mageia web services not reachable"
 #~ msgstr "Los servicios web de mandriva están inaccesibles de momento"
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -858,12 +858,12 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ "\n"
 #~ "%s"
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "La versión del cliente Mandriva Online es demasiado antigua.\n"
+#~ "La versión del cliente Mageia Online es demasiado antigua.\n"
 #~ "\n"
 #~ "Necesita actualizar a una nueva versión. Puede obtenerla de http://start."
 #~ "mandriva.com"
@@ -909,9 +909,9 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgstr "Versión muy antigua no soportada por el servicio"
 #~ msgid "Unknown state"
 #~ msgstr "Estado desconocido"
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Servicios en línea deshabilitados. Contacte al sitio Mandriva Online\n"
+#~ "Servicios en línea deshabilitados. Contacte al sitio Mageia Online\n"
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Contraseña incorrecta\n"
 #~ msgid "Wrong Action or host or login.\n"
@@ -928,8 +928,8 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgstr ""
 #~ "Un problema ocurrió durante la conexión con el servidor, por favor, "
 #~ "póngase en contacto con el equipo de apoyo"
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Respuesta desde el servidor de Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Respuesta desde el servidor de Mageia Online\n"
 #~ msgid "No check"
 #~ msgstr "Sin verificación"
 #~ msgid "Checking config file: Not present\n"
@@ -940,14 +940,14 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgstr "Limpiar"
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versión %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Este es software libre y puede volver a ser distribuido bajo los términos "
 #~ "de la GNU GPL.\n"
 #~ "\n"
@@ -985,10 +985,10 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ "útiles.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Creación de cuentas o autentificación"
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
 #~ "Introduzca su nombre de usuario, contraseña y nombre de máquina de "
-#~ "Mandriva Online:"
+#~ "Mageia Online:"
 #~ msgid "Email address:"
 #~ msgstr "Dirección de correo:"
 #~ msgid "Country"
@@ -1001,13 +1001,13 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgstr ""
 #~ "El nombre de máquina puede sólo contener de 1 a 40 caracteres "
 #~ "alfanuméricos"
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Conectando al sitio web Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Conectando al sitio web Mageia Online..."
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1022,10 +1022,10 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Parar beneficiarse de los servicios de Mandriva Online,\n"
+#~ "Parar beneficiarse de los servicios de Mageia Online,\n"
 #~ "vamos a transferir su configuración.\n"
 #~ "\n"
-#~ "El asistente enviará ahora la siguiente información a Mandriva:\n"
+#~ "El asistente enviará ahora la siguiente información a Mageia:\n"
 #~ "\n"
 #~ "1) los paquetes que tiene instalados en su sistema.\n"
 #~ "\n"
@@ -1042,8 +1042,8 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr ""
 #~ "Ocurrieron problemas al enviar archivos, por favor intentelo de nuevo"
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Crear una cuenta en Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Crear una cuenta en Mageia Online"
 #~ msgid "Greeting:"
 #~ msgstr "Tratamiento:"
 #~ msgid "First name:"
@@ -1065,36 +1065,36 @@ msgstr "No se puede actualizar paquetes desde el soporte update_source.\n"
 #~ msgid "Creating account failed!"
 #~ msgstr "¡Falló la cración de la cuenta!"
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Cuenta de Mandriva Online creada con éxito.\n"
+#~ "Cuenta de Mageia Online creada con éxito.\n"
 #~ "Por favor, pulse \"Siguiente\" para autentificarse y enviar su "
 #~ "configuración\n"
 #~ msgid "Your upload was successful!"
 #~ msgstr "Actualización exitosa"
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Desde ahora, recibirá anuncions de seguridad\n"
-#~ "y actualizaciones gracias a Mandriva Online."
+#~ "y actualizaciones gracias a Mageia Online."
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online le ofrece la posibilidad de automatizar las "
+#~ "Mageia Online le ofrece la posibilidad de automatizar las "
 #~ "actualizaciones.\n"
 #~ "Se ejecutará regularmente un programa  en su sistema a la espera de "
 #~ "nuevas actualizaciones\n"
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Su cuenta de Mandriva Online se ha configurado con éxito\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Su cuenta de Mageia Online se ha configurado con éxito\n"
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Configuración enviada con éxito"
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Problema enviando la configuración"
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "No se pudo conectar con el sitio web de mandrivaonline: nombre de usuario/"
diff --git a/po/et.po b/po/et.po
index 797657a4..4a3b7460 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-07 22:59+0200\n"
@@ -32,10 +32,10 @@ msgstr "Teie süsteemis pole midagi uuendada"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Teenuse seadistamise probleem. Palun kontrollige logisid ja saatke e-kiri "
-"aadressile support@mandrivaonline.com"
+"aadressile support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -49,8 +49,8 @@ msgstr "Teie süsteemile on uuendusi"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Ilmunud on Mandriva Linuxi distributsiooni uus versioon"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Ilmunud on Mageia Linuxi distributsiooni uus versioon"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -159,8 +159,8 @@ msgstr "Drakconnecti käivitamine\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linuxi distributsiooni uus versioon"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linuxi distributsiooni uus versioon"
 
 #: ../mdkapplet:464
 #, c-format
@@ -169,8 +169,8 @@ msgstr "Sirvi"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Ilmunud on Mandriva Linuxi distributsiooni uus versioon."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Ilmunud on Mageia Linuxi distributsiooni uus versioon."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -217,10 +217,10 @@ msgstr "Loobu"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Selle Mandriva Linuxi süsteemi hooldusperiood on läbi. See tähendab, et Te "
+"Selle Mageia Linuxi süsteemi hooldusperiood on läbi. See tähendab, et Te "
 "ei saa enam tarkvara uuendusi."
 
 #: ../mdkapplet:514
@@ -230,8 +230,8 @@ msgstr "Hoidmaks süsteemi turvalisena, võite"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -301,8 +301,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate'i käivitamine\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate'i käivitamine\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -321,18 +321,18 @@ msgstr "Võrgu kontroll: paistab, et võrk ei tööta\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Autoriõigus (C) %s: Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Autoriõigus (C) %s: %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online võimaldab kasutada Mandriva veebiteenuseid."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online võimaldab kasutada Mageia veebiteenuseid."
 
 #: ../mdkapplet:899
 #, c-format
@@ -402,8 +402,8 @@ msgstr "Kas soovite lisada täiendava andmekandja?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -435,10 +435,10 @@ msgstr "Distributsiooni nimekirja hankimine nurjus:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva pakub uuendusi töölauale 12 kuud (kuni %s) ja baassüsteemile 18 "
+"Mageia pakub uuendusi töölauale 12 kuud (kuni %s) ja baassüsteemile 18 "
 "kuud (kuni %s)."
 
 #: ../mdkapplet-add-media-helper:167
@@ -472,8 +472,8 @@ msgstr "Tekkis viga"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Teie Mandriva kontol ei ole %s allalaadimine tellitud."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Teie Mageia kontol ei ole %s allalaadimine tellitud."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -533,18 +533,18 @@ msgstr "Enterprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack pakub Teile parimaid Linuxi kogemusi töölaual: avatud "
-"lähtekoodi stabiilsus ja tõhusus käsikäes eksklusiivse tarkvara ja Mandriva "
+"Mageia Powerpack pakub Teile parimaid Linuxi kogemusi töölaual: avatud "
+"lähtekoodi stabiilsus ja tõhusus käsikäes eksklusiivse tarkvara ja Mageia "
 "ametliku tugiteenusega."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linuxi omadused"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linuxi omadused"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -593,35 +593,35 @@ msgstr "%s on nüüd saadaval, Te võite valida:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
-msgstr "Mandriva Linux veel rohkema tarkvaraga ja ametliku tugiteenusega."
+msgstr "Mageia Linux veel rohkema tarkvaraga ja ametliku tugiteenusega."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -637,14 +637,14 @@ msgstr "Distributsiooni uuendamine"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versioon %s\n"
-"Autoriõigus (C) %s Mandriva.\n"
+"Autoriõigus (C) %s Mageia.\n"
 "See on vabavara, mida võib levitada vastavalt GNU Üldise Avaliku Litsentsi "
 "tingimustele.\n"
 "\n"
@@ -657,8 +657,8 @@ msgstr "  --help\t\t- selle abiteate näitamine.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update käivitatakse automaatselt.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update käivitatakse automaatselt.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -667,8 +667,8 @@ msgstr "  --mnf\t\t\t- käivitatakse MNF-spetsiifilised skriptid.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update'i tekstiversioon.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update'i tekstiversioon.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -688,12 +688,12 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ "otsustanud internetitellimuse kasuks"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Teie Mandriva kontol ei ole hooldusperioodi pikendamine tellitud."
+#~ msgstr "Teie Mageia kontol ei ole hooldusperioodi pikendamine tellitud."
 
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Kas Teile meeldiks Powerpack?"
@@ -703,7 +703,7 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ "and get Powerpack subscription."
 #~ msgstr ""
 #~ "Et Teil pole hangitud Powerpacki kasutamise õigusi, võiksite külastada "
-#~ "Mandriva poodi ja hankida sealt Powerpacki tellimuse."
+#~ "Mageia poodi ja hankida sealt Powerpacki tellimuse."
 
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Hangi Powerpacki tellimus!"
@@ -722,9 +722,9 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgstr "Loobu ja uuenda vaba versiooni"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Teie Mandriva kontol ei ole Powerpacki allalaadimine tellitud."
+#~ msgstr "Teie Mageia kontol ei ole Powerpacki allalaadimine tellitud."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -745,8 +745,8 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Õnnitlused!"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Uuendamine ja Mandriva väljalaske %s paigaldamine õnnestus."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Uuendamine ja Mageia väljalaske %s paigaldamine õnnestus."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Nüüd tuleb süsteem uuesti käivitada."
@@ -769,10 +769,10 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgstr "Viga andmekandja lisamisel"
 
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""
-#~ "Teie süsteemi paigaldatud Mandriva Linuxi versioon ei ole enam toetatud."
+#~ "Teie süsteemi paigaldatud Mageia Linuxi versioon ei ole enam toetatud."
 
 #~ msgid "Get long term support for your currently installed distribution"
 #~ msgstr "Hankida praegu paigaldatud distributsioonile pikaajalise toetuse"
@@ -792,9 +792,9 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgid "No"
 #~ msgstr "Ei"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online paistab olevat uuesti paigaldatud, aplett laaditakse "
+#~ "Mageia Online paistab olevat uuesti paigaldatud, aplett laaditakse "
 #~ "uuesti..."
 
 #~ msgid "Checking... Updates are available\n"
@@ -809,8 +809,8 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Ühendumine saidiga"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linuxi uuenduste aplett"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linuxi uuenduste aplett"
 
 #~ msgid "Security error"
 #~ msgstr "Turvalisusviga"
@@ -867,33 +867,33 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgstr "Teenuse viga"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva veebiteenused pole praegu kättesaadavad\n"
+#~ "Mageia veebiteenused pole praegu kättesaadavad\n"
 #~ "Palun proovige hiljem uuesti"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Paroolid ei lange kokku"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva veebiteenuseid parajasti hooldatakse\n"
+#~ "Mageia veebiteenuseid parajasti hooldatakse\n"
 #~ "Palun proovige hiljem uuesti"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Kasutaja keelatud"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Kasutajakontol pole lubatud ligipääs Mandriva veebiteenustele"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Kasutajakontol pole lubatud ligipääs Mageia veebiteenustele"
 
 #~ msgid "Connection error"
 #~ msgstr "Ühenduse viga"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Mandriva veebiteenused pole kättesaadavad"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Mageia veebiteenused pole kättesaadavad"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -925,12 +925,12 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Mandriva Online'i klient on liiga vana versiooniga.\n"
+#~ "Mageia Online'i klient on liiga vana versiooniga.\n"
 #~ "\n"
 #~ "Teil tuleb uuendada see värskema versioonini. Selle leiab aadressilt "
 #~ "http://start.mandriva.com"
@@ -995,9 +995,9 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Tundmatu olek"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Võrguteenused ei ole lubatud. Ühendumine Mandriva Online'i saidiga\n"
+#~ "Võrguteenused ei ole lubatud. Ühendumine Mageia Online'i saidiga\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Vale parool.\n"
@@ -1019,8 +1019,8 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ "Serveriga ühendumisel tekkis probleem, palun võtke ühendust "
 #~ "tugimeeskonnaga"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Mandriva Online'i serveri vastus\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Mageia Online'i serveri vastus\n"
 
 #~ msgid "No check"
 #~ msgstr "Pole kontrollitud"
@@ -1036,14 +1036,14 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdkonline versioon %s\n"
-#~ "Autoriõigus (C) %s Mandriva.\n"
+#~ "Autoriõigus (C) %s Mageia.\n"
 #~ "See on vabavara, mida võib levitada vastavalt GNU Üldise Avaliku "
 #~ "Litsentsi tingimustele.\n"
 #~ "\n"
@@ -1094,9 +1094,9 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Konto loomine või autentimine"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Sisestage oma Mandriva Online'i kasutajatunnus, parool ja masina nimi:"
+#~ "Sisestage oma Mageia Online'i kasutajatunnus, parool ja masina nimi:"
 
 #~ msgid "Email address:"
 #~ msgstr "E-posti aadress:"
@@ -1113,14 +1113,14 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Haakepunkti nimi tohib sisaldada vaid 1 kuni 40 tähte ja numbrit"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Ühendumine Mandriva Online'i saidiga..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Ühendumine Mageia Online'i saidiga..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1135,10 +1135,10 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Et saaksite kasu Mandriva Online'i teenustest,\n"
+#~ "Et saaksite kasu Mageia Online'i teenustest,\n"
 #~ "saadame praegu teele Teie konfiguratsiooni.\n"
 #~ "\n"
-#~ "Nõustaja saadab nüüd Mandrivale järgmise info:\n"
+#~ "Nõustaja saadab nüüd Mageiale järgmise info:\n"
 #~ "\n"
 #~ "1) Teie süsteemi paigaldatud pakettide nimekiri\n"
 #~ "\n"
@@ -1157,8 +1157,8 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Tekkis viga failide saatmisel, palun proovige uuesti"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Online'i konto loomine"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Online'i konto loomine"
 
 #~ msgid "Greeting:"
 #~ msgstr "Tiitel:"
@@ -1189,10 +1189,10 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgstr "Konto loomine ebaõnnestus!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Mandriva Online'i konto edukalt loodud.\n"
+#~ "Mageia Online'i konto edukalt loodud.\n"
 #~ "Palun klõpsake nupule \"Järgmine\" autentimiseks ja oma konfiguratsiooni "
 #~ "saatmiseks\n"
 
@@ -1201,21 +1201,21 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Nüüdsest alates saate tänu Mandriva Online'ile \n"
+#~ "Nüüdsest alates saate tänu Mageia Online'ile \n"
 #~ "teateid turvaparanduste ja uuenduste kohta."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online pakub võimalust uuendamine automaatseks muuta.\n"
+#~ "Mageia Online pakub võimalust uuendamine automaatseks muuta.\n"
 #~ "Selleks käivitatakse Teie arvutis regulaarselt rakendus, mis otsib "
 #~ "uuendusi\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Teie Mandriva Online'i konto on edukalt loodud\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Teie Mageia Online'i konto on edukalt loodud\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Konfiguratsiooni saatmine õnnestus"
@@ -1224,14 +1224,14 @@ msgstr "Pakettide uuendamine update_source andmekandjalt nurjus.\n"
 #~ msgstr "Probleem konfiguratsiooni saatmisel"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "Mandriva Online'i veebileheküljega ei õnnestunud ühendust luua: vigane "
+#~ "Mageia Online'i veebileheküljega ei õnnestunud ühendust luua: vigane "
 #~ "kasutajatunnus/parool või sobimatud ruuteri/tulemüüri seadistused"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- käivitatakse Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- käivitatakse Mageia Update.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Uuenduste nimekirja hankimine ebaõnnestus: %s"
diff --git a/po/eu.po b/po/eu.po
index 974f2baa..a13326e9 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,12 +1,12 @@
 # translation of mdkonline.po to Euskara
-# EUSKARA: Mandriva Linux translation.
+# EUSKARA: Mageia Linux translation.
 # Copyright (C) 2001 Mandriva S.A.
 #
 # Iñigo Salvador Azurmendi <xalba@euskalnet.net>, 2001-2002,2003, 2004, 2005, 2006, 2008, 2009, 2010.
 # Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-29 21:26+0200\n"
@@ -33,10 +33,10 @@ msgstr "Zure sistema eguneratuta dago"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Zerbitzuaren konfigurazio arazoa. Mesedez aztertu erregistroak eta bidali "
-"posta support@mandrivaonline.com helbidera"
+"posta support@mageiaonline.com helbidera"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,8 +50,8 @@ msgstr "Zure sistemarentzako eguneraketa berriak eskuragarri daude"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mandriva Linux banaketaren bertsio berri bat kaleratu da"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mageia Linux banaketaren bertsio berri bat kaleratu da"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -163,8 +163,8 @@ msgstr "drakconect abiarazten\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linux banaketaren bertsio berria"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linux banaketaren bertsio berria"
 
 #: ../mdkapplet:464
 #, c-format
@@ -173,8 +173,8 @@ msgstr "Arakatu"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mandriva Linux banaketaren bertsio berri bat kaleratu da."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mageia Linux banaketaren bertsio berri bat kaleratu da."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -221,10 +221,10 @@ msgstr "Utzi"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Mandriva Linux bertsio honentzako mantenua amaitu da. Ez dira sistema "
+"Mageia Linux bertsio honentzako mantenua amaitu da. Ez dira sistema "
 "honentzako eguneraketa gehiago hornituko."
 
 #: ../mdkapplet:514
@@ -234,8 +234,8 @@ msgstr "Zure sistema seguru mantentzeko, egin dezakezu:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -307,8 +307,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate abiarazten\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate abiarazten\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -327,18 +327,18 @@ msgstr "Sare egiaztaketa: desgaituta dagoela dirudi\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online-k Mandriva web zerbitzuetara sarbidea ematen du."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online-k Mageia web zerbitzuetara sarbidea ematen du."
 
 #: ../mdkapplet:899
 #, c-format
@@ -408,8 +408,8 @@ msgstr "Pakete gordetegi osagarri hau erantsi nahi duzu?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -441,10 +441,10 @@ msgstr "Akatsa banaketen zerrenda eskuratzerakoan:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandrivak banaketetan 12 hilabetez mahaigainaren eguneraketak hornitzen ditu "
+"Mageiak banaketetan 12 hilabetez mahaigainaren eguneraketak hornitzen ditu "
 "(%s arte) eta 18 hilabez oinarriaren eguneraketak (%s arte)."
 
 #: ../mdkapplet-add-media-helper:167
@@ -479,8 +479,8 @@ msgstr "Akats bat gertatu da"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Zure Mandriva kontuak ez dauka %s jaisteko harpidetza gaituta."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Zure Mageia kontuak ez dauka %s jaisteko harpidetza gaituta."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -540,18 +540,18 @@ msgstr "Enpresa"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack-ek mahaigainerako Linux esperientziarik onena ekartzen "
+"Mageia Powerpack-ek mahaigainerako Linux esperientziarik onena ekartzen "
 "dizu: iturburu irekiko ebazpideen egonkortasun eta eraginkortasuna, software "
-"esklusibo eta Mandrivaren euskarri ofizialarekin batera."
+"esklusibo eta Mageiaren euskarri ofizialarekin batera."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux-en ezaugarriak"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux-en ezaugarriak"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -600,36 +600,36 @@ msgstr "%s eskuragarri dago orain, honetara bertsio berritu dezakezu:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"Mandriva Linux banaketa oraindik software gehiago eta euskarri ofizialarekin."
+"Mageia Linux banaketa oraindik software gehiago eta euskarri ofizialarekin."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -645,14 +645,14 @@ msgstr "Banaketaren Bertsio berritzea"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate %s bertsioa\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Software librea da, eta birbana daiteke GNU GPL lizentziaren baldintzak "
 "betetzen badira.\n"
 "\n"
@@ -665,8 +665,8 @@ msgstr "  --help\t\t- laguntza-mezu hau inprimatzen du.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update automatikoki abiarazten du.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update automatikoki abiarazten du.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -675,8 +675,8 @@ msgstr "  --mnf\t\t\t- jaurti mnf script espezifikoak.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update-ren testu moduko bertsioa.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update-ren testu moduko bertsioa.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -696,23 +696,23 @@ msgstr "Ezin dira update_source euskarritik paketeak eguneratu.\n"
 #~ "izen eman duzunean"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Zure Mandriva kontuak ez dauka Mantenu Hedapen harpidetza gaituta."
+#~ msgstr "Zure Mageia kontuak ez dauka Mantenu Hedapen harpidetza gaituta."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Lerroko harpidetza"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Zure Mandriva kontuak ez dauka Powerpack jaisteko harpidetza gaituta."
+#~ "Zure Mageia kontuak ez dauka Powerpack jaisteko harpidetza gaituta."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -733,8 +733,8 @@ msgstr "Ezin dira update_source euskarritik paketeak eguneratu.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Zorionak"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Bertsio berritza Mandriva %s askapenera arrakastatsua izan da."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Bertsio berritza Mageia %s askapenera arrakastatsua izan da."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Zure sistema berrabiatu behar duzu."
@@ -758,9 +758,9 @@ msgstr "Ezin dira update_source euskarritik paketeak eguneratu.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Mandriva Linux banaketaren bertsio berri bat kaleratu da."
+#~ msgstr "Mageia Linux banaketaren bertsio berri bat kaleratu da."
 
 #~ msgid "MES5"
 #~ msgstr "MES5"
diff --git a/po/fa.po b/po/fa.po
index 5fd34a57..3ee7c4a7 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-fa\n"
+"Project-Id-Version: mgaonline-fa\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-02-05 04:12-0500\n"
@@ -35,10 +35,10 @@ msgstr "سیستم‌تان بروز است"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "اشکال تنظیم سرویس. لطفا ثبت‌ها را کنترل کرده و پستی را به "
-"support@mandrivaonline.com ارسال کنید"
+"support@mageiaonline.com ارسال کنید"
 
 #: ../mdkapplet:90
 #, c-format
@@ -52,7 +52,7 @@ msgstr "بروزسازی‌هایی برای سیستم‌تان در دسترس
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -158,7 +158,7 @@ msgstr "راه انداختن drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -168,7 +168,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -216,7 +216,7 @@ msgstr "لغو"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -227,7 +227,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
 #: ../mdkapplet:526
@@ -290,8 +290,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "به راه انداختن MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "به راه انداختن MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -310,17 +310,17 @@ msgstr "بررسی کردن شبکه: بنظر از کار افتاده است\n
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -389,7 +389,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -422,7 +422,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -455,7 +455,7 @@ msgstr "خطائی رخ داد"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -516,14 +516,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
 #: ../mdkapplet_gui.pm:213
@@ -573,33 +573,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr "ﻡﺎﻧﺩﺭیﺑﺍ بر اینترنت"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -617,14 +617,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate نسخه %s\n"
-"حق نسخه‌برداری (C) %s Mandriva.\n"
+"حق نسخه‌برداری (C) %s Mageia.\n"
 "این نرم‌ افزار آزاد است ومی‌تواند تحت شروط GNU GPL پخش مجدد گردد.\n"
 "\n"
 "طرز استفاده:\n"
@@ -636,8 +636,8 @@ msgstr "  --help\t\t- چاپ این پیام راهنما.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update بطور خودکار اجرا شد.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update بطور خودکار اجرا شد.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -646,8 +646,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - اجرای Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - اجرای Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -696,9 +696,9 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgid "No"
 #~ msgstr "نه"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "بنظر می‌رسد که Mandriva Online نصب مجدد شده است، برنامک بارگذاری مجدد "
+#~ "بنظر می‌رسد که Mageia Online نصب مجدد شده است، برنامک بارگذاری مجدد "
 #~ "می‌شود ..."
 
 #~ msgid "Checking... Updates are available\n"
@@ -711,7 +711,7 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgid "Connecting to"
 #~ msgstr "در حال اتصال به"
 
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "برنامک بروزسازی ﻡﺎﻧﺩﺭیﺑﺍ "
 
 #, fuzzy
@@ -838,9 +838,9 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgid "Unknown state"
 #~ msgstr "وضعیت ناشناخته"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "سرویس‌های اینترنتی از کار افتاده‌اند. با وبگاه Mandriva Online تماس بگیرید\n"
+#~ "سرویس‌های اینترنتی از کار افتاده‌اند. با وبگاه Mageia Online تماس بگیرید\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "گذرواژه‌ی اشتباه\n"
@@ -861,8 +861,8 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgstr ""
 #~ "اشکالی هنگام اتصال به کارگزار رخ داد، لطفا با گروه پشتیبانی تماس بگیرید"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "پاسخ از کارگزار Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "پاسخ از کارگزار Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "بدون بررسی"
@@ -878,14 +878,14 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline نسخه %s\n"
-#~ "حق نسخه‌برداری (C) %s Mandriva.\n"
+#~ "حق نسخه‌برداری (C) %s Mageia.\n"
 #~ "این نرم‌ افزار آزاد است ومی‌تواند تحت شروط GNU GPL پخش مجدد گردد.\n"
 #~ "\n"
 #~ "طرز استفاده:\n"
@@ -917,8 +917,8 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgid "Account creation or authentication"
 #~ msgstr "ایجاد حساب یا تأیید هویت"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "نام ماشین، گذرواژه و ثبت‌ورود Mandriva Online خود را وارد کنید:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "نام ماشین، گذرواژه و ثبت‌ورود Mageia Online خود را وارد کنید:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -934,14 +934,14 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "نقاط سوارسازی فقط باید حاوی نویسه‌های الفبا باشند"
 
-#~ msgid "Connecting to Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
 #~ msgstr "در حال اتصال به وبگاه اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ ..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -979,8 +979,8 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "اشکالی هنگام باردهی پرونده‌ها رخ داد، لطفا دوباره تلاش کنید"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "ایجاد حساب Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "ایجاد حساب Mageia Online"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -1011,7 +1011,7 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgstr "نشانی پست معتبری نیست!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
 #~ "حساب اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ با موفقیت ایجاد گردید.\n"
@@ -1022,20 +1022,20 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "از اکنون شما آگهی‌های بروزسازی‌های امنیتی را به\n"
-#~ "لطف Mandriva Online دریافت خواهید کرد."
+#~ "لطف Mageia Online دریافت خواهید کرد."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online به شما توانائی بروزسازی خودکار را ارائه می‌دهد.\n"
+#~ "Mageia Online به شما توانائی بروزسازی خودکار را ارائه می‌دهد.\n"
 #~ "برنامه‌ای در سیستم‌تان بطور متناوب اجرا شده و منتظر بروزسازی‌های جدید خواهد "
 #~ "بود\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
 #~ msgstr "حساب اینترنتی ﻡﺎﻧﺩﺭیﺑﺍ شما با موفقیت پیکربندی شده است\n"
 
 #~ msgid "Configuration uploaded successfully"
@@ -1045,14 +1045,14 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgstr "اشکالی در باردهی پیکربندی وجود دارد"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "نمی‌توان به پایگاه mandrivaonline متصل شد: ثبت‌ورود/گذرواژه اشتباه یا "
 #~ "تنظیمهای بد مسیریاب/دیوارآتش"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- اجرای Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- اجرای Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "سیستم اشغال است. صبر کنید..."
@@ -1063,9 +1063,9 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "هیچ پرونده %s یافت نگردید. جادوگر mdkonline را نخست اجرا کنید"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update نتوانست با وبگاه تماس بگیرد، بعداً دوباره امتحانمی کنم.د"
+#~ "Mageia Update نتوانست با وبگاه تماس بگیرد، بعداً دوباره امتحانمی کنم.د"
 
 #~ msgid "Login:"
 #~ msgstr "ثبت‌ورود:"
@@ -1079,16 +1079,16 @@ msgstr "قادر نبودن به بروزسازی بسته‌ها از رسان�
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "ثبت‌ورود یا گذرواژه اشتباه بود.\n"
-#~ " یا باید دوباره آن را تایپ کنید، یا باید حساب جدیدی بر Mandriva Online "
+#~ " یا باید دوباره آن را تایپ کنید، یا باید حساب جدیدی بر Mageia Online "
 #~ "ایجاد کنید.\n"
-#~ " در مورد اخیر، به اولین گام برای اتصال به Mandriva Online برگردید.\n"
+#~ " در مورد اخیر، به اولین گام برای اتصال به Mageia Online برگردید.\n"
 #~ " توجه داشته باشید که باید نام ماشینی را همچنین ارائه کنید \n"
 #~ " (فقط نویسه‌های الفبایی مجازند) "
 
diff --git a/po/fi.po b/po/fi.po
index f0f5cf5e..eeb4e7d7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-fi\n"
+"Project-Id-Version: mgaonline-fi\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-13 21:11+0300\n"
@@ -40,10 +40,10 @@ msgstr "Järjestelmä on ajantasalla"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Palvelun asetusongelma. Tarkista lokit ja lähetä sähköpostia osoitteeseen "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -57,8 +57,8 @@ msgstr "Järjestelmälle on saatavilla päivityksiä"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mandriva Linux -jakelusta on saatavilla uusi versio"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mageia Linux -jakelusta on saatavilla uusi versio"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -169,8 +169,8 @@ msgstr "Käynnistetään drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linux -jakelun uusi versio"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linux -jakelun uusi versio"
 
 #: ../mdkapplet:464
 #, c-format
@@ -179,8 +179,8 @@ msgstr "Selaa"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mandriva Linux -jakelusta on saatavilla uusi versio."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mageia Linux -jakelusta on saatavilla uusi versio."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -227,10 +227,10 @@ msgstr "Peruuta"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Tämän Mandriva Linux -järjestelmän ylläpito on loppunut. Uusia "
+"Tämän Mageia Linux -järjestelmän ylläpito on loppunut. Uusia "
 "ohjelmistopäivityksiä ei enää ilmesty."
 
 #: ../mdkapplet:514
@@ -240,8 +240,8 @@ msgstr "Pitääksesi järjestelmän turvattuna, voit:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -310,8 +310,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Käynnistetään MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Käynnistetään MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -330,18 +330,18 @@ msgstr "Tarkistetaan verkkoa: nähtävästi pois käytöstä\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s, Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s, %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online avaa pääsyn Mandrivan Internet-palveluihin."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online avaa pääsyn Mageian Internet-palveluihin."
 
 #: ../mdkapplet:899
 #, c-format
@@ -412,8 +412,8 @@ msgstr "Asennetaanko lisäpakettilähde?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -445,10 +445,10 @@ msgstr "Virhe noudettaessa listaa jakeluista:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva tarjoaa 12 kuukauden ajan päivityksiä työpöytäsovelluksiin (%s "
+"Mageia tarjoaa 12 kuukauden ajan päivityksiä työpöytäsovelluksiin (%s "
 "asti) ja 18 kuukauden ajan jakelun peruspaketteihin (%s asti)."
 
 #: ../mdkapplet-add-media-helper:167
@@ -482,7 +482,7 @@ msgstr "Ilmeni virhe"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr "My.mandriva.com -tililtä ei löydy %sin lataustilausta."
 
 #: ../mdkapplet-add-media-helper:226
@@ -545,18 +545,18 @@ msgstr "Enterprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack tuo sinulle parhaan Linux kokemuksen työpöydälle: avoimen "
+"Mageia Powerpack tuo sinulle parhaan Linux kokemuksen työpöydälle: avoimen "
 "lähdekoodin perustuva vakaat ja tehokaat ratkaisut yhdistettynä "
-"eksklusiivisiin ohjelmistoihin ja Mandrivan viralliseen tukeen."
+"eksklusiivisiin ohjelmistoihin ja Mageian viralliseen tukeen."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux ominaisuudet"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux ominaisuudet"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -605,36 +605,36 @@ msgstr "%s on nyt saatavilla, voit pävittää tuotteeseen:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"Mandriva Linux jakelu jossa en viellä enemmän ohjelmistoja ja virallista "
+"Mageia Linux jakelu jossa en viellä enemmän ohjelmistoja ja virallista "
 "tukea."
 
 #: ../mdkonline.pm:199
@@ -651,14 +651,14 @@ msgstr "Jakelun päivitys"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versio %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Tämä on vapaata ohjelmistoa ja saadaan levittää uudelleen GNU GPL lisenssin "
 "alaisuudessa.\n"
 "\n"
@@ -671,8 +671,8 @@ msgstr "  --help\t\t- tulosta tämä viesti.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update käynnistetään automaattisesti.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update käynnistetään automaattisesti.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -681,8 +681,8 @@ msgstr "  --mnf\t\t\t- käynnistä mnf-aiheiset skriptit.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- tekstipohjainen Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- tekstipohjainen Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -702,13 +702,13 @@ msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 #~ "lisätä Online-tilauksen jälkeen."
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr "My.mandriva.com -tililtä ei löydy tilattua ylläpitolaajennusta."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Haluatko Powerpackin?"
@@ -717,7 +717,7 @@ msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 #~ "Since you don't have Powerpack rights you may visit mandriva store now "
 #~ "and get Powerpack subscription."
 #~ msgstr ""
-#~ "Koska sinulla ei ole oikeuksia Powerpackiin, voit vierailla Mandrivan "
+#~ "Koska sinulla ei ole oikeuksia Powerpackiin, voit vierailla Mageian "
 #~ "nettikaupassa ja hankkia Powerpackin."
 
 #~ msgid "Get Powerpack subscription!"
@@ -737,7 +737,7 @@ msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 #~ msgstr "Peruuta ja päivitä Free-versioon"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr "My.mandriva.com -tililtä ei löydy PowerPackin lataustilausta."
 
@@ -760,8 +760,8 @@ msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Onnittelut"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Päivitys Mandriva %s -julkaisuun onnistui."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Päivitys Mageia %s -julkaisuun onnistui."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Järjestelmä tulee käynnistää uudelleen."
@@ -784,9 +784,9 @@ msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 #~ msgstr "Virhe lisättäessä lähdettä"
 
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Asennettu Mandriva Linuxin versio ei ole enää tuettu."
+#~ msgstr "Asennettu Mageia Linuxin versio ei ole enää tuettu."
 
 #~ msgid "Get long term support for your currently installed distribution"
 #~ msgstr "Hankkia pitkäaikaistuen tällä hetkellä asennettuna olevaan jakeluun"
@@ -807,9 +807,9 @@ msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 #~ msgid "No"
 #~ msgstr "Ei"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online on asennettu uudelleen, käynnistetäänsovelma uudestan ..."
+#~ "Mageia Online on asennettu uudelleen, käynnistetäänsovelma uudestan ..."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Tarkistetaan... Päivityksiä on saatavilla\n"
@@ -823,8 +823,8 @@ msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Yhdistetään kohteeseen"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandrivan päivityssovelma"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageian päivityssovelma"
 
 #~ msgid "Security error"
 #~ msgstr "Tietoturvavirhe"
@@ -881,33 +881,33 @@ msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 #~ msgstr "Palveluvirhe"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandrivan webbipalvelut eivät ole käytettävissä tällä hetkellä\n"
+#~ "Mageian webbipalvelut eivät ole käytettävissä tällä hetkellä\n"
 #~ "Ole hyvä ja yritä uudelleen myöhemmin"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Salasana ei täsmää"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandrivan webbipalvelut ovat huollon alla\n"
+#~ "Mageian webbipalvelut ovat huollon alla\n"
 #~ "Ole hyvä ja yritä uudelleen myöhemmin"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Käyttäjä kielletty"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Käyttäjätili estety Mandrivan webbipalveluissa"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Käyttäjätili estety Mageian webbipalveluissa"
 
 #~ msgid "Connection error"
 #~ msgstr "Yhteysvirhe"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Mandrivan webbipalvelut eivät ole saatavilla"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Mageian webbipalvelut eivät ole saatavilla"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -939,7 +939,7 @@ msgstr "Paketteja ei voitu päivittää update_source-lähteestä.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
diff --git a/po/fr.po b/po/fr.po
index 9aa9f35f..aba58576 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@
 # Christophe Berthelé <berthy@mandriva.org>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-fr\n"
+"Project-Id-Version: mgaonline-fr\n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-02-03 18:44+0100\n"
 "Last-Translator: Christophe Berthelé <berthy@mandriva.org>\n"
@@ -40,11 +40,11 @@ msgstr "Votre système est à jour"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problème lors de la configuration du service. Vérifiez les journaux et "
 "envoyez-les à : \n"
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -58,8 +58,8 @@ msgstr "De nouvelles mises à jour sont disponibles pour votre système"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Une nouvelle version de la distribution Mandriva Linux est disponible"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Une nouvelle version de la distribution Mageia Linux est disponible"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -74,7 +74,7 @@ msgstr "Le réseau n'est pas disponible. Vérifiez la configuration du réseau"
 #: ../mdkapplet:130
 #, c-format
 msgid "Service is not activated. Please click on \"Online Website\""
-msgstr "Service non activé. Cliquez sur « Site Mandriva Online »"
+msgstr "Service non activé. Cliquez sur « Site Mageia Online »"
 
 #: ../mdkapplet:135 ../mdkapplet:141
 #, c-format
@@ -85,7 +85,7 @@ msgstr "base de donnée urpmi verrouillée"
 #, c-format
 msgid "Release not supported (too old release, or development release)"
 msgstr ""
-"Cette version de Mandriva Linux n'est pas supportée (obsolète ou en "
+"Cette version de Mageia Linux n'est pas supportée (obsolète ou en "
 "développement)"
 
 #: ../mdkapplet:156
@@ -171,8 +171,8 @@ msgstr "Lancement de drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nouvelle version de la distribution Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nouvelle version de la distribution Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -181,8 +181,8 @@ msgstr "naviguer"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Une nouvelle version de la distribution Mandriva Linux est disponible."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Une nouvelle version de la distribution Mageia Linux est disponible."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -229,7 +229,7 @@ msgstr "Annuler"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 "La maintenance de ce système Linux est finie. Cela signifie qu'il ne recevra "
@@ -242,8 +242,8 @@ msgstr "Afin de conserver votre système sécurisé, vous pouvez :"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -315,8 +315,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Lancement de MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Lancement de MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -335,23 +335,23 @@ msgstr "Vérification de l'accès au réseau : il semble être désactivé\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s par Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s par %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online donne accès aux services web de Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online donne accès aux services web de Mageia."
 
 #: ../mdkapplet:899
 #, c-format
 msgid "Online WebSite"
-msgstr "Site Mandriva Online"
+msgstr "Site Mageia Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../mdkapplet:904
@@ -427,8 +427,8 @@ msgstr "Voulez-vous installer cette nouvelle source de paquetages ?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -462,10 +462,10 @@ msgstr "Errors lors de la récupération de la liste des distributions :"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva fournit 12 mois de mises à jour pour le bureau (jusqu'au %s) et 18 "
+"Mageia fournit 12 mois de mises à jour pour le bureau (jusqu'au %s) et 18 "
 "mois de support de base (jusqu'au %s) pour les distributions."
 
 #: ../mdkapplet-add-media-helper:167
@@ -499,9 +499,9 @@ msgstr "Une erreur est survenue"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
-"Votre compte Mandriva n'est pas abonné au service de téléchargement %s."
+"Votre compte Mageia n'est pas abonné au service de téléchargement %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -561,15 +561,15 @@ msgstr "Entreprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -618,33 +618,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -662,14 +662,14 @@ msgstr "Mise à niveau de la distribution"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate version %s\n"
-"Copyright © %s Mandriva.\n"
+"Copyright © %s Mageia.\n"
 "Ceci est un logiciel libre qui peut être redistribué selon les termes de la "
 "Licence Publique Générale GNU.\n"
 "\n"
@@ -682,8 +682,8 @@ msgstr "  --help\t\t- affiche ce message d'aide.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update est lancé automatiquement.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update est lancé automatiquement.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -692,8 +692,8 @@ msgstr "  --mnf\t\t\t- lance les scripts spécifiques à mnf. \n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- mode texte de Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- mode texte de Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -713,24 +713,24 @@ msgstr "Impossible de mettre à jour les paquetages du dépôt update_source.\n"
 #~ "paquetages une fois que vous êtes inscrit en ligne"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Votre compte Mandriva n'est pas abonné au service de maintenance étendue."
+#~ "Votre compte Mageia n'est pas abonné au service de maintenance étendue."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Inscription en ligne"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Votre compte Mandriva n'est pas abonné au service de téléchargement "
+#~ "Votre compte Mageia n'est pas abonné au service de téléchargement "
 #~ "Powerpack."
 
 #~ msgid ""
@@ -752,9 +752,9 @@ msgstr "Impossible de mettre à jour les paquetages du dépôt update_source.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Félicitations"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
+#~ msgid "Upgrade to Mageia %s release was successfull."
 #~ msgstr ""
-#~ "La mise à niveau vers la version Mandriva %s s'est terminée avec succès."
+#~ "La mise à niveau vers la version Mageia %s s'est terminée avec succès."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Vous devez redémarrer votre système."
@@ -778,10 +778,10 @@ msgstr "Impossible de mettre à jour les paquetages du dépôt update_source.\n"
 #~ msgstr "Échec lors de l'ajout du dépôt"
 
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""
-#~ "La version de Mandriva Linux installée sur votre système n'est plus "
+#~ "La version de Mageia Linux installée sur votre système n'est plus "
 #~ "supportée."
 
 #~ msgid "Get long term support for your currently installed distribution"
diff --git a/po/fur.po b/po/fur.po
index 223c876c..68574fcd 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2004-06-28 16:55+0200\n"
@@ -37,7 +37,7 @@ msgstr "Il sisteme al è atualizât\n"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 
 #: ../mdkapplet:90
@@ -52,7 +52,7 @@ msgstr "Nissune atualizazion dispunibile pal to sistem"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -158,7 +158,7 @@ msgstr "Fâs lâ drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -168,7 +168,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -216,7 +216,7 @@ msgstr "Scancele"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -227,8 +227,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Benvignût su Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Benvignût su Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -290,8 +290,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Inviament de MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Inviament de MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -310,17 +310,17 @@ msgstr "Controlant le rêt: e somee no facoltizade\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Benvignût su Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Benvignût su Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -389,7 +389,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -422,7 +422,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -455,7 +455,7 @@ msgstr "Al è intravignût un fal"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -516,15 +516,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Benvignût su Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Benvignût su Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -573,33 +573,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Benvignût su Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Benvignût su Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Benvignût su Mandriva Online"
+msgid "Mageia Free"
+msgstr "Benvignût su Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Benvignût su Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Benvignût su Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Benvignût su Mandriva Online"
+msgid "Mageia One"
+msgstr "Benvignût su Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Benvignût su Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Benvignût su Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -617,14 +617,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Chest software al è libar e al po sedi distribuît sot dai termins de GNU "
 "GPL.\n"
 "\n"
@@ -637,8 +637,8 @@ msgstr "  --help\t\t- stampe chest mes di jutori.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update inviât automatichementri.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update inviât automatichementri.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -647,8 +647,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - invie Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - invie Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -662,7 +662,7 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Benvignût su Mandriva Online"
+#~ msgstr "Benvignût su Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -698,9 +698,9 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgid "No"
 #~ msgstr "No"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online al somee sedi stât tornât a instalâ, o torni a cjariâ le "
+#~ "Mageia Online al somee sedi stât tornât a instalâ, o torni a cjariâ le "
 #~ "applet ...."
 
 #~ msgid "Checking... Updates are available\n"
@@ -713,8 +713,8 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Conesion in vore a"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Applet Atualizazions Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Applet Atualizazions Mageia Linux"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -834,8 +834,8 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Stât no cognossût"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Servizis Online no facoltizâs. Contate il sît Mandriva Online\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Servizis Online no facoltizâs. Contate il sît Mageia Online\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Password falade.\n"
@@ -851,8 +851,8 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ "impostazions di instradament, firewall o proxy)\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Benvignût su Mandriva Online"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Benvignût su Mageia Online"
 
 #~ msgid "No check"
 #~ msgstr "Nissun control"
@@ -868,14 +868,14 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Chest software al è libar e al po sedi distribuît sot dai termins de GNU "
 #~ "GPL.\n"
 #~ "\n"
@@ -894,9 +894,9 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ "maniere di tignîti informât su atualizazions di sigurece e utii "
 #~ "mioraments.\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Insede il to login, password e non dal computer par Mandriva Online:"
+#~ "Insede il to login, password e non dal computer par Mageia Online:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -909,14 +909,14 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgstr "Password:"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Benvignût su Mandriva Online"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Benvignût su Mageia Online"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -931,10 +931,10 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Par permetiti di podê doprâ i servizis Mandriva Online,\n"
+#~ "Par permetiti di podê doprâ i servizis Mageia Online,\n"
 #~ "o stin par cjariâ le to configurazion.\n"
 #~ "\n"
-#~ "Il Wizard al mandarâ a Mandriva les seguintis informazions:\n"
+#~ "Il Wizard al mandarâ a Mageia les seguintis informazions:\n"
 #~ "\n"
 #~ "1) le liste dai pachets che tu âs instalât tal to sisteme,\n"
 #~ "\n"
@@ -951,8 +951,8 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgid "Connection problem"
 #~ msgstr "Probleme di conession"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Cree un account Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Cree un account Mageia Online"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -992,16 +992,16 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Di cumò indenant, tu ricevarâs avîs su le sigurece\n"
-#~ " e su lis atualizazions graziis a Mandriva Online."
+#~ " e su lis atualizazions graziis a Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online a ti ufrìs le pussibilitât di automatizâ les "
+#~ "Mageia Online a ti ufrìs le pussibilitât di automatizâ les "
 #~ "atualizazions.\n"
 #~ "Un program in spiete di gnovis atualizazions al sarà fat partî "
 #~ "periodichementri\n"
@@ -1014,8 +1014,8 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Leture de configurazion in vore\n"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- invie Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- invie Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Il sisteme al è cjapât. Spiete ..."
@@ -1024,8 +1024,8 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgstr "Inviament de configurazion in vore..."
 
 #, fuzzy
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Online nol po sedi contatât, par plasè prove plui indenant"
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Online nol po sedi contatât, par plasè prove plui indenant"
 
 #~ msgid "Login:"
 #~ msgstr "Login:"
@@ -1037,16 +1037,16 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Il non utent o le password e son faladis.\n"
 #~ " Tu varâs di scriviju une altre volte, o tu varâs di bisugne di creâ un "
-#~ "account su Mandriva Online.\n"
-#~ "Tal secont câs, torne indaûr al prin pas par conetiti a Mandriva Online.\n"
+#~ "account su Mageia Online.\n"
+#~ "Tal secont câs, torne indaûr al prin pas par conetiti a Mageia Online.\n"
 #~ " Sta atent che tu às di furnî un non di computer \n"
 #~ " (dome caratars dal alfabet e son ametûts)"
 
@@ -1083,11 +1083,11 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgstr "Precedent"
 
 #, fuzzy
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "No ai un account Mandriva Online ma o vorès vêlu "
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "No ai un account Mageia Online ma o vorès vêlu "
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Politiche di Mandriva Linux su le privacy"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Politiche di Mageia Linux su le privacy"
 
 #~ msgid "Authentification"
 #~ msgstr "Autentificazion"
@@ -1105,8 +1105,8 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgstr "Sierant il Wizard\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
-#~ msgstr "Mandriva Online nol po sedi contatât, par plasè prove plui indenant"
+#~ "Mageia Online could not be contacted, please try again at a later time"
+#~ msgstr "Mageia Online nol po sedi contatât, par plasè prove plui indenant"
 
 #~ msgid "  --update       - Update keys\n"
 #~ msgstr "  --update       - Atualize clâf\n"
@@ -1126,8 +1126,8 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgid "Service deactivated. Waiting for payment..."
 #~ msgstr "Servizi no atîf. In spiete di paiament..."
 
-#~ msgid "Launch Mandriva Linux Update"
-#~ msgstr "Fâs lâ Mandriva Linux Update"
+#~ msgid "Launch Mageia Linux Update"
+#~ msgstr "Fâs lâ Mageia Linux Update"
 
 #~ msgid "Available"
 #~ msgstr "Disponibii"
@@ -1135,8 +1135,8 @@ msgstr "No si rive a atualizâ i pachets de font update_source.\n"
 #~ msgid "Checking ..."
 #~ msgstr "Controlant ..."
 
-#~ msgid "Attempting to connect to mandrivaonline.com\n"
-#~ msgstr "Cirint di conetissi a mandrivaonline.com\n"
+#~ msgid "Attempting to connect to mageiaonline.com\n"
+#~ msgstr "Cirint di conetissi a mageiaonline.com\n"
 
 #~ msgid "Creation"
 #~ msgstr "Creazion"
diff --git a/po/ga.po b/po/ga.po
index 33ed99fb..7a26c0eb 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -29,7 +29,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 
 #: ../mdkapplet:90
@@ -46,7 +46,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -146,7 +146,7 @@ msgstr ""
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -156,7 +156,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -204,7 +204,7 @@ msgstr "Cealaigh"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -215,8 +215,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Ionad Rialaithe Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -278,7 +278,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -298,17 +298,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "Mageia Online %s"
+msgstr "Ionad Rialaithe Mageia Linux"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -377,7 +377,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -410,7 +410,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -443,7 +443,7 @@ msgstr "Tharla earráid"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -504,15 +504,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Ionad Rialaithe Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -561,33 +561,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "Mageia Flash"
+msgstr "Ionad Rialaithe Mageia Linux"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "Mageia Free"
+msgstr "Ionad Rialaithe Mageia Linux"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "Mageia Mini"
+msgstr "Ionad Rialaithe Mageia Linux"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "Mageia One"
+msgstr "Ionad Rialaithe Mageia Linux"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Ionad Rialaithe Mandriva Linux"
+msgid "Mageia PowerPack"
+msgstr "Ionad Rialaithe Mageia Linux"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -605,7 +605,7 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -619,7 +619,7 @@ msgstr ""
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
 #: ../mdkupdate:66
@@ -629,7 +629,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
 #: ../mdkupdate:68
@@ -644,7 +644,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Ionad Rialaithe Mandriva Linux"
+#~ msgstr "Ionad Rialaithe Mageia Linux"
 
 #~ msgid "Installation failed"
 #~ msgstr "Theip ar shuiteáil"
diff --git a/po/gl.po b/po/gl.po
index 5a219e64..357ccf82 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-gl\n"
+"Project-Id-Version: mgaonline-gl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2008-03-30 15:40+0100\n"
@@ -32,10 +32,10 @@ msgstr "O seu sistema está actualizado"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problema na configuración do servicio. Por favor comprobe os logs e envíe un "
-"correo-e a support@mandrivaonline.com"
+"correo-e a support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -49,7 +49,7 @@ msgstr "Hai novas actualizacións dispoñibles para o seu sistema"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -157,7 +157,7 @@ msgstr "Executando drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -167,7 +167,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -215,7 +215,7 @@ msgstr "Cancelar"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -226,8 +226,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:526
 #, c-format
@@ -289,8 +289,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Executando MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Executando MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -309,18 +309,18 @@ msgstr "Comprobando a Rede: parece que está deshabilitada\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s de Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s de %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online da acceso ós servicios web de Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online da acceso ós servicios web de Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -388,7 +388,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -421,7 +421,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -454,7 +454,7 @@ msgstr "Ocorreu un erro"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -515,15 +515,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -572,33 +572,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online %s"
+msgid "Mageia Free"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online %s"
+msgid "Mageia Mini"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -616,14 +616,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versión %s\n"
-"Copyright © %s Mandriva.\n"
+"Copyright © %s Mageia.\n"
 "Isto é software libre e pode ser redistribuido baixo os termos da GNU GPL.\n"
 "\n"
 "uso:\n"
@@ -635,8 +635,8 @@ msgstr "  --help\t\t- amosa esta mensaxe de axuda.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- executar Mandriva Update automaticamente.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- executar Mageia Update automaticamente.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -645,8 +645,8 @@ msgstr "  --mnf\t\t\t- executa scripts mnf específicos.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- versión en modo texto de Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- versión en modo texto de Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -661,7 +661,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online %s"
+#~ msgstr "Mageia Online %s"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -699,9 +699,9 @@ msgstr ""
 #~ msgid "No"
 #~ msgstr "Non"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Semella ser que se reinstalou Mandriva Online, recargando applet ...."
+#~ "Semella ser que se reinstalou Mageia Online, recargando applet ...."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Comprobando... As actualizacións están dispoñibles\n"
@@ -715,8 +715,8 @@ msgstr ""
 #~ msgid "Connecting to"
 #~ msgstr "Conectando a"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Applet de Actualización de Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Applet de Actualización de Mageia Linux"
 
 #~ msgid "Security error"
 #~ msgstr "Erro de seguridade"
@@ -773,33 +773,33 @@ msgstr ""
 #~ msgstr "Erro do servicio"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Os servicios web de Mandriva non están dispoñibles\n"
+#~ "Os servicios web de Mageia non están dispoñibles\n"
 #~ "Por favor, inténteo de novo máis tarde"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Os contrasinais non coinciden"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Estáse realizando o mantemento dos servicios web de Mandriva\n"
+#~ "Estáse realizando o mantemento dos servicios web de Mageia\n"
 #~ "Por favor, inténteo de novo máis tarde"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Usuario Prohibido"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Conta de usuario prohibida polos servicios web de Mandriva"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Conta de usuario prohibida polos servicios web de Mageia"
 
 #~ msgid "Connection error"
 #~ msgstr "Erro de conexión"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Os servicios web de Mandriva non están dispoñibles"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Os servicios web de Mageia non están dispoñibles"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -831,12 +831,12 @@ msgstr ""
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "A versión do cliente de Mandriva Online é moi antiga.\n"
+#~ "A versión do cliente de Mageia Online é moi antiga.\n"
 #~ "\n"
 #~ "Cómpre actualizar a unha versión máis nova. Pode facelo en http://start."
 #~ "mandriva.com"
@@ -903,9 +903,9 @@ msgstr ""
 #~ msgid "Unknown state"
 #~ msgstr "Estado descoñecido"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Os sevicios en liña están deshabilitados. Contacte co sitio Mandriva "
+#~ "Os sevicios en liña están deshabilitados. Contacte co sitio Mageia "
 #~ "Online\n"
 
 #~ msgid "Wrong Password.\n"
@@ -928,8 +928,8 @@ msgstr ""
 #~ "Ocorreu un problema mentres se conectaba co servidor, por favor contacte "
 #~ "co equipo de soporte"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Resposta do servidor de Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Resposta do servidor de Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Sen comprobar"
@@ -945,14 +945,14 @@ msgstr ""
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versión %s\n"
-#~ "Copyright © %s Mandriva.\n"
+#~ "Copyright © %s Mageia.\n"
 #~ "Isto é software libre e pode redistribuirse baixo os termos da GNU GPL.\n"
 #~ "\n"
 #~ "uso:\n"
@@ -1002,9 +1002,9 @@ msgstr ""
 #~ msgid "Account creation or authentication"
 #~ msgstr "Creación da conta ou autenticación"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Introduza o seu login e contrasinal de Mandriva Online e o nome do "
+#~ "Introduza o seu login e contrasinal de Mageia Online e o nome do "
 #~ "ordenador:"
 
 #~ msgid "Email address:"
@@ -1022,14 +1022,14 @@ msgstr ""
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "O nome de máquina debe ter entre 1 e 40 caracteres alfanuméricos"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Conectando ó sitio web de Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Conectando ó sitio web de Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1044,10 +1044,10 @@ msgstr ""
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Para poder beneficiarse dos servicios de Mandriva Online,\n"
+#~ "Para poder beneficiarse dos servicios de Mageia Online,\n"
 #~ "estamos a piques de subir a súa configuración.\n"
 #~ "\n"
-#~ "O asistente vai envia-la seguinte información a Mandriva:\n"
+#~ "O asistente vai envia-la seguinte información a Mageia:\n"
 #~ "\n"
 #~ "1) a lista dos paquetes que ten instalados no seu sistema,\n"
 #~ "\n"
@@ -1068,8 +1068,8 @@ msgstr ""
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Ocorreu un problema ó subi-los ficheiros, inténteo de novo"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Crear unha Conta en Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Crear unha Conta en Mageia Online"
 
 #~ msgid "Greeting:"
 #~ msgstr "Benvida:"
@@ -1100,10 +1100,10 @@ msgstr ""
 #~ msgstr "Erro ó crea-la conta!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "A Conta de Mandriva Online creouse con éxito.\n"
+#~ "A Conta de Mageia Online creouse con éxito.\n"
 #~ "Prema \"Seguinte\" para autenticarse e subir a súa configuración\n"
 
 #~ msgid "Your upload was successful!"
@@ -1111,22 +1111,22 @@ msgstr ""
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Dende agora recibirá avisos referentes á seguridade \n"
-#~ "e ás actualizacións gracias a Mandriva Online."
+#~ "e ás actualizacións gracias a Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online ofrécelle a posibilidade de automatiza-las "
+#~ "Mageia Online ofrécelle a posibilidade de automatiza-las "
 #~ "actualizacións.\n"
 #~ "Un programa executarase regularmente no seu sistema agardando novas "
 #~ "actualizacións\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "A súa conta de Mandriva Online configurouse con éxito\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "A súa conta de Mageia Online configurouse con éxito\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "A configuración subiuse con éxito"
@@ -1135,14 +1135,14 @@ msgstr ""
 #~ msgstr "Problema ó subir a configuración"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "Non se puido conectar ó sitio web de mandrivaonline: nome de usuario/"
 #~ "contrasinal incorrecto ou mala configuración do encamiñador/cortalumes"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- executar Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- executar Mageia Update.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Non se puido obter a lista de actualizacións: %s"
diff --git a/po/he.po b/po/he.po
index 468a058d..d2080a7f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@
 # Dotan Kamber <kamberd@yahoo.com>, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2008-03-01 14:44+0200\n"
@@ -35,7 +35,7 @@ msgstr "המערכת מעודכנת"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "חלה תקלה בעת הגדרת השרות. באפשרותך לדווח על התקלה ל: support@mandrivaonline."
 "net"
@@ -52,7 +52,7 @@ msgstr "עדכונים חדשים זמינים עבור המערכת שלך"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -157,7 +157,7 @@ msgstr "מפעיל את drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -167,7 +167,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -215,7 +215,7 @@ msgstr "ביטול"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "מנדריבה-אונליין %s"
 
 #: ../mdkapplet:526
@@ -289,8 +289,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "מפעיל את MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "מפעיל את MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -309,17 +309,17 @@ msgstr "בודק זמינות רשת: אין תגובה\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr "מנדריבה-אונליין %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr "זכויות היוצרים (C) %s שמורות למנדריבה"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr "מנדריבה-אונליין מאפשר גישה לשירותי הרשת של מנדריבה."
 
 #: ../mdkapplet:899
@@ -388,7 +388,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -421,7 +421,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -454,7 +454,7 @@ msgstr "חלה שגיאה"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -515,14 +515,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "מנדריבה-אונליין %s"
 
 #: ../mdkapplet_gui.pm:213
@@ -572,33 +572,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "מנדריבה-אונליין %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "מנדריבה-אונליין %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "מנדריבה-אונליין %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "מנדריבה-אונליין %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr ""
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -616,14 +616,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate, גרסה %s\n"
-"כל הזכויות שמורות (C)  %s Mandriva.\n"
+"כל הזכויות שמורות (C)  %s Mageia.\n"
 "תוכנה זו היא חופשית וניתנת להפצה בהתאם לתנאי הרישיון של GNU GPL.\n"
 "\n"
 "שימוש:\n"
@@ -635,8 +635,8 @@ msgstr "  --help\t\t- הדפס הודעת עזרה זו.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t-Mandriva Update יופעל אוטומטי \n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t-Mageia Update יופעל אוטומטי \n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -645,7 +645,7 @@ msgstr "  --mnf\t\t\t- launch mnf specific scripts.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- גרסה טקסטואלית של אשף העדכונים.\n"
 
 #: ../mdkupdate:68
@@ -697,8 +697,8 @@ msgstr "לא ניתן לעדכן חבילות ממדיית update_source.\n"
 #~ msgid "No"
 #~ msgstr "לא"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-#~ msgstr "נראה ש Mandriva Online הותקן מחדש, טוען את היישומון ..."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
+#~ msgstr "נראה ש Mageia Online הותקן מחדש, טוען את היישומון ..."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "בודק... יש עדכונים זמינים\n"
@@ -712,7 +712,7 @@ msgstr "לא ניתן לעדכן חבילות ממדיית update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "מתחבר אל"
 
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "יישומון עדכוני מנדרייבה-לינוקס"
 
 #~ msgid "Security error"
@@ -770,7 +770,7 @@ msgstr "לא ניתן לעדכן חבילות ממדיית update_source.\n"
 #~ msgstr "שגיאת שירות"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
 #~ "שירותי הרשת של מנדריבה אינם זמינים כרגע\n"
@@ -780,7 +780,7 @@ msgstr "לא ניתן לעדכן חבילות ממדיית update_source.\n"
 #~ msgstr "הסיסמה לא תואמת"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
 #~ "שירותי הרשת של מנדריבה בתחזוקה\n"
@@ -789,13 +789,13 @@ msgstr "לא ניתן לעדכן חבילות ממדיית update_source.\n"
 #~ msgid "User Forbidden"
 #~ msgstr "המשתמש אסור"
 
-#~ msgid "User account forbidden by Mandriva web services"
+#~ msgid "User account forbidden by Mageia web services"
 #~ msgstr "חשבון המשתמש אסור על ידי שירותי הרשת של מנדריבה"
 
 #~ msgid "Connection error"
 #~ msgstr "שגיאת התחברות"
 
-#~ msgid "Mandriva web services not reachable"
+#~ msgid "Mageia web services not reachable"
 #~ msgstr "שירותי הרשת של מנדריבה אינם בנמצא"
 
 #~ msgid ""
@@ -826,7 +826,7 @@ msgstr "לא ניתן לעדכן חבילות ממדיית update_source.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
diff --git a/po/hi.po b/po/hi.po
index 38959e51..acb4e11a 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-hi\n"
+"Project-Id-Version: mgaonline-hi\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-08-21 14:31+0530\n"
@@ -33,10 +33,10 @@ msgstr "आपका तंत्र आज-तक अप-टू-डेट ह�
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "सेवा संरचना समस्या । कॄपया लॉग की जाँच करें और निम्न पते पर एक विपत्र संदेश भेजें "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,7 +50,7 @@ msgstr "आपके तंत्र हेतु नये अपडेट उ�
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -157,7 +157,7 @@ msgstr "ड्रैककनेक्ट को आरम्भ किया �
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -167,7 +167,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -215,7 +215,7 @@ msgstr "निरस्त"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -226,7 +226,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkapplet:526
@@ -289,7 +289,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, fuzzy, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr "एमडीकेअपडेट को आरम्भ किया जा रहा है\n"
 
 #: ../mdkapplet:719
@@ -309,17 +309,17 @@ msgstr "नेटवर्क की जाँच की जा रही है
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -388,7 +388,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -421,7 +421,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -454,7 +454,7 @@ msgstr "एक त्रुटि हो गयी है"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -515,14 +515,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkapplet_gui.pm:213
@@ -572,33 +572,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr "मैनड्रिवऑनलाइन"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -616,7 +616,7 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -636,7 +636,7 @@ msgstr "  --help\t\t- यह सहायता संदेश छापें
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --auto\t\t- एमडीकेअपडेट का स्वचालित रूप से शुरू होना ।\n"
 
 #: ../mdkupdate:66
@@ -646,7 +646,7 @@ msgstr "  --mnf\t\t\t- एमएनएफ़ विशिष्ट स्क्र�
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --noX\t\t\t- मैनड्रिव अपडेट का पाठ विधा संस्मरण।\n"
 
 #: ../mdkupdate:68
@@ -696,7 +696,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "No"
 #~ msgstr "नहीं"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
 #~ "एमडीकेऑनलाइन का लगता है कि पुनः संसाधन किया गया है, एपलेट को पुनः लाया जा रहा "
 #~ "है .... "
@@ -711,7 +711,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Connecting to"
 #~ msgstr "से सम्बन्ध स्थापित हो रहा है"
 
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "मैनड्रिव अपडेटो का एपलेट"
 
 #, fuzzy
@@ -838,7 +838,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Unknown state"
 #~ msgstr "अज्ञात अवस्था"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr "ऑनलाइन सेवायें निष्क्रिय है । मैनड्रिवऑनलाइन स्थल से सम्पर्क करें\n"
 
 #~ msgid "Wrong Password.\n"
@@ -859,7 +859,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ "support team"
 #~ msgstr "सर्वर से संबंध स्थापित करते समय समस्या हुई, कृपया सहायता दल से सम्पर्क करें"
 
-#~ msgid "Response from Mandriva Online server\n"
+#~ msgid "Response from Mageia Online server\n"
 #~ msgstr "मैनड्रिवऑनलाइन सर्वर से प्रतिउत्तर\n"
 
 #~ msgid "No check"
@@ -877,7 +877,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #, fuzzy
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
@@ -912,7 +912,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Account creation or authentication"
 #~ msgstr "खाते का निर्माण या प्रमाणीकरण"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr "अपना मैनड्रिवऑनलाइन लॉग-इन, कूटशब्द और मशीन नाम बतायें:"
 
 #, fuzzy
@@ -929,14 +929,14 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "आरोह बिन्दुओं के नाम में सिर्फ़ शब्द व संख्या होना चाहिए"
 
-#~ msgid "Connecting to Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
 #~ msgstr "मैनड्रिवऑनलाइन वेब-स्थल से जुड़ा जा रहा है..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -975,7 +975,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "संचिकाओं को अपलोड करते समय समस्या हुई, कॄपया पुनः प्रयास करें"
 
-#~ msgid "Create a Mandriva Online Account"
+#~ msgid "Create a Mageia Online Account"
 #~ msgstr "एक मैनड्रिवऑनलाइन खाता खोलें"
 
 #, fuzzy
@@ -1007,7 +1007,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgstr "एक वैध विपत्र पता नहीं!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
 #~ "मैनड्रिवऑनलाइन खाते को सफ़लता-पूर्वक निर्मित किया गया ।\n"
@@ -1018,20 +1018,20 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "अब से आप सुरक्षा व अपडेटो की घोषणाओं को प्राप्त करेगें \n"
 #~ "मैनड्रिवऑनलाइन को धन्यवाद।"
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
 #~ "मैनड्रिवऑनलाइन आपको अपडेटो को स्वचालित रूप से करने की क्षमता प्रदान करने को "
 #~ "प्रस्तावित करता है।\n"
 #~ "आपके तंत्र में एक कार्यक्रम लगातार नये अपडेटो की प्रतीक्षा में चलता रहेगा\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
 #~ msgstr "आपके मैनड्रिवऑनलाइन खाते को सफ़लता-पूर्वक संरचित किया गया\n"
 
 #~ msgid "Configuration uploaded successfully"
@@ -1041,13 +1041,13 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgstr "संरचना-सूचना को अपलोड करने में समस्या"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "मैनड्रिवऑनलाइन वेब-स्थल से जुड़ा नहीं जा सका: गलत लॉग-इन/पासवर्ड या रूटर/फ़ायरवाल की "
 #~ "खराब सेटिंग्स"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t- मैनड्रिवअपडेट की शुरूवात।\n"
 
 #~ msgid "Choose which packages should be installed and Press Ok"
@@ -1062,7 +1062,7 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "कोई %s फ़ाइल नहीं मिली । सर्वप्रथम एमडीकेऑनलाइन विज़ार्ड को चलाएँ"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
 #~ "मैनड्रिवअपडेट इस स्थल से सम्पर्क स्थापित नहीं कर सकाया, हम कुछ समय उपरान्त पुनः प्रयास "
 #~ "करेगें ।"
@@ -1079,8 +1079,8 @@ msgstr "एमडीकेअपडेट माध्यम से पैके
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
diff --git a/po/hr.po b/po/hr.po
index 155a6e0c..cefe9880 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,7 +3,7 @@
 # Translators: Danijel Studen <dstuden@vuka.hr>,Jerko Škifić <skific@riteh.hr>,Matija Blagus <Matija.Blagus@public.srce.hr>,Sasa Poznanovic <sasa.poznanovic@vuka.hr>,Vlatko Kosturjak <kost@linux.hr>,
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline 0\n"
+"Project-Id-Version: mgaonline 0\n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-01-04 21:26+CET\n"
 "Last-Translator: auto\n"
@@ -30,10 +30,10 @@ msgstr "Vaš sistem je ažuran"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problem s konfiguracijom servisa. Molimo provjerite logove i pošaljite mail "
-"na support@mandrivaonline.com"
+"na support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -49,7 +49,7 @@ msgstr "Nema novih datoteka dostupnih za Vas sistem!"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -149,7 +149,7 @@ msgstr "Pokrećem drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -159,7 +159,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -207,7 +207,7 @@ msgstr "Odustani"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -218,8 +218,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -281,8 +281,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Pokrećem MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Pokrećem MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -301,17 +301,17 @@ msgstr "Provjeravam mreži: čini se da je isključena\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -380,7 +380,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -413,7 +413,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -446,7 +446,7 @@ msgstr "Pojavila se greška"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -507,15 +507,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -564,33 +564,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -608,7 +608,7 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -622,8 +622,8 @@ msgstr "  --help\t\t- ispiši ovaj tekst s pomoći.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update pokrenuto automatski.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update pokrenuto automatski.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -632,8 +632,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - pokreni Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - pokreni Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -647,7 +647,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -671,9 +671,9 @@ msgstr ""
 #~ msgid "No"
 #~ msgstr "Ne"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online se čini da je reinstaliran, ponovo pokrećem aplet ... "
+#~ "Mageia Online se čini da je reinstaliran, ponovo pokrećem aplet ... "
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Provjeravam... Nadogradnje su dostupne\n"
@@ -686,8 +686,8 @@ msgstr ""
 #~ msgid "Connecting to"
 #~ msgstr "Povezujem se sa"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux nadograđuje applete"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux nadograđuje applete"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -810,9 +810,9 @@ msgstr ""
 #~ msgid "Unknown state"
 #~ msgstr "Nepoznato stanje"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Online servis je isključen. Kontaktirajte Mandriva Online stranicu\n"
+#~ "Online servis je isključen. Kontaktirajte Mageia Online stranicu\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Kriva lozinka.\n"
@@ -828,8 +828,8 @@ msgstr ""
 #~ "ili postavke proxya)\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Dobro došli u Mandriva Online"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Dobro došli u Mageia Online"
 
 #~ msgid "No check"
 #~ msgstr "Ne provjeravaj"
@@ -852,8 +852,8 @@ msgstr ""
 #~ "(pakete, hardwaresku konfiguraciju) u centralnu bazu kako\n"
 #~ "bih vas mogli informirati o sigurnosnim i korisnim dogradnjama.\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Unesite vaš Mandriva Online login,lozinku i ime računala:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Unesite vaš Mageia Online login,lozinku i ime računala:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -866,14 +866,14 @@ msgstr ""
 #~ msgstr "Lozinka:"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Dobro došli u Mandriva Online"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Dobro došli u Mageia Online"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -888,10 +888,10 @@ msgstr ""
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "U pravilu da imate koristi od Mandriva Online usluga,\n"
+#~ "U pravilu da imate koristi od Mageia Online usluga,\n"
 #~ "trebate nam poslati vašu konfiguraciju.\n"
 #~ "\n"
-#~ "Čarobnjak će poslati slijedeće informacije Mandrivau:\n"
+#~ "Čarobnjak će poslati slijedeće informacije Mageiau:\n"
 #~ "\n"
 #~ "1) pakete koje ste instalirali na vaš sustav,\n"
 #~ "\n"
@@ -911,8 +911,8 @@ msgstr ""
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Problem kod uploada datoteka, molimo pokušajte ponovo"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Napravi Mandriva Online račun"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Napravi Mageia Online račun"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -947,16 +947,16 @@ msgstr ""
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Od sada ćete primati obavijesti o sigurnosti\n"
-#~ "i dogradnjama zahvaljujući Mandriva Onlineu."
+#~ "i dogradnjama zahvaljujući Mageia Onlineu."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online nudi vam mogućnost automatiziranja dogradnji.\n"
+#~ "Mageia Online nudi vam mogućnost automatiziranja dogradnji.\n"
 #~ "Program će se pokrenuti redovno na vašem sustavu čekajući nove dogradnje\n"
 
 #, fuzzy
@@ -967,8 +967,8 @@ msgstr ""
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Čitam postavke\n"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- pokreni Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- pokreni Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Sistem je zauzet. Molimo pričekajte ..."
@@ -977,9 +977,9 @@ msgstr ""
 #~ msgid "Sending configuration..."
 #~ msgstr "Čitam postavke\n"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Online ne može biti kontaktiran, molimo probajte ponovno kasnije"
+#~ "Mageia Online ne može biti kontaktiran, molimo probajte ponovno kasnije"
 
 #~ msgid "Login:"
 #~ msgstr "Login:"
@@ -994,17 +994,17 @@ msgstr ""
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Vaš login ili lozinka su pogrešni.\n"
-#~ " Ili ih trebate unijeti ponovno, ili trebate napraviti račun na Mandriva "
+#~ " Ili ih trebate unijeti ponovno, ili trebate napraviti račun na Mageia "
 #~ "Online.\n"
 #~ " Ukoliko je ovaj posljednji slučaj, vratite se na prvi korak za\n"
-#~ "spajanje na Mandriva Online.\n"
+#~ "spajanje na Mageia Online.\n"
 #~ " Budite upozoreni da morate također omogućiti ime računala \n"
 #~ " (samo alfabetski karakteri se priznaju)"
 
diff --git a/po/hu.po b/po/hu.po
index fd72b60f..9ddd9570 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 # Gergely Lonyai <aleph@mandriva.org>, 2007, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-2010.1\n"
+"Project-Id-Version: mgaonline-2010.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-20 19:11+0100\n"
@@ -34,8 +34,8 @@ msgstr "A rendszer naprakész"
 
 #: ../mdkapplet:84
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
-msgstr "Szolgáltatásbeállítási probléma; ellenőrizze a naplókat és küldjön levelet a következő címre: support@mandrivaonline.com"
+msgid "Service configuration problem. Please check logs and send mail to support@mageiaonline.com"
+msgstr "Szolgáltatásbeállítási probléma; ellenőrizze a naplókat és küldjön levelet a következő címre: support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -49,8 +49,8 @@ msgstr "Új frissítések érhetők el az Ön rendszeréhez"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "A Mandriva Linux disztribúciónak új verziója jelent meg"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "A Mageia Linux disztribúciónak új verziója jelent meg"
 
 #: ../mdkapplet:119
 #: ../mdkapplet:161
@@ -158,8 +158,8 @@ msgstr "A DrakConnect indítása\n"
 #: ../mdkapplet:459
 #: ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linux disztribúció új verziója"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linux disztribúció új verziója"
 
 #: ../mdkapplet:464
 #, c-format
@@ -168,8 +168,8 @@ msgstr "Böngészés"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "A Mandriva Linux disztribúciónak új verziója jelent meg."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "A Mageia Linux disztribúciónak új verziója jelent meg."
 
 #: ../mdkapplet:475
 #: ../mdkapplet:572
@@ -230,8 +230,8 @@ msgstr "Mégsem"
 
 #: ../mdkapplet:508
 #, c-format
-msgid "Maintenance for this Mandriva Linux version has ended. No more updates will be delivered for this system."
-msgstr "Ennek a Mandriva Linuxnak a karbantartási ideje lejárt, nem fog többé frissítés megjelenni hozzá."
+msgid "Maintenance for this Mageia Linux version has ended. No more updates will be delivered for this system."
+msgstr "Ennek a Mageia Linuxnak a karbantartási ideje lejárt, nem fog többé frissítés megjelenni hozzá."
 
 #: ../mdkapplet:514
 #, c-format
@@ -240,8 +240,8 @@ msgstr "Ahhoz, hogy a rendszerét biztonságban tartsa, az alábbi dolgokat tehe
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -295,8 +295,8 @@ msgstr "Rakja hálózati áramellátásra a laptopot és ha lehet váltson vezet
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "\"MandrivaUpdate\" indítása\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "\"MageiaUpdate\" indítása\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -315,18 +315,18 @@ msgstr "A hálózat ellenőrzése: úgy tűnik, nem aktív\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s, Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s, %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "A Mandriva Online hozzáférést biztosít a Mandriva webes szolgáltatásaihoz."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "A Mageia Online hozzáférést biztosít a Mageia webes szolgáltatásaihoz."
 
 #: ../mdkapplet:899
 #, c-format
@@ -402,8 +402,8 @@ msgstr "Szeretné a további szoftvereket tartalmazó csomagforrást használni?
 #: ../mdkapplet:1061
 #: ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84
 #: ../mdkapplet-config:43
@@ -437,8 +437,8 @@ msgstr "Hiba a disztribúciólista beszerzésében:"
 #. -PO: Here '%s' will be a localized date (eg:
 #: ../mdkapplet-add-media-helper:161
 #, c-format
-msgid "Mandriva provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
-msgstr "A Mandriva minden disztibúción 12 hónap frissítést biztosít a munkaasztali alkalmazások számára (maradt %s) és 18 hónapot a rendszerszintű alkalmazásokhoz (maradt %s)."
+msgid "Mageia provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
+msgstr "A Mageia minden disztibúción 12 hónap frissítést biztosít a munkaasztali alkalmazások számára (maradt %s) és 18 hónapot a rendszerszintű alkalmazásokhoz (maradt %s)."
 
 #: ../mdkapplet-add-media-helper:167
 #, c-format
@@ -468,8 +468,8 @@ msgstr "Hiba lépett fel"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "A te Mandriva hozzáféréseddel nincs lehetőséged a %s letöltéseket használni."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "A te Mageia hozzáféréseddel nincs lehetőséged a %s letöltéseket használni."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -529,13 +529,13 @@ msgstr "Enterprise"
 
 #: ../mdkapplet_gui.pm:87
 #, c-format
-msgid "Mandriva Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mandriva official support."
-msgstr "A Mandriva Powerpack adja önnek a legjobb Linux élményt: stabilitás és eredményesség a nyílt forrású megoldásoknak köszönhetően, exkluzív szoftverek és a Mandriva hivatalos támogatása."
+msgid "Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."
+msgstr "A Mageia Powerpack adja önnek a legjobb Linux élményt: stabilitás és eredményesség a nyílt forrású megoldásoknak köszönhetően, exkluzív szoftverek és a Mageia hivatalos támogatása."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux jellemzői"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux jellemzői"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -584,35 +584,35 @@ msgstr "%s már elérhető, és tud rá frissíteni:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178
 #: ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181
 #: ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
-msgid "The Mandriva Linux distribution with even more softwares and official support."
-msgstr "A Mandriva Linux disztribúció most még több szoftverrel és hivatalos támogatással."
+msgid "The Mageia Linux distribution with even more softwares and official support."
+msgstr "A Mageia Linux disztribúció most még több szoftverrel és hivatalos támogatással."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -628,13 +628,13 @@ msgstr "Disztribúció frissítése"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"Mandriva Update %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Mageia Update %s\n"
+"Copyright (C) %s Mageia.\n"
 "Ez a program szabad szoftver; a GNU GPL alapján terjeszthető.\n"
 "\n"
 "Használat:\n"
@@ -646,8 +646,8 @@ msgstr "  --help\t\t- jelen segítség megjelenítése\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update automatikus indítása\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update automatikus indítása\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -656,8 +656,8 @@ msgstr "  --mnf\t\t\t- MNF-specifikus szkriptek indítása\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- a Mandriva Update szöveges felületű verziója\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- a Mageia Update szöveges felületű verziója\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -667,7 +667,7 @@ msgstr "  --debug\t\t\t- a tevékenység naplózása\n"
 #: ../mdkupdate:98
 #, c-format
 msgid "Unable to update packages from update_source medium.\n"
-msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen.\n"
+msgstr "A csomagok Mageia Update-adatforrásból való frissítése sikertelen.\n"
 
 #~ msgid ""
 #~ "Please fill in your account ID to add an additional package medium once "
@@ -676,10 +676,10 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ "Kérem töltse ki a hozzáférés adatait azon egyéb adatforrás hozzáadásához, "
 #~ "amire online előfizetett"
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "A Mandriva hozzáféréséhez nem fizetett elő Kiterjesztett karbantartásra."
+#~ "A Mageia hozzáféréséhez nem fizetett elő Kiterjesztett karbantartásra."
 #~ msgid "Mandiva Free"
 #~ msgstr "Mandiva Free"
 #~ msgid "Would you like Powerpack?"
@@ -688,7 +688,7 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ "Since you don't have Powerpack rights you may visit mandriva store now "
 #~ "and get Powerpack subscription."
 #~ msgstr ""
-#~ "Amennyiben nincs Powerpack jogosultsága, nézzen el a Mandriva online "
+#~ "Amennyiben nincs Powerpack jogosultsága, nézzen el a Mageia online "
 #~ "boltjába, és szerezzen egy Powerpack előfizetést."
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Szerezzen egy Powerpack előfizetést!"
@@ -703,10 +703,10 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ msgid "Cancel, upgrade to Free Edition"
 #~ msgstr "Mégsem, Free kiadás használata"
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "A te Mandriva hozzáféréseddel nincs lehetőséged a Powerpack letöltéseket "
+#~ "A te Mageia hozzáféréseddel nincs lehetőséged a Powerpack letöltéseket "
 #~ "használni."
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -722,8 +722,8 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ msgstr "Újrapróbálás"
 #~ msgid "Congratulations"
 #~ msgstr "Gratulálunk"
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "A Mandriva %s kiadására történő frissítés sikeresen lezajlott."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "A Mageia %s kiadására történő frissítés sikeresen lezajlott."
 #~ msgid "You must restart your system."
 #~ msgstr "A rendszer újraindítása szükséges."
 #~ msgid "Reboot"
@@ -743,9 +743,9 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "A Mandriva Linux disztribúciónak új verziója jelent meg."
+#~ msgstr "A Mageia Linux disztribúciónak új verziója jelent meg."
 #~ msgid "You are using '%s' distribution."
 #~ msgstr "Ön a '%s' disztribúciót használja?"
 #~ msgid "Do you want to upgrade?"
@@ -754,9 +754,9 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ msgstr "Igen"
 #~ msgid "No"
 #~ msgstr "Nem"
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Úgy tűnik, a Mandriva Online újra lett telepítve - az alkalmazás "
+#~ "Úgy tűnik, a Mageia Online újra lett telepítve - az alkalmazás "
 #~ "újratöltése..."
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Ellenőrzés... vannak elérhető frissítések\n"
@@ -766,8 +766,8 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ msgstr "Nem sikerült megnyitni az Urpmi-adatbázist"
 #~ msgid "Connecting to"
 #~ msgstr "Kapcsolódás:"
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux-frissítési alkalmazás"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux-frissítési alkalmazás"
 #~ msgid "Security error"
 #~ msgstr "Biztonsági hiba"
 #~ msgid "Generic error (machine already registered)"
@@ -809,28 +809,28 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ msgid "Service error"
 #~ msgstr "Szolgáltatási hiba"
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "A Mandriva webes szolgáltatásai jelenleg nem elérhetők.\n"
+#~ "A Mageia webes szolgáltatásai jelenleg nem elérhetők.\n"
 #~ "Próbálkozzon később."
 #~ msgid "Password mismatch"
 #~ msgstr "A jelszavak nem egyeznek"
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "A Mandriva webes szolgáltatásai karbantartás alatt állnak.\n"
+#~ "A Mageia webes szolgáltatásai karbantartás alatt állnak.\n"
 #~ "Próbálkozzon később."
 #~ msgid "User Forbidden"
 #~ msgstr "A felhasználó le van tiltva"
-#~ msgid "User account forbidden by Mandriva web services"
+#~ msgid "User account forbidden by Mageia web services"
 #~ msgstr ""
-#~ "A felhasználói azonosító le van tiltva a Mandriva webes szolgáltatásain"
+#~ "A felhasználói azonosító le van tiltva a Mageia webes szolgáltatásain"
 #~ msgid "Connection error"
 #~ msgstr "Kapcsolódási hiba"
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "A Mandriva webes szolgáltatásai nem elérhetők"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "A Mageia webes szolgáltatásai nem elérhetők"
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
 #~ "file.\n"
@@ -856,12 +856,12 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ "\n"
 #~ "%s"
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "A Mandriva Online-kliens túl régi verziójú.\n"
+#~ "A Mageia Online-kliens túl régi verziójú.\n"
 #~ "\n"
 #~ "Frissítse egy új verzióra. A következő helyen szerezhető be: http://start."
 #~ "mandriva.com"
@@ -907,10 +907,10 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ msgstr "Túl régi, a szolgáltatás által nem támogatott verzió"
 #~ msgid "Unknown state"
 #~ msgstr "Ismeretlen állapot"
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
 #~ "Az online szolgáltatások inaktiválva vannak. Lépjen kapcsolatba a "
-#~ "Mandriva Online weboldallal.\n"
+#~ "Mageia Online weboldallal.\n"
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Helytelen jelszó.\n"
 #~ msgid "Wrong Action or host or login.\n"
@@ -927,8 +927,8 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ msgstr ""
 #~ "Probléma lépett fel a kiszolgálóhoz való kapcsolódáskor. Lépjen "
 #~ "kapcsolatba a támogatási csapattal."
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Válasz a Mandriva Online-kiszolgálótól\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Válasz a Mageia Online-kiszolgálótól\n"
 #~ msgid "No check"
 #~ msgstr "Nincs ellenőrzés"
 #~ msgid "Checking config file: Not present\n"
@@ -939,14 +939,14 @@ msgstr "A csomagok Mandriva Update-adatforrásból való frissítése sikertelen
 #~ msgstr "Törlés"
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Ez a program szabad szoftver; a GNU GPL alapján terjeszthető.\n"
 #~ "\n"
 #~ "Használat:\n"
diff --git a/po/hy.po b/po/hy.po
index 6dd7cf76..1d32792e 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2004-03-20 23:50+0300\n"
@@ -31,7 +31,7 @@ msgstr "Համակարգը զբաղված է: Սպասեք..."
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 
 #: ../mdkapplet:90
@@ -46,7 +46,7 @@ msgstr "Ձեր համակարգի համար չկան առկա նորացում�
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -146,7 +146,7 @@ msgstr ""
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -156,7 +156,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -204,7 +204,7 @@ msgstr "Հրաժարվել"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -215,8 +215,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Բարի գալուստ Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Բարի գալուստ Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -278,7 +278,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -298,17 +298,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Բարի գալուստ Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Բարի գալուստ Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -377,7 +377,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -410,7 +410,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -443,7 +443,7 @@ msgstr ""
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -504,15 +504,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Բարի գալուստ Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Բարի գալուստ Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -561,33 +561,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Բարի գալուստ Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Բարի գալուստ Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Բարի գալուստ Mandriva Online"
+msgid "Mageia Free"
+msgstr "Բարի գալուստ Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Բարի գալուստ Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Բարի գալուստ Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Բարի գալուստ Mandriva Online"
+msgid "Mageia One"
+msgstr "Բարի գալուստ Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Բարի գալուստ Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Բարի գալուստ Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -605,14 +605,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate %s տարբերակը\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Այս բաց ծրագրաշարը և կարող է տարածվել համաձայն GNU GPL պայմանների:\n"
 "\n"
 "կիրառում`\n"
@@ -624,8 +624,8 @@ msgstr "  --help\t\t- ցուցադրել այս տեղեկանքը:\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update ավտոմատ բեռնում:\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update ավտոմատ բեռնում:\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -634,8 +634,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - աշխատացնել Mandriva Update:\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - աշխատացնել Mageia Update:\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -649,7 +649,7 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Բարի գալուստ Mandriva Online"
+#~ msgstr "Բարի գալուստ Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -673,8 +673,8 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgid "Connecting to"
 #~ msgstr "Միացման պրոբլեմ"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux Նորացումների Ապլետ"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux Նորացումների Ապլետ"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -787,8 +787,8 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgstr "Սխալ գաղտնաբառ է\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Բարի գալուստ Mandriva Online"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Բարի գալուստ Mageia Online"
 
 #~ msgid "No check"
 #~ msgstr "Ստուգված չէ"
@@ -802,14 +802,14 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline %s տարբերակը\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Այս բաց ծրագրաշարը և կարող է տարածվել համաձայն GNU GPL պայմանների:\n"
 #~ "\n"
 #~ "կիրառում`\n"
@@ -826,8 +826,8 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ "(փաթեթները, սարքի տվյալները) կենտրոնական բազա` ձեզ տեղյակ\n"
 #~ "պահելու անվտանգության և այլ օգտակար նորացումների մասին:\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Ներմուծեք ձեր Mandriva Online հաշիվը, գաղտնաբառը և մեքենայի անունը`"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Ներմուծեք ձեր Mageia Online հաշիվը, գաղտնաբառը և մեքենայի անունը`"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -840,14 +840,14 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgstr "Գաղտնաբառը`"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Բարի գալուստ Mandriva Online"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Բարի գալուստ Mageia Online"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -862,10 +862,10 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Mandriva Online ծառայություններից օգուտ քաղելու համար\n"
+#~ "Mageia Online ծառայություններից օգուտ քաղելու համար\n"
 #~ "      խորհուրդ ենք տալիս լցնել ձեր ձևակերպումը:\n"
 #~ "\n"
-#~ "Հիմա Ուղեկցորդը կուղարկի Mandriva հետևյալ տվյալները`\n"
+#~ "Հիմա Ուղեկցորդը կուղարկի Mageia հետևյալ տվյալները`\n"
 #~ "\n"
 #~ "1)համակարգում տեղադրված փաթեթների ցուցակը,\n"
 #~ "\n"
@@ -880,8 +880,8 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgid "Connection problem"
 #~ msgstr "Միացման պրոբլեմ"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Ստեղծել Mandriva Online Հաշիվ"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Ստեղծել Mageia Online Հաշիվ"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -921,16 +921,16 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Այսուհետև շնորհիվ Mandriva Online-ի ստանալու եք \n"
+#~ "Այսուհետև շնորհիվ Mageia Online-ի ստանալու եք \n"
 #~ "նորացումների և անվտանգության  ծանուցումներ:"
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online-ը առաջարկում է ավտոմատացնել նորացումները:\n"
+#~ "Mageia Online-ը առաջարկում է ավտոմատացնել նորացումները:\n"
 #~ "Ծրագիրը համակարգում ինքնուրույն աշխատացվելու է` ստուգելու նորացումները\n"
 
 #, fuzzy
@@ -941,8 +941,8 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Ձևակերպման ընթերցում\n"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- աշխատացնել Mandriva Update:\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- աշխատացնել Mageia Update:\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Համակարգը զբաղված է: Սպասեք..."
@@ -950,8 +950,8 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgid "Sending configuration..."
 #~ msgstr "Ուղարկվում են ձևակերպումները..."
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update -ը չի կարողանում միանալ էջին. կփորձենք կրկին:"
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update -ը չի կարողանում միանալ էջին. կփորձենք կրկին:"
 
 #~ msgid "Login:"
 #~ msgstr "Մուտք`"
@@ -963,15 +963,15 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Մուտքագրված հաշիվը կամ գաղտնաբառը սխալ են:\n"
-#~ "Մուտքագրեք կրկին, կամ ստեղծեք նոր Mandriva Online հաշիվ:\n"
-#~ "Երկրորդ դեպքում վերադարձեք առաջին քայլին` Mandriva Online միանալու:\n"
+#~ "Մուտքագրեք կրկին, կամ ստեղծեք նոր Mageia Online հաշիվ:\n"
+#~ "Երկրորդ դեպքում վերադարձեք առաջին քայլին` Mageia Online միանալու:\n"
 #~ "Չմոռանաք նաև ներմուծել մեքենայի անունը\n"
 #~ "(թույլատրված են միայն տառերը)"
 
@@ -999,16 +999,16 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgid "Unable to update packages from mdkupdate medium.\n"
 #~ msgstr "Անհնար է նորացնել փաթեթները mdkupdate - ից:\n"
 
-#~ msgid "Welcome to Mandriva Online"
-#~ msgstr "Բարի գալուստ Mandriva Online"
+#~ msgid "Welcome to Mageia Online"
+#~ msgstr "Բարի գալուստ Mageia Online"
 
 #, fuzzy
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "Ես չունեմ Mandriva Online հաշիվ, և ցանկանում եմ ձեռք բերել այն "
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "Ես չունեմ Mageia Online հաշիվ, և ցանկանում եմ ձեռք բերել այն "
 
 #, fuzzy
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Mandriva Linux Անվտանգության Կանոններ"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Mageia Linux Անվտանգության Կանոններ"
 
 #~ msgid "Authentification"
 #~ msgstr "Տվյալների ստուգում"
@@ -1026,8 +1026,8 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgstr "Ելք Ուղեկցորդից\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
-#~ msgstr "Անհնար է միանալ Mandriva Online, ուշով կրկին փորձեք"
+#~ "Mageia Online could not be contacted, please try again at a later time"
+#~ msgstr "Անհնար է միանալ Mageia Online, ուշով կրկին փորձեք"
 
 #~ msgid "  --update       - Update keys\n"
 #~ msgstr "  --update       - Նորացնել բանալիները\n"
@@ -1044,8 +1044,8 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgid "Service deactivated. Waiting for payment..."
 #~ msgstr "Ծառայությունը անջատված է մինչ վճարում..."
 
-#~ msgid "Launch Mandriva Linux Update"
-#~ msgstr "Սկսել Mandriva Linux-ի Նորացումը"
+#~ msgid "Launch Mageia Linux Update"
+#~ msgstr "Սկսել Mageia Linux-ի Նորացումը"
 
 #~ msgid "Available"
 #~ msgstr "Առկա են"
@@ -1070,8 +1070,8 @@ msgstr "Անհնար է նորացնել փաթեթները update_source - ից
 #~ msgstr "Բանավարի պրոբլեմ"
 
 #, fuzzy
-#~ msgid "Launching Mandriva Update\n"
-#~ msgstr "Սկսել Mandriva Linux-ի Նորացումը"
+#~ msgid "Launching Mageia Update\n"
+#~ msgstr "Սկսել Mageia Linux-ի Նորացումը"
 
 #~ msgid "Yes I want automated updates"
 #~ msgstr "Այո, ցանկանում եմ ավտոմատ ստանալ նորացումներ"
diff --git a/po/id.po b/po/id.po
index 7f8b6d14..eed6162f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2007-10-27 19:40+0700\n"
@@ -36,10 +36,10 @@ msgstr "Sistem Anda sudah up-to-date"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Masalah konfigurasi layanan. Harap perika file log dan kirimkan mail ke "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -53,7 +53,7 @@ msgstr "Update baru tersedia untuk sistem Anda"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -160,7 +160,7 @@ msgstr "Menjalankan drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -170,7 +170,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -218,7 +218,7 @@ msgstr "Batal"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -229,8 +229,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:526
 #, c-format
@@ -292,8 +292,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Menjalankan MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Menjalankan MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -312,18 +312,18 @@ msgstr "Memeriksa Jaringan: tampaknya dinonaktifkan\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Hak cipta (C) %s oleh Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Hak cipta (C) %s oleh %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online memberikan akses ke layanan web Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online memberikan akses ke layanan web Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -391,7 +391,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -424,7 +424,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -457,7 +457,7 @@ msgstr "Terjadi kesalahan"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -518,15 +518,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -575,33 +575,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online %s"
+msgid "Mageia Free"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online %s"
+msgid "Mageia Mini"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -619,14 +619,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versi %s\n"
-"Hak cipta (C) %s Mandriva.\n"
+"Hak cipta (C) %s Mageia.\n"
 "Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
 "GPL GNU.\n"
 "\n"
@@ -639,8 +639,8 @@ msgstr "  --help\t\t- cetak pesan bantuan ini.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update dijalankan secara otomatis.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update dijalankan secara otomatis.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -649,8 +649,8 @@ msgstr "  --mnf\t\t\t- jalankan script khusus mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- versi mode teks dari Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- versi mode teks dari Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -664,7 +664,7 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online %s"
+#~ msgstr "Mageia Online %s"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -702,9 +702,9 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgid "No"
 #~ msgstr "Tidak"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online tampaknya baru saja diinstall ulang, memuat ulang "
+#~ "Mageia Online tampaknya baru saja diinstall ulang, memuat ulang "
 #~ "applet ...."
 
 #~ msgid "Checking... Updates are available\n"
@@ -719,8 +719,8 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Menghubungkan ke"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Applet Update Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Applet Update Mageia Linux"
 
 #~ msgid "Security error"
 #~ msgstr "Kesalahan keamanan"
@@ -777,33 +777,33 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgstr "Kesalahan layanan"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Layanan web Mandriva sedang tidak tersedia\n"
+#~ "Layanan web Mageia sedang tidak tersedia\n"
 #~ "Harap mencoba lagi nanti"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Kata sandi tidak cocok"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Layanan web Mandriva sedang dalam perawatan\n"
+#~ "Layanan web Mageia sedang dalam perawatan\n"
 #~ "Harap mencoba lagi nanti"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Pengguna Dilarang"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Account pengguna dilarang oleh layanan web Mandriva"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Account pengguna dilarang oleh layanan web Mageia"
 
 #~ msgid "Connection error"
 #~ msgstr "Kesalahan koneksi"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Layanan web Mandriva tidak dapat dicapai"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Layanan web Mageia tidak dapat dicapai"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -835,12 +835,12 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Versi dari klien Mandriva Online terlalu lama.\n"
+#~ "Versi dari klien Mageia Online terlalu lama.\n"
 #~ "\n"
 #~ "Anda perlu mengupdatenya ke versi yang baru. Anda bisa mendapatkannya "
 #~ "dari http://start.mandriva.com"
@@ -907,8 +907,8 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Kondisi tidak diketahui"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Layanan Online dinonaktifkan. Hubungi situs Mandriva Online\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Layanan Online dinonaktifkan. Hubungi situs Mageia Online\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Kata sandi salah.\n"
@@ -930,8 +930,8 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ "Masalah muncul ketika melakukan koneksi ke server, silakan menghubungi "
 #~ "tim pendukung."
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Jawaban dari server Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Jawaban dari server Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Tidak ada pemeriksaan"
@@ -947,14 +947,14 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdkonline versi %s\n"
-#~ "Hak cipta (C) %s Mandriva.\n"
+#~ "Hak cipta (C) %s Mageia.\n"
 #~ "Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
 #~ "GPL GNU.\n"
 #~ "\n"
@@ -1006,9 +1006,9 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Pembuatan atau authentikasi account"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Masukkan login dan kata sandi Mandriva Online serta nama mesin  Anda:"
+#~ "Masukkan login dan kata sandi Mageia Online serta nama mesin  Anda:"
 
 #~ msgid "Email address:"
 #~ msgstr "Alamat email:"
@@ -1025,14 +1025,14 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Nama komputer harus berupa karakter alphanumerik sebanyak 1 - 40"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Terhubung ke website Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Terhubung ke website Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1047,10 +1047,10 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Agar mendapat manfaat layanan Mandriva Online,\n"
+#~ "Agar mendapat manfaat layanan Mageia Online,\n"
 #~ "kami akan meng-upload konfigurasi Anda.\n"
 #~ "\n"
-#~ "Wizard kini akan mengirim informasi berikut ke Mandriva:\n"
+#~ "Wizard kini akan mengirim informasi berikut ke Mageia:\n"
 #~ "\n"
 #~ "1) daftar paket yang terinstall pada sistem Anda,\n"
 #~ "\n"
@@ -1069,8 +1069,8 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Masalah terjadi ketika mengupload file, harap mencoba lagi"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Buat Account Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Buat Account Mageia Online"
 
 #~ msgid "Greeting:"
 #~ msgstr "Salam:"
@@ -1101,10 +1101,10 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgstr "Pembuatan account gagal!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Account Mandriva Online berhasil dibuat.\n"
+#~ "Account Mageia Online berhasil dibuat.\n"
 #~ "Silahkan klik \"Lanjut\" untuk authentikasi dan mengupload konfigurasi "
 #~ "Anda\n"
 
@@ -1113,20 +1113,20 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Mulai saat ini Anda akan menerima pemberitahuan keamanan dan upgrade\n"
-#~ "dari Mandriva Online."
+#~ "dari Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online memberi Anda kemampuan update otomatis.\n"
+#~ "Mageia Online memberi Anda kemampuan update otomatis.\n"
 #~ "Sebuah program akan secara periodik menunggu update baru\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Account Mandriva Online Anda telah sukses dikonfigurasi\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Account Mageia Online Anda telah sukses dikonfigurasi\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Konfigurasi Anda telah sukses diupload"
@@ -1135,14 +1135,14 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgstr "Kesalahan mengupload konfigurasi"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "Tidak bisa terhubung ke website Mandriva Online: login/kata sandi salah "
+#~ "Tidak bisa terhubung ke website Mageia Online: login/kata sandi salah "
 #~ "atau settingrouter/firewall yang buruk"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- jalankan Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- jalankan Mageia Update.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Tidak bisa mendapatkan daftar update: %s"
@@ -1162,9 +1162,9 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Tidak ada %s file yang ditemukan. Jalankan wizard mdkonline dahulu"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update tidak bisa menghubungi situs, kami akan mencoba lagi."
+#~ "Mageia Update tidak bisa menghubungi situs, kami akan mencoba lagi."
 
 #~ msgid "Login:"
 #~ msgstr "Login:"
@@ -1178,16 +1178,16 @@ msgstr "Gagal meng-update paket dari media update_source.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Login atau kata sandi Anda keliru.\n"
-#~ "Anda harus menuliskannya lagi, atau membuat account di Mandriva Online.\n"
+#~ "Anda harus menuliskannya lagi, atau membuat account di Mageia Online.\n"
 #~ " Pada kasus terakhir, kembalilah ke langkah awal untuk menghubungi "
-#~ "Mandriva Online.\n"
+#~ "Mageia Online.\n"
 #~ " Ingat, Anda juga harus memberikan nama Mesin \n"
 #~ " (hanya karakter alfabet)"
 
diff --git a/po/is.po b/po/is.po
index 9edb1148..95a693b6 100644
--- a/po/is.po
+++ b/po/is.po
@@ -5,7 +5,7 @@
 # Pjetur G. Hjaltason <pjetur@pjetur.net>, 2003, 2004, 2005, 2006, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2009-03-26 12:55+0000\n"
@@ -32,10 +32,10 @@ msgstr "Kerfið þitt er uppfært"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Vandræði með þjónustustillingar. Athugið annála og sendið póst til "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -49,8 +49,8 @@ msgstr "Nýjar uppfærslur eru til fyrir kerfið þitt"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Ný útgáfa af Mandriva Linux hefur verið sett í dreifingu"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Ný útgáfa af Mageia Linux hefur verið sett í dreifingu"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -156,8 +156,8 @@ msgstr "Ræsi drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Ný útgáfa af Mandriva Linux dreifingunni"
+msgid "New version of Mageia Linux distribution"
+msgstr "Ný útgáfa af Mageia Linux dreifingunni"
 
 #: ../mdkapplet:464
 #, c-format
@@ -166,8 +166,8 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Ný útgáfa af Mandriva Linux hefur verið sett í dreifingu."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Ný útgáfa af Mageia Linux hefur verið sett í dreifingu."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -214,7 +214,7 @@ msgstr "Hætta við"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:526
 #, c-format
@@ -292,8 +292,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Ræsi MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Ræsi MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -312,18 +312,18 @@ msgstr "Athuga net: virðist aftengt\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Höfundaréttur (C) %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Höfundaréttur (C) %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online veitir aðgang að Mandriva vefþjónustu."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online veitir aðgang að Mageia vefþjónustu."
 
 #: ../mdkapplet:899
 #, c-format
@@ -392,7 +392,7 @@ msgstr "Vilt þú bæta við þessum auka-pakkamiðli?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -425,7 +425,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -458,8 +458,8 @@ msgstr "Villa kom upp"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Í Mandriva skráningunni þinni er \"%s download\" ekki virkt."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Í Mageia skráningunni þinni er \"%s download\" ekki virkt."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -519,15 +519,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -576,33 +576,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online %s"
+msgid "Mageia Free"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online %s"
+msgid "Mageia Mini"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -620,14 +620,14 @@ msgstr "Uppfærsla dreifingar"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate útgáfa %s\n"
-"Höfundaréttur © %s Mandriva.\n"
+"Höfundaréttur © %s Mageia.\n"
 "þetta er frjáls hugbúnaður og má dreifa samkvæmt skilmálum GNU GPL.\n"
 "\n"
 "notkun:\n"
@@ -639,8 +639,8 @@ msgstr "  --help\t\t- prenta þessa hjálp.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Uppfærslur keyrðar sjálfvirkt.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Uppfærslur keyrðar sjálfvirkt.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -649,8 +649,8 @@ msgstr "  --mnf\t\t\t- ræsa sértækar mnf skriftur.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- textahams útgáfa af Mandriva Uppfærslum.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- textahams útgáfa af Mageia Uppfærslum.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -670,22 +670,22 @@ msgstr "Gat ekki uppfært pakka frá uppfærslumiðli.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Í Mandriva skráningunni þinni er \"%s download\" ekki virkt."
+#~ msgstr "Í Mageia skráningunni þinni er \"%s download\" ekki virkt."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online %s"
+#~ msgstr "Mageia Online %s"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Tengjast vefsvæði"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Í Mandriva skráningunni þinni er \"Powerpack download\" ekki virkt."
+#~ msgstr "Í Mageia skráningunni þinni er \"Powerpack download\" ekki virkt."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -706,8 +706,8 @@ msgstr "Gat ekki uppfært pakka frá uppfærslumiðli.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Til hamingju"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Tókst að uppfæra í útgáfu Mandriva %s."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Tókst að uppfæra í útgáfu Mageia %s."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Þú verður að endurræsa kerfið þitt."
@@ -730,6 +730,6 @@ msgstr "Gat ekki uppfært pakka frá uppfærslumiðli.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Ný útgáfa af Mandriva Linux hefur verið sett í dreifingu."
+#~ msgstr "Ný útgáfa af Mageia Linux hefur verið sett í dreifingu."
diff --git a/po/it.po b/po/it.po
index a086ab8b..5b43949f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -38,10 +38,10 @@ msgstr "Il sistema è aggiornato"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problema di configurazione del server. Controlla i log e scrivi a "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -55,8 +55,8 @@ msgstr "Disponibili nuovi aggiornamenti per il tuo sistema"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "È stata rilasciata una nuova versione di Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "È stata rilasciata una nuova versione di Mageia Linux"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -168,8 +168,8 @@ msgstr "Sto avviando drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nuova versione della distribuzione Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nuova versione della distribuzione Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -178,9 +178,9 @@ msgstr "Naviga"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
-"È stata rilasciata una nuova versione della distribuzione Mandriva Linux."
+"È stata rilasciata una nuova versione della distribuzione Mageia Linux."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -227,10 +227,10 @@ msgstr "Annulla"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"La manutenzione di questo sistema Mandriva Linux è terminata. Ciò significa "
+"La manutenzione di questo sistema Mageia Linux è terminata. Ciò significa "
 "che non riceverai più i nuovi aggiornamenti del software."
 
 #: ../mdkapplet:514
@@ -240,8 +240,8 @@ msgstr "Per mantenere sicuro il sistema, puoi:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -313,8 +313,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Si sta avviando MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Si sta avviando MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -333,18 +333,18 @@ msgstr "Controllo rete: sembra disattivata\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s di Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright © %s di %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online dà accesso ai servizi web di Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online dà accesso ai servizi web di Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -414,8 +414,8 @@ msgstr "Vuoi installare questa fonte di software aggiuntivo?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -449,10 +449,10 @@ msgstr "Problemi nel recuperare l'elenco delle distribuzioni:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva fornisce 12 mesi di aggiornamenti delle applicazioni (fino al %s) e "
+"Mageia fornisce 12 mesi di aggiornamenti delle applicazioni (fino al %s) e "
 "18 mesi di aggiornamenti del sistema (fino al %s) per le proprie "
 "distribuzioni."
 
@@ -487,8 +487,8 @@ msgstr "Si è verificato un errore"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Il tuo account Mandriva non consente di scaricare i pacchetti di %s."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Il tuo account Mageia non consente di scaricare i pacchetti di %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -548,18 +548,18 @@ msgstr "Aziendale"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack ti guida verso verso la migliore esperienza nell'uso di "
+"Mageia Powerpack ti guida verso verso la migliore esperienza nell'uso di "
 "un desktop Linux: la stabilità ed efficienza delle soluzioni open source, "
-"integrata da software esclusivi e dal supporto ufficiale Mandriva."
+"integrata da software esclusivi e dal supporto ufficiale Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Caratteristiche di Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Caratteristiche di Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -608,36 +608,36 @@ msgstr "%s è ora disponibile, puoi fare l'aggiornamento a:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"La distribuzione  Mandriva Linux con sempre più software ed assistenza "
+"La distribuzione  Mageia Linux con sempre più software ed assistenza "
 "ufficiale."
 
 #: ../mdkonline.pm:199
@@ -654,14 +654,14 @@ msgstr "Aggiornamento della distribuzione"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versione %s\n"
-"Copyright © %s Mandriva.\n"
+"Copyright © %s Mageia.\n"
 "Questo è software libero e può essere ridistribuito secondo i termini della "
 "GNU GPL.\n"
 "\n"
@@ -674,8 +674,8 @@ msgstr "  --help\t\t- stampa questo messaggio d'aiuto.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update avviato automaticamente.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update avviato automaticamente.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -684,8 +684,8 @@ msgstr "  --mnf\t\t\t- lancia gli script specifici di mnf. \n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update in versione testuale.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update in versione testuale.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -705,13 +705,13 @@ msgstr "Impossibile aggiornare i pacchetti dalla fonte update_source.\n"
 #~ "fonte di pacchetti dopo che l'adesione online sarà completata."
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Il tuo account Mandriva non comprende la manutenzione prolungata."
+#~ msgstr "Il tuo account Mageia non comprende la manutenzione prolungata."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Ti piacerebbe avere Powerpack?"
@@ -721,7 +721,7 @@ msgstr "Impossibile aggiornare i pacchetti dalla fonte update_source.\n"
 #~ "and get Powerpack subscription."
 #~ msgstr ""
 #~ "Poiché non hai i necessari diritti, potresti visitare il negozio online "
-#~ "di Mandriva e sottoscrivere Powerpack."
+#~ "di Mageia e sottoscrivere Powerpack."
 
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Sottoscrivi  Powerpack!"
@@ -740,10 +740,10 @@ msgstr "Impossibile aggiornare i pacchetti dalla fonte update_source.\n"
 #~ msgstr "Annulla, passa alla Edizione Free"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Il tuo account Mandriva non consente di scaricare i pacchetti di "
+#~ "Il tuo account Mageia non consente di scaricare i pacchetti di "
 #~ "Powerpack."
 
 #~ msgid ""
@@ -764,8 +764,8 @@ msgstr "Impossibile aggiornare i pacchetti dalla fonte update_source.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Complimenti"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "L'aggiornamento alla versione %s di Mandriva è riuscito."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "L'aggiornamento alla versione %s di Mageia è riuscito."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Dovresti riavviare il sistema."
diff --git a/po/ja.po b/po/ja.po
index 0cd68bc8..a8812dee 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-ja\n"
+"Project-Id-Version: mgaonline-ja\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2009-03-22 20:08+0900\n"
@@ -34,9 +34,9 @@ msgstr "新しい更新はありません"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
-"サービスの設定に問題があります。ログを調べて support@mandrivaonline.com に"
+"サービスの設定に問題があります。ログを調べて support@mageiaonline.com に"
 "メールしてください。"
 
 #: ../mdkapplet:90
@@ -51,8 +51,8 @@ msgstr "新しい更新があります"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "新しいバージョンの Mandriva Linux がリリースされました"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "新しいバージョンの Mageia Linux がリリースされました"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -160,8 +160,8 @@ msgstr "Drakconnect を起動\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "新バージョンの Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "新バージョンの Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -170,8 +170,8 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "新しいバージョンの Mandriva Linux がリリースされました。"
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "新しいバージョンの Mageia Linux がリリースされました。"
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -218,7 +218,7 @@ msgstr "キャンセル"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -229,8 +229,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:526
 #, c-format
@@ -296,8 +296,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate を起動\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate を起動\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -316,18 +316,18 @@ msgstr "ネットワーク確認: 無効になっているようです\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online は Mandriva ウェブサービスへのアクセスを提供します。"
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online は Mageia ウェブサービスへのアクセスを提供します。"
 
 #: ../mdkapplet:899
 #, c-format
@@ -397,7 +397,7 @@ msgstr "この付加的なソフトウェア用のリポジトリをインスト
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -431,7 +431,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -464,9 +464,9 @@ msgstr "エラーが発生しました"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
-"あなたの Mandriva アカウントは %s のダウンロード申し込みが有効になっていませ"
+"あなたの Mageia アカウントは %s のダウンロード申し込みが有効になっていませ"
 "ん。"
 
 #: ../mdkapplet-add-media-helper:226
@@ -527,15 +527,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -584,33 +584,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online %s"
+msgid "Mageia Free"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online %s"
+msgid "Mageia Mini"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -628,14 +628,14 @@ msgstr "ディストリビューションのアップグレード"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate バージョン %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "これはフリーソフトウェアであり、GNU GPL の下で再配布することができます。\n"
 "\n"
 "使用方法 :\n"
@@ -647,8 +647,8 @@ msgstr "  --help\t\t- このヘルプメッセージを出力\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update を自動的に起動する。\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update を自動的に起動する。\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -657,8 +657,8 @@ msgstr "  --mnf\t\t\t- MNF 固有のスクリプトを起動する。\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- テキストモードの Mandriva Update\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- テキストモードの Mageia Update\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -679,25 +679,25 @@ msgstr "update_source メディアからパッケージを更新できません�
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "あなたの Mandriva アカウントは %s のダウンロード申し込みが有効になっていま"
+#~ "あなたの Mageia アカウントは %s のダウンロード申し込みが有効になっていま"
 #~ "せん。"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online %s"
+#~ msgstr "Mageia Online %s"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Online ウェブサイト"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "あなたの Mandriva アカウントは Powerpack のダウンロード申し込みが有効に"
+#~ "あなたの Mageia アカウントは Powerpack のダウンロード申し込みが有効に"
 #~ "なっていません。"
 
 #~ msgid ""
@@ -719,8 +719,8 @@ msgstr "update_source メディアからパッケージを更新できません�
 #~ msgid "Congratulations"
 #~ msgstr "おめでとうございます"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Mandriva の %s リリースへのアップグレードに成功しました。"
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Mageia の %s リリースへのアップグレードに成功しました。"
 
 #~ msgid "You must restart your system."
 #~ msgstr "システムを再起動してください。"
@@ -744,9 +744,9 @@ msgstr "update_source メディアからパッケージを更新できません�
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "新しいバージョンの Mandriva Linux がリリースされました。"
+#~ msgstr "新しいバージョンの Mageia Linux がリリースされました。"
 
 #~ msgid "You are using '%s' distribution."
 #~ msgstr "お使いのディストリビューションは %s です"
diff --git a/po/ka.po b/po/ka.po
index a0425854..18fbd2ab 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline 0.15\n"
+"Project-Id-Version: mgaonline 0.15\n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2004-09-29 19:58+0400\n"
 "Last-Translator: \n"
@@ -29,10 +29,10 @@ msgstr "თქვენი სისტემა განახლებულ�
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "პრობლემა სერვისების კონფიგურაციაში. გთხოვთ გადაამოწმოთ აღრიცხვის ფაილები "
-"(logs) დაგამოაგზავნოთ ფოსტა მისმართზე support@mandrivaonline.com"
+"(logs) დაგამოაგზავნოთ ფოსტა მისმართზე support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -46,7 +46,7 @@ msgstr "თქვენი სისტემა განახლებას
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -148,7 +148,7 @@ msgstr "ვიძახებ drakconnect-ს\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -158,7 +158,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -206,7 +206,7 @@ msgstr "სტოპ!"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -217,8 +217,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -280,8 +280,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "ვიძახებ MandrivaUpdate-ს\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "ვიძახებ MageiaUpdate-ს\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -300,17 +300,17 @@ msgstr "ვამოწმებ ქსელს: როგორც ჩან�
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -379,7 +379,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -412,7 +412,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -445,7 +445,7 @@ msgstr ""
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -506,15 +506,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -563,33 +563,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -607,14 +607,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate ვერსია %s\n"
-"საავტორო უფლებები (C) %s Mandriva.\n"
+"საავტორო უფლებები (C) %s Mageia.\n"
 "პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
 "თანახმად გავრცელება.\n"
 "\n"
@@ -627,8 +627,8 @@ msgstr "  --help\t\t- აჩვენე ეს დამხმარე ტე�
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update-ის ავტომატური გამოძახებ.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update-ის ავტომატური გამოძახებ.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -637,8 +637,8 @@ msgstr "  --mnf\t\t\t- mnf სპეფიციკის სკრიფტე�
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update-ის newt ვერსია.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update-ის newt ვერსია.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -652,7 +652,7 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -671,9 +671,9 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgid "No"
 #~ msgstr "არა"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "როგორ ჩანს Mandriva Online ხელმეორედ იქნა ინსტალირებული. ხელახლა ვიძახებ "
+#~ "როგორ ჩანს Mageia Online ხელმეორედ იქნა ინსტალირებული. ხელახლა ვიძახებ "
 #~ "აპლეტს..."
 
 #~ msgid "Checking... Updates are available\n"
@@ -686,7 +686,7 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgid "Connecting to"
 #~ msgstr "ვუკავშირდები:"
 
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "მენდრეიქის განახლების აპლეტი"
 
 #, fuzzy
@@ -801,9 +801,9 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgid "Unknown state"
 #~ msgstr "უცნობი მდგომარეობა"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "ონლაინ მომსახურებები შეწყვეტილია. მიაკითხეთ Mandriva Online-ის ვებგვერდს\n"
+#~ "ონლაინ მომსახურებები შეწყვეტილია. მიაკითხეთ Mageia Online-ის ვებგვერდს\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "არასწორი პაროლი\n"
@@ -826,8 +826,8 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ "დახმარების ჯგუფს"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "კეთილი იყოს თქვენი ფეხი Mandriva Online-ზე."
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "კეთილი იყოს თქვენი ფეხი Mageia Online-ზე."
 
 #~ msgid "No check"
 #~ msgstr "შეამოწმების გარეშე"
@@ -843,14 +843,14 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline ვერსია %s\n"
-#~ "საავტორო უფლებები (C) %s Mandriva.\n"
+#~ "საავტორო უფლებები (C) %s Mageia.\n"
 #~ "პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
 #~ "თანახმად გავრცელება.\n"
 #~ "\n"
@@ -879,9 +879,9 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgid "Account creation or authentication"
 #~ msgstr "ანგარიშის შექმნა ან ავტორიზაცია"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "შეიყვანეთ თქვენი Mandriva Online-ის მომხმარებლის სახელი, პაროლი და "
+#~ "შეიყვანეთ თქვენი Mageia Online-ის მომხმარებლის სახელი, პაროლი და "
 #~ "სისტემის სახელი:"
 
 #, fuzzy
@@ -894,14 +894,14 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgid "Password:"
 #~ msgstr "პაროლი:"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "უკავშირდები Mandriva Online ვებგვერდს..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "უკავშირდები Mageia Online ვებგვერდს..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -916,10 +916,10 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "იმისათვის, რომ გამოიყენოთ Mandriva Online-ის სერვისი, ჩვენ ვაპირებთ\n"
+#~ "იმისათვის, რომ გამოიყენოთ Mageia Online-ის სერვისი, ჩვენ ვაპირებთ\n"
 #~ "თქვენი კონფიგურაციის ატვირთვას.\n"
 #~ "\n"
-#~ "თუ გააგრძელებთ, შემდეგი ინფორმაცია გადაიგზავნება Mandriva-ში:\n"
+#~ "თუ გააგრძელებთ, შემდეგი ინფორმაცია გადაიგზავნება Mageia-ში:\n"
 #~ "\n"
 #~ "1) თქვენ სისტემაში ინსტალირებულ პაკეტთა სია,\n"
 #~ "\n"
@@ -937,8 +937,8 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "ფაილების ატვირთვისას პრობლემებია. გთხოვთ კვლავ ცადოთ"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Online-ზე ანგარიშის გახსნა"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Online-ზე ანგარიშის გახსნა"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -970,10 +970,10 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgstr "გთხოვთ სწორი მისამართი შეიყვანოთ!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Mandriva Online-ზე წარმატებით განხორციელდა თქვენი ანგარიშის რეგისტრაცია.\n"
+#~ "Mageia Online-ზე წარმატებით განხორციელდა თქვენი ანგარიშის რეგისტრაცია.\n"
 #~ "გთხოვთ დააჭიროთ \"შემდეგ\" ღილაკს რათა გაიაროთ ვტორიზაცია და ატვირთოთ "
 #~ "თვენი კონფიგურაცია\n"
 
@@ -982,23 +982,23 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Mandriva Online-ის მეშვეობით დღეიდან თქვენ მიიღებთ უსაფრთხოებასთან "
+#~ "Mageia Online-ის მეშვეობით დღეიდან თქვენ მიიღებთ უსაფრთხოებასთან "
 #~ "დაკავშირებულ\n"
 #~ "და მნიშვნელოვან გაუმჯობესებების განცხადებებს."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online გაძლევთ საშუალებას ავტომატურად განაახლოთ სისტემა.\n"
+#~ "Mageia Online გაძლევთ საშუალებას ავტომატურად განაახლოთ სისტემა.\n"
 #~ "თქვენს სისტემაზე რეგულარურად გაიშვება პროგრამა, რომელიც განახლებებს "
 #~ "დაელოდება\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
 #~ msgstr ""
-#~ "თქვენი Mandriva Online ანგარიშის კონფიგურაცია  წარმატებით დასრულდა\n"
+#~ "თქვენი Mageia Online ანგარიშის კონფიგურაცია  წარმატებით დასრულდა\n"
 
 #, fuzzy
 #~ msgid "Configuration uploaded successfully"
@@ -1009,14 +1009,14 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgstr "ვკითხულობ კონფიგურაცას\n"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "ვერ ვუკავშირდები Mandriva Online ვებ-გვერდს: ან მომხმ. სახელი და პაროლია "
+#~ "ვერ ვუკავშირდები Mageia Online ვებ-გვერდს: ან მომხმ. სახელი და პაროლია "
 #~ "არასწორი, ან თქვენი როუტერი/firewall არის ცუდად კონფიგურირებული"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- გამოიძახე Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- გამოიძახე Mageia Update.\n"
 
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr ""
@@ -1031,9 +1031,9 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "%s ფაილი ვერ ვიპოვე. ჯერ mdkonline-ის ოსტატი გამოიძახეთ"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update-მა ვერ შეძლო დაკავშირებოდა საიტს. მოგვიანებით ვცადოთ."
+#~ "Mageia Update-მა ვერ შეძლო დაკავშირებოდა საიტს. მოგვიანებით ვცადოთ."
 
 #~ msgid "Login:"
 #~ msgstr "მომხმარებელი:"
@@ -1047,15 +1047,15 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "თქვენი მომხმარებლის სახელი ან პაროლი არასწორია.\n"
-#~ " ან ხელახლა უნდა ჩაწეროთ, ან ახალი ანგარიში შექმნათ Mandriva Online-ზე.\n"
-#~ " ამ უკანასკნელის გასაკეთებლად მიუბრუნდით პირველ მოქმედებას Mandriva "
+#~ " ან ხელახლა უნდა ჩაწეროთ, ან ახალი ანგარიში შექმნათ Mageia Online-ზე.\n"
+#~ " ამ უკანასკნელის გასაკეთებლად მიუბრუნდით პირველ მოქმედებას Mageia "
 #~ "Online-ზე დასაკავშირებლად. გაითვალისწინეთ, რომ თქვენ ასევე უნდა მიუთითოთ "
 #~ "სისტემის სახელი(Machine name) \n"
 #~ " (ნებადართულია მხოლოდ ანბანის ასოები)"
@@ -1086,10 +1086,10 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgstr "mdkupdate-ის მედიუმიდან პაკეტები ვერ განვაახლე.\n"
 
 #~ msgid ""
-#~ "Mandriva Update could not upload the diff files. Send a mail to support "
+#~ "Mageia Update could not upload the diff files. Send a mail to support "
 #~ "[at] mandrivaonline [dot] net"
 #~ msgstr ""
-#~ "Mandriva Update–მა ვერ შეძლო diff ფაილების ატვირთვა. გააგზავნეთ ელფოსტა "
+#~ "Mageia Update–მა ვერ შეძლო diff ფაილების ატვირთვა. გააგზავნეთ ელფოსტა "
 #~ "მისამართზე support [at] mandrivaonline [dot] net"
 
 #, fuzzy
@@ -1099,11 +1099,11 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgid "Previous"
 #~ msgstr "წინა"
 
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "მე ჯერ არ მაქვს ანგარიში Mandriva Online-ზე და მსურს გაწევრიანება"
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "მე ჯერ არ მაქვს ანგარიში Mageia Online-ზე და მსურს გაწევრიანება"
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Mandriva Linux-ის პირადი უფლებების პოლისი"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Mageia Linux-ის პირადი უფლებების პოლისი"
 
 #~ msgid "Authentification"
 #~ msgstr "რეგისტრაცია"
@@ -1121,8 +1121,8 @@ msgstr "update_source-ის მედიუმიდან პაკეტე�
 #~ msgstr "ოსტატის დასრულება\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
-#~ msgstr "Mandriva Online-ს ვერ ვუკავშირდები. გთხოვთ მოგვიანებით სცადოთ"
+#~ "Mageia Online could not be contacted, please try again at a later time"
+#~ msgstr "Mageia Online-ს ვერ ვუკავშირდები. გთხოვთ მოგვიანებით სცადოთ"
 
 #~ msgid "  --update       - Update keys\n"
 #~ msgstr "  --update       - განახლების კვანძები\n"
diff --git a/po/ko.po b/po/ko.po
index 9131f2d3..14a61a76 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline 1.0\n"
+"Project-Id-Version: mgaonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2002-08-16 12:34+0900\n"
@@ -30,8 +30,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
-msgstr "문의사항은 support@mandrivaonline.com로 메일 주세요.\n"
+"support@mageiaonline.com"
+msgstr "문의사항은 support@mageiaonline.com로 메일 주세요.\n"
 
 #: ../mdkapplet:90
 #, c-format
@@ -45,7 +45,7 @@ msgstr "네트웍 어댑터를 찾을 수 없습니다!"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -145,7 +145,7 @@ msgstr "사용자드레이크 실행"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -155,7 +155,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -203,7 +203,7 @@ msgstr "취소"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -214,7 +214,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "맨드리바 온라인"
 
 #: ../mdkapplet:526
@@ -277,7 +277,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -297,17 +297,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr "맨드리바 온라인"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -376,7 +376,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -409,7 +409,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -442,7 +442,7 @@ msgstr "오류 발생"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -503,14 +503,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "맨드리바 온라인"
 
 #: ../mdkapplet_gui.pm:213
@@ -560,33 +560,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "맨드리바 온라인"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "맨드리바 온라인"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "맨드리바 온라인"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "맨드리바 온라인"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr "맨드리바 온라인"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -604,14 +604,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate 버전 %s\n"
-"저작권(C) %s Mandriva.\n"
+"저작권(C) %s Mageia.\n"
 "공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
 "\n"
 "usage:\n"
@@ -623,7 +623,7 @@ msgstr "  --help\t\t- 이 도움말 출력.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
 #: ../mdkupdate:66
@@ -633,7 +633,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
 #: ../mdkupdate:68
@@ -681,7 +681,7 @@ msgstr ""
 #~ msgstr "연결 문제"
 
 #, fuzzy
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "맨드리바 프라이버시 정책"
 
 #, fuzzy
@@ -793,7 +793,7 @@ msgstr ""
 #~ msgstr "잘못된 암호\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
+#~ msgid "Response from Mageia Online server\n"
 #~ msgstr "맨드리바 온라인에 잘 오셨습니다."
 
 #~ msgid "Logs"
@@ -804,14 +804,14 @@ msgstr ""
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline 버전 %s\n"
-#~ "저작권(C) %s Mandriva.\n"
+#~ "저작권(C) %s Mageia.\n"
 #~ "공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
 #~ "\n"
 #~ "usage:\n"
@@ -830,7 +830,7 @@ msgstr ""
 #~ "이는 님께 보안 업데이트나 유용한 업그레이드에 대해 지속적으로 알리기 위함"
 #~ "입니다.\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr "맨드리바온라인 사용자명, 암호, 컴퓨터 이름을 입력하세요:"
 
 #, fuzzy
@@ -844,14 +844,14 @@ msgstr ""
 #~ msgstr "암호:"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
 #~ msgstr "맨드리바 온라인에 잘 오셨습니다."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -885,7 +885,7 @@ msgstr ""
 #~ msgstr "연결 문제"
 
 #, fuzzy
-#~ msgid "Create a Mandriva Online Account"
+#~ msgid "Create a Mageia Online Account"
 #~ msgstr "맨드리바 온라인에 잘 오셨습니다."
 
 #, fuzzy
@@ -922,13 +922,13 @@ msgstr ""
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "이제부터 보안과 업그레이드에 대한 정보를 \n"
 #~ "맨드리바 온라인을 통해 받아 보실 수 있습니다."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
 #~ "맨들레크 온라인은 님께 자동업데이트 기능을 제공합니다.\n"
@@ -947,7 +947,7 @@ msgstr ""
 #~ msgstr "설정사항 읽는 중\n"
 
 #, fuzzy
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
 #~ "맨드리바 업데이트가 사이트에 접속하지 못했습니다. 다시 시도할 것입니다."
 
@@ -963,8 +963,8 @@ msgstr ""
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
@@ -987,10 +987,10 @@ msgstr ""
 #~ msgid "Previous"
 #~ msgstr "이전"
 
-#~ msgid "Welcome to Mandriva Online"
+#~ msgid "Welcome to Mageia Online"
 #~ msgstr "맨드리바 온라인에 잘 오셨습니다."
 
-#~ msgid "Mandriva Linux Privacy Policy"
+#~ msgid "Mageia Linux Privacy Policy"
 #~ msgstr "맨드리바 프라이버시 정책"
 
 #~ msgid "Authentification"
@@ -1066,7 +1066,7 @@ msgstr ""
 #~ msgstr "확인"
 
 #~ msgid ""
-#~ "Do you really want to abort Mandriva Online?\n"
+#~ "Do you really want to abort Mageia Online?\n"
 #~ "To return to the Wizard press 'Cancel',\n"
 #~ "to really quit it press 'Quit'."
 #~ msgstr ""
@@ -1074,5 +1074,5 @@ msgstr ""
 #~ "마법사로 돌아가려면 「취소」를 누르고,\n"
 #~ "정말 종료하려면 「종료」를 누르세요."
 
-#~ msgid "Really abort? - Mandriva Online"
+#~ msgid "Really abort? - Mageia Online"
 #~ msgstr "정말 종료합니까? - 맨드리바 온라인"
diff --git a/po/ku.po b/po/ku.po
index 77e9b0f0..ddac3e82 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-ku\n"
+"Project-Id-Version: mgaonline-ku\n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2004-12-14 20:33+0100\n"
 "Last-Translator: Kadir Dilsiz <kadir@linux-ku.com>\n"
@@ -34,7 +34,7 @@ msgstr "Sîstema we rojane bû"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Ji bo pirsgirêkan tu dikarî ji navnîşana support@manrakeonline.net re e-"
 "peyamekêbişînî"
@@ -51,7 +51,7 @@ msgstr "Rojaneyên nû heye ji bo sîstema we"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -151,7 +151,7 @@ msgstr "Drakconnect destpêdike\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -161,7 +161,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -209,7 +209,7 @@ msgstr "Betal"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -220,8 +220,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -283,8 +283,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Destpêkirina MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Destpêkirina MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -303,17 +303,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -382,7 +382,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -415,7 +415,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -448,7 +448,7 @@ msgstr ""
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -509,15 +509,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -566,33 +566,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
+msgid "Mageia Free"
+msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
+msgid "Mageia One"
+msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Tu Bi Xêr Hatî Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -610,14 +610,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate guherto %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Ev nivîsbariyeke serbest e û  di bin lîsansa GNU GPL de dikare dubare were "
 "belavkirin.\n"
 "\n"
@@ -630,7 +630,7 @@ msgstr "  --help\t\t- ev peyama alîkariyê nîşan dide.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr ""
 
 #: ../mdkupdate:66
@@ -640,7 +640,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr ""
 
 #: ../mdkupdate:68
@@ -655,7 +655,7 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Tu Bi Xêr Hatî Mandriva Online"
+#~ msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -679,8 +679,8 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Pirsgirêka girêdanê"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Sepandinoka Nûjenkirina Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Sepandinoka Nûjenkirina Mageia Linux"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -789,8 +789,8 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Şîfreya Çewt.\n"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Tu Bi Xêr Hatî Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Tu Bi Xêr Hatî Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Kontrola Dawî:"
@@ -803,14 +803,14 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline guherto %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Ev nivîsbariyeke serbest e û  di bin lîsansa GNU GPL de dikare dubare "
 #~ "were belavkirin.\n"
 #~ "\n"
@@ -837,7 +837,7 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 #~ "order to keep you informed about security updates and useful upgrades.\n"
 #~ msgstr ""
 #~ "Ev asîstan dê di şandina sazkirina te de bibe alîkarê te.\n"
-#~ "(paket, agahiyên hardware) Dê bi van agahiyan di Mandriva de danedankek\n"
+#~ "(paket, agahiyên hardware) Dê bi van agahiyan di Mageia de danedankek\n"
 #~ "were çêkirin û der barê pergala te de, te ji pîneyên ewlekariyê û "
 #~ "nûjenkirinan\n"
 #~ " agahdar bike.\n"
@@ -845,9 +845,9 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "çêkirina hesabekî û têketin"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Wekî bikarhênerê Mandriva Online navê bikarhêneriyê , şîfre û navê "
+#~ "Wekî bikarhênerê Mageia Online navê bikarhêneriyê , şîfre û navê "
 #~ "makîneyê binivîse:"
 
 #, fuzzy
@@ -860,14 +860,14 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 #~ msgid "Password:"
 #~ msgstr "Şîfre:"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Tu Bi Xêr Hatî Mandriva Online"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Tu Bi Xêr Hatî Mageia Online"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -883,26 +883,26 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
 #~ "Bi hilbijartina ku tê bikî tu dibî xwediyê şansa ku alîkariyê bidî\n"
-#~ "Mandriva Linux'e.\n"
+#~ "Mageia Linux'e.\n"
 #~ "\n"
-#~ "Dê ev sêrbaz agahiyên li jêr hatiye lîstekirin ji  Mandriva'ê re bişîne:\n"
+#~ "Dê ev sêrbaz agahiyên li jêr hatiye lîstekirin ji  Mageia'ê re bişîne:\n"
 #~ "\n"
 #~ "1) Navê (bernameyên) Paketên di pergalêde barkirî,\n"
 #~ "\n"
 #~ "2) Lîsteya hardwera kompûtera te.\n"
 #~ "\n"
 #~ "Heke ev li xweşa te neçû Derbas Be bitikîne û jê derkeve!\n"
-#~ "Heke tu Pêş de Here bitikînî tê li gor pêwistiyên Mandriva Linux\n"
+#~ "Heke tu Pêş de Here bitikînî tê li gor pêwistiyên Mageia Linux\n"
 #~ "di sazkirinê de alîkariyeke mezin bikî.\n"
 #~ "Tu caran agahiyên te yên pergalê ji kesekî sêyemîn re naçe.\n"
-#~ "Dê hemû agahî di Poliçeya Nepenî ya Mandriva Linux de were veşartin.\n"
+#~ "Dê hemû agahî di Poliçeya Nepenî ya Mageia Linux de were veşartin.\n"
 #~ "www.mandrivaexpert.com."
 
 #~ msgid "Connection problem"
 #~ msgstr "Pirsgirêka girêdanê"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Hesabê Mandriva Linux Online Çêke"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Hesabê Mageia Linux Online Çêke"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -938,24 +938,24 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Ji niha û pê ve ji Mandriva Online\n"
+#~ "Ji niha û pê ve ji Mageia Online\n"
 #~ "der barê pergala we de hemû pêşketin û qelşên ewlekariyê de tê werî "
 #~ "agahdarkirin.\n"
-#~ "Mandriva spas dike..."
+#~ "Mageia spas dike..."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online bernameyeke ku dê dê jixweber nûjenkirinên dikarin werin "
+#~ "Mageia Online bernameyeke ku dê dê jixweber nûjenkirinên dikarin werin "
 #~ "sepandin teklîf bike.\n"
 #~ "Dê bi navber di pergala te de bixebite û\n"
 #~ "nûjenkirinan bişopîne\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Hesabê we ji bo Mandriva Online bi serkeftin hate eyar kirin\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Hesabê we ji bo Mageia Online bi serkeftin hate eyar kirin\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Eyarên we bi serkeftin pêk hat"
@@ -972,9 +972,9 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Belge %s ne hatiye dîtin. Berî hemû mdkonline wizard ê  bişuxulînê"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Têkilî bi malpera Mandriva Update pêk nehat, em ê dûvre dîsa biceribînin."
+#~ "Têkilî bi malpera Mageia Update pêk nehat, em ê dûvre dîsa biceribînin."
 
 #~ msgid ""
 #~ "Service configuration problem. Please check logs and send mail to "
@@ -995,16 +995,16 @@ msgstr "di medyaya update_source de paket tên nûjenkirin.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Navê te yê Bikarhêneriyê an jî şîfreya te çewt e.\n"
-#~ " Şîfreya xwe bi kontrol dîsa binivîse, an jî ji Mandriva Online 'ê "
+#~ " Şîfreya xwe bi kontrol dîsa binivîse, an jî ji Mageia Online 'ê "
 #~ "hesabekî nû veke.\n"
-#~ " Nexwe niha bişkojka Vegere bitikîne û ji bo girêdana bi Mandriva Online\n"
+#~ " Nexwe niha bişkojka Vegere bitikîne û ji bo girêdana bi Mageia Online\n"
 #~ "fermanan bişopîne!. \n"
 #~ " Ji bo diyarkirina navê Makîneyê bi xwe bawer be. \n"
 #~ " ( bi tenê navên bi karakteran derbasdar e)"
diff --git a/po/ky.po b/po/ky.po
index 8d0cb8ab..845f3c0b 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-ky\n"
+"Project-Id-Version: mgaonline-ky\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2009-09-22 10:12+0600\n"
@@ -31,10 +31,10 @@ msgstr "Система жаңылоону талап кылбайт"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Кызматты конфигурациялоо проблемасы. Логдорду карап чыгып андан соң "
-"support@mandrivaonline.com дарегин кат жазыңыз"
+"support@mageiaonline.com дарегин кат жазыңыз"
 
 #: ../mdkapplet:90
 #, c-format
@@ -48,8 +48,8 @@ msgstr "Сиздин системаңызды жаңылоо мүмкүнчүл�
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mandriva Linux дистрибутивинин жаңы версиясы чыкты"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mageia Linux дистрибутивинин жаңы версиясы чыкты"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -156,8 +156,8 @@ msgstr "drakconnect иштетүү\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linux дистрибутивинин жаңы версиясы"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linux дистрибутивинин жаңы версиясы"
 
 #: ../mdkapplet:464
 #, c-format
@@ -166,8 +166,8 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mandriva Linux дистрибутивинин жаңы версиясы чыкты."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mageia Linux дистрибутивинин жаңы версиясы чыкты."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -214,7 +214,7 @@ msgstr "Айнуу"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -295,8 +295,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate иштетүү\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate иштетүү\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -315,19 +315,19 @@ msgstr "Тармак текшерилүүдө: өчүрүлгөн көрүнөт
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
-"Mandriva Online, Mandriva веб кызматтарды колдонуу мүмкүнчүлүгүн берет."
+"Mageia Online, Mageia веб кызматтарды колдонуу мүмкүнчүлүгүн берет."
 
 #: ../mdkapplet:899
 #, c-format
@@ -397,8 +397,8 @@ msgstr "Сиз кошумча пакеттер булагын кошууну к�
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -430,7 +430,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -463,8 +463,8 @@ msgstr "Жаңылыштык орун алды"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Сиздин Mandriva колодонуучу аты %s жүктөө катталышын камтыбайт."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Сиздин Mageia колодонуучу аты %s жүктөө катталышын камтыбайт."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -524,15 +524,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -581,33 +581,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Linux"
+msgid "Mageia Free"
+msgstr "Mageia Linux"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Linux"
+msgid "Mageia Mini"
+msgstr "Mageia Linux"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -625,14 +625,14 @@ msgstr "Дитсрибутив жаңылоосу"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate версиясы %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Бул эркин программалык жабдуу жана ал GNU GPL\n"
 "шартынын негизинде таратылат\n"
 "\n"
@@ -645,8 +645,8 @@ msgstr "  --help\t\t- бул маалыматты чыгаруу.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update автоматтык түрдө иштетүү.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update автоматтык түрдө иштетүү.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -655,8 +655,8 @@ msgstr "  --mnf\t\t\t- mnf аныкталган скриптерди иштет�
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update текстинин ыкма версиясы.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update текстинин ыкма версиясы.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -676,23 +676,23 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Сиздин Mandriva колодонуучу аты %s жүктөө катталышын камтыбайт."
+#~ msgstr "Сиздин Mageia колодонуучу аты %s жүктөө катталышын камтыбайт."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Linux"
+#~ msgstr "Mageia Linux"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Машинанын аты:"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Сиздин Mandriva колодонуучу аты Powerpack жүктөө катталышын камтыбайт."
+#~ "Сиздин Mageia колодонуучу аты Powerpack жүктөө катталышын камтыбайт."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -713,8 +713,8 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgid "Congratulations"
 #~ msgstr "Конфигурациялар"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Mandriva %s жаңылоосу ийгиликтүү аяктады."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Mageia %s жаңылоосу ийгиликтүү аяктады."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Системаны кайра өчүрүп иштетүү керек."
@@ -739,9 +739,9 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Mandriva Linux дистрибутивинин жаңы версиясы чыкты."
+#~ msgstr "Mageia Linux дистрибутивинин жаңы версиясы чыкты."
 
 #~ msgid "You are using '%s' distribution."
 #~ msgstr "Сиз '%s' дистрибутивин колдонуп жатасыз."
@@ -752,8 +752,8 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgid "No"
 #~ msgstr "Жок"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-#~ msgstr "Mandriva Online кайра орнотулса керек, апплет кайра жүктөлүүдө ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
+#~ msgstr "Mageia Online кайра орнотулса керек, апплет кайра жүктөлүүдө ...."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Текшерүү... Жаңылоолор мүмүкүн\n"
@@ -765,8 +765,8 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgid "Connecting to"
 #~ msgstr "Төмөнкүгө туташуу"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux Updates апплети"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux Updates апплети"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -891,9 +891,9 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgid "Unknown state"
 #~ msgstr "Белгисиз абал"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Онлайн кызматы өчүрүлгөн. Mandriva Online сайты менен байланышыңыз\n"
+#~ "Онлайн кызматы өчүрүлгөн. Mageia Online сайты менен байланышыңыз\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Туура эмес пароль.\n"
@@ -914,8 +914,8 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgstr ""
 #~ "Серверге кайрылууда ката кетти,сураныч жардамчы командасына кайрылыңыз"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Mandriva Online серверден жооп\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Mageia Online серверден жооп\n"
 
 #~ msgid "No check"
 #~ msgstr "Текшерүүсүз"
@@ -931,14 +931,14 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline версиясы %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Бул эркин программалык жабдуу жана ал GNU GPL\n"
 #~ "шартынын негизинде таратылат\n"
 #~ "\n"
@@ -968,8 +968,8 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgid "Account creation or authentication"
 #~ msgstr "Аккаунт түзүү же аутентификациялоо"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Mandriva Online логинин, паролун жана машина атын киргизиңиз:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Mageia Online логинин, паролун жана машина атын киргизиңиз:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -986,14 +986,14 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgstr ""
 #~ "Биригүү чекиттери алфавиттик-цифралык символдордон гана турушу керек"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Mandriva Online веб-сайтына туташуу..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Mageia Online веб-сайтына туташуу..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1008,10 +1008,10 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Mandriva Online кызматтарындан пайдалануу үчүн,\n"
+#~ "Mageia Online кызматтарындан пайдалануу үчүн,\n"
 #~ "сиздин конфигурацияларыңыздын жүктөлүшүн сунуш кылабыз.\n"
 #~ "\n"
-#~ "Азыр, Уста төмөнкү маалыматтарды Mandriva'ко жөнөтөт:\n"
+#~ "Азыр, Уста төмөнкү маалыматтарды Mageia'ко жөнөтөт:\n"
 #~ "\n"
 #~ "1) сиздин системада жүктөлгөн пакеттердин тизмези,\n"
 #~ "\n"
@@ -1031,8 +1031,8 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Файлдарды жүктөө учурундагы проблема, кайра аракет кылыңыз"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Online аккаунтун түзүү"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Online аккаунтун түзүү"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -1063,10 +1063,10 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgstr "Туура эмес почта адреси!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Mandriva Online аккаунту ийгиликтүү түзүлдү.\n"
+#~ "Mageia Online аккаунту ийгиликтүү түзүлдү.\n"
 #~ "Аутентификациялоо жана конфигурацияңызды жөнөтүү үчүн \"Кийинки\" "
 #~ "басыңыз\n"
 
@@ -1075,21 +1075,21 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Мындан кийин сиз коопсуздуктар жана жыңылоолор\n"
-#~ "жөнүндө, Mandriva Online тарабынан кабардар болосуздар."
+#~ "жөнүндө, Mageia Online тарабынан кабардар болосуздар."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online сизге автоматташтырылган жаңылоо мүмкүнчүлүгүн "
+#~ "Mageia Online сизге автоматташтырылган жаңылоо мүмкүнчүлүгүн "
 #~ "сунуштайт.\n"
 #~ "Программа сиздин системада жаңы жаңылоолор үчүн регулярдуу иштейт\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Сиздин Mandriva Online аккаунтуңуз ийгиликтүү конфигурацияланды\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Сиздин Mageia Online аккаунтуңуз ийгиликтүү конфигурацияланды\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Конфигурация ийгиликтүү сыртка жүктөлдү"
@@ -1098,14 +1098,14 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgstr "Сыртка жүктөөлүүдө конфигурацияда ката"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "Mandriva Online веб сайтына кирүүгө мүмкүн эмес:аты/катылган белги туура "
+#~ "Mageia Online веб сайтына кирүүгө мүмкүн эмес:аты/катылган белги туура "
 #~ "эмес  маршрутизатор/файервол ыңгайлашуусу туура эмес"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- Mandriva Update иштетүү.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- Mageia Update иштетүү.\n"
 
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "Орнотуу үчүн пакеттердим тандагыла жана Okди баскыла"
@@ -1119,8 +1119,8 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "%s файлы табылбады. Алгач mdkonline устасын иштетиңиз"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update сайты туташылбады, биз кайрадан аракет кылабыз."
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update сайты туташылбады, биз кайрадан аракет кылабыз."
 
 #~ msgid "Login:"
 #~ msgstr "Логин:"
@@ -1134,16 +1134,16 @@ msgstr "update_source булагынан пакеттерди жаңылоо м�
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Сиздин логин же пароль туура эмес.\n"
-#~ " Сизге же аларды кайра терүүгө же болбосо Mandriva Online'да аккаунт "
+#~ " Сизге же аларды кайра терүүгө же болбосо Mageia Online'да аккаунт "
 #~ "түзүүгө туура келет.\n"
-#~ " Болбосо, артка, Mandriva Online'га туташуучу биринчи кадамга барыңыз.\n"
+#~ " Болбосо, артка, Mageia Online'га туташуучу биринчи кадамга барыңыз.\n"
 #~ " Машина ысымын көрсөткөнүңүздү байкаңыз\n"
 #~ " (алфавиттик символдор гана кабыл алынат)"
 
diff --git a/po/lt.po b/po/lt.po
index 1f23d8a9..c0a6ab7d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-lt\n"
+"Project-Id-Version: mgaonline-lt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-09-26 16:38+0200\n"
@@ -33,10 +33,10 @@ msgstr "Jūsų sistema yra naujausia"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Paslaugos konfigūravimo problema. Patikrinkite įrašus ir išsiųskite el. "
-"laišką adresu support@mandrivaonline.com"
+"laišką adresu support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, fuzzy, c-format
@@ -50,7 +50,7 @@ msgstr "Jūsų sistemai yra atnaujinimų"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -150,7 +150,7 @@ msgstr "Paleidžiama drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -160,7 +160,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -208,7 +208,7 @@ msgstr "Atšaukti"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -219,8 +219,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -282,8 +282,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Paleidžiama MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Paleidžiama MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -302,17 +302,17 @@ msgstr "Tikrinamas tinklas: atrodo, neveikia\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -381,7 +381,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -414,7 +414,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -447,7 +447,7 @@ msgstr "Įvyko klaida"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -508,15 +508,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -565,33 +565,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -609,14 +609,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versija %s\n"
-"Autorinės teisės (C) %s Mandriva.\n"
+"Autorinės teisės (C) %s Mageia.\n"
 "Tai nemokama programa ir gali būti platinama pagal GNU GPL licenciją.\n"
 " \n"
 "naudojimas:\n"
@@ -628,8 +628,8 @@ msgstr "  --help\t\t- spausdinti šį pagalbos pranešimą.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update paleista automatiškai.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update paleista automatiškai.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -638,8 +638,8 @@ msgstr "  --mnf\t\t\t- paleisti specialius mnf skriptus.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- tekstinės veiksenos Mandriva Update versija.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- tekstinės veiksenos Mageia Update versija.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -653,7 +653,7 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -674,8 +674,8 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgid "No"
 #~ msgstr "Ne"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-#~ msgstr "Mandriva Online buvo įdiegta iš naujo, įkraunu programėlę ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
+#~ msgstr "Mageia Online buvo įdiegta iš naujo, įkraunu programėlę ...."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Tikrinama... Yra atnaujinimų\n"
@@ -687,8 +687,8 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgid "Connecting to"
 #~ msgstr "Jungiamasi prie"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux atnaujinimų programėlė"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux atnaujinimų programėlė"
 
 #~ msgid "Security error"
 #~ msgstr "Saugumo klaida"
@@ -742,33 +742,33 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgstr "Paslaugos klaida"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva internetinės paslaugos šiuo metu neteikiamos\n"
+#~ "Mageia internetinės paslaugos šiuo metu neteikiamos\n"
 #~ "Pabandykite vėliau"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Slaptažodžio neatitikimas"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva internetinės paslaugos šiuo metu tvarkomos\n"
+#~ "Mageia internetinės paslaugos šiuo metu tvarkomos\n"
 #~ "Pabandykite vėliau"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Vartotojas draudžiamas"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Mandriva draudžia internetinių paslaugų vartotojo abonentą"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Mageia draudžia internetinių paslaugų vartotojo abonentą"
 
 #~ msgid "Connection error"
 #~ msgstr "Prisijungimo klaida"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Mandriva internetinės paslaugos nepasiekiamos"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Mageia internetinės paslaugos nepasiekiamos"
 
 #~ msgid "Please wait"
 #~ msgstr "Prašom palaukti"
@@ -834,9 +834,9 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgid "Unknown state"
 #~ msgstr "Nežinoma būsena"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Internetinės paslaugos išjungtos. Kreipkitės į Mandriva Online svetainę\n"
+#~ "Internetinės paslaugos išjungtos. Kreipkitės į Mageia Online svetainę\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Neteisingas slaptažodis.\n"
@@ -857,8 +857,8 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgstr ""
 #~ "Jungiantis prie serverio įvyko klaida, susisiekite su palaikymo komanda"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Atsakymas iš Mandriva Online serverio\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Atsakymas iš Mageia Online serverio\n"
 
 #~ msgid "No check"
 #~ msgstr "Netikrinti"
@@ -874,14 +874,14 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versija %s\n"
-#~ "Autorinės teisės (C) %s Mandriva.\n"
+#~ "Autorinės teisės (C) %s Mageia.\n"
 #~ "Tai nemokama programa ir gali būti platinama pagal GNU GPL licenciją.\n"
 #~ " \n"
 #~ "naudojimas:\n"
@@ -917,9 +917,9 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Abonento sukūrimas arba atpažinimas"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Įveskite savo Mandriva Online abonento vardą, slaptažodį ir kompiuterio "
+#~ "Įveskite savo Mageia Online abonento vardą, slaptažodį ir kompiuterio "
 #~ "vardą:"
 
 #~ msgid "Email address:"
@@ -935,14 +935,14 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgstr ""
 #~ "Kompiuterio vardą turi sudaryti nuo 1 iki 40 raidinių-skaitinių simbolių"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Jungiamasi prie Mandriva Online svetainės..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Jungiamasi prie Mageia Online svetainės..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -957,10 +957,10 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Kad jūs galėtumėte naudotis Mandriva Online privalumais,\n"
+#~ "Kad jūs galėtumėte naudotis Mageia Online privalumais,\n"
 #~ "mes parsisiųsime jūsų kompiuterio konfigūraciją.\n"
 #~ "\n"
-#~ "Į Mandriva vedlys netrukus išsiųs sekančią informaciją:\n"
+#~ "Į Mageia vedlys netrukus išsiųs sekančią informaciją:\n"
 #~ "\n"
 #~ "1) jūsų sistemoje įdiegtų paketų sąrašą,\n"
 #~ "\n"
@@ -981,8 +981,8 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Persiunčiant bylas įvyko klaida, pabandykite dar kartą"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Sukurti Mandriva Online abonentą"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Sukurti Mageia Online abonentą"
 
 #~ msgid "Greeting:"
 #~ msgstr "Sveikinimas:"
@@ -1010,10 +1010,10 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgstr "Neteisingas el. pašto adresas!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Mandriva Online abonentas sėkmingai sukurtas.\n"
+#~ "Mageia Online abonentas sėkmingai sukurtas.\n"
 #~ "Atpažinimui ir jūsų konfigūracijos persiuntimui paspauskite \"Tęsti\"\n"
 
 #~ msgid "Your upload was successful!"
@@ -1021,20 +1021,20 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Dėka Mandriva online nuo šio momento jūs gausite\n"
+#~ "Dėka Mageia online nuo šio momento jūs gausite\n"
 #~ "pranešimus apie saugumo pataisas ir atnaujinimus."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "MandrivaOnlina jums siūlo galimybę automatizuoti atnaujinimus.\n"
+#~ "MageiaOnlina jums siūlo galimybę automatizuoti atnaujinimus.\n"
 #~ "Programa bus reguliariai paleidžiama jūsų sistemoje ir lauks atnaujinimų\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Jūsų Mandriva Online abonentas buvo sėkmingai sukonfigūruotas\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Jūsų Mageia Online abonentas buvo sėkmingai sukonfigūruotas\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Konfigūracija persiųsta sėkmingai"
@@ -1043,15 +1043,15 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgstr "Konfigūracijos persiuntimo problema"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "Negaliu prisijungti prie Mandriva Online svetainės: neteisingas "
+#~ "Negaliu prisijungti prie Mageia Online svetainės: neteisingas "
 #~ "prisijungimo vardas/slaptažodis arba blogi maršrutizatoriaus/ugniasienės "
 #~ "nustatymai"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- paleisti Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- paleisti Mageia Update.\n"
 
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "Pasirinkite, kokius paketus įdiegsite ir paspauskite Gerai"
@@ -1068,9 +1068,9 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Nerasta %s byla. Pirmiausia paleiskite mdkonline vedlį"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update negali prisijungti prie svetainės, pabandysime dar kartą."
+#~ "Mageia Update negali prisijungti prie svetainės, pabandysime dar kartą."
 
 #~ msgid "Login:"
 #~ msgstr "Prisijungimo vardas:"
@@ -1084,16 +1084,16 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Jūsų prisijungimo vardas arba slaptažodis neteisingi.\n"
-#~ " Arba įrašykite juos dar kartą, arba jums reikės susikurti Mandriva "
+#~ " Arba įrašykite juos dar kartą, arba jums reikės susikurti Mageia "
 #~ "Online abonentą.\n"
-#~ " Pastaruoju atveju, grįžkite į prisijungimo prie Mandriva Online "
+#~ " Pastaruoju atveju, grįžkite į prisijungimo prie Mageia Online "
 #~ "žingsnio.\n"
 #~ " Žinokite, kad jūs taip pat turite nurodyti ir kompiuterio vardą \n"
 #~ " (leidžiami tik raidiniai simboliai)"
@@ -1130,12 +1130,12 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgid "Previous"
 #~ msgstr "Ankstesnis"
 
-#~ msgid "Welcome to Mandriva Online"
-#~ msgstr "Sveiki atvykę į Mandriva Online"
+#~ msgid "Welcome to Mageia Online"
+#~ msgstr "Sveiki atvykę į Mageia Online"
 
 #, fuzzy
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "Aš neturiu Mandriva Online sąskaitos bet noriu "
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "Aš neturiu Mageia Online sąskaitos bet noriu "
 
 #~ msgid "Authentification"
 #~ msgstr "Autentifikacija"
@@ -1166,10 +1166,10 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgstr "  -v             - verbose mode.\n"
 
 #~ msgid ""
-#~ "You need to have an account on Mandriva Online, or update your "
+#~ "You need to have an account on Mageia Online, or update your "
 #~ "subscription."
 #~ msgstr ""
-#~ "Jūs turite turėti sąskaita Mandriva Online servisui, arba atnaujinti "
+#~ "Jūs turite turėti sąskaita Mageia Online servisui, arba atnaujinti "
 #~ "prenumeratą."
 
 #~ msgid "Your login or password may be wrong"
@@ -1214,5 +1214,5 @@ msgstr "Negaliu atnaujinti paketų sarašo iš update_source šaltinio. \n"
 #~ msgid "OK"
 #~ msgstr "OK"
 
-#~ msgid "Really abort? - Mandriva Online"
-#~ msgstr "Tikrai Nutraukti ? - Mandriva Online"
+#~ msgid "Really abort? - Mageia Online"
+#~ msgstr "Tikrai Nutraukti ? - Mageia Online"
diff --git a/po/ltg.po b/po/ltg.po
index c8fca04f..958ee791 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline 0.15\n"
+"Project-Id-Version: mgaonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2004-02-17 17:39+0200\n"
@@ -30,8 +30,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
-msgstr "Problemu gadīnī syutit e-posta viesti iz support@mandrivaonline.com\n"
+"support@mageiaonline.com"
+msgstr "Problemu gadīnī syutit e-posta viesti iz support@mageiaonline.com\n"
 
 #: ../mdkapplet:90
 #, fuzzy, c-format
@@ -49,7 +49,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -149,7 +149,7 @@ msgstr "Palaist userdrake"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -159,7 +159,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -207,7 +207,7 @@ msgstr "Atceļt"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -218,8 +218,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -281,7 +281,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -301,17 +301,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -380,7 +380,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -413,7 +413,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -446,7 +446,7 @@ msgstr "Atkluota kliuda"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -507,15 +507,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -564,33 +564,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -608,14 +608,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate verseja %s\n"
-"Autortīseibys © %s Mandriva.\n"
+"Autortīseibys © %s Mageia.\n"
 "Itei ir breiva programmatura, kū var izplateit saskaņā ar GNU GPL "
 "nūteikumim.\n"
 "\n"
@@ -628,7 +628,7 @@ msgstr "  --help\t\t- drukuot itū paliedzeibys tekstu.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- atjaunuot vysu informaceju.\n"
 
 #: ../mdkupdate:66
@@ -638,7 +638,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - atjaunuot vysu informaceju.\n"
 
 #: ../mdkupdate:68
@@ -653,7 +653,7 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -679,8 +679,8 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgstr "Pīslāguma problema"
 
 #, fuzzy
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux privātuma politika"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux privātuma politika"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -793,8 +793,8 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgstr "Napareizs paroļs.\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Laipni lyudzam Mandriva Online"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Laipni lyudzam Mageia Online"
 
 #~ msgid "Logs"
 #~ msgstr "Žurnali"
@@ -805,14 +805,14 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline verseja %s\n"
-#~ "Autortīseibys © %s Mandriva.\n"
+#~ "Autortīseibys © %s Mageia.\n"
 #~ "Itei ir breiva programmatura, kū var izplateit saskaņā ar GNU GPL "
 #~ "nūteikumim.\n"
 #~ "\n"
@@ -832,9 +832,9 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ "tyktu\n"
 #~ "informeits par drūšeibys uzlobuojumim i cytim vierteigim jaunumim.\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Īvodit jiusu Mandriva Online lītuotuojvuordu, paroli i datora nūsaukumu:"
+#~ "Īvodit jiusu Mageia Online lītuotuojvuordu, paroli i datora nūsaukumu:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -847,14 +847,14 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgstr "Parole:"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Laipni lyudzam Mandriva Online"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Laipni lyudzam Mageia Online"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -869,10 +869,10 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Lai pylnvierteigi izmontuotu Mandriva Online pakolpuojumus,\n"
+#~ "Lai pylnvierteigi izmontuotu Mageia Online pakolpuojumus,\n"
 #~ "mes gatovojamīs nūsyuteit jiusu konfiguraceju.\n"
 #~ "\n"
-#~ "Vednis uz Mandriva tyuleņ nūsyuteis sekojūšu informaceju:\n"
+#~ "Vednis uz Mageia tyuleņ nūsyuteis sekojūšu informaceju:\n"
 #~ "\n"
 #~ "1) jiusu sistemā instaleitū pakūtņu sarokstu,\n"
 #~ "\n"
@@ -889,8 +889,8 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgstr "Pīslāguma problema"
 
 #, fuzzy
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Laipni lyudzam Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Laipni lyudzam Mageia Online"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -926,16 +926,16 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Niule pasateicūt Mandriva Online jius sajimsit\n"
+#~ "Niule pasateicūt Mageia Online jius sajimsit\n"
 #~ "paziņuojumus par drūšeibys i cytim jaunynuojumim."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online pīduovoj īspieju automatizēt jaunynuojumus.\n"
+#~ "Mageia Online pīduovoj īspieju automatizēt jaunynuojumus.\n"
 #~ "Jiusu sistema regulari palaiss programmu, kas gaideis jaunynuojumus\n"
 
 #, fuzzy
@@ -947,14 +947,14 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgstr "Nūlosu konfiguraceju\n"
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t- atjaunuot vysu informaceju.\n"
 
 #~ msgid "Sending configuration..."
 #~ msgstr "Syutu konfiguraceju..."
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update navar dasaslēgtda servera, mieginuosim vāluok."
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update navar dasaslēgtda servera, mieginuosim vāluok."
 
 #~ msgid "Login:"
 #~ msgstr "Lītuotuojs:"
@@ -966,17 +966,17 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Jiusu lītuotuojvuords ci paroļs beja napareizs.\n"
-#~ "Jiusim tī juoīvoda vēlreiz, voi ari juoizveidoj Mandriva Online "
+#~ "Jiusim tī juoīvoda vēlreiz, voi ari juoizveidoj Mageia Online "
 #~ "lītuotuoja konts.\n"
 #~ "Jebkurā gadīnī jiusim juoīt atpakaļ uz pyrmū sūli, lai dasaslāgtu "
-#~ "Mandriva Online.\n"
+#~ "Mageia Online.\n"
 #~ "Īvārojit, ka jiusim juonūruoda ari datora nūsaukums \n"
 #~ "(atļauti tikai latiņu alfabeta burti)"
 
@@ -998,15 +998,15 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgid "Previous"
 #~ msgstr "Atpakaļ"
 
-#~ msgid "Welcome to Mandriva Online"
-#~ msgstr "Laipni lyudzam Mandriva Online"
+#~ msgid "Welcome to Mageia Online"
+#~ msgstr "Laipni lyudzam Mageia Online"
 
 #, fuzzy
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "Maņ nav Mandriva Linux Online konta, i es grybu tū īgiut"
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "Maņ nav Mageia Linux Online konta, i es grybu tū īgiut"
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Mandriva Linux privātuma politika"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Mageia Linux privātuma politika"
 
 #~ msgid "Authentification"
 #~ msgstr "Autentifikaceja"
@@ -1025,8 +1025,8 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgstr "Izeju nu vedņa\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
-#~ msgstr "Mandriva Update navar dasaslēgt da servera, pamieginuosim vāluok"
+#~ "Mageia Online could not be contacted, please try again at a later time"
+#~ msgstr "Mageia Update navar dasaslēgt da servera, pamieginuosim vāluok"
 
 #~ msgid "Subscribe"
 #~ msgstr "Dasaraksteit"
@@ -1041,10 +1041,10 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgstr "  -v             - seiks režims.\n"
 
 #~ msgid ""
-#~ "You need to have an account on Mandriva Online, or update your "
+#~ "You need to have an account on Mageia Online, or update your "
 #~ "subscription."
 #~ msgstr ""
-#~ "Jiusim napīcīšoms Mandriva Online konts, voi ari juoatjaunynoj sova "
+#~ "Jiusim napīcīšoms Mageia Online konts, voi ari juoatjaunynoj sova "
 #~ "dasaraksteišona."
 
 #~ msgid "Your login or password may be wrong"
@@ -1105,39 +1105,39 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ msgstr "Labi"
 
 #~ msgid ""
-#~ "Do you really want to abort Mandriva Online?\n"
+#~ "Do you really want to abort Mageia Online?\n"
 #~ "To return to the Wizard press 'Cancel',\n"
 #~ "to really quit it press 'Quit'."
 #~ msgstr ""
-#~ "Teišom vālatīs puortraukt Mandriva Linux Online?\n"
+#~ "Teišom vālatīs puortraukt Mageia Linux Online?\n"
 #~ "Lai atsagrīztu vednī, spīdit 'Atceļt',\n"
 #~ "lai teišom izītu, spīdit 'Izīt'."
 
-#~ msgid "Really abort? - Mandriva Online"
-#~ msgstr "Teišom puortraukt? - Mandriva Linux Online"
+#~ msgid "Really abort? - Mageia Online"
+#~ msgstr "Teišom puortraukt? - Mageia Linux Online"
 
 #~ msgid ""
-#~ " You are just starting our Free Mandriva Linux Download Edition for the "
+#~ " You are just starting our Free Mageia Linux Download Edition for the "
 #~ "first time. \n"
 #~ "\n"
-#~ "There are now over three million Mandriva Linux users all over the "
+#~ "There are now over three million Mageia Linux users all over the "
 #~ "world!\n"
 #~ "\n"
 #~ "Please take a few seconds to fill a short questionnaire. The data from "
 #~ "this \n"
 #~ "questionnaire will be used only for aggregate market studies.\n"
-#~ "The text below is the privacy policy of Mandriva about your personal data."
+#~ "The text below is the privacy policy of Mageia about your personal data."
 #~ msgstr ""
-#~ "Jius tikai pyrmū reizi startejat myusu bezmoksys Mandriva Linux "
+#~ "Jius tikai pyrmū reizi startejat myusu bezmoksys Mageia Linux "
 #~ "šursyuteišonys izdavumu. \n"
 #~ "\n"
-#~ "Niule pa vysu pasauli ir vairuok kai treis miljoni Mandriva Linux "
+#~ "Niule pa vysu pasauli ir vairuok kai treis miljoni Mageia Linux "
 #~ "lītuotuoju!\n"
 #~ "\n"
 #~ "Lyudzu pagaidit dažys sekundis, kab aizpiļdeitu eisu aptaujis lopu. Ituos "
 #~ "aptaujis lopys \n"
 #~ "dati tiks izmontuoti tikai dieļ tierga izpietis datim.\n"
-#~ "Sekojūšais teksts ir jiusu personeigū datu Mandriva privātuma politika."
+#~ "Sekojūšais teksts ir jiusu personeigū datu Mageia privātuma politika."
 
 #~ msgid ""
 #~ "What personal data do we collect ?         \n"
@@ -1147,13 +1147,13 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ "\n"
 #~ "Firstly, we record your email address, name and postal address.\n"
 #~ "Secondly we give you a unique customer ID. This ID will be used to \n"
-#~ "add additional information related to your Mandriva Linux account such "
+#~ "add additional information related to your Mageia Linux account such "
 #~ "as:\n"
 #~ "    - Your subscription to mailling lists.\n"
 #~ "    - When registering a purchased product, we ask for personal\n"
 #~ "information as well as system/hardware details so that we may deliver\n"
 #~ "the best support services customized to your needs.\n"
-#~ "    - On our donation page and on our online store (MandrivaStore), we\n"
+#~ "    - On our donation page and on our online store (MageiaStore), we\n"
 #~ "record data for billing purpose (we do not store any credit card data).\n"
 #~ "    \n"
 #~ "What do we do with this information?\n"
@@ -1171,7 +1171,7 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ "to receive support, we keep this information private unless the\n"
 #~ "information is required by one of our partners to deliver the support\n"
 #~ "you require.\n"
-#~ "    - If you use MandrivaStore, we also use your Customer ID to track\n"
+#~ "    - If you use MageiaStore, we also use your Customer ID to track\n"
 #~ "your order and deliver your products.\n"
 #~ "    - If you provide us with marketing information, we keep it for \n"
 #~ "internal use only in order to improve our products so that they can \n"
@@ -1182,7 +1182,7 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ "remove their own personal data that we have on record. We offer this \n"
 #~ "as a worldwide privilege. You may execute this right at any time by \n"
 #~ "logging to your account with your customer ID and editing your\n"
-#~ "personnal data. You can log on to this page: http://www.mandrivaonline.com"
+#~ "personnal data. You can log on to this page: http://www.mageiaonline.com"
 #~ msgstr ""
 #~ "Kaidus anketu datus mes savuocam ?         \n"
 #~ "                               \n"
@@ -1192,13 +1192,13 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ "Pyrmkuort, mes īrokstom jiusu e-posta adresi, vuordu i posta adresi.\n"
 #~ "Ūtrkuort, mes dūdam jiusim unikalu klienta personys aplīceibu (ID). Itei "
 #~ "personys aplīceiba tiks lītuota, \n"
-#~ "lai pīvīnuotu papyldus informaceju saisteitu ar jiusu Mandriva Linux "
+#~ "lai pīvīnuotu papyldus informaceju saisteitu ar jiusu Mageia Linux "
 #~ "kontu taidu kai:\n"
 #~ "    - Jiusu dasaraksteišona da viestu ailem.\n"
 #~ "    - Kod registrejūt nūpierktū produktu, mes lyudzam personeigū\n"
 #~ "informaceju, taidu kai sistemys/dzeļžu detalis, lai mes varātu pīguoduot\n"
 #~ "lobuokūs atbolsta pakolpuojums pīlāguotus jiusu vajadzeibom.\n"
-#~ "    - Myusu zīduojumu lopa i myusu tīšsaistis veikalā (MandrivaStore), "
+#~ "    - Myusu zīduojumu lopa i myusu tīšsaistis veikalā (MageiaStore), "
 #~ "mes\n"
 #~ "īrokstom datus dieļ tuo, kab pasludynuot mierki (mes nasaglobojom "
 #~ "nikaidus kreditkartis datus).\n"
@@ -1222,7 +1222,7 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ "kab sajimtu atbolstu, mes turom itū informaceju privātu, cikom\n"
 #~ "informaceja ir napīcīšoma kaidam nu myusu partnerim, lai dūtu atbolstu,\n"
 #~ "kuru jius pīprosot.\n"
-#~ "    - Ja jius lītojot Mandriva Linux veikalu, mes ari izmontojam jiusu "
+#~ "    - Ja jius lītojot Mageia Linux veikalu, mes ari izmontojam jiusu "
 #~ "klienta personys aplīceibu (ID),\n"
 #~ "kab izsekuotu jiusu pasyutiejumam i pīguoduotu jiusu produktus.\n"
 #~ "    - Ja jius nūdrūšynojit myus ar marketinga informaceju, mes turom tū \n"
@@ -1239,7 +1239,7 @@ msgstr "Nav īspiejams atjaunuot pakūtnis nu update_source medium.\n"
 #~ "dasaslādzūt da jiusu konta ar jiusu klienta personys aplīceibu (ID) i "
 #~ "redigeit jiusu\n"
 #~ "personeigūs datus. Jius varit dasaslēgt itamā lopā: http://www."
-#~ "mandrivaonline.com"
+#~ "mageiaonline.com"
 
 #~ msgid "Sans Italic 17"
 #~ msgstr "Sans Italic 17"
diff --git a/po/lv.po b/po/lv.po
index d3ad11ed..a93584c6 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline 0.15\n"
+"Project-Id-Version: mgaonline 0.15\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2002-09-25 19:04+0200\n"
@@ -32,8 +32,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
-msgstr "Problēmu gadījumā sūtiet vēstuli uz support@mandrivaonline.com\n"
+"support@mageiaonline.com"
+msgstr "Problēmu gadījumā sūtiet vēstuli uz support@mageiaonline.com\n"
 
 #: ../mdkapplet:90
 #, c-format
@@ -47,7 +47,7 @@ msgstr "Jūsu sistēmā nav tīkla adaptera!"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -147,7 +147,7 @@ msgstr "Izpildīt userdrake"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -157,7 +157,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -205,7 +205,7 @@ msgstr "Atcelt"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -216,8 +216,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -279,7 +279,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -299,17 +299,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -378,7 +378,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -411,7 +411,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -444,7 +444,7 @@ msgstr "Atklāta kļūda"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -505,15 +505,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -562,33 +562,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -606,14 +606,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versija %s\n"
-"Autortiesības (C) %s Mandriva.\n"
+"Autortiesības (C) %s Mageia.\n"
 "Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL noteikumiem.\n"
 "\n"
 "Pielietojums:\n"
@@ -625,7 +625,7 @@ msgstr "  --help\t\t- drukāt šo palīdzības tekstu.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --update\t\t- izveidot atjaunināšanas datu nesēju.\n"
 
 #: ../mdkupdate:66
@@ -635,7 +635,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
 #: ../mdkupdate:68
@@ -650,7 +650,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -680,8 +680,8 @@ msgstr ""
 #~ msgstr "Pieslēguma problēma"
 
 #, fuzzy
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux privātuma politika"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux privātuma politika"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -800,8 +800,8 @@ msgstr ""
 #~ msgstr "Nepareiza parole.\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Laipni lūdzam Mandriva Online"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Laipni lūdzam Mageia Online"
 
 #~ msgid "Logs"
 #~ msgstr "Žurnāli"
@@ -811,14 +811,14 @@ msgstr ""
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versija %s\n"
-#~ "Autortiesības (C) %s Mandriva.\n"
+#~ "Autortiesības (C) %s Mageia.\n"
 #~ "Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL "
 #~ "noteikumiem.\n"
 #~ "\n"
@@ -838,9 +838,9 @@ msgstr ""
 #~ "uz centralizētu datubāzi, šis viss tiek darīts ar mērķi, lai Jūs tiktu\n"
 #~ "informēts par drošības uzlabojumiem un citiem vērtīgiem jaunumiem.\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Ievadiet jūsu Mandriva Online lietotājvārdu, paroli un datora nosaukumu:"
+#~ "Ievadiet jūsu Mageia Online lietotājvārdu, paroli un datora nosaukumu:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -853,14 +853,14 @@ msgstr ""
 #~ msgstr "Parole:"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Laipni lūdzam Mandriva Online"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Laipni lūdzam Mageia Online"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -875,10 +875,10 @@ msgstr ""
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Lai pilnvērtīgi izmantotu Mandriva Online pakalpojumus,\n"
+#~ "Lai pilnvērtīgi izmantotu Mageia Online pakalpojumus,\n"
 #~ "mēs gatavojamies nosūtīt jūsu konfigurāciju.\n"
 #~ "\n"
-#~ "Vednis uz Mandriva tūlīt nosūtīs sekojošu informācijiu:\n"
+#~ "Vednis uz Mageia tūlīt nosūtīs sekojošu informācijiu:\n"
 #~ "\n"
 #~ "1) jūsu sistēmā instalēto pakotņu sarakstu,\n"
 #~ "\n"
@@ -895,8 +895,8 @@ msgstr ""
 #~ msgstr "Pieslēguma problēma"
 
 #, fuzzy
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Laipni lūdzam Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Laipni lūdzam Mageia Online"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -931,16 +931,16 @@ msgstr ""
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Tagad pateicoties Mandriva Online jūs saņemsit\n"
+#~ "Tagad pateicoties Mageia Online jūs saņemsit\n"
 #~ "paziņojumus par drošības un citiem jauninājumiem."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online piedāvā iespēju automatizēt jauninājumus.\n"
+#~ "Mageia Online piedāvā iespēju automatizēt jauninājumus.\n"
 #~ "Jūsu sistēma regulāri palaidīs programmu, kas gaidīs jauninājumus\n"
 
 #, fuzzy
@@ -952,7 +952,7 @@ msgstr ""
 #~ msgstr "Nolasu konfigurāciju\n"
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --update\t\t- izveidot atjaunināšanas datu nesēju.\n"
 
 #~ msgid "Login:"
@@ -964,32 +964,32 @@ msgstr ""
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Jūsu lietotājvārds vai parole bija nepareizi.\n"
-#~ "Jums tie jāievada vēlreiz, vai arī jāizveido Mandriva Online lietotāja "
+#~ "Jums tie jāievada vēlreiz, vai arī jāizveido Mageia Online lietotāja "
 #~ "konts.\n"
 #~ "Jebkurā gadījumā jums jāiet atpakaļ uz pirmo soli, lai pieslēgtos "
-#~ "Mandriva Online.\n"
+#~ "Mageia Online.\n"
 #~ "Ievērojiet, ka jums jānorāda arī datora nosaukums \n"
 #~ "(atļauti tikai latīņu alfabēta burti)"
 
 #~ msgid "Previous"
 #~ msgstr "Atpakaļ"
 
-#~ msgid "Welcome to Mandriva Online"
-#~ msgstr "Laipni lūdzam Mandriva Online"
+#~ msgid "Welcome to Mageia Online"
+#~ msgstr "Laipni lūdzam Mageia Online"
 
 #, fuzzy
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "Man nav Mandriva Linux Online konta, un es vēlos "
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "Man nav Mageia Linux Online konta, un es vēlos "
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Mandriva Linux privātuma politika"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Mageia Linux privātuma politika"
 
 #~ msgid "Authentification"
 #~ msgstr "Autentifikācija"
@@ -1064,13 +1064,13 @@ msgstr ""
 #~ msgstr "Labi"
 
 #~ msgid ""
-#~ "Do you really want to abort Mandriva Online?\n"
+#~ "Do you really want to abort Mageia Online?\n"
 #~ "To return to the Wizard press 'Cancel',\n"
 #~ "to really quit it press 'Quit'."
 #~ msgstr ""
-#~ "Tiešām vēlaties pārtraukt Mandriva Linux Online?\n"
+#~ "Tiešām vēlaties pārtraukt Mageia Linux Online?\n"
 #~ "Lai atgrieztos vednī, spiediet 'Atcelt',\n"
 #~ "lai tiešām izietu, spiediet 'Iziet'."
 
-#~ msgid "Really abort? - Mandriva Online"
-#~ msgstr "Tiešām pārtraukt? - Mandriva Linux Online"
+#~ msgid "Really abort? - Mageia Online"
+#~ msgstr "Tiešām pārtraukt? - Mageia Linux Online"
diff --git a/po/mdkonline.pot b/po/mdkonline.pot
index dc24c6a9..64298673 100644
--- a/po/mdkonline.pot
+++ b/po/mdkonline.pot
@@ -28,7 +28,7 @@ msgstr ""
 
 #: ../mdkapplet:84
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
+msgid "Service configuration problem. Please check logs and send mail to support@mageiaonline.com"
 msgstr ""
 
 #: ../mdkapplet:90
@@ -43,7 +43,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -141,7 +141,7 @@ msgstr ""
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -151,7 +151,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -196,7 +196,7 @@ msgstr ""
 
 #: ../mdkapplet:508
 #, c-format
-msgid "Maintenance for this Mandriva Linux version has ended. No more updates will be delivered for this system."
+msgid "Maintenance for this Mageia Linux version has ended. No more updates will be delivered for this system."
 msgstr ""
 
 #: ../mdkapplet:514
@@ -206,7 +206,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr ""
 
 #: ../mdkapplet:526
@@ -262,7 +262,7 @@ msgstr ""
 #: ../mdkapplet:687
 #, c-format
 msgid ""
-"Launching MandrivaUpdate\n"
+"Launching MageiaUpdate\n"
 ""
 msgstr ""
 
@@ -289,17 +289,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr ""
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -367,7 +367,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -400,7 +400,7 @@ msgstr ""
 #. -PO: Here '%s' will be a localized date (eg:
 #: ../mdkapplet-add-media-helper:161
 #, c-format
-msgid "Mandriva provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
+msgid "Mageia provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:167
@@ -430,7 +430,7 @@ msgstr ""
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -490,12 +490,12 @@ msgstr ""
 
 #: ../mdkapplet_gui.pm:87
 #, c-format
-msgid "Mandriva Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mandriva official support."
+msgid "Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr ""
 
 #: ../mdkapplet_gui.pm:213
@@ -545,32 +545,32 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr ""
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr ""
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr ""
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr ""
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr ""
 
 #: ../mdkonline.pm:195
 #, c-format
-msgid "The Mandriva Linux distribution with even more softwares and official support."
+msgid "The Mageia Linux distribution with even more softwares and official support."
 msgstr ""
 
 #: ../mdkonline.pm:199
@@ -587,7 +587,7 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "usage:\n"
@@ -604,7 +604,7 @@ msgstr ""
 #: ../mdkupdate:65
 #, c-format
 msgid ""
-"  --auto\t\t- Mandriva Update launched automatically.\n"
+"  --auto\t\t- Mageia Update launched automatically.\n"
 ""
 msgstr ""
 
@@ -618,7 +618,7 @@ msgstr ""
 #: ../mdkupdate:67
 #, c-format
 msgid ""
-"  --noX\t\t\t- text mode version of Mandriva Update.\n"
+"  --noX\t\t\t- text mode version of Mageia Update.\n"
 ""
 msgstr ""
 
diff --git a/po/mk.po b/po/mk.po
index 76d26523..251635c4 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -6,7 +6,7 @@
 # Zoran Dimovski <zoki.dimovski@gmail.com>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-mk\n"
+"Project-Id-Version: mgaonline-mk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2006-09-17 20:55-0700\n"
@@ -33,10 +33,10 @@ msgstr "Вашиот систем е ажуриран"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Проблем при конфигурирање на сервисот. Ве молиме проверете ги логовите и "
-"испратете пошта на  support@mandrivaonline.com"
+"испратете пошта на  support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,7 +50,7 @@ msgstr "Достапни се нови ажурирања за вашиот си
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -157,7 +157,7 @@ msgstr "Вклучувам drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -167,7 +167,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -215,7 +215,7 @@ msgstr "Откажи"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -226,8 +226,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:526
 #, c-format
@@ -289,8 +289,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Вклучувам MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Вклучувам MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -309,18 +309,18 @@ msgstr "Проверувам мрежа: изгледа е оневозможе�
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Авторски права (C) %s од „Mandriva“"
+msgid "Copyright (C) %s by %s"
+msgstr "Авторски права (C) %s од „%s“"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "„Mandriva Online“ дава пристап до веб сервисите на „Mandriva“."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "„Mageia Online“ дава пристап до веб сервисите на „Mageia“."
 
 #: ../mdkapplet:899
 #, c-format
@@ -388,7 +388,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -421,7 +421,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -454,7 +454,7 @@ msgstr "Се случи грешка"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -515,15 +515,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -572,33 +572,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online %s"
+msgid "Mageia Free"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online %s"
+msgid "Mageia Mini"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "„Mandriva Online“"
+msgid "Mageia PowerPack"
+msgstr "„Mageia Online“"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -616,14 +616,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate верзија %s\n"
-"Авторски права (C) %s Mandriva.\n"
+"Авторски права (C) %s Mageia.\n"
 "Ова е бесплатен софтвер и може да се редистрибуира под условите на GNU GPL.\n"
 "\n"
 "употреба:\n"
@@ -635,8 +635,8 @@ msgstr "  --help\t\t- ја печати оваа помошна порака.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Автоматско вклучување на Mandriva Update.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Автоматско вклучување на Mageia Update.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -645,8 +645,8 @@ msgstr "  --mnf\t\t\t- вклучува одредени mnf скрипти.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- верзија на Mandriva Update во текстуален режим.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- верзија на Mageia Update во текстуален режим.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -660,7 +660,7 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online %s"
+#~ msgstr "Mageia Online %s"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -694,9 +694,9 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ msgid "No"
 #~ msgstr "Не"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Изгледа дека Mandriva Online е повторно инсталиран, го превчитувам "
+#~ "Изгледа дека Mageia Online е повторно инсталиран, го превчитувам "
 #~ "аплетот ...."
 
 #~ msgid "Checking... Updates are available\n"
@@ -709,8 +709,8 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ msgid "Connecting to"
 #~ msgstr "Се поврзувам со"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Аплет за ажурирање на Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Аплет за ажурирање на Mageia Linux"
 
 #~ msgid "Security error"
 #~ msgstr "Безбедносна грешка"
@@ -767,33 +767,33 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ msgstr "Грешка во сервисот"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Веб сервисите на Mandriva тековно се недостапни\n"
+#~ "Веб сервисите на Mageia тековно се недостапни\n"
 #~ "Ве молиме обидете се подоцна"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Лозинките не се совпаѓаат"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Веб сервисите на Mandriva се сервисираат\n"
+#~ "Веб сервисите на Mageia се сервисираат\n"
 #~ "Ве молиме обидете се подоцна"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Корисникот е забранет"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Корисничката сметка е забранета од веб сервисите на Mandriva"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Корисничката сметка е забранета од веб сервисите на Mageia"
 
 #~ msgid "Connection error"
 #~ msgstr "Грешка при поврзување"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Веб сервисите на Mandriva се недостапни"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Веб сервисите на Mageia се недостапни"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -825,12 +825,12 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Верзијата на клиентот „Mandriva Online“ е премногу стара.\n"
+#~ "Верзијата на клиентот „Mageia Online“ е премногу стара.\n"
 #~ "\n"
 #~ "Треба да го надградите со понова верзија. Новата верзија можете да ја "
 #~ "преземете од http://start.mandriva.com"
@@ -897,9 +897,9 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ msgid "Unknown state"
 #~ msgstr "Непозната држава"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Онлајн сервисите се оневозможени. Контактирајте со сајтот Mandriva "
+#~ "Онлајн сервисите се оневозможени. Контактирајте со сајтот Mageia "
 #~ "Online\n"
 
 #~ msgid "Wrong Password.\n"
@@ -922,8 +922,8 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ "Се појави проблем при поврзување со серверот. Ве молиме контактирајте со "
 #~ "тимот за поддршка"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Одговор од серверот на Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Одговор од серверот на Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Без проверка"
@@ -939,14 +939,14 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline верзија %s\n"
-#~ "Авторски права (C) %s Mandriva.\n"
+#~ "Авторски права (C) %s Mageia.\n"
 #~ "Ова е бесплатен софтвер и може да се редистрибуира под условите на GNU "
 #~ "GPL.\n"
 #~ "\n"
@@ -997,8 +997,8 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ msgid "Account creation or authentication"
 #~ msgstr "Создавање на сметка или автентикација"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Внесете го вашиот Mandriva Online логин, лозинка и име на машината:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Внесете го вашиот Mageia Online логин, лозинка и име на машината:"
 
 #~ msgid "Email address:"
 #~ msgstr "Адреса на е-пошта:"
@@ -1015,14 +1015,14 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Името на машината море да има од 1-40 алфанумерички карактери"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Се поврзувам на веб страницата Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Се поврзувам на веб страницата Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1037,10 +1037,10 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "За да придобивате од сервисите на Mandriva Online,\n"
+#~ "За да придобивате од сервисите на Mageia Online,\n"
 #~ "сега ќе ја пратиме вашата конфигурација.\n"
 #~ "\n"
-#~ "Волшебникот сега ќе ги испрати следниве информации на Mandriva:\n"
+#~ "Волшебникот сега ќе ги испрати следниве информации на Mageia:\n"
 #~ "\n"
 #~ "1) листа на пакетите кои се инсталирани на вашиот систем,\n"
 #~ "\n"
@@ -1061,8 +1061,8 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Проблем при испраќање на датотеките, ве молиме обидете се повторно"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Создади Mandriva Online сметка"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Создади Mageia Online сметка"
 
 #~ msgid "Greeting:"
 #~ msgstr "Поздрав:"
@@ -1093,10 +1093,10 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ msgstr "Неуспешно создавање на сметка!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "„Mandriva Online“ сметката е успешно креирана.\n"
+#~ "„Mageia Online“ сметката е успешно креирана.\n"
 #~ "Ве молиме притиснете „Следно“ за автентикација и испраќање на вашата "
 #~ "конфигурација\n"
 
@@ -1105,21 +1105,21 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Од сега па понатаму ќе добивате известувања за \n"
-#~ "сигурност и ажурирања, благодарение на „Mandriva Online“."
+#~ "сигурност и ажурирања, благодарение на „Mageia Online“."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "„Mandriva Online“ ви ја нуди способноста за автоматско ажурирање.\n"
+#~ "„Mageia Online“ ви ја нуди способноста за автоматско ажурирање.\n"
 #~ "Програмата ќе работи регуларно на вашиот систем чекајќи за нови "
 #~ "ажирирања\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Вашата „Mandriva Online“ сметка успешно е конфигуирана\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Вашата „Mageia Online“ сметка успешно е конфигуирана\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Конфигурацијата е успешно испратена"
@@ -1128,14 +1128,14 @@ msgstr "Не можам да ги ажурирам пакетите од мед�
 #~ msgstr "Проблем при праќање на конфигурацијата"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "Не можам да се поврзам на веб страницата на „Mandriva Online“: погрешна "
+#~ "Не можам да се поврзам на веб страницата на „Mageia Online“: погрешна "
 #~ "најава/лозинка или лоши поставувања на рутерот/огнениот ѕид"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- Вклучување на Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- Вклучување на Mageia Update.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Не може да се достави листата на надградби: %s"
diff --git a/po/mn.po b/po/mn.po
index 72fccdb7..1f4e3dbd 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2003-02-21 00:17+0100\n"
@@ -31,8 +31,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
-msgstr "Та гарсан асуудлаа support@mandrivaonline.com рүү илгээнэ үү\n"
+"support@mageiaonline.com"
+msgstr "Та гарсан асуудлаа support@mageiaonline.com рүү илгээнэ үү\n"
 
 #: ../mdkapplet:90
 #, c-format
@@ -46,7 +46,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -146,7 +146,7 @@ msgstr ""
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -156,7 +156,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -204,7 +204,7 @@ msgstr "Хүчингүй"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -215,7 +215,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr ""
 
 #: ../mdkapplet:526
@@ -278,7 +278,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -298,17 +298,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr ""
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -377,7 +377,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -410,7 +410,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -443,7 +443,7 @@ msgstr ""
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -504,14 +504,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr ""
 
 #: ../mdkapplet_gui.pm:213
@@ -561,33 +561,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr ""
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr ""
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr ""
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr ""
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr ""
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -605,14 +605,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate Version %s\n"
-"Copyright ® %s Mandriva.\n"
+"Copyright ® %s Mageia.\n"
 "Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
 "тарааж болно.\n"
 "\n"
@@ -625,7 +625,7 @@ msgstr "  --help\t\t- Энэ тусламжийг хэвлэх.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- Бүх мэдээллийг шинэчлэх.\n"
 
 #: ../mdkupdate:66
@@ -635,7 +635,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - Бүх мэдээллийг шинэчлэх.\n"
 
 #: ../mdkupdate:68
@@ -764,14 +764,14 @@ msgstr "„update_source“ хэрэгслээс багцуудыг шинэчи
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline Version %s\n"
-#~ "Copyright ® %s Mandriva.\n"
+#~ "Copyright ® %s Mageia.\n"
 #~ "Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
 #~ "тарааж болно.\n"
 #~ "\n"
@@ -825,12 +825,12 @@ msgstr "„update_source“ хэрэгслээс багцуудыг шинэчи
 #~ msgstr "Зөв биш э-шуудангийн хаяг! \n"
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t- Бүх мэдээллийг шинэчлэх.\n"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
+#~ "Mageia Update вэб хуудас руу хүрч чадахгүй байна, бид дахин оролдоё."
 
 #~ msgid "Login:"
 #~ msgstr "Нэвтрэх нэр:"
diff --git a/po/ms.po b/po/ms.po
index 74ea92ff..4a317fe9 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-11-26 15:20+0800\n"
@@ -30,10 +30,10 @@ msgstr "Sistem anda telah dikemaskini"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Masalah tetapan servis. Sila periksa log dan hantar mel ke "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, fuzzy, c-format
@@ -47,7 +47,7 @@ msgstr "Kemaskini baru terdapat untuk sistem anda"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -148,7 +148,7 @@ msgstr "Melaksanakan drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -158,7 +158,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -206,7 +206,7 @@ msgstr "Batal"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -217,8 +217,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -280,8 +280,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Melaksanakan MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Melaksanakan MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -300,17 +300,17 @@ msgstr "Pemeriksaan Rangkaian: seperti dimatikan\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Hakcipta (C) %s Mandriva SA"
+msgid "Copyright (C) %s by %s"
+msgstr "Hakcipta (C) %s %s SA"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -379,7 +379,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -412,7 +412,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -445,7 +445,7 @@ msgstr "Ralat telah berlaku"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -506,15 +506,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -563,33 +563,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -607,14 +607,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "versi mdkupdate %s\n"
-"Hakmilik (C) %s Mandriva.\n"
+"Hakmilik (C) %s Mageia.\n"
 "Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
 "\n"
 "penggunaan:\n"
@@ -626,7 +626,7 @@ msgstr "  --help\t\t- cetak mesej bantuan ini.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- kemaskini semua maklumat.\n"
 
 #: ../mdkupdate:66
@@ -636,7 +636,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - kemaskini semua maklumat.\n"
 
 #: ../mdkupdate:68
@@ -651,7 +651,7 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -688,8 +688,8 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Menyambung ke"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Aplet Kemaskini Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Aplet Kemaskini Mageia Linux"
 
 #~ msgid "Security error"
 #~ msgstr "Ralat keselamatan"
@@ -749,14 +749,14 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ msgid "User Forbidden"
 #~ msgstr "Pengguna Dihalang"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Akaun pengguna dihalang oleh servis web Mandriva"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Akaun pengguna dihalang oleh servis web Mageia"
 
 #~ msgid "Connection error"
 #~ msgstr "Ralat sambungan"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Servis web Mandriva tidak dapat dicapai"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Servis web Mageia tidak dapat dicapai"
 
 #~ msgid "Please wait"
 #~ msgstr "Sila tunggu"
@@ -822,8 +822,8 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Keadaan tidak diketahui"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Service dalam talian dimatikan. Hubungi laman Mandriva Online\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Service dalam talian dimatikan. Hubungi laman Mageia Online\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Salah katalaluan.\n"
@@ -831,8 +831,8 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ msgid "Wrong Action or host or login.\n"
 #~ msgstr "Salah Tindakan atau hos atau logmasuk.\n"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Jawapan dari pelayan Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Jawapan dari pelayan Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Tiada pemeriksaan"
@@ -848,14 +848,14 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "versi mdonline %s\n"
-#~ "Hakmilik (C) %s Mandriva.\n"
+#~ "Hakmilik (C) %s Mageia.\n"
 #~ "Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
 #~ "\n"
 #~ "penggunaan:\n"
@@ -887,8 +887,8 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Penciptaan akaun atau pengesahan"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Masukkan login, katalaluan, dan nama mesin  Mandriva Online Anda:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Masukkan login, katalaluan, dan nama mesin  Mageia Online Anda:"
 
 #~ msgid "Email address:"
 #~ msgstr "Alamat emel:"
@@ -902,14 +902,14 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Nama mesin mesti 1 hingga 40 aksara alfanumerik"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Menyambung ke laman web Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Menyambung ke laman web Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -924,10 +924,10 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Agar mendapat manfaat servis Mandriva Online,\n"
+#~ "Agar mendapat manfaat servis Mageia Online,\n"
 #~ "kami akan meng-upload konfigurasi Anda.\n"
 #~ "\n"
-#~ "Wizard kini akan mengirim info berikut ke Mandriva:\n"
+#~ "Wizard kini akan mengirim info berikut ke Mageia:\n"
 #~ "\n"
 #~ "1) daftar pakej yang diinstal di dalam sistem Anda,\n"
 #~ "\n"
@@ -948,8 +948,8 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Masalah berlaku ketika memuatnaik fail, sila cuba lagi"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Cipta Akaun Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Cipta Akaun Mageia Online"
 
 #~ msgid "Greeting:"
 #~ msgstr "Ucapan:"
@@ -981,16 +981,16 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Mulai saat ini Anda akan menerima pengumuman sekuriti dan upgrade\n"
-#~ "dari Mandriva Online."
+#~ "dari Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online memberi Anda kemampuan update automatik.\n"
+#~ "Mageia Online memberi Anda kemampuan update automatik.\n"
 #~ "Sebuah program akan berjalan secara periodik menunggu untuk kemaskini "
 #~ "baru\n"
 
@@ -1000,8 +1000,8 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Masalah memuatnaik tetapan"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- lancar Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- lancar Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Sistem sibuk. Sila tunggu ..."
@@ -1013,5 +1013,5 @@ msgstr "Gagal mengemaskini pakej dari media update_source.\n"
 #~ msgstr ""
 #~ "Pelaksanaan tidak selamat: Kaedah hanya terdapat melalui httpS sahaja"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update gagal dihubungi, sila cuba sekali lagi."
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update gagal dihubungi, sila cuba sekali lagi."
diff --git a/po/mt.po b/po/mt.po
index 25f67891..781ce4fc 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -33,10 +33,10 @@ msgstr "Is-sistema tiegħek hija aġġornata"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Hemm problema fil-konfigurazzjoni. Iċċekkja l-logs u ibgħat imejl "
-"lilsupport@mandrivaonline.com"
+"lilsupport@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,7 +50,7 @@ msgstr "Hemm aġġornamenti ġodda għas-sistema tiegħek"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -155,7 +155,7 @@ msgstr "Qed jitħaddem drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -165,7 +165,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -213,7 +213,7 @@ msgstr "Ikkanċella"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -224,8 +224,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -287,8 +287,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Qed jitħaddem MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Qed jitħaddem MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -307,17 +307,17 @@ msgstr "Qed niċċekkja n-network... jidher li mitfi\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -386,7 +386,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -419,7 +419,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -452,7 +452,7 @@ msgstr "Inqalgħet problema"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -513,15 +513,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -570,33 +570,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -614,14 +614,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate verżjoni %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
 "GPL.\n"
 "\n"
@@ -634,8 +634,8 @@ msgstr "  --help\t\t- uri dan il-messaġġ ta' għajnuna.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update jitħaddem awtomatikament.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update jitħaddem awtomatikament.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -644,8 +644,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - ħaddem Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - ħaddem Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -659,7 +659,7 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -694,9 +694,9 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgid "No"
 #~ msgstr "Le"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online jidher li reġa' ġie installat, qed terġa' tittella' l-"
+#~ "Mageia Online jidher li reġa' ġie installat, qed terġa' tittella' l-"
 #~ "applet ..."
 
 #~ msgid "Checking... Updates are available\n"
@@ -709,8 +709,8 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Qed issir konnessjoni ma'"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Applet għall-aġġornamenti Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Applet għall-aġġornamenti Mageia Linux"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -837,9 +837,9 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Stat mhux magħruf"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Servizzi online mhux attivi. Ikkuntattja s-sit ta' Mandriva Online\n"
+#~ "Servizzi online mhux attivi. Ikkuntattja s-sit ta' Mageia Online\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Password ħażina.\n"
@@ -855,8 +855,8 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ "route, firewall jew proxy)\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Merħba għal Mandriva Online"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Merħba għal Mageia Online"
 
 #~ msgid "No check"
 #~ msgstr "Ebda ċċekkjar"
@@ -872,14 +872,14 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline verżjoni %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
 #~ "GPL.\n"
 #~ "\n"
@@ -910,9 +910,9 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Ħolqien jew awtentikazzjoni ta' kont"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Daħħal il-login, password u isem tal-kompjuter għal Mandriva Online:"
+#~ "Daħħal il-login, password u isem tal-kompjuter għal Mageia Online:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -928,14 +928,14 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Punti tal-immunar jista' jkun fihom biss ittri u numri"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Qed naqbad mas-sit Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Qed naqbad mas-sit Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -950,10 +950,10 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Biex tibbenefika mis-servizzi ta' Mandriva Online,\n"
+#~ "Biex tibbenefika mis-servizzi ta' Mageia Online,\n"
 #~ "irridu nibgħatu l-konfigurazzjoni tiegħel.\n"
 #~ "\n"
-#~ "Is-Saħħar se jibgħat din l-informazzjoni lill Mandriva:\n"
+#~ "Is-Saħħar se jibgħat din l-informazzjoni lill Mageia:\n"
 #~ "\n"
 #~ "1) Lista tal-pakketti li huma nstallati fuq is-sistema tiegħek,\n"
 #~ "\n"
@@ -975,8 +975,8 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Problema waqt li jintbagħtu l-fajls, erġa' pprova"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Oħloq kont Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Oħloq kont Mageia Online"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -1007,10 +1007,10 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgstr "Dan mhux indirizz tal-imejl validu!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Kont Mandriva Online inħoloq.\n"
+#~ "Kont Mageia Online inħoloq.\n"
 #~ "Jekk jogħġbok agħfas \"Li Jmiss\" biex tawtentika ruħek u tibgħat il-"
 #~ "konfigurazzjoni\n"
 
@@ -1019,22 +1019,22 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Minn issa 'l quddiem int tirċievi notifiki dwar \n"
-#~ "sigurtà u aġġornamenti minngħand Mandriva Online."
+#~ "sigurtà u aġġornamenti minngħand Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online joffrilek il-possibbiltà li taġġorna s-sistema "
+#~ "Mageia Online joffrilek il-possibbiltà li taġġorna s-sistema "
 #~ "awtomatikament.\n"
 #~ "Regularment jitħaddem programm fuq is-sistema biex jistenna "
 #~ "aġġornamenti.\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Il-kont Mandriva Online tiegħek ġie konfigurat\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Il-kont Mageia Online tiegħek ġie konfigurat\n"
 
 #, fuzzy
 #~ msgid "Configuration uploaded successfully"
@@ -1044,8 +1044,8 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Qed tinqara' l-konfigurazzjoni\n"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- ħaddem Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- ħaddem Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Is-sistema hija okkupata. Stenna ftit ..."
@@ -1056,8 +1056,8 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Ebda fajl %s misjub. L-ewwel ħaddem is-saħħar mdkonline"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Online ma setax jikkuntattja s-sit, se nerġa' nipprova"
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Online ma setax jikkuntattja s-sit, se nerġa' nipprova"
 
 #~ msgid "Login:"
 #~ msgstr "Login:"
@@ -1071,15 +1071,15 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Il-login jew password kien ħażin.\n"
-#~ "Jew erġa' ttajpjaha, jew trid toħloq kont ieħor ma' Mandriva Online.\n"
-#~ "F'dak il-każ, mur lura fl-ewwel pass biex taqbad ma' Mandriva Online.\n"
+#~ "Jew erġa' ttajpjaha, jew trid toħloq kont ieħor ma' Mageia Online.\n"
+#~ "F'dak il-każ, mur lura fl-ewwel pass biex taqbad ma' Mageia Online.\n"
 #~ "Innota li trid tipprovdi wkoll isem ta' kompjuter (karattri alfabetiċi "
 #~ "biss aċċettati)"
 
@@ -1108,20 +1108,20 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgstr "Ma stajtx naġġorna pakketti mis-sors mdkupdate.\n"
 
 #~ msgid ""
-#~ "Mandriva Update could not upload the diff files. Send a mail to support "
+#~ "Mageia Update could not upload the diff files. Send a mail to support "
 #~ "[at] mandrivaonline [dot] net"
 #~ msgstr ""
-#~ "Mandriva Update ma setax jibgħat il-fajls diff. Ibgħat imejl lil support "
+#~ "Mageia Update ma setax jibgħat il-fajls diff. Ibgħat imejl lil support "
 #~ "[at] mandrivaonline [dot] net"
 
 #~ msgid "Previous"
 #~ msgstr "Ta' qabel"
 
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "M'għandix kont fuq Mandriva Online u nixtieq nabbona"
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "M'għandix kont fuq Mageia Online u nixtieq nabbona"
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Polza ta' privatezza Mandriva Linux"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Polza ta' privatezza Mageia Linux"
 
 #~ msgid "Authentification"
 #~ msgstr "Awtentikazzjoni"
@@ -1139,8 +1139,8 @@ msgstr "Ma stajtx naġġorna pakketti mis-sors update_source.\n"
 #~ msgstr "Ħiereġ is-saħħar\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
-#~ msgstr "Mandriva Online ma setax jiġi kuntattjat, ipprova iżjed tard"
+#~ "Mageia Online could not be contacted, please try again at a later time"
+#~ msgstr "Mageia Online ma setax jiġi kuntattjat, ipprova iżjed tard"
 
 #~ msgid "  --update       - Update keys\n"
 #~ msgstr "  --update       - Aġġorna ċifrarji\n"
diff --git a/po/nb.po b/po/nb.po
index ece54d5f..3086f128 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -40,10 +40,10 @@ msgstr "Systemet ditt er oppdatert."
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Feil ved oppsett av tjenesten. Kontroller loggene og kontakt "
-"support@mandrivaonline.com."
+"support@mageiaonline.com."
 
 #: ../mdkapplet:90
 #, c-format
@@ -57,8 +57,8 @@ msgstr "Det finnes nye oppdateringer for systemet ditt."
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "En ny versjon av Mandriva Linux er nå ute."
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "En ny versjon av Mageia Linux er nå ute."
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -167,8 +167,8 @@ msgstr "Starter drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Ny versjon av Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Ny versjon av Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -177,8 +177,8 @@ msgstr "Bla gjennom"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "En ny versjon av Mandriva Linux er nå ute."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "En ny versjon av Mageia Linux er nå ute."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -225,10 +225,10 @@ msgstr "Avbryt"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Vedlikeholdet for dette Mandriva Linux-systemet har utløpt. Dette betyr at "
+"Vedlikeholdet for dette Mageia Linux-systemet har utløpt. Dette betyr at "
 "det ikke vil komme flere programvareoppdateringer."
 
 #: ../mdkapplet:514
@@ -238,8 +238,8 @@ msgstr "For å holde systemet sikkert, kan du:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -309,8 +309,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Kjører MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Kjører MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -329,18 +329,18 @@ msgstr "Kontrollerer nettverk: ser ut til å være slått av\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright © %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online gir deg tilgang til vevtjenestene til Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online gir deg tilgang til vevtjenestene til Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -408,8 +408,8 @@ msgstr "Vil du legge til dette nye programvarelageret?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -443,10 +443,10 @@ msgstr "Feil ved henting av distribusjonsliste:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva tilbyr tolv måneder med skrivebordsoppdateringer (fram til %s) og "
+"Mageia tilbyr tolv måneder med skrivebordsoppdateringer (fram til %s) og "
 "atten måneder med baseoppdateringer (fram til %s) for distribusjoner."
 
 #: ../mdkapplet-add-media-helper:167
@@ -480,8 +480,8 @@ msgstr "Det oppsto en feil"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Mandriva-kontoen din har ikke et nedlastingsabonnement for %s."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Mageia-kontoen din har ikke et nedlastingsabonnement for %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -541,18 +541,18 @@ msgstr "Bedrift"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Linux gir deg den beste opplevelsen for skrivebordet. Stabilitet og "
+"Mageia Linux gir deg den beste opplevelsen for skrivebordet. Stabilitet og "
 "effektiviteten til åpen kildekode-løsninger, sammen med eksklusiv "
-"programvare and offentlig støtte fra Mandriva."
+"programvare and offentlig støtte fra Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Funksjoner i Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Funksjoner i Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -601,36 +601,36 @@ msgstr "%s er nå tilgjengelig, du kan oppgradere til:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"Mandriva Linux-distribusjonen med ennå mer programvare og offentlig støtte."
+"Mageia Linux-distribusjonen med ennå mer programvare og offentlig støtte."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -646,14 +646,14 @@ msgstr "Distribusjonsoppgradering"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versjon %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Dette er fri programvare og kan redistribueres under vilkårene til GNU GPL.\n"
 "\n"
 "bruk:\n"
@@ -665,8 +665,8 @@ msgstr "  --help\t\t– vis denne hjelpeteksten.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t– Mandriva Update kjørt automatisk.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t– Mageia Update kjørt automatisk.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -675,8 +675,8 @@ msgstr "  --mnf\t\t\t– Kjør mnf-spesifike skript.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t– tekstversjon av Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t– tekstversjon av Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -696,14 +696,14 @@ msgstr "Klarte ikke oppdatere pakker fra oppdateringsmedium.\n"
 #~ "nett, for å kunne legge til flere pakkebrønner."
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Mandriva-kontoen din har ikke utvidet vedlikeholdsabonnement slått på."
+#~ "Mageia-kontoen din har ikke utvidet vedlikeholdsabonnement slått på."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Vil du ha PowerPack?"
@@ -713,7 +713,7 @@ msgstr "Klarte ikke oppdatere pakker fra oppdateringsmedium.\n"
 #~ "and get Powerpack subscription."
 #~ msgstr ""
 #~ "Siden du mangler rettigheter til PowerPack, kan du besøke nettbutikken "
-#~ "til Mandriva og bestille et abonnement."
+#~ "til Mageia og bestille et abonnement."
 
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Skaff abonnement på PowerPack."
@@ -732,10 +732,10 @@ msgstr "Klarte ikke oppdatere pakker fra oppdateringsmedium.\n"
 #~ msgstr "Avbryt, oppgrader til «Free»"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Mandriva-kontoen din har ikke abonnementsnedlasting av PowerPack påslått."
+#~ "Mageia-kontoen din har ikke abonnementsnedlasting av PowerPack påslått."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -756,8 +756,8 @@ msgstr "Klarte ikke oppdatere pakker fra oppdateringsmedium.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Gratulerer"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Oppgraderinga til Mandriva %s er nå fullført."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Oppgraderinga til Mageia %s er nå fullført."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Du må starte maskina på nytt."
diff --git a/po/nl.po b/po/nl.po
index 0fcc086d..186eaa0f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-nl\n"
+"Project-Id-Version: mgaonline-nl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2008-12-10 23:10+0100\n"
@@ -34,10 +34,10 @@ msgstr "Uw systeem is bijgewerkt"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Dienst-instellingsprobleem. Verifieer uw logboeken en stuur een e-mail naar "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -51,8 +51,8 @@ msgstr "Er zijn nieuwe herzieningen beschikbaar voor uw systeem"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Er is een nieuwe versie van Mandriva Linux uitgebracht"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Er is een nieuwe versie van Mageia Linux uitgebracht"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -159,8 +159,8 @@ msgstr "Drakconnect wordt gestart\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nieuwe versie van Mandriva Linux-distributie"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nieuwe versie van Mageia Linux-distributie"
 
 #: ../mdkapplet:464
 #, c-format
@@ -169,8 +169,8 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Er is een nieuwe versie van de Mandriva Linux-distributie uitgebracht."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Er is een nieuwe versie van de Mageia Linux-distributie uitgebracht."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -217,7 +217,7 @@ msgstr "Annuleren"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -228,8 +228,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:526
 #, c-format
@@ -297,8 +297,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate wordt gestart\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate wordt gestart\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -317,18 +317,18 @@ msgstr "Controle van het netwerk: lijkt uitgeschakeld te zijn\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s van Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright © %s van %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online geeft toegang tot webdiensten van Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online geeft toegang tot webdiensten van Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -400,7 +400,7 @@ msgstr "Wilt u dit extra softwaredepot installeren?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -434,7 +434,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -467,8 +467,8 @@ msgstr "Er is een fout opgetreden"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Uw Mandriva-account bevat geen %s-downloadabonnement."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Uw Mageia-account bevat geen %s-downloadabonnement."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -528,15 +528,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -585,33 +585,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online %s"
+msgid "Mageia Free"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online %s"
+msgid "Mageia Mini"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -629,14 +629,14 @@ msgstr "Distributie-opwaardering"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versie %s\n"
-"Copyright © %s Mandriva.\n"
+"Copyright © %s Mageia.\n"
 "Dit is vrije software en mag verder gedistribueerd worden onder de "
 "voorwaarden van de GNU GPL.\n"
 "\n"
@@ -649,8 +649,8 @@ msgstr "  --help\t\t- deze gebruiksaanwijzing.tonen\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update automatisch starten.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update automatisch starten.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -659,8 +659,8 @@ msgstr "  --mnf\t\t\t- specifieke mnf scripts starten.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- tekstmodus van Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- tekstmodus van Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -681,22 +681,22 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Uw Mandriva-account bevat geen %s-downloadabonnement."
+#~ msgstr "Uw Mageia-account bevat geen %s-downloadabonnement."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online %s"
+#~ msgstr "Mageia Online %s"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Computeromschrijving:"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Uw Mandriva-account bevat geen Powerpack-downloadabonnement."
+#~ msgstr "Uw Mageia-account bevat geen Powerpack-downloadabonnement."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -717,8 +717,8 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgid "Congratulations"
 #~ msgstr "Gefeliciteerd"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Opwaardering naar Mandriva versie %s geslaagd."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Opwaardering naar Mageia versie %s geslaagd."
 
 #~ msgid "You must restart your system."
 #~ msgstr "U dient uw computer te herstarten."
@@ -742,10 +742,10 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""
-#~ "Er is een nieuwe versie van de Mandriva Linux-distributie uitgebracht."
+#~ "Er is een nieuwe versie van de Mageia Linux-distributie uitgebracht."
 
 #, fuzzy
 #~ msgid "You are using '%s' distribution."
@@ -760,9 +760,9 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgid "No"
 #~ msgstr "Nee"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online lijkt opnieuw geïnstalleerd te zijn, applet herladen…"
+#~ "Mageia Online lijkt opnieuw geïnstalleerd te zijn, applet herladen…"
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Nagaan… Herzieningen zijn beschikbaar\n"
@@ -776,8 +776,8 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgid "Connecting to"
 #~ msgstr "Verbinding aan het maken met"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux herzieningen-applet"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux herzieningen-applet"
 
 #~ msgid "Security error"
 #~ msgstr "Beveiligingsfout"
@@ -834,33 +834,33 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgstr "Service-fout"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva webdiensten zijn momenteel niet beschikbaar\n"
+#~ "Mageia webdiensten zijn momenteel niet beschikbaar\n"
 #~ "Probeer het later nog eens"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Wachtwoorden kloppen niet"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva webdiensten zijn momenteel in onderhoud\n"
+#~ "Mageia webdiensten zijn momenteel in onderhoud\n"
 #~ "Probeer het later nog eens"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Gebruiker niet toegestaan"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Gebruikersaccount niet toegestaan door Mandriva webdiensten"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Gebruikersaccount niet toegestaan door Mageia webdiensten"
 
 #~ msgid "Connection error"
 #~ msgstr "Verbindingsfout"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Mandriva webdiensten niet bereikbaar"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Mageia webdiensten niet bereikbaar"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -892,12 +892,12 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Deze versie van de Mandriva Online-client is te oud.\n"
+#~ "Deze versie van de Mageia Online-client is te oud.\n"
 #~ "\n"
 #~ "U dient op te waarderen naar een nieuwere versie. U kunt deze vinden op "
 #~ "http://start.mandriva.com"
@@ -962,8 +962,8 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgid "Unknown state"
 #~ msgstr "Onbekende toestand"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Online diensten uitgeschakeld. Zie de Mandriva Online webstek\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Online diensten uitgeschakeld. Zie de Mageia Online webstek\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Wachtwoord onjuist.\n"
@@ -985,8 +985,8 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ "Er heeft zich een probleem voorgedaan bij het maken van de verbinding met "
 #~ "de server, neem alstublieft contact op met het ondersteuningsteam"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Antwoord van Mandriva Online server\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Antwoord van Mageia Online server\n"
 
 #~ msgid "No check"
 #~ msgstr "Geen controle"
@@ -1002,14 +1002,14 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versie %s\n"
-#~ "Copyright © %s Mandriva.\n"
+#~ "Copyright © %s Mageia.\n"
 #~ "Dit is vrije software en mag verder gedistribueerd worden onder de "
 #~ "voorwaarden van de GNU GPL.\n"
 #~ "\n"
@@ -1061,9 +1061,9 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Aanmaken van account of aanmeldingscontrole"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Voer uw Mandriva Online gebruikersnaam, wachtwoord en computernaam in:"
+#~ "Voer uw Mageia Online gebruikersnaam, wachtwoord en computernaam in:"
 
 #~ msgid "Email address:"
 #~ msgstr "E-mailadres:"
@@ -1080,14 +1080,14 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Machinenaam dient uit 1 tot 40 alfanumerieke tekens te bestaan"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Verbinden met Mandriva Online webstek..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Verbinden met Mageia Online webstek..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1102,10 +1102,10 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Om te profiteren van de Mandriva Online diensten,\n"
+#~ "Om te profiteren van de Mageia Online diensten,\n"
 #~ "staan we op het punt uw configuratie op te sturen.\n"
 #~ "\n"
-#~ "De assistent zal nu de volgende informatie naar Mandriva sturen:\n"
+#~ "De assistent zal nu de volgende informatie naar Mageia sturen:\n"
 #~ "\n"
 #~ "1) een lijst met pakketten die u heeft geïnstalleerd op uw systeem,\n"
 #~ "\n"
@@ -1124,8 +1124,8 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Probleem met het versturen van de gegevens, probeert u het opnieuw"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Online account aanmaken"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Online account aanmaken"
 
 #~ msgid "Greeting:"
 #~ msgstr "Aanhef:"
@@ -1156,10 +1156,10 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgstr "Aanmaken van account is mislukt!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Aanmaken van een Mandriva Online-account is gelukt.\n"
+#~ "Aanmaken van een Mageia Online-account is gelukt.\n"
 #~ "Klik op \"Volgende\" om aan te melden en uw systeemsamenstelling te "
 #~ "verzenden\n"
 
@@ -1168,22 +1168,22 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Vanaf nu ontvangt u beveiligings- en\n"
-#~ "herzieningsaankondigingen dankzij Mandriva Online"
+#~ "herzieningsaankondigingen dankzij Mageia Online"
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online biedt u de mogelijkheid om de herzieningen te "
+#~ "Mageia Online biedt u de mogelijkheid om de herzieningen te "
 #~ "automatiseren.\n"
 #~ "Een programma in uw systeem zal regelmatig kijken of er nieuwe herziene\n"
 #~ "versies zijn\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Uw Mandriva Online account is met succes geconfigureerd\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Uw Mageia Online account is met succes geconfigureerd\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Het versturen van de configuratie is gelukt!"
@@ -1192,14 +1192,14 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgstr "Probleem met versturen van de configuratie"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
-#~ "Niet in staat verbinding te maken met de Mandriva Online website: "
+#~ "Niet in staat verbinding te maken met de Mageia Online website: "
 #~ "onjuiste gebruikersnaam/wachtwoord of router/firewall instelling"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- Mandriva Update starten.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- Mageia Update starten.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Kan lijst met herzieningen niet ophalen: %s"
@@ -1219,9 +1219,9 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Geen %s-bestand gevonden. Start eerst de mdkonline-assistent"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update kan geen verbinding met de webstek maken, we proberen het "
+#~ "Mageia Update kan geen verbinding met de webstek maken, we proberen het "
 #~ "later nog eens."
 
 #~ msgid "Login:"
@@ -1236,17 +1236,17 @@ msgstr "Niet in staat pakketten bij te werken vanaf het update_source-medium\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Uw gebruikersnaam of wachtwoord was onjuist.\n"
-#~ " U kunt het opnieuw proberen, of u moet zich nog registreren bij Mandriva "
+#~ " U kunt het opnieuw proberen, of u moet zich nog registreren bij Mageia "
 #~ "Online.\n"
 #~ " In het laatste geval dient u terug te gaan naar de eerste stap om "
-#~ "verbinding te maken met Mandriva Online.\n"
+#~ "verbinding te maken met Mageia Online.\n"
 #~ " Weest u zich ervan bewust dat u ook een computernaam moet invoeren \n"
 #~ " (alleen letters zijn toegestaan)"
 
diff --git a/po/nn.po b/po/nn.po
index 0a8432e2..116216ec 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -3,7 +3,7 @@
 # Karl Ove Hufthammer <karl@huftis.org>, 2004, 2005, 2007, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-08 07:54+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
@@ -29,10 +29,10 @@ msgstr "Systemet ditt er oppdatert."
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Feil ved oppsett av tenesta. Kontroller loggane og kontakt "
-"support@mandrivaonline.com."
+"support@mageiaonline.com."
 
 #: ../mdkapplet:90
 #, c-format
@@ -46,8 +46,8 @@ msgstr "Det finst nye oppdateringar for systemet ditt."
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Ein ny versjon av Mandriva Linux er no ute."
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Ein ny versjon av Mageia Linux er no ute."
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -156,8 +156,8 @@ msgstr "Køyrer drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Ny versjon av Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Ny versjon av Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -166,8 +166,8 @@ msgstr "Bla gjennom"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Ein ny versjon av Mandriva Linux er no ute."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Ein ny versjon av Mageia Linux er no ute."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -214,10 +214,10 @@ msgstr "Avbryt"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Vedlikehaldsplanen for denne utgåva av Mandriva Linux er no over. Du vil "
+"Vedlikehaldsplanen for denne utgåva av Mageia Linux er no over. Du vil "
 "ikkje få nokon nye oppdateringar framover."
 
 #: ../mdkapplet:514
@@ -227,8 +227,8 @@ msgstr "For å halda systemet sikkert, kan du:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -298,8 +298,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Køyrer MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Køyrer MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -318,18 +318,18 @@ msgstr "Kontrollerer nettverk: Ser avslått ut.\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright © %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online gjev deg tilgang til vevtenestene til Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online gjev deg tilgang til vevtenestene til Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -399,8 +399,8 @@ msgstr "Vil du leggja til dette nye programvarelageret?"
 # skip-rule: server
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -434,10 +434,10 @@ msgstr "Feil ved henting av distribusjonslista:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva tilbyr 12 månader med generelle oppdateringar (fram til %s), samt "
+"Mageia tilbyr 12 månader med generelle oppdateringar (fram til %s), samt "
 "18 månader med grunnoppdateringar (fram til %s)."
 
 #: ../mdkapplet-add-media-helper:167
@@ -471,8 +471,8 @@ msgstr "Det oppstod ein feil"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Mandriva-kontoen din har ikkje eit nedlastingsabonnement for %s."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Mageia-kontoen din har ikkje eit nedlastingsabonnement for %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -532,18 +532,18 @@ msgstr "Bedrift"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack gjev deg den beste Linux-opplevinga – stabilitet og "
+"Mageia Powerpack gjev deg den beste Linux-opplevinga – stabilitet og "
 "effektivitet, med løysingar baserte på fri programvare saman med eksklusive "
-"Mandriva-program, og med offisiell kundestøtte."
+"Mageia-program, og med offisiell kundestøtte."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Funksjonar i Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Funksjonar i Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -592,36 +592,36 @@ msgstr "%1 er no tilgjengeleg. Du kan oppgradera til:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"Mandriva Linux-distribusjonen med endå fleire program, og med kundestøtte."
+"Mageia Linux-distribusjonen med endå fleire program, og med kundestøtte."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -637,14 +637,14 @@ msgstr "Oppgradering av distribusjon"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate – versjon %s\n"
-"Copyright © %s Mandriva.\n"
+"Copyright © %s Mageia.\n"
 "Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
 "lisensen.\n"
 "\n"
@@ -657,8 +657,8 @@ msgstr "  --help         – Vis denne hjelpeteksten.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto         – Mandriva Update køyrd automatisk.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto         – Mageia Update køyrd automatisk.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -667,8 +667,8 @@ msgstr "  --mnf          – Køyr mnf-spesifikke skript.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX          – Tekstutgåva av Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX          – Tekstutgåva av Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -688,10 +688,10 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ "passord ditt her for å leggja til det nye pakkemediet."
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Mandriva-kontoen din har ikkje eit abonnement på utvida vedlikehald."
+#~ "Mageia-kontoen din har ikkje eit abonnement på utvida vedlikehald."
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Ønskjer du Powerpack?"
@@ -700,7 +700,7 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ "Since you don't have Powerpack rights you may visit mandriva store now "
 #~ "and get Powerpack subscription."
 #~ msgstr ""
-#~ "Sidan du ikkje har Powerpack, kan du besøkja Mandriva-butikken no, og "
+#~ "Sidan du ikkje har Powerpack, kan du besøkja Mageia-butikken no, og "
 #~ "skaffa deg eit Powerpack-abonnement."
 
 #~ msgid "Get Powerpack subscription!"
@@ -720,10 +720,10 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ msgstr "Avbryt, og oppgrader til Free-utgåva"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Mandriva-kontoen din har ikkje eit nedlastingsabonnement for PowePack."
+#~ "Mageia-kontoen din har ikkje eit nedlastingsabonnement for PowePack."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -744,8 +744,8 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Gratulerer"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Oppgraderinga til Mandriva %s er no fullført."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Oppgraderinga til Mageia %s er no fullført."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Du må starta maskina på nytt."
@@ -768,10 +768,10 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ msgstr "Klarte ikkje leggja til nytt medium"
 
 #~ msgid ""
-#~ "This Mandriva Linux system maintenance has ended. It means it will not "
+#~ "This Mageia Linux system maintenance has ended. It means it will not "
 #~ "receive any new software update."
 #~ msgstr ""
-#~ "Vedlikehald for dette Mandriva Linux-systemet er ikkje lenger støtta. "
+#~ "Vedlikehald for dette Mageia Linux-systemet er ikkje lenger støtta. "
 #~ "Dette medfører at du i framtida ikkje får nye programvareoppdateringar."
 
 #, fuzzy
@@ -788,9 +788,9 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ msgid "No"
 #~ msgstr "Nei"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online er installert på nytt. Startar panelprogrammet om att."
+#~ "Mageia Online er installert på nytt. Startar panelprogrammet om att."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Kontrollererer … Det finst nye oppdateringar.\n"
@@ -804,8 +804,8 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Koplar til"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Panelprogram for Mandriva Linux-oppdateringar"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Panelprogram for Mageia Linux-oppdateringar"
 
 #~ msgid "Security error"
 #~ msgstr "Tryggleiksfeil"
@@ -860,33 +860,33 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ msgstr "Tenestefeil"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva-tenestene er ikkje tilgjengelege nett no.\n"
+#~ "Mageia-tenestene er ikkje tilgjengelege nett no.\n"
 #~ "Prøv på nytt seinare."
 
 #~ msgid "Password mismatch"
 #~ msgstr "Passorda er ikkje like."
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva-tenestene er under omlegging.\n"
+#~ "Mageia-tenestene er under omlegging.\n"
 #~ "Prøv på nytt seinare."
 
 #~ msgid "User Forbidden"
 #~ msgstr "Brukar nekta tilgang"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Brukarkontoen er nekta tilgang til Mandriva-tenestene"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Brukarkontoen er nekta tilgang til Mageia-tenestene"
 
 #~ msgid "Connection error"
 #~ msgstr "Sambandsfeil"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Får ikkje kontakt med Mandriva-tenestene"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Får ikkje kontakt med Mageia-tenestene"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -917,12 +917,12 @@ msgstr "Klarte ikkje oppdatera pakkar frå oppdateringsmedium.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Denne versjonen av Mandriva Online er for gammal.\n"
+#~ "Denne versjonen av Mageia Online er for gammal.\n"
 #~ "\n"
 #~ "Du må oppdatera til ein nyare versjon. Du kan lasta ned ein ny versjon "
 #~ "frå http://start.mandriva.com/."
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 393d10c1..461d3a8e 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-03-26 22:30+0530\n"
 "Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
@@ -30,9 +30,9 @@ msgstr "ਤੁਹਾਡਾ ਸਿਸਟਮ ਨਵੀਨ ਹੈ"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
-"ਸੇਵਾ ਸੰਰਚਨਾ ਸਮੱਸਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਲਾਗ ਦੀ ਪੜਤਾਲ ਕਰੋ ਅਤੇ support@mandrivaonline.com ਨੂੰ "
+"ਸੇਵਾ ਸੰਰਚਨਾ ਸਮੱਸਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਲਾਗ ਦੀ ਪੜਤਾਲ ਕਰੋ ਅਤੇ support@mageiaonline.com ਨੂੰ "
 "ਚਿੱਠੀ ਪਾਓ।"
 
 #: ../mdkapplet:90
@@ -47,7 +47,7 @@ msgstr "ਤੁਹਾਡੇ ਸਿਸਟਮ ਲਈ ਨਵੇਂ ਨਵੀਨੀ�
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -153,7 +153,7 @@ msgstr "drakconnect ਚਾਲੂ ਕੀਤਾ ਜਾਦਾ ਹੈ\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -163,7 +163,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -211,7 +211,7 @@ msgstr "ਰੱਦ ਕਰੋ"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -222,7 +222,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
 #: ../mdkapplet:526
@@ -285,8 +285,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate ਚਾਲੂ ਕੀਤਾ ਜਾਦਾ ਹੈ\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate ਚਾਲੂ ਕੀਤਾ ਜਾਦਾ ਹੈ\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -305,17 +305,17 @@ msgstr "ਨੈਟਵਰਕ ਪੜਤਾਲ: ਆਯੋਗ ਜਾਪਦਾ ਹੈ\
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -384,7 +384,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -417,7 +417,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -450,7 +450,7 @@ msgstr "ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -511,14 +511,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
 #: ../mdkapplet_gui.pm:213
@@ -568,33 +568,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -612,14 +612,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate ਵਰਜਨ %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "ਇਹ ਸਾਫਟਵੇਅਰ ਮੁਫਤ ਹੈ ਅਤੇ GNU GPL ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਧੀਨ ਮੁੜ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
 "\n"
 "ਵਰਤੋਂ:\n"
@@ -631,8 +631,8 @@ msgstr "  --help         - print this help message.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto         - Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto         - Mageia Update launched automatically.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -641,8 +641,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - launch Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - launch Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -691,7 +691,7 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgid "No"
 #~ msgstr "ਨਹੀਂ"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਮੁੜ-ਇੰਸਟਾਲ ਜਾਪਦਾ ਹੈ, ਐਪਲਿਟ ਮੁੜ ਲੋਡ..."
 
 #~ msgid "Checking... Updates are available\n"
@@ -704,7 +704,7 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgid "Connecting to"
 #~ msgstr "ਜੁੜਿਆ ਜਾਦਾ ਹੈ"
 
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "ਮੈਂਡਰਿਵਲੀਨਕਸ ਨਵੀਨੀਕਰਨ ਐਪਲਿਟ"
 
 #, fuzzy
@@ -832,7 +832,7 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgid "Unknown state"
 #~ msgstr "ਅਣਜਾਣੀ ਸਥਿਤੀ"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr "ਆਨਲਾਇਨ ਸੇਵਾ ਆਯੋਗ ਹੈ। ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਨਾਲ ਸੰਪਰਕ ਕਰੋ\n"
 
 #~ msgid "Wrong Password.\n"
@@ -853,7 +853,7 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ "support team"
 #~ msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਸਮੇਂ ਸਮੱਸਿਆ ਆਈ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਸਹਾਇਤਾ ਟੀਮ ਨਾਲ ਸੰਪਰਕ ਕਰੋ"
 
-#~ msgid "Response from Mandriva Online server\n"
+#~ msgid "Response from Mageia Online server\n"
 #~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਸਰਵਰ ਤੋਂ ਜਵਾਬ\n"
 
 #~ msgid "No check"
@@ -870,14 +870,14 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline ਵਰਜਨ %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "ਇਹ ਸਾਫਟਵੇਅਰ ਮੁਫਤ ਹੈ ਅਤੇ GNU GPL ਦੀਆਂ ਸ਼ਰਤਾਂ ਅਧੀਨ ਮੁੜ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
 #~ "\n"
 #~ "ਵਰਤੋਂ:\n"
@@ -904,7 +904,7 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgid "Account creation or authentication"
 #~ msgstr "ਖਾਤਾ ਬਣਾਉਣਾ ਜਾਂ ਦਾਖਲਾ"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr "ਆਪਣਾ ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਲਾਗਿੰਨ, ਗੁਪਤ-ਕੋਡ ਅਤੇ ਮਸ਼ੀਨ ਨਾਂ ਦਿਓ:"
 
 #, fuzzy
@@ -921,14 +921,14 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "ਮਾਊਂਟ ਸਥਿਤੀ ਵਿੱਚ ਸਿਰਫ ਅੱਖਰ-ਅੰਕੀ ਅੱਖਰਾਂ ਸ਼ਾਮਿਲ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ"
 
-#~ msgid "Connecting to Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
 #~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਵੈਬਸਾਇਟ ਨਾਲ ਜੁੜਿਆ ਜਾ ਰਿਹਾ ਹੈ..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -964,7 +964,7 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "ਫਾਇਲਾਂ ਅੱਪਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ, ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ"
 
-#~ msgid "Create a Mandriva Online Account"
+#~ msgid "Create a Mageia Online Account"
 #~ msgstr "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਖਾਤਾ ਬਣਾਓ"
 
 #, fuzzy
@@ -996,7 +996,7 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgstr "ਠੀਕ ਪੱਤਰ ਸਿਰਨਾਵਾਂ ਨਹੀਂ ਹੈ!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
 #~ "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਖਾਤਾ ਸਫਲਤਾਪੂਰਕ ਬਣਾਇਆ ਗਿਆ ਹੈ।\n"
@@ -1007,19 +1007,19 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "ਹੁਣ ਤੁਸੀਂ ਸੁਰੱਖਿਆ ਤੇ ਨਵੀਨੀਕਰਨ ਲਈ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ\n"
 #~ "ਕਰ ਸਕਦੇ ਹੋ, ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਦਾ ਧੰਨਵਾਦ।"
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
 #~ "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਤੁਹਾਨੂੰ ਨਵੀਨੀਕਰਨ ਸਵੈ-ਚਾਲਤ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ।\n"
 #~ "ਇੱਕ ਕਾਰਜ ਲਗਾਤਾਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਲਈ ਨਵੀਨ ਪੈਕੇਜਾਂ ਦੀ ਪੜਤਾਲ ਕਰਦਾ ਰਹੇਗਾ।\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
 #~ msgstr "ਤੁਹਾਡਾ ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਖਾਤਾ ਸਫਲਤਾਪੂਰਕ ਬਣ ਗਿਆ ਹੈ।\n"
 
 #~ msgid "Configuration uploaded successfully"
@@ -1029,15 +1029,15 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgstr "ਸੰਰਚਨਾ ਅੱਪਲੋਡ ਦੌਰਾਨ ਸਮੱਸਿਆ"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "ਮੈਂਡਰਿਵਆਨਲਾਇਨ ਸਾਇਟ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: ਗਲਤ ਲਾਗਿੰਨ/ਗੁਪਤ-ਕੋਡ ਜਾਂ ਰਾਊਟਰ/ਫਾਇਰਵਾਲ "
 #~ "ਗਲਤ ਵਿਵਸਥਾ"
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet       - launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet       - launch Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "ਸਿਸਟਮ ਰੁੱਝਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ..."
@@ -1048,8 +1048,8 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "ਕੋਈ ਫਾਇਲ %s ਨਹੀਂ ਲੱਭੀ। mdkonline ਸਹਾਇਕ ਪਹਿਲਾਂ ਚਲਾਓ।"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update ਸਾਇਟ ਨਾਲ ਸੰਪਰਕ ਨਹੀਂ ਕਰ ਸਕਿਆ ਹੈ, ਅਸੀਂ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰਦੇ ਹਾਂ।"
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update ਸਾਇਟ ਨਾਲ ਸੰਪਰਕ ਨਹੀਂ ਕਰ ਸਕਿਆ ਹੈ, ਅਸੀਂ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰਦੇ ਹਾਂ।"
 
 #~ msgid "Login:"
 #~ msgstr "ਲਾਗਿੰਨ:"
@@ -1060,8 +1060,8 @@ msgstr "update_source ਮਾਧਿਅਮ ਤੋਂ ਪੈਕੇਜ ਨਵੀਨ�
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
diff --git a/po/pl.po b/po/pl.po
index ee79ab31..9bc0b5e7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,6 +1,6 @@
 # translation of mdkonline.po to
 # translation of pl.po to
-# Aplikacja umożliwiająca zdalne korzystanie z usług Mandriva Linux.
+# Aplikacja umożliwiająca zdalne korzystanie z usług Mageia Linux.
 # Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # Arkadiusz Lipiec <arkadiusz.lipiec@gazeta.pl>, 2002-2004.
@@ -12,7 +12,7 @@
 # Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@amazis.pl>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-08 08:58+0100\n"
@@ -37,8 +37,8 @@ msgstr "Oprogramowanie systemu jest aktualne"
 
 #: ../mdkapplet:84
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
-msgstr "Problem z konfiguracją usługi. Sprawdź logi i wyślij e-mail'a pod adres support@mandrivaonline.com"
+msgid "Service configuration problem. Please check logs and send mail to support@mageiaonline.com"
+msgstr "Problem z konfiguracją usługi. Sprawdź logi i wyślij e-mail'a pod adres support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -52,8 +52,8 @@ msgstr "Dostępne są nowe aktualizacje dla Twojego systemu"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Udostępniono nową wersję dystrybucji Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Udostępniono nową wersję dystrybucji Mageia Linux"
 
 #: ../mdkapplet:119
 #: ../mdkapplet:161
@@ -159,8 +159,8 @@ msgstr "Uruchamianie programu drakconnect\n"
 #: ../mdkapplet:459
 #: ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nowa wersja dystrybucji Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nowa wersja dystrybucji Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -169,8 +169,8 @@ msgstr "Przeglądaj"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Udostępniono nową wersję dystrybucji Mandriva Linux."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Udostępniono nową wersję dystrybucji Mageia Linux."
 
 #: ../mdkapplet:475
 #: ../mdkapplet:572
@@ -231,8 +231,8 @@ msgstr "Anuluj"
 
 #: ../mdkapplet:508
 #, c-format
-msgid "Maintenance for this Mandriva Linux version has ended. No more updates will be delivered for this system."
-msgstr "Wsparcie dla tej wersji Mandriva Linux wygasło. Aktualizacje dla tego systemu nie będą dostarczane."
+msgid "Maintenance for this Mageia Linux version has ended. No more updates will be delivered for this system."
+msgstr "Wsparcie dla tej wersji Mageia Linux wygasło. Aktualizacje dla tego systemu nie będą dostarczane."
 
 #: ../mdkapplet:514
 #, c-format
@@ -241,8 +241,8 @@ msgstr "Aby utrzymać system bezpiecznym, możesz:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -296,8 +296,8 @@ msgstr "Podłącz notebooka do zasilania oraz połącz się z internetem z wykor
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Uruchamianie polecenia MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Uruchamianie polecenia MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -316,18 +316,18 @@ msgstr "Sprawdzanie sieci: wygląda na wyłączoną\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online umożliwia korzystanie z usług sieciowych Mandrivy."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online umożliwia korzystanie z usług sieciowych Mandrivy."
 
 #: ../mdkapplet:899
 #, c-format
@@ -403,8 +403,8 @@ msgstr "Czy chcesz zainstalować dodatkowy nośnik z pakietami?"
 #: ../mdkapplet:1061
 #: ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84
 #: ../mdkapplet-config:43
@@ -438,8 +438,8 @@ msgstr "Nieudane pobranie listy dystrybucji:"
 #. -PO: Here '%s' will be a localized date (eg:
 #: ../mdkapplet-add-media-helper:161
 #, c-format
-msgid "Mandriva provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
-msgstr "Mandriva przez 12 miesięcy dostarcza aktualizacje (aż do %s) i 18 miesięcy aktualizuje bazę (aż do %s) dla dystrybucji."
+msgid "Mageia provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
+msgstr "Mageia przez 12 miesięcy dostarcza aktualizacje (aż do %s) i 18 miesięcy aktualizuje bazę (aż do %s) dla dystrybucji."
 
 #: ../mdkapplet-add-media-helper:167
 #, c-format
@@ -469,7 +469,7 @@ msgstr "Wystąpił błąd"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr "Na Twoim koncie w systemie Mandrivy nie ma informacji na temat subskrypcji %s'a."
 
 #: ../mdkapplet-add-media-helper:226
@@ -530,13 +530,13 @@ msgstr "Enterprise"
 
 #: ../mdkapplet_gui.pm:87
 #, c-format
-msgid "Mandriva Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mandriva official support."
-msgstr "Mandriva Powerpack dostarcza najlepsze rozwiązania Linuksa dla komputerów: stabilniejsze i wydajniejsze rozwiązanie open source na zasadach wyłączności oraz oficjalne wsparcie Mandrivy."
+msgid "Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."
+msgstr "Mageia Powerpack dostarcza najlepsze rozwiązania Linuksa dla komputerów: stabilniejsze i wydajniejsze rozwiązanie open source na zasadach wyłączności oraz oficjalne wsparcie Mandrivy."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Możliwości Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Możliwości Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -585,35 +585,35 @@ msgstr "% jest teraz dostępna, możesz uaktualnić do:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178
 #: ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181
 #: ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
-msgid "The Mandriva Linux distribution with even more softwares and official support."
-msgstr "Dystrybucja Mandriva Linux z najbogatszym oprogramowaniem i oficjalnym wsparciem."
+msgid "The Mageia Linux distribution with even more softwares and official support."
+msgstr "Dystrybucja Mageia Linux z najbogatszym oprogramowaniem i oficjalnym wsparciem."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -629,13 +629,13 @@ msgstr "Aktualizacja dystrybucji"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "wersja mdkupdate %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "To jest Wolne Oprogramowanie i może być rozpowszechniane\n"
 "na zasadach licencji GNU GPL.\n"
 "\n"
@@ -648,8 +648,8 @@ msgstr "  --help\t\t- wyświetla ten komunikat pomocy.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- automatyczne uruchamiane Mandriva Update .\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- automatyczne uruchamiane Mageia Update .\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -658,8 +658,8 @@ msgstr "  --mnf\t\t\t- uruchom skrypty dla mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update pracujący w trybie tekstowym.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update pracujący w trybie tekstowym.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -678,7 +678,7 @@ msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
 #~ "Wprowadź ID Twojego konta abonenta, aby dodać dodatkowy nośnik z pakietami"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
 #~ "Na Twoim koncie Mandrivy nie ma aktywnego abonamentu Rozszerzonego "
@@ -686,7 +686,7 @@ msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Chcesz Powerpack?"
@@ -696,7 +696,7 @@ msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
 #~ "and get Powerpack subscription."
 #~ msgstr ""
 #~ "Nie masz uprawnień do Powerpack, możesz odwiedzić sklep i wykupić "
-#~ "subskrycję Mandriva Powerpack."
+#~ "subskrycję Mageia Powerpack."
 
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Subskrypcja Powerpack!"
@@ -715,7 +715,7 @@ msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
 #~ msgstr "Anulowano, uaktualnij edycję Free."
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
 #~ "Na Twoim koncie w systemie Mandrivy nie ma informacji na temat "
@@ -740,8 +740,8 @@ msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Gratulacje"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Aktualizacja systemu do wersji Mandriva %s przebiegła pomyśłnie."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Aktualizacja systemu do wersji Mageia %s przebiegła pomyśłnie."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Uruchom komputer ponownie."
@@ -765,6 +765,6 @@ msgstr "Nie można uaktualnić pakietów z nośnika update_source.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Udostępniono nową wersję dystrybucji Mandriva Linux."
+#~ msgstr "Udostępniono nową wersję dystrybucji Mageia Linux."
diff --git a/po/pt.po b/po/pt.po
index fc3c0d25..e74c49e1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,18 +1,14 @@
 # translation of pt.po to Português
-# translation of pt.po to
+#
 # MDKONLINE EM PORTUGUES
 # Copyright (C) 2002,2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # Fernando Ribeiro <fa.ribeiro(at)gmx.net>, 2003.
 # José JORGE <jose.jorge@oreka.com>, 2002,2003.
 # Jose Jorge <jjorge@free.fr>, 2004.
-# Américo José Melo <mmodem00@netvisao.pt>, 2004, 2005.
-# José Melo <mmodem00@gmail.com>, 2005.
-# José Melo <mmodme00@gmail.com>, 2005.
+# Zé <mmodem00@netvisao.pt>, 2004, 2005, 2006.
 # Zé <mmodem00@gmail.com>, 2006, 2007, 2008, 2010.
-# Zé <mmodem00@netvisao.pt>, 2006.
 # Zé <ze@mandriva.org>, 2008, 2010.
-# Zé <mmodem00@gmal.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
@@ -42,10 +38,10 @@ msgstr "O seu sistema está actualizado"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problema na configuração do serviço. Por favor verifique os registos "
-"e envie uma mensagem para support@mandrivaonline.com"
+"e envie uma mensagem para support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -59,8 +55,8 @@ msgstr "Estão disponíveis novas actualizações para o seu sistema"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Foi lançada uma nova versão da distribuição Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Foi lançada uma nova versão da distribuição Mageia Linux"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -173,8 +169,8 @@ msgstr "A lançar drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nova versão da distribuição Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nova versão da distribuição Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -183,8 +179,8 @@ msgstr "Procurar"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Foi lançada uma nova versão da distribuição Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Foi lançada uma nova versão da distribuição Mageia Linux"
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -231,10 +227,10 @@ msgstr "Cancelar"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Terminou a manutenção desta versão Mandriva Linux. Não serão entregues mais "
+"Terminou a manutenção desta versão Mageia Linux. Não serão entregues mais "
 "actualizações para este sistema."
 
 #: ../mdkapplet:514
@@ -244,8 +240,8 @@ msgstr "Para manter o seu sistema seguro, pode:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -315,8 +311,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "A iniciar o  MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "A iniciar o  MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -335,18 +331,18 @@ msgstr "A verificação a rede: parece desactivada\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Em-linha %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Em-linha %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Direitos de Autor (C) %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Direitos de Autor (C) %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "A Mandriva Em-linha dá acesso aos serviços web Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "A Mageia Em-linha dá acesso aos serviços web Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -416,8 +412,8 @@ msgstr "Deseja instalar este repositório de programas adicional?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Servidor Mandriva Enterprise"
+msgid "Mageia Enterprise Server"
+msgstr "Servidor Mageia Enterprise"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -451,10 +447,10 @@ msgstr "Falha ao obter lista da distribuição:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"A Mandriva dá 12 meses de actualizações do seu ambiente (até %s) "
+"A Mageia dá 12 meses de actualizações do seu ambiente (até %s) "
 "e 18 meses de actualizações base (até %s) para distribuições."
 
 #: ../mdkapplet-add-media-helper:167
@@ -488,9 +484,9 @@ msgstr "Ocorreu um erro"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
-"A sua conta Mandriva não tem uma subscrição de transferência %s activada."
+"A sua conta Mageia não tem uma subscrição de transferência %s activada."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -550,18 +546,18 @@ msgstr "Enterprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"A Mandriva Powerpack traz-lhe a melhor experiência Linux: "
+"A Mageia Powerpack traz-lhe a melhor experiência Linux: "
 "estabilidade e eficiência de soluções em código livre juntamente "
-"com a exclusividade do suporte oficial Mandriva."
+"com a exclusividade do suporte oficial Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Características Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Características Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -610,36 +606,36 @@ msgstr "%s está agora disponível, pode actualizar para:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"A distribuição Mandriva Linux  ainda com mais programas e com suporte "
+"A distribuição Mageia Linux  ainda com mais programas e com suporte "
 "oficial."
 
 #: ../mdkonline.pm:199
@@ -656,14 +652,14 @@ msgstr "Actualização da Distribuição"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versão %s\n"
-"Direitos de autor (C) %s Mandriva.\n"
+"Direitos de autor (C) %s Mageia.\n"
 "Isto é um programa livre e pode ser redistribuído sob os termos da licença "
 "GNU GPL.\n"
 "\n"
@@ -676,8 +672,8 @@ msgstr "  --help\t\t- mostra esta mensagem de ajuda.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update executado automáticamente.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update executado automáticamente.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -686,8 +682,8 @@ msgstr "  --mnf\t\t\t- executa scripts específicos mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- versão em modo texto do Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- versão em modo texto do Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -707,15 +703,15 @@ msgstr "Não é possível actualizar os pacotes da média update_source.\n"
 #~ "adicionais assim que se tenha subscrito em-linha"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "A sua conta Mandriva não tem uma subscrição de Manutenção Extendida "
+#~ "A sua conta Mageia não tem uma subscrição de Manutenção Extendida "
 #~ "activada."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Deseja a versão Powerpack?"
@@ -744,10 +740,10 @@ msgstr "Não é possível actualizar os pacotes da média update_source.\n"
 #~ msgstr "Cancelar, actualizar para a Edição Grátis (Free)"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "A sua conta Mandriva não tem uma subscrição de transferência Powerpack "
+#~ "A sua conta Mageia não tem uma subscrição de transferência Powerpack "
 #~ "activada."
 
 #~ msgid ""
@@ -769,8 +765,8 @@ msgstr "Não é possível actualizar os pacotes da média update_source.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Parabéns"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Actualização para o lançamento Mandriva %s terminada."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Actualização para o lançamento Mageia %s terminada."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Tem que reiniciar o seu sistema."
@@ -794,7 +790,7 @@ msgstr "Não é possível actualizar os pacotes da média update_source.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr "Foi lançada uma nova distribuição estável."
 
@@ -811,7 +807,7 @@ msgstr "Não é possível actualizar os pacotes da média update_source.\n"
 #~ msgid "No"
 #~ msgstr "Não"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "O Mandriva Em-linha parece ter sido reinstalado, a recarregar o "
+#~ "O Mageia Em-linha parece ter sido reinstalado, a recarregar o "
 #~ "componente..."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 58b9699c..15eec3b6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -37,10 +37,10 @@ msgstr "Seu sistema está atualizado"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problema no serviço de configuração. Por favor, verifique os logs gerados e "
-"envie para support@mandrivaonline.com"
+"envie para support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -54,8 +54,8 @@ msgstr "Atualizações disponíveis para o seu sistema"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Foi lançada uma nova versão da distribuição Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Foi lançada uma nova versão da distribuição Mageia Linux"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -168,8 +168,8 @@ msgstr "Lançando o Drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nova versão da Distribuição Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nova versão da Distribuição Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -178,8 +178,8 @@ msgstr "Navegar"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Foi lançada uma nova versão do Mandriva Linux."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Foi lançada uma nova versão do Mageia Linux."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -226,10 +226,10 @@ msgstr "Cancelar"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"A manutenção deste sistema Mandriva Linux chegou ao seu final. Isto "
+"A manutenção deste sistema Mageia Linux chegou ao seu final. Isto "
 "significa que você não receberá mais atualizações de programas."
 
 #: ../mdkapplet:514
@@ -239,8 +239,8 @@ msgstr "A fim de manter seu sistema seguro, você pode:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -310,8 +310,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Lançando o MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Lançando o MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -330,18 +330,18 @@ msgstr "Analisando Rede: Parece desativada\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online da Acesso para Serviços Web Mandriva"
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online da Acesso para Serviços Web Mageia"
 
 #: ../mdkapplet:899
 #, c-format
@@ -416,8 +416,8 @@ msgstr "Você deseja adicionar esta mídia com programas extras ?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -449,10 +449,10 @@ msgstr "Falha ao obter a lista de distribuições:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"A Mandriva fornece 12 meses de atualizações de Ambiente de Trabalho (até %s) "
+"A Mageia fornece 12 meses de atualizações de Ambiente de Trabalho (até %s) "
 "e 18 meses de atualizações de sistema base (até o %s) para suas "
 "distribuições."
 
@@ -487,8 +487,8 @@ msgstr "Ocorreu um Erro"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Sua conta Mandriva não possui assinatura para download %s."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Sua conta Mageia não possui assinatura para download %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -548,18 +548,18 @@ msgstr "Empresa"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack traz para você o melhor da experiência Linux: "
+"Mageia Powerpack traz para você o melhor da experiência Linux: "
 "estabilidade e eficiência em soluções de código aberto junto com programas "
-"exclusivos e suporte oficial Mandriva."
+"exclusivos e suporte oficial Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Características Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Características Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -608,36 +608,36 @@ msgstr "Agora disponível %s, você pode atualizar para:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"A distribuição Mandriva Linux com ainda mais programas e suporte oficial."
+"A distribuição Mageia Linux com ainda mais programas e suporte oficial."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -653,14 +653,14 @@ msgstr "Atualização da Distribuição"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versão %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Isto é Software Livre e pode ser redistribuído sobre os termos da GNU GPL\n"
 ".\n"
 "uso:\n"
@@ -672,8 +672,8 @@ msgstr "  --help\t\t- Exibe esta Mensagem de Ajuda.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Lançar Mandriva Update Automaticamente.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Lançar Mageia Update Automaticamente.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -682,8 +682,8 @@ msgstr "  --mnf\t\t\t- Roda scripts específicos do mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Versão Modo Texto do Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Versão Modo Texto do Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -703,15 +703,15 @@ msgstr "Não foi possível atualizar os programas da mídia update_source.\n"
 #~ "inscrição online adicionarmos uma mídia de programas extra."
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Sua conta Mandriva não possui assinatura para Manutenção Estendida "
+#~ "Sua conta Mageia não possui assinatura para Manutenção Estendida "
 #~ "habilitada."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Gostaria de assinar o Powerpack?"
@@ -721,7 +721,7 @@ msgstr "Não foi possível atualizar os programas da mídia update_source.\n"
 #~ "and get Powerpack subscription."
 #~ msgstr ""
 #~ "Já que você não tem uma assinatura Powerpack você, opcionalmente, pode "
-#~ "visitar a loja Mandriva e obter uma."
+#~ "visitar a loja Mageia e obter uma."
 
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Obtenha uma assinatura Powerpack!"
@@ -740,9 +740,9 @@ msgstr "Não foi possível atualizar os programas da mídia update_source.\n"
 #~ msgstr "Cancelar, atualizar para a versão Free"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Sua conta Mandriva não possui assinatura para download PowerPack."
+#~ msgstr "Sua conta Mageia não possui assinatura para download PowerPack."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -763,8 +763,8 @@ msgstr "Não foi possível atualizar os programas da mídia update_source.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Parabéns"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Atualização para o Mandriva %s finalizada com sucesso :)"
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Atualização para o Mageia %s finalizada com sucesso :)"
 
 #~ msgid "You must restart your system."
 #~ msgstr "Você deve Reiniciar o Sistema."
@@ -787,10 +787,10 @@ msgstr "Não foi possível atualizar os programas da mídia update_source.\n"
 #~ msgstr "Falha Enquanto Adicionava Mídia"
 
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr ""
-#~ "A versão do Mandriva Linux instalado em seu sistema não é mais suportada."
+#~ "A versão do Mageia Linux instalado em seu sistema não é mais suportada."
 
 #~ msgid "Get long term support for your currently installed distribution"
 #~ msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 17e23060..8252755c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -44,7 +44,7 @@
 # Cătălin Florin RUSSEN <cfrussen@yahoo.co.uk>, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: https://qa.mandriva.com\n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-08 13:23+0100\n"
@@ -74,10 +74,10 @@ msgstr "Sistemul este la zi cu actualizările"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problemă de configurare a serviciului. Verificați jurnalele și trimiteți un "
-"mesaj la support@mandrivaonline.com"
+"mesaj la support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -91,8 +91,8 @@ msgstr "Noi actualizări sînt disponibile pentru sistemul vostru"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "O nouă versiune a distribuției Mandriva Linux a fost lansată"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "O nouă versiune a distribuției Mageia Linux a fost lansată"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -206,8 +206,8 @@ msgstr "Se lansează drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Versiune nouă a distribuției Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Versiune nouă a distribuției Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -216,8 +216,8 @@ msgstr "Navigare"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "O nouă versiune a distribuției Mandriva Linux a fost lansată."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "O nouă versiune a distribuției Mageia Linux a fost lansată."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -264,10 +264,10 @@ msgstr "Anulează"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Mentenanța acestei versiuni de Mandriva Linux s-a sfîrșit. Nu se vor mai "
+"Mentenanța acestei versiuni de Mageia Linux s-a sfîrșit. Nu se vor mai "
 "produce actualizări pentru acest sistem."
 
 #: ../mdkapplet:514
@@ -277,8 +277,8 @@ msgstr "Pentru a vă păstra sistemul securizat, puteți:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -349,8 +349,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Se lansează MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Se lansează MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -369,18 +369,18 @@ msgstr "Verificarea rețelei: se pare că este dezactivată\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Drepturi de autor (C) %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Drepturi de autor (C) %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online permite accesul la serviciile web Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online permite accesul la serviciile web Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -458,8 +458,8 @@ msgstr "Doriți să instalați acest depozit de programe adiționale?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -493,10 +493,10 @@ msgstr "Eroare la preloarea listei de distribuții:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva oferă 12 luni de actualizări pentru mediul de birou (pînă în %s) și "
+"Mageia oferă 12 luni de actualizări pentru mediul de birou (pînă în %s) și "
 "18 luni de actualizări de bază (pînă în %s) pentru distribuții."
 
 #: ../mdkapplet-add-media-helper:167
@@ -531,9 +531,9 @@ msgstr "S-a produs o eroare"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
-"Contul vostru Mandriva nu are activat opțiunea de descărcare a versiunii %s."
+"Contul vostru Mageia nu are activat opțiunea de descărcare a versiunii %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -593,18 +593,18 @@ msgstr "Antrepriză"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack vă aduce cea mai bună experiență Linux pentru birou: "
+"Mageia Powerpack vă aduce cea mai bună experiență Linux pentru birou: "
 "stabilitatea și eficiența soluțiilor cu sursă deschisă împreună cu programe "
-"exclusive și suport oficial Mandriva."
+"exclusive și suport oficial Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Funcționalitățile Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Funcționalitățile Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -653,36 +653,36 @@ msgstr "%s este acum disponibilă, puteți avansa la:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"Distribuția Mandriva Linux cu mult mai multe programe și suport oficial."
+"Distribuția Mageia Linux cu mult mai multe programe și suport oficial."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -698,14 +698,14 @@ msgstr "Actualizare majoră de distribuție"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versiunea %s\n"
-"Drepturi de autor (C) %s Mandriva.\n"
+"Drepturi de autor (C) %s Mageia.\n"
 "Acesta este un program liber și poate fi redistribuit sub termenii GNU GPL.\n"
 "\n"
 "Utilizare:\n"
@@ -717,8 +717,8 @@ msgstr "  --help\t\t- afișează acest mesaj de ajutor.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update este lansat automat.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update este lansat automat.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -727,8 +727,8 @@ msgstr "  --mnf\t\t\t- lansare scripturi specifice mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- mod text pentru Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- mod text pentru Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -748,14 +748,14 @@ msgstr "Nu se pot actualiza pachetele de pe mediul update_source.\n"
 #~ "pachete adițional odată ce v-ați abonat"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Contul vostru Mandriva nu are activat opțiunea de mentenanță extinsă."
+#~ "Contul vostru Mageia nu are activat opțiunea de mentenanță extinsă."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "V-ați dori Powerpack?"
@@ -784,10 +784,10 @@ msgstr "Nu se pot actualiza pachetele de pe mediul update_source.\n"
 #~ msgstr "Anulează, avansează la ediția Free"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Contul vostru Mandriva nu are activat opțiunea de descărcare a versiunii "
+#~ "Contul vostru Mageia nu are activat opțiunea de descărcare a versiunii "
 #~ "Powerpack"
 
 #~ msgid ""
@@ -809,8 +809,8 @@ msgstr "Nu se pot actualiza pachetele de pe mediul update_source.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Felicitări"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Avansarea la versiunea Mandriva %s s-a încheiat cu succes."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Avansarea la versiunea Mageia %s s-a încheiat cu succes."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Trebuie să reporniți sistemul."
@@ -833,17 +833,17 @@ msgstr "Nu se pot actualiza pachetele de pe mediul update_source.\n"
 #~ msgstr "Adăugare de mediu eșuată"
 
 #~ msgid ""
-#~ "This Mandriva Linux system maintenance has ended. It means it will not "
+#~ "This Mageia Linux system maintenance has ended. It means it will not "
 #~ "receive any new software update."
 #~ msgstr ""
-#~ "Mentenanța acestui sistem Mandriva Linux s-a sfîrșit. Aceasta înseamnă că "
+#~ "Mentenanța acestui sistem Mageia Linux s-a sfîrșit. Aceasta înseamnă că "
 #~ "nu va mai primi nici o nouă actualizare."
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "O nouă versiune a distribuției Mandriva Linux a fost lansată."
+#~ msgstr "O nouă versiune a distribuției Mageia Linux a fost lansată."
 
 #~ msgid "MES5"
 #~ msgstr "MES5"
diff --git a/po/ru.po b/po/ru.po
index b659f159..aa77c1eb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -36,8 +36,8 @@ msgstr "Система не нуждается в обновлении"
 
 #: ../mdkapplet:84
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
-msgstr "Проблема настройки службы. Проверьте журнал и отправьте письмо на support@mandrivaonline.com"
+msgid "Service configuration problem. Please check logs and send mail to support@mageiaonline.com"
+msgstr "Проблема настройки службы. Проверьте журнал и отправьте письмо на support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -51,8 +51,8 @@ msgstr "Для системы доступны новые обновления"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Выпущена новая версия дистрибутива Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Выпущена новая версия дистрибутива Mageia Linux"
 
 #: ../mdkapplet:119
 #: ../mdkapplet:161
@@ -157,8 +157,8 @@ msgstr "Запуск drakconnect\n"
 #: ../mdkapplet:459
 #: ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Новая версия дистрибутива Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Новая версия дистрибутива Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -167,8 +167,8 @@ msgstr "Обзор"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Выпущена новая версия дистрибутива Mandriva Linux."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Выпущена новая версия дистрибутива Mageia Linux."
 
 #: ../mdkapplet:475
 #: ../mdkapplet:572
@@ -229,7 +229,7 @@ msgstr "Отмена"
 
 #: ../mdkapplet:508
 #, c-format
-msgid "Maintenance for this Mandriva Linux version has ended. No more updates will be delivered for this system."
+msgid "Maintenance for this Mageia Linux version has ended. No more updates will be delivered for this system."
 msgstr "Поддержка этого дистрибутива завершена. Для него больше не будет выпускаться никаких обновлений."
 
 #: ../mdkapplet:514
@@ -239,8 +239,8 @@ msgstr "Для того чтобы продолжать держать вашу
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -294,8 +294,8 @@ msgstr "Ноутбук следует подключить к источнику
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Запуск Mandriva Update\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Запуск Mageia Update\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -314,18 +314,18 @@ msgstr "Проверка сети: похоже отключена\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online предоставляет доступ к веб-службам Mandriva."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online предоставляет доступ к веб-службам Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -403,8 +403,8 @@ msgstr "Установить этот дополнительный источн�
 #: ../mdkapplet:1061
 #: ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84
 #: ../mdkapplet-config:43
@@ -438,8 +438,8 @@ msgstr "Сбой при получении списка дистрибутиво
 #. -PO: Here '%s' will be a localized date (eg:
 #: ../mdkapplet-add-media-helper:161
 #, c-format
-msgid "Mandriva provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
-msgstr "Mandriva предоставляет для вашего дистрибутива 12 месяцев обновлений ПО (до %s) и 18 месяцев базовых обновлений (до %s)."
+msgid "Mageia provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
+msgstr "Mageia предоставляет для вашего дистрибутива 12 месяцев обновлений ПО (до %s) и 18 месяцев базовых обновлений (до %s)."
 
 #: ../mdkapplet-add-media-helper:167
 #, c-format
@@ -469,8 +469,8 @@ msgstr "Возникла ошибка"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Для вашей учётной записи Mandriva не включена подписка на загрузку %s."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Для вашей учётной записи Mageia не включена подписка на загрузку %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -530,13 +530,13 @@ msgstr "Enterprise"
 
 #: ../mdkapplet_gui.pm:87
 #, c-format
-msgid "Mandriva Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mandriva official support."
-msgstr "Mandriva Powerpack привнесет лучшее из Linux на ваш ПК: стабильность и эффективность решений с открытым исходным кодом вместе с эксклюзивным ПО и официальной поддержкой Mandriva."
+msgid "Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."
+msgstr "Mageia Powerpack привнесет лучшее из Linux на ваш ПК: стабильность и эффективность решений с открытым исходным кодом вместе с эксклюзивным ПО и официальной поддержкой Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Особенности Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Особенности Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -585,35 +585,35 @@ msgstr "Уже доступен %s и вы можете обновиться:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178
 #: ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181
 #: ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
-msgid "The Mandriva Linux distribution with even more softwares and official support."
-msgstr "Дистрибутив Mandriva Linux с еще большим количеством программ и официальной поддержкой."
+msgid "The Mageia Linux distribution with even more softwares and official support."
+msgstr "Дистрибутив Mageia Linux с еще большим количеством программ и официальной поддержкой."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -629,13 +629,13 @@ msgstr "Обновление дистрибутива"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate версия %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Это открытое программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
 "\n"
 "использование:\n"
@@ -647,8 +647,8 @@ msgstr "  --help\t\t- показать эту справку\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- автоматически запускать Mandriva Update\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- автоматически запускать Mageia Update\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -657,8 +657,8 @@ msgstr "  --mnf\t\t\t- запустить скрипты mnf\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- текстовая версия Mandriva Update\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- текстовая версия Mageia Update\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -678,25 +678,25 @@ msgstr "Не удаётся обновить пакеты из источник�
 #~ "введите ID своей учётной записи"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Для вашей учётной записи Mandriva не включена подписка на Расширенную "
+#~ "Для вашей учётной записи Mageia не включена подписка на Расширенную "
 #~ "поддержку."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Онлайн подписка"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Для вашей учётной записи Mandriva не включена подписка на загрузку "
+#~ "Для вашей учётной записи Mageia не включена подписка на загрузку "
 #~ "Powerpack."
 
 #~ msgid ""
@@ -718,8 +718,8 @@ msgstr "Не удаётся обновить пакеты из источник�
 #~ msgid "Congratulations"
 #~ msgstr "Поздравляем"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Обновление до Mandriva версии %s выполнено успешно"
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Обновление до Mageia версии %s выполнено успешно"
 
 #~ msgid "You must restart your system."
 #~ msgstr "Необходимо перезагрузить систему."
@@ -742,6 +742,6 @@ msgstr "Не удаётся обновить пакеты из источник�
 #~ msgstr "Не удалось добавить источник"
 
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Выпущена новая версия дистрибутива Mandriva Linux."
+#~ msgstr "Выпущена новая версия дистрибутива Mageia Linux."
diff --git a/po/sc.po b/po/sc.po
index 1173efd8..790aaf8b 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-sc\n"
+"Project-Id-Version: mgaonline-sc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-09-05 19:00+0100\n"
@@ -34,10 +34,10 @@ msgstr "Su sistema est ajorronau"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Probrema de assètiu de serbìtziu. Controlla is log e manda una missada a "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -51,7 +51,7 @@ msgstr "Ajorronus a disposta po su sistema tuu"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -157,7 +157,7 @@ msgstr "Seu alluendi drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -167,7 +167,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -215,7 +215,7 @@ msgstr "Annudda"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -226,8 +226,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -289,8 +289,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Seu alluendi MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Seu alluendi MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -309,17 +309,17 @@ msgstr "Seu controllendi s'arretza: parit disabivada\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -388,7 +388,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -421,7 +421,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -454,7 +454,7 @@ msgstr "Faddina"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -515,15 +515,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -572,33 +572,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -616,14 +616,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate versioni %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Custu est software lìberu e fait a du spainai sighendi sa GNU GPL.\n"
 "\n"
 "impreu:\n"
@@ -635,8 +635,8 @@ msgstr "  --help\t\t- imprenta custa missada de ajudu.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update lançau in automàtigu.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update lançau in automàtigu.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -645,8 +645,8 @@ msgstr "  --mnf\t\t\t- lança is script mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- versioni in modalidadi scriturali de Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- versioni in modalidadi scriturali de Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -660,7 +660,7 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -695,9 +695,9 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgid "No"
 #~ msgstr "No"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online parit torrau a aposentai, càrrigu torra sa applet ...."
+#~ "Mageia Online parit torrau a aposentai, càrrigu torra sa applet ...."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Seu controllendi... Ajorronus a disposta\n"
@@ -709,8 +709,8 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Seu acapiendi"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Applet Mandriva Linux Updates"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Applet Mageia Linux Updates"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -834,8 +834,8 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Stadu disconnotu"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Serbìtziu online disabivau. Cuntata su jassu Mandriva Online\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Serbìtziu online disabivau. Cuntata su jassu Mageia Online\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Password sballiada.\n"
@@ -856,8 +856,8 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgstr ""
 #~ "Probrema in s'acàpiu a su server, po praxeri, cuntata su support team"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Arrespusta de su server Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Arrespusta de su server Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Nisçunu controllu"
@@ -873,14 +873,14 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versioni %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Custu est software lìberu e fait a du spainai sighendi sa GNU GPL.\n"
 #~ "\n"
 #~ "impreu:\n"
@@ -907,8 +907,8 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Creadura o autentigadura de account"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Intra su login e password tuus Mandriva Online e su nòmini màkina:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Intra su login e password tuus Mageia Online e su nòmini màkina:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -920,14 +920,14 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgid "Password:"
 #~ msgstr "Password:"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Acàpiu a su jassu Mandriva Online in cursu..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Acàpiu a su jassu Mageia Online in cursu..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -942,10 +942,10 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Po ti podi abantaxai de is serbìtzius de Mandriva Online,\n"
+#~ "Po ti podi abantaxai de is serbìtzius de Mageia Online,\n"
 #~ "megaus a carrigai s'assetiu de su sistema tuu.\n"
 #~ "\n"
-#~ "Su Wizard imoi at a mandai a Mandriva is scedas ki sighint:\n"
+#~ "Su Wizard imoi at a mandai a Mageia is scedas ki sighint:\n"
 #~ "\n"
 #~ "1) sa lista de is pakitus ki as aposentau in su sistema,\n"
 #~ "\n"
@@ -963,8 +963,8 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Probrema carrighendi is file, torra a provai"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Crea unu Account Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Crea unu Account Mageia Online"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -996,10 +996,10 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgstr "No est bivimentu email bonu!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Account Mandriva Online acabau de creai.\n"
+#~ "Account Mageia Online acabau de creai.\n"
 #~ "Crica \"Sighi\" po intrai e carrigai is assètius tuus\n"
 
 #~ msgid "Your upload was successful!"
@@ -1007,20 +1007,20 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "De imoi as a arriciri noas apitzus de siguresa e\n"
-#~ "ajorronus, gràtzias a Mandriva Online."
+#~ "ajorronus, gràtzias a Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online ti donat de podi ajorronai in automàtigu.\n"
+#~ "Mageia Online ti donat de podi ajorronai in automàtigu.\n"
 #~ "Unu programa at a girai in su sistema, abetendi ajorronus\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "S'assètiu de s'account Mandriva Online est acabau\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "S'assètiu de s'account Mageia Online est acabau\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Su carrigamentu de s'assètiu est acabau!"
@@ -1029,14 +1029,14 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgstr "Barrancus carrighendi s'assètiu"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "No potzu acapiai su jassu mandrivaonline: login/password sballiau o "
 #~ "assètiu router/firewall malu "
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- lança Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- lança Mageia Update.\n"
 
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "Sçobera ita pakitus iant a bolli aposentaus e Craca Ok"
@@ -1050,9 +1050,9 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "File %s no agatau. Fai girai su wizard mdkonline a innantis"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update no at pòtziu acapiai su jassu, eus a torrai a provai"
+#~ "Mageia Update no at pòtziu acapiai su jassu, eus a torrai a provai"
 
 #~ msgid "Login:"
 #~ msgstr "Login:"
@@ -1066,16 +1066,16 @@ msgstr "No potzu ajorronai is pakitus de su mèdiu update_source.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Su login o sa password fiant sballiaus.\n"
-#~ " O dus depis torrai a scriri, o depis creai unu account in Mandriva "
+#~ " O dus depis torrai a scriri, o depis creai unu account in Mageia "
 #~ "Online.\n"
-#~ " In sa segundu sorti, torra a su primu passu po ti acapiai a Mandriva "
+#~ " In sa segundu sorti, torra a su primu passu po ti acapiai a Mageia "
 #~ "Online.\n"
 #~ " Atentu, ca depis donai unu nòmini màkina \n"
 #~ " (funt permìtias lìteras feti)"
diff --git a/po/sk.po b/po/sk.po
index 83eb795f..5c8edf70 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-09-21 14:06+0100\n"
@@ -30,10 +30,10 @@ msgstr "Váš systém je dostatočne aktualizovaný"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Nastal problém v konfigurácii služby. Prosím skontrolujte log súbory a "
-"pošlite e-mail na support@mandrivaonline.com"
+"pošlite e-mail na support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -47,7 +47,7 @@ msgstr "Sú dostupné nové aktualizácie pre váš systém"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -153,7 +153,7 @@ msgstr "Spúšťanie drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -163,7 +163,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -211,7 +211,7 @@ msgstr "Zrušiť"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -222,8 +222,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -285,8 +285,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Spúšťanie MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Spúšťanie MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -305,17 +305,17 @@ msgstr "Kontrolovanie siete: zrejme je vypnutá\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -384,7 +384,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -417,7 +417,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -450,7 +450,7 @@ msgstr "Vyskytla sa chyba"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -511,15 +511,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -568,33 +568,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -612,14 +612,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate verzia %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Tento softvér môže byť redistribuovaný podľa podmienok GNU GPL.\n"
 "\n"
 "použitie:\n"
@@ -631,8 +631,8 @@ msgstr "  --help\t\t- vypíše túto pomoc.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update spustený automaticky.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update spustený automaticky.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -641,8 +641,8 @@ msgstr "  --mnf\t\t\t- spustiť špecifické skripty pre mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- textová verzia Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- textová verzia Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -656,7 +656,7 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -690,9 +690,9 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgid "No"
 #~ msgstr "Nie"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Mandriva Online bude potrebné preinštalovať, znova nahrávam applet...."
+#~ "Mageia Online bude potrebné preinštalovať, znova nahrávam applet...."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Hľadanie... K dispozícii sú aktualizácie\n"
@@ -704,8 +704,8 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Spájanie s"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux aktualizačný applet"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux aktualizačný applet"
 
 #~ msgid "Security error"
 #~ msgstr "Bezpečnostná chyba"
@@ -759,33 +759,33 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgstr "Chyba služby"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Web služby Mandriva sú momentálne nedostupné\n"
+#~ "Web služby Mageia sú momentálne nedostupné\n"
 #~ "Skúste neskôr, prosím"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Heslo nesúhlasí"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Web služby Mandriva sú momentálne pozastavené z dôvodu údržby\n"
+#~ "Web služby Mageia sú momentálne pozastavené z dôvodu údržby\n"
 #~ "Skúste neskôr, prosím"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Používateľ zakázaný"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Používateľský účet je zakázaný pre Mandriva web služby"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Používateľský účet je zakázaný pre Mageia web služby"
 
 #~ msgid "Connection error"
 #~ msgstr "Chyba spojenia"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Web služby Mandriva nie sú dostupné"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Web služby Mageia nie sú dostupné"
 
 #~ msgid "Please wait"
 #~ msgstr "Prosím čakajte"
@@ -852,8 +852,8 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Neznámy status"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Online služby vypnuté. Kontaktujte stránku Mandriva Online\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Online služby vypnuté. Kontaktujte stránku Mageia Online\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Zlé heslo.\n"
@@ -874,8 +874,8 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgstr ""
 #~ "Nastal problém pri pripájaní na server, prosím kontaktujte podporný tím"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Odpoveď zo servera Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Odpoveď zo servera Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Žiadna kontrola"
@@ -891,14 +891,14 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline verzia %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Tento softvér môže byť redistribuovaný podľa podmienok GNU GPL.\n"
 #~ "\n"
 #~ "použitie:\n"
@@ -930,7 +930,7 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Vytváranie účtu a autorizácia"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr "Zadajte vaše prihlasovacie meno, heslo a názov počítača:"
 
 #~ msgid "Email address:"
@@ -945,14 +945,14 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Meno tlačiarne môže byť 1 až 40 alfanumerických znakov"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Pripájanie sa na stránku Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Pripájanie sa na stránku Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -967,10 +967,10 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Aby ste mohli mať úžitok zo služieb na Mandriva Online,\n"
+#~ "Aby ste mohli mať úžitok zo služieb na Mageia Online,\n"
 #~ "je potrebné získanie vašej konfigurácie.\n"
 #~ "\n"
-#~ "Sprievodca teraz odošle nasledovné informácie do Mandriva-u:\n"
+#~ "Sprievodca teraz odošle nasledovné informácie do Mageia-u:\n"
 #~ "\n"
 #~ "1) zoznam balíkov ktoré ste si nainštalovali\n"
 #~ "\n"
@@ -991,8 +991,8 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Pri odosielaní súborov nastal problém, prosím skúste ešte raz"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Vytvoriť Mandriva Linux Online účet"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Vytvoriť Mageia Linux Online účet"
 
 #~ msgid "Greeting:"
 #~ msgstr "Uvítanie:"
@@ -1020,10 +1020,10 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgstr "Nekorektná emailová adresa!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Účet pre Mandriva Online bol úspešne vytvorený.\n"
+#~ "Účet pre Mageia Online bol úspešne vytvorený.\n"
 #~ "Kliknite prosím na \"Ďalej\" pre overenie a nahratie vašej konfigurácie\n"
 
 #~ msgid "Your upload was successful!"
@@ -1031,20 +1031,20 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Odteraz budete môcť vďaka Mandriva Online získavať oznámenia \n"
+#~ "Odteraz budete môcť vďaka Mageia Online získavať oznámenia \n"
 #~ "o bezpečnostných a funkčných aktualizáciách."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online vám prináša možnosť ako vykonávať aktualizácie.\n"
+#~ "Mageia Online vám prináša možnosť ako vykonávať aktualizácie.\n"
 #~ "Program môže bežať na vašom systéme a čakať na nové aktualizácie\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Váš Mandriva Online účet bol úspešne vytvorený\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Váš Mageia Online účet bol úspešne vytvorený\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Zaslanie nastavení bolo úspešné"
@@ -1053,14 +1053,14 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgstr "Nastal problém so zasielaním nastavenia"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "Nebolo možné pripojiť sa na stránku mandrivaonline: nesprávne meno/heslo "
 #~ "alebo nastavenie firewallu"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- spustiť Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- spustiť Mageia Update.\n"
 
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "Vyberte balíky ktoré chcete inštalovať a kliknite na Ok"
@@ -1077,9 +1077,9 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Neboj nájdený súbor %s. Spustite najprv mdkonline sprievodcu"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update sa nedokáže pripojiť, prosím skúste to neskôr znova."
+#~ "Mageia Update sa nedokáže pripojiť, prosím skúste to neskôr znova."
 
 #~ msgid "Login:"
 #~ msgstr "Prihlasovacie meno:"
@@ -1093,16 +1093,16 @@ msgstr "Nie je možné aktualizovať balíky z média update_source.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Vaše prihlasovacie meno alebo heslo je nesprávne.\n"
 #~ " Predtým ako sa ich pokúsite zadať znova, mali by ste si vytvoriť účet na "
-#~ "Mandriva Online.\n"
-#~ " V opačnom prípade sa vráťte na prvý krok v pripojení k Mandriva Online.\n"
+#~ "Mageia Online.\n"
+#~ " V opačnom prípade sa vráťte na prvý krok v pripojení k Mageia Online.\n"
 #~ " Buďte si vedomí toho, že je potrebné zadať meno počítača \n"
 #~ " (akceptované sú iba abecedné znaky)"
 
diff --git a/po/sl.po b/po/sl.po
index a5506977..e115cb04 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -39,10 +39,10 @@ msgstr "Vaš sistem je ažuren"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Težava z nastavitvijo storitve. Preverite dnevnike in pošljite pošto na "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -56,8 +56,8 @@ msgstr "Za vaš sistem so na voljo nove posodobitve"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Izdana je bila nova različica distribucije Mandriva Linux"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Izdana je bila nova različica distribucije Mageia Linux"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -167,8 +167,8 @@ msgstr "»drakconnect« se zaganja\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Nova različica distribucije Mandriva Linux"
+msgid "New version of Mageia Linux distribution"
+msgstr "Nova različica distribucije Mageia Linux"
 
 #: ../mdkapplet:464
 #, c-format
@@ -177,8 +177,8 @@ msgstr "Brskaj"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Izdana je bila nova različica distribucije Mandriva Linux."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Izdana je bila nova različica distribucije Mageia Linux."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -225,10 +225,10 @@ msgstr "Prekliči"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Vzdrževanje te različice Mandriva Linuxa se je izteklo. Za to različico ne "
+"Vzdrževanje te različice Mageia Linuxa se je izteklo. Za to različico ne "
 "bo na voljo nobenih posodobitev več."
 
 #: ../mdkapplet:514
@@ -238,8 +238,8 @@ msgstr "Da ohranite svoj sistem varen, priporočamo:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -308,8 +308,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "»MandrivaUpdate« se zaganja\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "»MageiaUpdate« se zaganja\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -328,18 +328,18 @@ msgstr "Preverjanje omrežja: izgleda onemogočeno\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Avtorske pravice © %s, Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Avtorske pravice © %s, %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online omogoča dostop do spletnih storitev Mandriva"
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online omogoča dostop do spletnih storitev Mageia"
 
 #: ../mdkapplet:899
 #, c-format
@@ -409,8 +409,8 @@ msgstr "Ali želite dodati ta dodaten vir programov?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -442,10 +442,10 @@ msgstr "Napaka pri pridobivanju seznama distribucij:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva za distribucije zagotavlja 12 mesecev posodobitev za namizje (do %"
+"Mageia za distribucije zagotavlja 12 mesecev posodobitev za namizje (do %"
 "s) in 18 mesecev posodobitev za osnovo (do %s)."
 
 #: ../mdkapplet-add-media-helper:167
@@ -479,7 +479,7 @@ msgstr "Prišlo je do napake"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr "Vaš račun pri Mandrivi nima omogočene naročnine za prenos %s-a."
 
 #: ../mdkapplet-add-media-helper:226
@@ -540,15 +540,15 @@ msgstr "Enterprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -597,33 +597,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -641,14 +641,14 @@ msgstr "Nadgradnja distribucije"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate različica %s\n"
-"Avtorske pravice © %s Mandriva.\n"
+"Avtorske pravice © %s Mageia.\n"
 "To je prosto programje in se sme razširjati pod pogoji licence GNU GPL.\n"
 "\n"
 "uporaba:\n"
@@ -660,8 +660,8 @@ msgstr "  --help\t\t- izpiši to sporočilo s pomočjo.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update se zažene samodejno.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update se zažene samodejno.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -670,8 +670,8 @@ msgstr "  --mnf\t\t\t- poženi skripte specifične za mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update v besedilnem načinu.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update v besedilnem načinu.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -691,14 +691,14 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 #~ "dodan bo nov vir za pakete."
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
 #~ "Vaš račun pri Mandrivi nima omogočene naročnine na podaljšano vzdrževanje."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Ali bi želeli PowerPack?"
@@ -727,7 +727,7 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 #~ msgstr "Prekliči, nadgradi na izdajo Free"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
 #~ "Vaš račun pri Mandrivi nima omogočene naročnine za prenos PowerPack-a."
@@ -751,8 +751,8 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Čestitke"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Nadgradnja na različico Mandriva %s je bila uspešna."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Nadgradnja na različico Mageia %s je bila uspešna."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Računalnik je potrebno znova zagnati."
@@ -776,9 +776,9 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Izdana je bila nova različica distribucije Mandriva Linux."
+#~ msgstr "Izdana je bila nova različica distribucije Mageia Linux."
 
 #~ msgid "You are using '%s' distribution."
 #~ msgstr "Ali želite nadgraditi na različico »%s«?"
@@ -792,9 +792,9 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 #~ msgid "No"
 #~ msgstr "Ne"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Izgleda, da je Mandriva Online na novo nameščen. Ponovno nalaganje "
+#~ "Izgleda, da je Mageia Online na novo nameščen. Ponovno nalaganje "
 #~ "vstavka ..."
 
 #~ msgid "Checking... Updates are available\n"
@@ -809,8 +809,8 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Povezovanje z"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Vstavek Mandriva Linux za posodobitve"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Vstavek Mageia Linux za posodobitve"
 
 #~ msgid "Security error"
 #~ msgstr "Varnostna napaka"
@@ -867,7 +867,7 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 #~ msgstr "Napaka glede storitve"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
 #~ "Trenutno spletne storitve Mandrive niso na voljo\n"
@@ -877,7 +877,7 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 #~ msgstr "Gesli se ne ujemata"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
 #~ "Poteka vzdrževanje spletnih storitev Mandrive\n"
@@ -886,13 +886,13 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 #~ msgid "User Forbidden"
 #~ msgstr "Uporabnik je zavrnjen"
 
-#~ msgid "User account forbidden by Mandriva web services"
+#~ msgid "User account forbidden by Mageia web services"
 #~ msgstr "Spletne storitve Mandrive zavračajo ta uporabniški račun"
 
 #~ msgid "Connection error"
 #~ msgstr "Napaka glede povezave"
 
-#~ msgid "Mandriva web services not reachable"
+#~ msgid "Mageia web services not reachable"
 #~ msgstr "Spletne storitve Mandrive niso dostopne"
 
 #~ msgid ""
@@ -923,12 +923,12 @@ msgstr "Paketov iz vira update_source ni mogoče posodobiti.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Različica Mandriva Online client je prestara \n"
+#~ "Različica Mageia Online client je prestara \n"
 #~ "\n"
 #~ "Nadgraditi jo morate z novejšo, ki jo dobite na  http://start.mandriva.com"
 
diff --git a/po/sq.po b/po/sq.po
index 57d21fd2..d915b0cb 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline 0.15 \n"
+"Project-Id-Version: mgaonline 0.15 \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2002-09-24 15:30+0100\n"
@@ -31,8 +31,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
-msgstr "Për çdo problem na dërgoni një e-mail në suppport@mandrivaonline.com\n"
+"support@mageiaonline.com"
+msgstr "Për çdo problem na dërgoni një e-mail në suppport@mageiaonline.com\n"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,7 +50,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -156,7 +156,7 @@ msgstr "Nise userdrake"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -166,7 +166,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -214,7 +214,7 @@ msgstr "Anulo"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -288,7 +288,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -308,17 +308,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -387,7 +387,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -420,7 +420,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -453,7 +453,7 @@ msgstr "Një gabim është paraqitur"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -514,15 +514,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -571,33 +571,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -615,14 +615,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "azhurnimi-mdk versioni %s\n"
-"E drejtë autori (C) %s Mandriva.\n"
+"E drejtë autori (C) %s Mageia.\n"
 "Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
 "\n"
 "përdorim:\n"
@@ -634,7 +634,7 @@ msgstr "  --help\t\t- çfaqe këtë lajm ndihmues.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- azhurnoi të gjitha informacionet.\n"
 
 #: ../mdkupdate:66
@@ -644,7 +644,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - azhurnoi të gjitha informacionet.\n"
 
 #: ../mdkupdate:68
@@ -659,7 +659,7 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -689,8 +689,8 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ msgstr "Lidhje e ballafaquar"
 
 #, fuzzy
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux dhe jeta e juaj private"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux dhe jeta e juaj private"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -821,8 +821,8 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ msgstr "Parulla e gabuar.\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Mirë se Vini në Mandriva Online"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Mirë se Vini në Mageia Online"
 
 #~ msgid "Logs"
 #~ msgstr "Të përditëshmet"
@@ -832,14 +832,14 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline versioni %s\n"
-#~ "E drejtë autori (C) %s Mandriva.\n"
+#~ "E drejtë autori (C) %s Mageia.\n"
 #~ "Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
 #~ "\n"
 #~ "përdorim:\n"
@@ -858,8 +858,8 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ "qendrore\n"
 #~ "që në fund të ju informon për azhurnimin e sigurisë.\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
-#~ msgstr "Hyni loginin, parullën dhe emrin e makinës suaj në Mandriva Online:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
+#~ msgstr "Hyni loginin, parullën dhe emrin e makinës suaj në Mageia Online:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -876,14 +876,14 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ msgstr "Pikat montuese duhet të posedojnë vetëm shkronja dhe numëra"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Mirë se Vini në Mandriva Online"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Mirë se Vini në Mageia Online"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -898,9 +898,9 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Më në fund që të përfitoni nga servicet Mandriva Online,\n"
+#~ "Më në fund që të përfitoni nga servicet Mageia Online,\n"
 #~ "ne jeni përsipër në marrjes e të dhënave mbi konfigurimin tuaj.\n"
-#~ "Asistenti do të ju komunikoj të dhënat e poshtë të shënuara në Mandriva:\n"
+#~ "Asistenti do të ju komunikoj të dhënat e poshtë të shënuara në Mageia:\n"
 #~ "\n"
 #~ "1) listën e pakove të cilat i keni instaluar në sistemin tuaj,\n"
 #~ "\n"
@@ -919,8 +919,8 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ msgstr "Lidhje e ballafaquar"
 
 #, fuzzy
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Kontoja e Klubit Mandriva"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Kontoja e Klubit Mageia"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -956,16 +956,16 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Prej ketij momenti Mandriva Online do të ju dërgon azhurnimet\n"
+#~ "Prej ketij momenti Mageia Online do të ju dërgon azhurnimet\n"
 #~ "e reja të sigurisë."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online ju mundëson që ti automatozoni azhurnimet e reja.\n"
+#~ "Mageia Online ju mundëson që ti automatozoni azhurnimet e reja.\n"
 #~ "Një program do të starton rregulisht në makinën tuaj për pritjen e "
 #~ "azhurnimeve të reja.\n"
 
@@ -978,12 +978,12 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ msgstr "Lexim i konfiguracionit\n"
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t- azhurnoi të gjitha informacionet.\n"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update nuk mund të kontaktoj sitin, ne do të mundohemi edhe një "
+#~ "Mageia Update nuk mund të kontaktoj sitin, ne do të mundohemi edhe një "
 #~ "herë."
 
 #~ msgid "Login:"
@@ -992,17 +992,17 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Logini apo parulla juaj janë të pa sakta.\n"
 #~ "Ju duhet të shtypni përsëri apo të krijoni një llogarie tjetër në "
-#~ "Mandriva Online.\n"
+#~ "Mageia Online.\n"
 #~ "Në këtë pjesë të dytë, ju duhet të ktheheni në pikën e parë të kyqjes "
-#~ "Mandriva Online.\n"
+#~ "Mageia Online.\n"
 #~ "Shënoni se ju duhet ta shkruani emrin e Makinës suaj \n"
 #~ "(vetëm shkronjat alfabetike janë të autorizuara)"
 
@@ -1019,8 +1019,8 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ msgid "Previous"
 #~ msgstr "Mbrapa"
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Mandriva Linux dhe jeta e juaj private"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Mageia Linux dhe jeta e juaj private"
 
 #~ msgid "Finish"
 #~ msgstr "Mbaro"
@@ -1050,10 +1050,10 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ msgstr "  -v             - modë oratori.\n"
 
 #~ msgid ""
-#~ "You need to have an account on Mandriva Online, or update your "
+#~ "You need to have an account on Mageia Online, or update your "
 #~ "subscription."
 #~ msgstr ""
-#~ "Ju duhet të keni një gjiro llogari në Mandriva Online, apo azhurnone "
+#~ "Ju duhet të keni një gjiro llogari në Mageia Online, apo azhurnone "
 #~ "nëshkrimin tuaj."
 
 #~ msgid "Your login or password may be wrong"
@@ -1108,13 +1108,13 @@ msgstr "I pa mundur azhurnimi i pakove nga update_source mesatar.\n"
 #~ msgstr "OK"
 
 #~ msgid ""
-#~ "Do you really want to abort Mandriva Online?\n"
+#~ "Do you really want to abort Mageia Online?\n"
 #~ "To return to the Wizard press 'Cancel',\n"
 #~ "to really quit it press 'Quit'."
 #~ msgstr ""
-#~ "Dëshironi që të lini anash Mandriva Online?\n"
+#~ "Dëshironi që të lini anash Mageia Online?\n"
 #~ "Për tu kthyer mbrapa tek asistenti, shtypni 'Anulo',\n"
 #~ "për të hjekur dorë shtypni 'Braktise'."
 
-#~ msgid "Really abort? - Mandriva Online"
-#~ msgstr "Lereni anash me të vërtet? - Mandriva Online"
+#~ msgid "Really abort? - Mageia Online"
+#~ msgstr "Lereni anash me të vërtet? - Mageia Online"
diff --git a/po/sr.po b/po/sr.po
index b915f358..533cad35 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
@@ -33,7 +33,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Уколико имате било какав проблем пошаљите e-mail на support@mandrivaonline."
 "net\n"
@@ -54,7 +54,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -161,7 +161,7 @@ msgstr "Покрени userdrake"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -171,7 +171,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -219,7 +219,7 @@ msgstr "Поништи"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -230,8 +230,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -293,7 +293,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -313,17 +313,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr "Сва права (C) %s задржава Мандрива"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -392,7 +392,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -425,7 +425,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -458,7 +458,7 @@ msgstr "Хм,појавила се грешка"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -519,15 +519,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -576,33 +576,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -620,14 +620,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate верзија %s\n"
-"Сва права задржава (C) %s Mandriva.\n"
+"Сва права задржава (C) %s Mageia.\n"
 "Ово је бесплатни софтвер и може се слободно дистрибуирати под условима GNU "
 "GPL лиценце.\n"
 "\n"
@@ -640,7 +640,7 @@ msgstr "  --help\t\t- приказује ову поруку.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- ажурира све информације.\n"
 
 #: ../mdkupdate:66
@@ -650,7 +650,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - ажурира све информације.\n"
 
 #: ../mdkupdate:68
@@ -665,7 +665,7 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -698,8 +698,8 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 #~ msgstr "Проблем са повезивањем"
 
 #, fuzzy
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Update"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Update"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -832,8 +832,8 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 #~ msgstr "Потврди лозинку:"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Добродошли у Mandriva Linux"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Добродошли у Mageia Linux"
 
 #, fuzzy
 #~ msgid "Checking config file: Not present\n"
@@ -847,14 +847,14 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline верзија %s\n"
-#~ "Сва права задржава (C) %s Mandriva.\n"
+#~ "Сва права задржава (C) %s Mageia.\n"
 #~ "Ово је бесплатни софтвер и може се слободно дистрибуирати под условима "
 #~ "GNU GPL лиценце.\n"
 #~ "\n"
@@ -884,15 +884,15 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 #~ msgstr "Тачке монтирања треба да садрже само алфанумеричке карактере"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Добродошли у Mandriva Linux"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Добродошли у Mageia Linux"
 
 #~ msgid "Connection problem"
 #~ msgstr "Проблем са повезивањем"
 
 #, fuzzy
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Club Рачун"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Club Рачун"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -927,14 +927,14 @@ msgstr "Не могу да ажурирам пакете са update_source ме
 #~ msgstr "Поново уносим конфигурацију: "
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t- ажурира све информације.\n"
 
 #~ msgid "Sending configuration..."
 #~ msgstr "Шаљем подешавања..."
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update не може да контактира сајт, покушаћемо поново."
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update не може да контактира сајт, покушаћемо поново."
 
 #~ msgid "Login:"
 #~ msgstr "Login:"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 0e8e6a81..99c53bd6 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2003-02-15 09:31+0100\n"
@@ -33,7 +33,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Ukoliko imate bilo kakav problem pošaljite e-mail na support@mandrivaonline."
 "net\n"
@@ -54,7 +54,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -161,7 +161,7 @@ msgstr "Pokreni userdrake"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -171,7 +171,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -219,7 +219,7 @@ msgstr "Poništi"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -230,8 +230,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -293,7 +293,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -313,17 +313,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Sva prava (C) %s zadržava Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Sva prava (C) %s zadržava %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -392,7 +392,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -425,7 +425,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -458,7 +458,7 @@ msgstr "Hm,pojavila se greška"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -519,15 +519,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -576,33 +576,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -620,14 +620,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate verzija %s\n"
-"Sva prava zadržava (C) %s Mandriva.\n"
+"Sva prava zadržava (C) %s Mageia.\n"
 "Ovo je besplatni softver i može se slobodno distribuirati pod uslovima GNU "
 "GPL licence.\n"
 "\n"
@@ -640,7 +640,7 @@ msgstr "  --help\t\t- prikazuje ovu poruku.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- ažurira sve informacije.\n"
 
 #: ../mdkupdate:66
@@ -650,7 +650,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - ažurira sve informacije.\n"
 
 #: ../mdkupdate:68
@@ -665,7 +665,7 @@ msgstr "Ne mogu da ažuriram pakete sa update_source medija.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -698,8 +698,8 @@ msgstr "Ne mogu da ažuriram pakete sa update_source medija.\n"
 #~ msgstr "Problem sa povezivanjem"
 
 #, fuzzy
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Update"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Update"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -832,8 +832,8 @@ msgstr "Ne mogu da ažuriram pakete sa update_source medija.\n"
 #~ msgstr "Potvrdi lozinku:"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Dobrodošli u Mandriva Linux"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Dobrodošli u Mageia Linux"
 
 #, fuzzy
 #~ msgid "Checking config file: Not present\n"
@@ -847,14 +847,14 @@ msgstr "Ne mogu da ažuriram pakete sa update_source medija.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline verzija %s\n"
-#~ "Sva prava zadržava (C) %s Mandriva.\n"
+#~ "Sva prava zadržava (C) %s Mageia.\n"
 #~ "Ovo je besplatni softver i može se slobodno distribuirati pod uslovima "
 #~ "GNU GPL licence.\n"
 #~ "\n"
@@ -884,15 +884,15 @@ msgstr "Ne mogu da ažuriram pakete sa update_source medija.\n"
 #~ msgstr "Tačke montiranja treba da sadrže samo alfanumeričke karaktere"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Dobrodošli u Mandriva Linux"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Dobrodošli u Mageia Linux"
 
 #~ msgid "Connection problem"
 #~ msgstr "Problem sa povezivanjem"
 
 #, fuzzy
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Club Račun"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Club Račun"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -927,14 +927,14 @@ msgstr "Ne mogu da ažuriram pakete sa update_source medija.\n"
 #~ msgstr "Ponovo unosim konfiguraciju: "
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t- ažurira sve informacije.\n"
 
 #~ msgid "Sending configuration..."
 #~ msgstr "Šaljem podešavanja..."
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update ne može da kontaktira sajt, pokušaćemo ponovo."
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update ne može da kontaktira sajt, pokušaćemo ponovo."
 
 #~ msgid "Login:"
 #~ msgstr "Login:"
diff --git a/po/sv.po b/po/sv.po
index 5eac737d..d6e8c753 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@
 # Thomas Backlund <tmb@mandriva.org>, 2005, 2006, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-sv\n"
+"Project-Id-Version: mgaonline-sv\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-13 17:31+0300\n"
@@ -38,10 +38,10 @@ msgstr "Ditt system är uppdaterat"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problem med tjänstens konfiguration. Var vänlig kontrollera loggar och "
-"skicka e-post till support@mandrivaonline.com"
+"skicka e-post till support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -55,8 +55,8 @@ msgstr "Nya uppdateringar finns tillgängliga för ditt system"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "En ny distribution av Mandriva Linux har släppts"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "En ny distribution av Mageia Linux har släppts"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -165,8 +165,8 @@ msgstr "Startar drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Ny version av Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
+msgstr "Ny version av Mageia Linux distribution"
 
 #: ../mdkapplet:464
 #, c-format
@@ -175,8 +175,8 @@ msgstr "Bläddra"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "En ny version av Mandriva Linux distributionen har släppts."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "En ny version av Mageia Linux distributionen har släppts."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -223,10 +223,10 @@ msgstr "Avbryt"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Underhåll av denna Mandriva Linux version har upphört. Inga mera "
+"Underhåll av denna Mageia Linux version har upphört. Inga mera "
 "uppdateringar kommer att distribueras till detta system."
 
 #: ../mdkapplet:514
@@ -236,8 +236,8 @@ msgstr "För att hålla ditt system säkert kan du:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -307,8 +307,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Startar MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Startar MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -327,18 +327,18 @@ msgstr "Kontrollerar nätverk: verkar avaktiverat\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s, Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s, %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online ger tillgång till Mandriva webtjänster."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online ger tillgång till Mageia webtjänster."
 
 #: ../mdkapplet:899
 #, c-format
@@ -408,8 +408,8 @@ msgstr "Vill du lägga till detta tilläggs-media ?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -441,10 +441,10 @@ msgstr "Fel vid hämtning av distributionslista:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva tillhandahåller 12 månader av uppdateringar för skrivbordet (till %"
+"Mageia tillhandahåller 12 månader av uppdateringar för skrivbordet (till %"
 "s) och 18 månader för bassystemet (fram till %s) för distributioner."
 
 #: ../mdkapplet-add-media-helper:167
@@ -478,8 +478,8 @@ msgstr "Ett fel inträffade"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Ditt Mandriva konto har ingen %s nerladdingsprenumeration aktiverad."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Ditt Mageia konto har ingen %s nerladdingsprenumeration aktiverad."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -539,18 +539,18 @@ msgstr "Företag"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack ger dig det bästa av Linux upplevelser för skrivbordet: "
+"Mageia Powerpack ger dig det bästa av Linux upplevelser för skrivbordet: "
 "stabilitet och effektivitet av lösningar baserade på öppen källkod "
-"tillsammans med exklusiva programvaror och Mandrivas officiella support."
+"tillsammans med exklusiva programvaror och Mageias officiella support."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux Egenskaper"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux Egenskaper"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -599,36 +599,36 @@ msgstr "%s är nu tillgänglig, du kan uppgradera till:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
-"Mandriva Linux distributionen med ännu mera programvara och officiell "
+"Mageia Linux distributionen med ännu mera programvara och officiell "
 "support."
 
 #: ../mdkonline.pm:199
@@ -646,14 +646,14 @@ msgstr "Uppgradering av distribution"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
-"Mandriva Update version %s\n"
-"Copyright © %s Mandriva.\n"
+"Mageia Update version %s\n"
+"Copyright © %s Mageia.\n"
 "Det här är fri programvara och får distribueras enligt villkoren i GNU GPL.\n"
 "\n"
 "användning:\n"
@@ -665,8 +665,8 @@ msgstr "  --help\t\t- visa det här hjälpmeddelandet.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update startas automatiskt.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update startas automatiskt.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -675,8 +675,8 @@ msgstr "  --mnf\t\t\t- kör mnf specifika script.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- textversion av Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- textversion av Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -696,15 +696,15 @@ msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 #~ "att du beställt online"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Ditt Mandriva konto har ingen prenumeration på förlängt underhåll "
+#~ "Ditt Mageia konto har ingen prenumeration på förlängt underhåll "
 #~ "aktiverat."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Vill du ha Powerpack?"
@@ -713,7 +713,7 @@ msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 #~ "Since you don't have Powerpack rights you may visit mandriva store now "
 #~ "and get Powerpack subscription."
 #~ msgstr ""
-#~ "Eftersom du inte har Powerpackrättigheter kan du besöka Mandriva store nu "
+#~ "Eftersom du inte har Powerpackrättigheter kan du besöka Mageia store nu "
 #~ "och skaffa dig en Powerpack prenumeration"
 
 #~ msgid "Get Powerpack subscription!"
@@ -733,10 +733,10 @@ msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 #~ msgstr "Avbryt, uppgradera till fri version"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Ditt Mandriva konto har ingen Powerpack nerladdingsprenumeration "
+#~ "Ditt Mageia konto har ingen Powerpack nerladdingsprenumeration "
 #~ "aktiverad."
 
 #~ msgid ""
@@ -758,8 +758,8 @@ msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Gratulerar"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Uppgraderingen till Mandriva %s distributionen lyckades."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Uppgraderingen till Mageia %s distributionen lyckades."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Du måste starta om ditt system."
@@ -782,9 +782,9 @@ msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "En ny version av Mandriva Linux distributionen har släppts."
+#~ msgstr "En ny version av Mageia Linux distributionen har släppts."
 
 #, fuzzy
 #~ msgid "You are using '%s' distribution."
@@ -799,8 +799,8 @@ msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 #~ msgid "No"
 #~ msgstr "Nej"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-#~ msgstr "Mandriva Online verkar ha ominstallerats,startar om applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
+#~ msgstr "Mageia Online verkar ha ominstallerats,startar om applet ...."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Kontrollerar... Uppdateringar finns tillgängliga\n"
@@ -814,8 +814,8 @@ msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Ansluter till"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux uppdateringsapplet"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux uppdateringsapplet"
 
 #~ msgid "Security error"
 #~ msgstr "Säkerhetsfel"
@@ -872,33 +872,33 @@ msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 #~ msgstr "Servicefel"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva webtjänster är onåbara för tillfället.\n"
+#~ "Mageia webtjänster är onåbara för tillfället.\n"
 #~ "Vänligen försök senare igen."
 
 #~ msgid "Password mismatch"
 #~ msgstr "Lösenorden stämmer ej överens."
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Mandriva webtjänster är under service.\n"
+#~ "Mageia webtjänster är under service.\n"
 #~ "Vänligen försök på nytt senare."
 
 #~ msgid "User Forbidden"
 #~ msgstr "Användare förbjuden."
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Användarkonto förbjudet av Mandriva webtjänster"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Användarkonto förbjudet av Mageia webtjänster"
 
 #~ msgid "Connection error"
 #~ msgstr "Anslutningsfel"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Mandriva webtjänster är inte nåbara"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Mageia webtjänster är inte nåbara"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -930,12 +930,12 @@ msgstr "Kunde ej uppdatera paket från update_source källan.\n"
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Versionen på Mandriva Online klienten är för gammal.\n"
+#~ "Versionen på Mageia Online klienten är för gammal.\n"
 #~ "\n"
 #~ "Du måste uppdatera till en nyare version. Du kan hämta en ny från http://"
 #~ "start.mandriva.com"
diff --git a/po/ta.po b/po/ta.po
index e5903d47..569b3a4b 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline 1.0\n"
+"Project-Id-Version: mgaonline 1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2002-08-23 20:02-0400\n"
@@ -31,8 +31,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
-msgstr "பிழைகளை ஆங்கிலத்தில் ெதரிவிக்க support@mandrivaonline.com\n"
+"support@mageiaonline.com"
+msgstr "பிழைகளை ஆங்கிலத்தில் ெதரிவிக்க support@mageiaonline.com\n"
 
 #: ../mdkapplet:90
 #, c-format
@@ -46,7 +46,7 @@ msgstr "வலையமைப்பு அட்ைட எதுவும் க
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -146,7 +146,7 @@ msgstr "டிரேக்பயனரை துவக்கு"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -156,7 +156,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -204,7 +204,7 @@ msgstr "நீக்கு"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -215,7 +215,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: ../mdkapplet:526
@@ -278,7 +278,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -298,17 +298,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -377,7 +377,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -410,7 +410,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -443,7 +443,7 @@ msgstr "பிழை நேர்ந்துள்ளது மன்னிக�
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -504,14 +504,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: ../mdkapplet_gui.pm:213
@@ -561,33 +561,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr "மாண்ட்ேரக்இணைய"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -605,14 +605,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "மாண்டிரேக்இணைய வெளியீடு %s\n"
-"உரிமம்; %s Mandriva.\n"
+"உரிமம்; %s Mageia.\n"
 "இது சுதந்திரமாக பயன்படுத்தக் கூடிய மென்பொருள், குனு GPL கீழ் வெளியிடப்பட்டுள்ளது\n"
 "\n"
 "பயன்பாடு\n"
@@ -624,7 +624,7 @@ msgstr "  --help\t\t- இந்த உதவியை காட்டு.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t-அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
 
 #: ../mdkupdate:66
@@ -634,7 +634,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       -அைனத்து விவரங்களையும் புதுப்பிக்கவும்\n"
 
 #: ../mdkupdate:68
@@ -675,7 +675,7 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
 #, fuzzy
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "மாண்டிரேக் கொள்கை"
 
 #, fuzzy
@@ -790,7 +790,7 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ msgstr "தவறான கடவுச்சொல்\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
+#~ msgid "Response from Mageia Online server\n"
 #~ msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
 
 #~ msgid "Logs"
@@ -801,14 +801,14 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline வெளியீடு %s\n"
-#~ "உரிமம்; %s Mandriva.\n"
+#~ "உரிமம்; %s Mageia.\n"
 #~ "இது சுதந்திரமாக பயன்படுத்தக் கூடிய மென்பொருள், குனு GPL கீழ் வெளியிடப்பட்டுள்ளது\n"
 #~ "\n"
 #~ "பயன்பாடு\n"
@@ -831,7 +831,7 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ "புதிய நிரல்களை அனுப்ப வடிவமைப்பு விவரங்களை ஓர் தரவுத்தளத்திற்கு\n"
 #~ "அனுப்பி வைக்கும்.\n"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
 #~ "உங்கள் மாண்டிரேக் இணையத்தள பயனர்கணக்கின்\n"
 #~ "பெயர்,கடவுச்சொல்லை அடிக்கவும்"
@@ -847,14 +847,14 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ msgstr "கடவுச்சொல்"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
 #~ msgstr "மாண்டிரேக் இணையத்தளத்திற்கு வருக"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -887,7 +887,7 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ msgstr "தொடர்பில் பிழை நேர்ந்துள்ளது"
 
 #, fuzzy
-#~ msgid "Create a Mandriva Online Account"
+#~ msgid "Create a Mageia Online Account"
 #~ msgstr "மாண்ட்ரிவ க்ளப் கணக்கு"
 
 #, fuzzy
@@ -919,13 +919,13 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "இப்போது முதல் நீங்கள் மாண்டிரேக் இணையத்தளத்திலிருந்து\n"
 #~ "பாதுகாப்பு, புதிய நிரல் பற்றி அறியலாம்"
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
 #~ "மாண்டிரேக் இணையம் உங்கள் கணிணியில் புதிய நிரல்களை நிறுவும்\n"
@@ -940,13 +940,13 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ msgstr "வடிவமைப்பு படித்துக்கொன்டிருக்கிறது\n"
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t-அைனத்து  விவரங்களையும் புதுப்பிக்கவும்\n"
 
 #~ msgid "Sending configuration..."
 #~ msgstr "அமைப்பை அனுப்புகிறது"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
 #~ "மாண்ட்ேரக்புதுப்பி  இணையத்தளத்துடன் தொடர்பு \n"
 #~ "கொள்ள முடியவில்லை,பிறகு முயலுங்கள்"
@@ -960,8 +960,8 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
@@ -982,15 +982,15 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ msgid "Previous"
 #~ msgstr "முன்னது"
 
-# inserted a \n because Mandriva Online has a bug, it doens't wrap long
+# inserted a \n because Mageia Online has a bug, it doens't wrap long
 # lines and the end of the line is not visible on the window...
 #, fuzzy
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
 #~ msgstr ""
 #~ "மாண்டிரேக் இணையத்தளத்ளத்தில் எனக்கு\n"
 #~ "பயனர்கணக்கு இல்லை.எனக்கொன்று "
 
-#~ msgid "Mandriva Linux Privacy Policy"
+#~ msgid "Mageia Linux Privacy Policy"
 #~ msgstr "மாண்டிரேக் கொள்கை"
 
 #~ msgid "Authentification"
@@ -1021,7 +1021,7 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ msgstr "  -v             - விளக்கமாக காட்டு.\n"
 
 #~ msgid ""
-#~ "You need to have an account on Mandriva Online, or update your "
+#~ "You need to have an account on Mageia Online, or update your "
 #~ "subscription."
 #~ msgstr "மாண்ட்ேரக் இணையத்தில் கணக்கில்ைல, அல்லது சந்தாைவ புதுப்பிக்கவும்"
 
@@ -1077,7 +1077,7 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ msgstr "சரி"
 
 #~ msgid ""
-#~ "Do you really want to abort Mandriva Online?\n"
+#~ "Do you really want to abort Mageia Online?\n"
 #~ "To return to the Wizard press 'Cancel',\n"
 #~ "to really quit it press 'Quit'."
 #~ msgstr ""
@@ -1085,5 +1085,5 @@ msgstr "மாண்ட்ேரக்புதுப்பி ஊடகத்�
 #~ "மாயாவியை தொடர நீக்கு பொத்தானை அழுத்துங்கள்,\n"
 #~ "நிச்சயமாக வெளியேர வெளிச்செல் பாத்தானை அழுத்துங்கள்"
 
-#~ msgid "Really abort? - Mandriva Online"
+#~ msgid "Really abort? - Mageia Online"
 #~ msgstr "நீங்கள் நிச்சயமாக மாண்டிரேக்இணையத்தை முடிக்கவேண்டுமா"
diff --git a/po/tg.po b/po/tg.po
index 61a05625..bb022ecc 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -13,7 +13,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-tg\n"
+"Project-Id-Version: mgaonline-tg\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-09-17 16:22+0500\n"
@@ -39,10 +39,10 @@ msgstr "Системаи навкуниро талаб намекунад"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Мушкилии танзими хидмат.Марҳамат карда номнависҳоро санҷед ва ба "
-"support@mandrivaonline.com пайём фиристед"
+"support@mageiaonline.com пайём фиристед"
 
 #: ../mdkapplet:90
 #, c-format
@@ -56,7 +56,7 @@ msgstr "Барои системаи шумо навсозиҳои дастрас
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -163,7 +163,7 @@ msgstr "Сардиҳии drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -173,7 +173,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -221,7 +221,7 @@ msgstr "Бекор кардан"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -232,8 +232,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -295,8 +295,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Сардиҳии MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Сардиҳии MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -315,17 +315,17 @@ msgstr "Тафтиши Шабака: эҳтимолан хомӯш карда ш
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -394,7 +394,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -427,7 +427,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -460,7 +460,7 @@ msgstr "Хатогӣ рух дод"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -521,15 +521,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -578,33 +578,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -622,14 +622,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate нусхаи %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Ин нармафзори озод мебошад ва дар зери шартҳои GNU GPL аз нав паҳн карда "
 "мешавад.\n"
 "\n"
@@ -642,8 +642,8 @@ msgstr "  --help\t\t- чопи ин пайғоми ёрӣ.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update ба таври худкор сар дода мешавад.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update ба таври худкор сар дода мешавад.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -652,8 +652,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- навкунии ривояти Mandriva бо усули матнӣ.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- навкунии ривояти Mageia бо усули матнӣ.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -667,7 +667,7 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -702,9 +702,9 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ msgid "No"
 #~ msgstr "Не"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Дар назар чунин аст, ки Mandriva Online боз коргузорӣ шудааст, "
+#~ "Дар назар чунин аст, ки Mageia Online боз коргузорӣ шудааст, "
 #~ "бозборкунии апплет ...."
 
 #~ msgid "Checking... Updates are available\n"
@@ -717,8 +717,8 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ msgid "Connecting to"
 #~ msgstr "Пайвастшавӣ ба"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Апплети Mandriva Linux Навкунӣ"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Апплети Mageia Linux Навкунӣ"
 
 #~ msgid "Security error"
 #~ msgstr "Огоҳӣ оиди бехатарӣ:"
@@ -842,9 +842,9 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ msgid "Unknown state"
 #~ msgstr "Ҳолати номаълум"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Хидматрасониҳои ғайрихудмухтор хомӯш карда мешаванд. Ба пойгоҳи Mandriva "
+#~ "Хидматрасониҳои ғайрихудмухтор хомӯш карда мешаванд. Ба пойгоҳи Mageia "
 #~ "Online пайваст шавед\n"
 
 #~ msgid "Wrong Password.\n"
@@ -860,8 +860,8 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ "Чизе дар гузоришҳои шабакаи шумо нодуруст аст (гардиш, фейрвол ва "
 #~ "гузоришҳои проксии худро санҷед)\n"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Ёри аз тарафи хидматрасони Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Ёри аз тарафи хидматрасони Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Бе тафтишот"
@@ -877,14 +877,14 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline нусхаи %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Ин нармафзори озод мебошад ва дар зери шартҳои GNU GPL аз нав паҳн карда "
 #~ "мешавад.\n"
 #~ "\n"
@@ -914,9 +914,9 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ msgid "Account creation or authentication"
 #~ msgstr "Офаридани ҳисоб ё аслшиносӣ"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Ворикунанадаи Mandriva Online-и худро, гузарвожа ва номи мошинаро ворид "
+#~ "Ворикунанадаи Mageia Online-и худро, гузарвожа ва номи мошинаро ворид "
 #~ "кунед:"
 
 #~ msgid "Email address:"
@@ -932,14 +932,14 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Нуқтаҳои васлшавӣ бояд танҳо рамзҳои ҳарфу рақамро дошта бошад"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Пайвастшавӣ бо пойгоҳи шабакавии Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Пайвастшавӣ бо пойгоҳи шабакавии Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -954,10 +954,10 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Барои аз хадамоти Mandriva Online фоида гирифтан,\n"
+#~ "Барои аз хадамоти Mageia Online фоида гирифтан,\n"
 #~ "мо ба бор кардани танзимдарории шумо наздик ҳастем.\n"
 #~ "\n"
-#~ "Устод маълумоти зеринро ҳозир ба Mandriva мефиристад:\n"
+#~ "Устод маълумоти зеринро ҳозир ба Mageia мефиристад:\n"
 #~ "\n"
 #~ "1) рӯйхати қуттиҳои ба системи шумо коргузошташуда,\n"
 #~ "\n"
@@ -977,8 +977,8 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Ҳангоми боркунии файлҳо мушкилие рух дод, бори дигар кӯшиш кунед"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Офаридани Ҳисоби Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Офаридани Ҳисоби Mageia Online"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -1008,10 +1008,10 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ msgstr "Суроғаи пост ҳақиқӣ нест!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Ҳисоби Mandriva Online бо муваффақият офарида шуд.\n"
+#~ "Ҳисоби Mageia Online бо муваффақият офарида шуд.\n"
 #~ "Барои аслшиносӣ ва боркунии танзимоти худ ба \"Оянда\" ангушт занед\n"
 
 #~ msgid "Your upload was successful!"
@@ -1019,22 +1019,22 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
-#~ "Ба туфайли Mandriva Online аз ин лаҳза эътибран шумо ахбороти \n"
+#~ "Ба туфайли Mageia Online аз ин лаҳза эътибран шумо ахбороти \n"
 #~ "оиди бехатарӣ ва навкуниҳоро қабул хоҳед кард."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online ба шумо имконияти худкоркунии навсозиҳоро пешкаш "
+#~ "Mageia Online ба шумо имконияти худкоркунии навсозиҳоро пешкаш "
 #~ "мекунад.\n"
 #~ "Барнома доимо ар системаи шумо иҷро мегардад ва то навкуниҳои оянда "
 #~ "интизор мешавад.\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Ҳисоби Mandriva Online-и шумо бо муваффақият танзим карда шуд\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Ҳисоби Mageia Online-и шумо бо муваффақият танзим карда шуд\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Боркунии шумо бо муваффақият ноил гардид"
@@ -1043,14 +1043,14 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ msgstr "Танзимдарории хатогии боркуни"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "Ба пойгоҳи шабакавии mandrivaonline пайваст гашта наметавонам: хатогии "
 #~ "ном/гузарвожа ё таҳриргур/фейрвол гузоришҳои нодуруст"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- сардиҳии MandrivaНавкунӣ.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- сардиҳии MageiaНавкунӣ.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Система банд аст. Интизор шавед ..."
@@ -1062,7 +1062,7 @@ msgstr "Навсозии бастаҳо аз муҳити update_source ғайр
 #~ msgstr ""
 #~ "Ягон файли %s пайдо нагардид. Дар аввал устоди mdkonline-ро ба кор андозед"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Mandriva Update бо пойгоҳ алоқа карда натавониста истодаааст, мо бори "
+#~ "Mageia Update бо пойгоҳ алоқа карда натавониста истодаааст, мо бори "
 #~ "дигар кӯшиш мекунем."
diff --git a/po/th.po b/po/th.po
index c0de2b6b..b82e98b3 100644
--- a/po/th.po
+++ b/po/th.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2003-02-28 05:55+0900\n"
@@ -32,8 +32,8 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
-msgstr "หากมีปัญหาใดๆ ให้ส่งอีเมล์ไปยัง support@mandrivaonline.com\n"
+"support@mageiaonline.com"
+msgstr "หากมีปัญหาใดๆ ให้ส่งอีเมล์ไปยัง support@mageiaonline.com\n"
 
 #: ../mdkapplet:90
 #, c-format
@@ -47,7 +47,7 @@ msgstr ""
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -147,7 +147,7 @@ msgstr ""
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -157,7 +157,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -205,7 +205,7 @@ msgstr "ยกเลิก"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -216,8 +216,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -279,7 +279,7 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
 msgstr ""
 
 #: ../mdkapplet:719
@@ -299,17 +299,17 @@ msgstr ""
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -378,7 +378,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -411,7 +411,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -444,7 +444,7 @@ msgstr "มีปัญหาเกิดขึ้น"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -505,15 +505,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -562,33 +562,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -606,14 +606,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate เวอร์ชั่นที่ %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
 "\n"
 "วิธีใช้:\n"
@@ -625,7 +625,7 @@ msgstr "  --help\t\t- แสดงข้อความช่วยเหลื�
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr "  --applet\t\t- อัพเดทข้อมูลทั้งหมด\n"
 
 #: ../mdkupdate:66
@@ -635,7 +635,7 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr "  --applet       - อัพเดทข้อมูลทั้งหมด\n"
 
 #: ../mdkupdate:68
@@ -650,7 +650,7 @@ msgstr "ไม่สามารถอัพเดทแพ็จเกจจา
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #~ msgid "Installation failed"
 #~ msgstr "การติดตั้งไม่สำเร็จ"
@@ -756,14 +756,14 @@ msgstr "ไม่สามารถอัพเดทแพ็จเกจจา
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline เวอร์ชั่นที่ %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
 #~ "\n"
 #~ "วิธีใช้:\n"
@@ -810,11 +810,11 @@ msgstr "ไม่สามารถอัพเดทแพ็จเกจจา
 #~ msgstr "กรุณาเลือกช่องข้างล่างนี้"
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr "  --applet\t\t- อัพเดทข้อมูลทั้งหมด\n"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update ไม่สามารถติดต่อกับไซต์ จะลองพยายามอีกครั้ง"
 
 #~ msgid "Login:"
 #~ msgstr "ล็อกอิน:"
diff --git a/po/tl.po b/po/tl.po
index 94f2bb0c..f0b51b78 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-tl\n"
+"Project-Id-Version: mgaonline-tl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-02-05 00:43+0000\n"
@@ -33,10 +33,10 @@ msgstr "Ang iyong sistema ay ayon sa bago"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Problema sa pag-configure ng serbisyo. Pakisuri ang mga log at ipadala sa "
-"sulat na support@mandrivaonline.com"
+"sulat na support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,7 +50,7 @@ msgstr "May mga bagong update para sa iyong sistema"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -157,7 +157,7 @@ msgstr "Inilulunsad ang drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -167,7 +167,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -215,7 +215,7 @@ msgstr "Cancel"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -226,8 +226,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -289,8 +289,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Inilulunsad ang MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Inilulunsad ang MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -309,17 +309,17 @@ msgstr "Sinusuri ang Network: tila naka-disable\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -388,7 +388,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -421,7 +421,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -454,7 +454,7 @@ msgstr "May \"error\" na nangyari"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -515,15 +515,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -572,33 +572,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -616,14 +616,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Ito ay libreng software at maaaring ipamahagi muli sa ilalim ng mga nasasaad "
 "sa GNU GPL.\n"
 "\n"
@@ -636,8 +636,8 @@ msgstr "  --help\t\t- i-print ang mensaheng tulong na ito.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update ay nakalunsad ng automatic.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update ay nakalunsad ng automatic.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -646,8 +646,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - ilunsad ang Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - ilunsad ang Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -661,7 +661,7 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -696,9 +696,9 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ msgid "No"
 #~ msgstr "Hindi"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "Tila in-install muli ang Mandriva Online, nilo-load muli ang applet..."
+#~ "Tila in-install muli ang Mageia Online, nilo-load muli ang applet..."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Nagsusuri... mayroong mga Update\n"
@@ -710,8 +710,8 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ msgid "Connecting to"
 #~ msgstr "Kumukonekta sa"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Mageia Linux Updates Applet"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -838,9 +838,9 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ msgid "Unknown state"
 #~ msgstr "Di-kilalang state"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Naka-disable ang mga online service. Makipag-alam sa Mandriva Online "
+#~ "Naka-disable ang mga online service. Makipag-alam sa Mageia Online "
 #~ "site\n"
 
 #~ msgid "Wrong Password.\n"
@@ -863,8 +863,8 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ "May nangyaring problema habang kumokonekta sa server, makipag-alam sa "
 #~ "koponang pangsuporta"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Sagot mula sa Mandriva Online server\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Sagot mula sa Mageia Online server\n"
 
 #~ msgid "No check"
 #~ msgstr "Walang pagsuri"
@@ -880,14 +880,14 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Ito ay libreng software at maaaring ipamahagi muli sa ilalim ng mga "
 #~ "nasasaad sa GNU GPL.\n"
 #~ "\n"
@@ -916,9 +916,9 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ msgid "Account creation or authentication"
 #~ msgstr "Paggawa o pagpapatotoo ng account"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Ipasok ang iyong Mandriva Online login, password at pangalan ng makina:"
+#~ "Ipasok ang iyong Mageia Online login, password at pangalan ng makina:"
 
 #, fuzzy
 #~ msgid "Email address:"
@@ -936,14 +936,14 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ "Ang mga \"mount point\" ay dapat maglaman lamang ng mga character na "
 #~ "\"alphanumeric\""
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Kumukonekta sa Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Kumukonekta sa Mageia Online website..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -958,10 +958,10 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Para makinabang sa mga serbisyo ng Mandriva Online,\n"
+#~ "Para makinabang sa mga serbisyo ng Mageia Online,\n"
 #~ "i-a-upload namin ang iyong configuration.\n"
 #~ "\n"
-#~ "Ipapadala ngayon ng Wizard ang mga sumusunod na inpormasyon sa Mandriva:\n"
+#~ "Ipapadala ngayon ng Wizard ang mga sumusunod na inpormasyon sa Mageia:\n"
 #~ "\n"
 #~ "1) ang talaan ng mga package na naka-install sa iyong sistema,\n"
 #~ "\n"
@@ -983,8 +983,8 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Nagkakaproblema sa pag-a-upload ng file, pakisubukan muli"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Gumawa ng Mandriva Online Account"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Gumawa ng Mageia Online Account"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -1015,10 +1015,10 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ msgstr "Hindi balidong mail address!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Matagumpay na nalikha ang Mandriva Online Account.\n"
+#~ "Matagumpay na nalikha ang Mageia Online Account.\n"
 #~ "Paki-click ang \"Kasunod\" para patotohonan at i-upload ang iyong "
 #~ "configuration\n"
 
@@ -1027,21 +1027,21 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Mula ngayon ikaw ay makakatanggap ng mga announcement\n"
-#~ "tungkol sa seguridad at update salamat sa Mandriva Online."
+#~ "tungkol sa seguridad at update salamat sa Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Ang Mandriva Online ay naghahandog sa iyo ng kakayahang i-automate\n"
+#~ "Ang Mageia Online ay naghahandog sa iyo ng kakayahang i-automate\n"
 #~ "ang mga update. May program na tatakbo tuwina sa iyong sistema na\n"
 #~ "maghihintay para sa mga bagong update.\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Matagumpay na na-configure ang iyong Mandriva Online account\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Matagumpay na na-configure ang iyong Mageia Online account\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Matagumpay na nai-upload ang configuration!"
@@ -1050,14 +1050,14 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ msgstr "Problema sa pag-a-upload ng configuration"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "Hindi makakonekta sa website ng mandrivaonline: maling login/password o "
 #~ "maling setting ng router/firewall"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- ilunsad ang Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- ilunsad ang Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "Abala ang sistema. Maghintay ..."
@@ -1067,11 +1067,11 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr ""
-#~ "Walang nakitang file na %s. Patakbuhin muna ang Mandriva Online Wizard"
+#~ "Walang nakitang file na %s. Patakbuhin muna ang Mageia Online Wizard"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr ""
-#~ "Hindi makapag-alam ang Mandriva Update sa pook, susubukan muli natin."
+#~ "Hindi makapag-alam ang Mageia Update sa pook, susubukan muli natin."
 
 #~ msgid "Login:"
 #~ msgstr "Login:"
@@ -1085,16 +1085,16 @@ msgstr "Hindi ma-update ang mga package mula sa medium ng update_source.\n"
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Ang iyong login o password ay mali.\n"
 #~ " Kailangang i-type mo ulit ito, o kailangan mong gumawa ng account sa "
-#~ "Mandriva Online.\n"
-#~ " Sa mas huling kaso, bumalik sa unang hakbang para kumonekta saMandriva "
+#~ "Mageia Online.\n"
+#~ " Sa mas huling kaso, bumalik sa unang hakbang para kumonekta saMageia "
 #~ "Online.\n"
 #~ " Tandaan na dapat kang magbigay ng pangalan ng Makina \n"
 #~ " (mga alphabetical na character lamang ang tatanggapin)"
diff --git a/po/tr.po b/po/tr.po
index ce01c8fd..00bbb521 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@
 # Atilla ÖNTAŞ <atilla_ontas@mandriva.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-08 18:48+0200\n"
@@ -37,8 +37,8 @@ msgstr "Sisteminiz güncel"
 
 #: ../mdkapplet:84
 #, c-format
-msgid "Service configuration problem. Please check logs and send mail to support@mandrivaonline.com"
-msgstr "Hizmet yapılandırma sorunu. Lütfen kayıtları denetleyin ve support@mandrivaonline.com adresine e-posta gönderin"
+msgid "Service configuration problem. Please check logs and send mail to support@mageiaonline.com"
+msgstr "Hizmet yapılandırma sorunu. Lütfen kayıtları denetleyin ve support@mageiaonline.com adresine e-posta gönderin"
 
 #: ../mdkapplet:90
 #, c-format
@@ -52,8 +52,8 @@ msgstr "Sisteminiz için yeni güncellemeler mevcut"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mandriva Linux' un yeni bir sürümü yayınlanmış"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mageia Linux' un yeni bir sürümü yayınlanmış"
 
 #: ../mdkapplet:119
 #: ../mdkapplet:161
@@ -159,8 +159,8 @@ msgstr "Drakconnect başlatılıyor\n"
 #: ../mdkapplet:459
 #: ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linux dağıtımının yeni sürümü"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linux dağıtımının yeni sürümü"
 
 #: ../mdkapplet:464
 #, c-format
@@ -169,8 +169,8 @@ msgstr "Göz at"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mandriva Linux' un yeni bir sürümü yayınlanmış"
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mageia Linux' un yeni bir sürümü yayınlanmış"
 
 #: ../mdkapplet:475
 #: ../mdkapplet:572
@@ -231,8 +231,8 @@ msgstr "İptal"
 
 #: ../mdkapplet:508
 #, c-format
-msgid "Maintenance for this Mandriva Linux version has ended. No more updates will be delivered for this system."
-msgstr "Bu Mandriva Linux sürümü için bakım süreci sona erdi. Bu sistem için daha fazla güncelleme yapılmayacak."
+msgid "Maintenance for this Mageia Linux version has ended. No more updates will be delivered for this system."
+msgstr "Bu Mageia Linux sürümü için bakım süreci sona erdi. Bu sistem için daha fazla güncelleme yapılmayacak."
 
 #: ../mdkapplet:514
 #, c-format
@@ -241,8 +241,8 @@ msgstr "Sisteminizi güvenli tutabilmek için yapabilecekleriniz:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -296,8 +296,8 @@ msgstr "Dizüstü bilgisayarınızı doğrudan fişe takmalı ve mümkünse, kab
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Mandriva Güncelleme Başlatılıyor.\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Mageia Güncelleme Başlatılıyor.\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -316,18 +316,18 @@ msgstr "Ağ Denetleniyor: etkinleştirilmemiş\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s bir Mandriva ürünüdür"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s bir %s ürünüdür"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online, Mandriva web hizmetlerine erişim sağlar."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online, Mageia web hizmetlerine erişim sağlar."
 
 #: ../mdkapplet:899
 #, c-format
@@ -403,8 +403,8 @@ msgstr "Bu ek paket veri kaynağını eklemek ister misiniz?"
 #: ../mdkapplet:1061
 #: ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84
 #: ../mdkapplet-config:43
@@ -438,8 +438,8 @@ msgstr "Dağıtım listesi alınırken hata oluştu:"
 #. -PO: Here '%s' will be a localized date (eg:
 #: ../mdkapplet-add-media-helper:161
 #, c-format
-msgid "Mandriva provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
-msgstr "Mandriva, her sürüm için 12 ay süreyle masaüstü güncellemeleri (%s tarihine kadar) ve 18 ay süreyle temel sistem güncellemeleri ( %s tarihine kadar) sunar."
+msgid "Mageia provides 12 months of desktop updates (until %s) and 18 months of base updates (up to the %s) for distributions."
+msgstr "Mageia, her sürüm için 12 ay süreyle masaüstü güncellemeleri (%s tarihine kadar) ve 18 ay süreyle temel sistem güncellemeleri ( %s tarihine kadar) sunar."
 
 #: ../mdkapplet-add-media-helper:167
 #, c-format
@@ -469,8 +469,8 @@ msgstr "Bir hata oluştu"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Mandriva hesabınız %s üyeliği içermiyor."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Mageia hesabınız %s üyeliği içermiyor."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -530,13 +530,13 @@ msgstr "Kuruluş"
 
 #: ../mdkapplet_gui.pm:87
 #, c-format
-msgid "Mandriva Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mandriva official support."
-msgstr "Mandriva Powerpack size bir masaüstünün en iyi Linux deneyimini sunar: açık kaynaklı çözümlerin verimi ve kararlılığı ile birlikte seçkin yazılımlar ve Mandriva resmi desteği."
+msgid "Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."
+msgstr "Mageia Powerpack size bir masaüstünün en iyi Linux deneyimini sunar: açık kaynaklı çözümlerin verimi ve kararlılığı ile birlikte seçkin yazılımlar ve Mageia resmi desteği."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux Özellikleri"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux Özellikleri"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -585,35 +585,35 @@ msgstr "%s erişilebilir durumda. Yükseltme yapabilirsiniz:"
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178
 #: ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181
 #: ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
-msgid "The Mandriva Linux distribution with even more softwares and official support."
-msgstr "Çok daha fazla yazılım ve resmi destek sunan Mandriva Linux dağıtımı."
+msgid "The Mageia Linux distribution with even more softwares and official support."
+msgstr "Çok daha fazla yazılım ve resmi destek sunan Mageia Linux dağıtımı."
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -629,13 +629,13 @@ msgstr "Dağıtım Yükseltmesi"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate sürüm %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Bu bir özgür yazılımdır ve GNU GPL lisansı altında tekrar dağıtılabilir.\n"
 "\n"
 "kullanımı:\n"
@@ -647,8 +647,8 @@ msgstr "  --help\t\t- bu yardım mesajını görüntüler.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr " --auto\t\t- Mandriva Güncelleme'yi otomatik çalıştır.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr " --auto\t\t- Mageia Güncelleme'yi otomatik çalıştır.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -657,8 +657,8 @@ msgstr "  --mnf\t\t\t- mnf'ye özgü betikleri çalıştır.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Güncelleme'nin metin sürümü.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Güncelleme'nin metin sürümü.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -678,13 +678,13 @@ msgstr "update_source yazılım kaynağından paketler güncellenemiyor.\n"
 #~ "ekleyebilmek için hesap kimliğinizi doldurun"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Mandriva hesabınız Genişletilmiş Bakım üyeliği içermiyor."
+#~ msgstr "Mageia hesabınız Genişletilmiş Bakım üyeliği içermiyor."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Powerpack almak istemez misiniz?"
@@ -693,7 +693,7 @@ msgstr "update_source yazılım kaynağından paketler güncellenemiyor.\n"
 #~ "Since you don't have Powerpack rights you may visit mandriva store now "
 #~ "and get Powerpack subscription."
 #~ msgstr ""
-#~ "Powerpack haklarına sahip değilsiniz. Şimdi Mandriva mağazasını ziyaret "
+#~ "Powerpack haklarına sahip değilsiniz. Şimdi Mageia mağazasını ziyaret "
 #~ "edebilir ve bir Powerpack üyeliği satın alabilirsiniz."
 
 #~ msgid "Get Powerpack subscription!"
@@ -713,9 +713,9 @@ msgstr "update_source yazılım kaynağından paketler güncellenemiyor.\n"
 #~ msgstr "İptal et ve Free Yayın' a yükselt"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Mandriva hesabınız Powerpack üyeliği içermiyor."
+#~ msgstr "Mageia hesabınız Powerpack üyeliği içermiyor."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -736,8 +736,8 @@ msgstr "update_source yazılım kaynağından paketler güncellenemiyor.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Tebrikler"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Mandriva %s yayımına yükseltme işlemi başarılı oldu."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Mageia %s yayımına yükseltme işlemi başarılı oldu."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Sisteminizi yeniden başlatmalısınız."
@@ -761,6 +761,6 @@ msgstr "update_source yazılım kaynağından paketler güncellenemiyor.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Mandriva Linux' un yeni bir sürümü yayınlanmış"
+#~ msgstr "Mageia Linux' un yeni bir sürümü yayınlanmış"
diff --git a/po/uk.po b/po/uk.po
index 0c6a7ef0..30562141 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,5 +1,5 @@
 # translation of mdkonline.po to ukrainian
-# $Id$
+# $Id: uk.po 269960 2010-06-08 10:12:21Z fisher $
 # Ukrainian translation for MDKOnline
 # Copyright (C) 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
 #
@@ -12,7 +12,7 @@
 # Тарас Бойчук <boychuk_t@ndpi.ukrnafta.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2010-06-08 08:06+0300\n"
@@ -40,10 +40,10 @@ msgstr "Система поновлена"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Проблема з налаштуванням служб. Будь ласка, перевірте журнал і відправте "
-"лист на support@mandrivaonline.com"
+"лист на support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -57,7 +57,7 @@ msgstr "Є нові поновлення для Вашої системи"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr "Вийшла нова збірка Мандріва Лінакс"
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -168,7 +168,7 @@ msgstr "Запускається drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr "Нова версія збірки Мандріва Лінакс"
 
 #: ../mdkapplet:464
@@ -178,7 +178,7 @@ msgstr "Навігація"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr "Вийшла нова збірка Мандріва Лінакс."
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -226,10 +226,10 @@ msgstr "Скасувати"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
-"Термін супроводу цієї версії Mandriva Linux вичерпано. Оновлень для цієї "
+"Термін супроводу цієї версії Mageia Linux вичерпано. Оновлень для цієї "
 "системи більше не буде."
 
 #: ../mdkapplet:514
@@ -239,8 +239,8 @@ msgstr "З метою підтримання безпеки системи ви
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -309,8 +309,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Запускається MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Запускається MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -329,18 +329,18 @@ msgstr "Перевірка мережі: здається, вимкнена\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr "Права застережено (C) %s Мандрівою"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online надає доступ до веб-послуг Мандріви."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online надає доступ до веб-послуг Мандріви."
 
 #: ../mdkapplet:899
 #, c-format
@@ -409,8 +409,8 @@ msgstr "Ви хочете додати це додаткове сховище п
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -442,10 +442,10 @@ msgstr "Не вдалося отримати список дистрибутив
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"У Mandriva передбачено 12 місяців оновлень стільничного дистрибутива (до %s) "
+"У Mageia передбачено 12 місяців оновлень стільничного дистрибутива (до %s) "
 "і 18 місяців базових оновлень (до %s)."
 
 #: ../mdkapplet-add-media-helper:167
@@ -480,8 +480,8 @@ msgstr "Сталася помилка"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Ваш рахунок на Mandriva не має активованої підписки на звантаження %s."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Ваш рахунок на Mageia не має активованої підписки на звантаження %s."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -541,17 +541,17 @@ msgstr "Enterprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack надає Вам передові досягнення лікакса для настільних "
+"Mageia Powerpack надає Вам передові досягнення лікакса для настільних "
 "комп’ютерів: стабільність і ефективність рішень з відкритим кодом поруч з "
-"комерційними програмами і офіційною підтримкою Mandriva."
+"комерційними програмами і офіційною підтримкою Mageia."
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "Можливості Мандріва лінакс"
 
 #: ../mdkapplet_gui.pm:213
@@ -601,33 +601,33 @@ msgstr "зараз доступний %s, Ви можете оновитися �
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 "Збірка Мандріва лінакс з ще більшою кількістю програм  і офіційною "
@@ -647,14 +647,14 @@ msgstr "Оновлення дистрибутиву"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate версія %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Це відкрите програмне забезпечення і може розповсюджуватися за умов GNU "
 "GPL.\n"
 "\n"
@@ -667,8 +667,8 @@ msgstr "  --help\t\t- вивести цю довідку.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update виконується автоматично.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update виконується автоматично.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -677,8 +677,8 @@ msgstr "  --mnf\t\t\t- виконати специфічний mnf-скрипт.
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- версія Mandriva Update в текстовому режимі.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- версія Mageia Update в текстовому режимі.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -698,14 +698,14 @@ msgstr "Неможливо поновити пакунки з джерела upd
 #~ "носій з пакунками, після завершення оформлення мережевої передплати"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "У вашому обліковому записі Mandriva не увімкнено передплати на додатковий "
+#~ "У вашому обліковому записі Mageia не увімкнено передплати на додатковий "
 #~ "супровід."
 
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #~ msgid "Would you like Powerpack?"
 #~ msgstr "Ви б хотіли Powerpack?"
@@ -734,10 +734,10 @@ msgstr "Неможливо поновити пакунки з джерела upd
 #~ msgstr "Скасувати, оновитися до Free Edition"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
 #~ msgstr ""
-#~ "Ваш рахунок на Mandriva не має активованої підписки на звантаження "
+#~ "Ваш рахунок на Mageia не має активованої підписки на звантаження "
 #~ "Powerpack."
 
 #~ msgid ""
@@ -759,8 +759,8 @@ msgstr "Неможливо поновити пакунки з джерела upd
 #~ msgid "Congratulations"
 #~ msgstr "Вітаємо"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Поновлення Mandriva до версії %s відбулося успішно."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Поновлення Mageia до версії %s відбулося успішно."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Вам потрібно перезапустити систему."
@@ -783,6 +783,6 @@ msgstr "Неможливо поновити пакунки з джерела upd
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
 #~ msgstr "Вийшла нова збірка Мандріва Лінакс."
diff --git a/po/ur.po b/po/ur.po
index 4b5376be..24b57454 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-02-22 06:57-0500\n"
 "Last-Translator: khushbakht  <khushbakht@gmail.com>\n"
@@ -29,10 +29,10 @@ msgstr "آپ كا سسٹم جدید هے"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "خدمات كی ترتیب میں مسله۔ مهربانی فرما كر یاداشتوں میں دیكھیں اور "
-"support@mandrivaonline.com كو میل بھیجیں"
+"support@mageiaonline.com كو میل بھیجیں"
 
 #: ../mdkapplet:90
 #, c-format
@@ -46,7 +46,7 @@ msgstr "آپ كے سسٹم كیلیے تازه تریں معلومات موجو�
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -146,7 +146,7 @@ msgstr "ڈارك كے رابطے كا آغاز\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -156,7 +156,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -204,7 +204,7 @@ msgstr ""
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -215,7 +215,7 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia Linux"
 msgstr "مینڈریكآنلاءین"
 
 #: ../mdkapplet:526
@@ -278,8 +278,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, fuzzy, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "جدید تریں ایمڈی كے كا آغاز MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "جدید تریں ایمڈی كے كا آغاز MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -298,17 +298,17 @@ msgstr "نیٹورك كی تصدیق كرها هے: معزور دیكھاءی د
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
+msgid "Mageia Online %s"
 msgstr "مینڈریكآنلاءین"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -377,7 +377,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -410,7 +410,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -443,7 +443,7 @@ msgstr ""
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -504,14 +504,14 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
+msgid "Mageia Linux Features"
 msgstr "مینڈریكآنلاءین"
 
 #: ../mdkapplet_gui.pm:213
@@ -561,33 +561,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
+msgid "Mageia Flash"
 msgstr "مینڈریكآنلاءین"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
+msgid "Mageia Free"
 msgstr "مینڈریكآنلاءین"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
+msgid "Mageia Mini"
 msgstr "مینڈریكآنلاءین"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
+msgid "Mageia One"
 msgstr "مینڈریكآنلاءین"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
+msgid "Mageia PowerPack"
 msgstr "مینڈریكآنلاءین"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -605,14 +605,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "%s ایم ڈی كے كا جدید طرز\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "یه ایك مفت سافٹ ویعر هے اور شاید دوباره سے GNU GPL كی شراءت پر تقسیم كیا "
 "جاےء۔ \n"
 " \n"
@@ -625,8 +625,8 @@ msgstr "  --help         - print this help message.\n"
 
 #: ../mdkupdate:65
 #, fuzzy, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto         - Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto         - Mageia Update launched automatically.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -635,8 +635,8 @@ msgstr ""
 
 #: ../mdkupdate:67
 #, fuzzy, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --applet       - launch Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --applet       - launch Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -659,7 +659,7 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ msgid "Congratulations"
 #~ msgstr "مبارك هو"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr "مینڈریك اونلاءین كو دوباره نصب كرنا پڑے گا، دوباره بھرنا ایپلٹ ۔۔۔۔"
 
 #~ msgid "Checking... Updates are available\n"
@@ -668,7 +668,7 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ msgid "Connecting to"
 #~ msgstr "سے رابطه كر رها هے"
 
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "جدید تریں مینڈریك لاءینك ایپلٹ"
 
 #, fuzzy
@@ -771,7 +771,7 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ msgid "Unknown state"
 #~ msgstr "نامعلام درجه"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr "اونلاءین خدمات معزور هیں۔مینڈریك اونلاءین ساءیٹ سے رابطه كریں\n"
 
 #~ msgid "Wrong Password.\n"
@@ -787,7 +787,7 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ "آپ كی نیٹورك سیٹینگ كے ساتھ كچھ مسله هے (اپنے راوءٹ،فاءروال یا پراكسی "
 #~ "سیٹینگ كی تصدیق كریں)\n"
 
-#~ msgid "Response from Mandriva Online server\n"
+#~ msgid "Response from Mageia Online server\n"
 #~ msgstr "مینڈریك اونلاءین سرور سے جواب\n"
 
 #~ msgid "No check"
@@ -804,14 +804,14 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "یه ایك مفت سافٹ ویعر هے اور شاید دوباره سے GNU GPL كی شراءت پر تقسیم كیا "
 #~ "جاےء۔ \n"
 #~ " \n"
@@ -836,7 +836,7 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ msgid "Account creation or authentication"
 #~ msgstr "كھاتا بنانا یا توثیق دینا"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr "اپنا مینڈریك آنلاءین كا لوگ ان، خفیه لفظ اور مشین كا نام داخل كریں:"
 
 #, fuzzy
@@ -849,14 +849,14 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ msgid "Password:"
 #~ msgstr "خفیه لفظ:"
 
-#~ msgid "Connecting to Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
 #~ msgstr "مینڈریكآنلاءین ویبساءیٹ سے رابطه هو رها هے۔۔۔"
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -890,7 +890,7 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ "فاءل كو بڑے ذخیزه نظام میں منتقل كرنے میں مسله آرها هے،مهربانی فرماكر "
 #~ "دوباره كوشش كریں"
 
-#~ msgid "Create a Mandriva Online Account"
+#~ msgid "Create a Mageia Online Account"
 #~ msgstr "ایك مینڈریك آنلاءین كھاتا بناءیں"
 
 #, fuzzy
@@ -915,7 +915,7 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ msgstr "میل كا پته معقول نهی!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
 #~ "آپ كے مینڈرك آنلاءین كھاتےكوبنانے میں كامیابی حاصل هوءی۔\n"
@@ -927,20 +927,20 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "اب كے بعد آپ كو  حفاظت اور تازه ترین معلومات سےآگاه كیا جاےء گا\n"
 #~ "اعلانیه مینڈرك آنلاءین كا شكریه ادا كرتی هے۔"
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
 #~ "مینڈرك آنلاءین آپ كو جدیدترین كو خودكاربنانے كی صلاحیت پیش كرتا هے\n"
 #~ "ایك پروگرام تازه تریں معلومات كے انتظار میں مسلسل آپ كے سسٹم پر چلتا رهے "
 #~ "گا\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
 #~ msgstr ""
 #~ "آپ كے مینڈرك آنلاءین كھاتےكے اجزا یا اناصركوكی ایك خاص صورت میں ترتیب "
 #~ "دینے میں كامیابی\n"
@@ -952,15 +952,15 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ msgstr "اجزا یا اناصر كو كی ایك خاص صورت میں ترتیب دینا"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "مینڈرك آنلاءین ویبساءیٹ سے الحاق نهی هو رها:غلط لوگ ان/خفیه لفظ یا رآاوٹر/"
 #~ "فاءروال كی بری ترتیب هے"
 
 #, fuzzy
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet       - launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet       - launch Mageia Update.\n"
 
 #~ msgid "System is busy. Please wait ..."
 #~ msgstr "سسٹم مصروف هے۔ انتظار فرماءیے ۔۔۔"
@@ -971,7 +971,7 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "%s فاءیل نهیں ملی۔ پهلے ایم ڈی كےآنلاءین وزرڈ چلاءیں"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr "مینڈرك اپڈیٹ ساءیٹ سے رابطه نهی بنا سكا،هم دوباره كوشش كریں گے۔"
 
 #~ msgid "Login:"
@@ -983,8 +983,8 @@ msgstr "عمومی پروگرام جس كا اطلاق كیء جگه هو سكے
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
diff --git a/po/uz.po b/po/uz.po
index 4cedce7e..cb7765e7 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -6,7 +6,7 @@
 # Nurali Abdurahmonov <mavnur@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-uz\n"
+"Project-Id-Version: mgaonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2009-12-20 19:03+0500\n"
@@ -33,10 +33,10 @@ msgstr "Tizim yangilashga muhtoe emas"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Xizmatni sozlashda muammo. Iltmos log jurnallarini tekshiring va  "
-"support@mandrivaonline.com manziliga xat joʻnating"
+"support@mageiaonline.com manziliga xat joʻnating"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,8 +50,8 @@ msgstr "Tizimingiz uchun yangilanish mavjud"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mandriva Linux distributivining yangi versiyasi chiqdi"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mageia Linux distributivining yangi versiyasi chiqdi"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -154,8 +154,8 @@ msgstr "drakconnect'ni ishga tushirish\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linux distributivining yangi versiyasi"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linux distributivining yangi versiyasi"
 
 #: ../mdkapplet:464
 #, c-format
@@ -164,8 +164,8 @@ msgstr "Tanlash"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mandriva Linux distributivining yangi versiyasi chiqdi."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mageia Linux distributivining yangi versiyasi chiqdi."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -212,7 +212,7 @@ msgstr "Bekor qilish"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -223,8 +223,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -293,8 +293,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate ishga tushirilmoqda\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate ishga tushirilmoqda\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -313,19 +313,19 @@ msgstr "Tarmoq tekshirilmoqda: oʻchirilgan koʻrinadi\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
-"Mandriva Online, Mandriva veb xizmatlariga ulanish imkoniyatini beradi."
+"Mageia Online, Mageia veb xizmatlariga ulanish imkoniyatini beradi."
 
 #: ../mdkapplet:899
 #, c-format
@@ -395,8 +395,8 @@ msgstr "Ushbu qoʻshimcha dasturlar repozitoriysini oʻrnatishni istaysizmi?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -430,7 +430,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -463,8 +463,8 @@ msgstr "Xato roʻy berdi"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Sizning Mandriva hisobingizda %s yozib olish yoqilmagan."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Sizning Mageia hisobingizda %s yozib olish yoqilmagan."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -524,15 +524,15 @@ msgstr "Enterprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -581,33 +581,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -625,14 +625,14 @@ msgstr "Distributivni yangilash"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate, versiya %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
 "\n"
 "Foydalanish:\n"
@@ -644,8 +644,8 @@ msgstr "  --help\t\t- shu yordam xabarini koʻrsatish.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update avtomatik ishga tushadi.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update avtomatik ishga tushadi.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -654,8 +654,8 @@ msgstr "  --mnf\t\t\t- mnf skriptini ishga tushirish.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update matn usuli.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update matn usuli.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -677,22 +677,22 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Sizning Mandriva hisobingizda %s yozib olish yoqilmagan."
+#~ msgstr "Sizning Mageia hisobingizda %s yozib olish yoqilmagan."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Kompyuterning nomi:"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Sizning Mandriva hisobingizda Powerpack'ni yozib olish yoqilmagan."
+#~ msgstr "Sizning Mageia hisobingizda Powerpack'ni yozib olish yoqilmagan."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -712,8 +712,8 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgid "Congratulations"
 #~ msgstr "Tabriklaymiz"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Mandriva %s reliziga yangilash muvaffaqiyatli amalgan oshirildi."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Mageia %s reliziga yangilash muvaffaqiyatli amalgan oshirildi."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Tizimni oʻchirib-yoqishingiz kerak."
@@ -726,9 +726,9 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Mandriva Linux distributivining yangi versiyasi chiqdi."
+#~ msgstr "Mageia Linux distributivining yangi versiyasi chiqdi."
 
 #~ msgid "Yes"
 #~ msgstr "Ha"
@@ -859,8 +859,8 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgstr "Maxfiy soʻz notoʻgʻri.\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Mandriva Online'ga marhamat"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Mageia Online'ga marhamat"
 
 #~ msgid "Logs"
 #~ msgstr "Loglar"
@@ -870,14 +870,14 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline, versiya %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
 #~ "\n"
 #~ "Foydalanish:\n"
@@ -906,14 +906,14 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgstr "Ulash nuqtalari faqat son yoki harflardan iborat boʻlishi mumkin"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Mandriva Online'ga marhamat"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Mageia Online'ga marhamat"
 
 #~ msgid "Connection problem"
 #~ msgstr "Aloqa oʻrnatishda muammo"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Online hisobini yaratish"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Online hisobini yaratish"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -951,8 +951,8 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Moslamalar joʻnatilmoqda..."
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- Mandriva Update xizmatini ishga tushirish.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- Mageia Update xizmatini ishga tushirish.\n"
 
 #~ msgid "Login:"
 #~ msgstr "Foydalanuvchi:"
@@ -994,9 +994,9 @@ msgstr "update_source toʻplamidan paketlarni yangilab boʻlmadi.\n"
 #~ msgstr "Yordamchidan chiqilmoqda\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
+#~ "Mageia Online could not be contacted, please try again at a later time"
 #~ msgstr ""
-#~ "Mandriva Online bilan aloqa oʻrnatib boʻlmadi. Iltimos keyinroq urinib "
+#~ "Mageia Online bilan aloqa oʻrnatib boʻlmadi. Iltimos keyinroq urinib "
 #~ "koʻring"
 
 #~ msgid "  --update       - Update keys\n"
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 60ee178e..5a70bf90 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -6,7 +6,7 @@
 # Nurali Abdurahmonov <mavnur@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-uz\n"
+"Project-Id-Version: mgaonline-uz\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2009-12-20 19:03+0500\n"
@@ -33,10 +33,10 @@ msgstr "Тизим янгилашга муҳтоэ эмас"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Хизматни созлашда муаммо. Илтмос лог журналларини текширинг ва  "
-"support@mandrivaonline.com манзилига хат жўнатинг"
+"support@mageiaonline.com манзилига хат жўнатинг"
 
 #: ../mdkapplet:90
 #, c-format
@@ -50,8 +50,8 @@ msgstr "Тизимингиз учун янгиланиш мавжуд"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mandriva Linux дистрибутивининг янги версияси чиқди"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mageia Linux дистрибутивининг янги версияси чиқди"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -154,8 +154,8 @@ msgstr "drakconnect'ни ишга тушириш\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linux дистрибутивининг янги версияси"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linux дистрибутивининг янги версияси"
 
 #: ../mdkapplet:464
 #, c-format
@@ -164,8 +164,8 @@ msgstr "Танлаш"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mandriva Linux дистрибутивининг янги версияси чиқди."
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mageia Linux дистрибутивининг янги версияси чиқди."
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -212,7 +212,7 @@ msgstr "Бекор қилиш"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -223,8 +223,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -293,8 +293,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "MandrivaUpdate ишга туширилмоқда\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "MageiaUpdate ишга туширилмоқда\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -313,18 +313,18 @@ msgstr "Тармоқ текширилмоқда: ўчирилган кўрина
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online, Mandriva веб хизматларига уланиш имкониятини беради."
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online, Mageia веб хизматларига уланиш имкониятини беради."
 
 #: ../mdkapplet:899
 #, c-format
@@ -394,8 +394,8 @@ msgstr "Ушбу қўшимча дастурлар репозиторийсин�
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -427,7 +427,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -460,8 +460,8 @@ msgstr "Хато рўй берди"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "Сизнинг Mandriva ҳисобингизда %s ёзиб олиш ёқилмаган."
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "Сизнинг Mageia ҳисобингизда %s ёзиб олиш ёқилмаган."
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -521,15 +521,15 @@ msgstr "Enterprise"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -578,33 +578,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -622,14 +622,14 @@ msgstr "Дистрибутивни янгилаш"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate, версия %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
 "\n"
 "Фойдаланиш:\n"
@@ -641,8 +641,8 @@ msgstr "  --help\t\t- шу ёрдам хабарини кўрсатиш.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Mandriva Update автоматик ишга тушади.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Mageia Update автоматик ишга тушади.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -651,8 +651,8 @@ msgstr "  --mnf\t\t\t- mnf скриптини ишга тушириш.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva Update матн усули.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia Update матн усули.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -673,22 +673,22 @@ msgstr "update_source тўпламидан пакетларни янгилаб �
 
 #, fuzzy
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "Сизнинг Mandriva ҳисобингизда %s ёзиб олиш ёқилмаган."
+#~ msgstr "Сизнинг Mageia ҳисобингизда %s ёзиб олиш ёқилмаган."
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Free"
+#~ msgstr "Mageia Free"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
 #~ msgstr "Компьютернинг номи:"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Powerpack download subscription "
+#~ "Your Mageia account does not have Powerpack download subscription "
 #~ "enabled."
-#~ msgstr "Сизнинг Mandriva ҳисобингизда Powerpack'ни ёзиб олиш ёқилмаган."
+#~ msgstr "Сизнинг Mageia ҳисобингизда Powerpack'ни ёзиб олиш ёқилмаган."
 
 #~ msgid ""
 #~ "Your system does not have enough space left in %s for upgrade (%dMB < %"
@@ -708,8 +708,8 @@ msgstr "update_source тўпламидан пакетларни янгилаб �
 #~ msgid "Congratulations"
 #~ msgstr "Табриклаймиз"
 
-#~ msgid "Upgrade to Mandriva %s release was successfull."
-#~ msgstr "Mandriva %s релизига янгилаш муваффақиятли амалган оширилди."
+#~ msgid "Upgrade to Mageia %s release was successfull."
+#~ msgstr "Mageia %s релизига янгилаш муваффақиятли амалган оширилди."
 
 #~ msgid "You must restart your system."
 #~ msgstr "Тизимни ўчириб-ёқишингиз керак."
@@ -722,9 +722,9 @@ msgstr "update_source тўпламидан пакетларни янгилаб �
 
 #, fuzzy
 #~ msgid ""
-#~ "The version of Mandriva Linux installed on your system is no longer "
+#~ "The version of Mageia Linux installed on your system is no longer "
 #~ "supported."
-#~ msgstr "Mandriva Linux дистрибутивининг янги версияси чиқди."
+#~ msgstr "Mageia Linux дистрибутивининг янги версияси чиқди."
 
 #~ msgid "Yes"
 #~ msgstr "Ҳа"
@@ -855,8 +855,8 @@ msgstr "update_source тўпламидан пакетларни янгилаб �
 #~ msgstr "Махфий сўз нотўғри.\n"
 
 #, fuzzy
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Mandriva Online'га марҳамат"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Mageia Online'га марҳамат"
 
 #~ msgid "Logs"
 #~ msgstr "Логлар"
@@ -866,14 +866,14 @@ msgstr "update_source тўпламидан пакетларни янгилаб �
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline, версия %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
 #~ "\n"
 #~ "Фойдаланиш:\n"
@@ -902,14 +902,14 @@ msgstr "update_source тўпламидан пакетларни янгилаб �
 #~ msgstr "Улаш нуқталари фақат сон ёки ҳарфлардан иборат бўлиши мумкин"
 
 #, fuzzy
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Mandriva Online'га марҳамат"
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Mageia Online'га марҳамат"
 
 #~ msgid "Connection problem"
 #~ msgstr "Алоқа ўрнатишда муаммо"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Mandriva Online ҳисобини яратиш"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Mageia Online ҳисобини яратиш"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -947,8 +947,8 @@ msgstr "update_source тўпламидан пакетларни янгилаб �
 #~ msgid "Problem uploading configuration"
 #~ msgstr "Мосламалар жўнатилмоқда..."
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- Mandriva Update хизматини ишга тушириш.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- Mageia Update хизматини ишга тушириш.\n"
 
 #~ msgid "Login:"
 #~ msgstr "Фойдаланувчи:"
@@ -990,9 +990,9 @@ msgstr "update_source тўпламидан пакетларни янгилаб �
 #~ msgstr "Ёрдамчидан чиқилмоқда\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
+#~ "Mageia Online could not be contacted, please try again at a later time"
 #~ msgstr ""
-#~ "Mandriva Online билан алоқа ўрнатиб бўлмади. Илтимос кейинроқ уриниб "
+#~ "Mageia Online билан алоқа ўрнатиб бўлмади. Илтимос кейинроқ уриниб "
 #~ "кўринг"
 
 #~ msgid "  --update       - Update keys\n"
diff --git a/po/vi.po b/po/vi.po
index 52df50da..15b23062 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline 0.15\n"
+"Project-Id-Version: mgaonline 0.15\n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2005-02-12 19:53+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
@@ -29,10 +29,10 @@ msgstr "Hệ thống của bạn đã cập nhật"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Trục trặc về cấu hình dịch vụ. Hãy xem log và gửi email tới "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -46,7 +46,7 @@ msgstr "Có cập nhật mới cho hệ thống của bạn"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -152,7 +152,7 @@ msgstr "Chạy drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -162,7 +162,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -210,7 +210,7 @@ msgstr "Bỏ qua"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -221,8 +221,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia Linux"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:526
 #, c-format
@@ -284,8 +284,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Chạy MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Chạy MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -304,17 +304,17 @@ msgstr "Kiểm tra mạng: có lẽ chưa bật chạy\n"
 
 #: ../mdkapplet:893
 #, fuzzy, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online"
+msgid "Mageia Online %s"
+msgstr "Mageia Online"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
 msgstr ""
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
 
 #: ../mdkapplet:899
@@ -383,7 +383,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -416,7 +416,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr "Lỗi xảy ra"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -510,15 +510,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -567,33 +567,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online"
+msgid "Mageia Flash"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online"
+msgid "Mageia Free"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online"
+msgid "Mageia Mini"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online"
+msgid "Mageia One"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -611,14 +611,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "phiên bản mdkupdate %s\n"
-"Bản quyền (C) %s Mandriva.\n"
+"Bản quyền (C) %s Mageia.\n"
 "Đây là phần mềm tự do và có thể phân phối lại dưới các điều khoản của GNU/"
 "GPL.\n"
 "\n"
@@ -631,8 +631,8 @@ msgstr "  --help\t\t- in ra thông điệp trợ giúp này.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- Tự động chạy Mandriva Update.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- Tự động chạy Mageia Update.\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -641,8 +641,8 @@ msgstr "  --mnf\t\t\t- chạy mnf specific scripts.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- phiên bản text mode của Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- phiên bản text mode của Mageia Update.\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -656,7 +656,7 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online"
+#~ msgstr "Mageia Online"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -691,8 +691,8 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgid "No"
 #~ msgstr "Không"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
-#~ msgstr "Mandriva Online có vẻ được cài đặt lại, đang nạp lại applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
+#~ msgstr "Mageia Online có vẻ được cài đặt lại, đang nạp lại applet ...."
 
 #~ msgid "Checking... Updates are available\n"
 #~ msgstr "Kiểm tra... Đang có bản cập nhật mới\n"
@@ -704,8 +704,8 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgid "Connecting to"
 #~ msgstr "Kết nối tới"
 
-#~ msgid "Mandriva Linux Updates Applet"
-#~ msgstr "Applet Cập Nhật Mandriva Linux"
+#~ msgid "Mageia Linux Updates Applet"
+#~ msgstr "Applet Cập Nhật Mageia Linux"
 
 #, fuzzy
 #~ msgid "Security error"
@@ -831,8 +831,8 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgid "Unknown state"
 #~ msgstr "Trạng thái không xác định"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
-#~ msgstr "Dịch vụ trực tuyến bị tắt. Hãy liên lạc với Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
+#~ msgstr "Dịch vụ trực tuyến bị tắt. Hãy liên lạc với Mageia Online site\n"
 
 #~ msgid "Wrong Password.\n"
 #~ msgstr "Sai mật khẩu.\n"
@@ -852,8 +852,8 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ "support team"
 #~ msgstr "Có trục trặc khi kết nỗi tới máy chủ, hãy liên lạc với nhóm hỗ trợ"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Trả lời từ máy chủ Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Trả lời từ máy chủ Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Không kiểm tra"
@@ -869,14 +869,14 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "phiên bản mdonline %s\n"
-#~ "Bản quyền (C) %s Mandriva.\n"
+#~ "Bản quyền (C) %s Mageia.\n"
 #~ "Đây là phần mềm tự do và có thể phân phối lại dưới các điều khoản của GNU/"
 #~ "GPL.\n"
 #~ "\n"
@@ -909,7 +909,7 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgid "Account creation or authentication"
 #~ msgstr "Việc tạo tài khoản hay chứng thực"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr "Hãy điền tên đăng nhập MandraleOnline, mật khẩu và tên máy:"
 
 #, fuzzy
@@ -926,14 +926,14 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgid "Machine name must be 1 to 40 alphanumerical characters"
 #~ msgstr "Các điểm gắn kết chỉ nên dùng các ký tự chữ và số"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Đang kết nối đến Mandriva Online website..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Đang kết nối đến Mageia Online website..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -948,10 +948,10 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Để nhận lợi ích từ các dịch vụ Mandriva Online,\n"
+#~ "Để nhận lợi ích từ các dịch vụ Mageia Online,\n"
 #~ "chúng tôi sẽ tải lên cấu hình bạn có.\n"
 #~ "\n"
-#~ "Bây giờ, đồ thuật sẽ gửi những thông tin sau tới Mandriva:\n"
+#~ "Bây giờ, đồ thuật sẽ gửi những thông tin sau tới Mageia:\n"
 #~ "\n"
 #~ "1) danh sách các gói đã được cài đặt lên hệ thống,\n"
 #~ "\n"
@@ -972,8 +972,8 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgid "Problem occurs when uploading files, please try again"
 #~ msgstr "Trục trặc khi tải lên các tập tin, hãy thực hiện lại"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Tạo tài khoản Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Tạo tài khoản Mageia Online"
 
 #, fuzzy
 #~ msgid "Greeting:"
@@ -1004,10 +1004,10 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgstr "Địa chỉ thư không hợp lệ!\n"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
-#~ "Đã tạo được tài khoản Mandriva Online.\n"
+#~ "Đã tạo được tài khoản Mageia Online.\n"
 #~ "Hãy nhấn \"Tiếp theo\" để chứng thực và tải lên cấu hình của bạn\n"
 
 #~ msgid "Your upload was successful!"
@@ -1015,21 +1015,21 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "Từ bây giờ, bạn sẽ nhận được các thông\n"
-#~ "báo về cập nhật bảo mật thông qua Mandriva Online."
+#~ "báo về cập nhật bảo mật thông qua Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online cung cấp khả năng tự động cập nhật.\n"
+#~ "Mageia Online cung cấp khả năng tự động cập nhật.\n"
 #~ "Một chương trình sẽ chạy thường quy trong hệ thống để đợi các cập nhật "
 #~ "mới\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Cấu hình thành công tài khoản Mandriva Online của bạn\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Cấu hình thành công tài khoản Mageia Online của bạn\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "Hoàn thành việc tải lên cấu hình"
@@ -1038,14 +1038,14 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgstr "Lỗi tải lên cấu hình"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "Không thể kết nối đến mandrivaonline website: sai đăng nhập/mật khẩu hoặc "
 #~ "thiết lập sai router/firewall"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
-#~ msgstr "  --applet\t\t- chạy Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
+#~ msgstr "  --applet\t\t- chạy Mageia Update.\n"
 
 #~ msgid "Choose which packages should be installed and Press Ok"
 #~ msgstr "Chọn các gói cần cài đặt và nhấn Ok"
@@ -1059,8 +1059,8 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Không thấy tập tin %s. Hãy chạy đồ thuật mdkonline trước"
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
-#~ msgstr "Mandriva Update không thể liên lạc với site, hãy thử lại sau."
+#~ msgid "Mageia Update could not contact the site, we will try again."
+#~ msgstr "Mageia Update không thể liên lạc với site, hãy thử lại sau."
 
 #~ msgid "Login:"
 #~ msgstr "Đăng nhập:"
@@ -1074,16 +1074,16 @@ msgstr "Không thể cập nhật các gói từ phương tiện update_source.\
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Tên đăng nhập hoặc mật khẩu của bạn không đúng.\n"
-#~ "Hoặc là bạn phải nhập lại, hoặc bạn cần tạo một tài khoản cho Mandriva "
+#~ "Hoặc là bạn phải nhập lại, hoặc bạn cần tạo một tài khoản cho Mageia "
 #~ "Linux Online.\n"
-#~ " Trong trường hợp sau, hãy quay về bước đầu tiên để kết nối tới Mandriva "
+#~ " Trong trường hợp sau, hãy quay về bước đầu tiên để kết nối tới Mageia "
 #~ "Linux Online.\n"
 #~ " Cần biết là bạn cũng phải cung cấp tên máy tính \n"
 #~ " (chỉ chấp nhận các ký tự trong bảng chữ cái)"
diff --git a/po/wa.po b/po/wa.po
index 49ed5e0a..6a79ecb8 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline\n"
+"Project-Id-Version: mgaonline\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2004-08-11 20:48+0200\n"
@@ -32,10 +32,10 @@ msgstr "Li sistinme da vosse est a djoû"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
 "Åk n' a nén stî tot-z apontiant l' siervice. Loukîz les djournås eyet emilez "
-"po dire li problinme a support@mandrivaonline.com"
+"po dire li problinme a support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -49,7 +49,7 @@ msgstr "I gn des noveas metaedjes a djoû po vosse sistinme"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
+msgid "A new version of Mageia Linux distribution has been released"
 msgstr ""
 
 #: ../mdkapplet:119 ../mdkapplet:161
@@ -158,7 +158,7 @@ msgstr "Enondant drakconnect\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
+msgid "New version of Mageia Linux distribution"
 msgstr ""
 
 #: ../mdkapplet:464
@@ -168,7 +168,7 @@ msgstr ""
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
+msgid "A new version of Mageia Linux distribution has been released."
 msgstr ""
 
 #: ../mdkapplet:475 ../mdkapplet:572
@@ -216,7 +216,7 @@ msgstr "Rinoncî"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
 msgstr ""
 
@@ -227,8 +227,8 @@ msgstr ""
 
 #: ../mdkapplet:520
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:526
 #, c-format
@@ -290,8 +290,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "Enondant «MandrivaUpdate»\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "Enondant «MageiaUpdate»\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -310,20 +310,20 @@ msgstr "Verifiaedje del rantoele: i shonnreut k' ele ni soeye nén en alaedje\n
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s pa Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright © %s pa %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
+msgid "Mageia Online gives access to Mageia web services."
 msgstr ""
-"Mandriva Online (Mandriva so les fyis) vos dene accès åzès siervices waibe "
-"da Mandriva."
+"Mageia Online (Mageia so les fyis) vos dene accès åzès siervices waibe "
+"da Mageia."
 
 #: ../mdkapplet:899
 #, c-format
@@ -391,7 +391,7 @@ msgstr ""
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
@@ -424,7 +424,7 @@ msgstr ""
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
 
@@ -457,7 +457,7 @@ msgstr "Dj' aroke so ene sacwè"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
+msgid "Your Mageia account does not have %s download subscription enabled."
 msgstr ""
 
 #: ../mdkapplet-add-media-helper:226
@@ -518,15 +518,15 @@ msgstr ""
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
 
 #: ../mdkapplet_gui.pm:94
 #, fuzzy, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Online %s"
+msgid "Mageia Linux Features"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -575,33 +575,33 @@ msgstr ""
 
 #: ../mdkonline.pm:177
 #, fuzzy, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Online %s"
+msgid "Mageia Flash"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, fuzzy, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Online %s"
+msgid "Mageia Free"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:179
 #, fuzzy, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Online %s"
+msgid "Mageia Mini"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:180
 #, fuzzy, c-format
-msgid "Mandriva One"
-msgstr "Mandriva Online %s"
+msgid "Mageia One"
+msgstr "Mageia Online %s"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, fuzzy, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva Online"
+msgid "Mageia PowerPack"
+msgstr "Mageia Online"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
 msgstr ""
 
@@ -619,14 +619,14 @@ msgstr ""
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate modêye %s\n"
-"Copyright © %s Mandriva.\n"
+"Copyright © %s Mageia.\n"
 "Çouchal est on libe programe et pout esse cossemé dzo les termes del licince "
 "GPL.\n"
 "\n"
@@ -639,7 +639,7 @@ msgstr " --help           - mostere ci messaedje d' aidance chal.\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
 msgstr " --auto           - enonder les metaedjes a djoû otomaticmint.\n"
 
 #: ../mdkupdate:66
@@ -649,7 +649,7 @@ msgstr " --mnf            - enonder les scripes especifikes mnf.\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
 msgstr " --noX            - enonder l' modêye e môde tecse.\n"
 
 #: ../mdkupdate:68
@@ -665,7 +665,7 @@ msgstr ""
 
 #, fuzzy
 #~ msgid "Mandiva Free"
-#~ msgstr "Mandriva Online %s"
+#~ msgstr "Mageia Online %s"
 
 #, fuzzy
 #~ msgid "Get Powerpack subscription!"
@@ -703,9 +703,9 @@ msgstr ""
 #~ msgid "No"
 #~ msgstr "Neni"
 
-#~ msgid "Mandriva Online seems to be reinstalled, reloading applet ...."
+#~ msgid "Mageia Online seems to be reinstalled, reloading applet ...."
 #~ msgstr ""
-#~ "I shonnreut k' Mandriva Online åye sitî rastalé, dji rtchedje "
+#~ "I shonnreut k' Mageia Online åye sitî rastalé, dji rtchedje "
 #~ "l' aplikete..."
 
 #~ msgid "Checking... Updates are available\n"
@@ -720,7 +720,7 @@ msgstr ""
 #~ msgid "Connecting to"
 #~ msgstr "Dji m' raloyaedje a"
 
-#~ msgid "Mandriva Linux Updates Applet"
+#~ msgid "Mageia Linux Updates Applet"
 #~ msgstr "Aplikete di metaedjes a djoû"
 
 #~ msgid "Security error"
@@ -778,33 +778,33 @@ msgstr ""
 #~ msgstr "Åk n' a nén stî avou l' siervice"
 
 #~ msgid ""
-#~ "Mandriva web services are currently unavailable\n"
+#~ "Mageia web services are currently unavailable\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Les siervices waibe di Mandriva èn sont nén disponibes pol moumint\n"
+#~ "Les siervices waibe di Mageia èn sont nén disponibes pol moumint\n"
 #~ "Rissayîz pus tård s' i vs plait"
 
 #~ msgid "Password mismatch"
 #~ msgstr "Les screts n' corespondèt nén"
 
 #~ msgid ""
-#~ "Mandriva web services are under maintenance\n"
+#~ "Mageia web services are under maintenance\n"
 #~ "Please Try again Later"
 #~ msgstr ""
-#~ "Les siervices waibe di Mandriva sont-st e mintnance\n"
+#~ "Les siervices waibe di Mageia sont-st e mintnance\n"
 #~ "Rissayîz pus tård s' i vs plait"
 
 #~ msgid "User Forbidden"
 #~ msgstr "Uzeu interdit"
 
-#~ msgid "User account forbidden by Mandriva web services"
-#~ msgstr "Ci conte uzeu la est interdit pås siervices waibe di Mandriva"
+#~ msgid "User account forbidden by Mageia web services"
+#~ msgstr "Ci conte uzeu la est interdit pås siervices waibe di Mageia"
 
 #~ msgid "Connection error"
 #~ msgstr "Åk n' a nén stî avou l' raloyaedje"
 
-#~ msgid "Mandriva web services not reachable"
-#~ msgstr "Les siervices waibe di Mandriva èn sont nén djondåves"
+#~ msgid "Mageia web services not reachable"
+#~ msgstr "Les siervices waibe di Mageia èn sont nén djondåves"
 
 #~ msgid ""
 #~ "  --bundle file.bundle\t- parse and install package from .bundle metainfo "
@@ -836,12 +836,12 @@ msgstr ""
 #~ "%s"
 
 #~ msgid ""
-#~ "The version of the Mandriva Online client is too old.\n"
+#~ "The version of the Mageia Online client is too old.\n"
 #~ "\n"
 #~ "You need to update to a newer version. You can get a new one from http://"
 #~ "start.mandriva.com"
 #~ msgstr ""
-#~ "Li modêye di Mandriva so les fyis est pår trop viye.\n"
+#~ "Li modêye di Mageia so les fyis est pår trop viye.\n"
 #~ "\n"
 #~ "Vos dvoz mete a djoû viè ene nouve modêye. Vos ndè ploz prinde ene so "
 #~ "http://start.mandriva.com"
@@ -906,9 +906,9 @@ msgstr ""
 #~ msgid "Unknown state"
 #~ msgstr "Estat nén cnoxhou"
 
-#~ msgid "Online services disabled. Contact Mandriva Online site\n"
+#~ msgid "Online services disabled. Contact Mageia Online site\n"
 #~ msgstr ""
-#~ "Les siervices so les fyis sont essoctés. Contactez li site Mandriva "
+#~ "Les siervices so les fyis sont essoctés. Contactez li site Mageia "
 #~ "Online\n"
 
 #~ msgid "Wrong Password.\n"
@@ -931,8 +931,8 @@ msgstr ""
 #~ "Åk n' a nén stî tot s' raloyant å sierveu, atôtchîz l' ekipe di sopoirt "
 #~ "s' i vs plait"
 
-#~ msgid "Response from Mandriva Online server\n"
-#~ msgstr "Response do sierveu Mandriva Online\n"
+#~ msgid "Response from Mageia Online server\n"
+#~ msgstr "Response do sierveu Mageia Online\n"
 
 #~ msgid "No check"
 #~ msgstr "Pont d' verifiaedje"
@@ -948,14 +948,14 @@ msgstr ""
 
 #~ msgid ""
 #~ "mdonline version %s\n"
-#~ "Copyright (C) %s Mandriva.\n"
+#~ "Copyright (C) %s Mageia.\n"
 #~ "This is free software and may be redistributed under the terms of the GNU "
 #~ "GPL.\n"
 #~ "\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "mdonline modêye %s\n"
-#~ "Copyright © %s Mandriva.\n"
+#~ "Copyright © %s Mageia.\n"
 #~ "Çouchal est on libe programe et pout esse cossemé dzo les termes del "
 #~ "licince GPL.\n"
 #~ "\n"
@@ -1011,9 +1011,9 @@ msgstr ""
 #~ msgid "Account creation or authentication"
 #~ msgstr "Ahivaedje d' on conte, ou otintifiaedje"
 
-#~ msgid "Enter your Mandriva Online login, password and machine name:"
+#~ msgid "Enter your Mageia Online login, password and machine name:"
 #~ msgstr ""
-#~ "Dinez vosse no d' elodjaedje, no d' éndjole eyet scret po Mandriva Online:"
+#~ "Dinez vosse no d' elodjaedje, no d' éndjole eyet scret po Mageia Online:"
 
 #~ msgid "Email address:"
 #~ msgstr "Emile:"
@@ -1031,14 +1031,14 @@ msgstr ""
 #~ msgstr ""
 #~ "Li no d' l' éndjole doet esse d' inte 1 a 40 caracteres alfanumerikes"
 
-#~ msgid "Connecting to Mandriva Online website..."
-#~ msgstr "Raloyaedje sol waibe Mandriva Online..."
+#~ msgid "Connecting to Mageia Online website..."
+#~ msgstr "Raloyaedje sol waibe Mageia Online..."
 
 #~ msgid ""
-#~ "In order to benefit from Mandriva Online services,\n"
+#~ "In order to benefit from Mageia Online services,\n"
 #~ "we are about to upload your configuration.\n"
 #~ "\n"
-#~ "The Wizard will now send the following information to Mandriva:\n"
+#~ "The Wizard will now send the following information to Mageia:\n"
 #~ "\n"
 #~ "1) the list of packages you have installed on your system,\n"
 #~ "\n"
@@ -1053,11 +1053,11 @@ msgstr ""
 #~ "Furthermore, you benefit from discounted paid support services on\n"
 #~ "www.mandrivaexpert.com."
 #~ msgstr ""
-#~ "Po profiter des siervices di Mandriva Linux so fyis (Mandriva Online),\n"
+#~ "Po profiter des siervices di Mageia Linux so fyis (Mageia Online),\n"
 #~ "i fåt evoyî les informåcions åd fwait di l' apontiaedje di voste "
 #~ "éndjole.\n"
 #~ "\n"
-#~ "Li macrea evoyrè asteure les informåcions shuvantes a Mandriva:\n"
+#~ "Li macrea evoyrè asteure les informåcions shuvantes a Mageia:\n"
 #~ "\n"
 #~ "1) li djivêye des pacaedjes k' ont stî astalés sol sistinme,\n"
 #~ "\n"
@@ -1078,8 +1078,8 @@ msgstr ""
 #~ msgstr ""
 #~ "Åk n' a nén stî tot-z eberwetant les fitchîs, rissayîz s' i vs plait"
 
-#~ msgid "Create a Mandriva Online Account"
-#~ msgstr "Ahiver on conte Mandriva Online"
+#~ msgid "Create a Mageia Online Account"
+#~ msgstr "Ahiver on conte Mageia Online"
 
 #~ msgid "Greeting:"
 #~ msgstr "Salutaedje:"
@@ -1110,7 +1110,7 @@ msgstr ""
 #~ msgstr "L' ahivaedje do conte a fwait berwete!"
 
 #~ msgid ""
-#~ "Mandriva Online Account successfully created.\n"
+#~ "Mageia Online Account successfully created.\n"
 #~ "Please click \"Next\" to authenticate and upload your configuration\n"
 #~ msgstr ""
 #~ "Li conte mandrivaonline a stî ahivé comifåt.\n"
@@ -1121,22 +1121,22 @@ msgstr ""
 
 #~ msgid ""
 #~ "From now you will receive on security and updates \n"
-#~ "announcements thanks to Mandriva Online."
+#~ "announcements thanks to Mageia Online."
 #~ msgstr ""
 #~ "A pårti d' asteure vos rçuroz les anonces di såvrité\n"
-#~ "et di metaedjes a djoû viè Mandriva Online."
+#~ "et di metaedjes a djoû viè Mageia Online."
 
 #~ msgid ""
-#~ "Mandriva Online offers you the ability to automate the updates.\n"
+#~ "Mageia Online offers you the ability to automate the updates.\n"
 #~ "A program will run regulary in your system waiting for new updates\n"
 #~ msgstr ""
-#~ "Mandriva Online vos ofere li possibilité di fé des metaedjes a djoû "
+#~ "Mageia Online vos ofere li possibilité di fé des metaedjes a djoû "
 #~ "otomatikes.\n"
 #~ "On programe srè enondé regulirmint so vosse sistinme po cweri après des "
 #~ "noveas metaedjes a djoû\n"
 
-#~ msgid "Your Mandriva Online account has been successfully configured\n"
-#~ msgstr "Vosse conte Mandriva Online a stî apontyî comifåt\n"
+#~ msgid "Your Mageia Online account has been successfully configured\n"
+#~ msgstr "Vosse conte Mageia Online a stî apontyî comifåt\n"
 
 #~ msgid "Configuration uploaded successfully"
 #~ msgstr "L' apontiaedje a stî metou a djoû comifåt"
@@ -1145,16 +1145,16 @@ msgstr ""
 #~ msgstr "Åk n' a nén stî tot-z eberwetant vost apontiaedje"
 
 #~ msgid ""
-#~ "Cannot connect to Mandriva Online website: wrong login/password or router/"
+#~ "Cannot connect to Mageia Online website: wrong login/password or router/"
 #~ "firewall bad settings"
 #~ msgstr ""
 #~ "Dji n' mi sai raloyî al waibe mandrivaonline: li no d' elodjaedje ou "
 #~ "l' sicret sont måvas, oudonbén i gn a des mwais apontiaedjes pol routeu/"
 #~ "côpe-feu"
 
-#~ msgid "  --applet\t\t- launch Mandriva Update.\n"
+#~ msgid "  --applet\t\t- launch Mageia Update.\n"
 #~ msgstr ""
-#~ " --applet         - enonder les metaedjes a djoû di Mandriva Linux.\n"
+#~ " --applet         - enonder les metaedjes a djoû di Mageia Linux.\n"
 
 #~ msgid "Cannot get list of updates: %s"
 #~ msgstr "Dji n' a nén savou aveur li djivêye des metaedjes a djoû: %s"
@@ -1176,7 +1176,7 @@ msgstr ""
 #~ msgid "No %s file found. Run mdkonline wizard first"
 #~ msgstr "Nou fitchî %s di trové. Enondez d' aprume li macrea mdkonline."
 
-#~ msgid "Mandriva Update could not contact the site, we will try again."
+#~ msgid "Mageia Update could not contact the site, we will try again."
 #~ msgstr "Dji n' a polou m' raloyî sol waibe, on rsayrè on pô pus tård."
 
 #~ msgid "Login:"
@@ -1191,15 +1191,15 @@ msgstr ""
 #~ msgid ""
 #~ "Your login or password was wrong.\n"
 #~ " Either you'll have to type it again, or you'll need to create an account "
-#~ "on Mandriva Online.\n"
-#~ " In the latter case, go back to the first step to connect to Mandriva "
+#~ "on Mageia Online.\n"
+#~ " In the latter case, go back to the first step to connect to Mageia "
 #~ "Online.\n"
 #~ " Be aware that you must also provide a Machine name \n"
 #~ " (only alphabetical characters are admitted)"
 #~ msgstr ""
 #~ "Vos avoz dné on måva no d' elodjaedje ou on måva scret.\n"
-#~ "I vos les fåt rtaper, oudonbén i vos fåt fé on conte so Mandriva Online.\n"
-#~ "Po ç' dierin cas, potchîz al prumire etape po s' raloyî a Mandriva "
+#~ "I vos les fåt rtaper, oudonbén i vos fåt fé on conte so Mageia Online.\n"
+#~ "Po ç' dierin cas, potchîz al prumire etape po s' raloyî a Mageia "
 #~ "Online.\n"
 #~ "Vos dvroz ossu dner on no d' éndjole (seulmint des letes sins accints)"
 
@@ -1237,20 +1237,20 @@ msgstr ""
 #~ "Dji n' a nén savou mete a djoû les pacaedjes foû do sopoirt mdkupdate.\n"
 
 #~ msgid ""
-#~ "Mandriva Update could not upload the diff files. Send a mail to support "
+#~ "Mageia Update could not upload the diff files. Send a mail to support "
 #~ "[at] mandrivaonline [dot] net"
 #~ msgstr ""
-#~ "Mandriva Update èn pola nén eberweter les fitchîs diff. Evoyîs èn emila "
+#~ "Mageia Update èn pola nén eberweter les fitchîs diff. Evoyîs èn emila "
 #~ "a: support[at]mandrivaonline[pont]net"
 
 #~ msgid "Previous"
 #~ msgstr "Di dvant"
 
-#~ msgid "I don't have a Mandriva Online account and I want to subscribe"
-#~ msgstr "Dji n' a nén d' conte Mandriva Online et dji vôreu m' eredjîstrer"
+#~ msgid "I don't have a Mageia Online account and I want to subscribe"
+#~ msgstr "Dji n' a nén d' conte Mageia Online et dji vôreu m' eredjîstrer"
 
-#~ msgid "Mandriva Linux Privacy Policy"
-#~ msgstr "Politike sol privaceye di Mandriva Linux"
+#~ msgid "Mageia Linux Privacy Policy"
+#~ msgstr "Politike sol privaceye di Mageia Linux"
 
 #~ msgid "Authentification"
 #~ msgstr "Otintifiaedje"
@@ -1268,9 +1268,9 @@ msgstr ""
 #~ msgstr "Cwitant l' macrea\n"
 
 #~ msgid ""
-#~ "Mandriva Online could not be contacted, please try again at a later time"
+#~ "Mageia Online could not be contacted, please try again at a later time"
 #~ msgstr ""
-#~ "Dji n' a polou m' raloyî a Mandriva Online, rissayîz on pô pus tård s' i "
+#~ "Dji n' a polou m' raloyî a Mageia Online, rissayîz on pô pus tård s' i "
 #~ "vs plait."
 
 #~ msgid "  --update       - Update keys\n"
@@ -1292,8 +1292,8 @@ msgstr ""
 #~ msgid "Service deactivated. Waiting for payment..."
 #~ msgstr "Siervice dismetou tot ratindant l' paymint..."
 
-#~ msgid "Launch Mandriva Linux Update"
-#~ msgstr "Enonder les metaedjes a djoû di Mandriva Linux"
+#~ msgid "Launch Mageia Linux Update"
+#~ msgstr "Enonder les metaedjes a djoû di Mageia Linux"
 
 #~ msgid "Available"
 #~ msgstr "Disponibe"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 336e23ff..bb5a48ec 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2008-03-29 21:34+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
-"Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Mageia Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,8 +31,8 @@ msgstr "您的系统已为最新"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
-msgstr "服务配置问题。请检查日志并发送邮件到 support@mandrivaonline.com"
+"support@mageiaonline.com"
+msgstr "服务配置问题。请检查日志并发送邮件到 support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -46,8 +46,8 @@ msgstr "您的系统现有可用的更新"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mandriva Linux 发行版已经发布了新版本"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mageia Linux 发行版已经发布了新版本"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -148,12 +148,12 @@ msgstr ""
 #: ../mdkapplet:446
 #, c-format
 msgid "Launching drakconnect\n"
-msgstr "调用 Mandriva 网络中心\n"
+msgstr "调用 Mageia 网络中心\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "新版本的 Mandriva Linux 发行版"
+msgid "New version of Mageia Linux distribution"
+msgstr "新版本的 Mageia Linux 发行版"
 
 #: ../mdkapplet:464
 #, c-format
@@ -162,8 +162,8 @@ msgstr "浏览"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mandriva Linux 发行版已经发布了新版本。"
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mageia Linux 发行版已经发布了新版本。"
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -210,9 +210,9 @@ msgstr "取消"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
-msgstr "此版本的 Mandriva Linux 维护已经结束。此系统不会发放任何更新。"
+msgstr "此版本的 Mageia Linux 维护已经结束。此系统不会发放任何更新。"
 
 #: ../mdkapplet:514
 #, c-format
@@ -221,8 +221,8 @@ msgstr "为了保持您的系统安全，您可以:"
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -284,8 +284,8 @@ msgstr "如果可能的话，您应该将您的笔记本转为用电源供电，
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "调用 MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "调用 MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -304,18 +304,18 @@ msgstr "检查网络：似乎已禁用\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "版权 (C) %s Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "版权 (C) %s %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online 可让您访问 Mandriva 的 Web 服务。"
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online 可让您访问 Mageia 的 Web 服务。"
 
 #: ../mdkapplet:899
 #, c-format
@@ -383,8 +383,8 @@ msgstr "您是否想要安装这一额外的软件仓库?"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva 企业服务器"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia 企业服务器"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -416,10 +416,10 @@ msgstr "获取发行版列失败:"
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva 为桌面提供了十二个月的更新(直至 %s)，为基本系统提供了十八个月的更新"
+"Mageia 为桌面提供了十二个月的更新(直至 %s)，为基本系统提供了十八个月的更新"
 "(直至 %s)。"
 
 #: ../mdkapplet-add-media-helper:167
@@ -451,8 +451,8 @@ msgstr "发生了错误"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "您的 Mandriva 账户没有启用 %s 下载订阅服务。"
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "您的 Mageia 账户没有启用 %s 下载订阅服务。"
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -512,17 +512,17 @@ msgstr "企业"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack 为您提供了绝佳的 Linux 桌面体验：既有开放源代码解决方案的"
-"稳定和高效，又有丰富软件和 Mandriva 的官方支持。"
+"Mageia Powerpack 为您提供了绝佳的 Linux 桌面体验：既有开放源代码解决方案的"
+"稳定和高效，又有丰富软件和 Mageia 的官方支持。"
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux 特性"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux 特性"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -571,35 +571,35 @@ msgstr "%s 现已发布，您可以升级到："
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
-msgstr "Mandriva Linux 发行版为您提供了更多软件和官方支持。"
+msgstr "Mageia Linux 发行版为您提供了更多软件和官方支持。"
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -615,14 +615,14 @@ msgstr "发行版升级"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate 版本 %s\n"
-"版权所有 (C) %s Mandriva。\n"
+"版权所有 (C) %s Mageia。\n"
 "这是自由软件, 它能在 GNU GPL 条款下再次发行。\n"
 "\n"
 "用法:\n"
@@ -634,8 +634,8 @@ msgstr "  --help\t\t- 打印本帮助信息。\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- 自动调用 Mandriva Update。\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- 自动调用 Mageia Update。\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -644,8 +644,8 @@ msgstr "  --mnf\t\t\t- 调用 mnf 指定的脚本。\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- Mandriva 更新的文本模式版本。\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- Mageia 更新的文本模式版本。\n"
 
 #: ../mdkupdate:68
 #, c-format
@@ -663,6 +663,6 @@ msgstr "无法从 update_source 介质更新软件包。\n"
 #~ msgstr "在您在线订阅之后，请填入您的账户 ID，以便添加额外的软件包介质"
 
 #~ msgid ""
-#~ "Your Mandriva account does not have Extended Maintenance subscription "
+#~ "Your Mageia account does not have Extended Maintenance subscription "
 #~ "enabled."
-#~ msgstr "您的 Mandriva 账户没有启用延保服务。"
+#~ msgstr "您的 Mageia 账户没有启用延保服务。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 096619b7..90158585 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mdkonline-zh_TW\n"
+"Project-Id-Version: mgaonline-zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-06-07 16:23-0300\n"
 "PO-Revision-Date: 2008-11-25 14:53+0800\n"
@@ -37,9 +37,9 @@ msgstr "您的系統處於最新的狀態"
 #, c-format
 msgid ""
 "Service configuration problem. Please check logs and send mail to "
-"support@mandrivaonline.com"
+"support@mageiaonline.com"
 msgstr ""
-"服務設定發生問題，請檢查錯誤紀錄並寄封電子郵件至 support@mandrivaonline.com"
+"服務設定發生問題，請檢查錯誤紀錄並寄封電子郵件至 support@mageiaonline.com"
 
 #: ../mdkapplet:90
 #, c-format
@@ -53,8 +53,8 @@ msgstr "有適用於您系統的更新"
 
 #: ../mdkapplet:101
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released"
-msgstr "Mandriva Linux 的新版本已經釋出了"
+msgid "A new version of Mageia Linux distribution has been released"
+msgstr "Mageia Linux 的新版本已經釋出了"
 
 #: ../mdkapplet:119 ../mdkapplet:161
 #, c-format
@@ -158,8 +158,8 @@ msgstr "啟動 drakconnect 連線程式\n"
 
 #: ../mdkapplet:459 ../mdkapplet:632
 #, c-format
-msgid "New version of Mandriva Linux distribution"
-msgstr "Mandriva Linux 有新版本"
+msgid "New version of Mageia Linux distribution"
+msgstr "Mageia Linux 有新版本"
 
 #: ../mdkapplet:464
 #, c-format
@@ -168,8 +168,8 @@ msgstr "瀏覽"
 
 #: ../mdkapplet:473
 #, c-format
-msgid "A new version of Mandriva Linux distribution has been released."
-msgstr "Mandriva Linux 的新版本已經釋出了。"
+msgid "A new version of Mageia Linux distribution has been released."
+msgstr "Mageia Linux 的新版本已經釋出了。"
 
 #: ../mdkapplet:475 ../mdkapplet:572
 #, c-format
@@ -216,9 +216,9 @@ msgstr "取消"
 #: ../mdkapplet:508
 #, c-format
 msgid ""
-"Maintenance for this Mandriva Linux version has ended. No more updates will "
+"Maintenance for this Mageia Linux version has ended. No more updates will "
 "be delivered for this system."
-msgstr "這個 Mandriva Linux 版本的維護已經結束了。不會有更新再提供給這個系統。"
+msgstr "這個 Mageia Linux 版本的維護已經結束了。不會有更新再提供給這個系統。"
 
 #: ../mdkapplet:514
 #, c-format
@@ -227,8 +227,8 @@ msgstr "為了保持您系統的安全，您可以："
 
 #: ../mdkapplet:520
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia Linux"
+msgstr "Mageia Linux"
 
 #: ../mdkapplet:526
 #, c-format
@@ -293,8 +293,8 @@ msgstr ""
 
 #: ../mdkapplet:687
 #, c-format
-msgid "Launching MandrivaUpdate\n"
-msgstr "啟動 MandrivaUpdate\n"
+msgid "Launching MageiaUpdate\n"
+msgstr "啟動 MageiaUpdate\n"
 
 #: ../mdkapplet:719
 #, c-format
@@ -313,18 +313,18 @@ msgstr "檢查網路狀態中：似乎已停用\n"
 
 #: ../mdkapplet:893
 #, c-format
-msgid "Mandriva Online %s"
-msgstr "Mandriva Online %s"
+msgid "Mageia Online %s"
+msgstr "Mageia Online %s"
 
 #: ../mdkapplet:894
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by %s"
+msgstr "Copyright (C) %s by %s"
 
 #: ../mdkapplet:897
 #, c-format
-msgid "Mandriva Online gives access to Mandriva web services."
-msgstr "Mandriva Online 將引導您連結到 Mandriva 網頁服務。"
+msgid "Mageia Online gives access to Mageia web services."
+msgstr "Mageia Online 將引導您連結到 Mageia 網頁服務。"
 
 #: ../mdkapplet:899
 #, c-format
@@ -394,8 +394,8 @@ msgstr "您要安裝此額外的套件庫嗎？"
 
 #: ../mdkapplet:1061 ../mdkonline.pm:182
 #, c-format
-msgid "Mandriva Enterprise Server"
-msgstr "Mandriva Enterprise Server"
+msgid "Mageia Enterprise Server"
+msgstr "Mageia Enterprise Server"
 
 #: ../mdkapplet-add-media-helper:84 ../mdkapplet-config:43
 #, c-format
@@ -427,10 +427,10 @@ msgstr "取得發行版本清單時失敗："
 #: ../mdkapplet-add-media-helper:161
 #, c-format
 msgid ""
-"Mandriva provides 12 months of desktop updates (until %s) and 18 months of "
+"Mageia provides 12 months of desktop updates (until %s) and 18 months of "
 "base updates (up to the %s) for distributions."
 msgstr ""
-"Mandriva 提供發行版本 12 個月的桌面更新 (直到 %s) 與 18 個月的基礎更新 (直到 "
+"Mageia 提供發行版本 12 個月的桌面更新 (直到 %s) 與 18 個月的基礎更新 (直到 "
 "%s)。"
 
 #: ../mdkapplet-add-media-helper:167
@@ -462,8 +462,8 @@ msgstr "發生一個錯誤"
 
 #: ../mdkapplet-add-media-helper:200
 #, c-format
-msgid "Your Mandriva account does not have %s download subscription enabled."
-msgstr "您的 Mandriva 帳號並沒有下載 %s 的權限。"
+msgid "Your Mageia account does not have %s download subscription enabled."
+msgstr "您的 Mageia 帳號並沒有下載 %s 的權限。"
 
 #: ../mdkapplet-add-media-helper:226
 #, c-format
@@ -523,17 +523,17 @@ msgstr "企業"
 #: ../mdkapplet_gui.pm:87
 #, c-format
 msgid ""
-"Mandriva Powerpack brings you the best of Linux experience for desktop: "
+"Mageia Powerpack brings you the best of Linux experience for desktop: "
 "stability and efficiency of open source solutions together with exclusive "
-"softwares and Mandriva official support."
+"softwares and Mageia official support."
 msgstr ""
-"Mandriva Powerpack 帶給您最好的 Linux 桌面體驗：開放原始碼的穩定、效率，以及"
-"其他獨家軟體和 Mandriva 的正式支援。"
+"Mageia Powerpack 帶給您最好的 Linux 桌面體驗：開放原始碼的穩定、效率，以及"
+"其他獨家軟體和 Mageia 的正式支援。"
 
 #: ../mdkapplet_gui.pm:94
 #, c-format
-msgid "Mandriva Linux Features"
-msgstr "Mandriva Linux 特色"
+msgid "Mageia Linux Features"
+msgstr "Mageia Linux 特色"
 
 #: ../mdkapplet_gui.pm:213
 #, c-format
@@ -582,35 +582,35 @@ msgstr "%s 已經推出，您可以升級到："
 
 #: ../mdkonline.pm:177
 #, c-format
-msgid "Mandriva Flash"
-msgstr "Mandriva Flash"
+msgid "Mageia Flash"
+msgstr "Mageia Flash"
 
 #: ../mdkonline.pm:178 ../mdkonline.pm:198
 #, c-format
-msgid "Mandriva Free"
-msgstr "Mandriva Free"
+msgid "Mageia Free"
+msgstr "Mageia Free"
 
 #: ../mdkonline.pm:179
 #, c-format
-msgid "Mandriva Mini"
-msgstr "Mandriva Mini"
+msgid "Mageia Mini"
+msgstr "Mageia Mini"
 
 #: ../mdkonline.pm:180
 #, c-format
-msgid "Mandriva One"
-msgstr "Mandriva One"
+msgid "Mageia One"
+msgstr "Mageia One"
 
 #: ../mdkonline.pm:181 ../mdkonline.pm:194
 #, c-format
-msgid "Mandriva PowerPack"
-msgstr "Mandriva PowerPack"
+msgid "Mageia PowerPack"
+msgstr "Mageia PowerPack"
 
 #: ../mdkonline.pm:195
 #, c-format
 msgid ""
-"The Mandriva Linux distribution with even more softwares and official "
+"The Mageia Linux distribution with even more softwares and official "
 "support."
-msgstr "能提供您更多軟體與官方支援的 Mandriva Linux 發行版本。"
+msgstr "能提供您更多軟體與官方支援的 Mageia Linux 發行版本。"
 
 #: ../mdkonline.pm:199
 #, c-format
@@ -626,14 +626,14 @@ msgstr "升級發行版本"
 #, c-format
 msgid ""
 "mdkupdate version %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "mdkupdate 版本號 %s\n"
-"Copyright (C) %s Mandriva.\n"
+"Copyright (C) %s Mageia.\n"
 "這是自由軟體且可於 GNU GPL 條款下被重新散佈。\n"
 "\n"
 "用法：\n"
@@ -645,8 +645,8 @@ msgstr "  --help\t\t- 顯示本輔助說明。\n"
 
 #: ../mdkupdate:65
 #, c-format
-msgid "  --auto\t\t- Mandriva Update launched automatically.\n"
-msgstr "  --auto\t\t- 自動啟動 Mandriva Update。\n"
+msgid "  --auto\t\t- Mageia Update launched automatically.\n"
+msgstr "  --auto\t\t- 自動啟動 Mageia Update。\n"
 
 #: ../mdkupdate:66
 #, c-format
@@ -655,8 +655,8 @@ msgstr "  --mnf\t\t\t- 啟動 mnf 指定的 script。\n"
 
 #: ../mdkupdate:67
 #, c-format
-msgid "  --noX\t\t\t- text mode version of Mandriva Update.\n"
-msgstr "  --noX\t\t\t- 文字介面版的 Mandriva Update。\n"
+msgid "  --noX\t\t\t- text mode version of Mageia Update.\n"
+msgstr "  --noX\t\t\t- 文字介面版的 Mageia Update。\n"
 
 #: ../mdkupdate:68
 #, c-format
diff --git a/x-mdv-exec.desktop b/x-mga-exec.desktop
index 13dbc65d..ce098144 100644
--- a/x-mdv-exec.desktop
+++ b/x-mga-exec.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Mdkonline
-Icon=/usr/share/icons/mdkonline.png
+Name=MGAonline
+Icon=/usr/share/icons/mgaonline.png
 Type=MimeType
 MimeType=application/x-mdv-exec;
-Comment=mdkonline application updater
+Comment=mgaonline application updater
 Hidden=false
 X-KDE-AutoEmbed=false