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

[translation at torproject.org]

commit 718205d2253e0d846714555bf94731e2615e3779
Author: Translation commit bot <translation at torproject.org>
Date:   Thu Mar 13 07:15:27 2014 +0000

    Update translations for tails-greeter_completed
---
 zh_CN/zh_CN.po |   54 ++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 14 deletions(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index c816788..2006c63 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -3,20 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ihints <ihints at gmail.com>, 2014
 # simabull tsai, 2013
 # simabull tsai, 2013
 # ln191810 <ln191810 at gmail.com>, 2012
 # ln191810 <ln191810 at gmail.com>, 2012
 # xtoaster <zhazhenzhong at gmail.com>, 2012
+# baoliandeng <nkzhangjg at gmail.com>, 2014
 # Y.F Yang <yfdyh000 at gmail.com>, 2014
 # xtoaster <zhazhenzhong at gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-21 19:40+0100\n"
-"PO-Revision-Date: 2014-02-25 00:50+0000\n"
-"Last-Translator: Y.F Yang <yfdyh000 at gmail.com>\n"
+"POT-Creation-Date: 2014-03-06 17:16+0100\n"
+"PO-Revision-Date: 2014-03-13 07:01+0000\n"
+"Last-Translator: ihints <ihints at gmail.com>\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"
@@ -41,8 +43,8 @@ msgid "Use persistence?"
 msgstr "持久保存工作数据？"
 
 #: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Help</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">帮助</a>"
+msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
 
 #: ../glade/persistencewindow.glade.h:6
 msgid "Yes"
@@ -75,8 +77,8 @@ msgstr "ç®¡ç†å‘˜å¯†ç "
 #: ../glade/optionswindow.glade.h:4
 msgid ""
 "<a "
-"href=\"doc/first_steps/startup_options/administration_password.en.html\">Help</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">帮助</a>"
+"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
+msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>"
 
 #: ../glade/optionswindow.glade.h:5
 msgid ""
@@ -97,14 +99,14 @@ msgid "<i>Passwords do not match</i>"
 msgstr "<i>å¯†ç ä¸æ­£ç¡®</i>"
 
 #: ../glade/optionswindow.glade.h:10
-msgid "Windows Camouflage"
-msgstr "伪装 Windows"
+msgid "Windows camouflage"
+msgstr "伪装Windows"
 
 #: ../glade/optionswindow.glade.h:11
 msgid ""
 "<a "
-"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Help</a>"
-msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">帮助</a>"
+"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>"
+msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">文档</a>"
 
 #: ../glade/optionswindow.glade.h:12
 msgid ""
@@ -121,8 +123,10 @@ msgid "MAC address spoofing"
 msgstr "MAC 地址欺骗"
 
 #: ../glade/optionswindow.glade.h:15
-msgid "<a href=\"doc/advanced_topics/mac_changer.en.html\">Help</a>"
-msgstr "<a href=\"doc/advanced_topics/mac_changer.en.html\">帮助</a>"
+msgid ""
+"<a "
+"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
+msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>"
 
 #: ../glade/optionswindow.glade.h:16
 msgid ""
@@ -133,13 +137,35 @@ msgstr "欺骗 MAC 地址，隐匿您的网卡到本地网络的序列号。这
 #: ../glade/optionswindow.glade.h:17
 msgid ""
 "It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems. See the documentation."
+"suspicion or cause network connection problems."
 msgstr "欺骗 MAC 地址通常都是安全的，但也存在引发或导致网络连通问题的可能。请参阅文档。"
 
 #: ../glade/optionswindow.glade.h:18
 msgid "Spoof all MAC addresses"
 msgstr "欺骗所有 MAC 地址"
 
+#: ../glade/optionswindow.glade.h:19
+msgid "Network configuration"
+msgstr "网络确认"
+
+#: ../glade/optionswindow.glade.h:20
+msgid ""
+"<a "
+"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>"
+
+#: ../glade/optionswindow.glade.h:21
+msgid ""
+"This computer's Internet connection is clear of obstacles. You would like to"
+" connect directly to the Tor network."
+msgstr "该电脑的连接故障已排除，您可以直接连接Tor网络。"
+
+#: ../glade/optionswindow.glade.h:22
+msgid ""
+"This computer's Internet connection is censored, filtered, or proxied. You "
+"need to configure bridge, firewall, or proxy settings."
+msgstr "è¯¥ç”µè„‘çš„äº’è”ç½‘é“¾æŽ¥è¢«å±è”½ã€‚ä½ éœ€è¦é…ç½®ç½‘æ¡¥ã€é˜²ç«å¢™æˆ–è€…ä»£ç†è®¾ç½®ã€‚"
+
 #: ../glade/langpanel.glade.h:1
 msgid " "
 msgstr " "