[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

[translation at torproject.org]

commit a746059a494a02b303f826fbec503774fdc31cc4
Author: Translation commit bot <translation at torproject.org>
Date:   Fri Oct 10 09:46:10 2014 +0000

    Update translations for tails-misc_completed
---
 zh_CN.po |  164 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 88 insertions(+), 76 deletions(-)

diff --git a/zh_CN.po b/zh_CN.po
index a656bbf..eb17265 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -6,6 +6,7 @@
 # Wu Ming Shi, 2013
 # bnw, 2014
 # Meng3, 2014
+# leungsookfan <leung.sookfan at riseup.net>, 2014
 # Sanya chang <408070986 at qq.com>, 2013
 # Xiaolan <xiaolan65535 at gmail.com>, 2014
 # YF <yfdyh000 at gmail.com>, 2013-2014
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-31 21:41+0200\n"
-"PO-Revision-Date: 2014-09-25 21:20+0000\n"
-"Last-Translator: Xiaolan <xiaolan65535 at gmail.com>\n"
+"POT-Creation-Date: 2014-10-08 22:16+0200\n"
+"PO-Revision-Date: 2014-10-10 09:40+0000\n"
+"Last-Translator: leungsookfan <leung.sookfan at riseup.net>\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"
@@ -23,11 +24,11 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
 msgid "Tor is ready"
 msgstr "Tor 已就绪"
 
-#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44
+#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
 msgid "You can now access the Internet."
 msgstr "ä½ çŽ°åœ¨å¯ä»¥è®¿é—®å› ç‰¹ç½‘äº†ã€‚"
 
@@ -199,22 +200,6 @@ msgstr "GnuPG 输出："
 msgid "Other messages provided by GnuPG:"
 msgstr "GnuPG 提供的其他信息："
 
-#: config/chroot_local-includes/usr/local/bin/iceweasel:12
-msgid "Tor is not ready"
-msgstr "Tor 未就绪"
-
-#: config/chroot_local-includes/usr/local/bin/iceweasel:13
-msgid "Tor is not ready. Start Tor Browser anyway?"
-msgstr "Tor 未就绪。确定启动 Tor Browser？"
-
-#: config/chroot_local-includes/usr/local/bin/iceweasel:14
-msgid "Start Tor Browser"
-msgstr "启动 Tor Browser"
-
-#: config/chroot_local-includes/usr/local/bin/iceweasel:15
-msgid "Cancel"
-msgstr "取消"
-
 #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39
 msgid "Shutdown Immediately"
 msgstr "立即关闭"
@@ -319,38 +304,13 @@ msgid ""
 "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>."
 msgstr "MAC 欺骗对 ${nic_name} (${nic}) 失败。错误恢复也一同失败，所以所有网络已被禁用。\n您可能宁愿重启 Tails 并禁用 MAC 欺骗。参见<a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>相关文档</a>。"
 
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62
-msgid "Starting I2P..."
-msgstr "正在启动 I2P..."
-
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63
-msgid "The I2P router console will be opened on start."
-msgstr "I2P 路由控制台将在启动时打开。"
-
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124
-msgid "I2P failed to start"
-msgstr "I2P æ— æ³•å¯åŠ¨ã€‚"
-
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83
-msgid ""
-"Make sure that you have a working Internet connection, then try to start I2P"
-" again."
-msgstr "请确保网络正常连接，然后再次启动 I2P。"
-
-#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125
-msgid ""
-"Something went wrong when I2P was starting. Look in the logs in the "
-"following directory for more information:"
-msgstr "I2P 启动时出错。更多信息，请查阅以下目录中的日志："
-
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60
 msgid "error:"
 msgstr "错误："
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61
 msgid "Error"
 msgstr "错误"
 
@@ -384,77 +344,133 @@ msgid ""
 " more...</a>"
 msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>更多信息...</a>"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68
+#: config/chroot_local-includes/usr/local/bin/tor-browser:18
+msgid "Tor is not ready"
+msgstr "Tor 未就绪"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:19
+msgid "Tor is not ready. Start Tor Browser anyway?"
+msgstr "Tor 未就绪。确定启动 Tor Browser？"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:20
+msgid "Start Tor Browser"
+msgstr "启动 Tor Browser"
+
+#: config/chroot_local-includes/usr/local/bin/tor-browser:21
+msgid "Cancel"
+msgstr "取消"
+
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71
 msgid "Do you really want to launch the Unsafe Browser?"
 msgstr "是否确定启动非安全浏览器？"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:73
 msgid ""
 "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use"
 " the Unsafe Browser if necessary, for example if you have to login or "
 "register to activate your Internet connection."
 msgstr "非浏览器中的网络活动是<b>非匿名的</b>。仅再需要时使用不安全浏览器，例如必须登录或注册以激活互联网连接。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74
 msgid "_Launch"
 msgstr "启动"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75
 msgid "_Exit"
 msgstr "退出"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:85
 msgid "Starting the Unsafe Browser..."
 msgstr "正在启动非安全浏览器..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:86
 msgid "This may take a while, so please be patient."
 msgstr "可能需要一会儿，请稍等。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:101
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:104
 msgid "Failed to setup chroot."
 msgstr "设置 chroot 失败。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:184
 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
 msgid "Unsafe Browser"
 msgstr "非安全浏览器"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:240
 msgid "Shutting down the Unsafe Browser..."
 msgstr "正在关闭非安全浏览器..."
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:241
 msgid ""
 "This may take a while, and you may not restart the Unsafe Browser until it "
 "is properly shut down."
 msgstr "å¯èƒ½éœ€è¦ä¸€ä¼šå„¿ã€‚æ­£å¸¸å…³é—­ä¹‹å‰æ— æ³•é‡å¯éžå®‰å…¨æµè§ˆå™¨ã€‚"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:253
 msgid "Failed to restart Tor."
 msgstr "æ— æ³•é‡å¯ Tor。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:261
 msgid ""
 "Another Unsafe Browser is currently running, or being cleaned up. Please "
 "retry in a while."
 msgstr "另一种不安全的浏览器正在运行，或者正在被清理。请在稍后重试。"
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:274
 msgid ""
 "No DNS server was obtained through DHCP or manually configured in "
 "NetworkManager."
 msgstr "在网络管理器中没有通过 DHCP 获得或手动配置 DNS 服务器。"
 
 #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:11
-msgid "TrueCrypt will soon be removed from Tails"
-msgstr "TrueCrypt 很快就将从 Tails 中移除"
+msgid "TrueCrypt will be removed in Tails 1.2.1"
+msgstr "TrueCrypt 将会在 Tails 1.2.1 里被移除。"
 
 #: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:12
 msgid ""
-"TrueCrypt will soon be removed from Tails due to license and development "
-"concerns."
-msgstr "由于许可协议和开发问题，TrueCrypt 很快将从 Tails 中移除。"
+"TrueCrypt is no longer maintained and is said to be insecure by its own "
+"authors. Therefore, it will be removed in Tails 1.2.1 (November 25). We "
+"recommend that you learn how to <a "
+"href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>open"
+" TrueCrypt volumes with cryptsetup</a> as soon as possible."
+msgstr "TrueCrypt 已不再提供维护，并被该软件作者自己指出存在安全问题。所以在Tails 1.2.1（11月25日）中TrueCrypt将被移除。我们推荐您尽快了解如何  <a href='file:///usr/share/doc/tails/website/doc/encryption_and_privacy/truecrypt.en.html#cryptsetup'>用cryptsetup来打开被TrueCryptåŠ å¯†çš„å·</a>。"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-i2p:30
+msgid "I2P failed to start"
+msgstr "I2P æ— æ³•å¯åŠ¨ã€‚"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31
+msgid ""
+"Something went wrong when I2P was starting. Check the logs in /var/log/i2p "
+"for more information."
+msgstr "启动I2P时出现错误。请在 /var/log/i2p 查看日志以获取更多信息。"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-i2p:42
+msgid "I2P's router console is ready"
+msgstr "I2P 路由控制台就绪。"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43
+msgid "You can now access I2P's router console on http://127.0.0.1:7657."
+msgstr "ä½ çŽ°åœ¨å¯ä»¥é€šè¿‡ http://127.0.0.1:7657 访问 I2P 路由控制台。"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-i2p:48
+msgid "I2P is not ready"
+msgstr "I2P 未就绪。"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49
+msgid ""
+"Eepsite tunnel not built within six minutes. Check the router console at "
+"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information."
+" Reconnect to the network to try again."
+msgstr "eepSite 隧道未在6分钟内创建成功。请在 http://127.0.0.1:7657/logs 检查路由控制台 或 /var/log/i2p 中查看日志以了解更多。然后再次尝试连接。"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59
+msgid "I2P is ready"
+msgstr "I2P 已就绪。"
+
+#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60
+msgid "You can now access services on I2P."
+msgstr "ä½ çŽ°åœ¨å¯ä»¥è®¿é—® I2P 服务了。"
 
 #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1
 msgid "Report an error"
@@ -469,17 +485,13 @@ msgstr "Tails 文档"
 msgid "Learn how to use Tails"
 msgstr "了解如何使用 Tails"
 
-#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1
-msgid "Anonymous overlay network "
-msgstr "匿名掩盖网络"
-
-#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2
-msgid "i2p"
-msgstr "I2P"
+#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1
+msgid "Anonymous overlay network browser"
+msgstr "匿名覆盖网络浏览器"
 
-#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3
-msgid "Anonymous overlay network"
-msgstr "匿名掩盖网络"
+#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2
+msgid "I2P Browser"
+msgstr "I2P 浏览器"
 
 #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2
 msgid "Learn more about Tails"