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, 11 insertions, 11 deletions

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