May 2019 - tor-commits - lists.torproject.org

[tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser
by gk＠torproject.org 13 May '19

13 May '19

commit ab7e47f4ab54626e8b7e6348aac25fc3436d166f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Feb 8 14:42:05 2019 -0500 Bug 28044: Integrate Tor Launcher into tor-browser To avoid potential conflicts with other preference files, rename our default preferences file from pref.js to torlauncher-prefs.js. Do not load default preferences if the browser has already done so. --- .../preferences/{prefs.js => torlauncher-prefs.js} | 0 src/modules/tl-util.jsm | 26 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/torlauncher-prefs.js similarity index 100% rename from src/defaults/preferences/prefs.js rename to src/defaults/preferences/torlauncher-prefs.js diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 8b59afb..bac5eae 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2019, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -876,10 +876,30 @@ let TLUtilInternal = // Private return this.mDefaultPreferencesLoaded; } + // Check whether default preferences have already been loaded, e.g., + // because Tor Launcher is integrated into the browser rather than + // running as an extension. This code assumes that a default value is + // defined for extensions.torlauncher.loglevel. + let prefName = "extensions.torlauncher.loglevel"; + let val; + try + { + let defaultBranch = this._getPrefDefaultBranch(prefName); + val = defaultBranch.getIntPref(""); + } catch (e) {} + if (val !== undefined) + { + this.mDefaultPreferencesLoaded = true; + return true; + } + + // Use the JS subscript loaded in conjunction with our pref() function + // to load the default preferences. + const kPrefsURL = + "resource://torlauncher/defaults/preferences/torlauncher-prefs.js"; var loader = Cc["@mozilla.org/moz/jssubscript-loader;1"] .getService(Ci.mozIJSSubScriptLoader); - loader.loadSubScript( - "resource://torlauncher/defaults/preferences/prefs.js", this); + loader.loadSubScript(kPrefsURL, this); this.mDefaultPreferencesLoaded = (this.mNumDefaultPrefsDefined == this.mNumDefaultPrefsLoaded);

1 0

[tor-launcher/master] Bug 28044: Integrate Tor Launcher into tor-browser
by gk＠torproject.org 13 May '19

13 May '19

commit b46c6039d1a5bf95aa9cbd777a51220d1df80aa0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Feb 12 12:02:27 2019 -0500 Bug 28044: Integrate Tor Launcher into tor-browser Fix locale-related issues. Renamed en locale to en-US (previously done during packaging). Added moz.build for integration with the Firefox build process. Enhanced the import-translations.sh script to omit incomplete locales and to generate jar.mn and chrome.manifest. Removed checking for incomplete locales from the pkg-prepare make target. Improved the output generated by import-translations.sh and pkg-prepare. --- Makefile | 32 ++++++------ README | 20 +++---- chrome.manifest.in | 4 +- jar.mn.in | 27 ++++++++++ localization/import-translations.sh | 61 +++++++++++++++++++--- moz.build | 8 +++ .../locale/{en => en-US}/network-settings.dtd | 0 .../locale/{en => en-US}/torlauncher.properties | 0 8 files changed, 114 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index f629d52..44f9a2d 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,15 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2019, The Tor Project, Inc. ### See src/LICENSE for licensing information. +# Makefile for packaging Tor Launcher outside of the browser build. The only +# target in this file that is used by the Tor Browser build process is +# import-translations. + EXT_NAME=tor-launcher VERSION:=`grep em:version src/install.rdf | sed -e 's/[<>]/ /g' | cut -f3` XPI_NAME:=$(shell echo "$(EXT_NAME)-$(VERSION).xpi") STANDALONE_NAME=$(EXT_NAME)-standalone STANDALONE_TARBALL=$(shell echo "$(STANDALONE_NAME)-$(VERSION).tar.gz") -REQUIRED_TRANSLATION_FILES=$(shell ls -1 src/chrome/locale/en/) AVAIL_TARGETS=help package standalone import-translations clean @@ -36,23 +39,18 @@ pkg-prepare: clean fi \ fi @cp -a chrome.manifest.in "$(TMP)/$(EXT_NAME)"/chrome.manifest - @mv "$(TMP)/$(EXT_NAME)"/chrome/locale/en \ - "$(TMP)/$(EXT_NAME)"/chrome/locale/en-US @for d in "$(TMP)/$(EXT_NAME)"/chrome/locale/*; do \ - if [ "`basename "$${d}"`" = "en-US" ]; then \ + locale="`basename $${d}`"; \ + if [ "$${locale}" = "en-US" ]; then \ continue; \ fi; \ - for f in $(REQUIRED_TRANSLATION_FILES); do \ - if [ ! -e "$${d}/$${f}" ] || \ - ( \ - [ -n "$(BUNDLE_LOCALES)" ] && \ - ! echo $(BUNDLE_LOCALES) | grep -qw `basename "$${d}"` \ - ); then \ - echo "Removing locale $${d} (missing resource $${f})"; \ + if [ -n "$(BUNDLE_LOCALES)" ]; then \ + if ! echo $(BUNDLE_LOCALES) | grep -qw "$${locale}"; then \ rm -rf "$${d}"; \ - break; \ + else \ + echo "Including locale $${locale}"; \ fi \ - done \ + fi \ done @for l in $(BUNDLE_LOCALES); do \ if [ ! -d "$(TMP)/$(EXT_NAME)"/chrome/locale/"$${l}" ]; then \ @@ -62,8 +60,10 @@ pkg-prepare: clean done @for d in "$(TMP)/$(EXT_NAME)"/chrome/locale/*; do \ locale="`basename $${d}`"; \ - echo "locale torlauncher $${locale} chrome/locale/$${locale}/" >> \ - "$(TMP)/$(EXT_NAME)"/chrome.manifest; \ + if [ "$${locale}" != "en-US" ]; then \ + echo "locale torlauncher $${locale} chrome/locale/$${locale}/" >> \ + "$(TMP)/$(EXT_NAME)"/chrome.manifest; \ + fi; \ done package: pkg-prepare diff --git a/README b/README index 568acc1..ac536a1 100644 --- a/README +++ b/README @@ -1,8 +1,7 @@ PLEASE NOTE: - Tor Launcher is packaged with Tor Browser, Tor Messenger, and - other Tor-enabled applications and is designed for those - applications. You should not install and try to use it in - Mozilla Firefox or another Firefox-based browser. + Tor Launcher is built into Tor Browser, and it may be built as a + XUL/XPCOM extension for use with TorBirdy. You should not install + and try to use it in Mozilla Firefox or another Firefox-based browser. OVERVIEW Tor Launcher is a browser extension that starts the tor process @@ -32,18 +31,11 @@ for other product releases; e.g., maint-0.2.10 is a branch that is used for releases in the Tor Browser 6.5 series. BUILDING TOR LAUNCHER -Official builds of Tor Launcher are done as part of a larger -application build process. For example, look here for information -about the Tor Browser build process: +Official builds that use the Tor Launcher code are done as part of +a larger application build process. For example, look here for +information about the Tor Browser build process: https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking -If you want to build your own standalone copy of Tor Launcher in -order to test a translation or code change that you have made, run -the following command: - make package - -The resulting xpi file is created in a subdirectory named pkg. - CONTACTING THE DEVELOPERS To contact the Tor Launcher developers, use the #tor-dev channel on irc.oftc.net or post a message to the tbb-dev mailing list (see diff --git a/chrome.manifest.in b/chrome.manifest.in index a869569..1800533 100644 --- a/chrome.manifest.in +++ b/chrome.manifest.in @@ -1,4 +1,4 @@ -### Copyright (c) 2013, The Tor Project, Inc. +### Copyright (c) 2019, The Tor Project, Inc. ### See LICENSE for licensing information. content torlauncher chrome/content/ @@ -14,3 +14,5 @@ contract @torproject.org/torlauncher-protocol-service;1 {4F476361-23FB-43EF-A427 component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} components/tl-process.js contract @torproject.org/torlauncher-process-service;1 {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} category profile-after-change TorProcessService @torproject.org/torlauncher-process-service;1 + +locale torlauncher en-US chrome/locale/en-US/ diff --git a/jar.mn.in b/jar.mn.in new file mode 100644 index 0000000..9d0d0ee --- /dev/null +++ b/jar.mn.in @@ -0,0 +1,27 @@ +#filter substitution +### Copyright (c) 2019, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.jar: + components/ (src/components/*) + +% content torlauncher %content/ + content/ (src/chrome/content/*) + + modules/ (src/modules/*) + +% resource torlauncher % + +% skin torlauncher default %skin/ + skin/ (src/chrome/skin/*) + +% component {4F476361-23FB-43EF-A427-B36A14D3208E} %components/tl-protocol.js +% contract @torproject.org/torlauncher-protocol-service;1 {4F476361-23FB-43EF-A427-B36A14D3208E} + +% component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} %components/tl-process.js +% contract @torproject.org/torlauncher-process-service;1 {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} + +% category profile-after-change TorProcessService @torproject.org/torlauncher-process-service;1 + +% locale torlauncher en-US %locale/en-US/ + locale/en-US/ (src/chrome/locale/en-US/*) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index f78df42..a1d9bd4 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,12 +1,16 @@ #!/bin/sh +### Copyright (c) 2019, The Tor Project, Inc. +### See LICENSE for licensing information. + TRANSLATION_BRANCHES=" tor-launcher-network-settings tor-launcher-properties " -if [ -d translation ]; -then +# Import translated string files from the translation git repository. +echo "Updating translated files" +if [ -d translation ]; then cd translation git fetch origin cd .. @@ -17,16 +21,59 @@ fi cd translation for branch in ${TRANSLATION_BRANCHES} do - git checkout ${branch} - git merge origin/${branch} + git checkout --quiet ${branch} + git merge --quiet origin/${branch} for locale in * do - if [ ! -d "${locale}" ] - then + target_locale=$(echo "${locale}" | tr _ -) + if [ "${target_locale}" = "en" -o "${target_locale}" = "en-US" \ + -o ! -d "${locale}" ]; then continue fi - target="../../src/chrome/locale/$(echo "${locale}" | tr _ -)" + target="../../src/chrome/locale/${target_locale}" mkdir -p "${target}" cp -f "${locale}"/* "${target}"/ done done +cd .. + +# Remove all locales that are missing one or more string files. +# Remove all locales for which no translation has been done. +# Re-create the chrome.manifest and jar.mn files by appending to templates. +echo "Removing incomplete locales; updating chrome.manifest and jar.mn" +cd ../src/chrome/locale +CHROME_MANIFEST=../../../chrome.manifest +JAR_MN=../../../jar.mn +cp ${CHROME_MANIFEST}.in ${CHROME_MANIFEST} +cp ${JAR_MN}.in ${JAR_MN} +REQUIRED_TRANSLATION_FILES=`ls -1 en-US/` +for locale in *; do + if [ "${locale}" = "en-US" ]; then + continue + fi + omit_locale=0 + for f in ${REQUIRED_TRANSLATION_FILES}; do + if [ ! -e "${locale}/${f}" ]; then + echo "Removing locale ${locale} due to missing resource ${f}" + omit_locale=1 + break + fi + done + if [ ${omit_locale} -eq 0 ]; then + diff -r en-US "${locale}" > /dev/null + if [ $? -eq 0 ]; then + echo "Removing locale ${locale} because it has the same content as en-US" + omit_locale=1 + fi + fi + if [ ${omit_locale} -ne 0 ]; then + rm -rf "${locale}" + else + echo "locale torlauncher ${locale} chrome/locale/${locale}/" >> \ + ${CHROME_MANIFEST} + echo "% locale torlauncher ${locale} %locale/${locale}/" >> \ + ${JAR_MN} + echo " locale/${locale}/ (src/chrome/locale/${locale}/*)" >> \ + ${JAR_MN} + fi +done diff --git a/moz.build b/moz.build new file mode 100644 index 0000000..bf6d4a6 --- /dev/null +++ b/moz.build @@ -0,0 +1,8 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +### Copyright (c) 2019, The Tor Project, Inc. +### See LICENSE for licensing information. + +JAR_MANIFESTS += ['jar.mn'] + +JS_PREFERENCE_FILES += [ 'src/defaults/preferences/torlauncher-prefs.js' ] diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd similarity index 100% rename from src/chrome/locale/en/network-settings.dtd rename to src/chrome/locale/en-US/network-settings.dtd diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en-US/torlauncher.properties similarity index 100% rename from src/chrome/locale/en/torlauncher.properties rename to src/chrome/locale/en-US/torlauncher.properties

1 0

[metrics-lib/master] Bump version to 2.6.1-dev.
by karsten＠torproject.org 13 May '19

13 May '19

commit 3693e107a3aff7473200ece3ba3889dc9462c7b3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 13 11:45:17 2019 +0200 Bump version to 2.6.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 9b76d46..9ae5215 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.6.1" /> + <property name="release.version" value="2.6.1-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Prepare for 2.6.1 release.
by karsten＠torproject.org 13 May '19

13 May '19

commit d1d8ec5dca75147aa5ef1cd859765bb242b5dc21 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 3 08:44:52 2019 +0200 Prepare for 2.6.1 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aee65ea..1e70572 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 2.6.1 - 2019-05-?? +# Changes in version 2.6.1 - 2019-05-03 * Medium changes - Fix a bug in recognizing descriptors as bandwidth files. diff --git a/build.xml b/build.xml index bdbb146..9b76d46 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.6.0-dev" /> + <property name="release.version" value="2.6.1" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 13 May '19

13 May '19

commit c2b1d4d754ccffaf851fd0b5a60d2cbfec1220fb Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 13 07:20:52 2019 +0000 Update translations for support-portal --- contents+zh-CN.po | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 0eb0a247c..3a8b1ac4f 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3586,7 +3586,7 @@ msgstr "### 权威网桥" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "A special-purpose relay that maintains the list of [bridges](#bridge)." -msgstr "" +msgstr "一种专用中继，用于维护[网桥](#bridge)列表。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -3953,6 +3953,9 @@ msgid "" "services that use Flash also offer an HTML5 alternative, which should work " "in the Tor Browser." msgstr "" +"Flash Player 是一个[浏览器插件](#add-on-extension-or-" +"plugin)，用于为互联网[应用程序](#app)观看音频和视频内容。因为它并不安全，您不应该在 [Tor Browser](#tor-" +"browser) 中启用 Flash。很多使用 Flash 的服务也提供 HTML5 替代方案，应该可以在 Tor Browser 中使用。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4105,7 +4108,7 @@ msgstr "## I" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Internet Service Provider (ISP)" -msgstr "" +msgstr "### 网络服务提供商 (ISP)" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4281,7 +4284,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### network censorship" -msgstr "" +msgstr "### 网络审查" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4622,7 +4625,7 @@ msgstr "### 公开密钥加密算法" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "A public-key cryptography system uses pairs of mathematical keys." -msgstr "" +msgstr "公钥加密系统使用成对的数学密钥。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4650,7 +4653,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "This signature can be verified by the public key." -msgstr "" +msgstr "可以通过公钥验证此签名。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4810,7 +4813,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Sybil attack" -msgstr "" +msgstr "### 女巫攻击" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4864,7 +4867,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### third-party tracking" -msgstr "" +msgstr "### 第三方跟踪" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4885,7 +4888,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor / Tor network/ Core Tor" -msgstr "" +msgstr "### Tor / Tor 网络/ Tor 核心" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4962,7 +4965,7 @@ msgstr "" msgid "" "By default, Tor Browser does not keep any [browsing history](#browsing-" "history)." -msgstr "" +msgstr "Tor Browser 默认不保留任何[浏览记录](#browsing-history)。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4974,7 +4977,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Tor Launcher" -msgstr "" +msgstr "### Tor 启动器" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 13 May '19

13 May '19

commit 55e37dfddacfe074b28728fd6669f3478c30f128 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 13 06:20:55 2019 +0000 Update translations for support-portal --- contents+zh-CN.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 4b781c48e..0eb0a247c 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -4306,6 +4306,9 @@ msgid "" "the window, which allows you to control the [JavaScript](#javascript)that " "runs on individual web pages, or to block it entirely." msgstr "" +"[Tor Browser](#tor-browser) 包含一个叫 NoScript 的[扩展](#add-on-extension-or-" +"plugin)，可通过窗口左上角的 “S” 图标访问。允许你控制运行于单个网页中的 [JavaScript](#javascript)，或者完全阻止运行" +" JavaScript。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 13 May '19

13 May '19

commit 946bb3838d7d8650e2f978158b0ccdef9d0d1834 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 13 06:20:37 2019 +0000 Update translations for tpo-web_completed --- contents+zh-CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index f7917769f..e6c193953 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -712,7 +712,7 @@ msgstr "" msgid "" "We're a nonprofit organization and rely on supporters like you to help us " "keep Tor robust and secure for millions of people worldwide." -msgstr "" +msgstr "我们是一个非盈利组织，依靠像您一样的支持者来帮助我们为全球数百万人保持 Tor 的强大和安全。" #: templates/footer.html:9 templates/footer.html:13 #: templates/hero-home.html:13 templates/navbar.html:59

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 13 May '19

13 May '19

commit 07dc59675dbe729b43db057f58109e2648c00a21 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 13 06:20:31 2019 +0000 Update translations for tpo-web --- contents+zh-CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index f7917769f..e6c193953 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -712,7 +712,7 @@ msgstr "" msgid "" "We're a nonprofit organization and rely on supporters like you to help us " "keep Tor robust and secure for millions of people worldwide." -msgstr "" +msgstr "我们是一个非盈利组织，依靠像您一样的支持者来帮助我们为全球数百万人保持 Tor 的强大和安全。" #: templates/footer.html:9 templates/footer.html:13 #: templates/hero-home.html:13 templates/navbar.html:59

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 13 May '19

13 May '19

commit b5edbfc52cae6bbe0b58bc5b32c46d5c2e0505a3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 13 05:50:48 2019 +0000 Update translations for support-portal --- contents+zh-CN.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 00100e279..4b781c48e 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -32,7 +32,7 @@ msgstr "常见问题" #: https//support.torproject.org/tbb/ (content/tbb/contents+en.lrtopic.title) msgid "Tor Browser" -msgstr "Tor 浏览器" +msgstr "Tor Browser" #: https//support.torproject.org/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) @@ -3935,6 +3935,9 @@ msgid "" "connections. You can reconfigure or disable your firewall and restart Tor to" " test this." msgstr "" +"防火墙是一个监视和控制传入和传出的网络[流量](#traffic)的网络安全系统。这个流量过滤器基于预定的规则。防火墙通常在可信，安全的内部网络和另一个外部网络之间建立屏障，但从[审查" +"](#network-censorship)的意义上来说，它也可以用作内容过滤器。有时人们连接 [Tor](#tor-/-tor-network" +"/-core-tor) 出现问题是因为他们的防火墙阻止了 Tor 的连接。您可以重新配置或禁用您的防火墙，然后重新启动 Tor 试试。" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 13 May '19

13 May '19

commit 105eda38b43acc63c9a2e3bb3662c6009aa42cab Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 13 05:50:30 2019 +0000 Update translations for tpo-web_completed --- contents+zh-CN.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 459511050..f7917769f 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -9,6 +9,7 @@ # ヨイツの賢狼ホロ, 2019 # Emma Peel, 2019 # MD Rights <psychi2009(a)gmail.com>, 2019 +# Dianyu Liu <liudianyu5(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -16,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-09 15:06+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: MD Rights <psychi2009(a)gmail.com>, 2019\n" +"Last-Translator: Dianyu Liu <liudianyu5(a)gmail.com>, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -484,6 +485,10 @@ msgid "" "href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\">distribution " "directory</a>." msgstr "" +"Tor Browser 8.5a10 版本现已在 <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en#downloads-" +"alpha\">Tor Browser Project</a> 官网和我们的<a " +"href=\"https://www.torproject.org/dist/torbrowser/8.5a10/\">分发目录</a>中发布。" #: templates/contact.html:8 msgid "Chat with us on"

1 0