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

6 files changed, 10 insertions, 10 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);