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

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

20 Apr '20

commit 23eaabacbc4e2337a227ea33a85d47692f127219 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 18:45:38 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ja/LC_MESSAGES/messages.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/locale/ja/LC_MESSAGES/messages.po b/locale/ja/LC_MESSAGES/messages.po index e2152e8c6e..fc158b905f 100644 --- a/locale/ja/LC_MESSAGES/messages.po +++ b/locale/ja/LC_MESSAGES/messages.po @@ -3,7 +3,6 @@ # Naofumi <naofum(a)gmail.com>, 2018 # Tokumei Nanashi, 2018 # 987 pluto <pluto987(a)protonmail.com>, 2018 -# 石上敬祐 <k.130.email(a)gmail.com>, 2019 # h345u37g3 h345u37g3, 2019 # erinm, 2019 # Agent exe <sw.172.135.9.xxx.l62118102(a)gmail.com>, 2020 @@ -18,7 +17,7 @@ msgstr "" #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:101 msgid "Tracking, surveillance, and censorship are widespread online." -msgstr "トラッキング、監視、検閲はネット上で広く行われています。" +msgstr "現在インターネット上では、広範なトラッキング・監視・検閲が行われています。" #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:105 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43 @@ -641,7 +640,7 @@ msgstr "いいえ、ギフトは必要ありません。" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:211 #, php-format msgid "I would prefer 100% of my donation to go to the Tor Project's work." -msgstr "私の寄付を100%「Tor Projectの活動に」使って欲しいです。" +msgstr "私は寄付の全てを Tor Project の活動の支援に使いたいです。" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:201 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:222 @@ -697,7 +696,7 @@ msgstr "トレーナー" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:279 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:284 msgid "Your generous support of Tor gets you this high-quality zip hoodie." -msgstr "Torへ寛大なサポートをしていただくと、この高品質のジップパーカーが手に入ります！" +msgstr "Tor に非常に大きな支援をしていただくと、この高品質のジップパーカーを入手できます。" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:289 msgid "how do you want to DONATE?" @@ -725,7 +724,7 @@ msgstr "番地" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:334 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:333 msgid "Apt." -msgstr "アパート" +msgstr "部屋番号" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:344 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:343 @@ -750,7 +749,7 @@ msgstr "メールアドレスを入力" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:363 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:362 msgid "We‘ll email you your receipt" -msgstr "領収書をメールでお送りします" +msgstr "領収書の送信に使用します" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:377 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:376 @@ -798,7 +797,7 @@ msgstr "コメント" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:435 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:434 msgid "Donating:" -msgstr "寄付：" +msgstr "寄付額：" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:443 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:446 @@ -880,7 +879,7 @@ msgstr "検証または認証に失敗" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:509 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:540 msgid "__field_name__ must be filled out." -msgstr "__field_name__ must be filled out." +msgstr "__field_name__ を入力する必要があります。" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:514 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:545 @@ -943,13 +942,15 @@ msgstr "手順" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:247 msgid "Get our limited edition Take Back the Internet With Tor shirt." -msgstr "限定版の「Torで本来のインターネットを取り戻そう！」Tシャツを入手してください。" +msgstr "限定版の「Take Back the Internet With Tor」Tシャツを入手する。" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:266 msgid "" "Get this year's Take Back the Internet With Tor t-shirt and the Tor: " "Strength in Numbers t-shirt." -msgstr "限定版のTor：Numbers in Numbersシャツを入手しましょう" +msgstr "" +"限定版の「Take Back the Internet With Tor」Tシャツおよび「Tor: Strength in " +"Numbers」Tシャツを入手する。" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:294 msgid "how do you want to DONATE?" @@ -957,7 +958,7 @@ msgstr "寄付方法をご指定ください。" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:456 msgid "State/Province/Region" -msgstr "州/県/区" +msgstr "都道府県" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:460 msgid "Gift Selected:" @@ -965,7 +966,7 @@ msgstr "選択したギフト：" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:492 msgid "Take back the Internet with Tor" -msgstr "本来のインターネットをTorで取り戻しましょう！" +msgstr "Tor で Internet を取り戻す" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:557 msgid "Gift selected"

1 0

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

20 Apr '20

commit f2badd68f1106edb0dfe10970340713704ab7d80 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 18:23:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 83e4c0a234..8684eb36aa 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -3,13 +3,13 @@ # 石上敬祐 <k.130.email(a)gmail.com>, 2019 # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 # ue zaeco, 2019 -# 323484, 2019 # Emma Peel, 2019 # Tokumei Nanashi, 2019 # 987 pluto <pluto987(a)protonmail.com>, 2019 # h345u37g3 h345u37g3, 2019 # erinm, 2020 # Naofumi <naofum(a)gmail.com>, 2020 +# 323484, 2020 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Naofumi <naofum(a)gmail.com>, 2020\n" +"Last-Translator: 323484, 2020\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1092,7 +1092,7 @@ msgstr "サポートポータル" #: templates/download.html:14 msgid "Read other FAQ's at our Support Portal" -msgstr "" +msgstr "サポートポータルで他のよくある質問を見る" #: templates/download.html:19 templates/download.html:21 msgid "Stay safe" @@ -1132,7 +1132,7 @@ msgstr "その他のトラブルシューティングヒントは %sをご確認 #: templates/download.html:49 msgid "How can I verify Tor Browser signature?" -msgstr "" +msgstr "Tor Browser の署名を検証する方法" #: templates/download.html:54 msgid "Stand up for privacy and freedom online." @@ -1159,7 +1159,7 @@ msgstr "身を守る。" #: templates/hero-download.html:32 msgid "Download for" -msgstr "" +msgstr "ダウンロード /" #: templates/hero-download.html:33 msgid "Signature" @@ -1167,7 +1167,7 @@ msgstr "署名" #: templates/hero-download.html:43 msgid "Download for Android" -msgstr "" +msgstr "ダウンロード / Android" #: templates/hero-download.html:49 msgid "Download in another language or platform"

1 0

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

20 Apr '20

commit fc97c87018a9ea6f4c9bf0b1f9e7a8861b911861 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 18:15:43 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ja/LC_MESSAGES/messages.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/locale/ja/LC_MESSAGES/messages.po b/locale/ja/LC_MESSAGES/messages.po index 16f6ad1878..e2152e8c6e 100644 --- a/locale/ja/LC_MESSAGES/messages.po +++ b/locale/ja/LC_MESSAGES/messages.po @@ -1,12 +1,12 @@ # Translators: # Suguru Hirahara, 2018 +# Naofumi <naofum(a)gmail.com>, 2018 # Tokumei Nanashi, 2018 # 987 pluto <pluto987(a)protonmail.com>, 2018 -# Naofumi <naofum(a)gmail.com>, 2018 # 石上敬祐 <k.130.email(a)gmail.com>, 2019 # h345u37g3 h345u37g3, 2019 # erinm, 2019 -# Agent Exe <sw.172.135.9.xxx.l62118102(a)gmail.com>, 2020 +# Agent exe <sw.172.135.9.xxx.l62118102(a)gmail.com>, 2020 # 323484, 2020 # msgid "" @@ -24,7 +24,7 @@ msgstr "トラッキング、監視、検閲はネット上で広く行われて #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:43 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:66 msgid "Take back the internet with Tor" -msgstr "本来のインターネットをTorで取り戻しましょう！" +msgstr "Tor で Internet を取り戻す" #: tmp/cache_locale/ff/ffee28cfc961a339d813aed75493753fcc9e985dfa212e1af03fc089d5c3fdb0.php:112 msgid "Give today, and Mozilla will match your donation." @@ -393,7 +393,7 @@ msgstr "メール" #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:47 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:29 msgid "First Name" -msgstr "ファーストネーム・名" +msgstr "名" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:196 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:324 @@ -401,7 +401,7 @@ msgstr "ファーストネーム・名" #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:51 #: tmp/cache_locale/84/843b15891cb1c4a052da0edfef1988434048191530bcfe390199ff0e33e802d4.php:33 msgid "Last Name" -msgstr "ラストネーム" +msgstr "姓" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:200 #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:98 @@ -413,7 +413,7 @@ msgstr "寄付を報告する" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:370 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:369 msgid "Start sending me email updates about the Tor Project!" -msgstr "Tor Projectに関する最新情報をメールで受信する！" +msgstr "Tor Project の最新情報を受け取る" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:208 #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:105 @@ -595,22 +595,22 @@ msgstr "寄付" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:132 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:154 msgid "once" -msgstr "一回限り" +msgstr "1回のみの寄付：" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:138 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:160 msgid "monthly" -msgstr "毎月" +msgstr "月々の寄付：" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:145 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:167 msgid "Want to donate cryptocurrency?" -msgstr "暗号通貨を寄付したいですか？" +msgstr "暗号通貨で寄付を行う" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:150 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:172 msgid "Want to donate stock or via postal mail?" -msgstr "株または郵便で寄付したいですか？" +msgstr "株または郵便で寄付を行う" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:166 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:187 @@ -701,7 +701,7 @@ msgstr "Torへ寛大なサポートをしていただくと、この高品質の #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:289 msgid "how do you want to DONATE?" -msgstr "どのようにDONATEしたいですか?" +msgstr "寄付方法をご指定ください。" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:295 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:300 @@ -715,12 +715,12 @@ msgstr "ビットコイン、株、または普通郵便で寄付したいです #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:315 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:314 msgid "* required fields" -msgstr "このフィールドは必須です" +msgstr "* 入力の必要な項目" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:330 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:329 msgid "Street Address" -msgstr "住所" +msgstr "番地" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:334 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:333 @@ -740,7 +740,7 @@ msgstr "州" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:353 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:352 msgid "Zip" -msgstr "Zip" +msgstr "郵便番号" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:359 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:358 @@ -755,7 +755,7 @@ msgstr "領収書をメールでお送りします" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:377 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:376 msgid "Card Number" -msgstr "カードナンバー" +msgstr "カード番号" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:384 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:383 @@ -770,7 +770,7 @@ msgstr "年" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:392 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:391 msgid "CVC" -msgstr "カードセキュリティコード(CVC)" +msgstr "セキュリティコード" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:400 #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:465 @@ -953,7 +953,7 @@ msgstr "限定版のTor：Numbers in Numbersシャツを入手しましょう" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:294 msgid "how do you want to DONATE?" -msgstr "どのようにDONATEしたいですか?" +msgstr "寄付方法をご指定ください。" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:456 msgid "State/Province/Region" @@ -1093,7 +1093,7 @@ msgstr "Tor Project からの毎月の更新やお知らせをお届けします #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:57 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:39 msgid "Sign Up" -msgstr "サインアップ" +msgstr "登録" #: tmp/cache_locale/92/92eb639bc328f3dd569fa22b60c4360b6fe38f1a4cd80a14fce862d91bd765cb.php:65 #: tmp/cache_locale/2d/2d5f07aeb16acd7bb0a8dd355b13f59678a1f0ba6ea2b3d9dec8d2b5dcfbfde5.php:47

1 0

[metrics-cloud/master] metrics-common changes
by irl＠torproject.org 20 Apr '20

20 Apr '20

commit 66854108b54338ea98fafbfcf086fb2e395e9f34 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Wed Apr 1 15:12:20 2020 +0100 metrics-common changes --- ansible/common.yml | 5 ----- ansible/exit-scanners-aws.yml | 12 ++++++------ ansible/roles/debian-backports/tasks/main.yml | 6 ------ ansible/roles/debian-backports/vars/Debian.yml | 3 --- ansible/roles/debian-backports/vars/Ubuntu.yml | 3 --- ansible/roles/debian-backports/vars/main.yml | 2 -- ansible/roles/exit-scanner/files/exitscan.py | 5 +++++ ansible/roles/exit-scanner/files/exitscanner.service | 1 + ansible/roles/sanity/files/vimrc.local | 2 -- ansible/roles/sanity/tasks/main.yml | 7 ------- ansible/site.yml | 3 ++- cloudformation/exit-scanner-dev.yml | 9 +++++++++ 12 files changed, 23 insertions(+), 35 deletions(-) diff --git a/ansible/common.yml b/ansible/common.yml deleted file mode 100644 index 6ab3711..0000000 --- a/ansible/common.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: all - user: admin - roles: - - sanity diff --git a/ansible/exit-scanners-aws.yml b/ansible/exit-scanners-aws.yml index 1d79d12..a4eb657 100644 --- a/ansible/exit-scanners-aws.yml +++ b/ansible/exit-scanners-aws.yml @@ -1,8 +1,8 @@ --- -- hosts: exit-scanners - user: admin +- hosts: exit_scanners + become: true roles: - - tor-client - - exit-scanner-sys - - exit-scanner - - check + - metrics-common + #- tor-client + #- exit-scanner + #- check diff --git a/ansible/roles/debian-backports/tasks/main.yml b/ansible/roles/debian-backports/tasks/main.yml deleted file mode 100644 index 51ab50a..0000000 --- a/ansible/roles/debian-backports/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: add distribution-specific variables - include_vars: "{{ ansible_distribution }}.yml" -- name: add backports repository - apt_repository: repo='deb {{ backports_uri }} {{ backports_components }}' state=present update_cache=yes - become: true diff --git a/ansible/roles/debian-backports/vars/Debian.yml b/ansible/roles/debian-backports/vars/Debian.yml deleted file mode 100644 index 4943727..0000000 --- a/ansible/roles/debian-backports/vars/Debian.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -backports_uri: http://http.debian.net/debian -backports_components: "{{backports_distribution}}-backports main contrib non-free" diff --git a/ansible/roles/debian-backports/vars/Ubuntu.yml b/ansible/roles/debian-backports/vars/Ubuntu.yml deleted file mode 100644 index 6666ac7..0000000 --- a/ansible/roles/debian-backports/vars/Ubuntu.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -backports_uri: http://archive.ubuntu.com/ubuntu -backports_components: "{{backports_distribution}}-backports main restricted universe multiverse" diff --git a/ansible/roles/debian-backports/vars/main.yml b/ansible/roles/debian-backports/vars/main.yml deleted file mode 100644 index 0b79f68..0000000 --- a/ansible/roles/debian-backports/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -backports_distribution: "{{ansible_distribution_release}}" diff --git a/ansible/roles/exit-scanner/files/exitscan.py b/ansible/roles/exit-scanner/files/exitscan.py index d6ff874..33fdf22 100644 --- a/ansible/roles/exit-scanner/files/exitscan.py +++ b/ansible/roles/exit-scanner/files/exitscan.py @@ -8,6 +8,7 @@ import os import os.path import re import subprocess +import threading import stem.descriptor @@ -54,10 +55,13 @@ def run(): merge(desc) # Import new measurements + kill = lambda process: process.kill() with subprocess.Popen(["./bin/exitmap", "ipscan", "-o", "/dev/stdout"], cwd="/srv/tordnsel.torproject.org/exitscanner/exitmap", stdout=subprocess.PIPE, encoding='utf-8') as p: + scantimer = threading.Timer(7200, kill, [p]) + scantimer.start() for line in p.stdout: print(line) result = re.match( @@ -76,6 +80,7 @@ def run(): "%Y-%m-%d %H:%M:%S")) ] merge(desc) + scantimer.cancel() # Format exit list filename now = datetime.datetime.utcnow() diff --git a/ansible/roles/exit-scanner/files/exitscanner.service b/ansible/roles/exit-scanner/files/exitscanner.service index 920a081..806932c 100644 --- a/ansible/roles/exit-scanner/files/exitscanner.service +++ b/ansible/roles/exit-scanner/files/exitscanner.service @@ -5,6 +5,7 @@ Description=Exit Scanner Type=simple WorkingDirectory=/srv/tordnsel.torproject.org ExecStart=/usr/bin/python3 /srv/tordnsel.torproject.org/exitscanner/exitscan.py +StandardOutput=file:/srv/tordnsel.torproject.org/exitscanner.log [Install] WantedBy=default.target diff --git a/ansible/roles/sanity/files/vimrc.local b/ansible/roles/sanity/files/vimrc.local deleted file mode 100644 index afd5ae0..0000000 --- a/ansible/roles/sanity/files/vimrc.local +++ /dev/null @@ -1,2 +0,0 @@ -let g:skip_defaults_vim = 1 -set mouse= diff --git a/ansible/roles/sanity/tasks/main.yml b/ansible/roles/sanity/tasks/main.yml deleted file mode 100644 index 73d7c59..0000000 --- a/ansible/roles/sanity/tasks/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: install vim defaults - become: true - when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu' - copy: - src: vimrc.local - dest: /etc/vim/vimrc.local diff --git a/ansible/site.yml b/ansible/site.yml index 8691e42..2795690 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -1,4 +1,5 @@ --- -- import_playbook: common.yml +- import_playbook: exit-scanners.yml - import_playbook: monitors.yml +- import_playbook: onionoo-backends.yml - import_playbook: onionperfs.yml diff --git a/cloudformation/exit-scanner-dev.yml b/cloudformation/exit-scanner-dev.yml index 5c126c9..0407996 100644 --- a/cloudformation/exit-scanner-dev.yml +++ b/cloudformation/exit-scanner-dev.yml @@ -21,6 +21,15 @@ Resources: - Fn::ImportValue: 'MetricsInternetSecurityGroup' - Fn::ImportValue: 'MetricsPingableSecurityGroup' - Fn::ImportValue: 'MetricsHTTPSSecurityGroup' + InstanceDNSName: + Type: AWS::Route53::RecordSet + Properties: + HostedZoneName: tm-dev-aws.safemetrics.org. + Name: !Join ['', [!Ref 'AWS::StackName', .tm-dev-aws.safemetrics.org.]] + Type: A + TTL: '300' + ResourceRecords: + - !GetAtt Instance.PublicIp Outputs: PublicIp: Description: "Instance public IP"

1 0

[metrics-cloud/master] cfn: Fix identify_user.sh syntax
by irl＠torproject.org 20 Apr '20

20 Apr '20

commit b81a4470cc44bc4d4d9587e9a1101222d720072e Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Mar 26 12:11:07 2020 +0000 cfn: Fix identify_user.sh syntax --- cloudformation/identify_user.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudformation/identify_user.sh b/cloudformation/identify_user.sh index 470f28a..957eabf 100755 --- a/cloudformation/identify_user.sh +++ b/cloudformation/identify_user.sh @@ -4,7 +4,7 @@ if [[ -v $TOR_METRICS_SSH_KEY ]]; then echo $TOR_METRICS_SSH_KEY exit 0 -done +fi # Otherwise, make a guess based on the username. #

1 0

[metrics-cloud/master] Initial metrics-common role
by irl＠torproject.org 20 Apr '20

20 Apr '20

commit b47f39094f05a2c9dc2d6298bb46698bb661d3f3 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Mar 26 15:48:18 2020 +0000 Initial metrics-common role --- ansible/files/ssh_user_keys/acute | 1 + ansible/files/ssh_user_keys/irl | 1 + ansible/files/ssh_user_keys/karsten | 1 + ansible/group_vars/all.yml | 2 + ansible/group_vars/exit_scanners.yml | 15 ++++++ ansible/roles/metrics-common/files/vimrc.local | 2 + ansible/roles/metrics-common/handlers/main.yml | 5 ++ ansible/roles/metrics-common/tasks/main.yml | 68 ++++++++++++++++++++++++++ 8 files changed, 95 insertions(+) diff --git a/ansible/files/ssh_user_keys/acute b/ansible/files/ssh_user_keys/acute new file mode 100644 index 0000000..67462bd --- /dev/null +++ b/ansible/files/ssh_user_keys/acute @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQChdcj+GLhTme17lt8hKRSx5T5jrJlPlWsNSSK+Dnh594jLea0i/soYT+GimvGqrlZOOknSLDWHlnePa8K9nYm5hElDodmXbTCq2X4YyZ7OgMBKORSmuu5PD9d7MECDPhprPi1p6v6vk2BCjjL2QjOsxYeu5Dj89qcX009oIx+6lVlBD4SRfMyDYPOLf8UYx1ALLYdZ8Ruzl63ERJEG4mZrleZT8ZnrsN706xKVth01oacXTpvGxEtlakDAAoZoeWtucJj3vgVY+Edga54pRUb+0HGzTSPi6qJ/pgn2H1hZCklJLOP1saJemsOHi26IDyB3JNr2JbDGNOMhCNWcK3Kw3DOL9VkHJSbK+70SU7s/vFntL62D2blX/mzUFa1vf/4kh6390WKW535RmPs//bcKmWPQ4zCgpqMi3qn9Bm3ZJfgLYE2aMfMW5rjgGYRhft3tLuHRnGSUHVJwtBEMzD1PLIrIAFU32VRBqTX+v+xwVTKHujtdXP5gCSJwY6WKyTeFOfvz/HfS8DD8pZwciGfObI3hlprVbGQv6gUokaYH9/X9wj98hwfDWctJbMTmG6B/X7xiukzxnzUhA7Ijo7jpQKS3zfps0TD2GpyGnBnFZ5PzYqh1/vYtR/4+zS+56GNCgR3yAKMwwm3wixeF7ATmEG40eVdf6BtlxFCoZVFKvQ== cardno:00060490456 diff --git a/ansible/files/ssh_user_keys/irl b/ansible/files/ssh_user_keys/irl new file mode 100644 index 0000000..8aebcf5 --- /dev/null +++ b/ansible/files/ssh_user_keys/irl @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAnbNRJMRawMMgT8GJ9qOl5aIFGEwsdVeMTQxlpkYFsRMWERDxQLsU4X1pF9MP3U70qeeHTu1E+hVHFUWxFsMOm/f/1BaWzh9ODHx8DkLnP1OUdC8veQqVpPVUOmw4v68z0dotxiNE4g1h4+HBHJNt+hTcns6AdjuVKSV614EQPvmKn0DJJQc5CZY5r4fy8fz2W+7cmI5F3U6kF4snLSO0IwOb26PQCa6+Cw20aBihcsGks8mT6tMX70vr/XEtDSTOSKftTS6jjZ1ifnimR5sQ5JZpFnRL8HhxuhrnwgwLT+chkc7C/luv9H4+FXhRi/B6Me0XODXVtyhyWMhaUwN2AUv7Hr319kyKtwALvU/zTJXoqtFpYN7k3OHjYA15ZKwxGf+Pukl+10zZtT0V372UjVOxT5fuYPt6FykkKtIxbyiRHP0yXIMuIsfHtTqLiwKgDChiNb2oPI3NwxTFuuj0eO5eXYDDeuXXEDLIPg/2YCvpxaXf/PC+K3A4GgTb1l39KTMJxmh8/4HgVWZmi+gDJvVU3/SfujhSzRhlWBMeK2nACRwdCI7OFsCsh9GYEkCz/5w53M5/pBZnJeub1GnmnRso6cD+oP2v15yVWSMQVWj9YwifmQbSj8SyyL29wCgSyC28MfKvKWOfyulw3JjZicDTvaVAh1i6HteUB62E5Q== cardno:000606634751 diff --git a/ansible/files/ssh_user_keys/karsten b/ansible/files/ssh_user_keys/karsten new file mode 100644 index 0000000..8aebcf5 --- /dev/null +++ b/ansible/files/ssh_user_keys/karsten @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAnbNRJMRawMMgT8GJ9qOl5aIFGEwsdVeMTQxlpkYFsRMWERDxQLsU4X1pF9MP3U70qeeHTu1E+hVHFUWxFsMOm/f/1BaWzh9ODHx8DkLnP1OUdC8veQqVpPVUOmw4v68z0dotxiNE4g1h4+HBHJNt+hTcns6AdjuVKSV614EQPvmKn0DJJQc5CZY5r4fy8fz2W+7cmI5F3U6kF4snLSO0IwOb26PQCa6+Cw20aBihcsGks8mT6tMX70vr/XEtDSTOSKftTS6jjZ1ifnimR5sQ5JZpFnRL8HhxuhrnwgwLT+chkc7C/luv9H4+FXhRi/B6Me0XODXVtyhyWMhaUwN2AUv7Hr319kyKtwALvU/zTJXoqtFpYN7k3OHjYA15ZKwxGf+Pukl+10zZtT0V372UjVOxT5fuYPt6FykkKtIxbyiRHP0yXIMuIsfHtTqLiwKgDChiNb2oPI3NwxTFuuj0eO5eXYDDeuXXEDLIPg/2YCvpxaXf/PC+K3A4GgTb1l39KTMJxmh8/4HgVWZmi+gDJvVU3/SfujhSzRhlWBMeK2nACRwdCI7OFsCsh9GYEkCz/5w53M5/pBZnJeub1GnmnRso6cD+oP2v15yVWSMQVWj9YwifmQbSj8SyyL29wCgSyC28MfKvKWOfyulw3JjZicDTvaVAh1i6HteUB62E5Q== cardno:000606634751 diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml new file mode 100644 index 0000000..bbdb0bf --- /dev/null +++ b/ansible/group_vars/all.yml @@ -0,0 +1,2 @@ +--- +metrics_users: ['irl', 'karsten', 'acute'] diff --git a/ansible/group_vars/exit_scanners.yml b/ansible/group_vars/exit_scanners.yml new file mode 100644 index 0000000..e2e69b5 --- /dev/null +++ b/ansible/group_vars/exit_scanners.yml @@ -0,0 +1,15 @@ +--- +metrics_dependency_pkgs: + - git + - python-dnspython + - curl + - gettext + - golang-go + - build-essential + - python-dateutil +metrics_backport_pkgs: + - python-stem + - python3-stem +metrics_service_users: + - {name: tordnsel, uid: 1532, home: "/home/tordnsel", linger: yes} + - {name: check, uid: 1507, home: "/home/check", linger: yes} diff --git a/ansible/roles/metrics-common/files/vimrc.local b/ansible/roles/metrics-common/files/vimrc.local new file mode 100644 index 0000000..afd5ae0 --- /dev/null +++ b/ansible/roles/metrics-common/files/vimrc.local @@ -0,0 +1,2 @@ +let g:skip_defaults_vim = 1 +set mouse= diff --git a/ansible/roles/metrics-common/handlers/main.yml b/ansible/roles/metrics-common/handlers/main.yml new file mode 100644 index 0000000..5e8c155 --- /dev/null +++ b/ansible/roles/metrics-common/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: "reload sshd" + service: + name: sshd + state: reloaded diff --git a/ansible/roles/metrics-common/tasks/main.yml b/ansible/roles/metrics-common/tasks/main.yml new file mode 100644 index 0000000..aa1d962 --- /dev/null +++ b/ansible/roles/metrics-common/tasks/main.yml @@ -0,0 +1,68 @@ +--- +- name: set timezone to UTC + timezone: + name: UTC +- name: enable password-less sudo for sudo group + lineinfile: + path: /etc/sudoers + regexp: '^%sudo' + line: '%sudo ALL=(ALL) NOPASSWD: ALL' + validate: 'visudo -cf %s' +- name: create metrics users + user: + name: "{{ item }}" + password: "*" + with_items: "{{ metrics_users }}" +- name: ensure users are in correct primary group and sudo group + user: + name: "{{ item }}" + group: "{{ item }}" + append: yes + groups: "sudo" + with_items: "{{ metrics_users }}" +- name: disable root password + user: + name: root + password: '*' +- name: set up authorized keys + authorized_key: + user: "{{ item }}" + state: present + exclusive: yes + key: "{{ lookup('file', 'ssh_user_keys/' + item) }}" + with_items: "{{ metrics_users }}" +- name: sshd PermitRootLogin=no + lineinfile: + dest: "/etc/ssh/sshd_config" + regexp: "^#?PermitRootLogin" + line: "PermitRootLogin prohibit-password" + state: present + notify: "reload sshd" +- name: sshd PasswordAuthentication=no + lineinfile: + dest: "/etc/ssh/sshd_config" + regexp: "^#?PasswordAuthentication" + line: "PasswordAuthentication no" + state: present + notify: "reload sshd" +- name: install vim defaults + become: true + when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu' + copy: + src: vimrc.local + dest: /etc/vim/vimrc.local +- name: add backports repository + apt_repository: + repo: 'deb http://http.debian.net/debian {{ ansible_distribution_release }}-backports main contrib non-free' + state: present +- name: install dependency packages + apt: + pkg: "{{ metrics_dependency_pkgs }}" + state: latest + update_cache: yes +- name: install dependency (backport) packages + apt: + pkg: "{{ metrics_backport_pkgs }}" + state: latest + update_cache: yes + default_release: "{{ ansible_distribution_release }}-backports"

1 0

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

20 Apr '20

commit 88b508c1f79a95ff0e8dc8131633c57fc5d103b0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 07:20:40 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+zh-CN.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 6a55d2d0ca..9adc00c0e3 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -731,7 +731,7 @@ msgid "" "meek transports make it look like you are browsing a major web site instead " "of using Tor. meek-azure makes it look like you are using a Microsoft web " "site." -msgstr "meek传输让你看起来不像使用Tor而是在浏览普通网站。Meek-azure使你看起来在浏览微软的网页。" +msgstr "meek 方式使您看起来像在浏览主要网站，而不是使用 Tor。 meek-azure 使您看起来像在使用 Microsoft 网站。" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -779,7 +779,7 @@ msgstr "使用可插拔传输，在第一次运行Tor 浏览器时点击“配 msgid "" "After checking the checkbox \"Tor is censored in my country,\" choose the " "\"Select a built-in bridge\" option." -msgstr "" +msgstr "勾选“Tor在我的国家收到审查”的复选框后，选择“挑选一个内置网桥”选项。" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -954,7 +954,7 @@ msgstr "" msgid "" "Complete the CAPTCHA and click \"Submit.\" Click \"Connect\" to save your " "settings." -msgstr "" +msgstr "完成验证码并点击“提交”。点击“连接”以保存你的设定。" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -969,7 +969,7 @@ msgstr "" msgid "" "Complete the CAPTCHA and click \"Submit.\" Your setting will automatically " "be saved once you close the tab." -msgstr "" +msgstr "完成验证码并点击“提交”。当你关闭标签页以后你的设置将被自动保存。" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1003,7 +1003,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "Click \"Connect\" to save your settings." -msgstr "" +msgstr "点击“连接”来保存你的设置" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1011,7 +1011,7 @@ msgid "" "In the \"Bridges\" section, check the checkbox \"Use a bridge,\" and from " "the option \"Provide a bridge I know,\" enter each bridge address on a " "separate line." -msgstr "" +msgstr "在“网桥”界面，勾选“使用一个网桥，”并在“提供一个我所知道的网桥，”处输入网桥地址，每个网桥单独一行" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -2036,19 +2036,19 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.description) msgid "Learn about Tor for mobile devices" -msgstr "" +msgstr "了解移动设备上的Tor。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "### Tor Browser for Android" -msgstr "" +msgstr "###Tor 浏览器安卓版" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "" "Tor Browser for Android is the only official mobile browser supported and " "developed by the Tor Project." -msgstr "" +msgstr "Tor 浏览器安卓版是唯一受Tor 项目官方支持与开发的移动浏览器。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2190,7 +2190,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### The Tor Project website" -msgstr "" +msgstr "####Tor 项目网站" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2257,7 +2257,7 @@ msgstr "" msgid "" "If you know that your connection is censored, you should select the settings" " icon." -msgstr "" +msgstr "如果你知道你的连接受到审查，你应该点击选项图标。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2272,7 +2272,7 @@ msgid "" "If you know your connection is censored, or you have tried and failed to " "connect to the Tor network and no other solutions have worked, click the " "switch." -msgstr "" +msgstr "如果你知道你的连接受审查，或你已经尝试连接Tor网络但失败且其他方法均不可行，点击切换。" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2384,7 +2384,7 @@ msgstr "" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### New Identity" -msgstr "" +msgstr "####新身份" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

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

20 Apr '20

commit e227a9c2b55845fd5e8a3eec841ebcbba728d53e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 06:51:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- zh-CN/torbutton.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/zh-CN/torbutton.properties b/zh-CN/torbutton.properties index 1e81ba951b..69279ea8f8 100644 --- a/zh-CN/torbutton.properties +++ b/zh-CN/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = 未知国家 torbutton.circuit_display.guard = 守卫 torbutton.circuit_display.guard_note = 您的[守卫]节点似乎并未改变 torbutton.circuit_display.learn_more = 详细了解 -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = 点击以复制 +torbutton.circuit_display.copied = 已复制！ torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了一些边框，以降低窗口大小的独特性，令在线跟踪监控变得更加困难。 torbutton.panel.tooltip.disabled = 点击启用 Tor torbutton.panel.tooltip.enabled = 点击禁用 Tor @@ -89,12 +89,12 @@ onionServices.rendezvousFailed.header=Unable to Connect to Onionsite onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required +onionServices.clientAuthMissing.pageTitle=需要验证 onionServices.clientAuthMissing.header=Onionsite Requires Authentication onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed +onionServices.clientAuthIncorrect.pageTitle=验证失败 onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. @@ -133,11 +133,11 @@ onionLocation.alwaysPrioritize=Always Prioritize Onions onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=暂不 onionLocation.notNowAccessKey=n -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… +onionLocation.description=该网站还有一个更私密、更安全的版本，可以通过洋葱服务通过Tor网络访问。洋葱服务帮助网站发布者和他们的访问者战胜监控和审查。 +onionLocation.tryThis=尝试洋葱服务 +onionLocation.onionAvailable=.onion 可用 +onionLocation.learnMore=详细了解…… onionLocation.always=始终 -onionLocation.askEverytime=Ask every time +onionLocation.askEverytime=每次询问 onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. onionLocation.onionServicesTitle=洋葱服务

1 0

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

20 Apr '20

commit b22e99e1323396b03341df053b8456f3a8af71a6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 06:50:09 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+zh-CN.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index e7505bef34..6a55d2d0ca 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -105,7 +105,7 @@ msgstr "网桥" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Managing Identities" -msgstr "" +msgstr "管理身份" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -585,14 +585,14 @@ msgstr "Tor 浏览器会引导你进行一系列的配置。" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" -msgstr "" +msgstr "<img class=\"col-md-6\" src=\"../../static/images/pluggable-transport.png\">" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "" "The first checkbox asks if access to the Tor network is blocked or censored " "on your connection." -msgstr "" +msgstr "第一个复选框询问到 Tor 网络的连接是否被屏蔽或受审查。" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -605,7 +605,7 @@ msgid "" "If you know your connection is censored, or you have tried and failed to " "connect to the Tor network and no other solutions have worked, check the " "checkbox." -msgstr "" +msgstr "如果你知道你的连接受审查，或你已经尝试连接Tor网络但失败且其他方法均不可行，勾选该复选框。" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -627,6 +627,7 @@ msgid "" "checkbox because the same settings will be used for other browsers on your " "system." msgstr "" +"第二个复选框询问你的连接是否需要代理。大多数情况下，这不是必要的。你通常清楚是否需要选中此复选框，因为系统上的其他浏览器也将使用相同的设置。" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -730,7 +731,7 @@ msgid "" "meek transports make it look like you are browsing a major web site instead " "of using Tor. meek-azure makes it look like you are using a Microsoft web " "site." -msgstr "" +msgstr "meek传输让你看起来不像使用Tor而是在浏览普通网站。Meek-azure使你看起来在浏览微软的网页。" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0

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

20 Apr '20

commit 7eb8092223d10f749554f8df4e3a6f9775cda41a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 20 06:45:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- zh_CN/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po index 6a1cc39353..99de4ac5b2 100644 --- a/zh_CN/LC_MESSAGES/bridgedb.po +++ b/zh_CN/LC_MESSAGES/bridgedb.po @@ -23,8 +23,8 @@ 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-04-09 14:45-0700\n" -"PO-Revision-Date: 2020-04-15 19:46+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-04-20 06:40+0000\n" +"Last-Translator: Scott Rhodes <starring169(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -195,7 +195,7 @@ msgstr "获取网桥(%sG%s)" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[这是一份自动发送的邮件。]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -212,7 +212,7 @@ msgstr "您已超出了发送频率的限制，请慢慢来！两封邮件之间 msgid "" "If these bridges are not what you need, reply to this email with one of\n" "the following commands in the message body:" -msgstr "" +msgstr "如果这些网桥不是你所需要的，回复该邮件并在信息的主体部分包含如下的命令：" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -411,7 +411,7 @@ msgstr "" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)" -msgstr "" +msgstr "(请求IPv6网桥。)" #: bridgedb/strings.py:175 msgid "(Request obfs4 obfuscated bridges.)"

1 0