- tor-commits - lists.torproject.org

[gettor/master] Update license
by cohosh＠torproject.org 22 Apr '20

22 Apr '20

commit a85474e3e3fb8990f56ddc47446b0058b66d2e96 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Apr 13 16:40:54 2020 -0400 Update license --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 530ff57..bbc331e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ GetTor is distributed under this license: -Copyright (c) 2008-2014, The Tor Project, Inc. +Copyright (c) 2008-2020, The Tor Project, Inc. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -28,4 +28,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[gettor/master] Remove old mirror API
by cohosh＠torproject.org 22 Apr '20

22 Apr '20

commit 1f2080412c54b44280b54e7de71da1545874840d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Apr 13 16:44:53 2020 -0400 Remove old mirror API This isn't called by any other code and hasn't worked for a long time. --- gettor/web/http.py | 491 ----------------------------------------------------- 1 file changed, 491 deletions(-) diff --git a/gettor/web/http.py b/gettor/web/http.py deleted file mode 100644 index 2801db0..0000000 --- a/gettor/web/http.py +++ /dev/null @@ -1,491 +0,0 @@ -# -*- coding: utf-8 -*- -# -# This file is part of GetTor. -# -# :authors: Israel Leiva <ilv(a)torproject.org> -# see also AUTHORS file -# -# :copyright: (c) 2008-2015, The Tor Project, Inc. -# (c) 2015, Israel Leiva -# -# :license: This is Free Software. See LICENSE for license information. - -import os -import re -import json -import codecs -import urllib2 -import configparser - -from time import gmtime, strftime - -import core - -""" -GetTor RESTful API -This part of GetTor has not been integrated into twisted-gettor just yet. -""" - -# currently supported locales for Tor Browser -LC = ['ar', 'de', 'en-US', 'es-ES', 'fa', 'fr', 'it', 'ko', 'nl', 'pl', - 'pt-PT', 'ru', 'tr', 'vi', 'zh-CN'] - -# https://gitweb.tpo/tor-browser-spec.git/tree/processes/VersionNumbers -# does not say anything about operating systems, so it's possible the -# notation might change in the future. We should always use the same three -# strings though: linux, windows, osx. -OS = { - 'Linux': 'linux', - 'Windows': 'windows', - 'MacOS': 'osx' -} - -# based on -# https://gitweb.tpo.org/tor-browser-spec.git/tree/processes/VersionNumbers -# except for the first one, which is based on current RecommendedTBBVersions -RE = { - 'os': '(.*)-(\w+)', - 'alpha': '\d\.\d(\.\d)*a\d+', - 'stable': '\d\.\d(\.\d)*' -} - -# strings to build names of packages depending on OS. -PKG = { - 'windows': 'torbrowser-install-%s_%s.exe', - 'linux': 'tor-browser-linux%s-%s_%s.tar.xz', - 'osx': 'TorBrowser-%s-osx64_%s.dmg' -} - -# bin and asc are used to build the download links for each version, os and lc -URL = { - 'version': 'https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions', - 'bin': 'https://www.torproject.org/dist/torbrowser/%s/%s', - 'asc': 'https://www.torproject.org/dist/torbrowser/%s/%s.asc' -} - - - -class ConfigError(Exception): - pass - - -class InternalError(Exception): - pass - - -class HTTP(object): - """ Provide useful resources via RESTful API. """ - def __init__(self, cfg=None): - """ Create new object by reading a configuration file. - - :param: cfg (string) path of the configuration file. - - """ - default_cfg = 'http.cfg' - config = ConfigParser.ConfigParser() - - if cfg is None or not os.path.isfile(cfg): - cfg = default_cfg - - try: - with open(cfg) as f: - config.readfp(f) - except IOError: - raise ConfigError("File %s not found!" % cfg) - - try: - # path to static tree of API - self.tree = config.get('general', 'tree') - # server that provides the RESTful API - self.server = config.get('general', 'url') - # path to the links files - self.links_path = config.get('general', 'links') - # path to mirrors in json - self.mirrors_path = config.get('general', 'mirrors') - - # we will ask gettor.core for the links - core_cfg = config.get('general', 'core') - self.core = core.Core(core_cfg) - - except ConfigParser.Error as e: - raise ConfigError("Configuration error: %s" % str(e)) - except core.ConfigError as e: - raise InternalError("HTTP error: %s" % str(e)) - - def _is_json(self, my_json): - """ Check if json generated is valid. - - :param: my_json (string) data to ve verified. - - :return: (bool) true if data is json-valid, false otherwise. - - """ - try: - json_object = json.loads(my_json) - except ValueError, e: - return False - return True - - def _write_json(self, path, content): - """ - """ - try: - with codecs.open( - path, - "w", - "utf-8" - ) as jsonfile: - # Make pretty json - json.dump( - content, - jsonfile, - sort_keys=True, - indent=4, - separators=(',', ': '), - encoding="utf-8", - ) - except IOError as e: - #logging.error("Couldn't write json: %s" % str(e)) - print "Error building %s: %s" % (path, str(e)) - print "%s built" % path - - def _get_provider_name(self, p): - """ Return simplified version of provider's name. - - :param: p (string) provider's name. - - :return: (string) provider's name in lowercase and without spaces. - - """ - p = p.replace(' ', '-') - return p.lower() - - def _add_links(self, lv, release, version, os): - """ Add link for all locales in LC depending on given OS. - - :param: lv (dict) latest version data structure. - :param: release (string) release to which add the links. - :param: version (string) version obtained from tpo. - :param: os (string) operating system. - - """ - for lc in LC: - if os == 'linux': - pkg32 = PKG['linux'] % ('32', version, lc) - link_bin32 = URL['bin'] % (version, pkg32) - link_asc32 = URL['asc'] % (version, pkg32) - - pkg64 = PKG['linux'] % ('64', version, lc) - link_bin64 = URL['bin'] % (version, pkg64) - link_asc64 = URL['asc'] % (version, pkg64) - - lv[release]['downloads'][os][lc] = { - 'binary32': link_bin32, - 'signature32': link_asc32, - 'binary64': link_bin64, - 'signature64': link_asc64, - } - else: - if os == 'windows': - pkg = PKG['windows'] % (version, lc) - - elif os == 'osx': - pkg = PKG['osx'] % (version, lc) - - else: - continue - - link_bin = URL['bin'] % (version, pkg) - link_asc = URL['asc'] % (version, pkg) - lv[release]['downloads'][os][lc] = { - 'binary': link_bin, - 'signature': link_asc - } - - def _load_latest_version(self): - """ Load latest version data. """ - response = urllib2.urlopen(URL['version']) - json_response = json.load(response) - - lv = { - 'stable': { - 'latest_version': '', - 'downloads': {} - }, - 'alpha': { - 'latest_version': '', - 'downloads': {} - } - } - - self.releases = { - 'alpha': '%s/latest/alpha' % self.server, - 'stable': '%s/latest/stable' % self.server, - 'updated_at': strftime("%Y-%m-%d %H:%M:%S", gmtime()) - } - - # one iteration to find the latest version for each release - for v in json_response: - # latest version for each release - if not re.match(RE['os'], v): - if re.match(RE['alpha'], v): - if v > lv['alpha']['latest_version']: - # we'll use the latest one - lv['alpha']['latest_version'] = v - - elif re.match(RE['stable'], v): - if v > lv['stable']['latest_version']: - # we'll use the latest one - lv['stable']['latest_version'] = v - - latest_alpha = lv['alpha']['latest_version'] - latest_stable = lv['stable']['latest_version'] - - # another iteration to add the links - for v in json_response: - # based on current RecommendedTBBVersions scheme - # for each release and for each os we build links for all locales - if re.match(RE['os'], v): - m = re.match(RE['os'], v) - version = m.group(1) - osys = m.group(2) - - if osys in OS: - if latest_alpha and version == latest_alpha \ - and re.match(RE['alpha'], version): - lv['alpha']['downloads'][OS[osys]] = {} - self._add_links(lv, 'alpha', version, OS[osys]) - - elif latest_stable and version == latest_stable \ - and re.match(RE['stable'], version): - lv['stable']['downloads'][OS[osys]] = {} - self._add_links(lv, 'stable', version, OS[osys]) - - lv['updated_at'] = strftime("%Y-%m-%d %H:%M:%S", gmtime()) - self.lv = lv - - def _load_links(self): - """ Load links and providers data. """ - links_files = [] - - # look for files ending with .links in links_path - p = re.compile('.*\.links$') - for name in os.listdir(self.links_path): - path = os.path.abspath(os.path.join(self.links_path, name)) - if os.path.isfile(path) and p.match(path): - links_files.append(path) - - links = {} - providers = {} - supported_os = self.core.get_supported_os() - supported_lc = self.core.get_supported_lc() - - for name in links_files: - config = ConfigParser.ConfigParser() - try: - with open(name) as f: - config.readfp(f) - except IOError: - raise InternalError("File %s not found!" % name) - - try: - pname = config.get('provider', 'name') - pname = self._get_provider_name(pname) - - # build providers dict - providers[pname] = '%s/providers/%s' % (self.server, pname) - providers['updated_at'] = strftime( - "%Y-%m-%d %H:%M:%S", gmtime() - ) - - self.providers = providers - links[pname] = {} - - # build links data. - for osys in supported_os: - links[pname][osys] = {} - for lc in supported_lc: - links[pname][osys][lc] = {} - - for osys in supported_os: - for lc in supported_lc: - l_str = config.get(osys, lc) - - # linux has 32 and 64 bit packages - if osys == 'linux': - l32_str, l64_str = l_str.split(',') - - link32, sig32, sha32 = [ - l for l in l32_str.split("$") if l - ] - - link64, sig64, sha64 = [ - l for l in l64_str.split("$") if l - ] - link64 = link64.lstrip() - - links[pname][osys][lc]['binary32'] = link32 - links[pname][osys][lc]['signature32'] = sig32 - links[pname][osys][lc]['sha256-32'] = sha32 - links[pname][osys][lc]['binary64'] = link64 - links[pname][osys][lc]['signature64'] = sig64 - links[pname][osys][lc]['sha256-64'] = sha64 - - else: - link, sig, sha = [l for l in l_str.split("$") if l] - links[pname][osys][lc]['binary'] = link - links[pname][osys][lc]['signature'] = sig - links[pname][osys][lc]['sha256'] = sha - - except ConfigParser.Error as e: - raise InternalError("%s" % str(e)) - - links['updated_at'] = strftime("%Y-%m-%d %H:%M:%S", gmtime()) - self.links = links - - def _load_mirrors(self): - """ Load mirrors data. """ - mirrors = [] - - # json of mirrors should be obtained from get_mirrors.py - json_data = open(self.mirrors_path).read() - mirrors = json.loads(json_data) - - self.mirrors = mirrors - - def _load_resources(self): - """ Load available resources data. """ - - self.resources = { - 'providers': '%s/providers' % self.server, - 'mirrors': '%s/mirrors' % self.server, - 'latest_version': '%s/latest' % self.server, - 'updated_at': strftime("%Y-%m-%d %H:%M:%S", gmtime()) - } - - def load_data(self): - """ Load all data. - - Since data is not frequently updated, we load all data before - running the RESTful API. Every time the links/mirrors/version - data is updated we should restart the API. - - """ - self._load_links() - self._load_mirrors() - self._load_resources() - self._load_latest_version() - - def build(self): - """ Build RESTful API. """ - - print "Building API" - - # resources - self._write_json( - os.path.join(self.tree, 'api'), - self.resources - ) - - api_path = os.path.join(self.tree, 'api-content') - if not os.path.isdir(api_path): - os.mkdir(api_path) - - # providers - self._write_json( - os.path.join(api_path, 'providers'), - self.providers - ) - - providers_path = os.path.join(api_path, 'providers-content') - if not os.path.isdir(providers_path): - os.mkdir(providers_path) - - for provider in self.links: - if provider == 'updated_at': - continue - - self._write_json( - os.path.join(providers_path, provider), - self.links[provider] - ) - - provider_path = os.path.join( - providers_path, - "%s-content" % provider - ) - - if not os.path.isdir(provider_path): - os.mkdir(provider_path) - - for osys in self.links[provider]: - self._write_json( - os.path.join(provider_path, osys), - self.links[provider][osys] - ) - - provider_os_path = os.path.join( - provider_path, "%s-content" % osys - ) - - if not os.path.isdir(provider_os_path): - os.mkdir(provider_os_path) - - for lc in self.links[provider][osys]: - self._write_json( - os.path.join(provider_os_path, lc), - self.links[provider][osys][lc] - ) - - # latest version - self._write_json( - os.path.join(api_path, 'latest'), - self.lv - ) - - lv_path = os.path.join(api_path, 'latest-content') - if not os.path.isdir(lv_path): - os.mkdir(lv_path) - - for release in self.lv: - if release == 'updated_at': - continue - - self._write_json( - os.path.join(lv_path, release), - self.lv[release] - ) - - release_path = os.path.join( - lv_path, - "%s-content" % release - ) - - if not os.path.isdir(release_path): - os.mkdir(release_path) - - for osys in self.lv[release]['downloads']: - self._write_json( - os.path.join(release_path, osys), - self.lv[release]['downloads'][osys] - ) - - release_os_path = os.path.join( - release_path, - "%s-content" % osys - ) - - if not os.path.isdir(release_os_path): - os.mkdir(release_os_path) - - for lc in self.lv[release]['downloads'][osys]: - self._write_json( - os.path.join(release_os_path, lc), - self.lv[release]['downloads'][osys][lc] - ) - - # mirrors - self._write_json( - os.path.join(api_path, 'mirrors'), - self.mirrors - )

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 22 Apr '20

22 Apr '20

commit 8375fa340018cd92c205add52d92dc766da247fc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 19:23:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/contents+fa.po b/contents+fa.po index 69ee0dc9a9..5df59580fa 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -10514,6 +10514,8 @@ msgid "" "In the past they have not been reliably updated. That means you could be " "missing stability and security fixes." msgstr "" +"در گذشته به صورت قابل اعتمادی به روز رسانی نشده اند. بنابراین ممکن است فاقد " +"اصلاحات امنیتی و پایداری باشد." #: https//support.torproject.org/apt/tor-ubuntu/ #: (content/apt/apt-2/contents+en.lrquestion.description) @@ -11202,6 +11204,9 @@ msgid "" "FBI sends you a polite email, you explain that you run a Tor relay, and they" " say \"oh well\" and leave you alone. [Port 80]" msgstr "" +"- شخصی به هات میل وصل می شود، و از شرکت اخاذی می کند. اف بی آی به شما یک " +"نامه محترمانه می فرستد، شما توضیح می دهید که یک رلهٔ تور اجرا می کنید، ان ها" +" می گویند \"اوه متوجهیم\" و شما را به حال خودتان می گذارند. [درگاه 80]" #: https//support.torproject.org/abuse/exit-relay-expectations/ #: (content/abuse/exit-relay-expectations/contents+en.lrquestion.description) @@ -11210,6 +11215,10 @@ msgid "" "groups and post spam to Usenet, and then sends an angry mail to your ISP " "about how you're destroying the world. [Port 80]" msgstr "" +"- شخصی سعی می کند تا در کار شما با وصل شدن از طریق تور در گروه های گوگل و " +"اسپم کردن در Usenet دردسر ایجاد کند، سپس یک پست الکترونیکی به ارائه دهنده " +"خدمات اینترنتی شما می فرستد و درباره اینکه شما چگونه در حال خرابکاری هستید " +"اعتراض می کند. [درگاه 80]" #: https//support.torproject.org/abuse/exit-relay-expectations/ #: (content/abuse/exit-relay-expectations/contents+en.lrquestion.description) @@ -11218,6 +11227,10 @@ msgid "" "ISP gets polite mail about how your computer has been compromised; and/or " "your computer gets DDoSed. [Port 6667]" msgstr "" +"- شخصی به شبکه IRC وصل می شود و مزاحمت ایجاد می کند. ارائه دهنده خدمات " +"اینترنتی شما یک پست الکترونیکی محترمانه درباره اینکه چگونه کامپیوتر شما هک " +"شده است دریافت می کند; و/یا کامپیوتر شما تحت حمله منع سرویس توزیع شده قرار " +"می گیرد. [درگاه 6667]" #: https//support.torproject.org/abuse/exit-relay-expectations/ #: (content/abuse/exit-relay-expectations/contents+en.lrquestion.description) @@ -11228,6 +11241,13 @@ msgid "" "tor-legal-faq/tor-dmca-response/), which explains why your ISP can probably " "ignore the notice without any liability. [Arbitrary ports]" msgstr "" +"- شخصی از تور برای دانلود یک فیلم وین دیزل استفاده می کند، و ارائه دهنده " +"خدمات اینترنتی یک اخطاریه قانون کپی‌رایت هزاره دیجیتال دریافت می کند. لطفاً " +"[قالب پاسخ قانون کپی‌رایت هزاره دیجیتال " +"تور](https://community.torproject.org/relay/community-resources/eff-tor-" +"legal-faq/tor-dmca-response/) EFF را ببینید که توضیح می دهد چرا ارائه دهنده " +"خدمات اینترنتی می تواند از اخطاریه بدون قبول مسئولیت چشم پوشی کند. [درگاه " +"های قراردادی]" #: https//support.torproject.org/abuse/exit-relay-expectations/ #: (content/abuse/exit-relay-expectations/contents+en.lrquestion.description) @@ -11237,6 +11257,10 @@ msgid "" "wiki](https://community.torproject.org/relay/community-resources/good-bad-" "isps/)." msgstr "" +"برخی ارائه دهندگان میزبانی از سایر ارائه دهندگان در موضوع خروجی تور بهتر " +"رفتار می کنند. میتوانید [ویکی ارائه دهندگان خدمات اینترنتی خوب و " +"بد](https://community.torproject.org/relay/community-resources/good-bad-" +"isps/) را ببینید." #: https//support.torproject.org/abuse/exit-relay-expectations/ #: (content/abuse/exit-relay-expectations/contents+en.lrquestion.description) @@ -11245,6 +11269,9 @@ msgid "" " see the [collection of templates](https://community.torproject.org/relay" "/community-resources/tor-abuse-templates/)." msgstr "" +"برای دیدن یک دسته کامل از قالب پاسخ ها به شکایت های سو استفاده، لطفاً " +"[مجموعه قالب‌ها](https://community.torproject.org/relay/community-resources" +"/tor-abuse-templates/) را ببینید." #: https//support.torproject.org/abuse/exit-relay-expectations/ #: (content/abuse/exit-relay-expectations/contents+en.lrquestion.description) @@ -11341,6 +11368,9 @@ msgid "" "/user-research/persona/), we feel that we're doing pretty well at striking a" " balance currently." msgstr "" +"از آنجایی که تور [استفاده های خوب](https://community.torproject.org/user-" +"research/persona/) بسیاری نیز دارد، ما احساس می کنیم که کار خوبی در نگه " +"داشتن تعادل انجام می دهیم." #: https//support.torproject.org/abuse/tor-ip-for-legal-case/ #: (content/abuse/ip-legal-case/contents+en.lrquestion.title)

1 0

[translation/tor-launcher-properties_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
by translation＠torproject.org 22 Apr '20

22 Apr '20

commit adf1aa3f2db7fe28687c8ec5652b060cddec63ba Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 19:22:37 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- zh-CN/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/torlauncher.properties b/zh-CN/torlauncher.properties index 760cd139ff..54bdfccd22 100644 --- a/zh-CN/torlauncher.properties +++ b/zh-CN/torlauncher.properties @@ -77,7 +77,7 @@ torlauncher.bootstrapStatus.ap_conn=建立链路：正在连接到 Tor 中继 torlauncher.bootstrapStatus.ap_conn_done=建立链路：已连接到 Tor 中继 torlauncher.bootstrapStatus.ap_handshake=建立链路：与 Tor 中继交涉中 torlauncher.bootstrapStatus.ap_handshake_done=建立链路：与一个 Tor 中继交涉完毕 -torlauncher.bootstrapStatus.circuit_create=建立链路：建立一个 Tor 链路中 +torlauncher.bootstrapStatus.circuit_create=建立链路：正在建立 Tor 链路 torlauncher.bootstrapStatus.done=Tor 网络已经连接！ torlauncher.bootstrapWarning.done=完成

1 0

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

22 Apr '20

commit 8a1c48d62facc789bd7b7ca565c6c53d449560e4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 19:22:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper… --- zh-CN/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/torlauncher.properties b/zh-CN/torlauncher.properties index 760cd139ff..54bdfccd22 100644 --- a/zh-CN/torlauncher.properties +++ b/zh-CN/torlauncher.properties @@ -77,7 +77,7 @@ torlauncher.bootstrapStatus.ap_conn=建立链路：正在连接到 Tor 中继 torlauncher.bootstrapStatus.ap_conn_done=建立链路：已连接到 Tor 中继 torlauncher.bootstrapStatus.ap_handshake=建立链路：与 Tor 中继交涉中 torlauncher.bootstrapStatus.ap_handshake_done=建立链路：与一个 Tor 中继交涉完毕 -torlauncher.bootstrapStatus.circuit_create=建立链路：建立一个 Tor 链路中 +torlauncher.bootstrapStatus.circuit_create=建立链路：正在建立 Tor 链路 torlauncher.bootstrapStatus.done=Tor 网络已经连接！ torlauncher.bootstrapWarning.done=完成

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 22 Apr '20

22 Apr '20

commit 482133907fae36be05da2d1c939e6f0265dd42df Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 18:53:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index f904e0a6c7..69ee0dc9a9 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -4364,6 +4364,9 @@ msgid "" "(\"≡\")](../../glossary/hamburger-menu), then click on \"Preferences\", and " "finally on \"Tor\" in the side bar." msgstr "" +"هنگامی که مرورگر تور باز می باشد، می توانید به [منوی همبرگری " +"(\"≡\")](../../glossary/hamburger-menu) رفته، سپس روی \"ترجیحات\" کلیک کرده " +"و در پایان روی \"تور\" در نوار کناری کلیک کنید." #: https//support.torproject.org/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.description) @@ -4564,6 +4567,8 @@ msgid "" "Both options are located in the [hamburger menu (\"≡\")](../../glossary" "/hamburger-menu)." msgstr "" +"هر دو گزینه در [منوی همبرگری (\"≡\")](../../glossary/hamburger-menu) قرار " +"گرفته اند." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -8680,7 +8685,7 @@ msgstr "" #: (content/metrics/bridges-reports/contents+en.lrquestion.description) msgid "" "Once more bridges report these data, the numbers will become more accurate." -msgstr "" +msgstr "هر وقت پل‌ها این داده ها را گزارش کردند، اعداد دقیق تر خواهند شد." #: https//support.torproject.org/metrics/censorship-events/ #: (content/metrics/censorship-events/contents+en.lrquestion.title) @@ -8765,6 +8770,8 @@ msgid "" "The reason is that we publish user numbers once we're confident enough that " "they won't change significantly anymore." msgstr "" +"دلیل آن این است که ما زمانی تعداد کاربران را منتشر می کنیم که مطمئن باشیم به" +" صورت قابل توجهی تغییر نخواهند کرد." #: https//support.torproject.org/metrics/graph-data-point/ #: (content/metrics/graph-data-point/contents+en.lrquestion.description) @@ -8845,7 +8852,7 @@ msgstr "" #: https//support.torproject.org/metrics/user-estimation/ #: (content/metrics/user-estimation/contents+en.lrquestion.title) msgid "How is it even possible to count users in an anonymity network?" -msgstr "" +msgstr "شمارش کاربران در یک شبکه ناشناس چگونه امکان پذیر است؟" #: https//support.torproject.org/metrics/user-estimation/ #: (content/metrics/user-estimation/contents+en.lrquestion.description) @@ -8854,6 +8861,9 @@ msgid "" " clients make periodically to update their list of relays and estimate user " "numbers indirectly from there." msgstr "" +"در واقع ما کاربران را نمی شماریم، درخواست های به دایرکتوری که کلاینت‌ها به " +"صورت دوره ای برای به روز رسانی رله‌ها انجام می دهند را می شماریم و تعداد " +"کاربران را به صورت غیرمستقیم از آنجا تخمین می زنیم." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.title) @@ -8868,6 +8878,10 @@ msgid "" "but not all clients are connected 24/7, so we picked the number 10 for the " "average client." msgstr "" +"ما فرض می کنیم که هر کلاینت به صورت میانگین 10 درخواست روزانه انجام می دهد. " +"یک کلاینت تور که 24/7 متصل می باشد حدود 15 درخواست روزانه انجام می دهد، ولی " +"تمام کلاینت‌ها به صورت 24/7 متصل نیستند، بنابراین ما عدد 10 را برای کلاینت " +"میانگین انتخاب کردیم." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.description) @@ -10310,6 +10324,10 @@ msgid "" "version of Tor, this might not always give you the latest stable Tor " "version. Therefore, it's recommended to install `tor` from our repository." msgstr "" +"پروژه تور [مخزن بسته دبیان](https://deb.torproject.org) خود را نگهداری می " +"کند. از آنجایی که دبیان نسخه پشتیبانی بلندمدت تور را فارهم می کند، ممکن است " +"آخرین نسخه پایدار تور را به شما ندهد. بنابراین، توصیه می شود `tor` را از " +"مخزن ما نصب کنید." #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description) @@ -10327,6 +10345,9 @@ msgid "" "should have access to a user account with system administration privileges, " "e.g your user should be in the sudo group." msgstr "" +"> **توجه:** نشان # اشاره به اجرا کد به صورت روت دارد. این یعنی شما به یک " +"حساب کاربری با حق ادمین سیستم دسترسی دارید، کاربر شما باید در گروه sudo " +"باشد." #: https//support.torproject.org/apt/tor-deb-repo/ #: (content/apt/apt-1/contents+en.lrquestion.description)

1 0

[translation/tba-torbrowserstringsdtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd_completed
by translation＠torproject.org 22 Apr '20

22 Apr '20

commit 117b052275096fba88f39b7657e4e04fa611ef93 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 18:50:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- zh-CN/torbrowser_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/torbrowser_strings.dtd b/zh-CN/torbrowser_strings.dtd index 4238b75464..6896559dc7 100644 --- a/zh-CN/torbrowser_strings.dtd +++ b/zh-CN/torbrowser_strings.dtd @@ -26,7 +26,7 @@ <!ENTITY tor_bootstrap_swipe_for_logs "左划以显示 Tor 日志"> <!ENTITY tor_bootstrap_connect "连接"> -<!ENTITY tor_bootstrap_starting_status "正在连接到 Tor 网络……"> +<!ENTITY tor_bootstrap_starting_status "正在连接 Tor 网络…"> <!ENTITY pref_tor_network_title "网络"> <!ENTITY pref_tor_select_a_bridge_title "选择网桥">

1 0

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 22 Apr '20

22 Apr '20

commit 88dccb1379f3b0130b3aa6a7f990a85ef2eabf8b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 18:50:04 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- zh-CN/torbrowser_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/torbrowser_strings.dtd b/zh-CN/torbrowser_strings.dtd index 4238b75464..6896559dc7 100644 --- a/zh-CN/torbrowser_strings.dtd +++ b/zh-CN/torbrowser_strings.dtd @@ -26,7 +26,7 @@ <!ENTITY tor_bootstrap_swipe_for_logs "左划以显示 Tor 日志"> <!ENTITY tor_bootstrap_connect "连接"> -<!ENTITY tor_bootstrap_starting_status "正在连接到 Tor 网络……"> +<!ENTITY tor_bootstrap_starting_status "正在连接 Tor 网络…"> <!ENTITY pref_tor_network_title "网络"> <!ENTITY pref_tor_select_a_bridge_title "选择网桥">

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 22 Apr '20

22 Apr '20

commit 9f19bdfd41f7d0b14506c9e32161501c5027ec94 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 18:45:37 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/fa/LC_MESSAGES/messages.po | 41 ++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/locale/fa/LC_MESSAGES/messages.po b/locale/fa/LC_MESSAGES/messages.po index 32f7c9b4f3..9e370e3b2d 100644 --- a/locale/fa/LC_MESSAGES/messages.po +++ b/locale/fa/LC_MESSAGES/messages.po @@ -17,11 +17,11 @@ # Samaneh M <asamana.haoma(a)gmail.com>, 2019 # A.Mehraban <Mehr.Ban(a)chmail.ir>, 2019 # AmirAli Dabouei <amirgm.info(a)gmail.com>, 2020 -# magnifico, 2020 +# Reza Ghasemi, 2020 # msgid "" msgstr "" -"Last-Translator: magnifico, 2020\n" +"Last-Translator: Reza Ghasemi, 2020\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "Language: fa\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -374,7 +374,7 @@ msgstr "اهدا از طریق BTCPayServer" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:126 msgid "Donate using wallet addresses" -msgstr "" +msgstr "اهدا با استفاده از نشانی های کیف پول" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:166 msgid "Copied" @@ -540,7 +540,7 @@ msgstr "مهارتی دارید؟" #: tmp/cache_locale/60/60fb10a60dd92fe380a6d105fd68d9375e135c65251f204fa37158d9c2e655d9.php:172 #: tmp/cache_locale/12/12677df2d2a5991edb775c6909b7be7ca718fd00abd6950a809cda5ab878d2ce.php:115 msgid "The Tor network depends on volunteers." -msgstr "" +msgstr "شبکه تور متکی به داوطلبان می‌باشد." #: tmp/cache_locale/ca/ca1cd152d40544030a642d8d074e6afb769c3bf80a1b2b61c380f1466e3a03a4.php:157 #: tmp/cache_locale/af/afda2fbd22ed389453e63ca9acc074a25ce820b5bc97120edfd975cf8f46634a.php:127 @@ -792,7 +792,7 @@ msgstr "CVC" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:399 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:472 msgid "Choose your size and fit." -msgstr "" +msgstr "اندازه خود را انتخاب کنید." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:405 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:413 @@ -939,7 +939,7 @@ msgstr "شرکت" #: tmp/cache_locale/b5/b5f4f095d469d66a47aef1a351e119240dbf0291056fdb85b216534a25e91fef.php:78 #: tmp/cache_locale/08/08a9b06344a88c9ea01db4cdf9711c9cee305183a512ae0e8b7381dae8c6d798.php:60 msgid "Matching Conditions" -msgstr "" +msgstr "شرایط تطابق" #: tmp/cache_locale/b5/b5f4f095d469d66a47aef1a351e119240dbf0291056fdb85b216534a25e91fef.php:86 #: tmp/cache_locale/08/08a9b06344a88c9ea01db4cdf9711c9cee305183a512ae0e8b7381dae8c6d798.php:68 @@ -1015,7 +1015,7 @@ msgstr "" #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:59 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:41 msgid "Estimated Donation Date:" -msgstr "" +msgstr "تاریخ اهدا برآورد شده:" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:83 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:101 @@ -1090,12 +1090,12 @@ msgstr "" #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:49 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:31 msgid "Subscribe to Our Newsletter" -msgstr "" +msgstr "اشتراک در خبرنامه ما" #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:53 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:35 msgid "Get monthly updates and opportunities from the Tor Project." -msgstr "" +msgstr "دریافت به‌روز‌رسانی‌های ماهانه و فرصت‌ها از پروژه تور" #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:57 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:39 @@ -1119,6 +1119,9 @@ msgid "" "href=\"https://www.giantrabbit.com/\" class=\"stamp-bold\" " "target=\"_blank\">Giant Rabbit</a></span>" msgstr "" +"طراحی و ساخت توسط <span class=\"stamp-bold\"><a " +"href=\"https://www.giantrabbit.com/\" class=\"stamp-bold\" " +"target=\"_blank\">Giant Rabbit</a></span> " #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:53 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:34 @@ -1378,6 +1381,9 @@ msgid "" "<a class=\"hyperlinks links\" href=\"https://youtu.be/JWII85UlzKw\" " "target=\"_blank\">Watch this video</a> to learn more about how Tor works." msgstr "" +"برای یادگیری بیشتر درباره نحوه کار تور <a class=\"hyperlinks links\" " +"href=\"https://youtu.be/JWII85UlzKw\" target=\"_blank\">این ویدئو را تماشا " +"کنید</a>." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:237 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:154 @@ -1385,6 +1391,8 @@ msgid "" "I would like to know more about how Tor works, what onion services are, or " "how to run a relay." msgstr "" +"می خواهم درباره نحوه کار تور، اینکه سرویس های پیازی چه هستند، نحوه اجرا یک " +"رله بیشتر یاد بگیرم." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:241 msgid "" @@ -1535,7 +1543,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:311 msgid "The Tor Project spends about $5 million annually." -msgstr "" +msgstr "پروژه تور سالانه 5 میلیون دلار هزینه می کند." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:313 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:230 @@ -1544,6 +1552,7 @@ msgid "" "About 80% of the Tor Project's spending goes to staffing, mostly software " "engineers." msgstr "" +"حدود 80% مخارج پروژه تور صرف کارکنان، عمدتاً مهندسان نرم افزار می شود. " #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:315 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:232 @@ -1562,7 +1571,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:323 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:240 msgid "Is my donation tax-deductible?" -msgstr "" +msgstr "آیا اهدا من شامل کسر مالیات می شود؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:327 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:244 @@ -1574,7 +1583,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:329 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:246 msgid "Following is information you may need for reporting purposes:" -msgstr "" +msgstr "این‌ها اطلاعاتی هستند که شاید برای گزارش دادن به آن نیاز داشته باشید:" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:334 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:251 @@ -1755,7 +1764,7 @@ msgstr "می توانم در هنگام استفاده از مرورگر تور #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:437 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:298 msgid "Yes! In our testing, donation works via Tor Browser." -msgstr "" +msgstr "بله! در آزمایش ما، اهدا از طریق مرورگر تور کار می کند." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:439 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:300 @@ -1806,7 +1815,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:467 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:324 msgid "Why do you ask for my address and similar information?" -msgstr "" +msgstr "چرا شما نشانی من و اطلاعاتی از این قبیل را می خواهید؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:471 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:328 @@ -1851,7 +1860,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:493 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:350 msgid "Is there a maximum donation?" -msgstr "" +msgstr "آیا میزان بیشینه ای برای اهدا وجود دارد؟" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:497 msgid "Nope." @@ -1979,7 +1988,7 @@ msgstr "" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:587 msgid "Account Name: The Tor Project" -msgstr "" +msgstr "نام حساب: پروژه تور" #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:591 msgid "Contact: Jeffrey K. Miller: 206.464.3564"

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 22 Apr '20

22 Apr '20

commit 89bc128d421c53d375b02eab169fd4d047971b5e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 22 18:23:47 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+fa.po b/contents+fa.po index 19dca6fd1c..f904e0a6c7 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -8776,7 +8776,7 @@ msgstr "" #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.title) msgid "Why do the graphs end 2 days in the past and not today?" -msgstr "" +msgstr "چرا گراف ها در 2 روز گذشته پایان یافته اند و نه امروز؟" #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.description) @@ -11264,6 +11264,8 @@ msgid "" "(If you have a spare IP not used for other activities, you might consider " "running your Tor relay on it.)" msgstr "" +"(اگر یک IP اضافی دارید که برای فعالیت های دیگر استفاده نمی کنید، شاید " +"بخواهید رله تور خود را روی آن اجرا کنید.)" #: https//support.torproject.org/abuse/exit-relay-expectations/ #: (content/abuse/exit-relay-expectations/contents+en.lrquestion.description)

1 0