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/zh_TW.po b/po/zh_TW.po
index 76267ec..7a4da3b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -177,10 +177,10 @@ msgstr "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 ""
 "此網路介面尚未設定。\n"
-"請從 Mandriva Linux 控制中心執行「%s」"
+"請從 Mageia 控制中心執行「%s」"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:104
 #, c-format
@@ -224,7 +224,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 ""
 "您目前正要設定讓您的電腦分享它的 Internet 連線。\n"
@@ -459,7 +459,7 @@ 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 ""
 
@@ -1481,8 +1481,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
@@ -1491,8 +1491,8 @@ msgstr "這是一個用來管理 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
@@ -2118,10 +2118,10 @@ msgstr "網路已經由介面 %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 ""
 "您沒有任何已設定好的網路連線。\n"
-"請由 Mandriva Linux 控制中心啟動 \"%s\" 設定精靈"
+"請由 Mageia 控制中心啟動 \"%s\" 設定精靈"
 
 #: ../bin/net_applet:106 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2312,10 +2312,10 @@ msgstr "連線完成。"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandriva Linux Control Center."
+"Verify your configuration in the Mageia Control Center."
 msgstr ""
 "連線失敗。\n"
-"請檢查您在 Mandriva Linux 控制中心的設定。"
+"請檢查您在 Mageia 控制中心的設定。"
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -4658,14 +4658,14 @@ msgstr "防火牆組態設定"
 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 設定程式\n"
 "\n"
-"這是用來設定 Mandriva Linux 個人防火牆的程式。\n"
-"若您需要強大而專門的防火牆解決方案，請參考專門的 Mandriva Security\n"
+"這是用來設定 Mageia 個人防火牆的程式。\n"
+"若您需要強大而專門的防火牆解決方案，請參考專門的 Mageia Security\n"
 "Firewall 產品。"
 
 #: ../lib/network/drakfirewall.pm:230
@@ -5786,7 +5786,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"
@@ -5796,7 +5796,7 @@ msgstr ""
 " 所有直接連結到網際網路的界面都應該要選取，\n"
 " 而連結到本地端網路的界面則可以不要選取。\n"
 " \n"
-" 如果您想要使用 Mandriva Internet Connection 分享連線，\n"
+" 如果您想要使用 Mageia Internet Connection 分享連線，\n"
 " 請不要選取連結到區域網路的網路介面。 \n"
 " \n"
 " 哪些界面應該要被保護呢？\n"
@@ -5831,7 +5831,7 @@ msgstr ""
 msgid "Some packages (%s) are required but aren't available."
 msgstr "需要某些套件 (%s) 卻無法使用。"
 
-#. -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