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

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r396 | dmorgan | 2011-02-03 17:46:13 +0000 (Thu, 03 Feb 2011) | 1 line

Import cleaned userdrake2
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- License: GPLv2 according to the COPYING file
- Icons: icons in ./icons and /pixmaps replaced by Oxygen icons

1 files changed, 6 insertions, 6 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b422f84..8ae0e5c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -111,8 +111,8 @@ msgstr "正在装入用户和组... 请稍候"
 
 #: ../userdrake:83
 #, c-format
-msgid "Mandriva Linux Users Management Tool"
-msgstr "Mandriva Linux 用户管理工具"
+msgid "Mageia Users Management Tool"
+msgstr "Mageia 用户管理工具"
 
 #: ../userdrake:96
 #, c-format
@@ -420,9 +420,9 @@ msgstr "迁移向导"
 #, c-format
 msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
-"and settings in your Mandriva Linux distribution?"
+"and settings in your Mageia distribution?"
 msgstr ""
-"您是否想要运行迁移向导将 Windows 文档和设置导入到您的 Mandriva Linux 发行版"
+"您是否想要运行迁移向导将 Windows 文档和设置导入到您的 Mageia 发行版"
 "中？"
 
 #: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
@@ -717,8 +717,8 @@ msgstr "用户管理"
 
 #: ../userdrake:1282
 #, 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>")
 #: ../userdrake:1288