June 2014 - tor-commits - lists.torproject.org

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit a073aea5c290c29f18f1eb573ddc8730fbd79514 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 12 10:45:12 2014 +0000 Update translations for torcheck_completed --- ko/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ko/torcheck.po b/ko/torcheck.po index 50e08f0..547e667 100644 --- a/ko/torcheck.po +++ b/ko/torcheck.po @@ -6,12 +6,13 @@ # cwt967 <cwt967(a)gmail.com>, 2012 # cwt96 <cwt967(a)naver.com>, 2012 # Dr.what <javrick6(a)naver.com>, 2014 +# letsdiet <letsdiet(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 09:04+0000\n" -"Last-Translator: ilbe123 <a3057016(a)drdrb.net>\n" +"PO-Revision-Date: 2014-06-12 10:21+0000\n" +"Last-Translator: letsdiet <letsdiet(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,13 +22,13 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "축하합니다. 귀하의 브라우저는 Tor를 사용하도록 설정되었습니다." +msgstr "축하합니다. 지금부터 브라우저에서 Tor를 사용하실 수 있습니다." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Tor를 안전하게 사용하는 정보에 관한 정보를 얻으려면 <a href=\"https://www.torproject.org/\">Tor website</a>를 방문하십시오. 귀하는 이제 인터넷을 익명으로 자유롭게 탐색할 수 있습니다." +msgstr "Tor 관련 사용 정보를 얻으려면 <a href=\"https://www.torproject.org/\">Tor website</a>를 방문하십시오. 귀하는 이제 인터넷을 익명으로 자유롭게 탐색할 수 있습니다." msgid "There is a security update available for the Tor Browser Bundle." msgstr "Tor browser Bundle에 대한 보안 업데이트가 있습니다." @@ -38,7 +39,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">다운로드 페이지로 가려면 여기를 선택하십시오.</a>" msgid "Sorry. You are not using Tor." -msgstr "지금 Tor를 사용하지 않고 있습니다. " +msgstr "현재 Tor를 사용 중인지 확인해 주십시오." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -53,7 +54,7 @@ msgstr "죄송하지만, 귀하의 쿼리가 실패했거나 예기치 않은 msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "임시적인 서비스 중단이 귀하의 IP 주소가 <a href=\"https://www.torproject.org/\">Tor</a> node인지 알려주는 것을 막았습니다." +msgstr "일시적인 서비스 오류로 귀하의 IP 주소가 <a href=\"https://www.torproject.org/\">Tor</a> node인지 확인하지 못했습니다." msgid "Your IP address appears to be: " msgstr "귀하의 IP는 다음과 같이 보입니다. "

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit 815518ac670229b6562b1ec45fc84292263a5022 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 12 10:45:09 2014 +0000 Update translations for torcheck --- ko/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ko/torcheck.po b/ko/torcheck.po index 50e08f0..547e667 100644 --- a/ko/torcheck.po +++ b/ko/torcheck.po @@ -6,12 +6,13 @@ # cwt967 <cwt967(a)gmail.com>, 2012 # cwt96 <cwt967(a)naver.com>, 2012 # Dr.what <javrick6(a)naver.com>, 2014 +# letsdiet <letsdiet(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 09:04+0000\n" -"Last-Translator: ilbe123 <a3057016(a)drdrb.net>\n" +"PO-Revision-Date: 2014-06-12 10:21+0000\n" +"Last-Translator: letsdiet <letsdiet(a)gmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,13 +22,13 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "축하합니다. 귀하의 브라우저는 Tor를 사용하도록 설정되었습니다." +msgstr "축하합니다. 지금부터 브라우저에서 Tor를 사용하실 수 있습니다." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Tor를 안전하게 사용하는 정보에 관한 정보를 얻으려면 <a href=\"https://www.torproject.org/\">Tor website</a>를 방문하십시오. 귀하는 이제 인터넷을 익명으로 자유롭게 탐색할 수 있습니다." +msgstr "Tor 관련 사용 정보를 얻으려면 <a href=\"https://www.torproject.org/\">Tor website</a>를 방문하십시오. 귀하는 이제 인터넷을 익명으로 자유롭게 탐색할 수 있습니다." msgid "There is a security update available for the Tor Browser Bundle." msgstr "Tor browser Bundle에 대한 보안 업데이트가 있습니다." @@ -38,7 +39,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">다운로드 페이지로 가려면 여기를 선택하십시오.</a>" msgid "Sorry. You are not using Tor." -msgstr "지금 Tor를 사용하지 않고 있습니다. " +msgstr "현재 Tor를 사용 중인지 확인해 주십시오." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -53,7 +54,7 @@ msgstr "죄송하지만, 귀하의 쿼리가 실패했거나 예기치 않은 msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "임시적인 서비스 중단이 귀하의 IP 주소가 <a href=\"https://www.torproject.org/\">Tor</a> node인지 알려주는 것을 막았습니다." +msgstr "일시적인 서비스 오류로 귀하의 IP 주소가 <a href=\"https://www.torproject.org/\">Tor</a> node인지 확인하지 못했습니다." msgid "Your IP address appears to be: " msgstr "귀하의 IP는 다음과 같이 보입니다. "

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit 68fc2fcf8584b7f361eed7506b5f704adbaccdf3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 12 08:15:07 2014 +0000 Update translations for bridgedb_completed --- zh_CN/LC_MESSAGES/bridgedb.po | 368 +++++++++++++++++++++++++++++++++++------ 1 file changed, 313 insertions(+), 55 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index aec9bc4..2fa9fb4 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -1,21 +1,22 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: -# simabull tsai, 2013 -# simabull tsai, 2013 -# simabull tsai, 2013 +# Wu Ming Shi, 2013 +# Wu Ming Shi, 2013 +# Wu Ming Shi, 2013 # Christopher Meng <cickumqt(a)gmail.com>, 2012 # hanl <iamh4n(a)gmail.com>, 2011 +# Meng3, 2014 +# leungsookfan <leung.sookfan(a)riseup.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-06-28 00:10+0000\n" -"Last-Translator: simabull tsai\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-12 08:10+0000\n" +"Last-Translator: Meng3\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" @@ -24,82 +25,339 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "抱歉，您的请求出了点问题。" + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[这是一封自动生成的邮件，请勿回复]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "这些是你的网桥中继（bridges）：" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "您已超出了发送频率的限制，请慢慢来！两封邮件之间需要最少 %s 小时的间隔。在间隔期间发出的所有邮件将被忽略。" + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "命令：（组合使用命令可同时制定多个选项）" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "欢迎来到BridgeDB！" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "支持的 transport TYPEs：" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "嘿，%s！" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "你好，朋友！" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "公共密匙" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "这封邮件用在for %s %s 为 %s 生成。" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB 能用 %s几种类型的Pluggable Transports%s 为你提供bridges（网桥），\n以隐蔽你对Tor网络的直接连接。\n这样网络审查者就更难看出你是在使用Tor。\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "一些使用IPv6地址的bridges（网桥）也能使用，但是\nPluggable Transports并不兼容IPv6。\n" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "此外，BridgeDB 有很多 %s 没有Pluggable Transports的普通bridges（网桥）%s。\n虽然没那么有意思，但是这些普通网桥依然可以在很多情况下\n帮助绕过审查。\n" + +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "什么是网桥中继？" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:77 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s 网桥中继 %s 是一种 Tor 中继，用于帮助用户规避审查。" +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Bridges %s 是帮助你绕过审查或封锁的 Tor relay（中继点）。" -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "需要使用其他获取方式获取网桥！" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "获取公开的网桥地址还有一种方式：使用 %s 或 %s 邮箱发送电子邮件至 %s，并在邮件正文中包含文字“get bridges”。 " +"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 or %s." +msgstr "获得 bridges（网桥）的另一种方法是向 %s 发送一封邮件。注意：您只能使用以下邮件服务商提供的邮件地址发送：%s 或 %s 。" -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "网桥无法正常运行，我需要帮助！" -#: lib/bridgedb/templates/base.html:49 +#. 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。" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "如果 Tor 无法正常运行，请发送电子邮件至 %s。请在邮件中提供尽可能详细的信息，例如：使用的网桥列表，所用的软件包文件名/版本，Tor 所显示的信息等等。" +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "请尽量描述你的情况，包括你尝试过的bridges和Pluggable Transports，你的Tor浏览器版本，还有任何Tor显示过的信息等等。" + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "这里是你的Bridge lines：" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "获得Bridges！" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "请选择bridge类型。" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "您需要IPv6地址吗？" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "你需要一个 %s 吗？" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "您的浏览器未能正确显示图片。" + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "输入图片里的文字……" + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "如何开始使用你的bridges（网桥）。" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "如需使用以上地址，请打开 Vidalia 网络设置，选中“我的 ISP 阻挡了对 Tor 网络的连接\"，然后依次添加网桥地址。" +"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 浏览器。" + +#. 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 网络设置” 弹出时，点击“配置” 然后根据向导操作，您会被问到：" + +#. 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 网络的连接？" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"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网络设置”里的“帮助”按钮获取支持。" + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "显示这条信息。" + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "请求vanilla bridges（网桥）。" + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "请求IPv6 bridges（网桥）。" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "根据TYPE 请求Pluggable Transport。" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "获取BridgeDB的公共GnuPG密匙。" + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "报告缺陷" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "源代码" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "当前无可用的网桥中继" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "更改日志" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "请将你的浏览器升级至 Firefox" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "联系方式" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -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 +msgid "Uh oh, spaghettios!" +msgstr "哎哟哟！" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "第 1 步" +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "现在没有可用的bridge（网桥）。" -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:73 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "获取 %s Tor Browser Bundle %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "你或许可以尝试 %s 后退 %s 然后选择不同类型的bridge（网桥）。" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "第 %s 1 %s 步" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "第 2 步" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "下载 %s Tor 浏览器 %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "第 %s 2 %s 步" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "获取 %s bridges %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "第 3 步" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +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 。" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr " %s给%s我bridges（网桥）！ " + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "高级选项" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "否" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +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 +#, python-format +msgid "%sY%ses!" +msgstr "%s是%s！" -#: lib/bridgedb/templates/index.html:21 +#. 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 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "现在 %s 将网桥添加到 Tor %s" +msgid "%sG%set Bridges" +msgstr "%s获%s取Bridges（网桥）"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit 703e669c78dc09e027ab68f596a54809ea447da2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 12 08:15:03 2014 +0000 Update translations for bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index 2c0712b..2fa9fb4 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -8,14 +8,15 @@ # Wu Ming Shi, 2013 # Christopher Meng <cickumqt(a)gmail.com>, 2012 # hanl <iamh4n(a)gmail.com>, 2011 +# Meng3, 2014 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-12 05:50+0000\n" -"Last-Translator: leungsookfan <leung.sookfan(a)riseup.net>\n" +"PO-Revision-Date: 2014-06-12 08:10+0000\n" +"Last-Translator: Meng3\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" @@ -57,7 +58,7 @@ 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

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit 2fa1ca2c5c9d754bce1cf1b0900fca17904f726f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 12 06:15:03 2014 +0000 Update translations for bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index a3651f8..2c0712b 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-12 05:43+0000\n" +"PO-Revision-Date: 2014-06-12 05:50+0000\n" "Last-Translator: leungsookfan <leung.sookfan(a)riseup.net>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 12 Jun '14

12 Jun '14

commit 29e1e85ab3df1e0d1af85b4b539d03a92bc8e3d4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 12 05:45:03 2014 +0000 Update translations for bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index d3874e7..a3651f8 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-11 08:10+0000\n" +"PO-Revision-Date: 2014-06-12 05:43+0000\n" "Last-Translator: leungsookfan <leung.sookfan(a)riseup.net>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -45,7 +45,7 @@ msgstr "[这是一封自动生成的邮件，请勿回复]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "这些是你的网桥（bridges）：" +msgstr "这些是你的网桥中继（bridges）：" #: lib/bridgedb/strings.py:22 #, python-format

1 0

[meek/master] Return an error string for request format errors.
by dcf＠torproject.org 12 Jun '14

12 Jun '14

commit 77e4bff0fb29b214fb3641b943da5c809b29aff3 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 11 20:18:46 2014 -0700 Return an error string for request format errors. Previously we just closed the socket. I was trying to use a plain http URL through the helper, which isn't allowed by requestOK. (This is just a safety feature because none of our deployment is planned to use plain http.) It took me a little while to figure out what was going wrong. Now you will get a line in the meek-client log: error in handling request: helper returned error: request failed validation --- firefox/components/main.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 4265f97..841c6f1 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -184,7 +184,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { makeRequest: function(req) { // dump("makeRequest " + JSON.stringify(req) + "\n"); if (!this.requestOk(req)) { - this.transport.close(0); + this.returnResponse({"error": "request failed validation"}); return; } @@ -192,8 +192,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { // dump("using proxy " + JSON.stringify(req.proxy) + "\n"); var proxyInfo = MeekHTTPHelper.buildProxyInfo(req.proxy); if (proxyInfo === null) { - dump("can't create nsIProxyInfo from " + JSON.stringify(req.proxy) + "\n"); - this.transport.close(0); + this.returnResponse({"error": "can't create nsIProxyInfo from " + JSON.stringify(req.proxy)}); return; }

1 0

r26825: {website} low-numbered ports and AccountingMax don't mix because of ht (website/trunk/docs/en)
by Roger Dingledine 12 Jun '14

12 Jun '14

Author: arma Date: 2014-06-12 00:47:14 +0000 (Thu, 12 Jun 2014) New Revision: 26825 Modified: website/trunk/docs/en/tor-relay-debian.wml Log: low-numbered ports and AccountingMax don't mix because of https://trac.torproject.org/projects/tor/ticket/918 Modified: website/trunk/docs/en/tor-relay-debian.wml =================================================================== --- website/trunk/docs/en/tor-relay-debian.wml 2014-06-10 16:25:19 UTC (rev 26824) +++ website/trunk/docs/en/tor-relay-debian.wml 2014-06-12 00:47:14 UTC (rev 26825) @@ -117,7 +117,8 @@ </p> <p> - 7. If your computer isn't running a webserver, please consider + 7. If your computer isn't running a webserver, and you haven't set + AccountingMax, please consider changing your ORPort to 443 and/or your DirPort to 80. Many Tor users are stuck behind firewalls that only let them browse the web, and this change will let them reach your Tor relay. If you are already

1 0

[orbot/master] pegging tor to 0.2.4.22
by n8fr8＠torproject.org 12 Jun '14

12 Jun '14

commit 2fe57e84adf68faf69ec71190e25abb5f0227391 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 19:33:56 2014 -0400 pegging tor to 0.2.4.22 --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index d2147cc..2ee56e4 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit d2147cc7ba5c5d5114bae61000cbf757353c3ed6 +Subproject commit 2ee56e4c2c841a45418cfb826e1ce6689278382d

1 0

[orbot/master] tune bind/create service logic
by n8fr8＠torproject.org 12 Jun '14

12 Jun '14

commit 328c6af2c68a789ded01c58a2b19b56a4bb7ea9c Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 20:24:08 2014 -0400 tune bind/create service logic --- src/org/torproject/android/Orbot.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index cd7a392..c1e755c 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -106,10 +106,13 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } + Intent torService; + private void startService () { - Intent torService = new Intent(this, TorService.class); - + torService = new Intent(this, TorService.class); + startService(torService); + /* if (Build.VERSION.SDK_INT > 14) { @@ -120,11 +123,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic else { */ - bindService(torService, - mConnection, Context.BIND_AUTO_CREATE); + //} - startService(torService); } @@ -463,6 +464,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (aDialog != null) aDialog.dismiss(); + + unbindService(mConnection); } private void doTorCheck () @@ -796,6 +799,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected void onResume() { super.onResume(); + bindService(torService, + mConnection, 0); + if (mService != null) { try {

1 0