- move translations from desktop file into po files

- add GenericName

1 files changed, 83 insertions, 71 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fb61be8..b0a8522 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: http://bugs.mageia.org\n"
-"POT-Creation-Date: 2015-05-09 11:37+0200\n"
+"POT-Creation-Date: 2015-09-04 14:48+0300\n"
 "PO-Revision-Date: 2015-01-20 08:42+0000\n"
 "Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/"
@@ -22,39 +22,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:68
+#: ../usr/share/mageiawelcome/mageiawelcome.py:70
 msgid "Welcome to Mageia!"
 msgstr "欢迎来到Mageial！"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:69
+#: ../usr/share/mageiawelcome/mageiawelcome.py:71
 msgid "Show this window at startup"
 msgstr "在启动时显示该窗口"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:70
+#: ../usr/share/mageiawelcome/mageiawelcome.py:72
 msgid "Close"
 msgstr "关闭"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:73
+#: ../usr/share/mageiawelcome/mageiawelcome.py:75
 msgid "kernel:"
 msgstr "内核："
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:75
+#: ../usr/share/mageiawelcome/mageiawelcome.py:77
 msgid "arch:"
 msgstr "架构："
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:77
+#: ../usr/share/mageiawelcome/mageiawelcome.py:79
 msgid "Desktop:"
 msgstr "桌面（环境）："
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:79
+#: ../usr/share/mageiawelcome/mageiawelcome.py:81
 msgid "Welcome"
 msgstr "欢迎～"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:80
+#: ../usr/share/mageiawelcome/mageiawelcome.py:82
 msgid "Welcome<!--user//-->"
 msgstr "欢迎 <!--用户//--> "
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:82
+#: ../usr/share/mageiawelcome/mageiawelcome.py:84
 msgid ""
 "<p>Thank you for choosing Mageia!</p><p>We have put in a lot of effort to "
 "provide you with the best possible system. We hope you will have a good "
@@ -70,138 +70,138 @@ msgstr ""
 "href='http://www.mageia.org/en/contribute/'>点这里</a>。</p><p>别忘了告诉你的"
 "碰你正在用 Mageia 哦～</p>"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:83
+#: ../usr/share/mageiawelcome/mageiawelcome.py:85
 msgid "Mageia Control Center"
 msgstr "Mageia 控制中心"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:84
+#: ../usr/share/mageiawelcome/mageiawelcome.py:86
 msgid "Configure media sources and update system"
 msgstr "配置媒介源并更新系统"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:85
+#: ../usr/share/mageiawelcome/mageiawelcome.py:87
 msgid "Install and remove software"
 msgstr "添加/删除 软件"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:86
+#: ../usr/share/mageiawelcome/mageiawelcome.py:88
 msgid "Documentation"
 msgstr "文档"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:87
+#: ../usr/share/mageiawelcome/mageiawelcome.py:89
 msgid "New Features"
 msgstr "新特性"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:88
+#: ../usr/share/mageiawelcome/mageiawelcome.py:90
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:89
+#: ../usr/share/mageiawelcome/mageiawelcome.py:91
 msgid "Errata"
 msgstr "勘误表"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:90
+#: ../usr/share/mageiawelcome/mageiawelcome.py:92
 msgid "Newcomers Howto"
 msgstr "新手指南"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:91
+#: ../usr/share/mageiawelcome/mageiawelcome.py:93
 msgid "Support"
 msgstr "支持"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:92
+#: ../usr/share/mageiawelcome/mageiawelcome.py:94
 msgid "Forums"
 msgstr "论坛"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:93
+#: ../usr/share/mageiawelcome/mageiawelcome.py:95
 msgid "Wiki"
 msgstr "维基"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:94
+#: ../usr/share/mageiawelcome/mageiawelcome.py:96
 msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:95
+#: ../usr/share/mageiawelcome/mageiawelcome.py:97
 msgid "Bugzilla"
 msgstr "Bugzilla 漏洞追踪"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:96
+#: ../usr/share/mageiawelcome/mageiawelcome.py:98
 msgid "Community"
 msgstr "社区"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:97
+#: ../usr/share/mageiawelcome/mageiawelcome.py:99
 msgid "Community Center"
 msgstr "社区中心"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:98
+#: ../usr/share/mageiawelcome/mageiawelcome.py:100
 msgid "Contribute"
 msgstr "贡献"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:99
+#: ../usr/share/mageiawelcome/mageiawelcome.py:101
 msgid "Donations"
 msgstr "捐赠"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:100
+#: ../usr/share/mageiawelcome/mageiawelcome.py:102
 msgid "Join us!"
 msgstr "加入我们～"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:101
+#: ../usr/share/mageiawelcome/mageiawelcome.py:103
 msgid ""
 "Mageia Control Center (aka drakconf) is a set of tools to help you configure "
 "your system"
 msgstr "Mageia 控制中心 (drakconf) 是一系列帮助您配置系统的工具"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:102
+#: ../usr/share/mageiawelcome/mageiawelcome.py:104
 msgid "Software Management"
 msgstr "软件管理"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:103
+#: ../usr/share/mageiawelcome/mageiawelcome.py:105
 msgid "Online administration"
 msgstr "在线管理"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:104
+#: ../usr/share/mageiawelcome/mageiawelcome.py:106
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:105
+#: ../usr/share/mageiawelcome/mageiawelcome.py:107
 msgid "Network & Internet"
 msgstr "网络"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:106
-#: ../usr/share/mageiawelcome/mageiawelcome.py:136
+#: ../usr/share/mageiawelcome/mageiawelcome.py:108
+#: ../usr/share/mageiawelcome/mageiawelcome.py:138
 msgid "System"
 msgstr "系统"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:107
+#: ../usr/share/mageiawelcome/mageiawelcome.py:109
 msgid "Network Sharing"
 msgstr "网络共享"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:108
+#: ../usr/share/mageiawelcome/mageiawelcome.py:110
 msgid "Local Disks"
 msgstr "本地磁盘"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:109
+#: ../usr/share/mageiawelcome/mageiawelcome.py:111
 msgid "Security"
 msgstr "安全"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:110
+#: ../usr/share/mageiawelcome/mageiawelcome.py:112
 msgid "Boot"
 msgstr "引导"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:111
+#: ../usr/share/mageiawelcome/mageiawelcome.py:113
 msgid "Administrator password is needed"
 msgstr "需要管理员密码"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:112
+#: ../usr/share/mageiawelcome/mageiawelcome.py:114
 msgid "User password is needed"
 msgstr "需要用户密码"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:113
+#: ../usr/share/mageiawelcome/mageiawelcome.py:115
 msgid "Configure media sources ..."
 msgstr "正在配置媒介源。。。"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:114
+#: ../usr/share/mageiawelcome/mageiawelcome.py:116
 msgid "Mageia official repositories contain:"
 msgstr "Mageia 官方内容库"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:115
+#: ../usr/share/mageiawelcome/mageiawelcome.py:117
 msgid ""
 "<span class='label green'>core</span> - the free-open-source packages, i.e. "
 "software licensed under a free-open-source license"
@@ -209,7 +209,7 @@ msgstr ""
 "<span class='label green'>核心</span> 开放源软件包。例如：基于开放源代码许可"
 "证的软件"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:116
+#: ../usr/share/mageiawelcome/mageiawelcome.py:118
 msgid ""
 "<span class='label red'>non-free</span> - some programs which are not free, "
 "or closed source. For example this repository includes Nvidia and ATI "
@@ -218,7 +218,7 @@ msgstr ""
 "<span class='label red'>非自由软件</span> 一些不免费或闭源软件。例如软件仓库"
 "内的Nvidia和ATI的显卡专有驱动，固件以及不同的WiFi硬件驱动。"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:117
+#: ../usr/share/mageiawelcome/mageiawelcome.py:119
 msgid ""
 "<span class='label red'>tainted</span> - includes packages released under a "
 "free license. However, they may infringe on patents and copyright laws in "
@@ -229,27 +229,27 @@ msgstr ""
 "某些国家它们可能会侵犯专利权和版权法，例如播放很多音视频文件所需的多媒体解码"
 "器； 播放商业视频DVD的软件包，等等。 "
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:118
+#: ../usr/share/mageiawelcome/mageiawelcome.py:120
 msgid "<strong>Note!</strong> non-free and tainted are not enabled by default."
 msgstr "<strong>注意！</strong> non-free 和 tainted 默认不开启。"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:119
+#: ../usr/share/mageiawelcome/mageiawelcome.py:121
 msgid "Edit software sources"
 msgstr "编辑软件源"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:120
+#: ../usr/share/mageiawelcome/mageiawelcome.py:122
 msgid "... and update system"
 msgstr "...以及更新系统"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:121
+#: ../usr/share/mageiawelcome/mageiawelcome.py:123
 msgid "Check system updates"
 msgstr "检查系统更新"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:122
+#: ../usr/share/mageiawelcome/mageiawelcome.py:124
 msgid "GUI - RPMDrake"
 msgstr "图形用户界面- RPMDrake"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:123
+#: ../usr/share/mageiawelcome/mageiawelcome.py:125
 msgid ""
 "<span class='label green'>Rpmdrake</span> is a program for installing, "
 "uninstalling and updating packages. It is the graphical user interface of "
@@ -258,79 +258,79 @@ msgstr ""
 "<span class='label green'>Rpmdrake</span>是一个安装、卸载、更新软件包的程序。"
 "它是<span class='label green'>urpmi</span>的图形界面。"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:124
+#: ../usr/share/mageiawelcome/mageiawelcome.py:126
 msgid "read more (wiki)"
 msgstr "了解更多 (wiki)"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:125
+#: ../usr/share/mageiawelcome/mageiawelcome.py:127
 msgid "RPMdrake"
 msgstr "RPMdrake"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:126
+#: ../usr/share/mageiawelcome/mageiawelcome.py:128
 msgid "URPMI - from command line"
 msgstr "URPMI - 使用命令行"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:127
+#: ../usr/share/mageiawelcome/mageiawelcome.py:129
 msgid "Terminal"
 msgstr "终端"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:128
+#: ../usr/share/mageiawelcome/mageiawelcome.py:130
 msgid "This is just small selection of popular packages, for more run"
 msgstr "这仅仅是一个关于流行软件包的小节，要了解更多信息请运行"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:129
+#: ../usr/share/mageiawelcome/mageiawelcome.py:131
 msgid "Featured"
 msgstr "特征"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:130
+#: ../usr/share/mageiawelcome/mageiawelcome.py:132
 msgid "Games"
 msgstr "游戏"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:131
+#: ../usr/share/mageiawelcome/mageiawelcome.py:133
 msgid "Internet"
 msgstr "互联网"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:132
+#: ../usr/share/mageiawelcome/mageiawelcome.py:134
 msgid "Video"
 msgstr "视频"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:133
+#: ../usr/share/mageiawelcome/mageiawelcome.py:135
 msgid "Audio"
 msgstr "音频"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:134
+#: ../usr/share/mageiawelcome/mageiawelcome.py:136
 msgid "Office"
 msgstr "办公"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:135
+#: ../usr/share/mageiawelcome/mageiawelcome.py:137
 msgid "Graphics"
 msgstr "图形"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:137
+#: ../usr/share/mageiawelcome/mageiawelcome.py:139
 msgid "Programming"
 msgstr "开发"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:138
+#: ../usr/share/mageiawelcome/mageiawelcome.py:140
 msgid "Selected packages:"
 msgstr "选择包"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:139
+#: ../usr/share/mageiawelcome/mageiawelcome.py:141
 msgid "Install selected"
 msgstr "安装所选内容"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:140
+#: ../usr/share/mageiawelcome/mageiawelcome.py:142
 msgid "You can always launch MageiaWelcome from menu"
 msgstr "您可以从菜单启动Mageia欢迎中心"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:142
+#: ../usr/share/mageiawelcome/mageiawelcome.py:144
 msgid "Applications"
 msgstr "应用程序"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:145
+#: ../usr/share/mageiawelcome/mageiawelcome.py:147
 msgid "Be sure you have enabled <a>online repositories</a>"
 msgstr "请确保已打开 <a>在线源</a>"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:157
+#: ../usr/share/mageiawelcome/mageiawelcome.py:159
 msgid "About"
 msgstr "关于"
 
@@ -341,3 +341,15 @@ msgstr "安装"
 #: ../usr/share/mageiawelcome/helpers.py:11
 msgid "Launch"
 msgstr "运行"
+
+#: ../usr/share/applications/mageiawelcome.desktop.in:1
+msgid "Mageia Welcome"
+msgstr ""
+
+#: ../usr/share/applications/mageiawelcome.desktop.in:2
+msgid "Mageia Welcome Screen"
+msgstr ""
+
+#: ../usr/share/applications/mageiawelcome.desktop.in:3
+msgid "Welcome screen for Mageia, that is displayed upon first users boot"
+msgstr ""