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

[meek/turbotunnel] comment typo
by dcf＠torproject.org 27 Jul '20

27 Jul '20

commit 70ce713a9d48810dff51984498d7898f6d57374d Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 10 14:50:43 2020 -0600 comment typo --- meek-client/turbotunnel.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meek-client/turbotunnel.go b/meek-client/turbotunnel.go index c11b1f2..e492c9d 100644 --- a/meek-client/turbotunnel.go +++ b/meek-client/turbotunnel.go @@ -236,8 +236,8 @@ func (c *PollingPacketConn) requestLoop() { return case p := <-c.sendQueue: // An empty slice is a special case. It doesn't mean to - // literally mean to send an (encoded) packet of length - // zero, but to quit blocking and send an empty polling + // literally send an (encoded) packet of length zero, + // but to quit blocking and send an empty polling // request. if len(p) > 0 { encapsulation.WriteData(&body, p)

1 0

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

27 Jul '20

commit 9d101c1abeebc859d674645a7da70b1da43f8b85 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 20:15:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ar/LC_MESSAGES/messages.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po index a86b293e83..4022750123 100644 --- a/locale/ar/LC_MESSAGES/messages.po +++ b/locale/ar/LC_MESSAGES/messages.po @@ -705,6 +705,8 @@ msgid "" "Join the Tor Project - Defenders of Privacy program - a monthly giving " "circle designed to honor donors that make privacy a priority." msgstr "" +"انضم إلى مشروع Tor - برنامج المدافعين عن الخصوصية - دائرة منح شهرية مصممة " +"لتكريم المتبرعين الذين يجعلون الخصوصية أولوية." #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:91 msgid "" @@ -727,7 +729,7 @@ msgstr "" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:97 msgid "With your help, we will make the Tor network accessible to everyone!" -msgstr "" +msgstr "بمساعدتكم ، سنجعل شبكة Tor في متناول الجميع!" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:101 msgid "Together, we will stand up for the universal right to privacy."

1 0

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

27 Jul '20

commit f4ad57400905247a438a6466057c0d01b835e03a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 19:45:19 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/ar/LC_MESSAGES/messages.po | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/locale/ar/LC_MESSAGES/messages.po b/locale/ar/LC_MESSAGES/messages.po index c8ccbde078..a86b293e83 100644 --- a/locale/ar/LC_MESSAGES/messages.po +++ b/locale/ar/LC_MESSAGES/messages.po @@ -513,17 +513,18 @@ msgstr "احصل على إصدارنا المحدود Take Back the Internet م #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:258 msgid "t-shirt pack" -msgstr "" +msgstr "حزمة قميص" #: 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 "" +"احصل على Take Back the Internet مع قميص Tor وقميص Tor: Strength in Numbers." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:277 msgid "sweatshirt" -msgstr "" +msgstr "قميص من النوع الثقيل" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:284 msgid "Your generous support of Tor gets you this high-quality zip hoodie." @@ -623,19 +624,19 @@ msgstr "لم يتم تحديد هدية" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:468 msgid "Sticker Pack" -msgstr "" +msgstr "حزمة ملصقات" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:476 msgid "T-Shirt" -msgstr "" +msgstr "قميص" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:480 msgid "Choose your size and fit for each shirt." -msgstr "" +msgstr "اختر مقاسك و ملائم لكل قميص." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:484 msgid "T-Shirt Pack" -msgstr "" +msgstr "حزمة قميص" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:488 msgid "Tor: Strength in Numbers" @@ -651,7 +652,7 @@ msgstr "اختر مقاسك" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:520 msgid "Sweatshirt" -msgstr "" +msgstr "قميص من النوع الثقيل" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:524 msgid "A required field is missing from the form." @@ -663,7 +664,7 @@ msgstr "الرجاء اعادة تحميل الصفحة والمحاولة مر #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:530 msgid "There was a problem submitting your request to the server:<br>" -msgstr "" +msgstr "حدثت مشكلة في إرسال طلبك إلى الخادم:<br>" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:534 msgid "validation failed" @@ -673,7 +674,7 @@ msgstr "فشل التوثيق" #. javascript. #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:540 msgid "__field_name__ must be filled out." -msgstr "" +msgstr "يجب ملء __اسم _الحقل__." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:545 msgid "This field is required" @@ -689,15 +690,15 @@ msgstr "شهرياً" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:557 msgid "Gift selected" -msgstr "" +msgstr "تم اختيار الهدية" #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:59 msgid "Estimated Donation Date:" -msgstr "" +msgstr "تاريخ التبرع التقديري:" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:83 msgid "Become a Defender of Privacy!" -msgstr "" +msgstr "كن مدافعًا عن الخصوصية!" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:87 msgid "" @@ -711,6 +712,9 @@ msgid "" "reliable source of funds to help us be agile in an ever-changing privacy " "landscape and we send you exclusive gifts to show our appreciation!" msgstr "" +"يتعهد المدافعون عن الخصوصية بمبلغ متواضع كل شهر - إنشاء مصدر ثابت وموثوق " +"للأموال لمساعدتنا على أن نكون رشيقين في بيئة خصوصية دائمة التغير ونرسل لك " +"هدايا حصرية لإظهار تقديرنا!" #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:95 msgid "" @@ -718,6 +722,8 @@ msgid "" "continue our mission to provide tools that protect people's privacy and " "identity online." msgstr "" +"يعتمد مشروع Tor على دعم المدافعين عن الخصوصية لدينا لمواصلة مهمتنا في توفير " +"الأدوات التي تحمي خصوصية الأشخاص وهويتهم عبر الإنترنت." #: tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:97 msgid "With your help, we will make the Tor network accessible to everyone!"

1 0

[tpo/master] Update membership.html - CC copy
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit a4562adaf8f0d59f80a053288550c37342b489d6 Author: Antonela <antonela(a)torproject.org> Date: Mon Jul 27 19:22:47 2020 +0000 Update membership.html - CC copy --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index 6d915086..32deccc5 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -42,7 +42,7 @@ <div class="container"> <div class="row p-5 my-5 border text-center"> <p> - Your commitment to the community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Tor's Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. + Community is at the heart of the Tor Project Membership Program, and our members agree to join our community. As such, Members agree to adhere to Tor’s <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.t…" title="Code of Conduct" target="_blank">Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.t…" title="Social Contract" target="_blank">Social Contract</a>, and our <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_valu…" title="Statement of Values" target="_blank">Statement of Values</a>. </p> </div> </div>

1 0

[tpo/master] Merge remote-tracking branch 'anto-gl/master'
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 432fc189de8b3d6650a5b38cb0c78e4f54570363 Merge: 7966c0d1 a4562ada Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 21:35:23 2020 +0200 Merge remote-tracking branch 'anto-gl/master' templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/master] Add .htaccess for /about/membership
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 1b2a2910470b6fb1039a29a275e8d6b6f87ad301 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 16:02:54 2020 +0200 Add .htaccess for /about/membership --- .htaccess-membership | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.htaccess-membership b/.htaccess-membership new file mode 100644 index 00000000..64537967 --- /dev/null +++ b/.htaccess-membership @@ -0,0 +1,4 @@ +AuthType Basic + AuthName "Secure Content" + AuthUserFile .htpasswd + require valid-user

1 0

[tpo/master] Remove .htacces-membership
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 323d5aa1e9b0e3d4b2e22a86571ffcc5302b19b3 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 18:52:19 2020 +0200 Remove .htacces-membership --- .htaccess-membership | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.htaccess-membership b/.htaccess-membership deleted file mode 100644 index 0f113839..00000000 --- a/.htaccess-membership +++ /dev/null @@ -1,4 +0,0 @@ -AuthType Basic -AuthName "Secure Content" -AuthUserFile .htpasswd -require valid-user

1 0

[tpo/master] Add .htaccess-membership to add http auth to /about/membership
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 7adf1323c117fd07c2a87523dc0c6fd9decb6461 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 18:11:07 2020 +0200 Add .htaccess-membership to add http auth to /about/membership --- .htaccess-membership | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess-membership b/.htaccess-membership index 64537967..5651511f 100644 --- a/.htaccess-membership +++ b/.htaccess-membership @@ -2,3 +2,4 @@ AuthType Basic AuthName "Secure Content" AuthUserFile .htpasswd require valid-user +

1 0

[tpo/master] Merge remote-tracking branch 'anto-gl/master' into staging
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 45cedd844b4a20df037521a6d9cd9eb17430c5c1 Merge: 1b2a2910 cfd88bad Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 16:18:59 2020 +0200 Merge remote-tracking branch 'anto-gl/master' into staging assets/static/images/membership/logos/MullvadVPN.png | Bin 0 -> 21976 bytes templates/membership.html | 11 +++++------ 2 files changed, 5 insertions(+), 6 deletions(-)

1 0

[tpo/master] Fix .htaccess-membership
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 84f1011ca792d76ff099f9fc53335f5ff09969e7 Author: hiro <hiro(a)torproject.org> Date: Mon Jul 27 18:38:52 2020 +0200 Fix .htaccess-membership --- .htaccess-membership | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.htaccess-membership b/.htaccess-membership index 5651511f..0f113839 100644 --- a/.htaccess-membership +++ b/.htaccess-membership @@ -1,5 +1,4 @@ AuthType Basic - AuthName "Secure Content" - AuthUserFile .htpasswd - require valid-user - +AuthName "Secure Content" +AuthUserFile .htpasswd +require valid-user

1 0