Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r433 | dmorgan | 2011-02-06 02:16:32 +0000 (Sun, 06 Feb 2011) | 1 line

Import cleaned control-center
------------------------------------------------------------------------

1 files changed, 20 insertions, 11 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 21fdbf74..e52d4035 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-26 17:42+0200\n"
+"POT-Creation-Date: 2011-02-06 01:19+0100\n"
 "PO-Revision-Date: 2009-04-09 13:11+0800\n"
 "Last-Translator: Funda Wang <fundawang@gmail.com>\n"
 "Language-Team: %s i18n Team <cooker-i18n@mandrivalinux.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -532,8 +533,8 @@ msgstr "以及许多不知名的 beta 测试者和 bug 报告者，帮助了这�
 
 #: ../control-center:90
 #, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
+msgid "Mageia"
+msgstr ""
 
 #: ../control-center:100 ../control-center:105
 #, c-format
@@ -1152,8 +1153,8 @@ msgstr "fundawang@gmail.com,shiyutang_i18n@yahoo.com.cn"
 msgid "Translator: "
 msgstr "翻译者："
 
-#. -PO: Here, first %s will be replaced by 'Mandriva Linux'
-#. -PO: second %s will be replaced by the version (eg: "Mandriva Linux 2007.1 (Discovery) Control Center")
+#. -PO: Here, first %s will be replaced by 'Mageia'
+#. -PO: second %s will be replaced by the version (eg: "Mageia 1 (Free) Control Center")
 #: ../control-center:1483
 #, c-format
 msgid "%s %s (%s) Control Center"
@@ -1165,14 +1166,19 @@ msgstr "%s %s (%s) 控制中心"
 msgid "Copyright (C) %s Mandriva SA"
 msgstr "Mandriva SA 版权所有 (C) %s"
 
+#: ../control-center:1488
+#, fuzzy, c-format
+msgid "Copyright (C) %s Mageia"
+msgstr "Mandriva SA 版权所有 (C) %s"
+
 #: ../control-center:1494
 #, c-format
 msgid "Authors"
 msgstr "作者"
 
 #: ../control-center:1495
-#, c-format
-msgid "Mandriva Linux Contributors"
+#, fuzzy, c-format
+msgid "Mageia Contributors"
 msgstr "Mandriva Linux 贡献者"
 
 #: ../drakconsole:27
@@ -1468,14 +1474,14 @@ msgid "Manage installed software packages on a group of computers"
 msgstr "在一组计算机上管理已安装的软件包"
 
 #: ../lib/MDV/Control_Center.pm:349
-#, c-format
-msgid "Configure authentication for Mandriva tools"
+#, fuzzy, c-format
+msgid "Configure authentication for Mageia tools"
 msgstr "配置 Mandriva 工具的身份验证"
 
 #: ../lib/MDV/Control_Center.pm:350
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Define authentication required to access individual Mandriva configuration "
+"Define authentication required to access individual Mageia configuration "
 "tools "
 msgstr "定义访问单个 Mandriva 配置工具所需的身份验证"
 
@@ -1912,3 +1918,6 @@ msgstr "屏幕分辨率"
 #: ../drakconf.desktop.in.h:1
 msgid "Configure Your Computer"
 msgstr "配置您的计算机"
+
+#~ msgid "Mandriva Linux"
+#~ msgstr "Mandriva Linux"