traditional Chinese translation by vim xiang

2 files changed, 90 insertions, 114 deletions

diff --git a/langs/zh-cn/donate.zh-cn.lang b/langs/zh-cn/donate.zh-cn.lang
index c2b4ffeab..79fb8b732 100644
--- a/langs/zh-cn/donate.zh-cn.lang
+++ b/langs/zh-cn/donate.zh-cn.lang
@@ -1,154 +1,153 @@
-# Generated by extract2lang.php on 2012-12-21T15:09:11+01:00
+# Generated by extract2lang.php on 2013-05-26T14:08:50+02:00
 # Domain donate
+# include translation strings from:
+# en/donate/index.php
 
-# ../../svn/web/en/donate/index.php +10
+# en/donate/index.php +10
 ;Donate to Mageia
 捐助 Mageia
 
 
-# ../../svn/web/en/donate/index.php +12
+# en/donate/index.php +12
 ;mageia, donate, donation, donors, help
-mageia, donate, donation, donors, help, 捐赠, 帮助
+mageia, donate, donation, donors, help {ok}
 
 
-# ../../svn/web/en/donate/index.php +31
+# en/donate/index.php +31
 ;Donate via PayPal,
 通过 PayPal 捐助，
 
 
-# ../../svn/web/en/donate/index.php +34
+# en/donate/index.php +34
 ;via bitcoin,
 通过比特币，
 
-# ../../svn/web/en/donate/index.php +35
+
+# en/donate/index.php +35
 ;If you want to donate <a href="http://bitcoin.org/">bitcoins</a>, the Mageia.Org bitcoin address is <b>%s</b>.
-如果您想捐助 <a href="http://bitcoin.org/">比特币</a>，请牢记 Mageia.Org 比特币地址为 <b>%s</b>。
+如果您想捐助 <a href="http://bitcoin.org/">比特币</a>,，请牢记 Mageia.Org 比特币地址为 <b>%s</b>。
 
 
-# ../../svn/web/en/donate/index.php +37
+# en/donate/index.php +37
 ;via bank transfer,
 通过银行转账，
 
 
-# ../../svn/web/en/donate/index.php +38
+# en/donate/index.php +38
 ;using the following Bank Identifier Code (IBAN-BIC):
 使用下列银行识别码 (IBAN-BIC)：
 
 
-# ../../svn/web/en/donate/index.php +40
+# en/donate/index.php +40
 ;In favor of:
-In favor of:
+In favor of: {ok}
 
 
-# ../../svn/web/en/donate/index.php +45
+# en/donate/index.php +45
 ;Bank Account:
-Bank Account:
+Bank Account: {ok}
 
 
-# ../../svn/web/en/donate/index.php +51
+# en/donate/index.php +51
 ;or via check (&euro; only).
 或通过支票 (仅 &euro;)。
 
 
-# ../../svn/web/en/donate/index.php +52
+# en/donate/index.php +52
 ;You can send your donation by check to this address:
 您可以将支票邮寄到该地址：
 
 
-# ../../svn/web/en/donate/index.php +55
+# en/donate/index.php +56
 ;Use "Mageia.Org" in the "Pay to the order of..." line.
-Use "Mageia.Org" in the "Pay to the order of..." line.
+在 "Pay to the order of..." 栏填入 "Mageia.Org"
 
 
-# ../../svn/web/en/donate/index.php +59
+# en/donate/index.php +59
 ;Please note that:
 请注意：
 
 
-# ../../svn/web/en/donate/index.php +61
+# en/donate/index.php +61
 ;Paypal withdraws a small commission for each donation (around 2%) so we get a little bit less than you send;
-Paypal 会对每笔捐赠抽取一定佣金(每笔大约 2%) 所以我们收到的比您捐赠的少一点；
+Paypal 会对每笔捐赠收取一点手续费(每笔大约 2%)所以我们收到的比您捐赠的要少一点；
 
 
-# ../../svn/web/en/donate/index.php +62
+# en/donate/index.php +62
 ;conversion rates are charged to Mageia, so please use &euro; as currency;
-货币兑换需对 Mageia 收费，请使用 &euro;  作为货币支付单位；
+货币兑换需对 Mageia 收费，所以请使用 &euro;  货币支付；
 
 
-# ../../svn/web/en/donate/index.php +63
+# en/donate/index.php +63
 ;if you want to do an anonymous donation, please add a comment or send an email to %s.
-if you want to do an anonymous donation, please add a comment or send an email to %s.
-
+如果您想要匿名捐赠，请添加备注或者发送 email 到 %s.
 
-# ../../svn/web/en/donate/index.php +63
-;if you want to do an anonymous donation, please add a comment.
-如果您想要匿名捐赠，请添加备注。
 
-
-# ../../svn/web/en/donate/index.php +69
+# en/donate/index.php +69
 ;Why donate?
 为何捐助？
 
 
-# ../../svn/web/en/donate/index.php +70
+# en/donate/index.php +70
 ;Mageia.Org is a not-for-profit association to manage the Mageia distribution. As a not-for-profit association, it can receive donations from the community to help in a lot of differents fields:
-Mageia.Org 是管理 Mageia 发行版本的非盈利组织。作为一个非盈利性组织，它可以接受来自社区各个方面的捐助：
+Mageia.Org 是管理 Mageia 发行版的非盈利组织。作为一个非盈利性组织，它可以接受来自社区各个方面的捐助：
 
 
-# ../../svn/web/en/donate/index.php +73
+# en/donate/index.php +72
 ;hardware and hosting for servers;
-硬件和服务器；
+服务器硬件和托管；
 
 
-# ../../svn/web/en/donate/index.php +73
+# en/donate/index.php +73
 ;domain names;
 域名；
 
 
-# ../../svn/web/en/donate/index.php +74
+# en/donate/index.php +74
 ;registrations of Mageia trademark;
 Mageia 商标注册；
 
 
-# ../../svn/web/en/donate/index.php +75
+# en/donate/index.php +75
 ;goodies for spreading Mageia;
-推广 Mageia 的小玩意；
+用于推广 Mageia 的小玩意；
 
 
-# ../../svn/web/en/donate/index.php +76
+# en/donate/index.php +76
 ;administrative expenses;
-管理费用；
+行政支出；
 
 
-# ../../svn/web/en/donate/index.php +77
+# en/donate/index.php +77
 ;eventually, legal counsel and
 法律咨询与顾问
 
 
-# ../../svn/web/en/donate/index.php +78
+# en/donate/index.php +78
 ;etc.
 等等。
 
 
-# ../../svn/web/en/donate/index.php +82
+# en/donate/index.php +82
 ;How to track donation?
 如何跟踪捐助？
 
 
-# ../../svn/web/en/donate/index.php +83
+# en/donate/index.php +83
 ;Currently, we received a lot of generous donations (%s, remains %s) thanks to all of our <a href="../thank-you/">donors</a>!
-当前，我们已经收到大量捐助(共计 %s, 余 %s)，在此感谢我们的 <a href="../thank-you/">捐助者</a>！
+如今，我们已经收到大量大方的捐助 (%s, 余额 %s) 在此感谢我们的 <a href="../thank-you/">捐助者</a>！
 
 
-# ../../svn/web/en/donate/index.php +85
+# en/donate/index.php +85
 ;We believe public accountability is crucial. You can know more about how are used the funds received by reading our <a href="%s">financial reports</a>.
-我们相信公共问责是很重要的。您可以阅读我们的<a href="%s">财政报告</a>来了解我们收到的基金。
+我们相信公众问责是很重要的。您可以阅读我们的 <a href="%s">财政报告</a>来了解我们收入基金的支出情况。
+
 
-# ../../svn/web/en/donate/index.php +107
+# en/donate/index.php +107
 ;Questions?
 还有问题？
 
 
-# ../../svn/web/en/donate/index.php +108
+# en/donate/index.php +108
 ;If you have any question about donations, you can send an email to <a href="mailto:treasurer@mageia.org">treasurer@mageia.org</a>.
-如果您还有关于捐助的任何问题，请致电 <a href="mailto:treasurer@mageia.org">treasurer@mageia.org</a>。
+如果您还有关于捐助的任何问题，请发送 email 到 <a href="mailto:treasurer@mageia.org">treasurer@mageia.org</a>。
diff --git a/langs/zh-cn/index.zh-cn.lang b/langs/zh-cn/index.zh-cn.lang
index 0e44dfdd7..474c38c80 100644
--- a/langs/zh-cn/index.zh-cn.lang
+++ b/langs/zh-cn/index.zh-cn.lang
@@ -1,147 +1,124 @@
-# Generated by extract2lang.php on 2012-05-23T17:09:49+02:00
+# Generated by extract2lang.php on 2013-12-15T17:56:31+00:00
 # Domain index
+# include translation strings from:
+# en/index.php
 
-# /en/index.php +10
+# en/index.php +10
 ;For PC
 用于个人电脑
 
 
-# /en/index.php +11
+# en/index.php +11
 ;For server
 用于服务器
 
 
-# /en/index.php +12
+# en/index.php +12
 ;Support
 支持
 
 
-# /en/index.php +13
+# en/index.php +13
 ;Community
 社区
 
 
-# /en/index.php +14
+# en/index.php +14
 ;About&nbsp;Mageia.Org
 关于 &nbsp;Mageia.Org
 
 
-# /en/index.php +22
+# en/index.php +22
 ;Home of the Mageia project
 Mageia 项目首页
 
 
-# /en/index.php +23
+# en/index.php +23
 ;Mageia is a community-based Linux distribution, for desktop & server.
 Mageia 是基于社区的 Linux 发行版，适用于桌面和服务器。
 
 
-# /en/index.php +24
+# en/index.php +24
 ;linux, mageia, free software, operating system, computer, laptop, desktop, server, headless, device, mobile, mandriva, mandrake
-linux, mageia, free software, operating system, computer, laptop, desktop, server, headless, device, mobile, mandriva, mandrake
+linux, mageia, free software, operating system, computer, laptop, desktop, server, headless, device, mobile, mandriva, mandrake {ok}
 
 
-# /en/index.php +31
+# en/index.php +31
 ;Mageia Blog (English)
-Mageia 博客(英语)
+Mageia 博客(English)
 
 
-# /en/index.php +31
+# en/index.php +31
 ;https://blog.mageia.org/en/?feed=rss
-https://blog.mageia.org/en/?feed=rss
+https://blog.mageia.org/en/?feed=rss {ok}
 
 
-# /en/index.php +217
+# en/index.php +220
 ;Mageia, a free, community-based Linux distribution for desktop & server.
-Mageia, a free, community-based Linux distribution for desktop & server.
+Mageia,自由、基于社区的 Linux 发行版，适用于桌面和服务器。
 
 
-# /en/index.php +223
+# en/index.php +226
 ;Change your perspective
 颠覆你的视野
 
 
-# /en/index.php +225
+# en/index.php +228
 ;Stable, secure operating system for desktop &amp; server
 无论桌面还是服务器使用，都是可靠安全的操作系统
 
 
-# /en/index.php +226
+# en/index.php +229
 ;Free Software, coproduced by hundreds of people
 万众一心打造的自由软件
 
 
-# /en/index.php +227
+# en/index.php +230
 ;Elected governance, nonprofit organization
 选举自治的非盈利机构
 
 
-# /en/index.php +228
+# en/index.php +231
 ;You can be part of it
-您也可以成为其中一份子
+您也可以成为其中一员
 
 
-# /en/index.php +236
+# en/index.php +239
 ;Free Download
 免费下载
 
 
-# /en/index.php +237
-;version 2 (May 2012)
-版本 2 (2012年5月)
-
-
+# en/index.php +240
 ;version 3 (May 2013)
 版本 3 (2013年5月)
 
 
-# /en/index.php +240
-;Release notes
-版本通告
-
-
-
-
-
-# /en/index.php +240
-;https://wiki.mageia.org/en/Mageia_2_Release_Notes
-https://wiki.mageia.org/en/Mageia_2_Release_Notes
-
-
-# /en/index.php +241
-;https://wiki.mageia.org/en/Mageia_2_Errata
-https://wiki.mageia.org/en/Mageia_2_Errata
+# en/index.php +243
+;<a href="%s" hreflang="en">Release notes</a>
+<a href="%s" hreflang="en">发行注记</a>
 
 
-# /en/index.php +241
-;errata
-errata
+# en/index.php +244
+;<a href="%s" hreflang="en">errata</a>
+<a href="%s" hreflang="en">errata</a> {ok}
 
 
-# /en/index.php +244
+# en/index.php +247
 ;<strong>Get involved</strong> in the next version
-<strong>融入</strong>下一版本
+<strong>融入</strong> 下一版本
 
 
-# /en/index.php +248
-;Test Mageia 3%s
-测试 Mageia 3%s
+# en/index.php +249
+;Test
+测试
 
 
-# /en/index.php +265
+# en/index.php +266
 ;Sitemap
 网站地图
 
 
-# /en/index.php +266
+# en/index.php +267
 ;Privacy policy
 隐私策略
-
-;<a href="%s" hreflang="en">Release notes</a>
-<a href="%s" hreflang="en">版本通告</a>
-
-;<a href="%s" hreflang="en">errata</a>
-<a href="%s" hreflang="en">勘误表</a>
-
-;Mageia, a free, community-based Linux distribution for desktop & server.
-Mageia 是一款桌面和服务器均适用的基于社区的 Linux 发行版。
+