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/es.po b/po/es.po
index 28f9b1d..4bd6881 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # translation of es.po to Spanish
 # traducción de drakx-net-es.po to Español
 # spanish translation of drakx-net
-# Copyright (C) 2000, 2001,2002 Mandriva S.A.
+# Copyright (C) 2000, 2001,2002 Mageia S.A.
 #
 # Fabián Mandelbaum <fmandelbaum@gmail.com>, 2000-2003, 2004, 2006-2008.
 # Pablo Saratxaga <pablo@mandriva.com>, 2004, 2006.
@@ -193,10 +193,10 @@ msgstr "Cliente DHCP"
 #, 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 ""
 "Todavía no se ha configurado esta interfaz.\n"
-"Lance el asistente «%s» desde el Centro de Control de Mandriva Linux"
+"Lance el asistente «%s» desde el Centro de Control de Mageia"
 
 #: ../bin/drakconnect-old:247
 #: ../bin/net_applet:104
@@ -242,14 +242,14 @@ 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 ""
 "Está a punto de configurar su computadora para compartir la conexión a Internet.\n"
 "Con este recurso, otras computadoras de su red local podrán utilizar la conexión a Internet de esta computadora.\n"
 "\n"
 "Debe asegurarse que ha configurado su acceso a la Red/Internet utilizando drakconnect antes de proceder.\n"
 "\n"
-"Nota: necesita de un Adaptador de Red dedicado para configurar una Red de Área Local (LAN). En primero, desactive el Mandriva Firewall para la tarjeta de red conectada en su red local."
+"Nota: necesita de un Adaptador de Red dedicado para configurar una Red de Área Local (LAN). En primero, desactive el Mageia Firewall para la tarjeta de red conectada en su red local."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -516,11 +516,11 @@ msgstr "Difundir información de la impresora"
 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 ""
 "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."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -1608,8 +1608,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright © %s por Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright © %s por Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1618,8 +1618,8 @@ msgstr "Esta es una herramienta sencilla para administrar con facilidad la confi
 
 #: ../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
@@ -2226,10 +2226,10 @@ msgstr "La red no está activa en la interfaz %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 ""
 "Todavía no tiene configurada una conexión a Internet.\n"
-"Ejecute el asistente \"%s\" desde el Centro de Control de Mandriva Linux"
+"Ejecute el asistente \"%s\" desde el Centro de Control de Mageia"
 
 #: ../bin/net_applet:106
 #: ../lib/network/connection_manager.pm:206
@@ -2434,10 +2434,10 @@ msgstr "Conexión completa."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Falló la conexión.\n"
-"Verifique su configuración en el Centro de Control de Mandriva Linux."
+"Verifique su configuración en el Centro de Control de Mageia."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4866,15 +4866,15 @@ msgstr "Configuración del cortafuegos"
 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 ""
 "Configurador de drakfirewall\n"
 "\n"
-"Esto configura un cortafuegos personal para esta máquina Mandriva Linux.\n"
+"Esto configura un cortafuegos personal para esta máquina Mageia.\n"
 "Para una solución potente de cortafuegos dedicada, por favor eche un vistazo\n"
-"a la distribución especializada Mandriva Security Firewall."
+"a la distribución especializada Mageia Security Firewall."
 
 #: ../lib/network/drakfirewall.pm:230
 #, c-format
@@ -5988,7 +5988,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"
@@ -5998,7 +5998,7 @@ msgstr ""
 "Debería seleccionar todas las interfaces conectadas a la Internet,\n"
 "a la vez que deseleccionar todas aquellas conectadas a la red local.\n"
 "\n"
-"Si pretende utilizar la compartición de Conexión a Internet de Mandriva,\n"
+"Si pretende utilizar la compartición de Conexión a Internet de Mageia,\n"
 "deseleccione las interfaces que estarán conectadas a la red local.\n"
 "¿Qué interfaces se deberían proteger?\n"
 
@@ -6033,7 +6033,7 @@ msgstr "Se necesitan algunos componentes (%s), pero no están disponibles para e
 msgid "Some packages (%s) are required but aren't available."
 msgstr "Se necesitan algunos paquetes (%s), pero no están disponibles."
 
-#. -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