April 2018 - tor-commits - lists.torproject.org

[doctor/master] Disable DocTor checks for tor26
by atagar＠torproject.org 11 Apr '18

11 Apr '18

commit 5bae20237ad033d8fc776fb17bf043f5776b57e3 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 11 08:58:31 2018 -0700 Disable DocTor checks for tor26 To cut down on abuse tor26 rejects DirPort requests without a '.z' suffix (technically it throttles them, but I've never seen one work so effectively it's blocked). Stem no longer appends this suffix, using headers to indicate the compression it wants instead. --- consensus_health_checker.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index cd809cc..48c1224 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -25,6 +25,8 @@ from stem.util.lru_cache import lru_cache Runlevel = stem.util.enum.UppercaseEnum('NOTICE', 'WARNING', 'ERROR') DIRECTORY_AUTHORITIES = stem.descriptor.remote.get_authorities() +del DIRECTORY_AUTHORITIES['tor26'] # DirPort does not service requests without a '.z' suffix + EMAIL_SUBJECT = 'Consensus issues' CONFIG = stem.util.conf.config_dict('consensus_health', { @@ -628,6 +630,8 @@ def has_authority_flag(latest_consensus, consensuses, votes): if Flag.AUTHORITY in desc.flags: seen_authorities.add(desc.nickname) + seen_authorities.remove('tor26') + known_authorities = set(DIRECTORY_AUTHORITIES.keys()) missing_authorities = known_authorities.difference(seen_authorities) extra_authorities = seen_authorities.difference(known_authorities)

1 0

[tor/release-0.3.3] Bug 24989: Count client hsdir gets towards MaxClientCircuitsPending.
by nickm＠torproject.org 11 Apr '18

11 Apr '18

commit f9ba0c65467fe80f65b3789365cfac874198a337 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jan 24 00:03:24 2018 +0000 Bug 24989: Count client hsdir gets towards MaxClientCircuitsPending. We removed this by breaking them out from general in #13837. --- changes/bug24989 | 4 ++++ src/or/circuituse.c | 2 +- src/or/or.h | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug24989 b/changes/bug24989 new file mode 100644 index 000000000..a0ea6acf0 --- /dev/null +++ b/changes/bug24989 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden services): + - Re-instate counting pending client HSDir fetch circuits against the + MaxClientCircuitsPending rate limit. Fixes bug 24989; bugfix on + 0.3.3.0-alpha-dev. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bc9c4bccb..3125fff65 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -384,7 +384,7 @@ count_pending_general_client_circuits(void) SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) { if (circ->marked_for_close || circ->state == CIRCUIT_STATE_OPEN || - circ->purpose != CIRCUIT_PURPOSE_C_GENERAL || + !CIRCUIT_PURPOSE_COUNTS_TOWARDS_MAXPENDING(circ->purpose) || !CIRCUIT_IS_ORIGIN(circ)) continue; diff --git a/src/or/or.h b/src/or/or.h index 2397f6651..e54d3806e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -586,6 +586,14 @@ typedef enum { /** True iff the circuit_t c is actually an or_circuit_t */ #define CIRCUIT_IS_ORCIRC(c) (((circuit_t *)(c))->magic == OR_CIRCUIT_MAGIC) +/** True iff this circuit purpose should count towards the global + * pending rate limit (set by MaxClientCircuitsPending). We count all + * general purpose circuits, as well as the first step of client onion + * service connections (HSDir gets). */ +#define CIRCUIT_PURPOSE_COUNTS_TOWARDS_MAXPENDING(p) \ + ((p) == CIRCUIT_PURPOSE_C_GENERAL || \ + (p) == CIRCUIT_PURPOSE_C_HSDIR_GET) + /** How many circuits do we want simultaneously in-progress to handle * a given stream? */ #define MIN_CIRCUITS_HANDLING_STREAM 2

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 11 Apr '18

11 Apr '18

commit 0c8f901ee7c3cfd2351e7f6e723998226fabe190 Merge: 6bdfaa8b2 f9ba0c654 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 11 10:48:46 2018 -0400 Merge branch 'maint-0.3.3' changes/bug24989 | 4 ++++ src/or/circuituse.c | 2 +- src/or/or.h | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/master] Bug 24989: Count client hsdir gets towards MaxClientCircuitsPending.
by nickm＠torproject.org 11 Apr '18

11 Apr '18

commit f9ba0c65467fe80f65b3789365cfac874198a337 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jan 24 00:03:24 2018 +0000 Bug 24989: Count client hsdir gets towards MaxClientCircuitsPending. We removed this by breaking them out from general in #13837. --- changes/bug24989 | 4 ++++ src/or/circuituse.c | 2 +- src/or/or.h | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug24989 b/changes/bug24989 new file mode 100644 index 000000000..a0ea6acf0 --- /dev/null +++ b/changes/bug24989 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden services): + - Re-instate counting pending client HSDir fetch circuits against the + MaxClientCircuitsPending rate limit. Fixes bug 24989; bugfix on + 0.3.3.0-alpha-dev. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bc9c4bccb..3125fff65 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -384,7 +384,7 @@ count_pending_general_client_circuits(void) SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) { if (circ->marked_for_close || circ->state == CIRCUIT_STATE_OPEN || - circ->purpose != CIRCUIT_PURPOSE_C_GENERAL || + !CIRCUIT_PURPOSE_COUNTS_TOWARDS_MAXPENDING(circ->purpose) || !CIRCUIT_IS_ORIGIN(circ)) continue; diff --git a/src/or/or.h b/src/or/or.h index 2397f6651..e54d3806e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -586,6 +586,14 @@ typedef enum { /** True iff the circuit_t c is actually an or_circuit_t */ #define CIRCUIT_IS_ORCIRC(c) (((circuit_t *)(c))->magic == OR_CIRCUIT_MAGIC) +/** True iff this circuit purpose should count towards the global + * pending rate limit (set by MaxClientCircuitsPending). We count all + * general purpose circuits, as well as the first step of client onion + * service connections (HSDir gets). */ +#define CIRCUIT_PURPOSE_COUNTS_TOWARDS_MAXPENDING(p) \ + ((p) == CIRCUIT_PURPOSE_C_GENERAL || \ + (p) == CIRCUIT_PURPOSE_C_HSDIR_GET) + /** How many circuits do we want simultaneously in-progress to handle * a given stream? */ #define MIN_CIRCUITS_HANDLING_STREAM 2

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 11 Apr '18

11 Apr '18

commit 6a0b31e5a7db0271c90ef4eb11a14e16a3843d70 Merge: 3230814d2 f9ba0c654 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 11 10:48:46 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24989 | 4 ++++ src/or/circuituse.c | 2 +- src/or/or.h | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.3] Bug 24989: Count client hsdir gets towards MaxClientCircuitsPending.
by nickm＠torproject.org 11 Apr '18

11 Apr '18

commit f9ba0c65467fe80f65b3789365cfac874198a337 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jan 24 00:03:24 2018 +0000 Bug 24989: Count client hsdir gets towards MaxClientCircuitsPending. We removed this by breaking them out from general in #13837. --- changes/bug24989 | 4 ++++ src/or/circuituse.c | 2 +- src/or/or.h | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug24989 b/changes/bug24989 new file mode 100644 index 000000000..a0ea6acf0 --- /dev/null +++ b/changes/bug24989 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden services): + - Re-instate counting pending client HSDir fetch circuits against the + MaxClientCircuitsPending rate limit. Fixes bug 24989; bugfix on + 0.3.3.0-alpha-dev. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bc9c4bccb..3125fff65 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -384,7 +384,7 @@ count_pending_general_client_circuits(void) SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) { if (circ->marked_for_close || circ->state == CIRCUIT_STATE_OPEN || - circ->purpose != CIRCUIT_PURPOSE_C_GENERAL || + !CIRCUIT_PURPOSE_COUNTS_TOWARDS_MAXPENDING(circ->purpose) || !CIRCUIT_IS_ORIGIN(circ)) continue; diff --git a/src/or/or.h b/src/or/or.h index 2397f6651..e54d3806e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -586,6 +586,14 @@ typedef enum { /** True iff the circuit_t c is actually an or_circuit_t */ #define CIRCUIT_IS_ORCIRC(c) (((circuit_t *)(c))->magic == OR_CIRCUIT_MAGIC) +/** True iff this circuit purpose should count towards the global + * pending rate limit (set by MaxClientCircuitsPending). We count all + * general purpose circuits, as well as the first step of client onion + * service connections (HSDir gets). */ +#define CIRCUIT_PURPOSE_COUNTS_TOWARDS_MAXPENDING(p) \ + ((p) == CIRCUIT_PURPOSE_C_GENERAL || \ + (p) == CIRCUIT_PURPOSE_C_HSDIR_GET) + /** How many circuits do we want simultaneously in-progress to handle * a given stream? */ #define MIN_CIRCUITS_HANDLING_STREAM 2

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 11 Apr '18

11 Apr '18

commit 41cab8354017face2f7ccab0c6ef49bcb5298559 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 11 10:50:34 2018 +0000 Update translations for support-tbb --- zh_CN.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.json b/zh_CN.json index f15562e3b..87aa055cb 100644 --- a/zh_CN.json +++ b/zh_CN.json @@ -225,7 +225,7 @@ "id": "#tbb-37", "control": "tbb-37", "title": "我需要Tor Browser的语言不是英语.", - "description": "<p class=\"mb-3\">We currently offer Tor Browser in the following languages:</p><p class=\"mb-3\"><ul><li>English (en-US)</li><li>\"العربية\" (ar)</li><li>Deutsch (de)</li><li>Español (es-ES)</li><li> فارسى (fa)</li><li>Français (fr)</li><li>Italiano (it)</li><li>日本語 (ja)</li><li>Korean (ko)</li><li>Nederlands (nl)</li><li>Polish (pl)</li><li>Português (pt-BR)</li><li>Русский (ru)</li><li>Türkçe (tr)</li><li>Vietnamese (vi)</li><li>简体字 (zh-CN)</li></ul></p>" + "description": "<p class=\"mb-3\">我们现在提供Tor Browser有如下语言:</p><p class=\"mb-3\"><ul><li>English (en-US)</li><li>\"العربية\" (ar)</li><li>Deutsch (de)</li><li>Español (es-ES)</li><li> فارسى (fa)</li><li>Français (fr)</li><li>Italiano (it)</li><li>日本語 (ja)</li><li>Korean (ko)</li><li>Nederlands (nl)</li><li>Polish (pl)</li><li>Português (pt-BR)</li><li>Русский (ru)</li><li>Türkçe (tr)</li><li>Vietnamese (vi)</li><li>简体字 (zh-CN)</li></ul></p>" }, "tbb-38": { "id": "#tbb-38",

1 0

[translation/support-tbb] Update translations for support-tbb
by translation＠torproject.org 11 Apr '18

11 Apr '18

commit 51f859e83ba137b166316a0163677c2bc6f87c9d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 11 10:20:34 2018 +0000 Update translations for support-tbb --- zh_CN.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/zh_CN.json b/zh_CN.json index 70c11f7e4..f15562e3b 100644 --- a/zh_CN.json +++ b/zh_CN.json @@ -86,14 +86,14 @@ "tbb-14": { "id": "#tbb-14", "control": "tbb-14", - "title": "Should I install a new add-on or extension in Tor Browser, like AdBlock Plus or uBlock Origin?", - "description": "<p class=\"mb-3\">It's strongly discouraged to install new add-ons in Tor Browser, because they can compromise both your privacy and your security. Plus, Tor Browser already comes installed with two add-ons — HTTPS Everywhere and NoScript — which give you added protection.</p>" + "title": "我应该在Tor Browser里安装新的扩展程序吗? 例如AdBlock Plus或者uBlock Origin?", + "description": "<p class=\"mb-3\"> 我们强烈不推荐您在Tor Browser中安装新的扩展程序，因为它们会侵犯您的隐私和安全。另外，Tor Browser已经安装了两个扩展程序 — HTTPS Everywhere和NoScript — 它们将会给您额外的保护.</p>" }, "tbb-15": { "id": "#tbb-15", "control": "tbb-15", - "title": "Can I download Tor Browser for ChromeOS?", - "description": "<p class=\"mb-3\">Unfortunately, we don't yet have a version of Tor Browser for ChromeOS.</p>" + "title": "我能为ChromeOS下载Tor Browser吗?", + "description": "<p class=\"mb-3\">很不幸, 我们还没有ChromeOS的Tor Browser版本.</p>" }, "tbb-16": { "id": "#tbb-16", @@ -104,13 +104,13 @@ "tbb-17": { "id": "#tbb-17", "control": "tbb-17", - "title": "Is it safe to run Tor Browser and another browser at the same time?", + "title": "同时运行Tor Browser和其他的浏览器安全吗?", "description": "<p class=\"mb-3\">If you run Tor Browser and another browser at the same time, it won't affect Tor's performance or privacy properties. However, be aware that your other browser is not keeping your activity private, and you may forget and accidentally use that non-private browser to do something that you intended to do in Tor Browser.</p>" }, "tbb-18": { "id": "#tbb-18", "control": "tbb-18", - "title": "Is there support for *BSD?", + "title": "有对*BSD的支持吗?", "description": "<p class=\"mb-3\">Sorry, but there is currently no official support for running Tor Browser on *BSD. There is something called the TorBSD project, but their Tor Browser is not officially supported.</p>" }, "tbb-19": { @@ -134,14 +134,14 @@ "tbb-22": { "id": "#tbb-22", "control": "tbb-22", - "title": "How can I make Tor run faster? Is Tor Browser slower than other browsers?", + "title": "如何能使Tor运行得更快? Tor Browser比其他的浏览器更慢吗?", "description": "<p class=\"mb-3\">Using Tor Browser can sometimes be slower than other browsers. The Tor network has over a million daily users, and just over 6000 relays to route all of their traffic, and the load on each server can sometimes cause latency. You can help improve the speed of the network by running your own relay, or encouraging others to do so. That said, Tor is much faster than it used to be and you may not actually notice any change in speed from other browsers.</p>" }, "tbb-23": { "id": "#tbb-23", "control": "tbb-23", - "title": "What search engine comes with Tor Browser and how does it protect my privacy?", - "description": "<p class=\"mb-3\">DuckDuckGo is the default search engine in Tor Browser. DuckDuckGo does not track its users nor does it store any data about user searches.</p>" + "title": "Tor Browser使用什么搜索引擎，它是如何保护我的隐私的?", + "description": "<p class=\"mb-3\">DuckDuckGo是Tor Browser的默认搜索引擎. DuckDuckGo既不会追踪用户也不会储存任何关于用户搜索的数据.</p>" }, "tbb-24": { "id": "#tbb-24", @@ -164,13 +164,13 @@ "tbb-27": { "id": "#tbb-27", "control": "tbb-27", - "title": "How do I update Tor Browser?", + "title": "我如何更新Tor Browser?", "description": "<p class=\"mb-3\">You can update Tor Browser as soon as a new version is released.</p><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image4.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Tor Browser will prompt you to update the software once a new version has been released.</h4><p class=\"card-text\">The Torbutton icon (the little green onion in the top left corner of the browser) will display a yellow triangle.</p></div></div></div><p class=\"mb-3\">You may see a written indication when Tor Browser opens telling you that an update is available.</p><div class=\"col-md-6\"><div class=\"card\"><img class=\"card-img-top\" src=\"/static/images/image5.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Card title</h4><p class=\"card-text\">Card text</p></div></div></div><p class=\"mb-3\">Tor browser will install the updates.</p><div class=\"col-md-6\"><div clas s=\"card\"><img class=\"card-img-top\" src=\"/static/images/image3.png\" alt=\"New release alert\"><div class=\"card-body\"><h4 class=\"card-title\">Card title</h4><p class=\"card-text\">Card text</p></div></div></div>" }, "tbb-28": { "id": "#tbb-28", "control": "tbb-28", - "title": "How do I uninstall Tor Browser?", + "title": "我如何卸载Tor Browser?", "description": "<p class=\"mb-3\">Removing Tor Browser from your system is simple:</p><p class=\"mb-3\"><ol><li>Locate your Tor Browser folder or application. The default location on Windows is the Desktop; on macOS it is the Applications folder (on macOS, you have to move it into the Applications folder when you complete the installation process). On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser.</li><li>Delete the Tor Browser folder or application.</li><li>Empty your Trash.</li></ol></p><p class=\"mb-3\">Note that your operating system’s standard “Uninstall” utility is not used.</p>" }, "tbb-29": { @@ -206,7 +206,7 @@ "tbb-34": { "id": "#tbb-34", "control": "tbb-34", - "title": "Why does Tor Browser ship with Javascript enabled?", + "title": "为什么Tor Browser的Javascript是启用的?", "description": "<p class=\"mb-3\">We configure NoScript to allow JavaScript by default in Tor Browser because many websites will not work with JavaScript disabled. Most users would give up on Tor entirely if we disabled Javascript by default because it would cause so many problems for them.</p><p class=\"mb-3\">Ultimately, we want to make Tor Browser as secure as possible while also making it usable for the majority of people, so for now, that means leaving Javascript enabled by default. For users who want to have Javascript disabled on all HTTP sites by default, we recommend changing your Tor Browser's security slider (in the Tor Browser Onion menu under \"Security Settings\"). The low/default setting allows Javascript, but the medium and high levels both block Javascript on HTTP sites.</p>" }, "tbb-35": { @@ -224,7 +224,7 @@ "tbb-37": { "id": "#tbb-37", "control": "tbb-37", - "title": "I need Tor Browser in a language that's not English.", + "title": "我需要Tor Browser的语言不是英语.", "description": "<p class=\"mb-3\">We currently offer Tor Browser in the following languages:</p><p class=\"mb-3\"><ul><li>English (en-US)</li><li>\"العربية\" (ar)</li><li>Deutsch (de)</li><li>Español (es-ES)</li><li> فارسى (fa)</li><li>Français (fr)</li><li>Italiano (it)</li><li>日本語 (ja)</li><li>Korean (ko)</li><li>Nederlands (nl)</li><li>Polish (pl)</li><li>Português (pt-BR)</li><li>Русский (ru)</li><li>Türkçe (tr)</li><li>Vietnamese (vi)</li><li>简体字 (zh-CN)</li></ul></p>" }, "tbb-38": { @@ -248,7 +248,7 @@ "tbb-41": { "id": "#tbb-41", "control": "tbb-41", - "title": "Why did my search engine switch to DuckDuckGo?", + "title": "为什么我的搜索引擎换成了DuckDuckGo?", "description": "<p class=\"mb-3\">With the release of Tor Browser 6.0.6, we switched to DuckDuckGo as the primary search engine. For a while now, Disconnect has had no access to Google search results which we used in Tor Browser. Disconnect being more of a meta search engine which allows users to choose between different search providers fell back to delivering Bing search results which were basically unacceptable quality-wise.</p>" }, "tbb-42": {

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 11 Apr '18

11 Apr '18

commit f0e400f76e9ea0a53f75bab5f4eb192e81258387 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 11 10:16:44 2018 +0000 Update translations for tails-misc_completed --- zh_CN.po | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index e79a38ec9..8395a7ab6 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,6 +10,7 @@ # Meng San, 2014 # Lafrenze Laurant, 2018 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 +# dull2wall, 2018 # Sanya chang <408070986(a)qq.com>, 2013 # khi, 2014 # Xiaolan <xiaolan(a)protonmail.ch>, 2014 @@ -19,9 +20,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-01 16:34+0100\n" -"PO-Revision-Date: 2018-03-06 12:42+0000\n" -"Last-Translator: Lafrenze Laurant\n" +"POT-Creation-Date: 2018-03-12 19:03+0100\n" +"PO-Revision-Date: 2018-04-11 09:49+0000\n" +"Last-Translator: dull2wall\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,7 +85,6 @@ msgid "Restart" msgstr "重新启动" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:78 -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:147 msgid "Lock screen" msgstr "屏幕锁定" @@ -208,22 +208,30 @@ msgid "" msgstr "MAC 欺骗对 ${nic_name} (${nic}) 失败。错误恢复也一同失败，所以所有网络已被禁用。\n您可能宁愿重启 Tails 并禁用 MAC 欺骗。" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109 -msgid "Set up a password to unlock the screen" +msgid "Lock Screen" +msgstr "锁定屏幕" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 +#: config/chroot_local-includes/usr/local/bin/tor-browser:46 +msgid "Cancel" +msgstr "取消" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124 +msgid "Screen Locker" +msgstr "屏幕锁" + +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130 +msgid "Set up a password to unlock the screen." msgstr "设定解锁屏幕的密码" -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:115 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135 msgid "Password" msgstr "密码" -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:122 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141 msgid "Confirm" msgstr "确认" -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:155 -#: config/chroot_local-includes/usr/local/bin/tor-browser:46 -msgid "Cancel" -msgstr "取消" - #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:35 msgid "" "\"<b>Not enough memory available to check for upgrades.</b>\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 11 Apr '18

11 Apr '18

commit cdadd01cc98b4d52c9b29128f2193f1371fc4961 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 11 10:16:39 2018 +0000 Update translations for tails-misc --- zh_CN.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index 7ee308c1d..8395a7ab6 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,6 +10,7 @@ # Meng San, 2014 # Lafrenze Laurant, 2018 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 +# dull2wall, 2018 # Sanya chang <408070986(a)qq.com>, 2013 # khi, 2014 # Xiaolan <xiaolan(a)protonmail.ch>, 2014 @@ -20,8 +21,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-13 02:48+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-04-11 09:49+0000\n" +"Last-Translator: dull2wall\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -208,7 +209,7 @@ msgstr "MAC 欺骗对 ${nic_name} (${nic}) 失败。错误恢复也一同失败 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109 msgid "Lock Screen" -msgstr "" +msgstr "锁定屏幕" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 @@ -217,11 +218,11 @@ msgstr "取消" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124 msgid "Screen Locker" -msgstr "" +msgstr "屏幕锁" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130 msgid "Set up a password to unlock the screen." -msgstr "" +msgstr "设定解锁屏幕的密码" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135 msgid "Password"

1 0