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

diff --git a/po/nb.po b/po/nb.po
index 3271782..9cd2cee 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,8 +1,8 @@
 # translation of nb.po to Norwegian Bokmål
 # translation of nb.po to
 # KTranslator Generated File
-# Translation file of Mandriva Linux graphic install
-# Copyright (C) 1999 Mandriva
+# Translation file of Mageia graphic install
+# Copyright (C) 1999 Mageia
 #
 # Terje Bjerkelia <terje@bjerkelia.com>, 1999-2000.
 # Andreas Bergstrøm <abergstr@halden.net>, 2000.
@@ -22,7 +22,7 @@ msgstr ""
 "POT-Creation-Date: 2009-10-20 08:41-0200\n"
 "PO-Revision-Date: 2009-10-22 00:11+0200\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
-"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
+"Language-Team: Norwegian Bokmål <mageia-i18n@mandrivalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -178,10 +178,10 @@ 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 ""
 "Dette grensesnittet har ikke blitt satt opp ennå.\n"
-"Kjør «%s» fra Mandriva Linux Kontrollsenter"
+"Kjør «%s» fra Mageia Kontrollsenter"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -225,7 +225,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 å sette opp maskinen din til å dele Internettilkoblingen "
@@ -236,7 +236,7 @@ msgstr ""
 "drakconnect før du går videre.\n"
 "\n"
 "Merk: at du trenger et dedikert nettverksadapter for å sette opp et lokalt "
-"nettverk (LAN). Vær vennlig å slå av Mandriva-brannmuren for "
+"nettverk (LAN). Vær vennlig å slå av Mageia-brannmuren for "
 "nettverksadapteret tilkoblet lokalnettet før du fortsetter."
 
 #: ../bin/drakgw:91
@@ -476,14 +476,14 @@ 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 ""
 "Ingen Ethernet-nettverksadapter satt opp for LAN har blitt funnet på "
 "systemet ditt.\n"
 "\n"
 " Vær vennlig å kjøre oppsettsverktøyet for maskinvare for sette det opp. "
-"Kontroller at Mandriva-brannmuren ikke er satt opp til å beskytte adaptere "
+"Kontroller at Mageia-brannmuren ikke er satt opp til å beskytte adaptere "
 "tilkoblet lokalnettverket."
 
 #: ../bin/drakgw:316
@@ -1567,8 +1567,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Alle rettigheter (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Alle rettigheter (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1577,8 +1577,8 @@ msgstr "Dette er et verktøy for å kunne håndtere oppsett for Samba."
 
 #: ../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
@@ -2239,10 +2239,10 @@ msgstr "Nettverk er nede på grensesnitt %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 ennå ikke satt opp en internettilkobling.\n"
-"Kjør «%s» fra Mandriva Linux Kontrollsenter."
+"Kjør «%s» fra Mageia Kontrollsenter."
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2429,10 +2429,10 @@ msgstr "Oppkobling ferdig."
 #, 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 tilkobling.\n"
-"Kontroller oppsettet ditt i Mandriva Linux Kontrollsenter."
+"Kontroller oppsettet ditt i Mageia Kontrollsenter."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4884,15 +4884,15 @@ msgstr "Innstilling av brannmuren"
 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 ""
 "Innstilling av brannmuren\n"
 "\n"
 "Dette setter opp en personlig brannmur for denne maskina.\n"
 "For en kraftig dedikert brannmurløsning bør du ta en kikk på\n"
-"Mandriva Security Firewall."
+"Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -6029,7 +6029,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"
@@ -6078,7 +6078,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Noen pakker (%s) er nødvendige, men er ikke tilgjengelige."
 
-#. -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