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

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