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

diff --git a/po/uz.po b/po/uz.po
index 5a7db54..f8a9843 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,6 +1,6 @@
 # translation of uz@cyrillic.po to Uzbek
 # Copyright (C) 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
-# Copyright (C) 2003 Mandriva.
+# Copyright (C) 2003 Mageia.
 #
 # Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004, 2006, 2007, 2008.
 # Nurali Abdurahmonov <mavnur@gmail.com>, 2009, 2010.
@@ -165,10 +165,10 @@ msgstr "DHCP klienti"
 #, 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 ""
 "Bu interfeys hali moslangani yoʻq.\n"
-"Mandriva Linux boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
+"Mageia boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -212,7 +212,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 ""
 "Siz ushbu kompyuter internet ulanishi boʻlishishga moslamoqchisiz.\n"
@@ -223,7 +223,7 @@ msgstr ""
 "tekshirib koʻring.\n"
 "\n"
 "Izoh: lokal tarmoqq ulanish uchun alohida tarmoq kartasi kerak boʻladi. "
-"Sozlashdan avval lokal tarmoqqa ulangan karta uchun oʻrnatilgan Mandriva "
+"Sozlashdan avval lokal tarmoqqa ulangan karta uchun oʻrnatilgan Mageia "
 "fayervolini oʻchiring."
 
 #: ../bin/drakgw:91
@@ -465,12 +465,12 @@ 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 ""
 "Tizimda lokal tarmoq uchun sozlangan tarmoq adapteri topilmadi.\n"
 "\n"
-"Iltimos uskunalarni sozlash vositasidan foydalanib uni sozlang va Mandriva "
+"Iltimos uskunalarni sozlash vositasidan foydalanib uni sozlang va Mageia "
 "fayervoli ushbu adapter uchun oʻchirilganligini tekshiring."
 
 #: ../bin/drakgw:316
@@ -1486,8 +1486,8 @@ msgstr "Draksambashare"
 
 #: ../bin/draksambashare:196
 #, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Copyright (C) %s by Mandriva"
+msgid "Copyright (C) %s by Mageia"
+msgstr "Copyright (C) %s by Mageia"
 
 #: ../bin/draksambashare:198
 #, c-format
@@ -1496,8 +1496,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
@@ -2118,10 +2118,10 @@ msgstr "Aloqa ishga tushmagan: %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 ""
 "Internet bilan aloqa moslanmagan.\n"
-"Mandriva Linux boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
+"Mageia boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2314,10 +2314,10 @@ msgstr "Aloqa oʻrnatildi."
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "Aloqa oʻrnatish muvaffaqiyatsiz tugadi.\n"
-"Moslamani Mandriva Linux boshqaruv markazida tekshiring."
+"Moslamani Mageia boshqaruv markazida tekshiring."
 
 #: ../bin/net_monitor:360
 #, fuzzy, c-format
@@ -4652,9 +4652,9 @@ msgstr "Fayervol moslamalari"
 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 ""
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5765,7 +5765,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"
@@ -5799,7 +5799,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