March 2020 - tor-commits - lists.torproject.org

[translation/tor-launcher-properties] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties
by translation＠torproject.org 14 Mar '20

14 Mar '20

commit 4cf045b74743b80b18f871565db27fa502838783 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Mar 14 00:23:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- fa/torlauncher.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fa/torlauncher.properties b/fa/torlauncher.properties index c5674abba6..5dabff753d 100644 --- a/fa/torlauncher.properties +++ b/fa/torlauncher.properties @@ -58,9 +58,9 @@ torlauncher.bootstrapStatus.conn_pt=در حال اتصال به پل torlauncher.bootstrapStatus.conn_done_pt=اتصال به پل برقرار شد torlauncher.bootstrapStatus.conn_proxy=در حال اتصال به پراکسی torlauncher.bootstrapStatus.conn_done_proxy=اتصال به پراکسی برقرار شد -torlauncher.bootstrapStatus.conn=در حال اتصال به یک پل Tor -torlauncher.bootstrapStatus.conn_done=به یک پل Tor متصل شد -torlauncher.bootstrapStatus.handshake=در حال مذاکره با یک پل Tor +torlauncher.bootstrapStatus.conn=در حال اتصال به یک رله ی Tor +torlauncher.bootstrapStatus.conn_done=به یک رله ی Tor متصل شد +torlauncher.bootstrapStatus.handshake=در حال مذاکره با یک رله ی Tor torlauncher.bootstrapStatus.handshake_done=مذاکره با یک پل Tor انجام شد torlauncher.bootstrapStatus.onehop_create=برپایی یک اتصال فهرست رمزبندی شده torlauncher.bootstrapStatus.requesting_status=بازیابی وضیعت شبکه @@ -68,7 +68,7 @@ torlauncher.bootstrapStatus.loading_status=بارگذاری وضیعت شبکه torlauncher.bootstrapStatus.loading_keys=بارگذاری مجوز ها torlauncher.bootstrapStatus.requesting_descriptors=درخواست اطلاعات باز پخش torlauncher.bootstrapStatus.loading_descriptors=بارگذاری اطلاعات بازپخش -torlauncher.bootstrapStatus.enough_dirinfo=بارگذاری اطلاعات پل انجام شد +torlauncher.bootstrapStatus.enough_dirinfo=بارگذاری اطلاعات رله به پایان رسید. torlauncher.bootstrapStatus.ap_conn_pt=برقراری مسیریاب: در حال اتصال به یک پل torlauncher.bootstrapStatus.ap_conn_done_pt=برقراری مسیریاب: به پل متصل شد torlauncher.bootstrapStatus.ap_conn_proxy=برقراری مسیریاب: در حال اتصال به پراکسی @@ -90,6 +90,6 @@ torlauncher.bootstrapWarning.noroute=نبود مسیر به میزبان torlauncher.bootstrapWarning.ioerror=خطای خواندن/نوشتن torlauncher.bootstrapWarning.pt_missing=انتقال جایگزین مفقود است. -torlauncher.nsresult.NS_ERROR_NET_RESET=ارتباط با کارساز از دست رفت. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=اتصال به کارساز امکان پذیر نمی‌باشد. +torlauncher.nsresult.NS_ERROR_NET_RESET=ارتباط با سرور از دست رفت. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=اتصال به سرور امکان پذیر نمی‌باشد. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=اتصال به پروکسی امکان پذیر نمی‌باشد.

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 14 Mar '20

14 Mar '20

commit 73758cb1d5eef4f5122b798d99e5b30e5c4949c0 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 23:46:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- fa/https-everywhere.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index c67597b066..4ed828a164 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -49,6 +49,12 @@ <!ENTITY https-everywhere.cancel.open_page ""> <!ENTITY https-everywhere.cancel.http_once ""> +<!ENTITY https-everywhere.onboarding.intro ""> +<!ENTITY https-everywhere.onboarding.header ""> +<!ENTITY https-everywhere.onboarding.details_one ""> +<!ENTITY https-everywhere.onboarding.details_two ""> +<!ENTITY https-everywhere.onboarding.footer ""> + <!ENTITY https-everywhere.chrome.settings_for_this_site_header ""> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader ""> <!ENTITY https-everywhere.chrome.settings_for_this_site_explained "">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 14 Mar '20

14 Mar '20

commit f5cbe0a198aebb533006672b304651d120e65676 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 23:46:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- fa/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index 1844983d35..9e34fa87ee 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -50,10 +50,10 @@ <!ENTITY https-everywhere.cancel.http_once "تنها برای این نشست صفحه نا‌امن باز کن"> <!ENTITY https-everywhere.onboarding.intro "وب را رمزگذاری کنید! از امنیت HTTPS بصورت خودکار برای بسیاری از وب‌سایت‌ها استفاده کنید."> -<!ENTITY https-everywhere.onboarding.header "Changes with version 3.9.2020"> -<!ENTITY https-everywhere.onboarding.details_one "EASE Mode Optimized"> -<!ENTITY https-everywhere.onboarding.details_two "You can now whitelist sites to disable in HTTPS Everywhere"> -<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere is an EFF project"> +<!ENTITY https-everywhere.onboarding.header "تغییرات با نسخه ی 3.9.2020"> +<!ENTITY https-everywhere.onboarding.details_one "بهینه شده با حالت EASE"> +<!ENTITY https-everywhere.onboarding.details_two "شما اکنون میتوانید از لیست سفید سایت ها برای غیرفعال شدن در HTTPS Everywhere استفاده کنید."> +<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere یک پروژه ی EFF است."> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "تنظیمات برای این سایت"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "تنظیمات خود را برای ارتباط رمزگذاری تغییر دهید">

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 14 Mar '20

14 Mar '20

commit ac56bf4e4aa64dd661c87d1e9786df4062212c4d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 13 23:45:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- fa/LC_MESSAGES/bridgedb.po | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po index 5f79dda597..f206b3fd20 100644 --- a/fa/LC_MESSAGES/bridgedb.po +++ b/fa/LC_MESSAGES/bridgedb.po @@ -18,13 +18,14 @@ # perspolis <rezarms(a)yahoo.com>, 2011 # masoudd <relive.mn(a)gmail.com>, 2018 # Setareh <setareh.salehee(a)gmail.com>, 2014 +# Seyyed Hossein Darvari <xhdix(a)yahoo.com>, 2020 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-05 01:11+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2020-02-18 13:39-0800\n" +"PO-Revision-Date: 2020-03-13 23:37+0000\n" +"Last-Translator: Seyyed Hossein Darvari <xhdix(a)yahoo.com>\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,13 +58,10 @@ msgstr "" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" -#. "obfs2" -#. "obfs3" -#. "scramblesuit" -#. "fteproxy" +#. "obfs4" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:138 +#: bridgedb/distributors/https/server.py:135 msgid "Sorry! Something went wrong with your request." msgstr "متاسفانه در رابطه با درخواست شما خطایی رخ داده است." @@ -284,7 +282,7 @@ msgid "" "\n" msgstr "همچنین BridgeDB شامل تعداد زیادی پل های ابتدایی و قدیمی است که %s Pluggable Transports ندارند %s و ممکن است بی مصرف به نظر برسند اما همچنان ممکن است در موارد متعددی جهت دور زدن فیلترینگ به شما کمک کنند.\n" -#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356 msgid "What are bridges?" msgstr "پل ها چه هستند؟" @@ -305,7 +303,7 @@ msgid "" "empty and write \"get transport obfs4\" in the email's message body. Please note\n" "that you must send the email using an address from one of the following email\n" "providers: %s or %s." -msgstr "" +msgstr "یک راه دیگر برای دریافت پل ها، فرستادن ایمیل به %s است. \nعنوان را خالی بگذارید و در متن پیام \"get transport obfs4\" بنویسید. \nلطفا توجه داشته باشید که شما باید ایمیل را از طریق یکی از سرویس دهنده های \nایمیل %s یا %s ارسال کنید." #: bridgedb/strings.py:117 msgid "My bridges don't work! I need help!"

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 1df4221eedba403f4badbc39d761b8385973ff30 Merge: 51a2802a0 a255ca9b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:57:42 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit a255ca9b1228e70088cd6fd624dbcca86a9376ae Merge: 938487d4b 2f4fa423c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:57:27 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 "ours" to avoid version bump.

1 0

[tor/release-0.4.3] Bump to 0.3.5.10
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit d17108a187e32a4d5464d2428b8943702c6d5cde Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:56:31 2020 -0400 Bump to 0.3.5.10 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 834fea073..da158eb23 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.9-dev]) +AC_INIT([tor],[0.3.5.10]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 9eeb32822..8f5f38963 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.5.9-dev" +!define VERSION "0.3.5.10" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index baad733d0..42e3e1a4c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.5.9-dev" +#define VERSION "0.3.5.10"

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 2f4fa423c30c81092f06fb97c20f5d281b3cfac7 Merge: 2c1a49c46 7a9e2a261 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:57:03 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump.

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.1
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 7a9e2a261b44b93e244c04593dee8f7757ba32bc Merge: 7f0ad3343 d17108a18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:56:44 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 "ours" to avoid version bump.

1 0

[tor/release-0.4.3] Bump to 0.4.1.9
by nickm＠torproject.org 13 Mar '20

13 Mar '20

commit 7f0ad3343e2139f368f896ca44f8a9d9d84e6346 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 13 16:56:22 2020 -0400 Bump to 0.4.1.9 --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 48f3dfc00..1d6b8ee15 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.1.8-dev]) +AC_INIT([tor],[0.4.1.9]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-30"], # for 0.4.1.8-dev +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-03-13"], # for 0.4.1.9 [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 40783299c..01f5a5740 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.1.8-dev" +!define VERSION "0.4.1.9" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index c23dfe7bb..9e5d1d47c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.1.8-dev" +#define VERSION "0.4.1.9"

1 0