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

[translation/torbutton-brandproperties_completed] Update translations for torbutton-brandproperties_completed
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit 84a8a352131a2f4e305f2da8590b3d778d29f1f2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 19:17:33 2018 +0000 Update translations for torbutton-brandproperties_completed --- fa/brand.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fa/brand.properties b/fa/brand.properties index f5ec5a296..b602d0ab8 100644 --- a/fa/brand.properties +++ b/fa/brand.properties @@ -7,10 +7,10 @@ brandShortName=مرورگر تور brandFullName=مرورگر تور vendorShortName=پروژه تور -homePageSingleStartMain=صفحهٔ Firefox Start, صفحهٔ خانگی تند با موتور جستجو -homePageImport=صفحه‌ٔ خانگیتان‌را از %S وارد كنيد +homePageSingleStartMain=شروع بکار فایرفاکس، یک صفحه اصلی با قابلیت کادر جستجو ایجاد شد. +homePageImport=درون‌ریزی صفحه خانگی از %S -homePageMigrationPageTitle=انتخاب صفحهٔ خانگی -homePageMigrationDescription=لطفاً صفحه خانگی مورد نظر خود را انتخاب نمایید: +homePageMigrationPageTitle=انتخاب صفحه اصلی +homePageMigrationDescription=لطفا صفحه اصلی مورد نظر خود را انتخاب کنید: syncBrandShortName=همگام‌ سازی

1 0

[translation/torbutton-brandproperties] Update translations for torbutton-brandproperties
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit c3f68e74e6ff02bfc3b92e6982315870683e0349 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 19:17:27 2018 +0000 Update translations for torbutton-brandproperties --- fa/brand.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fa/brand.properties b/fa/brand.properties index f5ec5a296..b602d0ab8 100644 --- a/fa/brand.properties +++ b/fa/brand.properties @@ -7,10 +7,10 @@ brandShortName=مرورگر تور brandFullName=مرورگر تور vendorShortName=پروژه تور -homePageSingleStartMain=صفحهٔ Firefox Start, صفحهٔ خانگی تند با موتور جستجو -homePageImport=صفحه‌ٔ خانگیتان‌را از %S وارد كنيد +homePageSingleStartMain=شروع بکار فایرفاکس، یک صفحه اصلی با قابلیت کادر جستجو ایجاد شد. +homePageImport=درون‌ریزی صفحه خانگی از %S -homePageMigrationPageTitle=انتخاب صفحهٔ خانگی -homePageMigrationDescription=لطفاً صفحه خانگی مورد نظر خود را انتخاب نمایید: +homePageMigrationPageTitle=انتخاب صفحه اصلی +homePageMigrationDescription=لطفا صفحه اصلی مورد نظر خود را انتخاب کنید: syncBrandShortName=همگام‌ سازی

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit 095f2176c573d9d66e2303965a3d6937e61675b1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 19:17:19 2018 +0000 Update translations for tor-browser-manual --- fa/fa.po | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 47d520bff..883381ee8 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -1,5 +1,6 @@ # Translators: # Mohammad Hossein Mojtahedi <Mhm5000(a)gmail.com>, 2016 +# A.Mehraban <Mehr.Ban(a)chmail.ir>, 2016 # wtf <hmn23(a)yahoo.com>, 2016 # greenwave <green.dove1388(a)gmail.com>, 2016 # ardeshir, 2016 @@ -31,7 +32,7 @@ msgstr "" #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2 msgctxt "_" msgid "translator-credits" -msgstr "اعتبار-مترجم" +msgstr "مترجم - اعتبارات" #: about-tor-browser.page:7 msgid "Learn what Tor Browser can do to protect your privacy and anonymity" @@ -41,7 +42,7 @@ msgstr "" #: about-tor-browser.page:10 msgid "About Tor Browser" -msgstr "درباره مرورگر Tor" +msgstr "درباره مرورگر تور" #: about-tor-browser.page:12 msgid "" @@ -1000,6 +1001,8 @@ msgid "" "Tor Browser is based on Firefox, and any browser add-ons or themes that are " "compatible with Firefox can also be installed in Tor Browser." msgstr "" +"مرورگر تور بر پایه فایرفاکس است و هر افزودنی یا پوسته‌هایی که با فایرفاکس " +"سازگار هستند نیز می‌توانند در مرورگر تور نصب شوند." #: plugins.page:65 msgid "" @@ -1199,11 +1202,11 @@ msgstr "" #: translate.page:6 msgid "Becoming a translator for the Tor Project" -msgstr "" +msgstr "شما هم جزو مترجمین پروژه تور شوید" #: translate.page:10 msgid "Becoming a Tor Translator" -msgstr "" +msgstr "مترجم تور شوید" #: translate.page:12 msgid "" @@ -1216,17 +1219,21 @@ msgstr "" #: translate.page:21 msgid "Signing up on Transifex" -msgstr "" +msgstr "ثبت‌نام در ترانسِ‌فِکس - Transifex" #: translate.page:24 msgid "" "Head over to the <link href=\"https://transifex.com/signup/\">Transifex " "signup page</link>." msgstr "" +"به صفحه ثبت نام <link " +"href=\"https://transifex.com/signup/\">Transifex</link> بروید." #: translate.page:30 msgid "Enter your information into the fields and click the 'Sign Up' button:" msgstr "" +"اطلاعات خود را در زمینه‌های مربوطه وارد کنید و سپس بر روی دکمه ثبت‌نام کلیک " +"کنید:" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1238,12 +1245,16 @@ msgid "" "external ref='media/translate/tr1.png' " "md5='a94cfd90c9982916a987e2807ae5e4f6'" msgstr "" +"external ref='media/translate/tr1.png' " +"md5='a94cfd90c9982916a987e2807ae5e4f6'" #: translate.page:38 msgid "" "Fill out the next page with your name and select \"Localization\" and " "\"Translator\" from the drop-down menus:" msgstr "" +"صفحه بعدی را با نام خود تکمیل و از منوی کشویی «محلی سازی» و «مترجم» را " +"انتخاب کنید:" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1645,8 +1656,8 @@ msgid "" "(see the <link xref=\"uninstalling\">Uninstalling</link> section for more " "information)." msgstr "" -"مرورگر تور را با حذف کردن پوشه حاوی آن, از سیستم خود حذف کنید (برای اطلاعات بیشتر لینک را مشاهده کنید\n" -"R <link xref=\"uninstalling\">Uninstalling</link> )" +"با پاک کردن پوشه حاوی مرورگر تور، این مرورگر را حذف کنید. (برای کسب اطلاعات " +"بیشتر بر روی <link xref=\"uninstalling\">حذف</link> کلیک کنید)" #: updating.page:74 msgid ""

1 0

[tor/master] Add a missing function for windows
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 035166e7bf30645f6da9d39374f5e9c9efe867f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 15:02:11 2018 -0400 Add a missing function for windows --- src/lib/process/daemon.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/process/daemon.c b/src/lib/process/daemon.c index 9fc31eb2e..ab3ac73ad 100644 --- a/src/lib/process/daemon.c +++ b/src/lib/process/daemon.c @@ -178,4 +178,10 @@ finish_daemon(const char *cp) (void)cp; return 0; } +bool +start_daemon_has_been_called(void) +{ + return false; +} + #endif /* !defined(_WIN32) */

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit b8a2b88a2ef80be2b397cb55e4cb639c10c3183d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 18:49:09 2018 +0000 Update translations for support-portal --- contents+bn_BD.po | 3 +++ contents+ca.po | 5 ++++- contents+de.po | 3 +++ contents+el.po | 3 +++ contents+fa.po | 3 +++ contents+fr.po | 3 +++ contents+pt_BR.po | 5 ++++- contents+ru.po | 3 +++ contents+zh_CN.po | 2 ++ 9 files changed, 28 insertions(+), 2 deletions(-) diff --git a/contents+bn_BD.po b/contents+bn_BD.po index 9a78ea4db..6bf934d37 100644 --- a/contents+bn_BD.po +++ b/contents+bn_BD.po @@ -3322,6 +3322,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a> in the following languages:" msgstr "" +"বর্তমানে আমরা নিম্নলিখিত ব্রাউজারগুলিতে <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">টর " +"ব্রাউজার</a> প্রস্তাব করছি:" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) diff --git a/contents+ca.po b/contents+ca.po index 3e8fe56cc..064c23f3f 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -5,7 +5,7 @@ # Josep Anton Rius <j.rius.cat(a)gmail.com>, 2018 # Miquel Bosch, 2018 # icc <mail(a)koopic.net>, 2018 -# Adolfo Jayme-Barrientos, 2018 +# Adolfo Jayme Barrientos, 2018 # Bartges90, 2018 # Aleix Vidal i Gaya <aleix.vidal(a)gmail.com>, 2018 # Emma Peel, 2018 @@ -3378,6 +3378,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a> in the following languages:" msgstr "" +"Actualment oferim el <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">navegador " +"Tor</a> en els idiomes següents:" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) diff --git a/contents+de.po b/contents+de.po index 4808e2ca4..3eb06d4d2 100644 --- a/contents+de.po +++ b/contents+de.po @@ -3383,6 +3383,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a> in the following languages:" msgstr "" +"Aktuell bieten wir <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " +"Browser</a> in folgenden Sprachen an:" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) diff --git a/contents+el.po b/contents+el.po index fd0ec69b3..0d2d4b00c 100644 --- a/contents+el.po +++ b/contents+el.po @@ -2985,6 +2985,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a> in the following languages:" msgstr "" +"Παρέχουμε τον <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " +"Browser</a> στις παρακάτω γλώσσες:" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) diff --git a/contents+fa.po b/contents+fa.po index e95786b22..560d084d2 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -2914,6 +2914,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a> in the following languages:" msgstr "" +"<a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">مرورگر " +"تور</a> در حال حاضر به زبان‌های زیر در دسترس است:" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) diff --git a/contents+fr.po b/contents+fr.po index 494d91962..826c32af5 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3437,6 +3437,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a> in the following languages:" msgstr "" +"Nous proposons actuellement le <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Navigateur " +"Tor</a> dans les langues suivantes :" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) diff --git a/contents+pt_BR.po b/contents+pt_BR.po index e27c50731..494da6c20 100644 --- a/contents+pt_BR.po +++ b/contents+pt_BR.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-14 11:54+CET\n" +"POT-Creation-Date: 2018-09-13 22:35+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kordycepts, The Night City <kordycepts(a)protonmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" @@ -3381,6 +3381,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a> in the following languages:" msgstr "" +"Atualmente nós oferecemos o <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Navegador " +"Tor</a> nos seguintes idiomas:" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) diff --git a/contents+ru.po b/contents+ru.po index ff0217178..03f6b41fc 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -3120,6 +3120,9 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a> in the following languages:" msgstr "" +"В настоящее время <a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " +"Browser</a> доступен на следующих языках:" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index b5def7721..964235551 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -2893,6 +2893,8 @@ msgid "" "href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor " "Browser</a> in the following languages:" msgstr "" +"<a " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\">Tor浏览器目</a>前提供这些语言：" #: http//localhost/tormessenger/ #: (content/tormessenger/contents+en.lrtopic.title)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit ca32d14b4ca901555684918db616d76a8896716e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 18:19:17 2018 +0000 Update translations for support-portal --- contents+el.po | 6 +++--- contents+zh_CN.po | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/contents+el.po b/contents+el.po index c06980caa..fd0ec69b3 100644 --- a/contents+el.po +++ b/contents+el.po @@ -285,7 +285,7 @@ msgstr "Όχι." #: http//localhost/tbb/tbb-25/ #: (content/tbb/tbb-25/contents+en.lrquestion.seo_slug) msgid "problem-noscript" -msgstr "" +msgstr "πρόβλημα-δενυπάρχεισκριπτ" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -299,7 +299,7 @@ msgstr "" #: http//localhost/tbb/tbb-32/ #: (content/tbb/tbb-32/contents+en.lrquestion.seo_slug) msgid "setting-tor-browser-as-default" -msgstr "" +msgstr "θέτοντας-τον-Tor-πεοεπιλεγμένο-περιηγητή" #: http//localhost/tbb/tbb-15/ #: (content/tbb/tbb-15/contents+en.lrquestion.description) @@ -311,7 +311,7 @@ msgstr "" #: http//localhost/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) msgid "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" -msgstr "" +msgstr "<img class=\"\" src=\"/static/images/image5.png\" alt=\"New release alert\">" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.title) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index 0ad893f67..b5def7721 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -697,9 +697,8 @@ msgid "" "href=\"https://www.torproject.org/docs/pluggable-" "transports.html.en\">pluggable transports</a>." msgstr "" -"在被严重监视的地区，我们提供许多规避监管的选项，譬如可插拔传输<a " -"href=\"https://www.torproject.org/docs/pluggable-" -"transports.html.en\">。" +"在被严重监视的地区，我们提供许多规避监管的选项，譬如<a href=\"https://www.torproject.org/docs" +"/pluggable-transports.html.en\">可插拔传输</a>。" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit 5b9a539f70bd1de6485ae162626090c7eafab860 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 17:49:28 2018 +0000 Update translations for support-portal --- contents+zh_CN.po | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index 6bffee976..0ad893f67 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -696,7 +696,10 @@ msgid "" "circumvention options available, including <a " "href=\"https://www.torproject.org/docs/pluggable-" "transports.html.en\">pluggable transports</a>." -msgstr "在被严重监视的地区，我们提供许多规避监管的选项，譬如可插拔传输。" +msgstr "" +"在被严重监视的地区，我们提供许多规避监管的选项，譬如可插拔传输<a " +"href=\"https://www.torproject.org/docs/pluggable-" +"transports.html.en\">。" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) @@ -3420,6 +3423,8 @@ msgid "" "href=\"https://blog.torproject.org\">blog</a> for future " "announcements and details regarding this project." msgstr "" +"请查看我们的 <a href=\"https://blog.torproject.org\">博客</a> " +"获取关于将来这个项目的细节与公告。" #: http//localhost/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) @@ -3455,7 +3460,7 @@ msgstr "我能修改tor网络中的跳跃次数吗？" #: http//localhost/tbb/tbb-2/ #: (content/tbb/tbb-2/contents+en.lrquestion.description) msgid "The first relay in your circuit is called an \"entry guard\" or \"guard\"." -msgstr "" +msgstr "您连接的中继回路中的第一个节点通常被称为“入口节点”或是“护卫”。" #: http//localhost/tbb/tbb-16/ #: (content/tbb/tbb-16/contents+en.lrquestion.title)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 14 Sep '18

14 Sep '18

commit b1d6eccbb6e48d107c98309f72008ad6682f726a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 14 17:19:32 2018 +0000 Update translations for support-portal --- contents+zh_CN.po | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/contents+zh_CN.po b/contents+zh_CN.po index c51681b8b..6bffee976 100644 --- a/contents+zh_CN.po +++ b/contents+zh_CN.po @@ -585,7 +585,7 @@ msgstr "什么是守卫者项目（Guardian Project）?" msgid "" "If you are still unable to connect to the onion service, please try again " "later." -msgstr "" +msgstr "如果您还是无法访问这个网站，请稍后重试。" #: http//localhost/tormobile/tormobile-3/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.description) @@ -620,12 +620,12 @@ msgstr "为什么tor用duckduckgo" msgid "" "You should see one of these common log errors (look for the following lines " "in your Tor log):" -msgstr "" +msgstr "您应该能够在粘贴的Tor日志中发现这些常见问题（请在Tor日志里寻找如下所示的错误）:" #: http//localhost/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "<h4 class=\"card-title\">New Circuit for this Site</h4>" -msgstr "" +msgstr "<h4 class=\"card-title\">为此站点使用新线路</h4>" #: http//localhost/tbb/tbb-3/ #: (content/tbb/tbb-3/contents+en.lrquestion.seo_slug) @@ -655,6 +655,7 @@ msgid "" "rights activists, journalists, abuse survivors, and other people who use Tor" " for good things." msgstr "" +"我们厌恶用tor做糟糕的事情的人，但是我们并不能在剔除他们的同时，不伤害到人权活动者，记者，虐待后的幸存者们，以及其他用tor做好事的人们。" #: http//localhost/operators/ (content/operators/contents+en.lrtopic.seo_slug) msgid "operators" @@ -674,6 +675,8 @@ msgid "" "href=\"https://www.torproject.org\">website</a>, you can get a copy " "of Tor delivered to you via GetTor." msgstr "" +"如果无法通过我们的 <a href=\"https://www.torproject.org\">网站</a>下载 " +"Tor，你可以通过 GetTor 获取 Tor。" #: http//localhost/tbb/tbb-34/ #: (content/tbb/tbb-34/contents+en.lrquestion.description) @@ -693,7 +696,7 @@ msgid "" "circumvention options available, including <a " "href=\"https://www.torproject.org/docs/pluggable-" "transports.html.en\">pluggable transports</a>." -msgstr "" +msgstr "在被严重监视的地区，我们提供许多规避监管的选项，譬如可插拔传输。" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) @@ -831,6 +834,8 @@ msgid "" "For more information about bridges, see the <a href=\"https://tb-" "manual.torproject.org/en-US/bridges.html\">Tor Browser manual</a>." msgstr "" +"关于网桥的更多信息请参阅 <a href=\"https://tb-manual.torproject.org/en-" +"US/bridges.html\">Tor Browser 用户手册</a>。" #: http//localhost/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.description) @@ -985,6 +990,8 @@ msgid "" "If you are unable to connect to an onion service, please see <a " "href=\"/#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" +"如果你平时只在某个特定的国家使用他们的服务，从其他国家进行访问时你的账号可能就会被冻结。如无法连接 onion 服务，请参阅 <a " +"href=\"/#onionservices-3\">无法连接 x.onion！</a>" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -1571,6 +1578,8 @@ msgid "" "If you are unable to connect to an onion service, please see <a " "href=\"#onionservices-3\">I cannot reach X.onion!</a>" msgstr "" +"如果你平时只在某个特定的国家使用他们的服务，从其他国家进行访问时你的账号可能就会被冻结。如无法连接 onion 服务，请参阅 <a " +"href=\"/#onionservices-3\">无法连接 x.onion！</a>" #: http//localhost/tbb/tbb-33/ #: (content/tbb/tbb-33/contents+en.lrquestion.description) @@ -2130,7 +2139,7 @@ msgstr "" msgid "" "Tor Browser will prompt you to update the software once a new version has " "been released." -msgstr "" +msgstr "每当 Tor 浏览器有更新版被发布时，都会有提示自动出现。" #: http//localhost/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -2176,6 +2185,8 @@ msgid "" "11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor " "network" msgstr "" +"11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor " +"network" #: http//localhost/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description) @@ -2250,7 +2261,7 @@ msgstr "" msgid "" "If you don't remember what this destination was, it's most likely your " "Downloads or Desktop folder." -msgstr "" +msgstr "如果您忘记了它位于哪里，那么最大的可能性它会位于桌面或者下载文件夹。" #: http//localhost/connecting/connecting-2/ #: (content/connecting/connecting-2/contents+en.lrquestion.description) @@ -2260,6 +2271,8 @@ msgid "" "13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) " "with SSL state SSLv2/v3 read server hello A in HANDSHAKE" msgstr "" +"13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) " +"with SSL state SSLv2/v3 read server hello A in HANDSHAKE" #: http//localhost/tbb/tbb-7/ #: (content/tbb/tbb-7/contents+en.lrquestion.description) @@ -2268,12 +2281,12 @@ msgstr "" msgid "" "Sometimes websites will block Tor users because they can't tell the " "difference between the average Tor user and automated traffic." -msgstr "" +msgstr "有些网站屏蔽了 Tor 因为他们无法分辨出普通 Tor 用户和机器人的区别。" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "$ lsb_release -c" -msgstr "" +msgstr "$ lsb_release -c" #: http//localhost/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.seo_slug) @@ -2351,6 +2364,8 @@ msgid "" "<a href=\"https://blog.torproject.org/tor-heart-onion-browser-and-" "more-ios-tor\">Learn more about Onion Browser</a>." msgstr "" +"<a href=\"https://blog.torproject.org/tor-heart-onion-browser-and-" +"more-ios-tor\">了解更多关于洋葱浏览器</a>。" #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -2522,6 +2537,8 @@ msgid "" "19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to directory " "server" msgstr "" +"19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to directory " +"server" #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description) @@ -2529,7 +2546,7 @@ msgid "" "The only way to resolve this is by following the site’s recommended " "procedure for account recovery, or contacting the operators and explaining " "the situation." -msgstr "" +msgstr "要解决此情况的唯一方式是利用网站服务提供的帐号恢复功能，或直接向该网站服务的提供业者说明您的情况。" #: http//localhost/connecting/connecting-1/ #: (content/connecting/connecting-1/contents+en.lrquestion.description) @@ -3418,6 +3435,7 @@ msgstr "torproject.org 被屏蔽了，怎么下载 Tor？" msgid "" "19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" msgstr "" +"19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150" #: http//localhost/tormobile/tormobile-4/ #: (content/tormobile/tormobile-4/contents+en.lrquestion.seo_slug) @@ -3427,7 +3445,7 @@ msgstr "" #: http//localhost/operators/operators-3/ #: (content/operators/operators-3/contents+en.lrquestion.description) msgid "Log notice file /var/log/tor/notices.log" -msgstr "" +msgstr "Log notice file /var/log/tor/notices.log" #: http//localhost/misc/misc-11/ #: (content/misc/misc-11/contents+en.lrquestion.title)

1 0

[tor/master] Explicitly ignore BIO_set_close() return val to fix #27711
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit af39649aade3da87ac23ad62605e2273f92d9d47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 13:09:10 2018 -0400 Explicitly ignore BIO_set_close() return val to fix #27711 --- src/lib/tls/tortls_openssl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 534a90de5..227225b96 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -1169,10 +1169,10 @@ tor_tls_release_socket(tor_tls_t *tls) wbio = SSL_get_wbio(tls->ssl); if (rbio) { - BIO_set_close(rbio, BIO_NOCLOSE); + (void) BIO_set_close(rbio, BIO_NOCLOSE); } if (wbio && wbio != rbio) { - BIO_set_close(wbio, BIO_NOCLOSE); + (void) BIO_set_close(wbio, BIO_NOCLOSE); } }

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit a546e07600151be275e6134407c2bcb833a3dd97 Merge: 281854bab 0971b3ce4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 12:56:30 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27335 | 4 ++++ src/or/hs_service.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0