traditional Chinese translation by vim xiang

2 files changed, 144 insertions, 74 deletions

diff --git a/langs/zh-cn/about/media.zh-cn.lang b/langs/zh-cn/about/media.zh-cn.lang
index 67ebd66ab..9cb09d06d 100644
--- a/langs/zh-cn/about/media.zh-cn.lang
+++ b/langs/zh-cn/about/media.zh-cn.lang
@@ -1,77 +1,144 @@
- 
-# Generated by extract2lang.php on 2012-08-06T17:34:11+02:00
+# Generated by extract2lang.php on 2013-06-11T18:53:07+00:00
 # Domain about/media
+# include translation strings from:
+# en/about/media/index.php
 
-# ../../svn/web/en/about/media/index.php +13
+# en/about/media/index.php +12
 ;Mageia media files
 Mageia 媒体文件
 
 
-# ../../svn/web/en/about/media/index.php +22
+# en/about/media/index.php +21
 ;Media files
-Media 文件
-
-
-# ../../svn/web/en/about/media/index.php +26
-;Logo
-标志
+媒体文件
 
 
 # en/about/media/index.php +25
 ;Official Logo
-Official Logo
+官方徽标
 
 
 # en/about/media/index.php +28
 ;Mageia 2013
-Mageia 2013
+Mageia 2013 {ok}
 
 
-# ../../svn/web/en/about/media/index.php +31
+# en/about/media/index.php +29
 ;Mageia 2013 dark
-Mageia 2013 dark
+Mageia 2013 dark {ok}
 
 
-# ../../svn/web/en/about/media/index.php +32
+# en/about/media/index.php +30
 ;Mageia 2013 alpha
-Mageia 2013 alpha
+Mageia 2013 alpha {ok}
 
 
-# ../../svn/web/en/about/media/index.php +41
+# en/about/media/index.php +39
 ;%sPNG</a> or %sSVG</a>
-%sPNG</a> 或 %sSVG</a>。
-
-
-# ../../svn/web/en/about/media/index.php +28
-;TODO: usage guidelines.
-待办：使用指南。
-
-
-# ../../svn/web/en/about/media/index.php +32
-;Mageia 1 CD/DVD cover
-Mageia 1 CD/DVD 封面
+%sPNG</a> 或 %sSVG</a>
 
 
 # en/about/media/index.php +46
 ;Previous Logo
-Previous Logo
+以前的 Logo 
+
+
+# en/about/media/index.php +48
+;Mageia 2011 logo
+Mageia 2011 logo {ok}
 
 
 # en/about/media/index.php +51
 ;Mageia 3 CD/DVD covers
-Mageia 3 CD/DVD covers
+Mageia 3 CD/DVD 封面
+
+
+# en/about/media/index.php +52
+;Mageia 3 plain CD/DVD
+Mageia 3 plain CD/DVD {ok}
+
+
+# en/about/media/index.php +53
+;Mageia 3 CD
+Mageia 3 CD {ok}
+
+
+# en/about/media/index.php +54
+;Mageia 3 DVD
+Mageia 3 DVD {ok}
+
+
+# en/about/media/index.php +55
+;Mageia 3 dualarch CD
+Mageia 3 dualarch CD {ok}
+
+
+# en/about/media/index.php +56
+;Mageia 3 32bit DVD
+Mageia 3 32bit DVD {ok}
+
+
+# en/about/media/index.php +57
+;Mageia 3 64bit DVD
+Mageia 3 64bit DVD {ok}
+
+
+# en/about/media/index.php +58
+;Mageia 3 32bit LiveCD Gnome
+Mageia 3 32bit LiveCD Gnome {ok}
+
+
+# en/about/media/index.php +59
+;Mageia 3 32bit LiveCD KDE
+Mageia 3 32bit LiveCD KDE {ok}
+
+
+# en/about/media/index.php +60
+;Mageia 3 32bit LiveDVD Gnome
+Mageia 3 32bit LiveDVD Gnome {ok}
+
+
+# en/about/media/index.php +61
+;Mageia 3 32bit LiveDVD KDE
+Mageia 3 32bit LiveDVD KDE {ok}
+
+
+# en/about/media/index.php +62
+;Mageia 3 64bit LiveDVD Gnome
+Mageia 3 64bit LiveDVD Gnome {ok}
+
+
+# en/about/media/index.php +63
+;Mageia 3 64bit LiveDVD KDE
+Mageia 3 64bit LiveDVD KDE {ok}
 
 
 # en/about/media/index.php +66
+;Mageia 3 CD/DVD cover dedicated to Eugeni with his black silhuete
+Mageia 3 CD/DVD 封面献给黑色轮廓的 Eugeni
+
+
+# en/about/media/index.php +67
+;Mageia 3 CD/DVD cover with watermark dedicated to Eugeni
+Mageia 3 CD/DVD 带有水印的封面献给 Eugeni
+
+
+# en/about/media/index.php +72
 ;Mageia 1 CD/DVD covers
-Mageia 1 CD/DVD covers
+Mageia 1 CD/DVD 封面
+
 
+# en/about/media/index.php +73
+;Mageia 1 CD/DVD
+Mageia 1 CD/DVD {ok}
 
-# en/about/media/index.php +70
+
+# en/about/media/index.php +76
 ;Licensed under CC-By-SA by Julie Guennegues.
-作者：Julie Guennegues，协议遵循 CC-By-SA。
+Licensed under CC-By-SA by Julie Guennegues. {ok}
 
 
-# ../../svn/web/en/about/media/index.php +40
+# en/about/media/index.php +80
 ;Please consult <a href="https://wiki.mageia.org/en/Artwork_team">artwork team</a> or <a href="https://wiki.mageia.org/en/Marcom_Team">marcom' team</a> if you have questions/concerns about using these files.
-如果您对使用这些文件还有问题/关切，请咨询 <a href="https://wiki.mageia.org/en/Artwork_team">设计团队</a> 或 <a href="https://wiki.mageia.org/en/Marcom_Team">公关团队</a>。
\ No newline at end of file
+如果您对使用这些文件还有问题/关切，请咨询 <a href="https://wiki.mageia.org/en/Artwork_team">设计团队</a> or <a href="https://wiki.mageia.org/en/Marcom_Team"公关团队</a> 。
+
diff --git a/langs/zh-cn/downloads/get.zh-cn.lang b/langs/zh-cn/downloads/get.zh-cn.lang
index 62b3fe338..553cd8842 100644
--- a/langs/zh-cn/downloads/get.zh-cn.lang
+++ b/langs/zh-cn/downloads/get.zh-cn.lang
@@ -1,126 +1,129 @@
-# Generated by extract2lang.php on 2012-08-15T10:35:10+02:00
+# Generated by extract2lang.php on 2013-08-01T19:52:28+00:00
 # Domain downloads/get
+# include translation strings from:
+# en/downloads/get/index.php
 
-# ../../svn/web/en/downloads/get/index.php +94
+# en/downloads/get/index.php +113
 ;This <a href="%s">%s</a> download mirror is located in %s (%s).
-<a href="%s">%s</a> 下载镜像位于  %s (%s)。
+下载镜像站点 <a href="%s">%s</a> 位于 %s (%s).
 
 
-# ../../svn/web/en/downloads/get/index.php +99
+# en/downloads/get/index.php +119
 ;If it does not work well for you, <a href="#om" id="other_mirrors_btn">check out these other mirrors</a>.
-如果您使用起来有困难，可以<a href="#om" id="other_mirrors_btn">看看下面其它的镜像</a>。
+如果它不适合您,可以 <a href="#om" id="other_mirrors_btn">查看其他镜像站点</a>.
 
 
-# ../../svn/web/en/downloads/get/index.php +131
+# en/downloads/get/index.php +161
 ;Mageia Downloads
 Mageia 下载
 
 
-# ../../svn/web/en/downloads/get/index.php +141
+# en/downloads/get/index.php +173
 ;Download %s
 下载 %s
 
 
-# ../../svn/web/en/downloads/get/index.php +148
+# en/downloads/get/index.php +180
 ;Your download of %s should start within a few seconds
-下载 %s 即将于几秒钟之后开始。
+%s 下载即将于几秒钟之后开始。
 
 
-# ../../svn/web/en/downloads/get/index.php +149
+# en/downloads/get/index.php +181
 ;(download size is about %s).
 (下载大小约为 %s)。
 
 
-# ../../svn/web/en/downloads/get/index.php +150
+# en/downloads/get/index.php +182
 ;If the download does not start, <a href="%s" rel="nofollow" title="%s">click here</a>.
-如果下载不开始，<a href="%s" rel="nofollow" title="%s">请点击此处</a>。
+如果下载没有开始, <a href="%s" rel="nofollow" title="%s">请点击此处</a>。
 
 
-# ../../svn/web/en/downloads/get/index.php +159
+# en/downloads/get/index.php +192
 ;As soon as your download is complete, you should check that the signatures match:
 下载完成后，您应该检查签名是否匹配：
 
 
-# ../../svn/web/en/downloads/get/index.php +166
+# en/downloads/get/index.php +199
 ;If signatures do not match, <strong>DO NOT use this ISO</strong>. Double-check and try to download again.
 如果签名不匹配，<strong>请不要使用此 ISO</strong>。请再次检查然后重新下载。
 
 
-# ../../svn/web/en/downloads/get/index.php +169
+# en/downloads/get/index.php +205
 ;Your IP address is %s and you seem to be in %s, %s.
 您的 IP 是 %s，貌似是在 %s, %s。
 
 
-# ../../svn/web/en/downloads/get/index.php +175
+# en/downloads/get/index.php +213
 ;Country
 国家/地区
 
 
-# ../../svn/web/en/downloads/get/index.php +176
+# en/downloads/get/index.php +214
 ;City
 城市
 
 
-# ../../svn/web/en/downloads/get/index.php +177
+# en/downloads/get/index.php +215
 ;Download mirrors
 下载镜像
 
 
-# ../../svn/web/en/downloads/get/index.php +189
+# en/downloads/get/index.php +226
 ;The making and the distribution of Mageia worldwide is made possible by all the <a href="%s">people and organizations that mirror our software</a> and that <a href="%s">donate money, hardware, hosting and more</a>.
-Mageia 的全球发行源自<a href="%s">热心帮助我们软件</a>以及<a href="%s">捐赠款项或硬件施舍等资产</a>的人士和组织。
+所有 <a href="%s">做镜像站点</a>，<a href="%s">捐助资金、硬件以及托管等的人员和组织</a>使得 Mageia 的制作和全球发行得以实现。
 
 
-# ../../svn/web/en/downloads/get/index.php +190
+# en/downloads/get/index.php +227
 ;Want to help? %sJoin Us!%s
 想要帮忙？%s快加入我们！%s
 
 
-# ../../svn/web/en/downloads/get/index.php +196
+# en/downloads/get/index.php +232
 ;Sorry!
 抱歉！
 
 
-# ../../svn/web/en/downloads/get/index.php +197
+# en/downloads/get/index.php +233
 ;Your download could not complete, as we could not find this file. Please try again from the <a href="%s">main downloads page</a>.
-您的下载无法完成，我们找不到这个文件。请从<a href="%s">下载页面</a>再试一次。
+您的下载无法完成，因为我们找不到这个文件。请从<a href="%s">主下载页面</a>再试一次。
 
 
-# ../../svn/web/en/downloads/get/index.php +199
+# en/downloads/get/index.php +235
 ;If you still encounter this error and think IT SHOULD NOT HAPPEN &ndash; please tell us:
-如果您持续遇到此类您觉得不应该出现的错误，请告知我们：
+如果您持续遇到此类觉得不应该出现的错误，请告知我们：
 
 
-# ../../svn/web/en/downloads/get/index.php +201
+# en/downloads/get/index.php +237
 ;directly on <a href="irc://irc.freenode.net/#mageia-atelier">#mageia-atelier on Freenode IRC</a>,
-在 <a href="irc://irc.freenode.net/#mageia-atelier">Freenode IRC 的 #mageia-atelier</a> 上直接通报，
+在 <a href="irc://irc.freenode.net/#mageia-atelier">Freenode IRC 的 #mageia-atelier</a> 里直接上报，
 
 
-# ../../svn/web/en/downloads/get/index.php +202
+# en/downloads/get/index.php +238
 ;or <a href="https://twitter.com/mageia_org">via our Twitter account</a>,
-通过<a href="https://twitter.com/mageia_org">我们的 Twitter 账户</a>，
+或者<a href="https://twitter.com/mageia_org">通过我们的 Twitter 账户</a>，
 
 
-# ../../svn/web/en/downloads/get/index.php +203
+# en/downloads/get/index.php +239
 ;or with a <a href="https://ml.mageia.org/l/info/atelier-discuss">notice on the Atelier team mailing-list</a>,
-<a href="https://ml.mageia.org/l/info/atelier-discuss">通知 Web 团队的邮件列表</a>，
+或者<a href="https://ml.mageia.org/l/info/atelier-discuss">在 Atelier 团队的邮件列表上通知</a>，
 
 
-# ../../svn/web/en/downloads/get/index.php +204
+# en/downloads/get/index.php +240
 ;or a <a href="https://bugs.mageia.org/enter_bug.cgi?product=Websites&amp;format=guided&amp;component=www.mageia.org">bug report</a>.
 或者<a href="https://bugs.mageia.org/enter_bug.cgi?product=Websites&amp;format=guided&amp;component=www.mageia.org">提交错误报告</a>。
 
 
-# ../../svn/web/en/downloads/get/index.php +207
-;You may embed this debug info if you like:
-如果您需要的话，还可以附上以下调试信息：
+# en/downloads/get/index.php +243
+;Please copy and report us the above address that returned you to this page.
+请告知我们返回给你这个页面的地址。
 
 
-# ../../svn/web/en/downloads/get/index.php +209
+# en/downloads/get/index.php +243
 ;Thanks!
 感谢！
 
 
-# ../../svn/web/en/downloads/get/index.php +210
+# en/downloads/get/index.php +244
 ;back to that awesome Mageia home page
-回到 Mageia 首页
\ No newline at end of file
+回到 Mageia 首页
+