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

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