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

[tor/master] man: Fix -help typo to --help
by asn＠torproject.org 02 Jul '19

02 Jul '19

commit f446db59e1fc3f87f1312defbb12894ad006d978 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jun 27 14:47:11 2019 -0400 man: Fix -help typo to --help Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket31008 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket31008 b/changes/ticket31008 new file mode 100644 index 000000000..c7077de6c --- /dev/null +++ b/changes/ticket31008 @@ -0,0 +1,3 @@ + o Documentation (tor.1 man page): + - Fix typo -help to --help in tor.1 man page. Fixes bug 31008; bugfix on + 0.2.2.9-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 975a19818..3909a829b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -37,7 +37,7 @@ Project's website. COMMAND-LINE OPTIONS -------------------- -[[opt-h]] **-h**, **-help**:: +[[opt-h]] **-h**, **--help**:: Display a short help message and exit. [[opt-f]] **-f** __FILE__::

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket31008_035_01'
by asn＠torproject.org 02 Jul '19

02 Jul '19

commit 15e28af2d18b26b9ec4eda4bc2e84ed8465a166f Merge: c0ea6f9c6 f446db59e Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 2 13:19:40 2019 +0300 Merge remote-tracking branch 'dgoulet/ticket31008_035_01' changes/ticket31008 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 1552627 - pt 2, r=dveditz
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit 0be8d76933ec1e36553f1bfaffb261169757fa77 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Mon May 20 06:19:51 2019 +0000 Bug 1552627 - pt 2, r=dveditz Depends on D31722 Differential Revision: https://phabricator.services.mozilla.com/D31723 --HG-- extra : moz-landing-system : lando --- modules/libpref/init/all.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index dfcd043cac75..7793f3c201b6 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1631,6 +1631,9 @@ pref("network.protocol-handler.external.hcp", false); pref("network.protocol-handler.external.vbscript", false); pref("network.protocol-handler.external.javascript", false); pref("network.protocol-handler.external.data", false); +pref("network.protocol-handler.external.ie.http", false); +pref("network.protocol-handler.external.iehistory", false); +pref("network.protocol-handler.external.ierss", false); pref("network.protocol-handler.external.ms-help", false); pref("network.protocol-handler.external.res", false); pref("network.protocol-handler.external.shell", false);

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 1549833, r=valentin
by gk＠torproject.org 02 Jul '19

02 Jul '19

commit 35560e850f9dbf29e18895b3e55ad9b4e684cd24 Author: Gijs Kruitbosch <gijskruitbosch(a)gmail.com> Date: Tue May 7 23:23:30 2019 +0100 Bug 1549833, r=valentin Differential Revision: https://phabricator.services.mozilla.com//D30285 --HG-- extra : rebase_source : dcd2ecd154c5423143f449f52411eda32c61a972 --- modules/libpref/init/all.js | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 5b1d0a1c8972..dfcd043cac75 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1632,6 +1632,7 @@ pref("network.protocol-handler.external.vbscript", false); pref("network.protocol-handler.external.javascript", false); pref("network.protocol-handler.external.data", false); pref("network.protocol-handler.external.ms-help", false); +pref("network.protocol-handler.external.res", false); pref("network.protocol-handler.external.shell", false); pref("network.protocol-handler.external.vnd.ms.radio", false); #ifdef XP_MACOSX

1 0

[onionperf/master] Allows source to be given as a parameter on the commandline
by irl＠torproject.org 02 Jul '19

02 Jul '19

commit 096c2bb23d79033be79503754e180145879d3449 Author: Ana C. Custura <ana(a)netstat.org.uk> Date: Wed Jun 5 15:07:10 2019 +0100 Allows source to be given as a parameter on the commandline --- onionperf/onionperf | 9 ++++++++- onionperf/reprocessing.py | 42 ++++++++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index fab805b..45ead3c 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -385,6 +385,13 @@ files generated by this script will be written""", action="store", dest="date_filter", default=None) + reprocess_parser.add_argument('-n', '--nickname', + help="""a nickname STRING that identifies the machine where the input logfiles were produced""", + metavar="STRING", type=str, + action="store", dest="nickname", + default=None) + + # get args and call the command handler for the chosen mode args = main_parser.parse_args() args.func(args) @@ -495,7 +502,7 @@ def reprocess(args): torctl_logs = reprocessing.collect_logs(args.torctl_dirpath, '*torctl.log') log_pairs = reprocessing.match(tgen_logs, torctl_logs, args.date_filter) logging.info("Found {0} matching log pairs to be reprocessed".format(len(log_pairs))) - reprocessing.multiprocess_logs(log_pairs, args.prefix) + reprocessing.multiprocess_logs(log_pairs, args.prefix, args.nickname) def type_nonnegative_integer(value): i = int(value) diff --git a/onionperf/reprocessing.py b/onionperf/reprocessing.py index 25111ba..66b82c7 100644 --- a/onionperf/reprocessing.py +++ b/onionperf/reprocessing.py @@ -7,6 +7,8 @@ import fnmatch import logging import os import re +import sys + def collect_logs(dirpath, pattern): logs = [] @@ -14,7 +16,7 @@ def collect_logs(dirpath, pattern): for filename in fnmatch.filter(filenames, pattern): logs.append(os.path.join(root, filename)) return logs - + def match(tgen_logs, tor_logs, date_filter): log_pairs = [] @@ -24,41 +26,47 @@ def match(tgen_logs, tor_logs, date_filter): date = m.group(0) fdate = datetime.datetime.strptime(date, "%Y-%m-%d") found = False - if date_filter is None or util.do_dates_match(date_filter,fdate): + if date_filter is None or util.do_dates_match(date_filter, fdate): for tor_log in tor_logs: if date in tor_log: log_pairs.append((tgen_log, tor_log, fdate)) found = True - break + break if not found: - logging.warning('Skipping file {0}, could not find a match for it'.format(tgen_log)) - + logging.warning( + 'Skipping file {0}, could not find a match for it'. + format(tgen_log)) + else: - logging.warning('Filename {0} does not contain a date'.format(tgen_log)) + logging.warning( + 'Filename {0} does not contain a date'.format(tgen_log)) if not log_pairs: - logging.warning('Could not find any log matches. No analyses will be performed') + logging.warning( + 'Could not find any log matches. No analyses will be performed') return log_pairs - -def analyze_func(prefix, pair): - analysis = Analysis() + +def analyze_func(prefix, nick, pair): + analysis = Analysis(nickname=nick) logging.info('Analysing pair for date {0}'.format(pair[2])) analysis.add_tgen_file(pair[0]) analysis.add_torctl_file(pair[1]) analysis.analyze(do_simple=False, date_filter=pair[2]) analysis.save(output_prefix=prefix) - analysis.export_torperf_version_1_1(output_prefix=prefix, do_compress=False) + analysis.export_torperf_version_1_1( + output_prefix=prefix, do_compress=False) return 1 - - -def multiprocess_logs(log_pairs, prefix): + + +def multiprocess_logs(log_pairs, prefix, nick): pool = Pool(cpu_count()) analyses = None try: - func = partial(analyze_func, prefix) + func = partial(analyze_func, prefix, nick) mr = pool.map_async(func, log_pairs) pool.close() - while not mr.ready(): mr.wait(1) + while not mr.ready(): + mr.wait(1) except KeyboardInterrupt: logging.info("interrupted, terminating process pool") pool.terminate() @@ -66,5 +74,3 @@ def multiprocess_logs(log_pairs, prefix): sys.exit() except Exception as e: logging.error(e) - -

1 0

[onionperf/master] Adds short deployment instructions
by irl＠torproject.org 02 Jul '19

02 Jul '19

commit 2df6b54fd5ebd1f854ba6f263b0462df0a8d6e13 Author: Ana C. Custura <ana(a)netstat.org.uk> Date: Wed Jun 5 14:45:52 2019 +0100 Adds short deployment instructions --- README.md | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d2f2f05..ccd4065 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,37 @@ can later be used to visualize changes in Tor client performance over time. For more information, see https://git.torproject.org/onionperf For a dockerized setup, see https://github.com/hiromipaw/onionperf-docker +## Quick deployment instructions + +These are the quick deployment instructions for the current Debian stable distribution. + +``` +sudo apt install git cmake make build-essential gcc libigraph0-dev libglib2.0-dev python-dev libxml2-dev python-lxml python-networkx python-scipy python-matplotlib python-numpy libevent-dev libssl-dev + +echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list +apt update +apt-get -t stretch-backports install python-stem tor + + +git clone https://github.com/shadow/tgen.git +cd tgen +mkdir build +cd build +cmake .. -DCMAKE_INSTALL_PREFIX=/home/$USER/.local +make +ln -s ~/tgen/build/tgen /usr/bin/tgen + +git clone https://github.com/ana-cc/onionperf +cd onionperf +git checkout steins_gate +sudo python setup.py build +sudo python setup.py install +``` + +## Step-by-step installation instructions + +Here you can find more detailed instructions for the current Debian stable distribution. + ### Get OnionPerf ``` @@ -95,10 +126,12 @@ large dependencies. ### Build Tor **Note**: You can install Tor with apt, although the -preferred method is to build from source. To install using apt: +preferred method is to build from source. To install using from backports: ``` -sudo apt install tor +echo 'deb http://deb.debian.org/debian stretch-backports main' >> /etc/apt/sources.list +apt update +apt-get -t stretch-backports install tor ``` Or, if building from source:

1 0

[onionperf/master] Fixes log collect bug introduced by adding new logs in the data directory
by irl＠torproject.org 02 Jul '19

02 Jul '19

commit 74d9e01f8aa78f9c11c47e06cbcce60df3093389 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu Jun 27 02:07:59 2019 +0100 Fixes log collect bug introduced by adding new logs in the data directory --- onionperf/tests/test_reprocessing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onionperf/tests/test_reprocessing.py b/onionperf/tests/test_reprocessing.py index 6c58bcd..54b6ddf 100644 --- a/onionperf/tests/test_reprocessing.py +++ b/onionperf/tests/test_reprocessing.py @@ -25,7 +25,7 @@ def test_log_collection_tgen(): def test_log_collection_torctl(): log_list = reprocessing.collect_logs(DATA_DIR, '*torctl.log') - well_known_list = [ DATA_DIR + 'logs/onionperf.torctl.log', DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.torctl.log' ] + well_known_list = [ DATA_DIR + 'logs/onionperf_2019-01-10_23:59:59.torctl.log', DATA_DIR + 'logs/onionperf.torctl.log' ] assert_equals(log_list, well_known_list ) def test_log_match():

1 0

[onionperf/master] Removes unecessary raise and adds unit tests to validate behaviour
by irl＠torproject.org 02 Jul '19

02 Jul '19

commit 60fff2d9a1b212013cc854f00b8e1450eec7ea46 Author: Ana Custura <ana(a)netstat.org.uk> Date: Thu Jun 27 02:04:29 2019 +0100 Removes unecessary raise and adds unit tests to validate behaviour --- onionperf/analysis.py | 1 - onionperf/tests/data/parse_error | 1 + onionperf/tests/test_analysis.py | 15 +++++++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/onionperf/analysis.py b/onionperf/analysis.py index 0bc1811..e90d005 100644 --- a/onionperf/analysis.py +++ b/onionperf/analysis.py @@ -532,7 +532,6 @@ class TGenParser(Parser): break except: logging.warning("TGenParser: skipping line due to parsing error: {0}".format(line)) - raise continue source.close() diff --git a/onionperf/tests/data/parse_error b/onionperf/tests/data/parse_error new file mode 100644 index 0000000..3c8cde7 --- /dev/null +++ b/onionperf/tests/data/parse_error @@ -0,0 +1 @@ +2018-04-14 21:10:04 1523740204.809894 [message] [shd-tgen-transfer.c:803] [_tgentransfer_log] [transfer-error] transport TCP,17,NULL:37.218.247.40:26006,NULL:0.0.0.0:0,146.0.73.4:146.0.73.4:1313,state=SUCCESS,error=NONE transfer (null),26847,op-nl,NONE,0,(null),0,state=ERROR,error=AUTH total-bytes-read=1 total-bytes-write=0 payload-bytes-write=0/0 (-nan%) usecs-to-socket-create=0 usecs-to-socket-connect=8053676879205 usecs-to-proxy-init=-1 usecs-to-proxy-choice=-1 usecs-to-proxy-request=-1 usecs-to-proxy-response=-1 usecs-to-command=-1 usecs-to-response=-1 usecs-to-first-byte=-1 usecs-to-last-byte=-1 usecs-to-checksum=-1 diff --git a/onionperf/tests/test_analysis.py b/onionperf/tests/test_analysis.py index 150e8f0..6463458 100644 --- a/onionperf/tests/test_analysis.py +++ b/onionperf/tests/test_analysis.py @@ -1,7 +1,7 @@ import os import pkg_resources from nose.tools import * -from onionperf import analysis +from onionperf import analysis, util def absolute_data_path(relative_path=""): @@ -11,10 +11,10 @@ def absolute_data_path(relative_path=""): return pkg_resources.resource_filename("onionperf", "tests/data/" + relative_path) - DATA_DIR = absolute_data_path() LINE_ERROR = '2019-04-22 14:41:20 1555940480.647663 [message] [shd-tgen-transfer.c:1504] [_tgentransfer_log] [transfer-error] transport TCP,12,localhost:127.0.0.1:46878,localhost:127.0.0.1:43735,dc34og3c3aqdqntblnxkstzfvh7iy7llojd4fi5j23y2po32ock2k7ad.onion:0.0.0.0:8080,state=ERROR,error=READ transfer transfer5m,4,cyan,GET,5242880,(null),0,state=ERROR,error=PROXY total-bytes-read=0 total-bytes-write=0 payload-bytes-read=0/5242880 (0.00%) usecs-to-socket-create=11 usecs-to-socket-connect=210 usecs-to-proxy-init=283 usecs-to-proxy-choice=348 usecs-to-proxy-request=412 usecs-to-proxy-response=-1 usecs-to-command=-1 usecs-to-response=-1 usecs-to-first-byte=-1 usecs-to-last-byte=-1 usecs-to-checksum=-1' +NO_PARSE_LINE = '2018-04-14 21:10:04 1523740204.809894 [message] [shd-tgen-transfer.c:803] [_tgentransfer_log] [transfer-error] transport TCP,17,NULL:37.218.247.40:26006,NULL:0.0.0.0:0,146.0.73.4:146.0.73.4:1313,state=SUCCESS,error=NONE transfer (null),26847,op-nl,NONE,0,(null),0,state=ERROR,error=AUTH total-bytes-read=1 total-bytes-write=0 payload-bytes-write=0/0 (-nan%) usecs-to-socket-create=0 usecs-to-socket-connect=8053676879205 usecs-to-proxy-init=-1 usecs-to-proxy-choice=-1 usecs-to-proxy-request=-1 usecs-to-proxy-response=-1 usecs-to-command=-1 usecs-to-response=-1 usecs-to-first-byte=-1 usecs-to-last-byte=-1 usecs-to-checksum=-1' def test_transfer_status_event(): transfer = analysis.TransferStatusEvent(LINE_ERROR) @@ -186,3 +186,14 @@ def test_transfer_object_end_to_end(): 'filesize_bytes': 5242880 }) + + +@raises(ZeroDivisionError) +def test_transfer_status_parse_error(): + transfer = analysis.TransferStatusEvent(NO_PARSE_LINE) + t = analysis.Transfer(transfer.transfer_id) + t.add_event(transfer) + +def test_parsing_parse_error(): + parser = analysis.TGenParser() + parser.parse(util.DataSource(DATA_DIR + 'parse_error'))

1 0

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

02 Jul '19

commit 4adf21ce0db901d391a2541daa41650234710a43 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 2 09:50:29 2019 +0000 Update translations for tpo-web --- contents+th.po | 70 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/contents+th.po b/contents+th.po index fb95179ed..a4908e746 100644 --- a/contents+th.po +++ b/contents+th.po @@ -248,10 +248,10 @@ msgid "" "been involved in Tor are united by a common belief: internet users should " "have private access to an uncensored web.**" msgstr "" -"** เช่นเดียวกัน ผู้ที่ใช้ Tor , นักพัฒนา , นักวิจัย และผู้ก่อตั้ง " -"คือผู้ที่ทำให้ Tor เป็นไปได้ เป็นกลุ่มคนที่หลากหลาย แต่ทุกคนที่เกี่ยวข้องกับ" -" Tor นั้นล้วนเป็นปึกแผ่นที่มาจากความเชื่อร่วมกันว่า: " -"ผู้ใช้อินเทอร์เน็ตควรมีสิทธิ์ความเป็นส่วนตัวในเข้าถึงเว็บถูกปิดกั้น **" +"** เช่นเดียวกับผู้ที่ใช้ Tor , นักพัฒนา , นักวิจัย และผู้ก่อตั้ง " +"ผู้ซึ่งทำให้ Tor เป็นไปได้นั้น คือ/เป็น กลุ่มคนที่หลากหลาย " +"แต่ทุกคนที่เกี่ยวข้องกับ Tor รวมกลุ่มกันจากการมีความเชื่อร่วมกันว่า: " +"ผู้ใช้อินเทอร์เน็ตควรมีสิทธิ์ความเป็นส่วนตัวในการเข้าถึงเว็บที่ถูกปิดกั้น **" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -282,7 +282,7 @@ msgstr "" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "This is still a simple explanation for how Tor works today." -msgstr "" +msgstr "นี่เป็นสิ่งที่อธิบายว่า Tor ทำงานอย่างไรในวันนี้อย่างง่ายๆ" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -535,7 +535,7 @@ msgstr "มีส่วนเกี่ยวข้อง" #: templates/contact.html:44 msgid "Join an email list" -msgstr "" +msgstr "ลงทะเบียนรับข่าวสาร" #: templates/contact.html:47 msgid "" @@ -547,7 +547,7 @@ msgstr "" #: templates/contact.html:60 msgid "Report a bug or give feedback." -msgstr "" +msgstr "รายงานบั๊ก หรือ ข้อเสนอแนะ" #: templates/contact.html:61 msgid "" @@ -558,7 +558,7 @@ msgstr "" #: templates/contact.html:67 msgid "Tell us about a bad relay." -msgstr "" +msgstr "บอกเราเกี่ยวกับ bad relay" #: templates/contact.html:68 msgid "" @@ -568,7 +568,7 @@ msgstr "" #: templates/contact.html:76 msgid "Report a security issue." -msgstr "" +msgstr "รายงานปัญหาความปลอดภัย" #: templates/contact.html:77 msgid "" @@ -581,7 +581,7 @@ msgstr "" #: templates/contact.html:97 msgid "Email us" -msgstr "" +msgstr "อีเมล์ถึงเรา" #: templates/contact.html:98 msgid "" @@ -593,11 +593,11 @@ msgstr "" #: templates/contact.html:104 msgid "Send us Mail" -msgstr "" +msgstr "ส่งเมล์ถึงเรา" #: templates/download-android.html:12 msgid "Get Tor Browser for Android." -msgstr "" +msgstr "รับ Tor Browser สำหรับ Android." #: templates/download-android.html:15 templates/hero-download.html:5 msgid "Protect yourself against tracking, surveillance, and censorship." @@ -605,20 +605,20 @@ msgstr "" #: templates/download-android.html:20 templates/download-android.html:22 msgid "Download .apk" -msgstr "" +msgstr "ดาวน์โหลด .apk" #: templates/download-android.html:24 msgid "Go to Google Play" -msgstr "" +msgstr "ไปยัง Google Play" #: templates/download-android.html:26 #, python-format msgid "Go to F-droid %s" -msgstr "" +msgstr "ไปยัง F-droid %s" #: templates/download-android.html:36 msgid "Are you an iOS user? We encourage you to try Onion Browser." -msgstr "" +msgstr "คุณเป็นผู้ใช้ iOS? เราสนับสนุนให้คุณลองใช้ Onion Browser." #: templates/download-languages.html:11 templates/download-options.html:11 msgid "Language" @@ -630,11 +630,11 @@ msgstr "" #: templates/download.html:5 msgid "Get Connected" -msgstr "" +msgstr "ได้รับการเชื่อมต่อแล้ว" #: templates/download.html:7 msgid "Get connected" -msgstr "" +msgstr "ได้รับการเชื่อมต่อแล้ว" #: templates/download.html:9 msgid "" @@ -644,7 +644,7 @@ msgstr "" #: templates/download.html:10 msgid "Select \"Tor is censored in my country.\"" -msgstr "" +msgstr "เลือก \"Tor ถูกปิดกั้นในประเทศชองฉัน.\"" #: templates/download.html:13 msgid "" @@ -662,11 +662,11 @@ msgstr "" #: templates/download.html:19 templates/download.html:21 msgid "Stay safe" -msgstr "" +msgstr "อยู่อย่างปลอดภัย" #: templates/download.html:23 msgid "Please do not torrent over Tor." -msgstr "" +msgstr "กรุณาอย่าใช้ torrent บน Tor." #: templates/download.html:24 msgid "" @@ -771,7 +771,7 @@ msgstr "ดาวน์โหลดในภาษาอื่นหรือร #: templates/hero-download.html:46 msgid "Advanced Install Options" -msgstr "" +msgstr "ตัวเลือกการติดตั้งขั้นสูง" #: templates/hero-download.html:50 msgid "Read the latest release announcements" @@ -779,11 +779,11 @@ msgstr "" #: templates/hero-home.html:2 msgid "Browse Privately." -msgstr "" +msgstr "ค้นหาอย่างเป็นส่วนตัว" #: templates/hero-home.html:5 msgid "Explore Freely." -msgstr "" +msgstr "ท่องอย่างอิสระ" #: templates/hero-home.html:8 templates/meta.html:5 templates/meta.html:12 msgid "" @@ -822,11 +822,11 @@ msgstr "" #: templates/home.html:41 msgid "Resist Fingerprinting" -msgstr "" +msgstr "ปกป้องอัตลักษณ์" #: templates/home.html:45 msgid "RESIST FINGERPRINTING" -msgstr "" +msgstr "ปกป้องอัตลักษณ์" #: templates/home.html:46 msgid "" @@ -897,7 +897,7 @@ msgstr "โครงการ Tor" #: templates/navbar.html:15 msgid "Menu" -msgstr "" +msgstr "เมนู" #: templates/people.html:2 msgid "Board of Directors" @@ -909,7 +909,7 @@ msgstr "" #: templates/people.html:28 msgid "Join Our Team" -msgstr "" +msgstr "ร่วมทีมกับเรา" #: templates/people.html:29 msgid "" @@ -968,7 +968,7 @@ msgstr "" #: templates/press.html:63 msgid "Topic" -msgstr "" +msgstr "หัวข้อ" #: templates/reports.html:2 msgid "Founding Documents" @@ -1008,11 +1008,11 @@ msgstr "" #: templates/sponsors.html:5 msgid "Active Sponsors" -msgstr "" +msgstr "ผู้สนับสนุนปัจจุบัน" #: templates/sponsors.html:17 msgid "Past Sponsors" -msgstr "" +msgstr "เคยได้รับการสนับสนุนจาก" #: templates/sponsors.html:35 msgid "" @@ -1042,16 +1042,16 @@ msgstr "" #: templates/thank-you.html:21 msgid "Use your skills to volunteer." -msgstr "" +msgstr "อาสาสมัครโดยใช้ความสามารถของคุณ" #: templates/macros/downloads.html:61 msgid "Tor Browser manual" -msgstr "" +msgstr "คู่มือ Tow Browser" #: templates/macros/jobs.html:11 msgid "Read more." -msgstr "" +msgstr "อ่านเพิ่มเติม" #: templates/macros/reports.html:5 templates/macros/reports.html:19 msgid "View PDF" -msgstr "" +msgstr "มุมมอง PDF"

1 0

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

02 Jul '19

commit 9ac1ea0010fd15dbbd9f4d8789bd2262cf31392e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 2 09:20:34 2019 +0000 Update translations for tpo-web --- contents+th.po | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/contents+th.po b/contents+th.po index dcc36f960..fb95179ed 100644 --- a/contents+th.po +++ b/contents+th.po @@ -205,6 +205,10 @@ msgid "" "bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToRepo…," " and are not putting yourself at risk." msgstr "" +"กรุณาดาวน์โหลด alpha ถ้าคุณโอเคกับบางสิ่งที่มันทำงานไม่ถูกต้อง " +"เพื่อช่วยเราค้นหาและ [รายงานบั๊ก] " +"(https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…)" +" และ ต้องไม่พาตัวคุณเองไปอยู่ภายใต้ความเสี่ยง" #: https//www.torproject.org/download/languages/ #: (content/download/languages/contents+en.lrpage.title) @@ -219,6 +223,10 @@ msgid "" "add more. Want to help us translate? [See here](https://tb-" "manual.torproject.org/becoming-tor-translator/)" msgstr "" +"เราต้องการให้ทุกคนสามารถเพลิดเพลินไปกับ Tor Browser ในภาษาของพวกเขาเอง " +"ตอนนี้เบราว์เซอร์ของ Tor มีให้บริการใน 25 " +"ภาษาและเรากำลังเพิ่มจำนวนให้มากขึ้น ต้องการช่วยเราแปลไหม [ดูที่นี่] (https" +"://tb-manual.torproject.org/becoming-tor-translator/)" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) @@ -240,6 +248,10 @@ msgid "" "been involved in Tor are united by a common belief: internet users should " "have private access to an uncensored web.**" msgstr "" +"** เช่นเดียวกัน ผู้ที่ใช้ Tor , นักพัฒนา , นักวิจัย และผู้ก่อตั้ง " +"คือผู้ที่ทำให้ Tor เป็นไปได้ เป็นกลุ่มคนที่หลากหลาย แต่ทุกคนที่เกี่ยวข้องกับ" +" Tor นั้นล้วนเป็นปึกแผ่นที่มาจากความเชื่อร่วมกันว่า: " +"ผู้ใช้อินเทอร์เน็ตควรมีสิทธิ์ความเป็นส่วนตัวในเข้าถึงเว็บถูกปิดกั้น **" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) @@ -408,7 +420,7 @@ msgstr "" #: https//www.torproject.org/about/people/ #: (content/about/people/contents+en.lrpeople.title) msgid "People" -msgstr "" +msgstr "ผู้คน" #: https//www.torproject.org/about/people/ #: (content/about/people/contents+en.lrpeople.body) @@ -481,11 +493,11 @@ msgstr "" #: templates/contact.html:8 msgid "Chat with us on" -msgstr "" +msgstr "พูดคุยกับเรา" #: templates/contact.html:9 msgid "Ask questions about using Tor." -msgstr "" +msgstr "สอบถามเกี่ยวกับการใช้ Tor" #: templates/contact.html:10 msgid "Discuss Tor-related coding and protocols. Ideas are welcome." @@ -503,7 +515,7 @@ msgstr "" #: templates/contact.html:13 msgid "Discuss running a Tor relay." -msgstr "" +msgstr "พูดคุยการดำเนินงาน Tor relay" #: templates/contact.html:14 msgid "Talk with Tor's global south community." @@ -511,15 +523,15 @@ msgstr "" #: templates/contact.html:20 msgid "Find us on Social Media" -msgstr "" +msgstr "ค้นหาเราบนสื่อสังคม" #: templates/contact.html:34 msgid "Volunteer with Tor" -msgstr "" +msgstr "อาสาสมัคร กับ Tor" #: templates/contact.html:38 msgid "Get Involved" -msgstr "" +msgstr "มีส่วนเกี่ยวข้อง" #: templates/contact.html:44 msgid "Join an email list" @@ -743,19 +755,19 @@ msgstr "" #: templates/hero-download-languages.html:2 #: templates/hero-download-options.html:2 msgid "DEFEND YOURSELF" -msgstr "" +msgstr "ปกป้อง ตัวคุณ" #: templates/hero-download-tor.html:2 msgid "GROW THE NETWORK" -msgstr "" +msgstr "เครือข่ายที่เติบโต" #: templates/hero-download.html:2 msgid "Defend yourself." -msgstr "" +msgstr "ปกป้อง ตัวคุณ." #: templates/hero-download.html:45 msgid "Download in another language or platform" -msgstr "" +msgstr "ดาวน์โหลดในภาษาอื่นหรือรูปแบบอื่นๆ" #: templates/hero-download.html:46 msgid "Advanced Install Options"

1 0