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

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r398 | dmorgan | 2011-02-03 18:07:04 +0000 (Thu, 03 Feb 2011) | 1 line

Import cleaned drakx-net
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

po
 - replace Mandriva by Mangeia in po files

pixmaps
 - replace all images (use Oxygen)

icons
 - replace all images (use Oxygen)

lib
 - remove Mandriva occurrences
 - movre dbus prefix to org.mageia

config
 - remove Mandriva occurrences
 - movre dbus prefix to org.mageia

227 files changed, 1528 insertions, 1530 deletions

diff --git a/bin/drakconnect b/bin/drakconnect
index 7a95cc1..dcb4e0c 100755
--- a/bin/drakconnect
+++ b/bin/drakconnect
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# DrakConnect $Id$
+# DrakConnect $Id: drakconnect 239447 2008-03-14 12:45:50Z blino $
 
 # Copyright (C) 1999-2006 Mandriva
 #                         Damien "Dam's" Krotkine
diff --git a/bin/drakconnect-old b/bin/drakconnect-old
index 81ec706..41aaed9 100755
--- a/bin/drakconnect-old
+++ b/bin/drakconnect-old
@@ -244,7 +244,7 @@ Configure them first by clicking on 'Configure'")));
                                               update();
                                           });
 	} else {
-	    $widget_temp = N("This interface has not been configured yet.\nRun the \"%s\" assistant from the Mandriva Linux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"));
+	    $widget_temp = N("This interface has not been configured yet.\nRun the \"%s\" assistant from the Mageia Linux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"));
 	}
 	$vbox_local->pack_start(gtkpack__(Gtk2::HBox->new(0,0),
 					  $widget_temp
diff --git a/bin/drakgw b/bin/drakgw
index be3f5b9..d1ed287 100755
--- a/bin/drakgw
+++ b/bin/drakgw
@@ -77,7 +77,7 @@ With that feature, other computers on your local network will be able to use thi
 
 Make sure you have configured your Network/Internet access using drakconnect before going any further.
 
-Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mandriva Firewall for the network adapter connected to your LAN connection before proceeding."),
+Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."),
 	      post => sub {
 		  $gw_enabled = !$shorewall->{disabled} && grep { !/^#/ } cat_($masq_file);
 		  return $gw_enabled ? "ask_reconfigure" : "choose_net_interface";
@@ -307,7 +307,7 @@ If you do not know the meaning of an option, simply leave it as it is."),
 	     {
 	      name => N("No ethernet network adapter configured for LAN has been detected on your system.
 
-Please run the hardware configuration tool to configure it, and ensure that the Mandriva firewall is not enabled for network adapter connected to your LAN network."),
+Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."),
 	      end => 1,
 	     },
 
diff --git a/bin/draksambashare b/bin/draksambashare
index 52684fe..6a2a26a 100755
--- a/bin/draksambashare
+++ b/bin/draksambashare
@@ -196,8 +196,8 @@ sub get_items() {
                               copyright => N("Copyright (C) %s by Mandriva", '2001-2008'),
                               license => $license, wrap_license => 1,
                               comments => N("This is a simple tool to easily manage Samba configuration."),
-                              website => 'http://mandrivalinux.com',
-                              website_label => N("Mandriva Linux"),
+                              website => 'http://www.mageia.com',
+                              website_label => N("Mageia"),
                               authors => 'Antoine Ginies <aginies@mandriva.com>',
                               artists => 'Hélène Durosini <ln@mandriva.com>',
                               translator_credits =>
diff --git a/bin/net_applet b/bin/net_applet
index 5361c7a..fd2b79b 100755
--- a/bin/net_applet
+++ b/bin/net_applet
@@ -102,7 +102,7 @@ sub get_state_message {
           N("Network is down on interface %s.", get_interface_name($interface))
         : $current_state eq 'unconfigured' ?
           N("You do not have any configured Internet connection.
-Run the \"%s\" assistant from the Mandriva Linux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))
+Run the \"%s\" assistant from the Mageia Linux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))
         :
          N("Connecting...")
     );
@@ -235,7 +235,7 @@ if ($dbus) {
 if ($dbus) {
     $dbus->{connection}->add_filter(sub {
         my ($_con, $msg) = @_;
-            if ($msg->get_interface eq 'com.mandriva.network' && $msg->get_member eq 'status') {
+            if ($msg->get_interface eq 'org.mageia.network' && $msg->get_member eq 'status') {
                 my ($status, $interface) = $msg->get_args_list;
                 print "got connection status event: $status $interface\n";
                 if ($status eq "add") {
@@ -243,7 +243,7 @@ if ($dbus) {
                 }
             }
     });
-    $dbus->{connection}->add_match("type='signal',interface='com.mandriva.network'");
+    $dbus->{connection}->add_match("type='signal',interface='org.mageia.network'");
     dbus_object::set_gtk2_watch_helper($dbus);
 }
 
diff --git a/bin/net_monitor b/bin/net_monitor
index 861fb74..5c27f85 100755
--- a/bin/net_monitor
+++ b/bin/net_monitor
@@ -255,7 +255,7 @@ sub connection() {
                         N("Disconnection from Internet complete.")) :
                     ($isconnected ?
                         N("Connection complete.") :
-                        N("Connection failed.\nVerify your configuration in the Mandriva Linux Control Center."))
+                        N("Connection failed.\nVerify your configuration in the Mageia Linux Control Center."))
                 );
                 # remove the connection time timer if connection is down or failed
                 $isconnected or Glib::Source->remove($ct_tag);
diff --git a/data/icons/IC-Dhost-48.png b/data/icons/IC-Dhost-48.png
index 21b3934..48a6b4c 100644
--- a/data/icons/IC-Dhost-48.png
+++ b/data/icons/IC-Dhost-48.png
diff --git a/data/icons/IC-NFS-48.png b/data/icons/IC-NFS-48.png
index 81b44ae..bd60393 100644
--- a/data/icons/IC-NFS-48.png
+++ b/data/icons/IC-NFS-48.png
diff --git a/data/icons/IC-sambaprt-16.png b/data/icons/IC-sambaprt-16.png
index d4e5804..305072b 100644
--- a/data/icons/IC-sambaprt-16.png
+++ b/data/icons/IC-sambaprt-16.png
diff --git a/data/icons/IC-winacces1-48.png b/data/icons/IC-winacces1-48.png
index 07050bd..8cce7a1 100644
--- a/data/icons/IC-winacces1-48.png
+++ b/data/icons/IC-winacces1-48.png
diff --git a/data/icons/IC-winacces2-16.png b/data/icons/IC-winacces2-16.png
index 49d8469..9ce11f0 100644
--- a/data/icons/IC-winacces2-16.png
+++ b/data/icons/IC-winacces2-16.png
diff --git a/data/icons/activate-16.png b/data/icons/activate-16.png
index 2eef1ea..7604a91 100644
--- a/data/icons/activate-16.png
+++ b/data/icons/activate-16.png
diff --git a/data/icons/activate-24.png b/data/icons/activate-24.png
index 6aee320..a9e3689 100644
--- a/data/icons/activate-24.png
+++ b/data/icons/activate-24.png
diff --git a/data/icons/configure-16.png b/data/icons/configure-16.png
index ce5ad74..3f8dea7 100644
--- a/data/icons/configure-16.png
+++ b/data/icons/configure-16.png
diff --git a/data/icons/configure-24.png b/data/icons/configure-24.png
index ea08079..4e4fbf7 100644
--- a/data/icons/configure-24.png
+++ b/data/icons/configure-24.png
diff --git a/data/icons/drakconnect.png b/data/icons/drakconnect.png
index 6bea99a..91e63ab 100644
--- a/data/icons/drakconnect.png
+++ b/data/icons/drakconnect.png
diff --git a/data/icons/drakfirewall.png b/data/icons/drakfirewall.png
index 6cdde23..3af9eab 100644
--- a/data/icons/drakfirewall.png
+++ b/data/icons/drakfirewall.png
diff --git a/data/icons/drakgw.png b/data/icons/drakgw.png
index 45d1b86..7e4cda1 100644
--- a/data/icons/drakgw.png
+++ b/data/icons/drakgw.png
diff --git a/data/icons/draknetprofile-16.png b/data/icons/draknetprofile-16.png
index 10ad3ae..7ef6ae5 100644
--- a/data/icons/draknetprofile-16.png
+++ b/data/icons/draknetprofile-16.png
diff --git a/data/icons/draknetprofile-24.png b/data/icons/draknetprofile-24.png
index a092584..eb09b04 100644
--- a/data/icons/draknetprofile-24.png
+++ b/data/icons/draknetprofile-24.png
diff --git a/data/icons/draknetprofile-32.png b/data/icons/draknetprofile-32.png
index 7ecd2bb..7941da7 100644
--- a/data/icons/draknetprofile-32.png
+++ b/data/icons/draknetprofile-32.png
diff --git a/data/icons/draknetprofile-64.png b/data/icons/draknetprofile-64.png
index 6e2c3ae..e197d16 100644
--- a/data/icons/draknetprofile-64.png
+++ b/data/icons/draknetprofile-64.png
diff --git a/data/icons/draknetprofile.png b/data/icons/draknetprofile.png
index 9fe97fd..c94b25b 100644
--- a/data/icons/draknetprofile.png
+++ b/data/icons/draknetprofile.png
diff --git a/data/icons/draknetprofile_128.png b/data/icons/draknetprofile_128.png
index b2d68bb..1daad02 100644
--- a/data/icons/draknetprofile_128.png
+++ b/data/icons/draknetprofile_128.png
diff --git a/data/icons/drakvpn-16.png b/data/icons/drakvpn-16.png
index 6e91b3c..f964c65 100644
--- a/data/icons/drakvpn-16.png
+++ b/data/icons/drakvpn-16.png
diff --git a/data/icons/drakvpn-24.png b/data/icons/drakvpn-24.png
index fb878e8..b941c1f 100644
--- a/data/icons/drakvpn-24.png
+++ b/data/icons/drakvpn-24.png
diff --git a/data/icons/drakvpn-32.png b/data/icons/drakvpn-32.png
index fad6c50..43b5c91 100644
--- a/data/icons/drakvpn-32.png
+++ b/data/icons/drakvpn-32.png
diff --git a/data/icons/drakvpn-64.png b/data/icons/drakvpn-64.png
index fcdb3b8..3376b34 100644
--- a/data/icons/drakvpn-64.png
+++ b/data/icons/drakvpn-64.png
diff --git a/data/icons/drakvpn.png b/data/icons/drakvpn.png
index 75edb04..afeb95f 100644
--- a/data/icons/drakvpn.png
+++ b/data/icons/drakvpn.png
diff --git a/data/icons/drakvpn_128.png b/data/icons/drakvpn_128.png
index a250bbe..9c6f791 100644
--- a/data/icons/drakvpn_128.png
+++ b/data/icons/drakvpn_128.png
diff --git a/data/icons/invictus-16.png b/data/icons/invictus-16.png
index 2c3bbf8..5e2202f 100644
--- a/data/icons/invictus-16.png
+++ b/data/icons/invictus-16.png
diff --git a/data/icons/invictus-24.png b/data/icons/invictus-24.png
index 2cfa8cb..d7dfd46 100644
--- a/data/icons/invictus-24.png
+++ b/data/icons/invictus-24.png
diff --git a/data/icons/invictus-32.png b/data/icons/invictus-32.png
index c142cf6..fe5dcc9 100644
--- a/data/icons/invictus-32.png
+++ b/data/icons/invictus-32.png
diff --git a/data/icons/invictus-64.png b/data/icons/invictus-64.png
index 962ae57..cf59db4 100644
--- a/data/icons/invictus-64.png
+++ b/data/icons/invictus-64.png
diff --git a/data/icons/invictus.png b/data/icons/invictus.png
index b66997e..3ff84df 100644
--- a/data/icons/invictus.png
+++ b/data/icons/invictus.png
diff --git a/data/icons/invictus_128.png b/data/icons/invictus_128.png
index 0642144..acdcf87 100644
--- a/data/icons/invictus_128.png
+++ b/data/icons/invictus_128.png
diff --git a/data/icons/monitor-16.png b/data/icons/monitor-16.png
index 3065411..a436951 100644
--- a/data/icons/monitor-16.png
+++ b/data/icons/monitor-16.png
diff --git a/data/icons/monitor-24.png b/data/icons/monitor-24.png
index 998850f..3ba3d42 100644
--- a/data/icons/monitor-24.png
+++ b/data/icons/monitor-24.png
diff --git a/data/icons/ok-16.png b/data/icons/ok-16.png
index cf7a4fd..29748a6 100644
--- a/data/icons/ok-16.png
+++ b/data/icons/ok-16.png
diff --git a/data/icons/ok-24.png b/data/icons/ok-24.png
index 4409f63..5611163 100644
--- a/data/icons/ok-24.png
+++ b/data/icons/ok-24.png
diff --git a/data/icons/remove-16.png b/data/icons/remove-16.png
index 1b11435..8f7fed9 100644
--- a/data/icons/remove-16.png
+++ b/data/icons/remove-16.png
diff --git a/data/icons/remove-24.png b/data/icons/remove-24.png
index 7a9aa88..2c75433 100644
--- a/data/icons/remove-24.png
+++ b/data/icons/remove-24.png
diff --git a/data/pixmaps/bluetooth-128.png b/data/pixmaps/bluetooth-128.png
index 5207339..92fa770 100644
--- a/data/pixmaps/bluetooth-128.png
+++ b/data/pixmaps/bluetooth-128.png
diff --git a/data/pixmaps/bluetooth-16.png b/data/pixmaps/bluetooth-16.png
index 0863bd7..cd3a17f 100644
--- a/data/pixmaps/bluetooth-16.png
+++ b/data/pixmaps/bluetooth-16.png
diff --git a/data/pixmaps/bluetooth-24-off.png b/data/pixmaps/bluetooth-24-off.png
index d255a19..e43c74c 100644
--- a/data/pixmaps/bluetooth-24-off.png
+++ b/data/pixmaps/bluetooth-24-off.png
diff --git a/data/pixmaps/bluetooth-24-on.png b/data/pixmaps/bluetooth-24-on.png
index 613b78b..ec6bb8e 100644
--- a/data/pixmaps/bluetooth-24-on.png
+++ b/data/pixmaps/bluetooth-24-on.png
diff --git a/data/pixmaps/bluetooth-24-w.png b/data/pixmaps/bluetooth-24-w.png
index 80fa8bb..2f05db7 100644
--- a/data/pixmaps/bluetooth-24-w.png
+++ b/data/pixmaps/bluetooth-24-w.png
diff --git a/data/pixmaps/bluetooth-24.png b/data/pixmaps/bluetooth-24.png
index b339dc4..af246af 100644
--- a/data/pixmaps/bluetooth-24.png
+++ b/data/pixmaps/bluetooth-24.png
diff --git a/data/pixmaps/bluetooth-32.png b/data/pixmaps/bluetooth-32.png
index d4a38db..4ab7510 100644
--- a/data/pixmaps/bluetooth-32.png
+++ b/data/pixmaps/bluetooth-32.png
diff --git a/data/pixmaps/bluetooth-48.png b/data/pixmaps/bluetooth-48.png
index 4674919..e9eee2d 100644
--- a/data/pixmaps/bluetooth-48.png
+++ b/data/pixmaps/bluetooth-48.png
diff --git a/data/pixmaps/bluetooth-52.png b/data/pixmaps/bluetooth-52.png
index d2a9cd2..90226f2 100644
--- a/data/pixmaps/bluetooth-52.png
+++ b/data/pixmaps/bluetooth-52.png
diff --git a/data/pixmaps/bluetooth-64.png b/data/pixmaps/bluetooth-64.png
index 5d9fbc2..fd92803 100644
--- a/data/pixmaps/bluetooth-64.png
+++ b/data/pixmaps/bluetooth-64.png
diff --git a/data/pixmaps/cablemodem-128.png b/data/pixmaps/cablemodem-128.png
index c67f938..275eb16 100644
--- a/data/pixmaps/cablemodem-128.png
+++ b/data/pixmaps/cablemodem-128.png
diff --git a/data/pixmaps/cablemodem-16.png b/data/pixmaps/cablemodem-16.png
index 158ce35..b5bfad0 100644
--- a/data/pixmaps/cablemodem-16.png
+++ b/data/pixmaps/cablemodem-16.png
diff --git a/data/pixmaps/cablemodem-24.png b/data/pixmaps/cablemodem-24.png
index 53da1e8..21db6b8 100644
--- a/data/pixmaps/cablemodem-24.png
+++ b/data/pixmaps/cablemodem-24.png
diff --git a/data/pixmaps/cablemodem-32.png b/data/pixmaps/cablemodem-32.png
index 3ba9e20..d881825 100644
--- a/data/pixmaps/cablemodem-32.png
+++ b/data/pixmaps/cablemodem-32.png
diff --git a/data/pixmaps/cablemodem-48.png b/data/pixmaps/cablemodem-48.png
index 974fd5a..40fa772 100644
--- a/data/pixmaps/cablemodem-48.png
+++ b/data/pixmaps/cablemodem-48.png
diff --git a/data/pixmaps/cablemodem-52.png b/data/pixmaps/cablemodem-52.png
index 18868b8..78ae41a 100644
--- a/data/pixmaps/cablemodem-52.png
+++ b/data/pixmaps/cablemodem-52.png
diff --git a/data/pixmaps/cablemodem-64.png b/data/pixmaps/cablemodem-64.png
index 21f2f3f..4202bc2 100644
--- a/data/pixmaps/cablemodem-64.png
+++ b/data/pixmaps/cablemodem-64.png
diff --git a/data/pixmaps/cellular-128.png b/data/pixmaps/cellular-128.png
index f27523f..1b8827e 100644
--- a/data/pixmaps/cellular-128.png
+++ b/data/pixmaps/cellular-128.png
diff --git a/data/pixmaps/cellular-16.png b/data/pixmaps/cellular-16.png
index c140c35..d2814a1 100644
--- a/data/pixmaps/cellular-16.png
+++ b/data/pixmaps/cellular-16.png
diff --git a/data/pixmaps/cellular-24-off.png b/data/pixmaps/cellular-24-off.png
index bf37e96..bc39104 100644
--- a/data/pixmaps/cellular-24-off.png
+++ b/data/pixmaps/cellular-24-off.png
diff --git a/data/pixmaps/cellular-24-on.png b/data/pixmaps/cellular-24-on.png
index a75cf4a..514f4d6 100644
--- a/data/pixmaps/cellular-24-on.png
+++ b/data/pixmaps/cellular-24-on.png
diff --git a/data/pixmaps/cellular-24-w.png b/data/pixmaps/cellular-24-w.png
index f9adb4d..4efa114 100644
--- a/data/pixmaps/cellular-24-w.png
+++ b/data/pixmaps/cellular-24-w.png
diff --git a/data/pixmaps/cellular-24.png b/data/pixmaps/cellular-24.png
index ad30a47..0c15cbc 100644
--- a/data/pixmaps/cellular-24.png
+++ b/data/pixmaps/cellular-24.png
diff --git a/data/pixmaps/cellular-32.png b/data/pixmaps/cellular-32.png
index f745cbd..51c9086 100644
--- a/data/pixmaps/cellular-32.png
+++ b/data/pixmaps/cellular-32.png
diff --git a/data/pixmaps/cellular-48.png b/data/pixmaps/cellular-48.png
index 699fe7b..35b74b0 100644
--- a/data/pixmaps/cellular-48.png
+++ b/data/pixmaps/cellular-48.png
diff --git a/data/pixmaps/cellular-52.png b/data/pixmaps/cellular-52.png
index 0203a17..cee8632 100644
--- a/data/pixmaps/cellular-52.png
+++ b/data/pixmaps/cellular-52.png
diff --git a/data/pixmaps/cellular-64.png b/data/pixmaps/cellular-64.png
index 4a1b267..d6517f6 100644
--- a/data/pixmaps/cellular-64.png
+++ b/data/pixmaps/cellular-64.png
diff --git a/data/pixmaps/connected.png b/data/pixmaps/connected.png
index 4143c33..57a5e80 100755
--- a/data/pixmaps/connected.png
+++ b/data/pixmaps/connected.png
diff --git a/data/pixmaps/connecting.png b/data/pixmaps/connecting.png
index 10cc89c..1a1983d 100644
--- a/data/pixmaps/connecting.png
+++ b/data/pixmaps/connecting.png
diff --git a/data/pixmaps/disconnected.png b/data/pixmaps/disconnected.png
index e9d4fb1..a99d7ef 100644
--- a/data/pixmaps/disconnected.png
+++ b/data/pixmaps/disconnected.png
diff --git a/data/pixmaps/dvb-128.png b/data/pixmaps/dvb-128.png
index 4683ea5..c874e62 100644
--- a/data/pixmaps/dvb-128.png
+++ b/data/pixmaps/dvb-128.png
diff --git a/data/pixmaps/dvb-16.png b/data/pixmaps/dvb-16.png
index 2cd8d9a..fb030ea 100644
--- a/data/pixmaps/dvb-16.png
+++ b/data/pixmaps/dvb-16.png
diff --git a/data/pixmaps/dvb-24-off.png b/data/pixmaps/dvb-24-off.png
index 56ba8cc..354d2b9 100644
--- a/data/pixmaps/dvb-24-off.png
+++ b/data/pixmaps/dvb-24-off.png
diff --git a/data/pixmaps/dvb-24-on.png b/data/pixmaps/dvb-24-on.png
index 9b55b86..f5b13a8 100644
--- a/data/pixmaps/dvb-24-on.png
+++ b/data/pixmaps/dvb-24-on.png
diff --git a/data/pixmaps/dvb-24-w.png b/data/pixmaps/dvb-24-w.png
index 75da4c4..65be696 100644
--- a/data/pixmaps/dvb-24-w.png
+++ b/data/pixmaps/dvb-24-w.png
diff --git a/data/pixmaps/dvb-24.png b/data/pixmaps/dvb-24.png
index 4b4caaa..3c4da16 100644
--- a/data/pixmaps/dvb-24.png
+++ b/data/pixmaps/dvb-24.png
diff --git a/data/pixmaps/dvb-32.png b/data/pixmaps/dvb-32.png
index fd91383..7dc7433 100644
--- a/data/pixmaps/dvb-32.png
+++ b/data/pixmaps/dvb-32.png
diff --git a/data/pixmaps/dvb-48.png b/data/pixmaps/dvb-48.png
index f92fcf3..8d48429 100644
--- a/data/pixmaps/dvb-48.png
+++ b/data/pixmaps/dvb-48.png
diff --git a/data/pixmaps/dvb-52.png b/data/pixmaps/dvb-52.png
index ce023fb..2075378 100644
--- a/data/pixmaps/dvb-52.png
+++ b/data/pixmaps/dvb-52.png
diff --git a/data/pixmaps/dvb-64.png b/data/pixmaps/dvb-64.png
index f477b11..44d09f3 100644
--- a/data/pixmaps/dvb-64.png
+++ b/data/pixmaps/dvb-64.png
diff --git a/data/pixmaps/encryption-open-24.png b/data/pixmaps/encryption-open-24.png
index a3c6814..a0706f5 100644
--- a/data/pixmaps/encryption-open-24.png
+++ b/data/pixmaps/encryption-open-24.png
diff --git a/data/pixmaps/encryption-strong-24.png b/data/pixmaps/encryption-strong-24.png
index bc9eca0..a324dc5 100644
--- a/data/pixmaps/encryption-strong-24.png
+++ b/data/pixmaps/encryption-strong-24.png
diff --git a/data/pixmaps/encryption-weak-24.png b/data/pixmaps/encryption-weak-24.png
index d5b1c3e..a3e703f 100644
--- a/data/pixmaps/encryption-weak-24.png
+++ b/data/pixmaps/encryption-weak-24.png
diff --git a/data/pixmaps/ethernet-128.png b/data/pixmaps/ethernet-128.png
index 1660a75..cbcf1b6 100644
--- a/data/pixmaps/ethernet-128.png
+++ b/data/pixmaps/ethernet-128.png
diff --git a/data/pixmaps/ethernet-16.png b/data/pixmaps/ethernet-16.png
index 25fac7d..c096721 100644
--- a/data/pixmaps/ethernet-16.png
+++ b/data/pixmaps/ethernet-16.png
diff --git a/data/pixmaps/ethernet-24-off.png b/data/pixmaps/ethernet-24-off.png
index 8c46e05..e0ce8fa 100644
--- a/data/pixmaps/ethernet-24-off.png
+++ b/data/pixmaps/ethernet-24-off.png
diff --git a/data/pixmaps/ethernet-24-on.png b/data/pixmaps/ethernet-24-on.png
index 1c37939..0e3ddda 100644
--- a/data/pixmaps/ethernet-24-on.png
+++ b/data/pixmaps/ethernet-24-on.png
diff --git a/data/pixmaps/ethernet-24-w.png b/data/pixmaps/ethernet-24-w.png
index b171003..ca15617 100644
--- a/data/pixmaps/ethernet-24-w.png
+++ b/data/pixmaps/ethernet-24-w.png
diff --git a/data/pixmaps/ethernet-24.png b/data/pixmaps/ethernet-24.png
index 55c706a..08aab17 100644
--- a/data/pixmaps/ethernet-24.png
+++ b/data/pixmaps/ethernet-24.png
diff --git a/data/pixmaps/ethernet-32.png b/data/pixmaps/ethernet-32.png
index 1cf789e..92cd0f4 100644
--- a/data/pixmaps/ethernet-32.png
+++ b/data/pixmaps/ethernet-32.png
diff --git a/data/pixmaps/ethernet-48.png b/data/pixmaps/ethernet-48.png
index 9ccbc36..b94d5ad 100644
--- a/data/pixmaps/ethernet-48.png
+++ b/data/pixmaps/ethernet-48.png
diff --git a/data/pixmaps/ethernet-52.png b/data/pixmaps/ethernet-52.png
index 9f16c9f..8dc5578 100644
--- a/data/pixmaps/ethernet-52.png
+++ b/data/pixmaps/ethernet-52.png
diff --git a/data/pixmaps/ethernet-64.png b/data/pixmaps/ethernet-64.png
index bacdb0a..6566b53 100644
--- a/data/pixmaps/ethernet-64.png
+++ b/data/pixmaps/ethernet-64.png
diff --git a/data/pixmaps/isdn-128.png b/data/pixmaps/isdn-128.png
index d09ce4a..275eb16 100644
--- a/data/pixmaps/isdn-128.png
+++ b/data/pixmaps/isdn-128.png
diff --git a/data/pixmaps/isdn-16.png b/data/pixmaps/isdn-16.png
index 6d7086b..5be1ee9 100644
--- a/data/pixmaps/isdn-16.png
+++ b/data/pixmaps/isdn-16.png
diff --git a/data/pixmaps/isdn-24-off.png b/data/pixmaps/isdn-24-off.png
index 32f506c..901238d 100644
--- a/data/pixmaps/isdn-24-off.png
+++ b/data/pixmaps/isdn-24-off.png
diff --git a/data/pixmaps/isdn-24-on.png b/data/pixmaps/isdn-24-on.png
index 4b9c061..cd67189 100644
--- a/data/pixmaps/isdn-24-on.png
+++ b/data/pixmaps/isdn-24-on.png
diff --git a/data/pixmaps/isdn-24-w.png b/data/pixmaps/isdn-24-w.png
index 09d5d3c..0c20eef 100644
--- a/data/pixmaps/isdn-24-w.png
+++ b/data/pixmaps/isdn-24-w.png
diff --git a/data/pixmaps/isdn-24.png b/data/pixmaps/isdn-24.png
index 6ca1655..2d6591a 100644
--- a/data/pixmaps/isdn-24.png
+++ b/data/pixmaps/isdn-24.png
diff --git a/data/pixmaps/isdn-32.png b/data/pixmaps/isdn-32.png
index 3f90c80..253fddd 100644
--- a/data/pixmaps/isdn-32.png
+++ b/data/pixmaps/isdn-32.png
diff --git a/data/pixmaps/isdn-48.png b/data/pixmaps/isdn-48.png
index 7dc1776..2420454 100644
--- a/data/pixmaps/isdn-48.png
+++ b/data/pixmaps/isdn-48.png
diff --git a/data/pixmaps/isdn-52.png b/data/pixmaps/isdn-52.png
index 64690ec..85c785f 100644
--- a/data/pixmaps/isdn-52.png
+++ b/data/pixmaps/isdn-52.png
diff --git a/data/pixmaps/isdn-64.png b/data/pixmaps/isdn-64.png
index 0626636..0b1269e 100644
--- a/data/pixmaps/isdn-64.png
+++ b/data/pixmaps/isdn-64.png
diff --git a/data/pixmaps/potsmodem-128.png b/data/pixmaps/potsmodem-128.png
index 908bd67..275eb16 100644
--- a/data/pixmaps/potsmodem-128.png
+++ b/data/pixmaps/potsmodem-128.png
diff --git a/data/pixmaps/potsmodem-16.png b/data/pixmaps/potsmodem-16.png
index 09e0e4d..608df9e 100644
--- a/data/pixmaps/potsmodem-16.png
+++ b/data/pixmaps/potsmodem-16.png
diff --git a/data/pixmaps/potsmodem-24-off.png b/data/pixmaps/potsmodem-24-off.png
index 39d7c9c..972c0c9 100644
--- a/data/pixmaps/potsmodem-24-off.png
+++ b/data/pixmaps/potsmodem-24-off.png
diff --git a/data/pixmaps/potsmodem-24-on.png b/data/pixmaps/potsmodem-24-on.png
index 043300f..c48ab1e 100644
--- a/data/pixmaps/potsmodem-24-on.png
+++ b/data/pixmaps/potsmodem-24-on.png
diff --git a/data/pixmaps/potsmodem-24-w.png b/data/pixmaps/potsmodem-24-w.png
index a682f92..8d8eff1 100644
--- a/data/pixmaps/potsmodem-24-w.png
+++ b/data/pixmaps/potsmodem-24-w.png
diff --git a/data/pixmaps/potsmodem-24.png b/data/pixmaps/potsmodem-24.png
index 8f5609a..db3ae7e 100644
--- a/data/pixmaps/potsmodem-24.png
+++ b/data/pixmaps/potsmodem-24.png
diff --git a/data/pixmaps/potsmodem-32.png b/data/pixmaps/potsmodem-32.png
index 2472208..622dd80 100644
--- a/data/pixmaps/potsmodem-32.png
+++ b/data/pixmaps/potsmodem-32.png
diff --git a/data/pixmaps/potsmodem-48.png b/data/pixmaps/potsmodem-48.png
index 5811ba0..f2bbf1b 100644
--- a/data/pixmaps/potsmodem-48.png
+++ b/data/pixmaps/potsmodem-48.png
diff --git a/data/pixmaps/potsmodem-52.png b/data/pixmaps/potsmodem-52.png
index 5ca17f4..488ed1f 100644
--- a/data/pixmaps/potsmodem-52.png
+++ b/data/pixmaps/potsmodem-52.png
diff --git a/data/pixmaps/potsmodem-64.png b/data/pixmaps/potsmodem-64.png
index dc87fce..595d6d2 100644
--- a/data/pixmaps/potsmodem-64.png
+++ b/data/pixmaps/potsmodem-64.png
diff --git a/data/pixmaps/unconfigured.png b/data/pixmaps/unconfigured.png
index 4735f4a..b8f3bc1 100644
--- a/data/pixmaps/unconfigured.png
+++ b/data/pixmaps/unconfigured.png
diff --git a/data/pixmaps/wifi-020.png b/data/pixmaps/wifi-020.png
index 7ecb703..fbd21d6 100644
--- a/data/pixmaps/wifi-020.png
+++ b/data/pixmaps/wifi-020.png
diff --git a/data/pixmaps/wifi-040.png b/data/pixmaps/wifi-040.png
index e79cfd4..0f1193b 100644
--- a/data/pixmaps/wifi-040.png
+++ b/data/pixmaps/wifi-040.png
diff --git a/data/pixmaps/wifi-060.png b/data/pixmaps/wifi-060.png
index 93b16b4..bbc07df 100644
--- a/data/pixmaps/wifi-060.png
+++ b/data/pixmaps/wifi-060.png
diff --git a/data/pixmaps/wifi-080.png b/data/pixmaps/wifi-080.png
index 565c9fa..0f87650 100644
--- a/data/pixmaps/wifi-080.png
+++ b/data/pixmaps/wifi-080.png
diff --git a/data/pixmaps/wifi-100.png b/data/pixmaps/wifi-100.png
index bd0a206..0e67e29 100644
--- a/data/pixmaps/wifi-100.png
+++ b/data/pixmaps/wifi-100.png
diff --git a/data/pixmaps/wireless-128.png b/data/pixmaps/wireless-128.png
index cb44484..f3f215a 100644
--- a/data/pixmaps/wireless-128.png
+++ b/data/pixmaps/wireless-128.png
diff --git a/data/pixmaps/wireless-16.png b/data/pixmaps/wireless-16.png
index edfa36a..a1218c7 100644
--- a/data/pixmaps/wireless-16.png
+++ b/data/pixmaps/wireless-16.png
diff --git a/data/pixmaps/wireless-24-off.png b/data/pixmaps/wireless-24-off.png
index 0c2cb2b..894ba4d 100644
--- a/data/pixmaps/wireless-24-off.png
+++ b/data/pixmaps/wireless-24-off.png
diff --git a/data/pixmaps/wireless-24-on.png b/data/pixmaps/wireless-24-on.png
index 9b47f26..94c4062 100644
--- a/data/pixmaps/wireless-24-on.png
+++ b/data/pixmaps/wireless-24-on.png
diff --git a/data/pixmaps/wireless-24-w.png b/data/pixmaps/wireless-24-w.png
index e13aac4..f7c93d7 100644
--- a/data/pixmaps/wireless-24-w.png
+++ b/data/pixmaps/wireless-24-w.png
diff --git a/data/pixmaps/wireless-24.png b/data/pixmaps/wireless-24.png
index 12fadb0..6cba849 100644
--- a/data/pixmaps/wireless-24.png
+++ b/data/pixmaps/wireless-24.png
diff --git a/data/pixmaps/wireless-32.png b/data/pixmaps/wireless-32.png
index 304ce11..9d8002e 100644
--- a/data/pixmaps/wireless-32.png
+++ b/data/pixmaps/wireless-32.png
diff --git a/data/pixmaps/wireless-48.png b/data/pixmaps/wireless-48.png
index 20350af..0603a7c 100644
--- a/data/pixmaps/wireless-48.png
+++ b/data/pixmaps/wireless-48.png
diff --git a/data/pixmaps/wireless-52.png b/data/pixmaps/wireless-52.png
index 7373e0d..e4ea4ab 100644
--- a/data/pixmaps/wireless-52.png
+++ b/data/pixmaps/wireless-52.png
diff --git a/data/pixmaps/wireless-64.png b/data/pixmaps/wireless-64.png
index 405e940..01e045b 100644
--- a/data/pixmaps/wireless-64.png
+++ b/data/pixmaps/wireless-64.png
diff --git a/data/pixmaps/xdsl-128.png b/data/pixmaps/xdsl-128.png
index d76fb5a..11bf5f4 100644
--- a/data/pixmaps/xdsl-128.png
+++ b/data/pixmaps/xdsl-128.png
diff --git a/data/pixmaps/xdsl-16.png b/data/pixmaps/xdsl-16.png
index 3b74b69..1123ec9 100644
--- a/data/pixmaps/xdsl-16.png
+++ b/data/pixmaps/xdsl-16.png
diff --git a/data/pixmaps/xdsl-24-off.png b/data/pixmaps/xdsl-24-off.png
index 92ffeb8..ec0de9e 100644
--- a/data/pixmaps/xdsl-24-off.png
+++ b/data/pixmaps/xdsl-24-off.png
diff --git a/data/pixmaps/xdsl-24-on.png b/data/pixmaps/xdsl-24-on.png
index db29bb8..aea85a9 100644
--- a/data/pixmaps/xdsl-24-on.png
+++ b/data/pixmaps/xdsl-24-on.png
diff --git a/data/pixmaps/xdsl-24-w.png b/data/pixmaps/xdsl-24-w.png
index 752faf4..0837693 100644
--- a/data/pixmaps/xdsl-24-w.png
+++ b/data/pixmaps/xdsl-24-w.png
diff --git a/data/pixmaps/xdsl-24.png b/data/pixmaps/xdsl-24.png
index 638907a..641af11 100644
--- a/data/pixmaps/xdsl-24.png
+++ b/data/pixmaps/xdsl-24.png
diff --git a/data/pixmaps/xdsl-32.png b/data/pixmaps/xdsl-32.png
index b2e590f..03a0b9f 100644
--- a/data/pixmaps/xdsl-32.png
+++ b/data/pixmaps/xdsl-32.png
diff --git a/data/pixmaps/xdsl-48.png b/data/pixmaps/xdsl-48.png
index c5fe46b..8faa764 100644
--- a/data/pixmaps/xdsl-48.png
+++ b/data/pixmaps/xdsl-48.png
diff --git a/data/pixmaps/xdsl-52.png b/data/pixmaps/xdsl-52.png
index 074af50..9a055a1 100644
--- a/data/pixmaps/xdsl-52.png
+++ b/data/pixmaps/xdsl-52.png
diff --git a/data/pixmaps/xdsl-64.png b/data/pixmaps/xdsl-64.png
index 1440801..f164a86 100644
--- a/data/pixmaps/xdsl-64.png
+++ b/data/pixmaps/xdsl-64.png
diff --git a/lib/network/adsl.pm b/lib/network/adsl.pm
index c012219..e2ac90d 100644
--- a/lib/network/adsl.pm
+++ b/lib/network/adsl.pm
@@ -1,4 +1,4 @@
-package network::adsl; # $Id$
+package network::adsl; # $Id: adsl.pm 219797 2007-05-25 15:39:46Z blino $
 
 use common;
 use run_program;
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index e6b2a83..3efb2c1 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -458,7 +458,7 @@ sub setup_dbus_handlers {
     $dbus->{connection}->add_filter(
         sub {
             my ($_con, $msg) = @_;
-            if ($msg->get_interface eq 'com.mandriva.network') {
+            if ($msg->get_interface eq 'org.mageia.network') {
                 my $member = $msg->get_member;
                 my $message = _get_network_event_message($connections, $member, $msg->get_args_list);
                 $on_network_event->($message) if $on_network_event && $message;
@@ -483,7 +483,7 @@ sub setup_dbus_handlers {
                     }
                 }
             }
-            if ($msg->get_interface eq 'com.mandriva.monitoring.wireless' && $msg->get_member eq 'Event') {
+            if ($msg->get_interface eq 'org.mageia.monitoring.wireless' && $msg->get_member eq 'Event') {
                 my ($event, $interface) = $msg->get_args_list;
                 print "got wireless event: $event $interface\n";
                 # eugeni: wpa_supplicant seems to issue 'Authentication..timed out messages' even if they
@@ -498,8 +498,8 @@ sub setup_dbus_handlers {
 #                }
             }
         });
-    $dbus->{connection}->add_match("type='signal',interface='com.mandriva.network'");
-    $dbus->{connection}->add_match("type='signal',interface='com.mandriva.monitoring.wireless'");
+    $dbus->{connection}->add_match("type='signal',interface='org.mageia.network'");
+    $dbus->{connection}->add_match("type='signal',interface='org.mageia.monitoring.wireless'");
     dbus_object::set_gtk2_watch_helper($dbus);
 }
 
diff --git a/lib/network/drakconnect/global.pm b/lib/network/drakconnect/global.pm
index ad59c2a..59da73c 100644
--- a/lib/network/drakconnect/global.pm
+++ b/lib/network/drakconnect/global.pm
@@ -33,7 +33,7 @@ sub configure_net {
         $in->ask_warn(
                     N("Warning"),
                     N("You do not have any configured Internet connection.
-Run the \"%s\" assistant from the Mandriva Linux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)")));
+Run the \"%s\" assistant from the Mageia Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)")));
         return;
     }
     unless ($::isEmbedded) {
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm
index 5746ae7..f22ecfe 100644
--- a/lib/network/drakfirewall.pm
+++ b/lib/network/drakfirewall.pm
@@ -1,4 +1,4 @@
-package network::drakfirewall; # $Id$
+package network::drakfirewall; # $Id: drakfirewall.pm 268043 2010-04-30 13:29:37Z blino $
 
 use strict;
 use diagnostics;
@@ -223,9 +223,7 @@ sub get_conf {
     } else {
 	$in->ask_okcancel(N("Firewall configuration"), N("drakfirewall configurator
 
-This configures a personal firewall for this Mandriva Linux machine.
-For a powerful and dedicated firewall solution, please look to the
-specialized Mandriva Security Firewall distribution."), 1) or return;
+This configures a personal firewall for this Mageia machine."), 1) or return;
 
 	$in->ask_okcancel(N("Firewall configuration"), N("drakfirewall configurator
 
diff --git a/lib/network/ifw.pm b/lib/network/ifw.pm
index 1c7996d..2509b93 100644
--- a/lib/network/ifw.pm
+++ b/lib/network/ifw.pm
@@ -9,7 +9,7 @@ sub init {
     my ($bus, $filter) = @_;
     my $con = $bus->{connection};
     $con->add_filter($filter);
-    $con->add_match("type='signal',interface='com.mandriva.monitoring.ifw'");
+    $con->add_match("type='signal',interface='org.mageia.monitoring.ifw'");
 }
 
 sub new {
@@ -17,9 +17,9 @@ sub new {
     require dbus_object;
     my $o = dbus_object::new($type,
 			     $bus,
-			     "com.mandriva.monitoring",
-			     "/com/mandriva/monitoring/ifw",
-			     "com.mandriva.monitoring.ifw");
+			     "org.mageia.monitoring",
+			     "/org/mageia/monitoring/ifw",
+			     "org.mageia.monitoring.ifw");
     $o;
 }
 
diff --git a/lib/network/modem.pm b/lib/network/modem.pm
index 6c8fba0..b7fbc85 100644
--- a/lib/network/modem.pm
+++ b/lib/network/modem.pm
@@ -1,4 +1,4 @@
-package network::modem;	# $Id$
+package network::modem;	# $Id: modem.pm 243081 2008-06-25 15:44:25Z blino $
 
 use strict;
 use common;
diff --git a/lib/network/monitor.pm b/lib/network/monitor.pm
index 7e644b6..1182de4 100644
--- a/lib/network/monitor.pm
+++ b/lib/network/monitor.pm
@@ -5,9 +5,9 @@ use dbus_object;
 
 our @ISA = qw(dbus_object);
 
-my $monitor_service = "com.mandriva.monitoring";
-my $monitor_path = "/com/mandriva/monitoring/wireless";
-my $monitor_interface = "com.mandriva.monitoring.wireless";
+my $monitor_service = "org.mageia.monitoring";
+my $monitor_path = "/org/mageia/monitoring/wireless";
+my $monitor_interface = "org.mageia.monitoring.wireless";
 
 sub new {
     my ($type, $bus) = @_;
diff --git a/lib/network/netcenter.pm b/lib/network/netcenter.pm
index 29e2232..10d156d 100755
--- a/lib/network/netcenter.pm
+++ b/lib/network/netcenter.pm
@@ -183,7 +183,7 @@ sub main {
     if ($dbus) {
         $dbus->{connection}->add_filter(sub {
             my ($_con, $msg) = @_;
-            if ($msg->get_interface eq 'com.mandriva.network' && $msg->get_member eq 'status') {
+            if ($msg->get_interface eq 'org.mageia.network' && $msg->get_member eq 'status') {
                 my ($status, $interface) = $msg->get_args_list;
                 my $cmanager = find { $_->{connection}->get_interface eq $interface } @cmanagers;
                 if ($status eq "add") {
diff --git a/lib/network/netconnect.pm b/lib/network/netconnect.pm
index 1f6cbc1..e58121e 100644
--- a/lib/network/netconnect.pm
+++ b/lib/network/netconnect.pm
@@ -1,4 +1,4 @@
-package network::netconnect; # $Id$
+package network::netconnect; # $Id: netconnect.pm 259351 2009-08-17 15:15:51Z tv $
 
 use strict;
 use common;
diff --git a/lib/network/network.pm b/lib/network/network.pm
index f88939b..77e7e4c 100644
--- a/lib/network/network.pm
+++ b/lib/network/network.pm
@@ -1,4 +1,4 @@
-package network::network; # $Id$wir
+package network::network; # $Id: network.pm 268044 2010-04-30 13:31:34Z blino $wir
 
 #-######################################################################################
 #- misc imports
diff --git a/lib/network/pxe.pm b/lib/network/pxe.pm
index 1bc625a..2fecb8f 100644
--- a/lib/network/pxe.pm
+++ b/lib/network/pxe.pm
@@ -110,7 +110,7 @@ sub write_default_pxe_messages {
   my $hostname = $net->{hostname} || chomp_(`hostname`);
   output($pxelinux_message_file, <<EOF);
 
-                   Welcome to Mandriva Linux PXE Server
+                   Welcome to Mageia Linux PXE Server
                                                        Pxelinux
               .              .-----------------------------------.
              /|\\            /    Press F1 for available images    \\
diff --git a/lib/network/shorewall.pm b/lib/network/shorewall.pm
index da4e34d..46bafed 100644
--- a/lib/network/shorewall.pm
+++ b/lib/network/shorewall.pm
@@ -1,4 +1,4 @@
-package network::shorewall; # $Id$
+package network::shorewall; # $Id: shorewall.pm 254244 2009-03-18 22:54:32Z eugeni $
 
 use detect_devices;
 use network::network;
@@ -79,7 +79,7 @@ sub get_zones {
 All interfaces directly connected to Internet should be selected,
 while interfaces connected to a local network may be unselected.
 
-If you intend to use Mandriva Internet Connection sharing,
+If you intend to use Mageia Internet Connection sharing,
 unselect interfaces which will be connected to local network.
 
 Which interfaces should be protected?
diff --git a/lib/network/test.pm b/lib/network/test.pm
index 36da41d..0bd1231 100644
--- a/lib/network/test.pm
+++ b/lib/network/test.pm
@@ -1,4 +1,4 @@
-package network::test;          # $Id$
+package network::test;          # $Id: test.pm 219797 2007-05-25 15:39:46Z blino $
 
 use strict;
 use common;
@@ -8,7 +8,7 @@ use Socket;
 sub new {
     my ($class, $o_hostname) = @_;
     bless {
-           hostname => $o_hostname || "www.mandriva.com"
+           hostname => $o_hostname || "www.mageia.org"
           }, $class;
 }
 
@@ -111,7 +111,7 @@ sub update_status {
 
 =head2 Test synchronously
 
-resolve and get ping to hostname from command line if given, else to www.mandriva.com
+resolve and get ping to hostname from command line if given, else to www.mageia.org
 
  use lib qw(/usr/lib/libDrakX);
  use network::test;
@@ -132,7 +132,7 @@ resolve and get ping to hostname from command line if given, else to www.mandriv
 
 =head2 Test asynchronously
 
-resolve and get ping to hostname from command line if given, else to Mandriva
+resolve and get ping to hostname from command line if given, else to Mageia
 
 prints a "." every 10 miliseconds during connection test
 
diff --git a/lib/network/thirdparty.pm b/lib/network/thirdparty.pm
index f5a32eb..8fd48ab 100644
--- a/lib/network/thirdparty.pm
+++ b/lib/network/thirdparty.pm
@@ -145,11 +145,9 @@ sub warn_not_found {
                           N("Some packages (%s) are required but aren't available.", join(', ', @packages))),
                        join("\n\n",
                             if_(!$opt{no_distro_package} && !$opt{no_package},
-                                #-PO: first argument is a list of Mandriva distributions
+                                #-PO: first argument is a list of Mageia distributions
                                 #-PO: second argument is a package media name
-                                N("These packages can be found in %s, or in the official %s package repository.",
-                                  join(", ", "Mandriva Linux One", "Mandriva Linux Powerpack"),
-                                  "non-free"),
+                                N("These packages can be found in %s, or in the official %s package repository.", "non-free"),
                             ),
                             if_($checked, N("The following component is missing: %s", $checked)),
                             if_($opt{explanations}, translate($opt{explanations})),
diff --git a/lib/network/tools.pm b/lib/network/tools.pm
index 0a1d840..60eeb8b 100644
--- a/lib/network/tools.pm
+++ b/lib/network/tools.pm
@@ -1,4 +1,4 @@
-package network::tools; # $Id$
+package network::tools; # $Id: tools.pm 253976 2009-03-13 10:57:55Z eugeni $
 
 use strict;
 use common;
@@ -47,7 +47,7 @@ sub stop_net_interface {
     stop_interface($net->{net_interface}, $detach);
 }
 
-sub connected() { gethostbyname("www.mandriva.com") ? 1 : 0 }
+sub connected() { gethostbyname("www.mageia.org") ? 1 : 0 }
 
 # request a ref on a bg_connect and a ref on a scalar
 sub connected_bg__raw {
@@ -111,7 +111,7 @@ sub check_link_beat() {
                         } else {
                             $p = Net::Ping->new("icmp");
                         }
-                        print $p->ping("www.mandriva.com") ? 1 : 0;
+                        print $p->ping("www.mageia.org") ? 1 : 0;
                     });
 }
 
diff --git a/po/af.po b/po/af.po
index b69f8f0..205eb29 100644
--- a/po/af.po
+++ b/po/af.po
@@ -167,10 +167,10 @@ msgstr "DHCP-kliënt"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"Add an interface\"-assistent vanuit die Mandriva Linux Control "
+"Loods die \"Add an interface\"-assistent vanuit die Mageia Control "
 "Center"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -215,7 +215,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "U gaan nou u rekenaar so opstel dat die die Internetkonneksie deel.\n"
@@ -455,7 +455,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1480,7 +1480,7 @@ msgstr "Samba-bediener"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1490,8 +1490,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2112,10 +2112,10 @@ msgstr "Netwerkkoppelvlak"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"%s\"-assistent vanuit die Mandriva Linux Control Center"
+"Loods die \"%s\"-assistent vanuit die Mageia Control Center"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, fuzzy, c-format
@@ -2302,10 +2302,10 @@ msgstr "Voltooide konneksie."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Probleme met die Konneksie\n"
-"Maak tog seker van u konfigurasie in die 'Mandriva Linux Control Center'."
+"Maak tog seker van u konfigurasie in die 'Mageia Control Center'."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4677,15 +4677,15 @@ msgstr "Selfdoen konfigurasie"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall konfigurasie\n"
 "\n"
-"Hiermee stel u 'n persoonlike vuurmuur op vir die Mandriva Linux\n"
+"Hiermee stel u 'n persoonlike vuurmuur op vir die Mageia\n"
 "rekenaar. Indien u 'n kragtige en toegewyde vuurmuur verlang, kyk\n"
-"dan gerus na die 'Mandriva Security Firewall'."
+"dan gerus na die 'Mageia Security Firewall'."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5806,7 +5806,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5840,7 +5840,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/am.po b/po/am.po
index 57e41f3..de65b32 100644
--- a/po/am.po
+++ b/po/am.po
@@ -1,5 +1,5 @@
 # Latest versions of po files are at http://www.mandrivalinux.com/l10n/am.php3
-# Copyright (C) 2004 Mandriva SA
+# Copyright (C) 2004 Mageia SA
 # Alemayehu Gemeda <alemayehu@gmx.at>, 2004.
 #
 msgid ""
@@ -159,7 +159,7 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -204,7 +204,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 
@@ -423,7 +423,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1440,7 +1440,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1450,8 +1450,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia"
+msgstr "Mageia Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2072,7 +2072,7 @@ msgstr "የተጠቃሚው እይታ"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2260,7 +2260,7 @@ msgstr "የቅርብ መረብ ማገናኛ"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4591,9 +4591,9 @@ msgstr "በእጅ ምርጫ"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5654,7 +5654,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5688,7 +5688,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/ar.po b/po/ar.po
index 2079006..623f70c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -168,7 +168,7 @@ msgstr "عميل DHCP"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "لم تتمّ تهيئة الواجهة بعد.\n"
 "قم بتشغيل مساعد \"أضف واجهة\" من مركز تحكّم ماندريبا لينكس"
@@ -215,7 +215,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "أنت على وشك تهيئة جهازك لمشاركة الإتصال بالإنترنت.\n"
@@ -455,7 +455,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1478,7 +1478,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1488,7 +1488,7 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia"
 msgstr "ﻡﺎﻧﺩﺮﻴﺑﺍ ﻞﻴﻨﻜﺳ"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -2110,7 +2110,7 @@ msgstr "الشّبكة متصلة على الواجهة %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "ليست لديك أية وصلة إنترنت مهيئة.\n"
 "شغّل مساعد \"%s\" من مركز تحكم ماندريبا لينكس"
@@ -2306,7 +2306,7 @@ msgstr "تم الإتصال."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "فشل الاتّصال.\n"
 "تحقق من تهيئتك في مركز تحكّم ماندريبا لينكس."
@@ -4679,15 +4679,15 @@ msgstr "تهيئة يدوية"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "أداة تهيئة drakfirewall\n"
 "\n"
 "هذه الأداة تسمح لك بتهيئة جدار ناري شخصي لنظام ماندريبا لينكس هذا.\n"
 "إذا كنت تريد جدارا ناريا متخصّصاً وفعّالاً، ألق نظرة على\n"
-"توزيعة Mandriva Security Firewall المُتخصّصة."
+"توزيعة Mageia Security Firewall المُتخصّصة."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5811,7 +5811,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5845,7 +5845,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/az.po b/po/az.po
index 08e8d46..7b2e3f4 100644
--- a/po/az.po
+++ b/po/az.po
@@ -2,7 +2,7 @@
 # translation of drakx-net-az.po to Azerbaijani Turkish
 # drakx-net-az.po faylının Azərbaycan dilinə tərcüməsi
 # Copyright (C) 2000,2003, 2004 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva
+# Copyright (c) 2000 Mageia
 # Vasif Ismailoglu MD<azerb_linux@hotmail.com> , 2000-2001
 # Mətin Əmirov <metin@karegen.com>, 2001-2003, 2004.
 #
@@ -166,7 +166,7 @@ msgstr "DHCP alıcısı"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "BU ara üz hələlik quraşdırılmayıb.\n"
 "Ana pəncərədə quraşdırma sehirbazını işə salın"
@@ -213,7 +213,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Kompüterınızi İnternet bağlantısını bölüşdürmək üçün quraşdırırsınız.\n"
@@ -455,7 +455,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1478,7 +1478,7 @@ msgstr "Samba vericisi"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1488,8 +1488,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2110,7 +2110,7 @@ msgstr "Şəbəkə ara üzü"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "BU ara üz hələlik quraşdırılmayıb.\n"
 "Ana pəncərədə quraşdırma sehirbazını işə salın"
@@ -2306,10 +2306,10 @@ msgstr "Bağlantı tamamlandı."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Bağlantı iflas etdi.\n"
-"Mandriva Linux İdarə Mərkəzindən qurğularınızı yoxlayın."
+"Mageia İdarə Mərkəzindən qurğularınızı yoxlayın."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4650,14 +4650,14 @@ msgstr "Əllə quraşdırma"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall quraşdırıcısı\n"
 "\n"
-"Bu, Mandriva Linux sisteminiz üçün şəxsi bir atəş divarını quraşdıracaq.\n"
-"Daha güclü və e'tibarlı sistem üçün xahiş edirik, xüsusi Mandriva Security\n"
+"Bu, Mageia sisteminiz üçün şəxsi bir atəş divarını quraşdıracaq.\n"
+"Daha güclü və e'tibarlı sistem üçün xahiş edirik, xüsusi Mageia Security\n"
 "Firewall buraxılışı ilə maraqlanın."
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5769,7 +5769,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5803,7 +5803,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/be.po b/po/be.po
index 418fefe..2a4cf30 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 1999 Mandriva.
+# Copyright (C) 1999 Mageia.
 # Alexander Bokovoy <ab@avilink.net>, 2000
 # Maryia Davidouskaia <maryia@scientist.com>, 2000
 msgid ""
@@ -159,7 +159,7 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -204,7 +204,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 
@@ -425,7 +425,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1444,7 +1444,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1454,8 +1454,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2076,7 +2076,7 @@ msgstr "Сеткавы інтэрфейс"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2264,7 +2264,7 @@ msgstr "Імя злучэння"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4598,9 +4598,9 @@ msgstr "Захаваць канфігурацыю меню"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5671,7 +5671,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5705,7 +5705,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/bg.po b/po/bg.po
index 76dc29c..e742622 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,6 +1,6 @@
 # translation of drakx-net-bg.po to Bulgarian
 # Copyright (C) 2000,2003 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva
+# Copyright (c) 2000 Mageia
 #
 #
 # Bozhan Boiadzhiev <bozhan@plov.omega.bg>, 2000.
@@ -13,7 +13,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-03-19 00:24+0200\n"
 "Last-Translator: Kolio Kolev <kolio_kolev@biotronica.net>\n"
-"Language-Team: Mandriva User Group - Bulgaria <mandriva-bg@googlegroups."
+"Language-Team: Mageia User Group - Bulgaria <mandriva-bg@googlegroups."
 "com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -169,7 +169,7 @@ msgstr "DHCP клиент"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -214,7 +214,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "На път сте да настроите компютъра си така, че да поделя Интернет връзката\n"
@@ -363,7 +363,7 @@ msgstr "Възможен конфликт с адресите в LAN с наст
 #: ../bin/drakgw:204
 #, fuzzy, c-format
 msgid "Domain Name Server (DNS) configuration"
-msgstr "Конфигурация на Терминален Сървър в Mandriva Linux"
+msgstr "Конфигурация на Терминален Сървър в Mageia"
 
 #: ../bin/drakgw:208
 #, c-format
@@ -456,7 +456,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1478,8 +1478,8 @@ msgstr "Samba Сървър"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s by Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1488,8 +1488,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2110,7 +2110,7 @@ msgstr "Мрежов интерфейс"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Нямате Internet връзка.\n"
 "Създайте такава, като цъкнете на 'Настрой'"
@@ -2304,10 +2304,10 @@ msgstr "Връзката е установена."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Връзката пропадна.\n"
-"Проверете вашите настройки в Mandriva Linux контролен център."
+"Проверете вашите настройки в Mageia контролен център."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4647,15 +4647,15 @@ msgstr "Ръчна настройка"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Настройчик за малка защитна стена\n"
 "\n"
-"Това настройва персонална защитна стена за тази Mandriva Linux машина.\n"
+"Това настройва персонална защитна стена за тази Mageia машина.\n"
 "За мощно постветено на защитата решение, моле, погледнете специализираната\n"
-"Mandriva Security Firewall дистрибуция."
+"Mageia Security Firewall дистрибуция."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5778,7 +5778,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5812,7 +5812,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/bn.po b/po/bn.po
index 840c277..3b2cb5d 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -164,7 +164,7 @@ msgstr "DHCP ক্লায়েন্ট"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "এই ইন্টারফেস এখনো কন্‌ফিগার করা হয়নি।\n"
 "ম্যান্ড্রিব লিনাক্স নিয়ন্ত্রক কেন্দ্র থেকে সহকারী \"ইন্টারফেস যুক্ত করো\" চালান"
@@ -211,7 +211,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "আপনি আপনার কম্পিউটারের ইন্টারনেট সংযুক্তি ভাগাভাগি করার জন্য কন্‌ফিগার প্রায় করে "
@@ -454,7 +454,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1480,7 +1480,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1490,8 +1490,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "ম্যান্ড্রিব লিনাক্স (Mandriva Linux)"
+msgid "Mageia"
+msgstr "ম্যান্ড্রিব লিনাক্স (Mageia)"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2114,10 +2114,10 @@ msgstr "নেটওয়ার্ট %s ইন্টারফেস এ চাল
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "আপনার সিস্টেমে কোন ইন্টারনেট সংযোগ কনফিগার করা নেই।\n"
-"অনুগ্রহপূর্বক Mandriva Linux নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"
+"অনুগ্রহপূর্বক Mageia নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, fuzzy, c-format
@@ -2310,7 +2310,7 @@ msgstr "সংযোগ সম্পন্ন হয়েছে।"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "কানেকশন হয়নি।\n"
 "ম্যান্ড্রিব -লিনাক্স কন্ট্রোল প্যানেলে আপনার কনফিগারেশন যাচাই করুন।"
@@ -4688,9 +4688,9 @@ msgstr "স্বনির্বাচিত কনফিগারেশন"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "ড্র্যাকফায়ারওয়াল কন্‌ফিগারেটর\n"
 "\n"
@@ -5830,7 +5830,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5864,7 +5864,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/br.po b/po/br.po
index ec39928..2c31328 100644
--- a/po/br.po
+++ b/po/br.po
@@ -1,5 +1,5 @@
 # drakx-net e Brezhoneg.
-# Copyright (C) 1999-2005 Mandriva
+# Copyright (C) 1999-2005 Mageia
 # Thierry Vignaud <tvignaud@mandriva.com>, 1999-2006
 # Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>, 1999-2000
 #
@@ -161,7 +161,7 @@ msgstr "Kliant DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -206,7 +206,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 
@@ -429,7 +429,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1446,8 +1446,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s gant Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s gant Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1456,8 +1456,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2080,7 +2080,7 @@ msgstr "Marv eo ar rouedad war an etrefas %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2268,10 +2268,10 @@ msgstr "Echu eo ar gevreadenn."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Sac'het eo ar gevreadenn.\n"
-"Gwiriit ho kefluniadur er c'hreizenn ren Mandriva Linux."
+"Gwiriit ho kefluniadur er c'hreizenn ren Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4604,9 +4604,9 @@ msgstr "Kefluniadur ar moger-tan"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5701,7 +5701,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5735,7 +5735,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/bs.po b/po/bs.po
index 011c984..c8c1064 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -166,10 +166,10 @@ msgstr "DHCP klijent"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Interfejs još nije podešen.\n"
-"Pokrenite asistent \"Dodaj interfejs\" iz Mandriva Linux Kontrolnog centra"
+"Pokrenite asistent \"Dodaj interfejs\" iz Mageia Kontrolnog centra"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -213,7 +213,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Sada ćete konfigurisati vaš računar za dijeljenje Internet konekcije.\n"
@@ -455,7 +455,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1532,8 +1532,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1542,8 +1542,8 @@ msgstr "Ovo je jednostavan alat za upravljanje konfiguracijom Sambe."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2174,10 +2174,10 @@ msgstr "Mreža je prekinuta na interfejsu %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Niste podesili nijednu Internet konekciju.\n"
-"Pokrenite asistent \"%s\" iz Mandriva Linux Kontrolnog centra"
+"Pokrenite asistent \"%s\" iz Mageia Kontrolnog centra"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2370,10 +2370,10 @@ msgstr "Spajanje uspjelo."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Spajanje nije uspjelo.\n"
-"Provjerite konfiguraciju u Mandriva Linux Kontrolnom centru."
+"Provjerite konfiguraciju u Mageia Kontrolnom centru."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4755,15 +4755,15 @@ msgstr "Podešavanje firewalla"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall podešavanje\n"
 "\n"
-"Podesite lični firewall na ovom Mandriva Linux računaru.\n"
+"Podesite lični firewall na ovom Mageia računaru.\n"
 "Ako želite moćnu soluciju posebnog firewalla, molim pogledajte\n"
-"specijaliziranu Mandriva Security Firewall distribuciju."
+"specijaliziranu Mageia Security Firewall distribuciju."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5902,7 +5902,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5945,14 +5945,14 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Neki od potrebnih paketa (%s) nisu dostupni."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, fuzzy, c-format
 msgid ""
 "These packages can be found in %s, or in the official %s package repository."
 msgstr ""
-"Ovi paketi se mogu naći u Mandriva Klubu ili na komercijalnim izdanjima "
+"Ovi paketi se mogu naći u Mageia Klubu ili na komercijalnim izdanjima "
 "Mandrive."
 
 #: ../lib/network/thirdparty.pm:154
diff --git a/po/ca.po b/po/ca.po
index 91874a9..558415e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -166,11 +166,11 @@ msgstr "Client DHCP"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Aquesta interfície encara no s'ha configurat.\n"
 "Executeu l'auxiliar \"Afegeix una interfície\" del Centre de Control de "
-"Mandriva Linux"
+"Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -214,7 +214,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Ara es configurarà l'ordinador per tal que comparteixi la connexió a "
@@ -460,7 +460,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1500,7 +1500,7 @@ msgstr "Servidor Samba"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1510,8 +1510,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2134,10 +2134,10 @@ msgstr "La xarxa està activa a la interfície %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Aquesta interfície encara no s'ha configurat.\n"
-"Executeu l'auxiliar \"%s\" del Centre de Control de Mandriva Linux"
+"Executeu l'auxiliar \"%s\" del Centre de Control de Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, fuzzy, c-format
@@ -2332,10 +2332,10 @@ msgstr "Connexió completa."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "La connexió ha fallat.\n"
-"Comproveu la vostra configuració al Centre de control de Mandriva Linux."
+"Comproveu la vostra configuració al Centre de control de Mageia."
 
 #
 #: ../bin/net_monitor:360
@@ -4701,16 +4701,16 @@ msgstr "Configuració manual"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Configuració del drakfirewall\n"
 "\n"
-"Aquí es configura un tallafocs personal per a aquest ordinador Mandriva "
+"Aquí es configura un tallafocs personal per a aquest ordinador Mageia "
 "Linux.\n"
 "Per a una potent solució de tallafocs dedicada, consulteu si us plau la \n"
-"distribució especialitzada Mandriva Security Firewall."
+"distribució especialitzada Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5845,7 +5845,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5879,15 +5879,15 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Calen alguns paquets (%s) però no estan disponibles."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, fuzzy, c-format
 msgid ""
 "These packages can be found in %s, or in the official %s package repository."
 msgstr ""
-"Aquests paquets es poden trobar al Mandriva Club o a les versions comercials "
-"de Mandriva."
+"Aquests paquets es poden trobar al Mageia Club o a les versions comercials "
+"de Mageia."
 
 #: ../lib/network/thirdparty.pm:154
 #, c-format
diff --git a/po/cs.po b/po/cs.po
index 448d9a8..6cd2251 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -167,10 +167,10 @@ msgstr "DHCP klient"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Toto rozhraní ještě nebylo nastaveno.\n"
-"Spusťte průvodce \"%s\" z Ovládacího centra Mandriva Linux"
+"Spusťte průvodce \"%s\" z Ovládacího centra Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -214,7 +214,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Váš počítač bude nastaven, aby nabízel sdílení svého internetového "
@@ -227,7 +227,7 @@ msgstr ""
 "síťové připojení a připojení k internetu .\n"
 "\n"
 "Pozn.: Pro nastavení lokální sítě (LAN) potřebujete vyhrazený síťový "
-"adaptér. Před pokračováním prosím vypněte Mandriva firewall pro adaptér "
+"adaptér. Před pokračováním prosím vypněte Mageia firewall pro adaptér "
 "připojený do vaší LAN sítě."
 
 #: ../bin/drakgw:91
@@ -467,7 +467,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Na vašem systému nebyl nalezen žádný ethernetový síťový adaptér nastavený "
@@ -475,7 +475,7 @@ msgstr ""
 "\n"
 "Spusťte prosím nástroj pro nastavení hardware pro jeho nastavení a ujistěte "
 "se, že na síťovém adaptéru připojeném do lokální sítě není povolena ochrana "
-"pomocí Mandriva firewall."
+"pomocí Mageia firewall."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -1557,8 +1557,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright ©%s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright ©%s by Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1567,8 +1567,8 @@ msgstr "Toto je jednoduchý nástroj určený pro snadnou správu protokolu Samb
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2228,10 +2228,10 @@ msgstr "Síť na rozhraní %s je zastavena."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Nemáte nastaveno žádné připojení k internetu.\n"
-"Spusťte průvodce \"%s\" z Ovládacího centra Mandriva Linux"
+"Spusťte průvodce \"%s\" z Ovládacího centra Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2422,10 +2422,10 @@ msgstr "Připojení ukončeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Připojení selhalo.\n"
-"Ověřte nastavení v ovládacím centru Mandriva Linux."
+"Ověřte nastavení v ovládacím centru Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4877,15 +4877,15 @@ msgstr "Nastavení firewallu"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Nastavení aplikace drakfirewall\n"
 "\n"
-"Zde je možné nastavit osobní firewall pro tento systém Mandriva Linux.\n"
+"Zde je možné nastavit osobní firewall pro tento systém Mageia.\n"
 "Pro výkonné řešení vyhrazeného firewallu použijte specializovanou\n"
-"distribuci Mandriva Security Firewall."
+"distribuci Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6021,7 +6021,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6033,7 +6033,7 @@ msgstr ""
 "\n"
 "Pokud hodláte použít sdílení připojení k síti Internet nástrojem "
 "společnosti\n"
-"Mandriva, nevybírejte rozhraní připojené k vaší lokální síti.\n"
+"Mageia, nevybírejte rozhraní připojené k vaší lokální síti.\n"
 "\n"
 "Která rozhraní chcete chránit?\n"
 
@@ -6069,7 +6069,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Jsou vyžadovány některé balíčky (%s), ale nejsou k dispozici."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/cy.po b/po/cy.po
index 7022413..54d6550 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Mandriva drakx-net.cy\n"
+"Project-Id-Version: Mageia drakx-net.cy\n"
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-10-01 20:10-0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
@@ -165,10 +165,10 @@ msgstr "Cleient DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Nid yw'r rhyngwyneb hwn wedi ei ffurfweddu eto.\n"
-"Cychwynnwch y cynorthwyydd \"%s\" o Ganolfan Rheoli Mandriva Linux"
+"Cychwynnwch y cynorthwyydd \"%s\" o Ganolfan Rheoli Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -212,7 +212,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Rydych ar fin ffurfweddu eich cyfrifiadur i rannu ei gysylltiad Rhyngrwyd\n"
@@ -223,7 +223,7 @@ msgstr ""
 "gyda drakconnect cyn mynd ymhellach.\n"
 "\n"
 "Sylwer: bydd angen Addasydd Rhwydwaith un-pwrpas i greu Rhwydwaith Lleol "
-"(LAN). Anablwch Mandriva Firewall ar gyfer yr addasydd rhwydwaith sy'n "
+"(LAN). Anablwch Mageia Firewall ar gyfer yr addasydd rhwydwaith sy'n "
 "gysylltiedig â'ch cysylltiad LAN cyn cychwyn."
 
 #: ../bin/drakgw:91
@@ -469,14 +469,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Nid oes addasydd rhwydwaith ethernet wedi ei ffurfweddu ar gyfer LAN wedi ei "
 "ganfod ar eich system.\n"
 "\n"
 "Defnyddiwch yr offeryn ffurfweddu caledwedd i'w ffurfweddu, gan ofalu nad yw "
-"mur cadarn Mandriva wedi ei alluogi ar gyfer addasydd rhwydwaith ar eich "
+"mur cadarn Mageia wedi ei alluogi ar gyfer addasydd rhwydwaith ar eich "
 "rhwydwaith LAN."
 
 #: ../bin/drakgw:316
@@ -1564,8 +1564,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Hawlfraint (C) %s  Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Hawlfraint (C) %s  Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1574,8 +1574,8 @@ msgstr "Dyma offeryn syml i reol ffurfweddu Samba."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2226,10 +2226,10 @@ msgstr "Mae'r rhwydwaith i lawr ar ryngwyneb %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Nid oes gennych gyswllt wedi ei ffurfweddu â'r Rhyngrwyd.\n"
-"Cychwynnwch gynorthwy-ydd \"%s\" o Ganolfan Rheoli Mandriva"
+"Cychwynnwch gynorthwy-ydd \"%s\" o Ganolfan Rheoli Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2420,10 +2420,10 @@ msgstr "Cysylltiad wedi ei gwblhau."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Methodd y cysylltiad.\n"
-"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandriva Linux."
+"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4870,15 +4870,15 @@ msgstr "Ffurfweddiad mur cadarn"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "ffurfweddiadur drakfirewall\n"
 "\n"
 "Mae hwn yn ffurfweddu mur gwarchod personol ar gyfer y peiriant \n"
-"Mandriva Linux hwn. Am fur gwarchod pwrpasol pwerus, \n"
-"edrychwch ddosbarthiad arbenigol Mandriva Security Firewall."
+"Mageia hwn. Am fur gwarchod pwrpasol pwerus, \n"
+"edrychwch ddosbarthiad arbenigol Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6026,7 +6026,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6036,7 +6036,7 @@ msgstr ""
 "Bydd pob rhyngwyneb sydd wedi ei gysylltu â'r Rhyngrwyd gael ei ddewis,\n"
 "nid oes angen dewis y rhai sydd wedi eu cysylltu â'r rhwydweithiau lleol.\n"
 "\n"
-"Os ydych yn bwriadu defnyddio rhannu Cysylltiad Rhyngrwyd Mandriva,\n"
+"Os ydych yn bwriadu defnyddio rhannu Cysylltiad Rhyngrwyd Mageia,\n"
 "dad-ddewis rhyngwynebau sy'n gysylltiedig â'r rhwydwaith lleol.\n"
 "\n"
 "Pa ryngwynebau sydd i'w diogelu?\n"
@@ -6073,7 +6073,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Mae angen rhai pecynnau (%s) ond nid ydynt ar gael."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/da.po b/po/da.po
index c23c225..e410316 100644
--- a/po/da.po
+++ b/po/da.po
@@ -167,10 +167,10 @@ msgstr "DHCP-klient"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Dette grænsesnit er ikke blevet konfigureret endnu.\n"
-"Kør '%s'-hjælperen fra Mandriva Linux Kontrolcentret"
+"Kør '%s'-hjælperen fra Mageia Kontrolcentret"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -214,7 +214,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Du er ved at konfigurere din maskine til at dele dens internetforbindelse.\n"
@@ -225,7 +225,7 @@ msgstr ""
 "drakconnect før du går videre.\n"
 "\n"
 "Bemærk: du skal bruge en netværksadapter afsat kun til dette formål, for at "
-"lave et lokalnet (LAN). Deaktivér Mandriva brandmur for netværksadapteren "
+"lave et lokalnet (LAN). Deaktivér Mageia brandmur for netværksadapteren "
 "forbundet til dit lokalnet før du går videre."
 
 #: ../bin/drakgw:91
@@ -466,14 +466,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Ingen ethernet netværksadapter konfigureret for LAN er blevet fundet på dit "
 "system.\n"
 "\n"
 "Kør konfigurationsværktøjet for udstyr for at konfigurere den, and forsikr "
-"dig om at Mandriva brandmuren ikke er aktiveret for en netværksadapter "
+"dig om at Mageia brandmuren ikke er aktiveret for en netværksadapter "
 "forbundet til dit lokalnet."
 
 #: ../bin/drakgw:316
@@ -1559,8 +1559,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Ophavsret © %s ved Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Ophavsret © %s ved Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1569,8 +1569,8 @@ msgstr "Dette er et simpelt værktøj til nemt at håndtere Samba-konfigurering.
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2224,10 +2224,10 @@ msgstr "Netværket er nede på grænsesnittet %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Du har ikke konfigureret nogen internetforbindelser.\n"
-"Kør '%s'-hjælperen fra Mandriva Linux Kontrolcentret"
+"Kør '%s'-hjælperen fra Mageia Kontrolcentret"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2418,10 +2418,10 @@ msgstr "Opkobling fuldført."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Tilslutning mislykkedes.\n"
-"Kontrollér konfigurationen i Mandrivas kontrolcentral."
+"Kontrollér konfigurationen i Mageias kontrolcentral."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4873,15 +4873,15 @@ msgstr "Konfiguration af brandmur"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall-konfigurator\n"
 "\n"
-"Dette konfigurerer en personlig brandmur for denne Mandriva Linux-maskine.\n"
+"Dette konfigurerer en personlig brandmur for denne Mageia-maskine.\n"
 "For en stærk dedikeret brandmurs-løsning se venligst den specialiserede "
-"Mandriva Security Firewall-distribution."
+"Mageia Security Firewall-distribution."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6019,7 +6019,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6030,7 +6030,7 @@ msgstr ""
 "mens grænseflader opkoblet til det lokale netværk ikke behøver at blive "
 "valgt.\n"
 "\n"
-"Hvis du planlægger at bruge deling af Mandriva Internet forbindelse,\n"
+"Hvis du planlægger at bruge deling af Mageia Internet forbindelse,\n"
 "så fravælg grænseflader som skal forbindes til lokalnettet.\n"
 "\n"
 "Hvilke grænseflader ønsker du at beskytte?\n"
@@ -6066,7 +6066,7 @@ msgstr "Nogen komponenter ('%s') behøves, men er ikke tilgængelige for %s-udst
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Nogen pakker (%s) behøves, men er ikke tilgængelige."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/de.po b/po/de.po
index ce2340f..914f110 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # translation of de.po to
-# german translation of the MandrivaInstaller.
-# Copyright (C) 2000-2003 Mandriva S.A.
+# german translation of the MageiaInstaller.
+# Copyright (C) 2000-2003 Mageia S.A.
 #
 #
 # Stefan Siegel <siegel@linux-mandrake.com>, 2000, 2001, 2002, 2003.
@@ -28,7 +28,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2010-03-08 18:06-0300\n"
 "Last-Translator: Sergio Rafael Lemke <sergio@mandriva.com.br>\n"
-"Language-Team: Brazilian Portuguese <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Brazilian Portuguese <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -184,10 +184,10 @@ msgstr "DHCP-Client"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Diese Schnittstelle wurde noch nicht eingerichtet.\n"
-"Starten Sie den %s Assistenten im Mandriva Linux Kontrollzentrum"
+"Starten Sie den %s Assistenten im Mageia Kontrollzentrum"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -231,7 +231,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Sie sind dabei, Ihren Rechner so zu konfigurieren, dass er die "
@@ -242,7 +242,7 @@ msgstr ""
 "mit DrakConnect eingerichtet haben, bevor Sie fortfahren.\n"
 "\n"
 "Anmerkung: Sie benötigen eine Netzwerkkarte, mit deren Hilfe Sie ein \n"
-"lokales Netz (LAN) aufsetzen können. Bitte deaktivieren sie die Mandriva "
+"lokales Netz (LAN) aufsetzen können. Bitte deaktivieren sie die Mageia "
 "Firewall für die Netzwerkkarte die mit dem LAN verbunden ist, bevor sie "
 "fortfahren."
 
@@ -491,14 +491,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Keine für ein LAN konfigurierte Netzwerkkarte wurde in Ihrem System "
 "gefunden.\n"
 "\n"
 "Starten Sie bitte das Hardware Konfigurations Tool um sie zu konfigurieren "
-"und stellen Sie sicher, dass die Mandriva Firewall für die Karte welche mit "
+"und stellen Sie sicher, dass die Mageia Firewall für die Karte welche mit "
 "dem LAN verbunden ist nicht aktiviert ist."
 
 #: ../bin/drakgw:316
@@ -1583,8 +1583,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright·(C)·%s·bei·Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright·(C)·%s·bei·Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1593,8 +1593,8 @@ msgstr "Dies ist ein einfaches Werkzeug um Samba leicht zu konfigurieren."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2261,10 +2261,10 @@ msgstr "Netzwerk auf Schnittstelle %s ist inaktiv."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Sie haben noch keine eingerichtete Internetverbindung.\n"
-"Starten Sie den Assistenten „%s“ im Mandriva Linux Kontrollzentrum"
+"Starten Sie den Assistenten „%s“ im Mageia Kontrollzentrum"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2457,10 +2457,10 @@ msgstr "Verbindung fertiggestellt."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Verbinden fehlgeschlagen.\n"
-"Überprüfen Sie Ihre Konfiguration im Mandriva Linux Kontrollzentrum."
+"Überprüfen Sie Ihre Konfiguration im Mageia Kontrollzentrum."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4917,16 +4917,16 @@ msgstr "Firewall Konfiguration"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "DrakFirewall-Konfigurator\n"
 "\n"
 "Hiermit konfigurieren Sie eine persönliche Firewall für diesen\n"
-"Mandriva Linux-Rechner. Sollten Sie an einer speziellen ausgereiften\n"
+"Mageia-Rechner. Sollten Sie an einer speziellen ausgereiften\n"
 "Firewall-Lösung interessiert sein, schauen Sie sich nach der speziell\n"
-"dafür entwickelten Mandriva Security-Firewall-Distribution um."
+"dafür entwickelten Mageia Security-Firewall-Distribution um."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6078,7 +6078,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6126,7 +6126,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Einige Pakete (%s) werden benötigt, sind jedoch nicht verfügbar."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/drakx-net.pot b/po/drakx-net.pot
index fe69928..a22388d 100644
--- a/po/drakx-net.pot
+++ b/po/drakx-net.pot
@@ -146,7 +146,7 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -187,7 +187,7 @@ msgid ""
 "\n"
 "Make sure you have configured your Network/Internet access using drakconnect before going any further.\n"
 "\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mandriva Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
 msgstr ""
 
 #: ../bin/drakgw:91
@@ -368,7 +368,7 @@ msgstr ""
 msgid ""
 "No ethernet network adapter configured for LAN has been detected on your system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mandriva firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
 msgstr ""
 
 #: ../bin/drakgw:316
@@ -1314,7 +1314,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1324,7 +1324,7 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia"
 msgstr ""
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -1916,7 +1916,7 @@ msgstr ""
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2102,7 +2102,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -3845,9 +3845,9 @@ msgstr ""
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -4867,7 +4867,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -4902,7 +4902,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/el.po b/po/el.po
index 50a630c..e80ac31 100644
--- a/po/el.po
+++ b/po/el.po
@@ -173,10 +173,10 @@ msgstr "πελάτης DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Αυτή η σύνδεση δεν έχει ρυθμιστή ακόμα. \n"
-"Εκτελέστε τον οδηγό \"%s\" από το Κέντρο Ελέγχου του Mandriva Linux"
+"Εκτελέστε τον οδηγό \"%s\" από το Κέντρο Ελέγχου του Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -220,7 +220,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Πρόκειται να ρυθμίσετε τον υπολογιστή σας, για να μοιράζεται την σύνδεσή του "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "Σημείωση: Για να ρυθμίσετε το Τοπικό σας Δίκτυο (LAN), θα πρέπει να έχετε "
 "μια κάρτα δικτύου. Παρακαλώ, πριν προχωρήσετε παρακάτω, απενεργοποιείστε το "
-"Τοίχος Προστασίας της Mandriva για την κάρτα δικτύου, που συνδέεται στην "
+"Τοίχος Προστασίας της Mageia για την κάρτα δικτύου, που συνδέεται στην "
 "σύνδεση του τοπικού δικτύου."
 
 #: ../bin/drakgw:91
@@ -478,14 +478,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Δεν έχει βρεθεί στο σύστημά σου κάποιος προσαρμογέας δικτύου ethernet, "
 "ρυθμισμένος για τοπικό δίκτυο (LAN).\n"
 "\n"
 "Παρακαλώ, άνοιξε το εργαλείο ρύθμισης του υλικού, για να τον ρυθμίσεις, και "
-"σιγουρέψου ότι το τοίχος προστασίας Mandriva, δεν περιορίζει την σύνδεση του "
+"σιγουρέψου ότι το τοίχος προστασίας Mageia, δεν περιορίζει την σύνδεση του "
 "προσαρμογέα δικτύου με το τοπικό δίκτυο."
 
 #: ../bin/drakgw:316
@@ -1584,7 +1584,7 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr "Copyright (C)%s by mandriva"
 
 #: ../bin/draksambashare:198
@@ -1594,8 +1594,8 @@ msgstr "Ένα απλό εργαλείο για εύκολη διαχείρισ�
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2266,10 +2266,10 @@ msgstr "Το δίκτυο είναι απενεργοποιημένο στην �
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Δεν έχεις κάποια ρυθμισμένη σύνδεση Διαδικτύου.\n"
-"Εκτέλεσε τον οδηγό \"%s\" από το Κέντρο Ελέγχου του Mandriva Linux"
+"Εκτέλεσε τον οδηγό \"%s\" από το Κέντρο Ελέγχου του Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2462,10 +2462,10 @@ msgstr "Η σύνδεση έγινε."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Η σύνδεση απέτυχε.\n"
-"Επαληθεύστε τις ρυθμίσεις σας στο Κέντρο Ελέγχου Mandriva Linux."
+"Επαληθεύστε τις ρυθμίσεις σας στο Κέντρο Ελέγχου Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4872,7 +4872,7 @@ msgstr "Εξυπηρετητής Telnet"
 #: ../lib/network/drakfirewall.pm:56
 #, c-format
 msgid "NFS Server"
-msgstr "NFS Εξυπηρετητής"
+msgstr "Εξυπηρετητής NFS"
 
 #: ../lib/network/drakfirewall.pm:64
 #, c-format
@@ -4940,17 +4940,17 @@ msgstr "Ρύθμιση Τοίχους Προστασίας"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Ρύθμιση drakfirewall\n"
 "\n"
 "Εδώ μπορείτε να ρυθμίσετε το προσωπικό σας firewall για αυτό το μηχάνημα "
-"Mandriva Linux.\n"
+"Mageia.\n"
 "Εάν επιθυμείτε ένα τοίχος προστασίας εξαιρετικά ισχυρό, ενημερωθείτε "
 "σχετικά\n"
-"με την ειδικευμένη διανομή « Mandriva Security »."
+"με την ειδικευμένη διανομή « Mageia Security »."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6099,7 +6099,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6148,7 +6148,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Μερικά πακέτα  (%s) είναι απαραίτητα αλλά δεν είναι διαθέσιμα."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/eo.po b/po/eo.po
index fe9036f..5dff611 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,5 +1,5 @@
 # Esperanto drakbootdisk
-# Copyright (C) 2000, 2001 Mandriva
+# Copyright (C) 2000, 2001 Mageia
 # D. Dale Gulledge <dsplat@rochester.rr.com>, 2000.
 #
 msgid ""
@@ -160,7 +160,7 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -205,7 +205,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Nun kiam via Interreta konekto estas konfigurata,\n"
@@ -432,7 +432,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr "NIS Servilo"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1461,8 +1461,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2083,7 +2083,7 @@ msgstr "Reta interfaco"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2271,7 +2271,7 @@ msgstr "Speco de konekto"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4605,9 +4605,9 @@ msgstr "Interreta Konfigurado"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5696,7 +5696,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5730,7 +5730,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/es.po b/po/es.po
index 28f9b1d..4bd6881 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # translation of es.po to Spanish
 # traducción de drakx-net-es.po to Español
 # spanish translation of drakx-net
-# Copyright (C) 2000, 2001,2002 Mandriva S.A.
+# Copyright (C) 2000, 2001,2002 Mageia S.A.
 #
 # Fabián Mandelbaum <fmandelbaum@gmail.com>, 2000-2003, 2004, 2006-2008.
 # Pablo Saratxaga <pablo@mandriva.com>, 2004, 2006.
@@ -193,10 +193,10 @@ msgstr "Cliente DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Todavía no se ha configurado esta interfaz.\n"
-"Lance el asistente «%s» desde el Centro de Control de Mandriva Linux"
+"Lance el asistente «%s» desde el Centro de Control de Mageia"
 
 #: ../bin/drakconnect-old:247
 #: ../bin/net_applet:104
@@ -242,14 +242,14 @@ msgid ""
 "\n"
 "Make sure you have configured your Network/Internet access using drakconnect before going any further.\n"
 "\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mandriva Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
 msgstr ""
 "Está a punto de configurar su computadora para compartir la conexión a Internet.\n"
 "Con este recurso, otras computadoras de su red local podrán utilizar la conexión a Internet de esta computadora.\n"
 "\n"
 "Debe asegurarse que ha configurado su acceso a la Red/Internet utilizando drakconnect antes de proceder.\n"
 "\n"
-"Nota: necesita de un Adaptador de Red dedicado para configurar una Red de Área Local (LAN). En primero, desactive el Mandriva Firewall para la tarjeta de red conectada en su red local."
+"Nota: necesita de un Adaptador de Red dedicado para configurar una Red de Área Local (LAN). En primero, desactive el Mageia Firewall para la tarjeta de red conectada en su red local."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -516,11 +516,11 @@ msgstr "Difundir información de la impresora"
 msgid ""
 "No ethernet network adapter configured for LAN has been detected on your system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mandriva firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
 msgstr ""
 "No ethernet network adapter configured for LAN has been detected on your system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mandriva firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -1608,8 +1608,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s por Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright © %s por Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1618,8 +1618,8 @@ msgstr "Esta es una herramienta sencilla para administrar con facilidad la confi
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2226,10 +2226,10 @@ msgstr "La red no está activa en la interfaz %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Todavía no tiene configurada una conexión a Internet.\n"
-"Ejecute el asistente \"%s\" desde el Centro de Control de Mandriva Linux"
+"Ejecute el asistente \"%s\" desde el Centro de Control de Mageia"
 
 #: ../bin/net_applet:106
 #: ../lib/network/connection_manager.pm:206
@@ -2434,10 +2434,10 @@ msgstr "Conexión completa."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Falló la conexión.\n"
-"Verifique su configuración en el Centro de Control de Mandriva Linux."
+"Verifique su configuración en el Centro de Control de Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4866,15 +4866,15 @@ msgstr "Configuración del cortafuegos"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Configurador de drakfirewall\n"
 "\n"
-"Esto configura un cortafuegos personal para esta máquina Mandriva Linux.\n"
+"Esto configura un cortafuegos personal para esta máquina Mageia.\n"
 "Para una solución potente de cortafuegos dedicada, por favor eche un vistazo\n"
-"a la distribución especializada Mandriva Security Firewall."
+"a la distribución especializada Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5988,7 +5988,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5998,7 +5998,7 @@ msgstr ""
 "Debería seleccionar todas las interfaces conectadas a la Internet,\n"
 "a la vez que deseleccionar todas aquellas conectadas a la red local.\n"
 "\n"
-"Si pretende utilizar la compartición de Conexión a Internet de Mandriva,\n"
+"Si pretende utilizar la compartición de Conexión a Internet de Mageia,\n"
 "deseleccione las interfaces que estarán conectadas a la red local.\n"
 "¿Qué interfaces se deberían proteger?\n"
 
@@ -6033,7 +6033,7 @@ msgstr "Se necesitan algunos componentes (%s), pero no están disponibles para e
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Se necesitan algunos paquetes (%s), pero no están disponibles."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/et.po b/po/et.po
index 68c192e..bbb6330 100644
--- a/po/et.po
+++ b/po/et.po
@@ -163,10 +163,10 @@ msgstr "DHCP klient"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Seda liidest ei ole veel seadistatud.\n"
-"Käivitage Mandriva Linuxi juhtimiskeskuses nõustaja \"%s\""
+"Käivitage Mageiai juhtimiskeskuses nõustaja \"%s\""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -210,7 +210,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Nüüd on Teil võimalik seadistada oma arvuti internetiühendust jagama.\n"
@@ -221,7 +221,7 @@ msgstr ""
 "drakconnecti abil.\n"
 "\n"
 "Märkus: kohtvõrgu (LAN) jaoks on vajalik eraldi võrgukaardi olemasolu. Palun "
-"lülitage LAN-iga seotud võrgukaardi puhul enne jätkamist välja Mandriva "
+"lülitage LAN-iga seotud võrgukaardi puhul enne jätkamist välja Mageia "
 "tulemüür."
 
 #: ../bin/drakgw:91
@@ -460,7 +460,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Teie süsteemis ei leitud ühtegi kohtvõrgu jaoks seadistatud Etherneti "
@@ -468,7 +468,7 @@ msgstr ""
 "\n"
 "Palun käivitage selle seadistamiseks riistvara seadistuste tööriist ja "
 "kontrollige, et kohtvõrguga ühendatud võrgukaardil poleks sisse lülitatud "
-"Mandriva tulemüür."
+"Mageia tulemüür."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -1551,8 +1551,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Autoriõigus (C) %s: Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Autoriõigus (C) %s: Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1561,8 +1561,8 @@ msgstr "See on lihtne tööriist Samba seadistuste hõlpsaks haldamiseks."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2212,10 +2212,10 @@ msgstr "Võrk ei tööta liideses %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Internetiühendust ei ole veel seadistatud.\n"
-"Käivitage Mandriva Linuxi juhtimiskeskuses nõustaja \"%s\""
+"Käivitage Mageiai juhtimiskeskuses nõustaja \"%s\""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2406,10 +2406,10 @@ msgstr "Ühendus on loodud."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Ühenduse loomine nurjus.\n"
-"Kontrollige palun seadistusi Mandriva Linuxi juhtimiskeskuse abil."
+"Kontrollige palun seadistusi Mageiai juhtimiskeskuse abil."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4854,15 +4854,15 @@ msgstr "Tulemüüri seadistused"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewalli seadistaja\n"
 "\n"
 "Selle tööriistaga saate luua lihtsa kaitse interneti ohtude vastu.\n"
 "Kui vajate võimsat tulemüüri, vaadake palun\n"
-"spetsiaalset Mandriva Security Firewall distributsiooni."
+"spetsiaalset Mageia Security Firewall distributsiooni."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5998,7 +5998,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6008,7 +6008,7 @@ msgstr ""
 "Valida tuleks kõik otse internetti ühendatud liidesed,\n"
 "samas kohtvõrgu ühendatud liidesed võib ka valimata jätta.\n"
 "\n"
-"Kui kavatsete kasutada Mandriva internetiühenduse jagamist,\n"
+"Kui kavatsete kasutada Mageia internetiühenduse jagamist,\n"
 "ärge valige liideseid, mis ühendatakse kohtvõrku.\n"
 "\n"
 "Milliseid liideseid tuleks kaitsta?\n"
@@ -6045,7 +6045,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Mõned paketid (%s) on vajalikud, kuid pole saadaval."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/eu.po b/po/eu.po
index f660611..35b0df6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,5 +1,5 @@
 # translation of drakx-net.po to Euskara
-# EUSKARA: Mandriva Linux translation.
+# EUSKARA: Mageia translation.
 # Copyright (C) 2002,2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # Iñigo Salvador Azurmendi <xalba@euskalnet.net>, 2001-2002,2003,2004, 2005, 2007, 2008, 2009.
@@ -165,10 +165,10 @@ msgstr "DHCP bezeroa"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Interfaze hau ez da oraindik konfiguratu.\n"
-"Mandriva Linux Aginte Guneko \"%s\" laguntzailea exekutatu"
+"Mageia Aginte Guneko \"%s\" laguntzailea exekutatu"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -212,7 +212,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Konputagailua Interneteko konexioa partekatzeko konfiguratzera zoaz.\n"
@@ -223,7 +223,7 @@ msgstr ""
 "drakconnecterabiliz konfiguratu duzula.\n"
 "\n"
 "Oharra: Sare-moldagailu dedikatu bat behar duzu bertako sare (LAN) bat "
-"ezartzeko. Jarraitu aurretik ezgaitu Mandriva suhesia zure LAN-era "
+"ezartzeko. Jarraitu aurretik ezgaitu Mageia suhesia zure LAN-era "
 "konektatutako sare moldagailuarentzako."
 
 #: ../bin/drakgw:91
@@ -464,14 +464,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Zure sisteman ez da aurkitu LAN-erako konfiguratuta dagoen ethernet sare "
 "moldagailurik.\n"
 "\n"
 "Mesedez exekutatu hardwarea konfiguratzeko tresna hura konfiguratzeko, eta "
-"ziurta ezazu Mandrivaren suhesia ez dagoela gaituta zure LAN sarera lotutako "
+"ziurta ezazu Mageiaren suhesia ez dagoela gaituta zure LAN sarera lotutako "
 "sare moldagailuan."
 
 #: ../bin/drakgw:316
@@ -1559,8 +1559,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1569,8 +1569,8 @@ msgstr "Hau Sambaren konfiguraketa era errazean kudeatzeko tresna xumea da."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2235,10 +2235,10 @@ msgstr "Sarea erorita dago %s interfazean."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ez daukazu konfiguratutako Internet loturarik.\n"
-"Exekutatu Mandriva Linux Aginte Guneko \"%s\" morroia"
+"Exekutatu Mageia Aginte Guneko \"%s\" morroia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2429,10 +2429,10 @@ msgstr "Konexioa osatu da."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Konexioak huts egin du.\n"
-"Egiaztatu zure konfigurazioa Mandriva-ren kontrol-zentroan."
+"Egiaztatu zure konfigurazioa Mageia-ren kontrol-zentroan."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4886,14 +4886,14 @@ msgstr "Suhesi konfiguraketa"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall konfiguratzailea\n"
 "\n"
-"Mandriva Linux makina honentzako suhesi pertsonal bat konfiguratzen du.\n"
-"Suhesi ahaltsu eta dedikatu bat behar baduzu, Mandriva Security Firewall\n"
+"Mageia makina honentzako suhesi pertsonal bat konfiguratzen du.\n"
+"Suhesi ahaltsu eta dedikatu bat behar baduzu, Mageia Security Firewall\n"
 " banaketari begiratu iezaiozu."
 
 #: ../lib/network/drakfirewall.pm:230
@@ -6036,7 +6036,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6046,7 +6046,7 @@ msgstr ""
 "Internetera zuzenean lotutako interfaze guztiak aukeratu beharko\n"
 "lirateke, bertako sarera lotutakoak berriz hautatu gabe utzi daitezke.\n"
 "\n"
-"Mandrivaren Internet Lotura Partekatu erabili nahi baduzu,\n"
+"Mageiaren Internet Lotura Partekatu erabili nahi baduzu,\n"
 "zure bertako sarera lotuko diren interfazeak hautatu gabe utzi.\n"
 "\n"
 "Zein interfaze babestu beharko lirateke?\n"
@@ -6084,7 +6084,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Pakete batzuk (%s) behar dira baino ezin dira eskuratu."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/fa.po b/po/fa.po
index 6b7fd56..6b769a2 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -162,7 +162,7 @@ msgstr "کارگیر DHCP"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "این واسط هنوز پیکربندی نشده است.\n"
 "دستیار \"افزودن واسطی\" را از مرکز کنترل ماندریبا اجرا کنید"
@@ -209,7 +209,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "شما در حال پیکربندی رایانه‌ی خود برای اشتراک اتصال اینترنت هستید. \n"
@@ -449,7 +449,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1472,7 +1472,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1482,7 +1482,7 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia"
 msgstr "ماندریبا لینوکس"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -2104,7 +2104,7 @@ msgstr "شبکه بر واسط %s در حال اجراست"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "شما هیچ اتصال اینترنتی پیکربندی شده ندارید.\n"
 "دستیار \"%s\" را از مرکز کنترل لینوکس ماندریبا اجرا کنید"
@@ -2300,7 +2300,7 @@ msgstr "اتصال برقرار شد."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "اتصال شکست خورد.\n"
 "پیکربندی خود را در مرکز کنترل ماندریبا تصدیق کنید."
@@ -4677,9 +4677,9 @@ msgstr "پیکربندی دستی"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "پیکربند دیوارآتش‌درایک \n"
 "\n"
@@ -5806,7 +5806,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5840,7 +5840,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/fi.po b/po/fi.po
index 576f039..cfa0ca3 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 # drakx-net-fi - Finnish Translation
 #
 # Copyright (C) 2002,2003, 2004, 2005 Free Software Foundation, Inc.
-# Copyright (C) 2002 Mandriva
+# Copyright (C) 2002 Mageia
 #
 #
 # Matias Griese <mahagr@utu.fi>, 2001.
@@ -17,7 +17,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-11-14 13:47+0200\n"
 "Last-Translator: Jani Välimaa <wally@mandriva.org>\n"
-"Language-Team: Finnish <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Finnish <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -172,10 +172,10 @@ msgstr "DHCP-asiakas"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Liitäntää ei ole vielä asetettu.\n"
-"Suorita \"%s\"-avustaja Mandriva Linuxin Ohjauskeskuksesta"
+"Suorita \"%s\"-avustaja Mageiain Ohjauskeskuksesta"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -219,7 +219,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Tietokonetta ollaan asettamassa jakamaan Internet-yhteys.\n"
@@ -470,7 +470,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Järjestelmässä ei havaittu yhtään lähiverkkokäyttöön asetettua "
@@ -1562,8 +1562,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s, Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s, Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1572,8 +1572,8 @@ msgstr "Yksinkertainen työkalu Samba-jakojen hallintaan."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2220,10 +2220,10 @@ msgstr "Verkko ei ole käytössä liitännässä %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Yhtään verkkoliitäntää ei ole vielä asetettu.\n"
-"Suorita Mandriva Linuxin Ohjauskeskuksesta\n"
+"Suorita Mageiain Ohjauskeskuksesta\n"
 "työkalu \"%s\"."
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2415,10 +2415,10 @@ msgstr "Yhteys valmis."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Yhteys epäonnistui.\n"
-"Tarkista asetukset Mandriva Linuxin Ohjauskeskuksesta."
+"Tarkista asetukset Mageiain Ohjauskeskuksesta."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4868,15 +4868,15 @@ msgstr "Palomuuriasetukset"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall asetustyökalu\n"
 "\n"
-"Tämä työkalu asettaa henkilökohtaisen palomuurin Mandriva\n"
+"Tämä työkalu asettaa henkilökohtaisen palomuurin Mageia\n"
 "Linuxille. Jos halutaan tehokas ja erityinen palomuuriratkaisu,\n"
-"tutustu räätälöityyn Mandriva Security Firewall -jakeluun."
+"tutustu räätälöityyn Mageia Security Firewall -jakeluun."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6020,7 +6020,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6031,7 +6031,7 @@ msgstr ""
 "valita, kun taas lähiverkkoon kytketyt liitännät\n"
 "voidaan jättää valitsematta.\n"
 "\n"
-"Jos aikomuksena on käyttää Mandrivan\n"
+"Jos aikomuksena on käyttää Mageian\n"
 "Internet-yhteyden jakamista, jätä valitsematta\n"
 "lähiverkkoon kytkettäväksi aiotut liitännät.\n"
 "\n"
@@ -6070,7 +6070,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Vaadittuja paketteja (%s) ei ole saatavilla."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/fr.po b/po/fr.po
index 11ca235..34381ef 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
 # translation of fr.po to Français
-# Translation file of Mandriva Linux graphic install
-# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006 Mandriva
+# Translation file of Mageia graphic install
+# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006 Mageia
 #
 # Veuillez ne pas mettre à jour ce fichier à moins d'être
 # certain tant de vos traductions que de votre grammaire et
@@ -78,7 +78,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-10-21 14:46+0200\n"
 "Last-Translator: Christophe Berthelé <berthy@mandriva.org>\n"
-"Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: French <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -233,10 +233,10 @@ msgstr "Client DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Cette interface n'a pas encore été configurée.\n"
-"Lancez l'assistant « %s » depuis le Centre de Contrôle Mandriva Linux"
+"Lancez l'assistant « %s » depuis le Centre de Contrôle Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -280,7 +280,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Vous êtes sur le point de configurer votre ordinateur pour partager sa "
@@ -292,7 +292,7 @@ msgstr ""
 "drakconnect avant d'aller plus loin.\n"
 "\n"
 "Veuillez noter que vous avez besoin d'une carte réseau dédiée à votre réseau "
-"local (LAN). Veuillez désactiver le pare-feu Mandriva pour l'adaptateur "
+"local (LAN). Veuillez désactiver le pare-feu Mageia pour l'adaptateur "
 "réseau connecté à votre réseau local avant de continuer."
 
 #: ../bin/drakgw:91
@@ -534,14 +534,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Aucun adaptateur réseau configuré pour le LAN n'a été détecté sur votre "
 "système.\n"
 "\n"
 "Veuillez lancer l'outil de configuration du matériel pour le configurer et "
-"assurez vous que le pare-feu Mandriva n'est pas activé pour l'adaptateur "
+"assurez vous que le pare-feu Mageia n'est pas activé pour l'adaptateur "
 "réseau connecté à votre réseau local."
 
 #: ../bin/drakgw:316
@@ -1634,8 +1634,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s par Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s par Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1645,8 +1645,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2324,10 +2324,10 @@ msgstr "Le réseau est désactivé sur l'interface %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Vous n'avez aucune connexion internet configurée.\n"
-"Lancez l'assistant « %s » depuis le Centre de Contrôle Mandriva Linux"
+"Lancez l'assistant « %s » depuis le Centre de Contrôle Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2518,10 +2518,10 @@ msgstr "Connexion effectuée."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "La connexion a échoué.\n"
-"Vérifiez votre configuration dans le Centre de Contrôle Mandriva Linux."
+"Vérifiez votre configuration dans le Centre de Contrôle Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4988,16 +4988,16 @@ msgstr "Configuration du pare-feu"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Configuration de drakfirewall\n"
 "\n"
-"Ceci configure un Pare-Feu (firewall) personnel pour votre machine Mandriva "
+"Ceci configure un Pare-Feu (firewall) personnel pour votre machine Mageia "
 "Linux.\n"
 "Si vous souhaitez un Pare-Feu dédié plus puissant, tournez-vous plutôt vers\n"
-"la distribution spécialisée « Mandriva Security »."
+"la distribution spécialisée « Mageia Security »."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6151,7 +6151,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6200,7 +6200,7 @@ msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 "Certains paquetages (%s) sont nécessaires mais ne sont pas disponibles."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/fur.po b/po/fur.po
index 88f315f..5979536 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -160,7 +160,7 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -205,7 +205,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 
@@ -424,7 +424,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1441,7 +1441,7 @@ msgstr "Server Samba"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1451,8 +1451,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2073,7 +2073,7 @@ msgstr "Rêt & Internet"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2261,7 +2261,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4592,9 +4592,9 @@ msgstr "Configurazion Xorg"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5654,7 +5654,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5688,7 +5688,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/ga.po b/po/ga.po
index bf9297e..4263c08 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -158,7 +158,7 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -203,7 +203,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 
@@ -422,7 +422,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1439,7 +1439,7 @@ msgstr "Freastalaí NIS"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1449,8 +1449,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2071,7 +2071,7 @@ msgstr "Cláréadan Gréasán"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2259,7 +2259,7 @@ msgstr "Athraigh cineál ranna"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4616,9 +4616,9 @@ msgstr "Cumraigh Idirlíon"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5678,7 +5678,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5712,7 +5712,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/gl.po b/po/gl.po
index ee65d72..8ca0756 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-10-05 17:41+0200\n"
 "Last-Translator: Alejo Pacín Jul <alejopj@gmail.com>\n"
-"Language-Team: Galician <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Galician <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -167,11 +167,11 @@ msgstr "Cliente DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Esta interface ainda non foi configurada.\n"
 "Execute o asistente \"%s\" dende o\n"
-"Centro de Control de Mandriva Linux"
+"Centro de Control de Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -215,7 +215,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Está a piques de configurar o seu ordenador para que comparta a conexión á "
@@ -461,7 +461,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1495,8 +1495,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s de Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s de Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1507,8 +1507,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2154,11 +2154,11 @@ msgstr "A rede está desactivada na interface %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Non ten configurada ningunha conexión á Internet.\n"
 "Execute o asistente \"%s\" dende o\n"
-"Centro de Control de Mandriva Linux"
+"Centro de Control de Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2351,10 +2351,10 @@ msgstr "Conexión establecida."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Fallo ó conectarse.\n"
-"Verifique a configuración no Centro de Control de Mandriva Linux."
+"Verifique a configuración no Centro de Control de Mageia."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4727,15 +4727,15 @@ msgstr "Configuración do cortalumes"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Configurador de drakfirewall\n"
 "\n"
-"Isto configura un cortalumes persoal para esta máquina Mandriva Linux.\n"
+"Isto configura un cortalumes persoal para esta máquina Mageia.\n"
 "Para unha solución potente e dedicada a cortalumes, conte ca\n"
-"distribución especializada Mandriva Security Firewall."
+"distribución especializada Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5872,7 +5872,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5917,7 +5917,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Requírense algúns paquetes (%s) pero non están dispoñibles."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/he.po b/po/he.po
index a33bcf6..105a0a7 100644
--- a/po/he.po
+++ b/po/he.po
@@ -171,7 +171,7 @@ msgstr "לקוח DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "המנשק לא הוגדר עדיין.\n"
 "יש להפעיל את האשף \"%s\" ממרכז הבקרה של מנדריבה לינוקס"
@@ -218,7 +218,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "אשף זה יעזור לך לשתף את חיבור האינטרנט של המחשב שלך.\n"
@@ -457,7 +457,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1529,7 +1529,7 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr "זכויות היוצרים (C) %s שייכות למנדריבה"
 
 #: ../bin/draksambashare:198
@@ -1539,7 +1539,7 @@ msgstr "זהו כלי פשוט לניהול קל של תצורת Samba."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia"
 msgstr "מנדריבה לינוקס"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -2180,7 +2180,7 @@ msgstr "הרשת משותקת במנשק %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "החיבור לאינטרנט לא הוגדר עדיין.\n"
 "נא להפעיל את האשף \"%s\" ממרכז הבקרה של מנדריבה לינוקס"
@@ -2376,10 +2376,10 @@ msgstr "התחברות הושלמה."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "התחברות נכשלה.\n"
-"נא לבדוק את ההגדרות במרכז ההגדרות של Mandriva."
+"נא לבדוק את ההגדרות במרכז ההגדרות של Mageia."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4769,15 +4769,15 @@ msgstr "הגדרות חומת-אש"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "אשף הגדרת חומת אש drakfirewall\n"
 "\n"
 "אשף זה יגדיר חומת אש פרטית עבור מנדריבה לינוקס במחשב זה.\n"
 "עבור חומת אש ייעודית ובעלת יכולות נוספות מומלץ לבחון את\n"
-"הפצת Mandriva Security המיועדת לשמש כפתרון חומת אש ייעודית."
+"הפצת Mageia Security המיועדת לשמש כפתרון חומת אש ייעודית."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5908,7 +5908,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5951,7 +5951,7 @@ msgstr "מספר רכיבים (%s) דרושים אך אנים זמינים עב�
 msgid "Some packages (%s) are required but aren't available."
 msgstr "מספר חבילות (%s) נדרשות אך אינן זמינות."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/hi.po b/po/hi.po
index 179cd66..18d8131 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -162,7 +162,7 @@ msgstr "डी०एच०सी०पी० ग्राहक"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "इस इन्टरफ़ेस को अभी तक संरचित नहीं किया गया है ।\n"
 "मैनड्रिव नियंत्रण केन्द्र से \"एक इन्टरफ़ेस को जोड़े\" सहायक को चलायें"
@@ -209,7 +209,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 
@@ -442,7 +442,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1465,7 +1465,7 @@ msgstr "सॉबा सर्वर"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1475,7 +1475,7 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia"
 msgstr "मैनड्रैकलिनक्स"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -2097,7 +2097,7 @@ msgstr "नेटवर्क इन्टरफ़ेस"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "इस इन्टरफ़ेस को अभी तक संरचित नहीं किया गया है ।\n"
 "मैनड्रिव नियंत्रण केन्द्र से \"%s\" सहायक को चलायें"
@@ -2293,7 +2293,7 @@ msgstr "संबंध सम्पूर्ण ।"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "संबंधीकरण की प्रक्रिया असफ़ल हो गई ।\n"
 "मैनड्रिव नियंत्रण केन्द्र में अपनी संरचना को सत्यापित करें ।"
@@ -4674,9 +4674,9 @@ msgstr "स्वंम के द्वारा संरचना"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "ड्रैकफ़ायरवाल संरचनाकर्ता\n"
 "\n"
@@ -5798,7 +5798,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5832,7 +5832,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/hr.po b/po/hr.po
index 41540ee..3f90f64 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -163,7 +163,7 @@ msgstr "DHCP klijent"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ovo sučelje još nije podešeno.\n"
 "Pokrenite čarobnjak za postavu u glavnom prozoru"
@@ -210,7 +210,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Vaše računalo može biti konfigurirano da dijeli vlastitu Internet vezu.\n"
@@ -445,7 +445,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1467,7 +1467,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1477,8 +1477,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2099,7 +2099,7 @@ msgstr "Mrežni međusklop"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ovo sučelje još nije podešeno.\n"
 "Pokrenite čarobnjak za postavu u glavnom prozoru"
@@ -2289,10 +2289,10 @@ msgstr "Veza uspostavljena."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Spajanje nije uspjelo.\n"
-"Provjerite konfiguraciju u Mandriva Linux kontrolnom centru."
+"Provjerite konfiguraciju u Mageia kontrolnom centru."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4629,15 +4629,15 @@ msgstr "Ručno namještanje"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "tinyfirewall podešavanje\n"
 "\n"
-"Ovo podešava osobni vatrozid za ovo Mandriva Linux računalo.\n"
+"Ovo podešava osobni vatrozid za ovo Mageia računalo.\n"
 "Za snažno primjenjena vatrozidna rješenja, molimo pogledajte\n"
-"specijaliziranu Mandriva Security Firewall distribuciju."
+"specijaliziranu Mageia Security Firewall distribuciju."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5748,7 +5748,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5782,7 +5782,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/hu.po b/po/hu.po
index 1f416ed..df1b821 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -193,10 +193,10 @@ msgstr "DHCP kliens"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ez a csatoló még nem lett beállítva.\n"
-"Használja a \"%s\" funkciót a Mandriva Linux Vezérlőközpontban."
+"Használja a \"%s\" funkciót a Mageia Vezérlőközpontban."
 
 #: ../bin/drakconnect-old:247
 #: ../bin/net_applet:104
@@ -242,7 +242,7 @@ msgid ""
 "\n"
 "Make sure you have configured your Network/Internet access using drakconnect before going any further.\n"
 "\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mandriva Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
 msgstr ""
 "Az internetkapcsolat megosztásának beállítása következik.\n"
 "Ennek segítségével a helyi hálózat más gépei is elérhetik az internetet\n"
@@ -251,7 +251,7 @@ msgstr ""
 "Mielőtt továbblépne, állítsa be a hálózat- illetve internetelérést\n"
 "a DrakConnect programmal (ha ez még nem történt meg).\n"
 "\n"
-"Megjegyzés: a helyi hálózat (LAN) használatához legalább egy hálózati csatolókártya szükséges. Kérem tiltsa le a helyi hálózathoz csatlakozó interfészen a Mandriva Tűzfalat, mielőtt befejezné a műveletet."
+"Megjegyzés: a helyi hálózat (LAN) használatához legalább egy hálózati csatolókártya szükséges. Kérem tiltsa le a helyi hálózathoz csatlakozó interfészen a Mageia Tűzfalat, mielőtt befejezné a műveletet."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -517,11 +517,11 @@ msgstr "Nyomtatóinformáció sugárzása (broadcast)"
 msgid ""
 "No ethernet network adapter configured for LAN has been detected on your system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mandriva firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
 msgstr ""
 "Nincs beállítva hálózati eszköz, nem érzékelek helyi hálózatot a rendszerén.\n"
 "\n"
-"Kérem futtassa a hardverazonosító eszközt, hogy beállítson egyet. Futtassa a Mandriva tűzfalat beállító eszközt, és engedélyezze a hálózati eszközön a helyi hálózat kapcsolódását."
+"Kérem futtassa a hardverazonosító eszközt, hogy beállítson egyet. Futtassa a Mageia tűzfalat beállító eszközt, és engedélyezze a hálózati eszközön a helyi hálózat kapcsolódását."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -1621,8 +1621,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s, Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s, Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1631,8 +1631,8 @@ msgstr "Egyszerű eszköz a Samba beállításának kezeléséhez."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2236,10 +2236,10 @@ msgstr "A(z) \"%s\" csatolón a hálózat NEM aktív."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Internetkapcsolat még nem lett beállítva.\n"
-"Használja a \"%s\" funkciót a Mandriva Linux Vezérlőközpontban."
+"Használja a \"%s\" funkciót a Mageia Vezérlőközpontban."
 
 #: ../bin/net_applet:106
 #: ../lib/network/connection_manager.pm:206
@@ -2444,10 +2444,10 @@ msgstr "A kapcsolat létrejött."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "A kapcsolódás nem sikerült.\n"
-"Ellenőrizze a beállításokat a Mandriva Linux Vezérlőközpontban."
+"Ellenőrizze a beállításokat a Mageia Vezérlőközpontban."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4893,15 +4893,15 @@ msgstr "Tűzfalbeállítás"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "A DrakFirewall beállítása\n"
 "\n"
 "Ezzel egy személyes felhasználásra szánt tűzfalat lehet beállítani ehhez\n"
-"a Mandriva Linuxot használó géphez. Ha egy komolyabb tűzfalmegoldást\n"
-"szeretne, szerezze be a speciális Mandriva Security Firewall disztribúciót."
+"a Mageiaot használó géphez. Ha egy komolyabb tűzfalmegoldást\n"
+"szeretne, szerezze be a speciális Mageia Security Firewall disztribúciót."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6017,7 +6017,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6028,7 +6028,7 @@ msgstr ""
 "az internethez. A helyi hálózathoz csatlakozó csatolókat nem feltétlenül\n"
 "szükséges kijelölni.\n"
 "\n"
-"Ha használja a Mandriva Internetmegosztó eszközt,\n"
+"Ha használja a Mageia Internetmegosztó eszközt,\n"
 "Akkor a helyi hálózathoz csatlakozó interfészt ne jelölje meg.\n"
 "\n"
 "Mely csatolók legyenek védve?\n"
@@ -6064,7 +6064,7 @@ msgstr "Bizonyos komponensek (%s) szükségesek, de nem elérhetők ehhez a hard
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Bizonyos csomagokra (%s) szükség van, de nem elérhetők."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/id.po b/po/id.po
index 63344c1..191ef26 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,5 +1,5 @@
-# Instalator Grafis Mandriva Linux
-# Copyright (C) 1999 Mandriva
+# Instalator Grafis Mageia
+# Copyright (C) 1999 Mageia
 # Budi Rachmanto <rac@mandrivalinux.org>, 2001-2003
 # Linux Indonesia <http://www.linux.or.id>, 1999-2001
 # Mohammad DAMT <mdamt@cdl2000.com>, 1999-2001
@@ -172,10 +172,10 @@ msgstr "Klien DHCP"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Antarmuka ini belum terkonfigurasi.\n"
-"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mandriva Linux"
+"Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -219,7 +219,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Anda akan mengkonfigurasi komputer Anda untuk berbagi koneksi Internet.\n"
@@ -462,7 +462,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1540,8 +1540,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Hak cipta (C) %s oleh Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Hak cipta (C) %s oleh Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1550,8 +1550,8 @@ msgstr "Ini adalah perkakas sederhana untuk mengelola konfigurasi Samba."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2180,10 +2180,10 @@ msgstr "Jaringan tidak aktif pada antarmuka %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Anda tidak memiliki koneksi Internet yang terkonfigurasi.\n"
-"Jalankan asisten \"%s\" dari Pusat Kontrol Mandriva Linux"
+"Jalankan asisten \"%s\" dari Pusat Kontrol Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2376,10 +2376,10 @@ msgstr "Koneksi selesai."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Koneksi gagal.\n"
-"Periksa konfigurasi Anda pada Pusat Kontrol Mandriva Linux."
+"Periksa konfigurasi Anda pada Pusat Kontrol Mageia."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4756,15 +4756,15 @@ msgstr "Konfigurasi firewall"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "konfigurator drakfirewall\n"
 "\n"
-"Program ini mengkonfigurasi firewall pribadi untuk Mandriva Linux.\n"
+"Program ini mengkonfigurasi firewall pribadi untuk Mageia.\n"
 "Untuk membuat solusi firewall yang lebih baik, cobalah\n"
-"distribusi khusus Mandriva Security Firewall"
+"distribusi khusus Mageia Security Firewall"
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5905,7 +5905,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5950,15 +5950,15 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Beberapa paket (%s) diperlukan tetapi tidak tersedia."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, fuzzy, c-format
 msgid ""
 "These packages can be found in %s, or in the official %s package repository."
 msgstr ""
-"Paket-paket berikut dapat ditemukan pada Mandriva Club atau pada rilis "
-"komersial Mandriva."
+"Paket-paket berikut dapat ditemukan pada Mageia Club atau pada rilis "
+"komersial Mageia."
 
 #: ../lib/network/thirdparty.pm:154
 #, c-format
diff --git a/po/is.po b/po/is.po
index 20eca0a..511b545 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 # Icelandic translation of network-tools.po
-# Translation file for Mandriva Linux graphic install, drakx-net
+# Translation file for Mageia graphic install, drakx-net
 # Copyright (C) 1999,2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
-# Copyright (C) 1999 Mandriva
+# Copyright (C) 1999 Mageia
 #
 # Jóhann Þorvarðarson <johann.torvardarson@lais.is>, 1999-2000.
 # Þórarinn (Tony) R. Einarsson <thori@mindspring.com>, 1999-2000.
@@ -167,10 +167,10 @@ msgstr "DHCP biðlari"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Þetta nettengi hefur ekki verið stillt enn.\n"
-"Keyrið \"%s\" ráðgjafann frá Mandriva Linux stjórnborðinu"
+"Keyrið \"%s\" ráðgjafann frá Mageia stjórnborðinu"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -214,7 +214,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Þú er um það bil að fara að setja tölvuna þína upp til að deila Internet "
@@ -226,7 +226,7 @@ msgstr ""
 "drakconnect áður en þú heldur lengra.\n"
 "\n"
 "Athugið: þú þarft að hafa sérstakt netkort fyrir staðarnetið til að geta "
-"deilt Internet-tengingu um staðarnet (LAN). Aftengdu Mandriva eldvegginn "
+"deilt Internet-tengingu um staðarnet (LAN). Aftengdu Mageia eldvegginn "
 "fyrir það netkort sem tengt er staðanetinu áður en lengra er haldið."
 
 #: ../bin/drakgw:91
@@ -466,14 +466,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Ekkert netkort sem er stillt fyrir staðarnet hefur fundist á tölvunni "
 "þinni.\n"
 "\n"
 "Keyrðu vélbúnaðar-stillingar-tól til að stilla það, og staðfestu\n"
-"að Mandriva eldveggur sé ekki virkur fyrir þá nettengingu (kort) sem\n"
+"að Mageia eldveggur sé ekki virkur fyrir þá nettengingu (kort) sem\n"
 "er tengt staðarnetinu."
 
 #: ../bin/drakgw:316
@@ -1549,8 +1549,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Höfundaréttur (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Höfundaréttur (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1559,8 +1559,8 @@ msgstr "Þetta er einfalt tól til að sýsla með Samba uppsetningu."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2208,10 +2208,10 @@ msgstr "Net er ekki í gangi á tengi %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Þú hefur ekki skilgreint neina Internettengingu.\n"
-"Keyrið \"%s\" ráðgjafann frá Mandriva Linux stjórnborðinu"
+"Keyrið \"%s\" ráðgjafann frá Mageia stjórnborðinu"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2402,10 +2402,10 @@ msgstr "Tenging uppsett."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Tenging mistókst\n"
-"Athugaðu uppsetninguna í Mandriva Linux stjórnborði."
+"Athugaðu uppsetninguna í Mageia stjórnborði."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4796,15 +4796,15 @@ msgstr "Eldveggsuppsetning"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall stillingar\n"
 "\n"
-"Þessi eining stillir einka eldvegg fyrir þessa Mandriva Linux vél\n"
+"Þessi eining stillir einka eldvegg fyrir þessa Mageia vél\n"
 "Fyrir öruggan og aflmikinn eldvegg líttu á hina sértæku\n"
-"Mandriva eldveggs útgáfu."
+"Mageia eldveggs útgáfu."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5941,7 +5941,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5987,7 +5987,7 @@ msgstr "Nokkurra eininga (%s) er þörf, en eru ekki til fyrir vélbúnað %s."
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Þarf nokkra pakka (%s) sem eru ekki tiltækir."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/it.po b/po/it.po
index 07bb671..3f92b5e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,5 +1,5 @@
 # translation of drakx-net.po to Italian
-# Copyright (C) 2000, 2001 Mandriva S.A.
+# Copyright (C) 2000, 2001 Mageia S.A.
 #
 # Paolo Lorenzin <pasusu@tin.it>, 2000.
 # Simone Riccio <s.riccio@aeb-informatica.it>, 2002.
@@ -171,10 +171,10 @@ msgstr "Client DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Questa interfaccia non è stata ancora configurata.\n"
-"Esegui l'assistente \"%s\" dal Centro di controllo Mandriva Linux"
+"Esegui l'assistente \"%s\" dal Centro di controllo Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -218,7 +218,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Stai configurando il tuo computer per condividere la sua connessione a "
@@ -231,7 +231,7 @@ msgstr ""
 ".\n"
 "Nota: è necessaria una scheda di rete dedicata per realizzare una\n"
 "Rete di Area Locale (LAN). Prima di procedere, ricordati di disattivare "
-"Mandriva Firewall per la scheda di rete collegata alla LAN."
+"Mageia Firewall per la scheda di rete collegata alla LAN."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -472,14 +472,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Nel sistema on è stato rilevato alcun dispositivo di rete configurato per la "
 "LAN.\n"
 "\n"
 "Devi configurarne uno con lo strumento di configurazione dell'hardware ed "
-"assicurarti che il firewall di Mandriva non sia attiva nei confronti del "
+"assicurarti che il firewall di Mageia non sia attiva nei confronti del "
 "dispositivo di rete collegato alla rete LAN."
 
 #: ../bin/drakgw:316
@@ -1570,8 +1570,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s di Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s di Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1580,8 +1580,8 @@ msgstr "Questo è una semplice applicazione per configurare facilmente Samba."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2241,10 +2241,10 @@ msgstr "Il collegamento tramite l'interfaccia %s è disattivato."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Non è stata configurata nessuna interfaccia Internet.\n"
-"Lancia l'assistente \"%s\" dal Centro di controllo Mandriva Linux."
+"Lancia l'assistente \"%s\" dal Centro di controllo Mageia."
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2435,10 +2435,10 @@ msgstr "Connessione completata."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Connessione non riuscita.\n"
-"Verifica la configurazione dal Centro di Controllo Mandriva Linux."
+"Verifica la configurazione dal Centro di Controllo Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4903,15 +4903,15 @@ msgstr "Configurazione del firewall"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Configuratore drakfirewall\n"
 "\n"
-"Configura un firewall personale per questo sistema Mandriva Linux.\n"
+"Configura un firewall personale per questo sistema Mageia.\n"
 "Per una soluzione firewall potente e dedicata, affidati alla\n"
-"distribuzione specializzata Mandriva Security Firewall."
+"distribuzione specializzata Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6052,7 +6052,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6062,7 +6062,7 @@ msgstr ""
 "Andrebbero selezionate tutte le interfacce connesse ad internet,\n"
 "mentre si potrebbero tralasciare quelle connesse ad una rete locale.\n"
 "\n"
-"Se intendi condividere la connessione Internet tramite Mandriva,\n"
+"Se intendi condividere la connessione Internet tramite Mageia,\n"
 "non selezionare le interfacce collegate alla rete locale.\n"
 "\n"
 " Quali interfacce dovranno essere protette?\n"
@@ -6101,7 +6101,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Servono alcuni pacchetti (%s) ma non sono disponibili."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index 9a9550d..0a51fb0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-03-22 21:05+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
-"Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Japanese <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -166,10 +166,10 @@ msgstr "DHCP クライアント"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "このインターフェースはまだ設定されていません。\n"
-"Mandriva Linux コントロールセンターの「%s」を実行してください。"
+"Mageia コントロールセンターの「%s」を実行してください。"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -213,7 +213,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "インターネット接続を共有する設定を行います。\n"
@@ -450,7 +450,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1528,8 +1528,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s by Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1538,8 +1538,8 @@ msgstr "これは Samba の設定を簡単に管理するためのシンプル�
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2182,10 +2182,10 @@ msgstr "インターフェース %s のネットワークはダウンしてい�
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "インターネットの接続が設定されていません。\n"
-"Mandriva Linux コントロールセンターの「%s」を実行してください。"
+"Mageia コントロールセンターの「%s」を実行してください。"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2376,10 +2376,10 @@ msgstr "接続完了。"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "接続に失敗しました。\n"
-"Mandriva Linux コントロールセンターの設定を確認してください。"
+"Mageia コントロールセンターの設定を確認してください。"
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4760,15 +4760,15 @@ msgstr "ファイアウォールの設定"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall (ファイアウォール設定ツール)\n"
 "\n"
 "このツールは個人用ファイアウォールの設定を行います。\n"
 "強力なファイアウォール専用ソリューションをお求めの場合は\n"
-"Mandriva Security Firewall をご利用ください。"
+"Mageia Security Firewall をご利用ください。"
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5552,7 +5552,7 @@ msgid ""
 "configuration."
 msgstr ""
 "設定中に問題が発生しました。\n"
-"net_monitor か Mandriva コントロールセンターで接続をテストしてください。\n"
+"net_monitor か Mageia コントロールセンターで接続をテストしてください。\n"
 "接続できない場合は再設定してください。"
 
 #: ../lib/network/netconnect.pm:778
@@ -5908,7 +5908,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5954,7 +5954,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "必要なパッケージ (%s) がありません。"
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/ko.po b/po/ko.po
index b8a6776..22cd6a2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -163,7 +163,7 @@ msgstr "DHCP 클라이언트"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "인터넷 연결이 없습니다.\n"
 "「설정」을 눌러 먼저 연결을 설정하세요."
@@ -210,7 +210,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "이제 인터넷 연결 공유를 위해서 님의 컴퓨터를 설정하려고 합니다.\n"
@@ -442,7 +442,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1464,7 +1464,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1474,7 +1474,7 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia"
 msgstr "맨드리바 온라인"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -2096,7 +2096,7 @@ msgstr "네트웍 인터페이스"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "인터넷 연결이 없습니다.\n"
 "「설정」을 눌러 먼저 연결을 설정하세요."
@@ -2286,7 +2286,7 @@ msgstr "연결 속도"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4620,9 +4620,9 @@ msgstr "수동 설정"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "드레이크 방화벽 관리자\n"
 "\n"
@@ -5729,7 +5729,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5763,7 +5763,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/ky.po b/po/ky.po
index ba3cc98..f7308e0 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -161,7 +161,7 @@ msgstr ""
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -206,7 +206,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 
@@ -425,7 +425,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1442,7 +1442,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1452,8 +1452,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2074,7 +2074,7 @@ msgstr "Желе %s интерфейсинде тургузулду"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2268,10 +2268,10 @@ msgstr "Туташуу ишке ашты."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Туташуу ишке ашпады.\n"
-"Mandriva Башкаруу Борборунан конфигурацияны текшериңиз."
+"Mageia Башкаруу Борборунан конфигурацияны текшериңиз."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4603,9 +4603,9 @@ msgstr "Өз алдынча конфигурациялоо"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5669,7 +5669,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5703,7 +5703,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/lt.po b/po/lt.po
index 0812a57..0d8aab9 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -158,7 +158,7 @@ msgstr "DHCP klientas"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -203,7 +203,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Tavo kompiuteris gali būti sutvarkytas taip, kad dalintųsi interneto "
@@ -438,7 +438,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1460,7 +1460,7 @@ msgstr "NIS serveris"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1470,8 +1470,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2092,7 +2092,7 @@ msgstr "Tinklo interfeisas"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2280,7 +2280,7 @@ msgstr "Jungties tipas: "
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4616,9 +4616,9 @@ msgstr "Nustatymai"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5707,7 +5707,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5741,7 +5741,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/ltg.po b/po/ltg.po
index 206e3f9..94576b8 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva.
+# Copyright (c) 2000 Mageia.
 #
 msgid ""
 msgstr ""
@@ -159,10 +159,10 @@ msgstr "DHCP klients"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Itei saskarne vēl nabeja nūkonfigurāta.\n"
-"Palaidit paleigu \"Pīvīnuot saskarni\" nu Mandriva Linux kontrolis centra."
+"Palaidit paleigu \"Pīvīnuot saskarni\" nu Mageia kontrolis centra."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -206,7 +206,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Jius taisatēs konfigurēt jiusu datoru Interneta savīnuojuma kūplītuošonai.\n"
@@ -448,7 +448,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1472,7 +1472,7 @@ msgstr "Samba servers"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1482,8 +1482,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia"
+msgstr "Mageia Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2104,10 +2104,10 @@ msgstr "Teikla saskarne"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Itei saskarne vēl nabeja nūkonfigurāta.\n"
-"Palaidit paleigu \"%s\" nu Mandriva Linux kontrolis centra."
+"Palaidit paleigu \"%s\" nu Mageia kontrolis centra."
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, fuzzy, c-format
@@ -2300,7 +2300,7 @@ msgstr "Savīnuojums izpiļdeits."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4636,15 +4636,15 @@ msgstr "Manuala konfigureišona"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall konfigurētājs\n"
 "\n"
-"Šis rīks konfigurē personālo ugunssienu priekš Mandriva Linux\n"
+"Šis rīks konfigurē personālo ugunssienu priekš Mageia\n"
 "datora. Priekš spēcīga, ugunssienas izveidei veltīta risinājuma,\n"
-"lūdzu apskatiet Mandriva Security Firewall XXXXXX."
+"lūdzu apskatiet Mageia Security Firewall XXXXXX."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5755,7 +5755,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5789,7 +5789,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/lv.po b/po/lv.po
index 90106d9..dc64631 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2000 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva.
+# Copyright (c) 2000 Mageia.
 #
 msgid ""
 msgstr ""
@@ -159,10 +159,10 @@ msgstr "DHCP klients"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Šis %s skeneris jākonfigurē ar printerdrake.\n"
-"Jūs varat palaist printerdrake no Mandriva Linux kontroles centra Aparatūras "
+"Jūs varat palaist printerdrake no Mageia kontroles centra Aparatūras "
 "sekcijā."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -207,7 +207,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Jūs taisaties konfigurēt jūsu datoru Interneta savienojuma koplietošanai.\n"
@@ -449,7 +449,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1474,7 +1474,7 @@ msgstr "Samba serveris"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1484,8 +1484,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2106,10 +2106,10 @@ msgstr "Tīkla interfeiss"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Šis %s skeneris jākonfigurē ar printerdrake.\n"
-"Jūs varat palaist printerdrake no Mandriva Linux kontroles centra Aparatūras "
+"Jūs varat palaist printerdrake no Mageia kontroles centra Aparatūras "
 "sekcijā."
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2298,7 +2298,7 @@ msgstr "Savienojuma ātrums"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4635,15 +4635,15 @@ msgstr "Manuāla konfigurēšana"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall konfigurētājs\n"
 "\n"
-"Šis rīks konfigurē personālo ugunssienu priekš Mandriva Linux\n"
+"Šis rīks konfigurē personālo ugunssienu priekš Mageia\n"
 "datora. Priekš spēcīga, ugunssienas izveidei veltīta risinājuma,\n"
-"lūdzu apskatiet Mandriva Security Firewall XXXXXX."
+"lūdzu apskatiet Mageia Security Firewall XXXXXX."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5757,7 +5757,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5791,7 +5791,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/mk.po b/po/mk.po
index a936c48..6d6445b 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -168,7 +168,7 @@ msgstr "DHCP клиент"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "овој интерфејс не е конфигуриран.\n"
 " Стартувај го волшебникот за конфгурација."
@@ -215,7 +215,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "на на\n"
@@ -364,7 +364,7 @@ msgstr ""
 #: ../bin/drakgw:204
 #, fuzzy, c-format
 msgid "Domain Name Server (DNS) configuration"
-msgstr "Mandriva Конфигурација на Терминал Сервер"
+msgstr "Mageia Конфигурација на Терминал Сервер"
 
 #: ../bin/drakgw:208
 #, c-format
@@ -459,7 +459,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1481,8 +1481,8 @@ msgstr "Samba сервер"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Авторски права (C) %s од „Mandriva“"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Авторски права (C) %s од „Mageia“"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1491,8 +1491,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2113,7 +2113,7 @@ msgstr "Мрежата работи на интерфејс %d"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "овој интерфејс не е конфигуриран.\n"
 " Стартувај го волшебникот за конфгурација."
@@ -2309,7 +2309,7 @@ msgstr "Врската е завршена."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Врската не успеа.\n"
 "Потврдете ја вашата конфигурација во Мандрива Контролниот Центар."
@@ -4655,15 +4655,15 @@ msgstr "Рачна конфигурација"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall конфигуратор\n"
 "\n"
-"Ова конфигурира личен огнен ѕид за оваа Mandriva Linux машина.\n"
+"Ова конфигурира личен огнен ѕид за оваа Mageia машина.\n"
 "За моќно и наменско решение на огнен ѕид, видете ја специјализираната\n"
-"дистрибуција Mandriva Security Firewall."
+"дистрибуција Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5780,7 +5780,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5814,7 +5814,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/mn.po b/po/mn.po
index f452e30..422bdba 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -162,7 +162,7 @@ msgstr ""
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr "ямх"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -207,7 +207,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr "Та бусад г вы Сүлжээ Интернэт г вы Сүлжээ Сүлжээ."
 
@@ -434,7 +434,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1451,7 +1451,7 @@ msgstr "Самба"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1461,7 +1461,7 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia"
 msgstr "Мандрива Линукс"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -2083,7 +2083,7 @@ msgstr "Сүлжээ-харьцах хэсэг"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr "ямх"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2271,7 +2271,7 @@ msgstr "Холболт."
 #, fuzzy, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr "Холболт ямх Контрол Төвд."
 
 #: ../bin/net_monitor:360
@@ -4609,9 +4609,9 @@ msgstr "Гараар"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr "г."
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5691,7 +5691,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5725,7 +5725,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/ms.po b/po/ms.po
index 5310f1f..19feb95 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -159,7 +159,7 @@ msgstr "Klien MSN"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr "dalam utama"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -204,7 +204,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr "Internet on lokal Internet Rangkaian Internet Rangkaian Rangkaian."
 
@@ -423,7 +423,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1441,8 +1441,8 @@ msgstr "/Bantuan/_Perihal"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Hakcipta (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Hakcipta (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1451,8 +1451,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2075,7 +2075,7 @@ msgstr "Rangkaian tidak dapat dicapai."
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr "dalam utama"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2265,7 +2265,7 @@ msgstr "Sambungan Gagal"
 #, fuzzy, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr "dalam."
 
 #: ../bin/net_monitor:360
@@ -4598,9 +4598,9 @@ msgstr "Tetapan KFish"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5662,7 +5662,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5696,7 +5696,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/mt.po b/po/mt.po
index ff46600..cffcaea 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -164,10 +164,10 @@ msgstr "Klijent DHCP"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Din l-interfaċċja għadha ma ġietx ikkonfigurata.\n"
-"Ħaddem is-saħħar \"Żid interfaċċja\" miċ-Ċentru tal-Kontroll Mandriva Linux"
+"Ħaddem is-saħħar \"Żid interfaċċja\" miċ-Ċentru tal-Kontroll Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, fuzzy, c-format
@@ -211,7 +211,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Se tikkonfigura l-kompjuter biex jaqsam il-konnessjoni tal-internet.\n"
@@ -454,7 +454,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1477,7 +1477,7 @@ msgstr "Server Samba"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1487,8 +1487,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2109,10 +2109,10 @@ msgstr "Network imtella' fuq interfaċċja %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "M'għandek ebda konnessjoni mal-internet ikkonfigurata.\n"
-"Ħaddem is-saħħar \"%s\" miċ-Ċentru tal-Kontroll Mandriva Linux"
+"Ħaddem is-saħħar \"%s\" miċ-Ċentru tal-Kontroll Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, fuzzy, c-format
@@ -2305,10 +2305,10 @@ msgstr "Konnessjoni lesta."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Konnessjoni falliet.\n"
-"Ivverifika l-konfigurazzjoni fiċ-Ċentru tal-Kontroll Mandriva Linux."
+"Ivverifika l-konfigurazzjoni fiċ-Ċentru tal-Kontroll Mageia."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4685,15 +4685,15 @@ msgstr "Konfigurazzjoni manwali"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Konfiguratur drakfirewall\n"
 "\n"
-"Dan jikkonfigura firewall personali għal din is-sistema Mandriva Linux.\n"
+"Dan jikkonfigura firewall personali għal din is-sistema Mageia.\n"
 "Għal kompjuter firewall dedikat, jekk jogħġbok ara d-distribuzzjoni\n"
-"speċjalizzata Mandriva Security Firewall."
+"speċjalizzata Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5819,7 +5819,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5853,7 +5853,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/nb.po b/po/nb.po
index 3271782..9cd2cee 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,8 +1,8 @@
 # translation of nb.po to Norwegian Bokmål
 # translation of nb.po to
 # KTranslator Generated File
-# Translation file of Mandriva Linux graphic install
-# Copyright (C) 1999 Mandriva
+# Translation file of Mageia graphic install
+# Copyright (C) 1999 Mageia
 #
 # Terje Bjerkelia <terje@bjerkelia.com>, 1999-2000.
 # Andreas Bergstrøm <abergstr@halden.net>, 2000.
@@ -22,7 +22,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-10-22 00:11+0200\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
-"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Norwegian Bokmål <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -178,10 +178,10 @@ msgstr "DHCP-klient"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Dette grensesnittet har ikke blitt satt opp ennå.\n"
-"Kjør «%s» fra Mandriva Linux Kontrollsenter"
+"Kjør «%s» fra Mageia Kontrollsenter"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -225,7 +225,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Du er i ferd med å sette opp maskinen din til å dele Internettilkoblingen "
@@ -236,7 +236,7 @@ msgstr ""
 "drakconnect før du går videre.\n"
 "\n"
 "Merk: at du trenger et dedikert nettverksadapter for å sette opp et lokalt "
-"nettverk (LAN). Vær vennlig å slå av Mandriva-brannmuren for "
+"nettverk (LAN). Vær vennlig å slå av Mageia-brannmuren for "
 "nettverksadapteret tilkoblet lokalnettet før du fortsetter."
 
 #: ../bin/drakgw:91
@@ -476,14 +476,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Ingen Ethernet-nettverksadapter satt opp for LAN har blitt funnet på "
 "systemet ditt.\n"
 "\n"
 " Vær vennlig å kjøre oppsettsverktøyet for maskinvare for sette det opp. "
-"Kontroller at Mandriva-brannmuren ikke er satt opp til å beskytte adaptere "
+"Kontroller at Mageia-brannmuren ikke er satt opp til å beskytte adaptere "
 "tilkoblet lokalnettverket."
 
 #: ../bin/drakgw:316
@@ -1567,8 +1567,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Alle rettigheter (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Alle rettigheter (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1577,8 +1577,8 @@ msgstr "Dette er et verktøy for å kunne håndtere oppsett for Samba."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2239,10 +2239,10 @@ msgstr "Nettverk er nede på grensesnitt %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Du har ennå ikke satt opp en internettilkobling.\n"
-"Kjør «%s» fra Mandriva Linux Kontrollsenter."
+"Kjør «%s» fra Mageia Kontrollsenter."
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2429,10 +2429,10 @@ msgstr "Oppkobling ferdig."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Feil ved tilkobling.\n"
-"Kontroller oppsettet ditt i Mandriva Linux Kontrollsenter."
+"Kontroller oppsettet ditt i Mageia Kontrollsenter."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4884,15 +4884,15 @@ msgstr "Innstilling av brannmuren"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Innstilling av brannmuren\n"
 "\n"
 "Dette setter opp en personlig brannmur for denne maskina.\n"
 "For en kraftig dedikert brannmurløsning bør du ta en kikk på\n"
-"Mandriva Security Firewall."
+"Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6029,7 +6029,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6078,7 +6078,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Noen pakker (%s) er nødvendige, men er ikke tilgjengelige."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/nl.po b/po/nl.po
index d65348b..26ff248 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
 # translation of network-tools to Nederlands
 # Copyright (C) 2000, 2005, 2006, 2008 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva
+# Copyright (c) 2000 Mageia
 #
 # Niels Gras <niels.gras@wanadoo.nl>, 2000.
 # Jeroen ten Berge <j.ten.berge@twinbit.nl>, 2002.
@@ -170,10 +170,10 @@ msgstr "DHCP client"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Deze interface is nog niet geconfigureerd.\n"
-"Start de assistent ‘%s’ vanuit het Mandriva configuratiecentrum."
+"Start de assistent ‘%s’ vanuit het Mageia configuratiecentrum."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -217,7 +217,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "U staat op het punt om de internetverbinding van de computer te delen.\n"
@@ -229,7 +229,7 @@ msgstr ""
 "\n"
 "Opmerking: u heeft een specifiek hiervoor bestemde netwerkadapter nodig om "
 "een Local Area Network (LAN) op te zetten. Zet voordat u verder gaat eerst "
-"de Mandriva Firewall uit voor de netwerkadapter verbonden met het LAN."
+"de Mageia Firewall uit voor de netwerkadapter verbonden met het LAN."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -475,14 +475,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Geen voor LAN geconfigureerde ethernet-netwerkadapter is gevonden op uw "
 "systeem.\n"
 "\n"
 "Start het apparatuurconfiguratieprogramma om het te configureren en wees er "
-"zeker van dat de Mandriva firewall niet is ingeschakeld voor de netwerk-"
+"zeker van dat de Mageia firewall niet is ingeschakeld voor de netwerk-"
 "adapter verbonden met het LAN-netwerk."
 
 #: ../bin/drakgw:316
@@ -1564,8 +1564,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s door Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright © %s door Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1576,8 +1576,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2249,10 +2249,10 @@ msgstr "Netwerk is verbroken op interface %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "U heeft nog geen geconfigureerde internetverbinding.\n"
-"Start de \"%s\"-assistent vanuit het Mandriva Linux configuratiecentrum."
+"Start de \"%s\"-assistent vanuit het Mageia configuratiecentrum."
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2443,10 +2443,10 @@ msgstr "Verbinding voltooid."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Verbinding mislukt.\n"
-"Controleer uw configuratie in het Mandriva Linux Configuratiecentrum."
+"Controleer uw configuratie in het Mageia Configuratiecentrum."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4915,15 +4915,15 @@ msgstr "Firewall-configuratie"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Configuratie van drakfirewall\n"
 "\n"
 "Dit programma configureert een persoonlijke firewall voor deze \n"
-"Mandriva Linux machine. Voor een krachtige, specifieke\n"
-"firewall-oplossing, zie de gespecialiseerde Mandriva Security \n"
+"Mageia machine. Voor een krachtige, specifieke\n"
+"firewall-oplossing, zie de gespecialiseerde Mageia Security \n"
 "Firewall-distributie."
 
 #: ../lib/network/drakfirewall.pm:230
@@ -6066,7 +6066,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6076,7 +6076,7 @@ msgstr ""
 "Alle adapters direct verbonden met het internet moeten worden geselecteerd "
 "dienen, adapters verbonden met een lokaal netwerk hoeven niet geselecteerd "
 "te worden.\n"
-"Als u van plan bent om Mandriva Internetverbinding delen te gebruiken, \n"
+"Als u van plan bent om Mageia Internetverbinding delen te gebruiken, \n"
 "deselecteer dan de interfaces die verbonden worden met het lokale netwerk.\n"
 "\n"
 "Welke interfaces moeten worden beveiligd?\n"
@@ -6115,7 +6115,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Sommige pakketten (%s) zijn nodig maar niet verkrijgbaar."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/nn.po b/po/nn.po
index ab06fca..2116aa6 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -162,7 +162,7 @@ msgstr "DHCP-klient"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Grensesnittet er ikkje sett opp enno.\n"
 "Køyr «%s»-vegvisaren i kontrollsenteret."
@@ -209,7 +209,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Du er i ferd med å setja opp maskina til å dela Internett-sambandet.\n"
@@ -220,7 +220,7 @@ msgstr ""
 "drakconnect før du går vidare.\n"
 "\n"
 "Merk: Du treng eit eige nettverkskort for å kunna setja opp lokalnett (LAN). "
-"Slå av Mandriva-brannmuren for nettverkskortet som er kopla til lokalnettet "
+"Slå av Mageia-brannmuren for nettverkskortet som er kopla til lokalnettet "
 "før du held fram."
 
 #: ../bin/drakgw:91
@@ -458,13 +458,13 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Fann ikkje noko nettverkskort sett opp for lokalnettverk på systemet.\n"
 "\n"
 "Køyr verktøyet for maskinvareoppsett for å setja opp eit slikt kort, og sjå "
-"til at Mandriva-brannmuren ikkje er i bruk for nettverkskortet som er kopla "
+"til at Mageia-brannmuren ikkje er i bruk for nettverkskortet som er kopla "
 "til lokalnettet."
 
 #: ../bin/drakgw:316
@@ -1549,8 +1549,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright © %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1559,8 +1559,8 @@ msgstr "Eit enkelt verktøy for handtering av Samba-oppsett."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2212,10 +2212,10 @@ msgstr "Nettverket er nede på grensesnittet %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Du har ikkje sett opp noko Internett-samband.\n"
-"Køyr «%s»-vegvisaren i Mandriva Linux-kontrollsenteret."
+"Køyr «%s»-vegvisaren i Mageia-kontrollsenteret."
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2406,7 +2406,7 @@ msgstr "Har kopla til."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Feil ved tilkopling.\n"
 "Sjå etter at oppsett er rett i kontrollsenteret."
@@ -4859,14 +4859,14 @@ msgstr "Brannmuroppsett"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Brannmuroppsett\n"
 "\n"
 "Her kan du setja opp ein personleg brannmur for denne maskina.\n"
-"Sjå «Mandriva Security Firewall»-distribusjonen om du treng ein\n"
+"Sjå «Mageia Security Firewall»-distribusjonen om du treng ein\n"
 "kraftigare, særtileigna brannmur."
 
 #: ../lib/network/drakfirewall.pm:230
@@ -6006,7 +6006,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6055,7 +6055,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Nokre pakkar («%s») trengst, men er ikkje tilgjengelege."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/pa_IN.po b/po/pa_IN.po
index f204725..4e31e8d 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -164,7 +164,7 @@ msgstr "DHCP ਕਲਾਂਈਟ"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "ਹਾਲੇ ਕੋਈ ਵੀ ਇੰਟਰਫੇਸ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"
 "ਮੈਂਡਰਿਵਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਇੰਟਰਫੇਸ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
@@ -211,7 +211,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 
@@ -443,7 +443,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1466,7 +1466,7 @@ msgstr ""
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1476,7 +1476,7 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, fuzzy, c-format
-msgid "Mandriva Linux"
+msgid "Mageia"
 msgstr "ਮੈਂਡਰਿਵ-ਆਨਲਾਈਨ"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -2098,7 +2098,7 @@ msgstr "ਇੰਟਰਫੇਸ %s ਤੇ ਨੈੱਟਵਰਕ ਤੇਜ ਹੈ�
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "ਤੁਹਾਡੇ ਕੋਲ ਹਾਲੇ ਕੋਈ ਵੀ ਇੰਟਰਨੈਟ ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"
 "ਮੈਂਡਰਿਵਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
@@ -2294,7 +2294,7 @@ msgstr "ਕੁਨੈਕਸ਼ਨ ਮੁਕੰਮਲ।"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "ਕੁਨੈਕਸ਼ਨ ਅਸਫਲ।\n"
 "ਮੈਂਡਰਿਵ-ਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ ਆਪਣੀ ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ ਕਰੋ।"
@@ -4651,9 +4651,9 @@ msgstr "ਦਸਤੀ ਸੰਰਚਨਾ"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall ਸੰਰਚਨਾਕਾਰ\n"
 "\n"
@@ -5778,7 +5778,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5812,7 +5812,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/pl.po b/po/pl.po
index aa64f0c..730eef2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,9 +7,9 @@
 # Tomasz Bednarski <bednarski@skrzynka.pl>, 2005.
 # Tomasz Bednarski <tomasz.bednarski@mandriva.pl>, 2005.
 # Maciej Walkowiak <m.walkowiak@computer.org>, 2005.
-# Tomasz Bednarski - Mandriva Poland <tomasz.bednarski@mandriva.pl>, 2006, 2007.
-# Mandriva Poland <biuro@mandriva.pl>, 2006.
-# Tomasz Bednarski Mandriva Poland <tomasz.bednarski@mandriva.pl>, 2006.
+# Tomasz Bednarski - Mageia Poland <tomasz.bednarski@mandriva.pl>, 2006, 2007.
+# Mageia Poland <biuro@mandriva.pl>, 2006.
+# Tomasz Bednarski Mageia Poland <tomasz.bednarski@mandriva.pl>, 2006.
 # Tomasz Bednarski - Amazis.net <tomasz.bednarski@amazis.pl>, 2007.
 # Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva.pl>, 2008.
 # Amazis.net sp. z o.o. - Tomasz Bednarski <tomasz.bednarski@mandriva.pl>, 2008.
@@ -198,10 +198,10 @@ msgstr "Klient DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ten interfejs nie został jeszcze skonfigurowany.\n"
-"Uruchom druida \"%s\" z Centrum Sterowania Mandriva Linux"
+"Uruchom druida \"%s\" z Centrum Sterowania Mageia"
 
 #: ../bin/drakconnect-old:247
 #: ../bin/net_applet:104
@@ -247,7 +247,7 @@ msgid ""
 "\n"
 "Make sure you have configured your Network/Internet access using drakconnect before going any further.\n"
 "\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mandriva Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
 msgstr ""
 "Chcesz skonfigurować komputer jako udostępniający połączenie z Internetem\n"
 "Ta usługa pozwala innym komputerom w sieci lokalnej na używanie połączenia\n"
@@ -525,7 +525,7 @@ msgstr "Informacja rozgłoszeniowa o drukarce"
 msgid ""
 "No ethernet network adapter configured for LAN has been detected on your system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mandriva firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
 msgstr ""
 "Nie wykryto karty sieciowej skonfigurowanej dla połączeń w sieci lokalnej.\n"
 "\n"
@@ -1618,8 +1618,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s by Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1628,8 +1628,8 @@ msgstr "Jest to proste narzędzie do łatwego zarządzania konfiguracją serwera
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2232,8 +2232,8 @@ msgstr "Sieć jest niedostępna na interfejsie %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
-msgstr "Nie posiadasz żadnego skonfigurowanego połączenia internetowego. Uruchom asystenta \"%s\" z Centrum Sterowania Mandriva Linux"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr "Nie posiadasz żadnego skonfigurowanego połączenia internetowego. Uruchom asystenta \"%s\" z Centrum Sterowania Mageia"
 
 #: ../bin/net_applet:106
 #: ../lib/network/connection_manager.pm:206
@@ -2438,10 +2438,10 @@ msgstr "Próba połączenia zakończona powodzeniem."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Próba połączenia zakończona niepowodzeniem.\n"
-"Sprawdź konfigurację w Centrum Sterowania Mandriva Linux."
+"Sprawdź konfigurację w Centrum Sterowania Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4873,15 +4873,15 @@ msgstr "Konfiguracja zapory ogniowej (firewall)"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Konfiguracja zapory sieciowej\n"
 "\n"
 "Narzędzie to umożliwia konfigurację prostej zapory ogniowej.\n"
 "Jeśli potrzebujesz silnego dedykowanego rozwiązania,\n"
-"skorzystaj z dystrybucji Mandriva Security Firewall."
+"skorzystaj z dystrybucji Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5993,7 +5993,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6039,7 +6039,7 @@ msgstr "Niektóre z wymaganych komponentów (%s) są niedostępne dla urządzeni
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Niektóre pakiety (%s) są wymagane, ale są niedostępne."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/pt.po b/po/pt.po
index 0c229c2..1b216c3 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@
 #
 # Latest versions of po files are at http://www.mandrivalinux.com/l10n/pt.php3
 #
-# Copyright (C) 2000 Mandriva
+# Copyright (C) 2000 Mageia
 #
 # Fernando Moreira <fmoreira@netc.pt>, 1999.
 # Jorge Costa <Jorgercosta@netc.pt>, 2001.
@@ -23,7 +23,7 @@ msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
-"PO-Revision-Date: 2010-05-20 01:43+0100\n"
+"PO-Revision-Date: 2010-08-14 23:54+0100\n"
 "Last-Translator: Zé <mmodem00@gmal.com>\n"
 "Language-Team: Portuguese <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -180,10 +180,10 @@ msgstr "Cliente DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Este interface ainda não foi configurado.\n"
-"Execute o assistente \"%s\" do Centro de Controlo Mandriva Linux"
+"Execute o assistente \"%s\" do Centro de Controlo Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -227,7 +227,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Está prestes a configurar o seu computador para partilhar a sua conexão "
@@ -240,7 +240,7 @@ msgstr ""
 "antes de continuar.\n"
 "\n"
 "Nota: precisa de um Adaptador de Rede dedicado para definir uma Rede de "
-"Área Local (LAN). Antes de prosseguir desactive a 'Firewall' Mandriva para o "
+"Área Local (LAN). Antes de prosseguir desactive a 'Firewall' Mageia para o "
 "adaptador de rede conectado à sua rede LAN."
 
 #: ../bin/drakgw:91
@@ -486,14 +486,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Nenhum adaptador de rede ethernet configurado para uma LAN detectado no "
 "seu sistema.\n"
 "\n"
 "Por favor execute a ferramenta de configuração de material para configurar "
-"o adaptador de rede, e certifique-se que a 'firewall' Mandriva não está "
+"o adaptador de rede, e certifique-se que a 'firewall' Mageia não está "
 "activada para o adaptador de rede ligado à sua rede LAN."
 
 #: ../bin/drakgw:316
@@ -1174,22 +1174,22 @@ msgstr "Acesso síncrono:"
 #: ../bin/draknfs:178
 #, c-format
 msgid "Secured Connection:"
-msgstr "Conexão Segurada:"
+msgstr "Conexão segurada:"
 
 #: ../bin/draknfs:179
 #, c-format
 msgid "Read-Only share:"
-msgstr "Partilha em Apenas-Leitura:"
+msgstr "Partilha apenas-Leitura:"
 
 #: ../bin/draknfs:180
 #, c-format
 msgid "Subtree checking:"
-msgstr "Verificação das sub-árvores:"
+msgstr "Verificação de sub-árvores:"
 
 #: ../bin/draknfs:182
 #, c-format
 msgid "Advanced Options"
-msgstr "Opções Avançadas"
+msgstr "Opções avançadas"
 
 #: ../bin/draknfs:183
 #, c-format
@@ -1283,7 +1283,7 @@ msgstr "Mapeamento ID do Utilizador"
 #: ../bin/draknfs:384
 #, c-format
 msgid "User ID:"
-msgstr "ID de Utilizador:"
+msgstr "ID de utilizador:"
 
 #: ../bin/draknfs:385
 #, c-format
@@ -1432,7 +1432,7 @@ msgstr "Lista de escrita"
 #: ../bin/draksambashare:82 ../bin/draksambashare:158
 #, c-format
 msgid "Admin users"
-msgstr "Utilizadores Administradores"
+msgstr "Utilizadores administradores"
 
 #: ../bin/draksambashare:83 ../bin/draksambashare:159
 #, c-format
@@ -1492,7 +1492,7 @@ msgstr "Imprimivel"
 #: ../bin/draksambashare:122
 #, c-format
 msgid "Print Command"
-msgstr "Comando de Impressão"
+msgstr "Comando de impressão"
 
 #: ../bin/draksambashare:123
 #, c-format
@@ -1518,7 +1518,7 @@ msgstr "Impressão"
 #: ../bin/draksambashare:129
 #, c-format
 msgid "Create mode"
-msgstr "Modo criar"
+msgstr "Modo de criar"
 
 #: ../bin/draksambashare:130
 #, c-format
@@ -1528,17 +1528,17 @@ msgstr "Usar controlador do cliente"
 #: ../bin/draksambashare:156
 #, c-format
 msgid "Read List"
-msgstr "Lista de Leitura"
+msgstr "Lista de leitura"
 
 #: ../bin/draksambashare:157
 #, c-format
 msgid "Write List"
-msgstr "Lista de Escrita"
+msgstr "Lista de escrita"
 
 #: ../bin/draksambashare:162
 #, c-format
 msgid "Force Group"
-msgstr "Forçar Grupo"
+msgstr "Forçar grupo"
 
 #: ../bin/draksambashare:163
 #, c-format
@@ -1588,8 +1588,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Direitos de Autor (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Direitos de Autor (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1599,8 +1599,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -1651,8 +1651,8 @@ msgid ""
 "Share with the same name already exist or share name empty, please choose "
 "another name."
 msgstr ""
-"Partilha com o mesmo nome já existente ou nome de partilha vazio, por favor "
-"escolhe outro nome."
+"Partilha com o mesmo nome já existente ou nome de partilha vazio, por "
+"favor escolha outro nome."
 
 #: ../bin/draksambashare:400
 #, c-format
@@ -1719,7 +1719,7 @@ msgstr ""
 #: ../bin/draksambashare:570
 #, c-format
 msgid "DrakSamba Printers entry"
-msgstr "Entrada de Impressoras DrakSamba"
+msgstr "Entrada de impressoras DrakSamba"
 
 #: ../bin/draksambashare:583
 #, c-format
@@ -2056,8 +2056,8 @@ msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
 msgstr ""
-"Ficheiro de registo: use ficheiro.%m para usar um ficheiro de registo de "
-"separação para cada máquina que se conecta."
+"Ficheiro de registo: use o ficheiro.%m para usar um ficheiro de registo "
+"separado para cada máquina a que se conecta."
 
 #: ../bin/draksambashare:1153
 #, c-format
@@ -2099,7 +2099,7 @@ msgid ""
 "To accept these values, and configure your server, click the Next button or "
 "use the Back button to correct them."
 msgstr ""
-"Para aceitar estes valores, e configurar o seu servidor, clique no botão "
+"Para aceitar estes valores, e configurar o seu servidor, prima o botão "
 "Próximo ou use o botão Anterior para os corrigir."
 
 #: ../bin/draksambashare:1167
@@ -2109,7 +2109,7 @@ msgid ""
 "configuration. Run 'drakwizard sambashare' to manage your shares."
 msgstr ""
 "Se anteriormente criou algumas partilhas, irão aparecer nesta configuração. "
-"Execute o 'drakwizard sambashare' para gerir as suas partilhas."
+"Execute 'drakwizard sambashare' para gerir as suas partilhas."
 
 #: ../bin/draksambashare:1175
 #, c-format
@@ -2139,7 +2139,7 @@ msgstr "Conjunto de caracteres Dos:"
 #: ../bin/draksambashare:1182
 #, c-format
 msgid "Display Charset:"
-msgstr "Mostrar Conjunto de Caracteres:"
+msgstr "Mostrar conjunto de caracteres:"
 
 #: ../bin/draksambashare:1197
 #, c-format
@@ -2264,10 +2264,10 @@ msgstr "A rede está desligada no interface %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Não tem qualquer conexão Internet configurada.\n"
-"Execute o assistente \"%s\" do Centro de Controlo Mandriva Linux"
+"Execute o assistente \"%s\" do Centro de Controlo Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2287,7 +2287,7 @@ msgstr "Desconectar %s"
 #: ../bin/net_applet:133
 #, c-format
 msgid "Monitor Network"
-msgstr "Monitorizar Rede"
+msgstr "Monitorizar rede"
 
 #: ../bin/net_applet:135
 #, c-format
@@ -2302,7 +2302,7 @@ msgstr "Gerir conexões VPN"
 #: ../bin/net_applet:141
 #, c-format
 msgid "Configure Network"
-msgstr "Configurar Rede"
+msgstr "Configurar rede"
 
 #: ../bin/net_applet:143
 #, c-format
@@ -2364,7 +2364,7 @@ msgstr "Definições"
 #: ../bin/net_monitor:60 ../bin/net_monitor:65
 #, c-format
 msgid "Network Monitoring"
-msgstr "Monitorização da Rede"
+msgstr "Monitorização da rede"
 
 #: ../bin/net_monitor:99
 #, c-format
@@ -2458,10 +2458,10 @@ msgstr "Conexão completa."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Conexão falhada.\n"
-"Verifique a sua configuração no Centro de Controlo Mandriva Linux."
+"Verifique a sua configuração no Centro de Controlo Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -2504,8 +2504,8 @@ msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
 msgstr ""
-"Atenção, foi detectada outra conexão Internet, que talvez esteja a usar a "
-"sua rede"
+"Atenção, foi detectada outra conexão Internet, que talvez esteja a usar "
+"a sua rede"
 
 #: ../bin/net_monitor:516
 #, c-format
@@ -2632,7 +2632,7 @@ msgstr "Senha da conta"
 #: ../lib/network/connection/cellular.pm:75
 #, c-format
 msgid "Access Point Name"
-msgstr "Nome do Ponto de Acesso"
+msgstr "Nome do ponto de acesso"
 
 #: ../lib/network/connection/cellular_bluetooth.pm:10
 #, c-format
@@ -2642,12 +2642,12 @@ msgstr "Bluetooth"
 #: ../lib/network/connection/cellular_bluetooth.pm:11
 #, c-format
 msgid "Bluetooth Dial Up Networking"
-msgstr "Rede de Marcação Bluetooth"
+msgstr "Rede de marcação Bluetooth"
 
 #: ../lib/network/connection/cellular_card.pm:8
 #, c-format
 msgid "Wrong PIN number format: it should be 4 digits."
-msgstr "Formato incorrecto do número PIN: deve ser 4 dígitos."
+msgstr "Formato incorrecto do número PIN: deve ter 4 dígitos."
 
 #: ../lib/network/connection/cellular_card.pm:10
 #, c-format
@@ -2662,7 +2662,7 @@ msgstr "Número PIN (4 dígitos). Deixe em branco se o PIN não é pedido."
 #: ../lib/network/connection/cellular_card.pm:186
 #, c-format
 msgid "Unable to open device %s"
-msgstr "Incapaz de abrir o dispositivo %s"
+msgstr "Não é possível abrir o dispositivo %s"
 
 #: ../lib/network/connection/cellular_card.pm:218
 #, c-format
@@ -2676,8 +2676,8 @@ msgid ""
 "Entering the wrong PIN code multiple times may lock your SIM card!"
 msgstr ""
 "Indicou um número PIN incorrecto.\n"
-"Ao indicar várias vezes um número PIN incorrecto pode bloquear o seu cartão "
-"SIM!"
+"Ao indicar várias vezes um número PIN incorrecto pode bloquear "
+"o seu cartão SIM!"
 
 #: ../lib/network/connection/dvb.pm:9
 #, c-format
@@ -2734,7 +2734,7 @@ msgstr "Configuração manual"
 #: ../lib/network/connection/ethernet.pm:71
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
-msgstr "IP Automático (BOOTP/DHCP)"
+msgstr "IP automático (BOOTP/DHCP)"
 
 #: ../lib/network/connection/ethernet.pm:129
 #, c-format
@@ -2776,7 +2776,7 @@ msgstr "Servidor DNS 2"
 #: ../lib/network/connection/ethernet.pm:153
 #, c-format
 msgid "Search domain"
-msgstr "Domínio de procura"
+msgstr "Domínio de pesquisa"
 
 #: ../lib/network/connection/ethernet.pm:154
 #, c-format
@@ -4137,7 +4137,7 @@ msgstr "Definições de rede sem-fio"
 #: ../lib/network/connection_manager.pm:280
 #, c-format
 msgid "Operating Mode"
-msgstr "Modo de Operação"
+msgstr "Modo de operação"
 
 #: ../lib/network/connection/wireless.pm:462
 #, c-format
@@ -4407,7 +4407,7 @@ msgstr "Protocolo EAP"
 #: ../lib/network/connection/wireless.pm:558
 #, c-format
 msgid "Auto Detect"
-msgstr "Auto Detectar"
+msgstr "Auto detectar"
 
 #: ../lib/network/connection/wireless.pm:553
 #, c-format
@@ -4500,7 +4500,7 @@ msgstr ""
 #: ../lib/network/connection/wireless.pm:564
 #, c-format
 msgid "EAP outer identity"
-msgstr "Identidade de fora EAP"
+msgstr "Identidade EAP de fora"
 
 #: ../lib/network/connection/wireless.pm:566
 #, c-format
@@ -4511,7 +4511,7 @@ msgid ""
 msgstr ""
 "Texto de identidade anónima para EAP: para ser usada como\n"
 "a identidade não encriptada com tipos EAP que suportam\n"
-"diferentes identidades, e.g., TTLS"
+"diferentes identidades tuneladas, e.g., TTLS"
 
 #: ../lib/network/connection/wireless.pm:569
 #, c-format
@@ -4815,7 +4815,7 @@ msgstr "Servidor Web"
 #: ../lib/network/drakfirewall.pm:19
 #, c-format
 msgid "Domain Name Server"
-msgstr "Servidor de Nomes do Domínio"
+msgstr "Servidor de Nomes de Domínio"
 
 #: ../lib/network/drakfirewall.pm:24
 #, c-format
@@ -4918,15 +4918,15 @@ msgstr "Configuração da 'firewall'"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "configuração drakfirewall\n"
 "\n"
-"Isto configura uma 'firewall' pessoal para esta máquina Mandriva Linux.\n"
+"Isto configura uma 'firewall' pessoal para esta máquina Mageia.\n"
 "Para uma solução eficaz e dedicada da 'firewall', veja a distribuição\n"
-"especializada Mandriva Security 'Firewall'."
+"especializada Mageia Security 'Firewall'."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5038,7 +5038,7 @@ msgstr "Refrescar"
 #: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:795
 #, c-format
 msgid "Wireless connection"
-msgstr "Conexão Sem-fio"
+msgstr "Conexão sem-fio"
 
 #: ../lib/network/drakvpn.pm:30
 #, c-format
@@ -5124,7 +5124,7 @@ msgstr "Serviço atacado"
 #: ../lib/network/ifw.pm:134
 #, c-format
 msgid "Password cracking"
-msgstr "Ataque á senha"
+msgstr "Ataque à senha"
 
 #: ../lib/network/ifw.pm:135
 #, c-format
@@ -5610,12 +5610,12 @@ msgstr "Nome do domínio"
 #: ../lib/network/netconnect.pm:651
 #, c-format
 msgid "First DNS Server (optional)"
-msgstr "Primeiro Servidor DNS (opcional)"
+msgstr "Primeiro servidor DNS (opcional)"
 
 #: ../lib/network/netconnect.pm:652
 #, c-format
 msgid "Second DNS Server (optional)"
-msgstr "Segundo Servidor DNS (opcional)"
+msgstr "Segundo servidor DNS (opcional)"
 
 #: ../lib/network/netconnect.pm:653
 #, c-format
@@ -6011,7 +6011,7 @@ msgstr "Registar pacotes estranhos"
 #: ../lib/network/network.pm:539
 #, c-format
 msgid "Proxies configuration"
-msgstr "Configuração do 'proxy'"
+msgstr "Configuração de 'proxies'"
 
 #: ../lib/network/network.pm:540
 #, c-format
@@ -6070,7 +6070,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6080,7 +6080,7 @@ msgstr ""
 "Todos os interfaces ligados directamente à Internet devem ser detectados,\n"
 "enquanto os interfaces ligados a uma rede local podem ser de-seleccionados.\n"
 "\n"
-"Se pretende usar a partilha da Conexão Internet Mandriva, "
+"Se pretende usar a partilha da Conexão Internet Mageia, "
 "desmarque os interfaces que irão estar ligados à rede local.\n"
 "\n"
 "Que interfaces devem ser protegidos?\n"
@@ -6118,7 +6118,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Alguns pacotes (%s) são pedidos mas não estão disponíveis."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9d8cf2b..a779370 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2010-04-05 18:28-0300\n"
 "Last-Translator: Sergio Rafael Lemke <sergio@mandriva.com.br>\n"
-"Language-Team: Brazilian Portuguese <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Brazilian Portuguese <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -176,10 +176,10 @@ msgstr "Cliente DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Esta interface ainda não foi configurada.\n"
-"Execute o assistente \"%s\" no Centro de Controle Mandriva Linux"
+"Execute o assistente \"%s\" no Centro de Controle Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -223,7 +223,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Você está prestes a configurar o compartilhamento da conexão à Internet do \n"
@@ -234,7 +234,7 @@ msgstr ""
 "utilizando o drakconnect.\n"
 "\n"
 "Nota: você precisa de um Adaptador de Rede dedicado para criar uma Rede "
-"Local (LAN). Por favor desative o Mandriva Firewall para a placa de rede "
+"Local (LAN). Por favor desative o Mageia Firewall para a placa de rede "
 "conectada a rede local antes de proseguir."
 
 #: ../bin/drakgw:91
@@ -476,13 +476,13 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Nenhuma placa de rede configurada para a LAN foi detectada em seu sistema.\n"
 "\n"
 "Favor executar a ferramenta de detecção de hardware para configurar uma,"
-"certifique-se que o Firewall Mandriva esteja desativado para a placa de rede "
+"certifique-se que o Firewall Mageia esteja desativado para a placa de rede "
 "usada na LAN."
 
 #: ../bin/drakgw:316
@@ -1570,8 +1570,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s por Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s por Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1582,8 +1582,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2248,10 +2248,10 @@ msgstr "A rede está inativa na interface %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Você não possui nenhuma conexão de Internet configurada.\n"
-"Execute o assistente \"%s\" no Centro de Controle Mandriva Linux"
+"Execute o assistente \"%s\" no Centro de Controle Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2442,10 +2442,10 @@ msgstr "Conexão Completa."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "A conexão falhou.\n"
-"Verifique sua configuração no Centro de Controle Mandriva Linux."
+"Verifique sua configuração no Centro de Controle Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4897,15 +4897,15 @@ msgstr "Configuração de Firewal"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Configurador DrakFirewall\n"
 "\n"
-"Isto configura um firewall pessoal para esta máquina Mandriva Linux.\n"
+"Isto configura um firewall pessoal para esta máquina Mageia.\n"
 "Para um firewall dedicado potente, por favor procure a distribuição\n"
-"especializada Mandriva Security Firewall."
+"especializada Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6050,7 +6050,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6060,7 +6060,7 @@ msgstr ""
 "Recomenda-se selecionar todas as interfaces diretamente conectadas à\n"
 "Internet, as interfaces conectadas à rede local podem ficar sem proteção.\n"
 "\n"
-"Se você for usar o compartilhamento de conexão Mandriva,\n"
+"Se você for usar o compartilhamento de conexão Mageia,\n"
 "desmarque as interfaces que serão conectadas a rede local.\n"
 "\n"
 "Quais interfaces devem ser protegidas?\n"
@@ -6098,7 +6098,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Alguns pacotes (%s) que são requeridos não estão disponiveis."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/ro.po b/po/ro.po
index 9d9fb71..09f2dcf 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,5 +1,5 @@
 # Translation of drakx-net.po to Romanian
-# Copyright (c) 1999-2010 Mandriva
+# Copyright (c) 1999-2010 Mageia
 #
 # Vă rugăm să nu actualizaţi fișierul, cu excepția cazului în care sînteți
 # sigur de calitatea traducerii dumneavoastră, de gramatică și de ortografie.
@@ -30,7 +30,7 @@
 #
 # Vă mulțumim pentru înțelegere.
 #                                                       Echipa de traducători,
-#                                                       www.Mandrivausers.ro
+#                                                       www.Mageiausers.ro
 #
 # Traducători de-a lungul timpului:
 #
@@ -46,9 +46,9 @@ msgstr ""
 "Project-Id-Version: drakx-net\n"
 "Report-Msgid-Bugs-To: https://qa.mandriva.com\n"
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
-"PO-Revision-Date: 2010-06-02 17:39+0100\n"
+"PO-Revision-Date: 2010-06-11 15:07+0100\n"
 "Last-Translator: Cătălin Florin RUSSEN <cfrussen@yahoo.co.uk>\n"
-"Language-Team: Romanian <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Romanian <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -204,10 +204,10 @@ msgstr "Client DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Această interfață nu a fost configurată încă.\n"
-"Lansați asistentul „%s” din centrul de control Mandriva Linux"
+"Lansați asistentul „%s” din centrul de control Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -251,7 +251,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Sînteți pe cale să vă configurați calculatorul pentru a-și partaja "
@@ -263,7 +263,7 @@ msgstr ""
 "Internet cu ajutorul lui drakconnect.\n"
 "\n"
 "Notă: aveți nevoie de o placă de rețea dedicată pentru rețeaua locală (LAN). "
-"Dezactivați parafocul Mandriva pentru adaptorul conectat la rețeaua locală "
+"Dezactivați parafocul Mageia pentru adaptorul conectat la rețeaua locală "
 "înainte de a continua."
 
 #: ../bin/drakgw:91
@@ -505,7 +505,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Nu s-a detectat în sistem nici un adaptor configurat pentru rețeaua locală.\n"
@@ -1603,8 +1603,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Drepturi de autor (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Drepturi de autor (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1613,8 +1613,8 @@ msgstr "Acesta este o unealtă simplă pentru a gestiona ușor Samba."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2230,7 +2230,7 @@ msgstr "Utilizatori Samba"
 #: ../bin/draksambashare:1455
 #, c-format
 msgid "Please configure your Samba server"
-msgstr "Configurați-vă serverul Samba"
+msgstr "Configurați serverul Samba"
 
 #: ../bin/draksambashare:1455
 #, c-format
@@ -2269,26 +2269,26 @@ msgstr "DNS: %s"
 #: ../bin/net_applet:99
 #, c-format
 msgid "Connected to %s (link level: %d %%)"
-msgstr "Conectat la %s (nivelul legăturii: %d %%)"
+msgstr "Conectat la %s (nivel conexiune: %d %%)"
 
 #: ../bin/net_applet:101
 #, c-format
 msgid "Network is down on interface %s."
-msgstr "Rețeaua este dezactivată pe interfața %s."
+msgstr "Rețeaua este inactivă pe interfața %s."
 
 #: ../bin/net_applet:103
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Nu aveți configurată nici o conexiune la Internet.\n"
-"Lansați asistentul \"%s\" din centrul de control Mandriva Linux"
+"Lansați asistentul „%s” din centrul de control Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
 msgid "Connecting..."
-msgstr "Se conectează..."
+msgstr "Conectare..."
 
 #: ../bin/net_applet:131 ../bin/net_monitor:519
 #, c-format
@@ -2303,22 +2303,22 @@ msgstr "Deconectează %s"
 #: ../bin/net_applet:133
 #, c-format
 msgid "Monitor Network"
-msgstr "Supraveghere rețea"
+msgstr "Supraveghează rețeaua"
 
 #: ../bin/net_applet:135
 #, c-format
 msgid "Manage wireless networks"
-msgstr "Gestionează rețelele fără fir"
+msgstr "Gestionați rețelele fără-fir"
 
 #: ../bin/net_applet:137
 #, c-format
 msgid "Manage VPN connections"
-msgstr "Gestionează conexiunile VPN"
+msgstr "Gestionați conexiunile VPN"
 
 #: ../bin/net_applet:141
 #, c-format
 msgid "Configure Network"
-msgstr "Configurare rețea"
+msgstr "Configurează rețeaua"
 
 #: ../bin/net_applet:143
 #, c-format
@@ -2370,12 +2370,12 @@ msgstr "Lansează întotdeauna la pornire"
 #: ../bin/net_applet:518
 #, c-format
 msgid "Wireless networks"
-msgstr "Rețele fără fir"
+msgstr "Rețele fără-fir"
 
 #: ../bin/net_applet:525 ../bin/net_monitor:96
 #, c-format
 msgid "Settings"
-msgstr "Reglaje"
+msgstr "Configurări"
 
 #: ../bin/net_monitor:60 ../bin/net_monitor:65
 #, c-format
@@ -2438,7 +2438,7 @@ msgstr "Timp de conectare:"
 #: ../bin/net_monitor:120
 #, c-format
 msgid "Use same scale for received and transmitted"
-msgstr "Utilizează acceași scală pentru pachetele recepționate și transmise"
+msgstr "Utilizează aceeași scală pentru pachetele recepționate și transmise"
 
 #: ../bin/net_monitor:138
 #, c-format
@@ -2463,7 +2463,7 @@ msgstr "Deconectarea de la Internet a eșuat."
 #: ../bin/net_monitor:255
 #, c-format
 msgid "Disconnection from Internet complete."
-msgstr "Deconectarea de la Internet terminată."
+msgstr "Deconectare de la Internet terminată."
 
 #: ../bin/net_monitor:257
 #, c-format
@@ -2474,10 +2474,10 @@ msgstr "Conectare reușită."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Conectare eșuată.\n"
-"Verificați configurarea în centrul de control Mandriva Linux."
+"Verificați configurația în centrul de control Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -2512,7 +2512,7 @@ msgstr "Resetează contoarele"
 #: ../bin/net_monitor:454
 #, c-format
 msgid "Local measure"
-msgstr "Măsuri locale"
+msgstr "Măsură locală"
 
 #: ../bin/net_monitor:512
 #, c-format
@@ -2520,8 +2520,8 @@ msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
 msgstr ""
-"Atenție, o altă conexiune la Internet a fost detectată, utilizîndu-vă "
-"probabil rețeaua"
+"Atenție, o altă conexiune la Internet a fost detectată, probabil vă "
+"utilizează rețeaua"
 
 #: ../bin/net_monitor:516
 #, c-format
@@ -2536,7 +2536,7 @@ msgstr "Deconectat"
 #: ../bin/net_monitor:523
 #, c-format
 msgid "No internet connection configured"
-msgstr "Nu este configurată nici o conexiune la internet"
+msgstr "Nu este configurată nici o conexiune la Internet"
 
 #: ../lib/network/connection.pm:16
 #, c-format
@@ -2546,12 +2546,12 @@ msgstr "Tip de conexiune necunoscut"
 #: ../lib/network/connection.pm:162
 #, c-format
 msgid "Network access settings"
-msgstr "Parametrii de acces la rețea"
+msgstr "Parametri de acces la rețea"
 
 #: ../lib/network/connection.pm:163
 #, c-format
 msgid "Access settings"
-msgstr "Parametrii de acces"
+msgstr "Parametri de acces"
 
 #: ../lib/network/connection.pm:164
 #, c-format
@@ -2581,7 +2581,7 @@ msgstr "Permite utilizatorilor să gestioneze conexiunea"
 #: ../lib/network/connection.pm:244
 #, c-format
 msgid "Start the connection at boot"
-msgstr "Pornește conexiunea la demaraj"
+msgstr "Inițiază conexiunea la pornire"
 
 #: ../lib/network/connection.pm:245
 #, c-format
@@ -2639,18 +2639,18 @@ msgstr "Autentificare"
 #: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:393
 #, c-format
 msgid "Account Login (user name)"
-msgstr "Nume cont utilizator"
+msgstr "Numele utilizatorului contului"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
 #: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:394
 #, c-format
 msgid "Account Password"
-msgstr "Parolă cont"
+msgstr "Parola contului"
 
 #: ../lib/network/connection/cellular.pm:75
 #, c-format
 msgid "Access Point Name"
-msgstr "Nume punct de acces"
+msgstr "Numele punctului de acces"
 
 #: ../lib/network/connection/cellular_bluetooth.pm:10
 #, c-format
@@ -2660,7 +2660,7 @@ msgstr "Bluetooth"
 #: ../lib/network/connection/cellular_bluetooth.pm:11
 #, c-format
 msgid "Bluetooth Dial Up Networking"
-msgstr "Rețea Bluetooth Dial Up"
+msgstr "Rețea comutată Bluetooth"
 
 #: ../lib/network/connection/cellular_card.pm:8
 #, c-format
@@ -2694,7 +2694,7 @@ msgid ""
 "Entering the wrong PIN code multiple times may lock your SIM card!"
 msgstr ""
 "Ați introdus un cod PIN greșit.\n"
-"Introducerea repetată unui cod PIN greșit poate duce la blocarea cartelei "
+"Introducerea repetată a unui cod PIN greșit poate duce la blocarea cartelei "
 "SIM!"
 
 #: ../lib/network/connection/dvb.pm:9
@@ -2710,7 +2710,7 @@ msgstr "Satelit (DVB)"
 #: ../lib/network/connection/dvb.pm:53
 #, c-format
 msgid "Adapter card"
-msgstr "Cartelă adaptoare"
+msgstr "Placă adaptoare"
 
 #: ../lib/network/connection/dvb.pm:54
 #, c-format
@@ -2730,7 +2730,7 @@ msgstr "Ethernet"
 #: ../lib/network/connection/ethernet.pm:12
 #, c-format
 msgid "Wired (Ethernet)"
-msgstr "Cablat (Ethernet)"
+msgstr "Filară (Ethernet)"
 
 #: ../lib/network/connection/ethernet.pm:30
 #, c-format
@@ -2757,7 +2757,7 @@ msgstr "Alocare automată de adresă IP (BOOTP/DHCP)"
 #: ../lib/network/connection/ethernet.pm:129
 #, c-format
 msgid "IP settings"
-msgstr "Parametrii IP"
+msgstr "Parametri IP"
 
 #: ../lib/network/connection/ethernet.pm:142
 #, c-format
@@ -2766,7 +2766,7 @@ msgid ""
 "Each item should be entered as an IP address in dotted-decimal\n"
 "notation (for example, 1.2.3.4)."
 msgstr ""
-"Introduceți configurația IP pentru acest calculator.\n"
+"Introduceți configurația IP pentru această mașină.\n"
 "Fiecare rubrică va trebui să fie completată ca o adresă IP în format\n"
 "zecimal-punctat (de exemplu: 192.168.1.55)."
 
@@ -2800,12 +2800,13 @@ msgstr "Domeniu de căutare"
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
-"Implicit, domeniul de căutare va fi dedus din numele mașinii completcalificat"
+"Implicit, domeniul de căutare va fi dedus din numele mașinii complet "
+"calificat"
 
 #: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "DHCP timeout (in seconds)"
-msgstr "Limită de timp DHCP (în secunde)"
+msgstr "Durată de expirare DHCP (în secunde)"
 
 #: ../lib/network/connection/ethernet.pm:158
 #, c-format
@@ -2820,7 +2821,7 @@ msgstr "Recuperează serverele NTPD din DHCP"
 #: ../lib/network/connection/ethernet.pm:160
 #, c-format
 msgid "DHCP host name"
-msgstr "Nume DHCP de gazdă"
+msgstr "Nume de gazdă DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
 #, c-format
@@ -2849,10 +2850,10 @@ msgid ""
 "address with this connection, first disable all other devices which use it, "
 "or configure them not to start at boot"
 msgstr ""
-"%s este deja utilizat de conexiunea pornită la demaraj (%s). Pentru a "
+"%s este deja utilizată de conexiunea inițiată la pornire (%s). Pentru a "
 "utiliza această adresă cu această conexiune, va trebui să dezactivați mai "
-"întîi toate dispozitivele care o utilizează, sau să le configurați să nu "
-"pornească la demaraj"
+"întîi toate dispozitivele care o utilizează, sau să le configurați să nu fie "
+"inițiate la pornire"
 
 #: ../lib/network/connection/ethernet.pm:219
 #, c-format
@@ -2878,19 +2879,19 @@ msgid ""
 "left blank, 'localhost.localdomain' will be used."
 msgstr ""
 "Trebuie să definiți un nume de gazdă pentru această mașină, nume prin care "
-"va fi identificat acest calculator. De notat că acest nume va fi partajat "
-"pentru toate conexiunile în rețea. Dacă-l lăsați gol, „localhost."
-"localdomain” va fi folosit."
+"va fi identificat acest calculator. De notat că acest nume va fi utilizat "
+"detoate conexiunile de rețea. Dacă-l lăsați gol, „localhost.localdomain” va "
+"fi folosit."
 
 #: ../lib/network/connection/ethernet.pm:241
 #, c-format
 msgid "Network Hotplugging"
-msgstr "Reconfigurarea \"la cald\" a rețelei"
+msgstr "Cuplarea la cald a rețelei"
 
 #: ../lib/network/connection/ethernet.pm:245
 #, c-format
 msgid "Enable IPv6 to IPv4 tunnel"
-msgstr "Activează tunelul IPv6 spre IPv4"
+msgstr "Activează tunelul IPv6 către IPv4"
 
 #: ../lib/network/connection/ethernet.pm:301
 #, c-format
@@ -2900,7 +2901,7 @@ msgstr "Conexiune detectată pe interfața %s"
 #: ../lib/network/connection/ethernet.pm:304
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
-msgstr "Se solicită o adresă de rețea pe interfața %s (protocol %s)..."
+msgstr "Se solicită o adresă de rețea pentru interfața %s (protocol %s)..."
 
 #: ../lib/network/connection/ethernet.pm:305
 #, c-format
@@ -3169,14 +3170,14 @@ msgstr "Marea Britanie"
 #: ../lib/network/netconnect.pm:37
 #, c-format
 msgid "United States"
-msgstr "Statele unite"
+msgstr "Statele Unite"
 
 #: ../lib/network/connection/providers/cellular_extra.pm:11
 #: ../lib/network/connection/providers/cellular_extra.pm:18
 #: ../lib/network/connection/providers/xdsl.pm:1320
 #, c-format
 msgid "United Arab Emirates"
-msgstr "Emiratele arabe unite"
+msgstr "Emiratele Arabe Unite"
 
 #: ../lib/network/connection/providers/cellular_extra.pm:23
 #, c-format
@@ -3330,7 +3331,7 @@ msgstr "Elveția"
 #: ../lib/network/connection/providers/cellular_extra.pm:355
 #, c-format
 msgid "Cote d'Ivoire"
-msgstr "Coasta de fildeș"
+msgstr "Coasta de Fildeș"
 
 #: ../lib/network/connection/providers/cellular_extra.pm:358
 #: ../lib/network/connection/providers/cellular_extra.pm:363
@@ -3932,7 +3933,7 @@ msgstr "Federația Rusă"
 #: ../lib/network/connection/providers/cellular_extra.pm:1941
 #, c-format
 msgid "Saudi Arabia"
-msgstr "Arabia saudită"
+msgstr "Arabia Saudită"
 
 #: ../lib/network/connection/providers/cellular_extra.pm:1946
 #: ../lib/network/connection/providers/cellular_extra.pm:1949
@@ -4066,7 +4067,7 @@ msgstr "Venezuela"
 #: ../lib/network/connection/providers/cellular_extra.pm:2277
 #, c-format
 msgid "South Africa"
-msgstr "Africa de sud"
+msgstr "Africa de Sud"
 
 #: ../lib/network/connection/providers/xdsl.pm:47
 #: ../lib/network/connection/providers/xdsl.pm:57
@@ -4082,7 +4083,7 @@ msgstr "Algeria"
 #: ../lib/network/connection/providers/xdsl.pm:1258
 #, c-format
 msgid "Any"
-msgstr "Orice"
+msgstr "Orice țară"
 
 #: ../lib/network/connection/providers/xdsl.pm:1031
 #, c-format
@@ -4097,12 +4098,12 @@ msgstr "Tunisia"
 #: ../lib/network/connection/wireless.pm:13
 #, c-format
 msgid "Wireless"
-msgstr "Fără fir"
+msgstr "Fără-fir"
 
 #: ../lib/network/connection/wireless.pm:14
 #, c-format
 msgid "Wireless (Wi-Fi)"
-msgstr "Fără fir (Wi-Fi)"
+msgstr "Fără-fir (Wi-Fi)"
 
 #: ../lib/network/connection/wireless.pm:30
 #, c-format
@@ -4140,13 +4141,13 @@ msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
-"Placa de rețea fără fir este dezactivată, activați-o apăsînd butonul în "
-"acest scop."
+"Placa de rețea fără-fir este dezactivată, activați-o apăsînd butonul "
+"prevăzut în acest scop."
 
 #: ../lib/network/connection/wireless.pm:456
 #, c-format
 msgid "Wireless settings"
-msgstr "Parametrii conexiunii fără fir"
+msgstr "Parametrii conexiunii fără-fir"
 
 #: ../lib/network/connection/wireless.pm:461
 #: ../lib/network/connection_manager.pm:280
@@ -4187,7 +4188,7 @@ msgstr "Auto"
 #: ../lib/network/connection/wireless.pm:465
 #, c-format
 msgid "Network name (ESSID)"
-msgstr "Nume rețea (ESSID)"
+msgstr "Numele rețelei (ESSID)"
 
 #: ../lib/network/connection/wireless.pm:467
 #, c-format
@@ -4249,12 +4250,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 " Parolă : un șir de caractere.\n"
-"Notă: nu este același lucru cu psk.\n"
+"Notați că nu este același lucru cu un psk.\n"
 "____________________________________________________\n"
-"INFORMAȚII SUPLIMENTARE :\n"
-"În pagina 'Opțiuni avansate', puteți alege modul de\n"
-"autentificare EAP utilizat. Pentru modul EAP\n"
-"   Auto-detectție : toate modurile posibile vor fi încercate.\n"
+"INFORMAȚII ADIȚIONALE:\n"
+"În pagina „Opțiuni avansate”, puteți alege care mod de\n"
+"autentificare EAP este utilizat. Pentru configurarea modului EAP\n"
+"   Auto-detecție : toate modurile posibile vor fi încercate.\n"
 "\n"
 "Dacă auto-detecția eșuează, incercați PEAP cu TTLS în prioritate\n"
 "Notă:\n"
@@ -4279,12 +4280,12 @@ msgstr ""
 "Calea completă și numele fișierului certificatului client. Acesta\n"
 "este utilizat numai pentru autentificările bazate pe certificat EAP.\n"
 "Poate fi considerată ca o alternativă cuplului utilizator/parolă.\n"
-" Notă : ceilalți parametri asociați îi găsiți în „Opțiuni avansate”."
+" Notă: ceilalți parametri asociați îi găsiți în „Opțiuni avansate”."
 
 #: ../lib/network/connection/wireless.pm:509
 #, c-format
 msgid "Network ID"
-msgstr "Identificator rețea"
+msgstr "ID rețea"
 
 #: ../lib/network/connection/wireless.pm:510
 #, c-format
@@ -4320,7 +4321,7 @@ msgid ""
 "or off."
 msgstr ""
 "RTS/CTS rezervă canalul înainte de fiecare transmisie de pachet ca să-i\n"
-"verifice disponibilitatea. Aceasta reduce lățimea de bandă, dar mărește\n"
+"verifice disponibilitatea. Acest lucru reduce lățimea de bandă, dar mărește\n"
 "performanțele în cazul nodurilor ascunse, sau prezența unui număr mare de\n"
 "noduri active. Acest parametru definește mărimea celui mai mic pachet "
 "pentru\n"
@@ -4349,8 +4350,8 @@ msgid ""
 "\n"
 "See iwconfig(8) man page for further information."
 msgstr ""
-"Aici, se pot configura parametrii suplimentari pentru placa de rețeafără "
-"fir, precum:\n"
+"Aici, se pot configura parametrii suplimentari pentru placa de rețea fără-"
+"fir precum:\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (nick est deja "
 "configurat de numele gazdei).\n"
 "\n"
@@ -4376,7 +4377,7 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 "iwspy este utilizată pentrua defini o listă de adrese, la nivelul unei\n"
-"interfețe de rețea fără fir, pentru a obține calitatea semnalului pentru\n"
+"interfețe de rețea fără-fir, pentru a obține calitatea semnalului pentru\n"
 "fiecare dintre ele.\n"
 "\n"
 "De asemenea, această informație este disponibilă în /proc/net/wireless:\n"
@@ -4409,7 +4410,8 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 "iwpriv permite specificarea parametrilor opționali (și privați) ai unei "
-"interfețe de rețea fără fir.\n"
+"interfețe\n"
+"de rețea fără-fir.\n"
 "\n"
 "impriv permite manipularea parametrilor și reglajelor specifice fiecărui\n"
 "pilot (spre deosebire de iwconfig care gestionează parametrii\n"
@@ -4532,7 +4534,7 @@ msgid ""
 "unencrypted identity with EAP types that support different\n"
 "tunnelled identity, e.g., TTLS"
 msgstr ""
-"Șir de autentificare anonimă pentru EAP : va fi utilizată\n"
+"Șir de autentificare anonimă pentru EAP: va fi utilizată\n"
 "ca identitate necriptată cu tipurile de EAP ce suportă\n"
 "diferite identități încapsulate în tunele, ex: TTLS"
 
@@ -4569,9 +4571,9 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 "Calea completă a fișierului certificat CA (PEM/DER). Acest fișier\n"
-"poate include unul sau mai multe certificare de încredere. Dacă\n"
-"ca_cert nu sînt incluse, certificatul server nu va fi verificat.\n"
-"Dacă se poate, un certificat CA de încredere, trebuie întotdeauna\n"
+"poate include unul sau mai multe certificate de încredere. Dacă\n"
+"ca_cert nu sînt incluse, certificatul serverului nu va fi verificat.\n"
+"Dacă se poate, un certificat CA de încredere trebuie întotdeauna\n"
 "configurat dacă se utilizează TLS, TTLS sau PEAP."
 
 #: ../lib/network/connection/wireless.pm:582
@@ -4616,7 +4618,7 @@ msgid ""
 "\tOthers such as key_mgmt, eap maybe used to force\n"
 "\tspecial settings different from the U.I settings."
 msgstr ""
-"Parametrii suplimentari wpa_supplicant\n"
+"Aici puteți plasa parametri suplimentari lui wpa_supplicant\n"
 "Formatul așteptat este un cuplu cîmp=valoare. Se pot\n"
 "specifica valori multiple, prin separarea cu caracterul #.\n"
 "Notă: aceste directive nu sînt verificate și pot provoca\n"
@@ -4641,7 +4643,7 @@ msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
-"Cheia pre-partajată conține între 8 și 63 de caractere ASCII, sau 64 "
+"Cheia pre-partajată conține între 8 și 63 de caractere ASCII, sau 64 de "
 "caractere hexazecimale."
 
 #: ../lib/network/connection/wireless.pm:623
@@ -4658,8 +4660,8 @@ msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
-"Frecvența trebuie să conțină sufixul k, M or G (de exemplu: \"2.46G\" pentru "
-"frecvența de 2.46 GHz), sau să aibă suficiente zerouri."
+"Frecvența trebuie să conțină sufixul k, M or G (de exemplu: „2.46G” pentru "
+"frecvența de 2.46 GHz), sau să aibă suficiente „0” (zerouri)."
 
 #: ../lib/network/connection/wireless.pm:636
 #, c-format
@@ -4668,7 +4670,7 @@ msgid ""
 "enough '0' (zeroes)."
 msgstr ""
 "Debitul trebuie să conțină sufixul k, M or G (de exemplu, \"11M\" pentru "
-"11M), sau să aibă suficiente zerouri."
+"11M), sau să aibă suficiente „0” (zerouri)."
 
 #: ../lib/network/connection/wireless.pm:648
 #, c-format
@@ -4678,12 +4680,12 @@ msgstr "Autorizează conexiunile itinerante"
 #: ../lib/network/connection/wireless.pm:773
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
-msgstr "Asociat rețelei fără fir \"%s\" pe interfața %s"
+msgstr "Asociat rețelei fără-fir „%s” pe interfața %s"
 
 #: ../lib/network/connection/wireless.pm:774
 #, c-format
 msgid "Lost association to wireless network on interface %s"
-msgstr "Asociere pierdută cu rețeaua fără fir pe interfața %s"
+msgstr "S-a pierdut asocierea cu rețeaua fără-fir pe interfața %s"
 
 #: ../lib/network/connection/xdsl.pm:8
 #, c-format
@@ -4715,7 +4717,7 @@ msgid ""
 "binary firmware distribution problem."
 msgstr ""
 "Modemurile ce folosesc cipurile Conexant AccessRunner nu sînt suportate din "
-"cauza unei probleme de distribuție binară de micro-cod."
+"cauza unei probleme de distribuție binară a microcodului."
 
 #: ../lib/network/connection/xdsl.pm:205
 #, c-format
@@ -4750,12 +4752,12 @@ msgstr "PPP peste ATM (PPPoA)"
 #: ../lib/network/connection/xdsl.pm:252
 #, c-format
 msgid "Virtual Path ID (VPI):"
-msgstr "Identificator de cale virtuală (VPI)"
+msgstr "ID de cale virtuală (VPI):"
 
 #: ../lib/network/connection/xdsl.pm:253
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
-msgstr "Identificator de circuit virtual (VCI)"
+msgstr "ID de circuit virtual (VCI):"
 
 #: ../lib/network/connection/xdsl.pm:361
 #: ../lib/network/connection_manager.pm:62 ../lib/network/drakvpn.pm:45
@@ -4774,13 +4776,13 @@ msgstr "Se configurează dispozitivul..."
 #: ../lib/network/connection_manager.pm:144
 #, c-format
 msgid "Network settings"
-msgstr "Parametrii de rețea"
+msgstr "Parametrii rețelei"
 
 #: ../lib/network/connection_manager.pm:80
 #: ../lib/network/connection_manager.pm:145
 #, c-format
 msgid "Please enter settings for network"
-msgstr "Introduceți parametrii de rețea"
+msgstr "Introduceți parametrii rețelei"
 
 #: ../lib/network/connection_manager.pm:223
 #: ../lib/network/connection_manager.pm:479
@@ -4827,7 +4829,7 @@ msgstr "Conectează"
 #: ../lib/network/connection_manager.pm:445
 #, c-format
 msgid "Hostname changed to \"%s\""
-msgstr "Numele gazdei (hostname) a fost schimbat în \"%s\""
+msgstr "Numele gazdei a fost schimbat în „%s”"
 
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
@@ -4857,7 +4859,7 @@ msgstr "Server DHCP"
 #: ../lib/network/drakfirewall.pm:40
 #, c-format
 msgid "Mail Server"
-msgstr "Server mail"
+msgstr "Server de poștă electronică"
 
 #: ../lib/network/drakfirewall.pm:45
 #, c-format
@@ -4867,7 +4869,7 @@ msgstr "Server POP și IMAP"
 #: ../lib/network/drakfirewall.pm:50
 #, c-format
 msgid "Telnet server"
-msgstr "Server telnet"
+msgstr "Server de telnet"
 
 #: ../lib/network/drakfirewall.pm:56
 #, c-format
@@ -4922,7 +4924,7 @@ msgstr "BitTorrent"
 #: ../lib/network/drakfirewall.pm:116
 #, c-format
 msgid "Windows Mobile device synchronization"
-msgstr "Sincronizare dispozitiv Windows Mobile"
+msgstr "Sincronizare de dispozitiv Windows Mobile"
 
 #: ../lib/network/drakfirewall.pm:125
 #, c-format
@@ -4940,15 +4942,16 @@ msgstr "Configurare de parafoc"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Configurare de drakfirewall\n"
 "\n"
-"Acesta configurează parafocul personal pe această mașină Mandriva Linux.\n"
+"Acesta configurează parafocul personal pentru această mașină Mageia "
+"Linux.\n"
 "Dacă doriți un parafoc dedicat și mai puternic, îndreptați-vă mai degrabă\n"
-"către distribuția specializată Mandriva Security."
+"către distribuția specializată Mageia Security."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -4967,7 +4970,7 @@ msgstr ""
 #: ../lib/network/shorewall.pm:167
 #, c-format
 msgid "Firewall"
-msgstr "Parafoc (firewall)"
+msgstr "Parafoc"
 
 #: ../lib/network/drakfirewall.pm:250
 #, c-format
@@ -4990,7 +4993,7 @@ msgid ""
 "You can also give a range of ports (eg: 24300:24350/udp)"
 msgstr ""
 "Portul introdus este incorect: %s.\n"
-"Formatul corect este \"port/tcp\" sau \"port/udp\", \n"
+"Formatul corect este „port/tcp” sau „port/udp”, \n"
 "unde portul se află între 1 și 65535.\n"
 "\n"
 "Se poate specifica și un interval de porturi (ex: 24300:24350/udp)"
@@ -5029,13 +5032,13 @@ msgid ""
 "Please select which network activities should be watched."
 msgstr ""
 "Puteți fi avertizat cînd cineva accesează serviciile sau cînd un terț "
-"încearcă să intre în calculatorul dumneavoastră.\n"
-"Selecționați serviciile de rețea pe care doriți să le supravegheați."
+"încearcă să intre pe calculatorul vostru.\n"
+"Selectați serviciile de rețea pe care doriți să le supravegheați."
 
 #: ../lib/network/drakfirewall.pm:318
 #, c-format
 msgid "Use Interactive Firewall"
-msgstr "Utilizează un parafoc interactiv"
+msgstr "Utilizează parafocul interactiv"
 
 #: ../lib/network/drakroam.pm:22
 #, c-format
@@ -5055,12 +5058,12 @@ msgstr "Configurează"
 #: ../lib/network/drakroam.pm:92 ../lib/network/netcenter.pm:71
 #, c-format
 msgid "Refresh"
-msgstr "Actualizează"
+msgstr "Împrospătează"
 
 #: ../lib/network/drakroam.pm:103 ../lib/network/netconnect.pm:795
 #, c-format
 msgid "Wireless connection"
-msgstr "Conexiune fără fir"
+msgstr "Conexiune fără-fir"
 
 #: ../lib/network/drakvpn.pm:30
 #, c-format
@@ -5075,7 +5078,7 @@ msgstr "Alegeți tipul de VPN"
 #: ../lib/network/drakvpn.pm:49
 #, c-format
 msgid "Initializing tools and detecting devices for %s..."
-msgstr "Se inițializează uneltele și detectarea de dispozitive pentru %s..."
+msgstr "Se inițializează uneltele și de detectează dispozitivele pentru %s..."
 
 #: ../lib/network/drakvpn.pm:52
 #, c-format
@@ -5106,17 +5109,17 @@ msgstr ""
 #: ../lib/network/drakvpn.pm:81
 #, c-format
 msgid "Please enter the required key(s)"
-msgstr "Introduceți cheia(ile) necesară(e) "
+msgstr "Introduceți cheile necesare "
 
 #: ../lib/network/drakvpn.pm:86
 #, c-format
 msgid "Please enter the settings of your VPN connection"
-msgstr "Introduceți parametrii conexiunii VPN"
+msgstr "Introduceți parametrii conexiunii voastre VPN"
 
 #: ../lib/network/drakvpn.pm:94 ../lib/network/netconnect.pm:298
 #, c-format
 msgid "Do you want to start the connection now?"
-msgstr "Doriți să porniți acum conexiunea?"
+msgstr "Doriți să porniți conexiunea acum?"
 
 #: ../lib/network/drakvpn.pm:108
 #, c-format
@@ -5132,8 +5135,8 @@ msgstr ""
 "\n"
 "Această conexiune VPN poate fi pornită automat odată cu conectarea la "
 "rețea.\n"
-"Aceasta se poate efectua reconfigurînd conectarea la rețea și selecționînd "
-"această conexiune VPN.\n"
+"Acest lucru se poate efectua reconfigurînd conectarea la rețea și "
+"selecționînd această conexiune VPN.\n"
 
 #: ../lib/network/ifw.pm:132
 #, c-format
@@ -5158,12 +5161,12 @@ msgstr "Conexiune nouă"
 #: ../lib/network/ifw.pm:136
 #, c-format
 msgid "\"%s\" attack"
-msgstr "Atac \"%s\""
+msgstr "Atac „%s”"
 
 #: ../lib/network/ifw.pm:138
 #, c-format
 msgid "A port scanning attack has been attempted by %s."
-msgstr "O tentativă de scanare de porturi a fost efectuată de către %s."
+msgstr "O tentativă de scanare de porturi a fost efectuată de %s."
 
 #: ../lib/network/ifw.pm:139
 #, c-format
@@ -5183,7 +5186,7 @@ msgstr "%s se conectează la serviciul %s."
 #: ../lib/network/ifw.pm:142
 #, c-format
 msgid "A \"%s\" attack has been attempted by %s"
-msgstr "Un atac \"%s\" a fost tentat de către %s"
+msgstr "Un atac „%s” a fost tentat de %s"
 
 #: ../lib/network/ifw.pm:151
 #, c-format
@@ -5191,13 +5194,13 @@ msgid ""
 "The \"%s\" application is trying to make a service (%s) available to the "
 "network."
 msgstr ""
-"Aplicația \"%s\" a încercat să pună la dispoziție în rețea serviciul (%s)."
+"Aplicația „%s” a încercat să pună la dispoziție un serviciu (%s) în rețea."
 
 #. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
-msgstr "port %d"
+msgstr "portul %d"
 
 #: ../lib/network/modem.pm:42 ../lib/network/modem.pm:43
 #: ../lib/network/modem.pm:44 ../lib/network/netconnect.pm:632
@@ -5226,7 +5229,7 @@ msgstr ""
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
 msgid "Please select the correct driver"
-msgstr "Aalegeți pilotul corect"
+msgstr "Selectați pilotul corect"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
@@ -5236,8 +5239,8 @@ msgid ""
 "supported."
 msgstr ""
 "Selectați fișiereul de descriere a pilotului Windows (.inf), sau fișierul "
-"pilot corespunzător (fișiere .dll sau .o). De notat că numai piloții pînă la "
-"versiunea de  Windows XP sînt suportați."
+"pilot corespunzător (fișiere .dll sau .o). Notați că sînt suportați piloții "
+"numai pînă la versiunea de Windows XP."
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -5251,7 +5254,7 @@ msgid ""
 "Do you really want to use a ndiswrapper driver?"
 msgstr ""
 "Dispozitivul selectat a fost deja configurat cu pilotul %s.\n"
-"Chiar doriți să folosiți un pilot ndiswrapper?"
+"Sigur doriți să utilizați un pilot ndiswrapper?"
 
 #: ../lib/network/ndiswrapper.pm:118
 #, c-format
@@ -5281,12 +5284,12 @@ msgstr "Instalează un pilot nou"
 #: ../lib/network/ndiswrapper.pm:151
 #, c-format
 msgid "Select a device:"
-msgstr "Alegeți un dispozitiv:"
+msgstr "Selectați un dispozitiv:"
 
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
-msgstr "Alegeți-vă rețeaua:"
+msgstr "Selectați rețeaua:"
 
 #: ../lib/network/netcenter.pm:62
 #, c-format
@@ -5303,12 +5306,12 @@ msgstr "Centru de rețea"
 #: ../lib/network/netcenter.pm:171
 #, c-format
 msgid "You are currently using the network profile <b>%s</b>"
-msgstr "Actualmente folosiți profilul de rețea <b>%s</b>"
+msgstr "Actualmente utilizați profilul de rețea <b>%s</b>"
 
 #: ../lib/network/netcenter.pm:177
 #, c-format
 msgid "Advanced settings"
-msgstr "Reglaje avansate"
+msgstr "Configurări avansate"
 
 #: ../lib/network/netconnect.pm:60 ../lib/network/netconnect.pm:522
 #: ../lib/network/netconnect.pm:536
@@ -5343,18 +5346,18 @@ msgstr ""
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
-msgstr "Configurație de rețea și Internet"
+msgstr "Configurare de rețea și Internet"
 
 #: ../lib/network/netconnect.pm:127
 #, c-format
 msgid "Choose the connection you want to configure"
-msgstr "Alegeți conexiunea pe care doriți să o configurați"
+msgstr "Alegeți conexiunea pe care doriți s-o configurați"
 
 #: ../lib/network/netconnect.pm:149 ../lib/network/netconnect.pm:377
 #: ../lib/network/netconnect.pm:822
 #, c-format
 msgid "Select the network interface to configure:"
-msgstr "Alegeți interfața de rețea spre configurare:"
+msgstr "Selectați interfața de rețea pentru configurare:"
 
 #: ../lib/network/netconnect.pm:151
 #, c-format
@@ -5374,7 +5377,7 @@ msgstr "Configurație materială"
 #: ../lib/network/netconnect.pm:201
 #, c-format
 msgid "Please select your provider:"
-msgstr "Aalegeți-vă furnizorul de acces:"
+msgstr "Selectați furnizorul de acces:"
 
 #: ../lib/network/netconnect.pm:248
 #, c-format
@@ -5382,7 +5385,7 @@ msgid ""
 "Please select your connection protocol.\n"
 "If you do not know it, keep the preselected protocol."
 msgstr ""
-"Alegeți protocolul de conexiune.\n"
+"Selectați protocolul de conexiune.\n"
 "Dacă nu știți care este, păstrați-l pe cel preselectat."
 
 #: ../lib/network/netconnect.pm:292 ../lib/network/netconnect.pm:684
@@ -5408,12 +5411,12 @@ msgstr "Completați sau verificați cîmpurile de mai jos"
 #: ../lib/network/netconnect.pm:347
 #, c-format
 msgid "Your personal phone number"
-msgstr "Numarul dumneavoastră personal de telefon"
+msgstr "Numărul vostru de telefon personal"
 
 #: ../lib/network/netconnect.pm:348
 #, c-format
 msgid "Provider name (ex provider.net)"
-msgstr "Nume furnizor de acces (ex: furnizor.ro)"
+msgstr "Numele furnizorului de acces (ex: furnizor.ro)"
 
 #: ../lib/network/netconnect.pm:349
 #, c-format
@@ -5438,12 +5441,12 @@ msgstr "Mod de numerotare"
 #: ../lib/network/netconnect.pm:353
 #, c-format
 msgid "Connection speed"
-msgstr "Viteză de conexiune"
+msgstr "Viteza conexiunii"
 
 #: ../lib/network/netconnect.pm:354
 #, c-format
 msgid "Connection timeout (in sec)"
-msgstr "Limita de timp pentru stabilirea conexiunii (în sec.)"
+msgstr "Durata de expirare a conexiunii (în sec)"
 
 #: ../lib/network/netconnect.pm:357
 #, c-format
@@ -5453,22 +5456,22 @@ msgstr "Numărul IRQ al plăcii"
 #: ../lib/network/netconnect.pm:358
 #, c-format
 msgid "Card mem (DMA)"
-msgstr "Plajă de memorie (DMA)"
+msgstr "Zona de memorie (DMA)"
 
 #: ../lib/network/netconnect.pm:359
 #, c-format
 msgid "Card IO"
-msgstr "IO Placă"
+msgstr "IO a plăcii"
 
 #: ../lib/network/netconnect.pm:360
 #, c-format
 msgid "Card IO_0"
-msgstr "IO_0 Placă"
+msgstr "IO_0 a plăcii"
 
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
-msgstr "IO_1 Placă"
+msgstr "IO_1 a plăcii"
 
 #: ../lib/network/netconnect.pm:380 ../lib/network/netconnect.pm:385
 #, c-format
@@ -5478,7 +5481,7 @@ msgstr "Modem ISDN extern"
 #: ../lib/network/netconnect.pm:413
 #, c-format
 msgid "Select a device!"
-msgstr "Alegeți un dispozitiv!"
+msgstr "Selectați un dispozitiv!"
 
 #: ../lib/network/netconnect.pm:422 ../lib/network/netconnect.pm:432
 #: ../lib/network/netconnect.pm:442 ../lib/network/netconnect.pm:475
@@ -5505,8 +5508,8 @@ msgstr ""
 "Dacă aveți o placă ISA, valorile din ecranul următor ar trebui să fie "
 "corecte.\n"
 "\n"
-"Dacă aveți o placă PCMCIA, este nevoie să cunoașteți parametrii \"irq\" și "
-"\"io\" ai plăcii dumneavoastră.\n"
+"Dacă aveți o placă PCMCIA, trebuie să cunoașteți parametrii „IRQ” și „IO” ai "
+"plăcii.\n"
 
 #: ../lib/network/netconnect.pm:437
 #, c-format
@@ -5521,7 +5524,7 @@ msgstr "Abandonează"
 #: ../lib/network/netconnect.pm:443
 #, c-format
 msgid "Which of the following is your ISDN card?"
-msgstr "Care dintre următoarele este placa dumneavoastră ISDN?"
+msgstr "Care din următoarele este placa voastră ISDN?"
 
 #: ../lib/network/netconnect.pm:461
 #, c-format
@@ -5532,12 +5535,12 @@ msgid ""
 msgstr ""
 "Un pilot CAPIE ste disponibil pentru acest modem. Acest pilot CAPI poate "
 "oferi mai multe capabilități decît pilotul liber (precum trimiterea de "
-"faxuri). Ce pilot doriți să se folosească?"
+"faxuri). Ce pilot doriți să utilizați?"
 
 #: ../lib/network/netconnect.pm:475
 #, c-format
 msgid "Which protocol do you want to use?"
-msgstr "Ce protocol doriți să se folosească?"
+msgstr "Ce protocol doriți să utilizați?"
 
 #: ../lib/network/netconnect.pm:489
 #, c-format
@@ -5545,7 +5548,7 @@ msgid ""
 "Select your provider.\n"
 "If it is not listed, choose Unlisted."
 msgstr ""
-"Alegeți-vă furnizorul de acces.\n"
+"Selectați furnizorul de acces.\n"
 "Dacă nu este listat, alegeți „Nelistat”."
 
 #: ../lib/network/netconnect.pm:491 ../lib/network/netconnect.pm:587
@@ -5559,28 +5562,28 @@ msgid ""
 "Your modem is not supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
-"Modemul dumneavoastră nu este suportat de sistem.\n"
+"Modemul vostru nu este suportat de sistem.\n"
 "Consultați http://www.linmodems.org"
 
 #: ../lib/network/netconnect.pm:519
 #, c-format
 msgid "Select the modem to configure:"
-msgstr "Selectați modemul spre configurre:"
+msgstr "Selectați modemul pentru configurare:"
 
 #: ../lib/network/netconnect.pm:521
 #, c-format
 msgid "Modem"
-msgstr "Modemuri"
+msgstr "Modem"
 
 #: ../lib/network/netconnect.pm:556
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
-msgstr "Pe ce port serial este conectat modemul dumneavoastră?"
+msgstr "Alegeți portul serial pe care este conectat modemul vostru."
 
 #: ../lib/network/netconnect.pm:585
 #, c-format
 msgid "Select your provider:"
-msgstr "Selectați-vă furnizorul de acces:"
+msgstr "Selectați furnizorul de acces:"
 
 #: ../lib/network/netconnect.pm:609
 #, c-format
@@ -5590,7 +5593,7 @@ msgstr "Apel: opțiunile contului"
 #: ../lib/network/netconnect.pm:612
 #, c-format
 msgid "Connection name"
-msgstr "Nume conexiune"
+msgstr "Numele conexiunii"
 
 #: ../lib/network/netconnect.pm:613
 #, c-format
@@ -5600,7 +5603,7 @@ msgstr "Număr de telefon "
 #: ../lib/network/netconnect.pm:614
 #, c-format
 msgid "Login ID"
-msgstr "Identificator de conexiune"
+msgstr "ID de conexiune"
 
 #: ../lib/network/netconnect.pm:629 ../lib/network/netconnect.pm:662
 #, c-format
@@ -5645,7 +5648,7 @@ msgstr "Al doilea server DNS (opțional)"
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
-msgstr "Definește numele gazdei plecînd de la adresa IP"
+msgstr "Definește numele gazdei de la adresa IP"
 
 #: ../lib/network/netconnect.pm:666
 #, c-format
@@ -5655,27 +5658,27 @@ msgstr "Adresa IP a pasarelei"
 #: ../lib/network/netconnect.pm:699
 #, c-format
 msgid "Automatically at boot"
-msgstr "În mod automat la demaraj"
+msgstr "În mod automat la pornire"
 
 #: ../lib/network/netconnect.pm:701
 #, c-format
 msgid "By using Net Applet in the system tray"
-msgstr "Utilizînd mini-aplicația Rețea în zona de notificare sistem"
+msgstr "Utilizînd miniaplicația de rețea din zona de notificare sistem"
 
 #: ../lib/network/netconnect.pm:703
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
-msgstr "Manual (interfața va fi totuși activată la demaraj)"
+msgstr "Manual (interfața va fi totuși activată la pornire)"
 
 #: ../lib/network/netconnect.pm:712
 #, c-format
 msgid "How do you want to dial this connection?"
-msgstr "Cum doriți să porniți această conectare?"
+msgstr "Cum doriți să formați această conexiune?"
 
 #: ../lib/network/netconnect.pm:725
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
-msgstr "Doriți să încercați conectarea la Internet acum?"
+msgstr "Doriți să încercați să vă conectați la Internet acum?"
 
 #: ../lib/network/netconnect.pm:752
 #, c-format
@@ -5693,13 +5696,13 @@ msgid ""
 "The system does not seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
-"Sistemul dumneavoastră nu pare a fi conectat la Internet.\n"
+"Sistemul vostru nu pare a fi conectat la Internet.\n"
 "Încercați să reconfigurați conexiunea."
 
 #: ../lib/network/netconnect.pm:770
 #, c-format
 msgid "Problems occured during the network connectivity test."
-msgstr "S-a ivit o problemă în timpul testului de conectare la rețea."
+msgstr "S-au ivit probleme în timpul testului de conectare la rețea."
 
 #: ../lib/network/netconnect.pm:771
 #, c-format
@@ -5707,7 +5710,7 @@ msgid ""
 "This can be caused by invalid network configuration, or problems with your "
 "modem or router."
 msgstr ""
-"Aceasta poate fi cauzată de o configurație de rețea invalidă, sau de "
+"Acest lucru poate fi cauzat de o configurație de rețea invalidă, sau de "
 "probleme cu modemul sau ruterul."
 
 #: ../lib/network/netconnect.pm:772
@@ -5721,7 +5724,7 @@ msgstr ""
 #: ../lib/network/netconnect.pm:775
 #, c-format
 msgid "Congratulations, the network configuration is finished."
-msgstr "Felicitări, configurarea rețelei s-a terminat."
+msgstr "Felicitări, configurarea rețelei este finalizată."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
@@ -5729,8 +5732,8 @@ msgid ""
 "However, the Internet connectivity test failed. You should test your "
 "connection manually, and verify your Internet modem or router."
 msgstr ""
-"Totuși, testul de conectare la Internet a eșuat. Va trebui să vă testați "
-"conexiunea manual, și verificați-vă modemul sau ruterul de Internet."
+"Totuși, testul de conectare la Internet a eșuat. Va trebui să testați "
+"conexiunea manual, și verificați modemul sau ruterul de Internet."
 
 #: ../lib/network/netconnect.pm:776
 #, c-format
@@ -5738,14 +5741,14 @@ msgid ""
 "If your connection does not work, you might want to relaunch the "
 "configuration."
 msgstr ""
-"Conexiunea de rețea nu vă funcționează, poate doriți să relansați "
+"Conexiunea de rețea nu funcționează, poate ar trebui să relansați "
 "configurarea."
 
 #: ../lib/network/netconnect.pm:778
 #, c-format
 msgid "Congratulations, the network and Internet configuration are finished."
 msgstr ""
-"Felicitări, configurarea rețelei și a conexiunii la Internet s-a terminat."
+"Felicitări, configurarea rețelei și a conexiunii la Internet este finalizată."
 
 #: ../lib/network/netconnect.pm:779
 #, c-format
@@ -5754,7 +5757,7 @@ msgid ""
 "avoid any hostname-related problems."
 msgstr ""
 "Odată terminată, se recomandă repornirea interfeței grafice, pentru a evita "
-"problemele legate de schimbarea numelui de gazdă (hostname) a mașinii."
+"problemele legate de schimbarea numelui de gazdă."
 
 #: ../lib/network/netconnect.pm:790
 #, c-format
@@ -5820,12 +5823,12 @@ msgstr "(detectat)"
 #: ../lib/network/netconnect.pm:805
 #, c-format
 msgid "Network Configuration"
-msgstr "Configurația rețelei"
+msgstr "Configurare rețea"
 
 #: ../lib/network/netconnect.pm:806
 #, c-format
 msgid "Zeroconf hostname resolution"
-msgstr "Rezolvare nume de gazdă pentru Zeroconf"
+msgstr "Rezolvarea numelui de gazdă pentru Zeroconf"
 
 #: ../lib/network/netconnect.pm:807
 #, c-format
@@ -5836,15 +5839,15 @@ msgid ""
 "It is not necessary on most networks."
 msgstr ""
 "Dacă doriți, introduceți un nume de gazdă Zeroconf.\n"
-"Acesta este numele pe care mașina dumneavoastră o să-l\n"
-"utilizeze pentru a face cunoscute resursele partajate\n"
-"care nu sînt gestionate de un server în rețea. Pentru\n"
-"majoritatea rețelelor aceasta nu este necesară."
+"Acesta este numele pe care mașina voastră o să-l utilizeze\n"
+"pentru a face cunoscute resursele partajate care nu sînt\n"
+"gestionate de un server în rețea. Pentru majoritatea\n"
+"rețelelor acest lucru nu este necesar."
 
 #: ../lib/network/netconnect.pm:811
 #, c-format
 msgid "Zeroconf Host name"
-msgstr "Nume Zeroconf de gazdă"
+msgstr "Nume de gazdă Zeroconf"
 
 #: ../lib/network/netconnect.pm:812
 #, c-format
@@ -5859,15 +5862,14 @@ msgid ""
 "Click on Ok to keep your configuration, or cancel to reconfigure your "
 "Internet & Network connection.\n"
 msgstr ""
-"Pentru că efectuați o instalare prin rețea, rețeaua dumneavoastră este deja "
-"configurată.\n"
-"Apăsați 'Ok' pentru a păstra configurația, sau anulați pentru a reconfigura "
-"conexiunea la Internet și rețeaua.\n"
+"Pentru că efectuați o instalare prin rețea, rețeaua este deja configurată.\n"
+"Apăsați pe Ok pentru a păstra configurația, sau anulați pentru a reconfigura "
+"rețeaua și conexiunea la Internet.\n"
 
 #: ../lib/network/netconnect.pm:816
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
-msgstr "Rețeaua trebuie repornită. Doriți repornirea ei?"
+msgstr "Rețeaua trebuie repornită. Doriți s-o reporniți?"
 
 #: ../lib/network/netconnect.pm:817
 #, c-format
@@ -5891,7 +5893,7 @@ msgstr ""
 "Vom configura acum conexiunea %s.\n"
 "\n"
 "\n"
-"Apăsați pe \"%s\" pentru a continua."
+"Apăsați pe „%s” pentru a continua."
 
 #: ../lib/network/netconnect.pm:819
 #, c-format
@@ -5905,8 +5907,8 @@ msgid ""
 "Choose the one you want to use.\n"
 "\n"
 msgstr ""
-"Ați configurat mai multe căi de conectare la Internet.\n"
-"Alegeți-o pe cea pe care doriți să o folosiți.\n"
+"Ați configurat mai multe modalități de conectare la Internet.\n"
+"Alegeți-o pe cea pe care doriți s-o utilizați.\n"
 "\n"
 
 #: ../lib/network/netconnect.pm:821
@@ -5917,7 +5919,7 @@ msgstr "Conexiune la Internet"
 #: ../lib/network/netconnect.pm:823
 #, c-format
 msgid "Configuring network device %s (driver %s)"
-msgstr "Se configurează placa de rețea %s (pilot %s)"
+msgstr "Se configurează placa de rețea %s (pilotul %s)"
 
 #: ../lib/network/netconnect.pm:824
 #, c-format
@@ -5925,8 +5927,8 @@ msgid ""
 "The following protocols can be used to configure a LAN connection. Please "
 "choose the one you want to use."
 msgstr ""
-"Următoarele protocoale pot fi folosite pentru a configura o conexiune LAN. "
-"Alegeți protocolul pe care doriți să-l folosiți."
+"Următoarele protocoale pot fi utilizate pentru a configura o conexiune LAN. "
+"Alegeți protocolul pe care doriți să-l utilizați."
 
 #: ../lib/network/netconnect.pm:825
 #, c-format
@@ -5936,10 +5938,10 @@ msgid ""
 "such as ``mybox.mylab.myco.com''.\n"
 "You may also enter the IP address of the gateway if you have one."
 msgstr ""
-"Introduceți numele calculatorului.\n"
-"Numele calculatorului ar trebui să fie un nume întreg-calificat,\n"
-"ca de exemplu ``calculatorulmeu.laboratorulmeu.întreprindereamea.com''.\n"
-"Puteți, de asemenea, introduce adresa IP a pasarelei, dacă dispuneți de una."
+"Introduceți numele gazdei.\n"
+"Numele gazdei ar trebui să fie un nume complet calificat,\n"
+"precum „calculatorulmeu.laboratorulmeu.intreprindereamea.ro”.\n"
+"De asemenea, puteți introduce adresa IP a pasarelei, dacă dispuneți de una."
 
 #: ../lib/network/netconnect.pm:830
 #, c-format
@@ -5967,13 +5969,13 @@ msgid ""
 "An unexpected error has happened:\n"
 "%s"
 msgstr ""
-"S-a produs o eroare:\n"
+"S-a produs o eroare neașteptată:\n"
 "%s"
 
 #: ../lib/network/network.pm:514
 #, c-format
 msgid "Advanced network settings"
-msgstr "Parametrii avansați de rețea"
+msgstr "Configurări avansate de rețea"
 
 #: ../lib/network/network.pm:515
 #, c-format
@@ -5981,13 +5983,13 @@ msgid ""
 "Here you can configure advanced network settings. Please note that you have "
 "to reboot the machine for changes to take effect."
 msgstr ""
-"Aici puteți configura parametrii avansați de rețea. Va trebui să reporniți "
-"calculatorul pentru a fi luate în considerare modificările."
+"Aici puteți configura parametri avansați de rețea. Va trebui să reporniți "
+"calculatorul pentru a activa modificările."
 
 #: ../lib/network/network.pm:517
 #, c-format
 msgid "Wireless regulatory domain"
-msgstr "Domaniul de regularizare pentru rețeaua fără fir"
+msgstr "Domeniul normativ de rețea fără-fir"
 
 #: ../lib/network/network.pm:518
 #, c-format
@@ -6007,7 +6009,7 @@ msgstr "Dezactivează adaptarea ferestrelor TCP"
 #: ../lib/network/network.pm:521
 #, c-format
 msgid "Disable TCP Timestamps"
-msgstr "Dezactivează TCP Timestamps"
+msgstr "Dezactivează opțiunea TCP Timestamps"
 
 #: ../lib/network/network.pm:522
 #, c-format
@@ -6037,7 +6039,7 @@ msgstr "Înregistrează în jurnal pachetele bizare"
 #: ../lib/network/network.pm:539
 #, c-format
 msgid "Proxies configuration"
-msgstr "Configurație proxy"
+msgstr "Configurare proxy"
 
 #: ../lib/network/network.pm:540
 #, c-format
@@ -6051,42 +6053,42 @@ msgstr ""
 #: ../lib/network/network.pm:541
 #, c-format
 msgid "HTTP proxy"
-msgstr "Server proxy HTTP"
+msgstr "Proxy HTTP"
 
 #: ../lib/network/network.pm:542
 #, c-format
 msgid "Use HTTP proxy for HTTPS connections"
-msgstr "Folosește un server proxy HTTP pentru conexiunile HTTPS"
+msgstr "Utilizează un proxy HTTP pentru conexiunile HTTPS"
 
 #: ../lib/network/network.pm:543
 #, c-format
 msgid "HTTPS proxy"
-msgstr "Server proxy HTTPS"
+msgstr "Proxy HTTPS"
 
 #: ../lib/network/network.pm:544
 #, c-format
 msgid "FTP proxy"
-msgstr "Server proxy FTP"
+msgstr "Proxy FTP"
 
 #: ../lib/network/network.pm:545
 #, c-format
 msgid "No proxy for (comma separated list):"
-msgstr "Fără server proxy pentru (listă separată prin virgulă):"
+msgstr "Fără proxy pentru (listă separată prin virgulă):"
 
 #: ../lib/network/network.pm:550
 #, c-format
 msgid "Proxy should be http://..."
-msgstr "Sintaxa serverului proxy ar trebui să fie http://..."
+msgstr "Sintaxa proxyului ar trebui să fie http://..."
 
 #: ../lib/network/network.pm:551
 #, c-format
 msgid "Proxy should be http://... or https://..."
-msgstr "Sintaxa serverului proxy ar trebui să fie http://... sau https://..."
+msgstr "Sintaxa proxyului ar trebui să fie http://... sau https://..."
 
 #: ../lib/network/network.pm:552
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
-msgstr "Adresa locației (URL) trebuie să înceapă cu 'http:' sau 'ftp:'"
+msgstr "Adresa URL ar trebui să înceapă cu „http:” sau „ftp:”"
 
 #: ../lib/network/shorewall.pm:77
 #, c-format
@@ -6096,30 +6098,30 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
 msgstr ""
-"Selectați interfețele ce vor fi protejate de parafoc.\n"
+"Selectați interfețele care vor fi protejate de parafoc.\n"
 "\n"
-"Ar trebui selecționate toate interfețele conectare la Internet,\n"
+"Ar trebui selectate toate interfețele conectare la Internet,\n"
 "în timp ce interfețele conectate la rețeaua locală pot să nu fie.\n"
 "\n"
-"Dacă intenționați să utilizați partajarea coneciunii la Internet cu\n"
+"Dacă intenționați să utilizați partajarea conexiunii la Internet,\n"
 "deselectați toate interfețele conectate la rețeaua locală.\n"
 "\n"
-"Ce interfețe ar trebui protejate?\n"
+"Care interfețe ar trebui protejate?\n"
 
 #: ../lib/network/shorewall.pm:158
 #, c-format
 msgid "Keep custom rules"
-msgstr "Conservă regulile personalizate"
+msgstr "Păstrează regulile personalizate"
 
 #: ../lib/network/shorewall.pm:159
 #, c-format
 msgid "Drop custom rules"
-msgstr "Șterge regulile personalizate"
+msgstr "Abandonează regulile personalizate"
 
 #: ../lib/network/shorewall.pm:164
 #, c-format
@@ -6136,21 +6138,21 @@ msgstr ""
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
 msgstr ""
-"Unele componente (%s) sînt necesare, dar nu sînt disponibile pentru "
-"configurația materială %s."
+"Cîteva componente (%s) sînt necesare, dar nu sînt disponibile pentru "
+"componenta %s."
 
 #: ../lib/network/thirdparty.pm:145
 #, c-format
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Cîteva pachete (%s) sînt necesare dar nu sînt disponibile."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
 msgid ""
 "These packages can be found in %s, or in the official %s package repository."
-msgstr "Aceste pachete se pot găsi în %s, sau în mediul oficial %s."
+msgstr "Aceste pachete se pot fi găsite pe %s, sau pe mediul oficial %s."
 
 #: ../lib/network/thirdparty.pm:154
 #, c-format
@@ -6163,23 +6165,23 @@ msgid ""
 "The required files can also be installed from this URL:\n"
 "%s"
 msgstr ""
-"Fișierele necesare pot fi instalate și din locația (URL):\n"
+"Fișierele necesare pot fi instalate și de la adresa URL:\n"
 "%s"
 
 #: ../lib/network/thirdparty.pm:192
 #, c-format
 msgid "Firmware files are required for this device."
-msgstr "Fișierele microcod sînt necesare pentru acest dispozitiv"
+msgstr "Fișierele de microcod sînt necesare pentru acest dispozitiv."
 
 #: ../lib/network/thirdparty.pm:195 ../lib/network/thirdparty.pm:200
 #, c-format
 msgid "Use a floppy"
-msgstr "Folosește o dischetă"
+msgstr "Utilizează o dischetă"
 
 #: ../lib/network/thirdparty.pm:196 ../lib/network/thirdparty.pm:203
 #, c-format
 msgid "Use my Windows partition"
-msgstr "Folosește partiția Windows"
+msgstr "Utilizează partiția Windows"
 
 #: ../lib/network/thirdparty.pm:197
 #, c-format
@@ -6189,12 +6191,12 @@ msgstr "Selectează fișierul"
 #: ../lib/network/thirdparty.pm:208
 #, c-format
 msgid "Please select the firmware file (for example: %s)"
-msgstr "Selectați fișierul microcod (de exemplu: %s)"
+msgstr "Selectați fișierul de microcod (de exemplu: %s)"
 
 #: ../lib/network/thirdparty.pm:232
 #, c-format
 msgid "Unable to find \"%s\" on your Windows system!"
-msgstr "Imposibil de găsit \"%s\" pe sistemul dumneavoastră Windows!"
+msgstr "„%s” nu poate fi găsit pe sistemul vostru Windows!"
 
 #: ../lib/network/thirdparty.pm:234
 #, c-format
@@ -6238,7 +6240,7 @@ msgstr "Așteptați, se execută comenzile de configurare a dispozitivului..."
 #: ../lib/network/vpn/openvpn.pm:107
 #, c-format
 msgid "X509 Public Key Infrastructure"
-msgstr "Infrastructură cheie publică X509"
+msgstr "Infrastructură de cheie publică X509"
 
 #: ../lib/network/vpn/openvpn.pm:108
 #, c-format
@@ -6249,7 +6251,7 @@ msgstr "Cheie statică"
 #: ../lib/network/vpn/openvpn.pm:142
 #, c-format
 msgid "Certificate Authority (CA)"
-msgstr "Certificate Authority (CA)"
+msgstr "Autoritate de certificare (CA)"
 
 #: ../lib/network/vpn/openvpn.pm:148
 #, c-format
@@ -6279,7 +6281,7 @@ msgstr "Autentificare cu nume de utilizator și parolă"
 #: ../lib/network/vpn/openvpn.pm:181
 #, c-format
 msgid "Check server certificate"
-msgstr "Verificare certificat server"
+msgstr "Verifică certificatul serverului"
 
 #: ../lib/network/vpn/openvpn.pm:187
 #, c-format
@@ -6314,7 +6316,7 @@ msgstr "Adresă IP distantă"
 #: ../lib/network/vpn/openvpn.pm:237
 #, c-format
 msgid "Use TCP protocol"
-msgstr "Folosește protocolul TCP"
+msgstr "Utilizează protocolul TCP"
 
 #: ../lib/network/vpn/openvpn.pm:243
 #, c-format
@@ -6334,7 +6336,7 @@ msgstr "Se pornește conexiunea..."
 #: ../lib/network/vpn/openvpn.pm:380
 #, c-format
 msgid "Please insert your token"
-msgstr "Inserați jetonul dumneavoastră"
+msgstr "Inserați jetonul vostru"
 
 #: ../lib/network/vpn/openvpn.pm:391
 #, c-format
@@ -6349,17 +6351,17 @@ msgstr "Concentrator VPN Cisco"
 #: ../lib/network/vpn/vpnc.pm:43
 #, c-format
 msgid "Group name"
-msgstr "Nume grup"
+msgstr "Numele grupului"
 
 #: ../lib/network/vpn/vpnc.pm:47
 #, c-format
 msgid "Group secret"
-msgstr "Secret de grup"
+msgstr "Secretul grupului"
 
 #: ../lib/network/vpn/vpnc.pm:52
 #, c-format
 msgid "Username"
-msgstr "Nume utilizator"
+msgstr "Numele utilizatorului"
 
 #: ../lib/network/vpn/vpnc.pm:61
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 3b66a93..f69c1ec 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 # translation of ru.po to Russian
 # Translation of network-tools messages to Russian
-# Copyright (C) 1999-2006 Mandriva
+# Copyright (C) 1999-2006 Mageia
 #
 # Pavel Maryanov <acid_jack@ukr.net>, 2002-2009.
 # Alice Lafox <alice@lafox.com.ua>, 2003.
@@ -171,10 +171,10 @@ msgstr "Клиент DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Этот интерфейс ещё не был настроен.\n"
-"Запустите помощника \"%s\" из Центра Управления Mandriva Linux"
+"Запустите помощника \"%s\" из Центра Управления Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -218,7 +218,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "На данном компьютере будет настроено совместное использование подключения\n"
@@ -472,14 +472,14 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "В вашей системе не обнаружено ни одного настроенного для работы с локальной "
 "сетью сетевого адаптера.\n"
 "\n"
 "Запустите Поиск и настройку оборудования для его конфигурирования; и "
-"убедитесь что файрволл Mandriva не включен для адаптера, подсоединенного к "
+"убедитесь что файрволл Mageia не включен для адаптера, подсоединенного к "
 "вашей локальной сети."
 
 #: ../bin/drakgw:316
@@ -1565,8 +1565,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1575,8 +1575,8 @@ msgstr "Это утилита для упрощённой настройки Sam
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2235,10 +2235,10 @@ msgstr "Сеть опущена на интерфейсе %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "У вас ещё нет ни одного настроенного соединения с Интернет.\n"
-"Запустите помощника \"%s\" из Центра Управления Mandriva Linux"
+"Запустите помощника \"%s\" из Центра Управления Mageia"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2429,10 +2429,10 @@ msgstr "Подключение выполнено."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Подключение завершилось неудачей.\n"
-"Проверьте настройки в Центре управления Mandriva Linux."
+"Проверьте настройки в Центре управления Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4905,15 +4905,15 @@ msgstr "Настройка файервола"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Конфигуратор drakfirewall\n"
 "\n"
-"Он настраивает персональный файервол для этой машины Mandriva Linux.\n"
+"Он настраивает персональный файервол для этой машины Mageia.\n"
 "Для создания специализированного мощного файервола, пожалуйста, загляните\n"
-"в специализированный дистрибутив Mandriva Security Firewall."
+"в специализированный дистрибутив Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6052,7 +6052,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6099,7 +6099,7 @@ msgstr "Отсутствуют некоторые компоненты (%s), н�
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Отсутствуют некоторые необходимые пакеты (%s)."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/sc.po b/po/sc.po
index 6e8fa9c..87b0703 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -160,7 +160,7 @@ msgstr "Client DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -205,7 +205,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 
@@ -424,7 +424,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1441,7 +1441,7 @@ msgstr "Boxi de DrakSamba"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1451,8 +1451,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2073,7 +2073,7 @@ msgstr "S'arretza est alluta in s'interfaci %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2263,10 +2263,10 @@ msgstr "Acàpiu fatu."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Acàpiu faddiu.\n"
-"Aberiga s'assètiu in su Mandriva Linux Control Center."
+"Aberiga s'assètiu in su Mageia Control Center."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4596,9 +4596,9 @@ msgstr "Assètiu de Xorg"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5664,7 +5664,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5698,7 +5698,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/sk.po b/po/sk.po
index 975df9f..ab40789 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -163,10 +163,10 @@ msgstr "DHCP klient"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Toto rozhranie ešte nebolo nastavené.\n"
-"Spustite sprievodcu \"Pridanie rozhrania\" z Mandriva kontrolného centra"
+"Spustite sprievodcu \"Pridanie rozhrania\" z Mageia kontrolného centra"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -210,7 +210,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Máte možnosť nastaviť zdieľanie pripojenia tohto počítača na Internet.\n"
@@ -451,7 +451,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1526,14 +1526,14 @@ msgstr "O Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
 #, fuzzy, c-format
 msgid "This is a simple tool to easily manage Samba configuration."
 msgstr ""
-"Mandriva Linux \n"
+"Mageia \n"
 "Verzia: %s\n"
 "Autor: Antoine Ginies\n"
 "\n"
@@ -1541,8 +1541,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2172,10 +2172,10 @@ msgstr "Sieť je dostupná na zariadení %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Nemáte nakonfigurované žiadne pripojenie k Internetu.\n"
-"Spustite sprievodcu \"%s\" z Mandriva Linux kontrolného centra"
+"Spustite sprievodcu \"%s\" z Mageia kontrolného centra"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, fuzzy, c-format
@@ -2368,10 +2368,10 @@ msgstr "Pripojenie je ukončené."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Chyba pri spojení.\n"
-"Skontrolujte konfiguráciu v Mandriva Linux Kontrolnom Centre."
+"Skontrolujte konfiguráciu v Mageia Kontrolnom Centre."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4750,13 +4750,13 @@ msgstr "Ručné nastavenie"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "tinyfirewall konfigurátor\n"
 "\n"
-"Nastavuje osobný firewall pre váš Mandriva Linux systém na tomto\n"
+"Nastavuje osobný firewall pre váš Mageia systém na tomto\n"
 "počítači. "
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5886,7 +5886,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5920,14 +5920,14 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Niektoré balíky (%s) sú vyžadované ale nie sú dostupné."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, fuzzy, c-format
 msgid ""
 "These packages can be found in %s, or in the official %s package repository."
 msgstr ""
-"Tieto balíky je možné nájsť v Mandriva klube alebo v Mandriva komerčných "
+"Tieto balíky je možné nájsť v Mageia klube alebo v Mageia komerčných "
 "verziách."
 
 #: ../lib/network/thirdparty.pm:154
diff --git a/po/sl.po b/po/sl.po
index 359d97a..d10d6b4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -170,10 +170,10 @@ msgstr "Odjemalec DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ta omrežna naprava še ni nastavljena.\n"
-"Uporabite »%s« iz nadzornega središča Mandriva Linux"
+"Uporabite »%s« iz nadzornega središča Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -217,7 +217,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Prišli ste do nastavitev za souporabo internetne povezave na tem "
@@ -470,7 +470,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Na računalniku ni bil zaznan noben omrežni vmesnik, nastavljen za krajevno "
@@ -1555,8 +1555,8 @@ msgstr "DrakSambaShare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Avtorske pravice (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Avtorske pravice (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1565,8 +1565,8 @@ msgstr "To je enostavno orodje, ki olajšuje nastavljanje Sambe"
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux "
+msgid "Mageia"
+msgstr "Mageia "
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2217,10 +2217,10 @@ msgstr "Omrežje preko vmesnika %s je prekinjeno"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Nobena internetna povezava ni nastavljena.\n"
-"Zaženite »%s« v Mandriva Linux nadzornem središču"
+"Zaženite »%s« v Mageia nadzornem središču"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2411,10 +2411,10 @@ msgstr "Povezovanje je opravljeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Povezovanje je spodletelo.\n"
-"Preverite nastavitve v Nadzornem središču Mandriva Linux "
+"Preverite nastavitve v Nadzornem središču Mageia "
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4857,15 +4857,15 @@ msgstr "Nastavitev požarnega zidu"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Nastavljanje požarnega zidu drakfirewall\n"
 "\n"
 "Urejanje osebnega požarnega zidu.\n"
 "Za močno in učinkovito rešitev lahko uporabite\n"
-"posebno distribucijo Mandriva Security Firewall."
+"posebno distribucijo Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6000,7 +6000,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6048,7 +6048,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Potrebni so nekateri paketi (%s), ki pa niso na voljo."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/sq.po b/po/sq.po
index 4840f2a..f9b69a4 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -162,7 +162,7 @@ msgstr "Klienti DHCP"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ky interfac nuk është i konfiguruar ende.\n"
 "Nise asistentin konfigurues në dritaren kryesore"
@@ -209,7 +209,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Ju jeni duke konfiguruar kompjuterin tuaj, në shpërndarjen e lidhjes "
@@ -362,7 +362,7 @@ msgstr ""
 #: ../bin/drakgw:204
 #, fuzzy, c-format
 msgid "Domain Name Server (DNS) configuration"
-msgstr "Konfigurim i Serverit me Terminale Mandriva"
+msgstr "Konfigurim i Serverit me Terminale Mageia"
 
 #: ../bin/drakgw:208
 #, c-format
@@ -457,7 +457,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1480,7 +1480,7 @@ msgstr "Server Samba"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1490,8 +1490,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, fuzzy, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Online"
+msgid "Mageia"
+msgstr "Mageia Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2112,7 +2112,7 @@ msgstr "Interfac rrjeti"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ky interfac nuk është i konfiguruar ende.\n"
 "Nise asistentin konfigurues në dritaren kryesore"
@@ -2302,10 +2302,10 @@ msgstr "Lidhja përfundoi."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Lidhja dështoi.\n"
-"Verifikoje konfigurimin në Qendrën Kontrolluese Mandriva Linux."
+"Verifikoje konfigurimin në Qendrën Kontrolluese Mageia."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4646,16 +4646,16 @@ msgstr "Konfigurimi manuel"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Konfigurues i drakfirewall\n"
 "\n"
-"Ky do konfiguroj murin-e-zjarrtë (firewall) personel për makinën Mandriva "
+"Ky do konfiguroj murin-e-zjarrtë (firewall) personel për makinën Mageia "
 "Linux.\n"
 "Nëse ju dëshironi një mur-të-zjarrtë (firewall) më të fuqishëm, kthehuni në\n"
-"shpërndarjen e specializuar Mandriva Security."
+"shpërndarjen e specializuar Mageia Security."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5422,7 +5422,7 @@ msgid ""
 "configuration."
 msgstr ""
 "Disa probleme janë lajmëruar gjatë konfigurimit.\n"
-"Testone lidhjen tuaj tek Qendra Kontrolluese Mandriva, apo me urdherinë "
+"Testone lidhjen tuaj tek Qendra Kontrolluese Mageia, apo me urdherinë "
 "net_monitor. Nëse lidhja juaj nuk fonksionon, ju mund ta ri-nisni "
 "konfigurimin."
 
@@ -5769,7 +5769,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5803,7 +5803,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/sr.po b/po/sr.po
index 006e9d6..9197416 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -163,7 +163,7 @@ msgstr "DHCP клијент"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Овај интерфејс још увек није подешен.\n"
 "Покрените конфигурационог чаробњака у главном прозору"
@@ -210,7 +210,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Ваш рачунар можете подесити за дељење његове Интернет конекције.\n"
@@ -450,7 +450,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1472,7 +1472,7 @@ msgstr "Samba Сервер"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr "Сва права (C) %s задржава Мандрива"
 
 #: ../bin/draksambashare:198
@@ -1482,8 +1482,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2104,7 +2104,7 @@ msgstr "Мрежни интерфејс"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Овај интерфејс још увек није подешен.\n"
 "Покрените конфигурационог чаробњака у главном прозору"
@@ -2294,10 +2294,10 @@ msgstr "Повезивање завршено."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "повезивање неуспело.\n"
-"Проверите вашу конфигурацију у Mandriva Контролном Центру."
+"Проверите вашу конфигурацију у Mageia Контролном Центру."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4638,15 +4638,15 @@ msgstr "Ручна конфигурација"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall конфигуратор\n"
 "\n"
-"Он конфигурише лични firewall за ову Mandriva Linux машину.\n"
+"Он конфигурише лични firewall за ову Mageia машину.\n"
 "За моћно firewall решење, погледајте\n"
-"специјализовану Mandriva Security Firewall дистрибуцију."
+"специјализовану Mageia Security Firewall дистрибуцију."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5761,7 +5761,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5795,7 +5795,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 1bc7936..120ca27 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -163,7 +163,7 @@ msgstr "DHCP klijent"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ovaj interfejs još uvek nije podešen.\n"
 "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
@@ -210,7 +210,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Vaš računar možete podesiti za deljenje njegove Internet konekcije.\n"
@@ -450,7 +450,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1472,8 +1472,8 @@ msgstr "Samba Server"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Sva prava (C) %s zadržava Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Sva prava (C) %s zadržava Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1482,8 +1482,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2104,7 +2104,7 @@ msgstr "Mrežni interfejs"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ovaj interfejs još uvek nije podešen.\n"
 "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
@@ -2294,10 +2294,10 @@ msgstr "Povezivanje završeno."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "povezivanje neuspelo.\n"
-"Proverite vašu konfiguraciju u Mandriva Kontrolnom Centru."
+"Proverite vašu konfiguraciju u Mageia Kontrolnom Centru."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4638,15 +4638,15 @@ msgstr "Ručna konfiguracija"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall konfigurator\n"
 "\n"
-"On konfiguriše lični firewall za ovu Mandriva Linux mašinu.\n"
+"On konfiguriše lični firewall za ovu Mageia mašinu.\n"
 "Za moćno firewall rešenje, pogledajte\n"
-"specijalizovanu Mandriva Security Firewall distribuciju."
+"specijalizovanu Mageia Security Firewall distribuciju."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5761,7 +5761,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5795,7 +5795,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/sv.po b/po/sv.po
index dfd021f..00884df 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 # network-tools-sv - Swedish Translation
 #
 # Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva
+# Copyright (c) 2000 Mageia
 #
 # Kenneth Krekula, 2005.
 # Fuad Sabanovic <manijak@telia.com>, 2000.
@@ -171,10 +171,10 @@ msgstr "DHCP-klient"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Gränssnittet har inte konfigurerats ännu.\n"
-"Starta guiden \"%s\" från Mandriva Linux kontrollcentral"
+"Starta guiden \"%s\" från Mageia kontrollcentral"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -218,7 +218,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Du är på väg att konfigurera din dator för att dela sin Internetanslutning.\n"
@@ -469,12 +469,12 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Inget nätverkskort konfigurerat för lokala nätet har hittats i ditt system.\n"
 "\n"
-"Kör hårdvaru-verktyget för att konfigurera det, och kontrollera att Mandriva "
+"Kör hårdvaru-verktyget för att konfigurera det, och kontrollera att Mageia "
 "brandväggen inte är aktiv för det kortet."
 
 #: ../bin/drakgw:316
@@ -1559,8 +1559,8 @@ msgstr "DrakSambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s, Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s, Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1569,8 +1569,8 @@ msgstr "Detta är ett enkelt verktyg för att hantera Samba konfiguration."
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2231,10 +2231,10 @@ msgstr "Nätverksgränssnittet %s är nere."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Gränssnittet har inte konfigurerats ännu.\n"
-"Starta guiden \"%s\" från Mandriva Linux kontrollcentral."
+"Starta guiden \"%s\" från Mageia kontrollcentral."
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2425,10 +2425,10 @@ msgstr "Anslutning klar."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Anslutning misslyckades.\n"
-"Verifiera konfigurationen i Mandriva Linux kontrollcentral."
+"Verifiera konfigurationen i Mageia kontrollcentral."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4877,16 +4877,16 @@ msgstr "Brandväggskonfiguration"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Drakfirewall-konfigurator\n"
 "\n"
-"Detta konfigurerar en personlig brandvägg för den här Mandriva Linux-"
+"Detta konfigurerar en personlig brandvägg för den här Mageia-"
 "datorn.\n"
 "För en kraftfull och dedikerad brandväggslösning, se den\n"
-"specialiserade distributionen Mandriva Security Firewall."
+"specialiserade distributionen Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6027,7 +6027,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6037,7 +6037,7 @@ msgstr ""
 "Alla anslutningar direkt mot Internet bör väljas, medan\n"
 "anslutningar mot lokala nätet kan väljas bort.\n"
 "\n"
-"Om du tänker använda Mandriva Internet anslutningsdelning\n"
+"Om du tänker använda Mageia Internet anslutningsdelning\n"
 "välj då bort anslutningar mot lokala nätverket.\n"
 "\n"
 "Vilka anslutningar skall skyddas?\n"
@@ -6074,7 +6074,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Vissa paket (%s) behövs, men är inte tillgängliga."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/ta.po b/po/ta.po
index 36676c9..a041baf 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,5 +1,5 @@
 # Drak X
-# Copyright (C) 2002 Mandriva
+# Copyright (C) 2002 Mageia
 #
 # NOTE: use UTF-8 only
 #
@@ -165,7 +165,7 @@ msgstr "DHCP வேண்டி"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "இந்த வலையமைப்பு அட்ைட இன்னும் வடிவமைக்கப்படவில்ைல\n"
 "இதற்க்கான மாயாவியைத் துவக்கு"
@@ -212,7 +212,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "உங்கள் கணினி இணையத் தொடர்பு பரிமாறியாக.\n"
@@ -443,7 +443,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1462,7 +1462,7 @@ msgstr "ஒலிப் பரிமாறி"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1472,7 +1472,7 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
+msgid "Mageia"
 msgstr "மான்ட்ரிவ லினக்ஸ்"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
@@ -2094,7 +2094,7 @@ msgstr "வலையமைப்பு அட்ைட"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "இந்த வலையமைப்பு அட்ைட இன்னும் வடிவமைக்கப்படவில்ைல\n"
 "இதற்க்கான மாயாவியைத் துவக்கு"
@@ -2284,7 +2284,7 @@ msgstr "தொடர்பு வேகம்: "
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4617,9 +4617,9 @@ msgstr "கைமுறை வடிவமைப்பு "
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "நெருப்புச்சுவர் வடிவமைப்பு\n"
 "\n"
@@ -5727,7 +5727,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5761,7 +5761,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/tg.po b/po/tg.po
index 3f44589..f93bf34 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -173,10 +173,10 @@ msgstr "DHCP мизоҷ"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ин интерфейс то ҳол танзим нашудааст.\n"
-"Аз Маркази Идораи Mandriva Linux ёрдамчии \"Иловакунии интерфейс\"-ро ба кор "
+"Аз Маркази Идораи Mageia ёрдамчии \"Иловакунии интерфейс\"-ро ба кор "
 "андозед"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -221,7 +221,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Шумо хоҳиши ба танзим даровардани компютери худро барои истифодаи\n"
@@ -469,7 +469,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1493,7 +1493,7 @@ msgstr "Хидматгори Samba"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1503,8 +1503,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2125,10 +2125,10 @@ msgstr "Шабака дар асоси интерфейс %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Шумо ягон пайвастшавии Интернети танзимшударо надоред.\n"
-"\"%s\"-ро аз Маркази Идораи Mandriva Linux сар диҳед"
+"\"%s\"-ро аз Маркази Идораи Mageia сар диҳед"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, fuzzy, c-format
@@ -2322,10 +2322,10 @@ msgstr "Пайвастшавӣ ба итмом расид."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Пайвастшавӣ ба итмом расид.\n"
-"Ба танзимдарориро дар Маркази Назорати Mandriva санҷед."
+"Ба танзимдарориро дар Маркази Назорати Mageia санҷед."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4706,15 +4706,15 @@ msgstr "Танзимдарории дастӣПайкарабандии Раҳн
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Танзимгари drakfirewall\n"
 "\n"
-"Вай фейрволҳои шахсиро барои ин мошинаи Mandriva Linux ба танзим медарорад.\n"
+"Вай фейрволҳои шахсиро барои ин мошинаи Mageia ба танзим медарорад.\n"
 "Барои ҳалли фейрволи тахассуснок ва пуриқтидор, марҳамат карда ба тақсимоти\n"
-"Mandriva Security Firewall нигаред."
+"Mageia Security Firewall нигаред."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5853,7 +5853,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5887,7 +5887,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/th.po b/po/th.po
index 8df5037..e8d7318 100644
--- a/po/th.po
+++ b/po/th.po
@@ -160,7 +160,7 @@ msgstr "DHCP client"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -205,7 +205,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "ขณะนี้การต่อเข้า internet ได้ทำการปรับแต่งเรียบร้อยแล้ว\n"
@@ -429,7 +429,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1448,7 +1448,7 @@ msgstr "เซิร์ฟเวอร์ NIS"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1458,8 +1458,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2080,7 +2080,7 @@ msgstr "Network interface"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
@@ -2268,7 +2268,7 @@ msgstr "ชนิดการเชื่อมต่อ"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 
 #: ../bin/net_monitor:360
@@ -4602,9 +4602,9 @@ msgstr "การคอนฟิก"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5692,7 +5692,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5726,7 +5726,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/tl.po b/po/tl.po
index 4937814..52da6d9 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -163,10 +163,10 @@ msgstr "DHCP client"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ang interface na ito ay hindi pa na-configure.\n"
-"Patakbuhin ang \"Magdagdag ng interface\" na assistant mula sa Mandriva "
+"Patakbuhin ang \"Magdagdag ng interface\" na assistant mula sa Mageia "
 "Control Center"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
@@ -211,7 +211,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Ico-configure ninyo ang inyong computer na ipamahagi ang koneksyon nito sa "
@@ -457,7 +457,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1480,7 +1480,7 @@ msgstr "Samba server"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
@@ -1490,8 +1490,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2112,10 +2112,10 @@ msgstr "Network interface"
 #, fuzzy, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ang interface na ito ay hindi pa na-configure.\n"
-"Patakbuhin ang \"%s\" na assistant mula sa Mandriva Control Center"
+"Patakbuhin ang \"%s\" na assistant mula sa Mageia Control Center"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, fuzzy, c-format
@@ -2308,10 +2308,10 @@ msgstr "Kompleta na ang koneksyon."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Koneksyon ay nabigo.\n"
-"I-verify ang inyong configuration sa Mandriva Linux Control Center."
+"I-verify ang inyong configuration sa Mageia Control Center."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4695,15 +4695,15 @@ msgstr "Mano-manong pag-configure"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall configurator\n"
 "\n"
 "Ito ay nagko-configure ng personal na firewall para sa makinang ito ng\n"
-"Mandriva Linux. Para sa mas makapangyarihan at dedicated na solusyon\n"
-"ng firewall, pakitingnan ang pinatanging distribusyon na Mandriva Security\n"
+"Mageia. Para sa mas makapangyarihan at dedicated na solusyon\n"
+"ng firewall, pakitingnan ang pinatanging distribusyon na Mageia Security\n"
 "Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5827,7 +5827,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5861,7 +5861,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/tr.po b/po/tr.po
index e17609c..8b734e9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,6 +1,6 @@
 # translation of tr.po to Turkce
 # Copyright (C) 2000,2003, 2007 Free Software Foundation, Inc.
-# Copyright (c) 2000 Mandriva
+# Copyright (c) 2000 Mageia
 # ############################################
 #
 #
@@ -22,7 +22,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-10-21 09:39+0200\n"
 "Last-Translator: Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
-"Language-Team: Turkish <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Turkish <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -200,10 +200,10 @@ msgstr "DHCP istemcisi"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Bu bağdaştırıcı henüz yapılandırılmamış.\n"
-"Mandriva Linux Denetim Merkezi' ndeki \"%s\" yardımcısını çalıştırın"
+"Mageia Denetim Merkezi' ndeki \"%s\" yardımcısını çalıştırın"
 
 #: ../bin/drakconnect-old:247
 #: ../bin/net_applet:104
@@ -249,14 +249,14 @@ msgid ""
 "\n"
 "Make sure you have configured your Network/Internet access using drakconnect before going any further.\n"
 "\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mandriva Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
 msgstr ""
 "Bilgisayarınızı internet bağlantısını paylaştırmak için ayarlamak üzeresiniz.\n"
 "Bu özellik sayesinde yerel ağa bağlı diğer bilgisayarlar bu bilgisayarın internet bağlantısını kullanabilirler.\n"
 "\n"
 "Bu özellikleri kullanmadan önce Ağ/İnternet ayarlamalarınızı drakconnect ile düzgün bir şekilde yaptığınıza emin olunuz.\n"
 "\n"
-"Not: Yerel ağınızı (LAN) ayarlamak için bu işe özgülenmiş bir ağ bağdaştırıcısına ihtiyacınız var. Lütfen devam etmeden önce LAN bağlantınızı sağlayan ağ bağdaştırıcınızda etkin olan Mandriva Güvenlik Duvarını devre dışı bırakın."
+"Not: Yerel ağınızı (LAN) ayarlamak için bu işe özgülenmiş bir ağ bağdaştırıcısına ihtiyacınız var. Lütfen devam etmeden önce LAN bağlantınızı sağlayan ağ bağdaştırıcınızda etkin olan Mageia Güvenlik Duvarını devre dışı bırakın."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -523,11 +523,11 @@ msgstr "Yayınlanan yazıcı bilgisi"
 msgid ""
 "No ethernet network adapter configured for LAN has been detected on your system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mandriva firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
 msgstr ""
 "LAN için yapılandırılmış hiç bir bağdaştırıcı bulunamadı.\n"
 "\n"
-"Lütfen onu yapılandırmak için donanım yapılandırma aracını çalıştırın ve LAN ağınıza bağlı bağdaştırıcıda Mandriva güvenlik duvarının etkin olmadığından emin olun."
+"Lütfen onu yapılandırmak için donanım yapılandırma aracını çalıştırın ve LAN ağınıza bağlı bağdaştırıcıda Mageia güvenlik duvarının etkin olmadığından emin olun."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -1615,8 +1615,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s Mandriva ürünüdür"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s Mageia ürünüdür"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1625,8 +1625,8 @@ msgstr "Bu, Samba yapılandrımanızı kolaylıkla yönetmenizi sağlayan bir ar
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2229,10 +2229,10 @@ msgstr "Ağ, %s ara birimi üzerinde çalışmıyor."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Bu bağdaştırıcı henüz yapılandırılmamış.\n"
-"Mandriva Denetim Merkezi' nden \"%s\" yardımcısını çalıştırın"
+"Mageia Denetim Merkezi' nden \"%s\" yardımcısını çalıştırın"
 
 #: ../bin/net_applet:106
 #: ../lib/network/connection_manager.pm:206
@@ -2437,10 +2437,10 @@ msgstr "Bağlantı tamamlandı."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Bağlantı başarısız.\n"
-"Yapılandırmanızı Mandriva Linux Kontrol Merkezinden kontrol ediniz."
+"Yapılandırmanızı Mageia Kontrol Merkezinden kontrol ediniz."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4859,14 +4859,14 @@ msgstr "Güvenlik duvarı yapılandırması"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall yapılandırma aracı\n"
 "\n"
-"Bu araç Mandriva Linux makineniz için kişisel bir ateş duvarı yapılandırır.\n"
-"Güçlü bir ateş duvarı çözümü için özelleştirilmiş Mandriva Security Firewall\n"
+"Bu araç Mageia makineniz için kişisel bir ateş duvarı yapılandırır.\n"
+"Güçlü bir ateş duvarı çözümü için özelleştirilmiş Mageia Security Firewall\n"
 "dağıtımına bakın."
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5976,7 +5976,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5986,7 +5986,7 @@ msgstr ""
 "İnternet'e doğrudan bağlı ara birimler seçilmelidir; ancak yerel ağa bağlı\n"
 "olanlar seçilmeyebilir.\n"
 "\n"
-"Mandriva İnternet Bağlantı paylaşımını kullanmak istiyorsanız,\n"
+"Mageia İnternet Bağlantı paylaşımını kullanmak istiyorsanız,\n"
 "yerel ağa bağlı ara birimleri seçmeyin.\n"
 "\n"
 "Hangi ara birimler korunsun?\n"
@@ -6022,7 +6022,7 @@ msgstr "Bazı paketler (%s) gerekli ama %s donanımı için kurulamıyorlar."
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Bazı paketler (%s) gerekli ama kurulamıyorlar."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/uk.po b/po/uk.po
index b005e05..09a8fef 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,5 +1,5 @@
 # translation of drakx-net.po to ukrainian
-# $Id$
+# $Id: uk.po 262922 2009-10-28 10:35:06Z fisher $
 # Copyright (C) 2000,2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
 #
 # Dmytro  Kovalov <kov@tokyo.email.ne.jp>, 2000.
@@ -170,7 +170,7 @@ msgstr "Клієнт DHCP"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Цей інтерфейс ще не було налаштовано.\n"
 "Запустіть Помічник «%s» з Центру Керування Мандріва Лінакс"
@@ -217,7 +217,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Ви підійшли до налаштування організації спільного доступу до Інтернет з "
@@ -470,7 +470,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "В системі не знайдено жодного адаптера місцевої мережі.\n"
@@ -1570,8 +1570,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Авторські права належать © %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Авторські права належать © %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1580,8 +1580,8 @@ msgstr "Це простий інструмент для полегшення к�
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2249,7 +2249,7 @@ msgstr "На інтерфейсі %s мережу вимкнено."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "З'єднання з Інтернетом ще не було сконфігуровано.\n"
 "Запустіть Помічника \"%s\" Центрі Керування Мандріва "
@@ -2443,7 +2443,7 @@ msgstr "З'єднання завершене."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "З'єднання завершилося невдало.\n"
 "Перевірте налаштування в Центрі керування Мандріва."
@@ -4908,16 +4908,16 @@ msgstr "Налаштування захисного шлюзу"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Інструмент налаштування drakfirewall\n"
 "\n"
 "Це налаштовує персонального захисного шлюзу для цієї машини з\n"
 "Мандріва Лінакс. Для того, щоб встановити потужніший інтелектуальний\n"
 "захисний шлюз, зверніться, будь ласка, до спеціалізованого\n"
-"дистрибутива Mandriva Security Firewall."
+"дистрибутива Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6061,7 +6061,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -6108,7 +6108,7 @@ msgstr "Потрібні деякі компоненти (%s), але вони �
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Потрібні деякі пакунки (%s), але вони зараз недоступні."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/uz.po b/po/uz.po
index 5a7db54..f8a9843 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,6 +1,6 @@
 # translation of uz@cyrillic.po to Uzbek
 # Copyright (C) 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
-# Copyright (C) 2003 Mandriva.
+# Copyright (C) 2003 Mageia.
 #
 # Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004, 2006, 2007, 2008.
 # Nurali Abdurahmonov <mavnur@gmail.com>, 2009, 2010.
@@ -165,10 +165,10 @@ msgstr "DHCP klienti"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Bu interfeys hali moslangani yoʻq.\n"
-"Mandriva Linux boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
+"Mageia boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -212,7 +212,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Siz ushbu kompyuter internet ulanishi boʻlishishga moslamoqchisiz.\n"
@@ -223,7 +223,7 @@ msgstr ""
 "tekshirib koʻring.\n"
 "\n"
 "Izoh: lokal tarmoqq ulanish uchun alohida tarmoq kartasi kerak boʻladi. "
-"Sozlashdan avval lokal tarmoqqa ulangan karta uchun oʻrnatilgan Mandriva "
+"Sozlashdan avval lokal tarmoqqa ulangan karta uchun oʻrnatilgan Mageia "
 "fayervolini oʻchiring."
 
 #: ../bin/drakgw:91
@@ -465,12 +465,12 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Tizimda lokal tarmoq uchun sozlangan tarmoq adapteri topilmadi.\n"
 "\n"
-"Iltimos uskunalarni sozlash vositasidan foydalanib uni sozlang va Mandriva "
+"Iltimos uskunalarni sozlash vositasidan foydalanib uni sozlang va Mageia "
 "fayervoli ushbu adapter uchun oʻchirilganligini tekshiring."
 
 #: ../bin/drakgw:316
@@ -1486,8 +1486,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s by Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1496,8 +1496,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2118,10 +2118,10 @@ msgstr "Aloqa ishga tushmagan: %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Internet bilan aloqa moslanmagan.\n"
-"Mandriva Linux boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
+"Mageia boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2314,10 +2314,10 @@ msgstr "Aloqa oʻrnatildi."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Aloqa oʻrnatish muvaffaqiyatsiz tugadi.\n"
-"Moslamani Mandriva Linux boshqaruv markazida tekshiring."
+"Moslamani Mageia boshqaruv markazida tekshiring."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4652,9 +4652,9 @@ msgstr "Fayervol moslamalari"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5765,7 +5765,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5799,7 +5799,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 3c572f7..e8590cd 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -1,6 +1,6 @@
 # translation of uz@cyrillic.po to Uzbek
 # Copyright (C) 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
-# Copyright (C) 2003 Mandriva.
+# Copyright (C) 2003 Mageia.
 #
 # Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004, 2006, 2007, 2008.
 # Nurali Abdurahmonov <mavnur@gmail.com>, 2009, 2010.
@@ -165,10 +165,10 @@ msgstr "DHCP клиенти"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Бу интерфейс ҳали мослангани йўқ.\n"
-"Mandriva Linux бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
+"Mageia бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -212,7 +212,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Сиз ушбу компьютер интернет уланиши бўлишишга мосламоқчисиз.\n"
@@ -223,7 +223,7 @@ msgstr ""
 "текшириб кўринг.\n"
 "\n"
 "Изоҳ: локал тармоққ уланиш учун алоҳида тармоқ картаси керак бўлади. "
-"Созлашдан аввал локал тармоққа уланган карта учун ўрнатилган Mandriva "
+"Созлашдан аввал локал тармоққа уланган карта учун ўрнатилган Mageia "
 "файерволини ўчиринг."
 
 #: ../bin/drakgw:91
@@ -465,12 +465,12 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "Тизимда локал тармоқ учун созланган тармоқ адаптери топилмади.\n"
 "\n"
-"Илтимос ускуналарни созлаш воситасидан фойдаланиб уни созланг ва Mandriva "
+"Илтимос ускуналарни созлаш воситасидан фойдаланиб уни созланг ва Mageia "
 "файерволи ушбу адаптер учун ўчирилганлигини текширинг."
 
 #: ../bin/drakgw:316
@@ -1486,8 +1486,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s by Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1496,8 +1496,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2118,10 +2118,10 @@ msgstr "Алоқа ишга тушмаган: %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Интернет билан алоқа мосланмаган.\n"
-"Mandriva Linux бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
+"Mageia бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2314,10 +2314,10 @@ msgstr "Алоқа ўрнатилди."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Алоқа ўрнатиш муваффақиятсиз тугади.\n"
-"Мосламани Mandriva Linux бошқарув марказида текширинг."
+"Мосламани Mageia бошқарув марказида текширинг."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4652,9 +4652,9 @@ msgstr "Файервол мосламалари"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5765,7 +5765,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5799,7 +5799,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/vi.po b/po/vi.po
index 79af0c2..3fe7e4c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -163,10 +163,10 @@ msgstr "Máy khách DHCP"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Giao diện này vẫn còn chưa được cấu hình.\n"
-"Hãy chạy \"Bổ sung giao diện\" trong Trung Tâm Điều Khiển Mandriva Linuxlinux"
+"Hãy chạy \"Bổ sung giao diện\" trong Trung Tâm Điều Khiển Mageialinux"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -210,7 +210,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Bạn sắp cấu hình cho máy tính chia sẻ kết nối Internet của nó.\n"
@@ -451,7 +451,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1522,14 +1522,14 @@ msgstr "Thông tin về Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
 msgstr ""
 
 #: ../bin/draksambashare:198
 #, fuzzy, c-format
 msgid "This is a simple tool to easily manage Samba configuration."
 msgstr ""
-"Mandriva Linux \n"
+"Mageia \n"
 "Release: %s\n"
 "Tác giả: Antoine Ginies\n"
 "\n"
@@ -1537,8 +1537,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2161,10 +2161,10 @@ msgstr "Mạng hoạt động ở giao diện %s"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Bạn chưa cấu hình kết nối internet.\n"
-"Hãy chạy \"%s\" từ Trung Tâm Điều Khiển Mandriva Linuxlinux"
+"Hãy chạy \"%s\" từ Trung Tâm Điều Khiển Mageialinux"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, fuzzy, c-format
@@ -2357,10 +2357,10 @@ msgstr "Hoàn thành kết nối."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Không kết nối được.\n"
-"Hãy kiểm tra cấu hình trong Trung Tâm Điều Khiển Mandriva Linux."
+"Hãy kiểm tra cấu hình trong Trung Tâm Điều Khiển Mageia."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4734,15 +4734,15 @@ msgstr "Cấu hình thủ công"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Chương trình cấu hình Drakfirewall\n"
 "\n"
-"Chương trình này cấu hình một tường lửa cá nhân cho máy Mandriva Linux.\n"
+"Chương trình này cấu hình một tường lửa cá nhân cho máy Mageia.\n"
 "Về giải pháp tường lửa mạnh và chuyên dụng, hãy tìm xem phân phối\n"
-"tường lửa bảo mật chuyên dụng của Mandriva."
+"tường lửa bảo mật chuyên dụng của Mageia."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5871,7 +5871,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5905,15 +5905,15 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Cần một số gói tin (%s) nhưng hiện không thấy có."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, fuzzy, c-format
 msgid ""
 "These packages can be found in %s, or in the official %s package repository."
 msgstr ""
-"Những gói tin này có thể tìm thấy tại Mandriva Club hoặc phân phối thương "
-"mại của Mandriva."
+"Những gói tin này có thể tìm thấy tại Mageia Club hoặc phân phối thương "
+"mại của Mageia."
 
 #: ../lib/network/thirdparty.pm:154
 #, c-format
diff --git a/po/wa.po b/po/wa.po
index 347d465..15463fa 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -166,7 +166,7 @@ msgstr "Cliyint DHCP"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Ciste eterface n' a nén co stî apontieye.\n"
 "Enondez li macrea «Radjouter ene eterface» a pårti do cinte di contrôle."
@@ -213,7 +213,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "Vos alez apontyî li copiutrece da vosse po pårtaedjî li raloyaedje al "
@@ -459,7 +459,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1506,8 +1506,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s pa Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright © %s pa Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1518,8 +1518,8 @@ msgstr ""
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2144,7 +2144,7 @@ msgstr "Li rantoele est dismetowe so l' eterface %s."
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "Vos n' avoz nou raloyaedje al daegntoele d' apontyî.\n"
 "Enondez li macrea «%s» a pårti do cinte di contrôle."
@@ -2340,10 +2340,10 @@ msgstr "Raloyaedje completé."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Li raloyaedje a fwait berwete.\n"
-"Verifyîz vost apontiaedje dins l' cinte di contrôle di Mandriva Linux."
+"Verifyîz vost apontiaedje dins l' cinte di contrôle di Mageia."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4717,16 +4717,16 @@ msgstr "Apontiaedje do côpe-feu"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "Apontiaedje do côpe feu drakefirewall\n"
 "\n"
 "Çouci apontieye on côpe feu personel (dj' ô bén, po esse eployî sor on\n"
-"posse éndjolrece) po ciste éndjole Mandriva Linux chal.\n"
+"posse éndjolrece) po ciste éndjole Mageia chal.\n"
 "Po ene poûxhante solucion di côpe feu, loukîz purade do costé\n"
-"del distribucion Mandriva Security avou on côpe feu di hôte såvrité."
+"del distribucion Mageia Security avou on côpe feu di hôte såvrité."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5865,7 +5865,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5909,15 +5909,15 @@ msgid "Some packages (%s) are required but aren't available."
 msgstr ""
 "I gn a mezåjhe di sacwants pacaedjes (%s) mins ki n' sont nén disponibes."
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, fuzzy, c-format
 msgid ""
 "These packages can be found in %s, or in the official %s package repository."
 msgstr ""
-"Ces pacaedjes la si plèt trover dins l' Club di Mandriva oudonbén dins les "
-"modêyes di Mandriva vindowes dins l' comiece."
+"Ces pacaedjes la si plèt trover dins l' Club di Mageia oudonbén dins les "
+"modêyes di Mageia vindowes dins l' comiece."
 
 #: ../lib/network/thirdparty.pm:154
 #, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9f957f1..f72f594 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-04-09 13:03+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Mageia i18n Team <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -157,10 +157,10 @@ msgstr "DHCP 客户端"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "这块网卡还没有配置过。\n"
-"请从 Mandriva Linux 控制中心运行“%s”助手"
+"请从 Mageia 控制中心运行“%s”助手"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -204,7 +204,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "现在将要把您电脑上的 Internet 连接配置为共享给其它电脑。\n"
@@ -213,7 +213,7 @@ msgstr ""
 "请确定在继续操作之前已经使用 DrakConnect 配置了您的网络/Internet 访问。\n"
 "\n"
 "注意: 您另外需要一块专用的网卡来设置局域网(LAN)。在继续前，您应该先将 "
-"Mandriva 防火墙从与局域网连接的网卡上去掉。"
+"Mageia 防火墙从与局域网连接的网卡上去掉。"
 
 #: ../bin/drakgw:91
 #, c-format
@@ -450,12 +450,12 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 "您的系统上没有检测到配置为局域网的以太网卡。\n"
 "\n"
-"请运行硬件配置工具配置网卡，然后确保 Mandriva 防火墙没有在与局域网连接的网卡"
+"请运行硬件配置工具配置网卡，然后确保 Mageia 防火墙没有在与局域网连接的网卡"
 "上启用。"
 
 #: ../bin/drakgw:316
@@ -1522,8 +1522,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "版权 (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "版权 (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1532,8 +1532,8 @@ msgstr "这一简单工具可轻松管理 Samba 配置。"
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2169,10 +2169,10 @@ msgstr "网卡 %s 的网络已断。"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "您从未配置过 Internet 连接。\n"
-"请从 Mandriva Linux 控制中心运行“%s”助手"
+"请从 Mageia 控制中心运行“%s”助手"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2363,10 +2363,10 @@ msgstr "连接完成。"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "连接失败。\n"
-"请在 Mandriva Linux 控制中心中检查您的配置。"
+"请在 Mageia 控制中心中检查您的配置。"
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4768,15 +4768,15 @@ msgstr "防火墙配置"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "“Drak 防火墙”配置\n"
 "\n"
-"此程序可为您的 Mandriva Linux 机器配置个人防火墙。\n"
+"此程序可为您的 Mageia 机器配置个人防火墙。\n"
 "如果要配置强大的专用防火墙, 请考虑使用专门的\n"
-"Mandriva Security 防火墙发行版。"
+"Mageia Security 防火墙发行版。"
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5895,7 +5895,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5904,7 +5904,7 @@ msgstr ""
 "\n"
 "所有直接连接到 Internet 的接口都应该选中，而连接到局域网的接口可以不选。\n"
 "\n"
-"如果您想要使用 Mandriva Internet 连接共享，请不要选择将连接到局域网的接口。\n"
+"如果您想要使用 Mageia Internet 连接共享，请不要选择将连接到局域网的接口。\n"
 "\n"
 "应该保护哪个接口?\n"
 
@@ -5938,7 +5938,7 @@ msgstr "需要某些组件(%s)，但 %s 硬件无法使用。"
 msgid "Some packages (%s) are required but aren't available."
 msgstr "需要某些软件包(%s)，这些软件包不可用。"
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 76267ec..7a4da3b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -177,10 +177,10 @@ msgstr "DHCP 用戶端"
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "此網路介面尚未設定。\n"
-"請從 Mandriva Linux 控制中心執行「%s」"
+"請從 Mageia 控制中心執行「%s」"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -224,7 +224,7 @@ msgid ""
 "before going any further.\n"
 "\n"
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN). Please disable Mandriva Firewall for the network adapter connected to "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
 "your LAN connection before proceeding."
 msgstr ""
 "您目前正要設定讓您的電腦分享它的 Internet 連線。\n"
@@ -459,7 +459,7 @@ msgid ""
 "system.\n"
 "\n"
 "Please run the hardware configuration tool to configure it, and ensure that "
-"the Mandriva firewall is not enabled for network adapter connected to your "
+"the Mageia firewall is not enabled for network adapter connected to your "
 "LAN network."
 msgstr ""
 
@@ -1481,8 +1481,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s by Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1491,8 +1491,8 @@ msgstr "這是一個用來管理 Samba 組態設定的簡單工具。"
 
 #: ../bin/draksambashare:200
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
@@ -2118,10 +2118,10 @@ msgstr "網路已經由介面 %s 關閉。"
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandriva Linux Control Center"
+"Run the \"%s\" assistant from the Mageia Control Center"
 msgstr ""
 "您沒有任何已設定好的網路連線。\n"
-"請由 Mandriva Linux 控制中心啟動 \"%s\" 設定精靈"
+"請由 Mageia 控制中心啟動 \"%s\" 設定精靈"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2312,10 +2312,10 @@ msgstr "連線完成。"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "連線失敗。\n"
-"請檢查您在 Mandriva Linux 控制中心的設定。"
+"請檢查您在 Mageia 控制中心的設定。"
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4658,14 +4658,14 @@ msgstr "防火牆組態設定"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandriva Linux machine.\n"
+"This configures a personal firewall for this Mageia machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
-"specialized Mandriva Security Firewall distribution."
+"specialized Mageia Security Firewall distribution."
 msgstr ""
 "drakfirewall 設定程式\n"
 "\n"
-"這是用來設定 Mandriva Linux 個人防火牆的程式。\n"
-"若您需要強大而專門的防火牆解決方案，請參考專門的 Mandriva Security\n"
+"這是用來設定 Mageia 個人防火牆的程式。\n"
+"若您需要強大而專門的防火牆解決方案，請參考專門的 Mageia Security\n"
 "Firewall 產品。"
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5786,7 +5786,7 @@ msgid ""
 "All interfaces directly connected to Internet should be selected,\n"
 "while interfaces connected to a local network may be unselected.\n"
 "\n"
-"If you intend to use Mandriva Internet Connection sharing,\n"
+"If you intend to use Mageia Internet Connection sharing,\n"
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
@@ -5796,7 +5796,7 @@ msgstr ""
 " 所有直接連結到網際網路的界面都應該要選取，\n"
 " 而連結到本地端網路的界面則可以不要選取。\n"
 " \n"
-" 如果您想要使用 Mandriva Internet Connection 分享連線，\n"
+" 如果您想要使用 Mageia Internet Connection 分享連線，\n"
 " 請不要選取連結到區域網路的網路介面。 \n"
 " \n"
 " 哪些界面應該要被保護呢？\n"
@@ -5831,7 +5831,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "需要某些套件 (%s) 卻無法使用。"
 
-#. -PO: first argument is a list of Mandriva distributions
+#. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format