[tor-commits] [bridgedb/master] Update Chinese (zh_CN) translations.

[isis at torproject.org]

commit 4582f5da6decdd06ef3591993d0c59b95155cb7a
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Mar 20 03:43:42 2015 +0000

    Update Chinese (zh_CN) translations.
    
     * THANKS to Wu Ming Shi and YF.
    
    Note that only some changes were merged due to errors with missing
    format string specifiers.
---
 lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po |  121 ++++++++++++++---------
 1 file changed, 72 insertions(+), 49 deletions(-)

diff --git a/lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
index 79cd315..11bcc18 100644
--- a/lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/lib/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
 # Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
+# Copyright (C) 2015 'The Tor Project, Inc.'
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# Isis <isis at torproject.org>, 2014
 # Wu Ming Shi, 2013
 # Wu Ming Shi, 2013
 # Wu Ming Shi, 2013
@@ -11,14 +10,15 @@
 # hanl <iamh4n at gmail.com>, 2011
 # Meng3, 2014
 # leungsookfan <leung.sookfan at riseup.net>, 2014
-# Wu Ming Shi, 2014
+# Wu Ming Shi, 2014-2015
+# YF <yfdyh000 at gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-26 02:02+0000\n"
-"Last-Translator: Isis <isis at torproject.org>\n"
+"POT-Creation-Date: 2015-02-03 03:24+0000\n"
+"PO-Revision-Date: 2015-03-08 19:30+0000\n"
+"Last-Translator: Wu Ming Shi\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,17 +38,17 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: lib/bridgedb/HTTPServer.py:122
 msgid "Sorry! Something went wrong with your request."
-msgstr "抱歉，您的请求出了点问题。"
+msgstr "æŠ±æ­‰ï¼Œä½ çš„é‚®ä»¶è¯·æ±‚å‡ºçŽ°é—®é¢˜ã€‚"
 
 #: lib/bridgedb/strings.py:18
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[这是一封自动生成的邮件，请勿回复]"
+msgstr "[这是一封自动生成的邮件，请勿回复。]"
 
 #: lib/bridgedb/strings.py:20
 msgid "Here are your bridges:"
-msgstr "è¿™äº›æ˜¯ä½ çš„ç½‘æ¡¥ä¸­ç»§ï¼ˆbridges）："
+msgstr "ä»¥ä¸‹æ˜¯ä¸ºä½ æä¾›çš„ç½‘æ¡¥ï¼š"
 
 #: lib/bridgedb/strings.py:22
 #, python-format
@@ -60,12 +60,12 @@ msgstr "您已超出了发送频率的限制，请慢慢来！两封邮件之间
 #: lib/bridgedb/strings.py:25
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "命令：（组合使用命令可同时制定多个选项）"
+msgstr "命令：（组合使用命令可同时指定多个选项）"
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
 #: lib/bridgedb/strings.py:28
 msgid "Welcome to BridgeDB!"
-msgstr "欢迎来到BridgeDB！"
+msgstr "欢迎来到 BridgeDB！"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: lib/bridgedb/strings.py:30
@@ -75,7 +75,7 @@ msgstr "支持的 transport TYPE："
 #: lib/bridgedb/strings.py:31
 #, python-format
 msgid "Hey, %s!"
-msgstr "嘿，%s！"
+msgstr "ä½ å¥½ï¼Œ%s！"
 
 #: lib/bridgedb/strings.py:32
 msgid "Hello, friend!"
@@ -93,7 +93,7 @@ msgstr "公共密匙"
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "这封邮件用在for %s %s 为 %s 生成。"
+msgstr "本邮件是对 %s 的自动回复，日期 %s  %s。"
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -107,7 +107,7 @@ msgid ""
 "difficult for anyone watching your internet traffic to determine that you are\n"
 "using Tor.\n"
 "\n"
-msgstr "BridgeDB 能提供 %s å‡ ç§ Pluggable Transports %s 所用的网桥，可用于混淆 Tor ç½‘ç»œçš„è¿žæŽ¥ï¼Œä»Žè€Œè®©ç½‘ç»œç›‘æŽ§è€…éš¾ä»¥åˆ¤æ–­ä½ åœ¨ä½¿ç”¨ Tor。\n"
+msgstr "BridgeDB 能提供 %s å‡ ç§ Pluggable Transports %s 类型网桥，可用于混淆 Tor ç½‘ç»œçš„è¿žæŽ¥ï¼Œä»Žè€Œè®©ç½‘ç»œç›‘æŽ§è€…éš¾ä»¥åˆ¤æ–­ä½ åœ¨ä½¿ç”¨ Tor。\n"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #: lib/bridgedb/strings.py:54
@@ -133,7 +133,7 @@ msgstr "此外，BridgeDB 提供很多 %s  非Pluggable Transports %s 的普通
 
 #: lib/bridgedb/strings.py:76
 msgid "What are bridges?"
-msgstr "什么是网桥中继？"
+msgstr "什么是网桥？"
 
 #: lib/bridgedb/strings.py:77
 #, python-format
@@ -150,17 +150,17 @@ msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
 "%s, %s or %s."
-msgstr "获得 bridges（网桥）的另一种方法是向 %s 发送一封邮件。注意：您只能使用以下邮件服务商提供的邮件地址发送：%s， %s 或 %s 。"
+msgstr "另一种获取网桥的方式是发送电子邮件至 %s。注意：必须使用电子邮箱发送请求：%s、%s 或 %s。"
 
 #: lib/bridgedb/strings.py:90
 msgid "My bridges don't work! I need help!"
-msgstr "ç½‘æ¡¥æ— æ³•æ­£å¸¸è¿è¡Œï¼Œæˆ‘éœ€è¦å¸®åŠ©ï¼"
+msgstr "ç”¨ç½‘æ¡¥ä¹Ÿæ— æ³•è¿žæŽ¥ï¼Œéœ€è¦å¸®åŠ©ï¼"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: lib/bridgedb/strings.py:92
 #, python-format
 msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦‚æžœä½ çš„ Tor æ— æ³•æ­£å¸¸è¿è¡Œï¼Œè¯·å‘é‚®ä»¶è‡³ %s。"
+msgstr "如果 Tor æ— æ³•æ­£å¸¸è¿è¡Œï¼Œè¯·å‘é‚®ä»¶è‡³ %s。"
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -174,36 +174,36 @@ msgstr "è¯·å°½é‡æè¿°ä½ çš„æƒ…å†µï¼ŒåŒ…æ‹¬ä½ å°è¯•è¿‡çš„bridgeså’ŒPluggable T
 
 #: lib/bridgedb/strings.py:103
 msgid "Here are your bridge lines:"
-msgstr "è¿™é‡Œæ˜¯ä½ çš„Bridge lines："
+msgstr "ä»¥ä¸‹æ˜¯ä¸ºä½ æä¾›çš„ç½‘æ¡¥ï¼š"
 
 #: lib/bridgedb/strings.py:104
 msgid "Get Bridges!"
-msgstr "获得Bridges！"
+msgstr "获得网桥！"
 
 #: lib/bridgedb/strings.py:108
 msgid "Please select options for bridge type:"
-msgstr "请选择bridge类型。"
+msgstr "请选择类型类型。"
 
 #: lib/bridgedb/strings.py:109
 msgid "Do you need IPv6 addresses?"
-msgstr "您需要IPv6地址吗？"
+msgstr "是否需要IPv6地址？"
 
 #: lib/bridgedb/strings.py:110
 #, python-format
 msgid "Do you need a %s?"
-msgstr "ä½ éœ€è¦ä¸€ä¸ª %s 吗？"
+msgstr "是否需要 %s？"
 
 #: lib/bridgedb/strings.py:114
 msgid "Your browser is not displaying images properly."
-msgstr "您的浏览器未能正确显示图片。"
+msgstr "æµè§ˆå™¨æ— æ³•æ­£ç¡®æ˜¾ç¤ºå›¾ç‰‡ã€‚"
 
 #: lib/bridgedb/strings.py:115
 msgid "Enter the characters from the image above..."
-msgstr "输入图片里的文字……"
+msgstr "请输入上图中的字符（不区分大小写）..."
 
 #: lib/bridgedb/strings.py:119
 msgid "How to start using your bridges"
-msgstr "å¦‚ä½•å¼€å§‹ä½¿ç”¨ä½ çš„bridges（网桥）。"
+msgstr "如何使用网桥"
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
 #: lib/bridgedb/strings.py:121
@@ -211,21 +211,21 @@ msgstr "å¦‚ä½•å¼€å§‹ä½¿ç”¨ä½ çš„bridges（网桥）。"
 msgid ""
 "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
 "Browser download page %s to start Tor Browser."
-msgstr "要将bridges（网桥）输入Toræµè§ˆå™¨ï¼Œè¯·å…ˆæ ¹æ® %s Tor 浏览器下载页面 %s 的说明来启动Tor 浏览器。"
+msgstr "如需在 Tor æµè§ˆå™¨ä¸­æ·»åŠ ç½‘æ¡¥ï¼Œè¯·å…ˆæ ¹æ® %s Tor 浏览器下载页面 %s 的说明来启动Tor 浏览器。"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: lib/bridgedb/strings.py:125
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "当“Tor 网络设置” 弹出时，点击“配置” ç„¶åŽæ ¹æ®å‘å¯¼æ“ä½œï¼Œæ‚¨ä¼šè¢«é—®åˆ°ï¼š"
+msgstr "当“Tor 网络设置” 对话框出现时，点击“配置” ï¼Œç„¶åŽæ ¹æ®å‘å¯¼æ“ä½œï¼Œç›´åˆ°çœ‹åˆ°ä¸‹é¢çš„é—®é¢˜ï¼š"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: lib/bridgedb/strings.py:129
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "ä½ çš„ç½‘ç»œæä¾›å•†ï¼ˆISP）是否有封锁或者审查到 Tor 网络的连接？"
+msgstr "网络提供商（ISP）或其他人是否对 Tor 网络连接进行审查或封锁？"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: lib/bridgedb/strings.py:133
@@ -234,7 +234,7 @@ msgid ""
 "paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
 "you should be good to go! If you experience trouble, try clicking the 'Help'\n"
 "button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "选择“是”然后点击”下一步“。要配置新的bridges（网桥），将您获得的bridge linesï¼ˆç½‘æ¡¥åœ°å€ï¼‰å¤åˆ¶åˆ°æ–‡æœ¬è¾“å…¥æ¡†ã€‚æœ€åŽï¼Œç‚¹å‡»â€è¿žæŽ¥â€œï¼Œæ‚¨åº”è¯¥å°±èƒ½é¡ºåˆ©æµè§ˆã€‚å¦‚æžœä½ é‡åˆ°é—®é¢˜ï¼Œè¯·è¯•è¯•ç‚¹å‡»â€œTor网络设置”里的“帮助”按钮获取支持。"
+msgstr "é€‰æ‹©â€œæ˜¯â€ï¼Œç„¶åŽç‚¹å‡»â€œä¸‹ä¸€æ­¥â€ã€‚å¦‚ä¸‹æ·»åŠ æ–°çš„ç½‘æ¡¥ï¼Œè¯·å°†ç½‘æ¡¥åœ°å€è¡Œé€šè¿‡å¤åˆ¶ç²˜è´´çš„æ–¹å¼è¾“å…¥åˆ°æ–‡æœ¬è¾“å…¥æ¡†ã€‚æœ€åŽï¼Œç‚¹å‡»â€œè¿žæŽ¥â€å°±å¯ä»¥è¿žæŽ¥è‡³ Tor 网络。如有问题需要帮助，请点击“Tor 网络设置”向导窗口中的“帮助”按钮。"
 
 #: lib/bridgedb/strings.py:141
 msgid "Displays this message."
@@ -245,11 +245,11 @@ msgstr "显示这条信息。"
 #. "plain-ol'-vanilla" bridges.
 #: lib/bridgedb/strings.py:145
 msgid "Request vanilla bridges."
-msgstr "请求vanilla bridges（网桥）。"
+msgstr "请求普通网桥。"
 
 #: lib/bridgedb/strings.py:146
 msgid "Request IPv6 bridges."
-msgstr "请求IPv6 bridges（网桥）。"
+msgstr "请求IPv6网络。"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
 #: lib/bridgedb/strings.py:148
@@ -260,17 +260,17 @@ msgstr "æ ¹æ®TYPE 请求Pluggable Transport。"
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
 #: lib/bridgedb/strings.py:151
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "获取BridgeDB的公共GnuPG密匙。"
+msgstr "获取 BridgeDB 的 GnuPG 公共密匙。"
 
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:89
 msgid "Report a Bug"
-msgstr "报告缺陷"
+msgstr "报告 Bug"
 
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:92
 msgid "Source Code"
 msgstr "æºä»£ç "
 
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:95
 msgid "Changelog"
 msgstr "更改日志"
 
@@ -278,24 +278,47 @@ msgstr "更改日志"
 msgid "Contact"
 msgstr "联系方式"
 
+#: lib/bridgedb/templates/bridges.html:81
+msgid "Select All"
+msgstr "选择全部"
+
+#: lib/bridgedb/templates/bridges.html:87
+msgid "Show QRCode"
+msgstr "æ˜¾ç¤ºäºŒç»´ç "
+
+#: lib/bridgedb/templates/bridges.html:100
+msgid "QRCode for your bridge lines"
+msgstr "ç½‘æ¡¥äºŒç»´ç "
+
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
 #. for Italian, you might translate this into "Mama mia!",
 #. or for French: "Sacrebleu!". :)
-#: lib/bridgedb/templates/bridges.html:66
+#: lib/bridgedb/templates/bridges.html:115
+#: lib/bridgedb/templates/bridges.html:175
 msgid "Uh oh, spaghettios!"
 msgstr "哎哟哟！"
 
-#: lib/bridgedb/templates/bridges.html:72
+#: lib/bridgedb/templates/bridges.html:116
+msgid "It seems there was an error getting your QRCode."
+msgstr "èŽ·å–äºŒç»´ç æ—¶å‡ºé”™ã€‚"
+
+#: lib/bridgedb/templates/bridges.html:121
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "äºŒç»´ç åŒ…å«ç½‘æ¡¥ä¿¡æ¯ã€‚åˆ©ç”¨äºŒç»´ç æ‰«æç¨‹åºï¼Œå¯å°†ç›¸åº”çš„ç½‘æ¡¥ä¿¡æ¯å¤åˆ¶åˆ°æ‰‹æœºæˆ–å…¶ä»–è®¾å¤‡ã€‚"
+
+#: lib/bridgedb/templates/bridges.html:181
 msgid "There currently aren't any bridges available..."
-msgstr "现在没有可用的bridge（网桥）。"
+msgstr "现在没有可用的网桥。"
 
-#: lib/bridgedb/templates/bridges.html:73
+#: lib/bridgedb/templates/bridges.html:182
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "ä½ æˆ–è®¸å¯ä»¥å°è¯• %s 后退 %s 然后选择不同类型的bridge（网桥）。"
+msgstr "试试 %s后退%s到前一页面，然后选择其他类型的网桥。"
 
 #: lib/bridgedb/templates/index.html:11
 #, python-format
@@ -325,7 +348,7 @@ msgstr "第 %s 3 %s 步"
 #: lib/bridgedb/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "然后 %s å‘ä½ çš„Toræµè§ˆå™¨æ·»åŠ bridges（网桥）%s 。"
+msgstr "如何 %s 在 Tor æµè§ˆå™¨æ·»åŠ ç½‘æ¡¥%s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -334,7 +357,7 @@ msgstr "然后 %s å‘ä½ çš„Toræµè§ˆå™¨æ·»åŠ bridges（网桥）%s 。"
 #: lib/bridgedb/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr " %s给%s我bridges（网桥）！ "
+msgstr " 直接给我网桥(%sJ%s)！ "
 
 #: lib/bridgedb/templates/options.html:52
 msgid "Advanced Options"
@@ -351,15 +374,15 @@ msgstr "æ— "
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:130
+#: lib/bridgedb/templates/options.html:127
 #, python-format
 msgid "%sY%ses!"
-msgstr "%s是%s！"
+msgstr "是(%sY%s)！"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:154
+#: lib/bridgedb/templates/options.html:151
 #, python-format
 msgid "%sG%set Bridges"
-msgstr "%s获%s取Bridges（网桥）"
+msgstr "获取网桥(%sG%s)"