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/is.po b/po/is.po
index 20eca0a..511b545 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 # Icelandic translation of network-tools.po
-# Translation file for Mandriva Linux graphic install, drakx-net
+# Translation file for Mageia graphic install, drakx-net
 # Copyright (C) 1999,2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
-# Copyright (C) 1999 Mandriva
+# Copyright (C) 1999 Mageia
 #
 # Jóhann Þorvarðarson <johann.torvardarson@lais.is>, 1999-2000.
 # Þórarinn (Tony) R. Einarsson <thori@mindspring.com>, 1999-2000.
@@ -167,10 +167,10 @@ msgstr "DHCP biðlari"
 #, 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 ""
 "Þetta nettengi hefur ekki verið stillt enn.\n"
-"Keyrið \"%s\" ráðgjafann frá Mandriva Linux stjórnborðinu"
+"Keyrið \"%s\" ráðgjafann frá Mageia stjórnborðinu"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -214,7 +214,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 ""
 "Þú er um það bil að fara að setja tölvuna þína upp til að deila Internet "
@@ -226,7 +226,7 @@ msgstr ""
 "drakconnect áður en þú heldur lengra.\n"
 "\n"
 "Athugið: þú þarft að hafa sérstakt netkort fyrir staðarnetið til að geta "
-"deilt Internet-tengingu um staðarnet (LAN). Aftengdu Mandriva eldvegginn "
+"deilt Internet-tengingu um staðarnet (LAN). Aftengdu Mageia eldvegginn "
 "fyrir það netkort sem tengt er staðanetinu áður en lengra er haldið."
 
 #: ../bin/drakgw:91
@@ -466,14 +466,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 ""
 "Ekkert netkort sem er stillt fyrir staðarnet hefur fundist á tölvunni "
 "þinni.\n"
 "\n"
 "Keyrðu vélbúnaðar-stillingar-tól til að stilla það, og staðfestu\n"
-"að Mandriva eldveggur sé ekki virkur fyrir þá nettengingu (kort) sem\n"
+"að Mageia eldveggur sé ekki virkur fyrir þá nettengingu (kort) sem\n"
 "er tengt staðarnetinu."
 
 #: ../bin/drakgw:316
@@ -1549,8 +1549,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Höfundaréttur (C) %s Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Höfundaréttur (C) %s Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1559,8 +1559,8 @@ msgstr "Þetta er einfalt tól til að sýsla með Samba uppsetningu."
 
 #: ../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
@@ -2208,10 +2208,10 @@ msgstr "Net er ekki í gangi á tengi %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 ""
 "Þú hefur ekki skilgreint neina Internettengingu.\n"
-"Keyrið \"%s\" ráðgjafann frá Mandriva Linux stjórnborðinu"
+"Keyrið \"%s\" ráðgjafann frá Mageia stjórnborðinu"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2402,10 +2402,10 @@ msgstr "Tenging uppsett."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Tenging mistókst\n"
-"Athugaðu uppsetninguna í Mandriva Linux stjórnborði."
+"Athugaðu uppsetninguna í Mageia stjórnborði."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4796,15 +4796,15 @@ msgstr "Eldveggsuppsetning"
 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 stillingar\n"
 "\n"
-"Þessi eining stillir einka eldvegg fyrir þessa Mandriva Linux vél\n"
+"Þessi eining stillir einka eldvegg fyrir þessa Mageia vél\n"
 "Fyrir öruggan og aflmikinn eldvegg líttu á hina sértæku\n"
-"Mandriva eldveggs útgáfu."
+"Mageia eldveggs útgáfu."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5941,7 +5941,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"
@@ -5987,7 +5987,7 @@ msgstr "Nokkurra eininga (%s) er þörf, en eru ekki til fyrir vélbúnað %s."
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Þarf nokkra pakka (%s) sem eru ekki tiltækir."
 
-#. -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