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

1 files changed, 2 insertions, 2 deletions

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,
 	     },