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

[donate-static/staging] Update content/contents.lr
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 640594f086728ebc915ef757b7d6a3b0160ac8e5 Author: Antonela <antonela(a)torproject.org> Date: Tue Oct 20 13:49:31 2020 +0000 Update content/contents.lr --- content/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/contents.lr b/content/contents.lr index d8a4df70..cab2a286 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -92,9 +92,9 @@ success_redirect_url: --- counter: no --- -tshirt_pack_second_shirt_options_label: Take back the Internet with Tor +tshirt_pack_second_shirt_options_label: Use Tor --- -tshirt_perk_options_label: Tor: Strength in Numbers +tshirt_perk_options_label: Take back the Internet with Tor --- number_of_donations_counter_label: Number of Donations ---

1 0

[donate-static/staging] Merge remote-tracking branch 'gitlab/antonela-master-patch-63521' into staging
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 35277ff68b04868b8a76dd0c22829e95766942a0 Merge: 4e0345aa 7286035f Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 16:52:21 2020 +0200 Merge remote-tracking branch 'gitlab/antonela-master-patch-63521' into staging

1 0

[donate-static/staging] Fix links
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 4e0345aae2d19210911c132a9b7544acf92a9db4 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 16:52:03 2020 +0200 Fix links --- content/champions-of-privacy/contents.lr | 4 ++-- content/donor-faq/contents.lr | 22 +++++++++++----------- content/privacy-policy/contents.lr | 2 +- content/state-disclosures/contents.lr | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/content/champions-of-privacy/contents.lr b/content/champions-of-privacy/contents.lr index 0408394c..bfa80c66 100644 --- a/content/champions-of-privacy/contents.lr +++ b/content/champions-of-privacy/contents.lr @@ -21,8 +21,8 @@ intro: <p>We believe everyone in the world should be able to enjoy the luxury our tools provide: private access to the open web. The Tor Project counts on the support of our Champions of Privacy to keep our software strong and available to everyone who needs it. With your help, we can make the Tor network accessible to all.</p> <p>We're standing up for the universal human right to privacy. Join us by becoming a Champion of Privacy today.</p> <div class="text-center"> - <h4><a class="hyperlinks links" href="/monthly-giving">Join with a monthly gift of $84 per month, or more.</a></h4> - <h4><a class="hyperlinks links" href="/cryptocurrency">Join with cryptocurrency.</a></h4> + <h4><a class="hyperlinks links" href="../monthly-giving">Join with a monthly gift of $84 per month, or more.</a></h4> + <h4><a class="hyperlinks links" href="../cryptocurrency">Join with cryptocurrency.</a></h4> </div> </div> --- diff --git a/content/donor-faq/contents.lr b/content/donor-faq/contents.lr index 437ce1b7..d78b69b8 100644 --- a/content/donor-faq/contents.lr +++ b/content/donor-faq/contents.lr @@ -23,14 +23,14 @@ body: <p class="answer">Note: if you wish to donate to the Tor Project by <a class="hyperlinks links" href="https://2019.www.torproject.org/donate/donate.html.en" target="_blank">credit card or PayPal, please click here.</a></p> <p class="answer">The Tor Project also offers the following alternative donation methods:</p> <ul class="answer"> - <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">Bitcoin and Other Cryptocurrencies</a></li> - <li><a class="hyperlinks links" href="/cryptocurrency" target="_blank">BTCPayServer</a></li> + <li><a class="hyperlinks links" href="../cryptocurrency" target="_blank">Bitcoin and Other Cryptocurrencies</a></li> + <li><a class="hyperlinks links" href="../cryptocurrency" target="_blank">BTCPayServer</a></li> <li><a class="hyperlinks links" href="https://twitter.com/torproject/status/1196820407950741520" target="_blank">BottlePay</a></li> <li><a class="hyperlinks links" href="https://smile.amazon.com/ch/20-8096820" target="_blank">Amazon Smile</a></li> <li><a class="hyperlinks links" href="https://givingassistant.org/np#tor-project-inc" target="_blank">Giving Assistant</a></li> - <li><a class="hyperlinks links" href="/donor-faq#eu-bank-transfer">EU Bank Transfer</a></li> - <li><a class="hyperlinks links" href="/donor-faq#donate-by-mail">Checks</a> or <a class="hyperlinks links" href="/donor-faq#donate-anonymous">Money Orders</a></a></li> - <li><a class="hyperlinks links" href="/donor-faq#donate-stock">Stock Donation</a></li> + <li><a class="hyperlinks links" href="../donor-faq#eu-bank-transfer">EU Bank Transfer</a></li> + <li><a class="hyperlinks links" href="../donor-faq#donate-by-mail">Checks</a> or <a class="hyperlinks links" href="../donor-faq#donate-anonymous">Money Orders</a></a></li> + <li><a class="hyperlinks links" href="../donor-faq#donate-stock">Stock Donation</a></li> </ul> <p class="answer">If you have any questions or would like to receive a thank-you gift after making a donation with one of the methods above, please email <span class="email">giving(at)torproject.org</span>.</p> </li> @@ -112,7 +112,7 @@ body: <p class="answer"><a href="https://www.noisebridge.net/wiki/Noisebridge_Tor" target="_blank" class="hyperlinks links">Noisebridge</a> is a US-based 501(c)(3) non-profit that collects donations and turns them into more US-based exit relay capacity.</p> <p class="answer"><a href="https://nos-oignons.net/" target="_blank" class="hyperlinks links">Nos Oignons</a> is a French charitable non-profit that runs fast exit relays in France.</p> <p class="answer"><a href="https://www.dfri.se/donera/?lang=en" target="_blank" class="hyperlinks links">DFRI</a> is a Swedish non-profit running exit relays.</p> - <p class="answer">These organizations are not the same as <a href="/" target="_blank" class="hyperlinks links">The Tor Project, Inc</a>, but we consider that a good thing. They're run by nice people who are part of the Tor community.</p> + <p class="answer">These organizations are not the same as <a href="https://www.torproject.org" target="_blank" class="hyperlinks links">The Tor Project, Inc</a>, but we consider that a good thing. They're run by nice people who are part of the Tor community.</p> </li> <li> <h2 class="question">Can I donate to a specific project, or restrict my donation to a particular purpose?</h2> @@ -125,7 +125,7 @@ body: </li> <li> <h2 class="question">How can I donate via debit or credit card?</h2> - <p class="answer">To donate using a major credit card or debit card (VISA, MasterCard, Discover or American Express) or via PayPal, please visit our <a class="hyperlinks links" href="/">donate page</a>.</p> + <p class="answer">To donate using a major credit card or debit card (VISA, MasterCard, Discover or American Express) or via PayPal, please visit our <a class="hyperlinks links" href="../">donate page</a>.</p> </li> <li> <h2 class="question">Why do you ask for my address and similar information?</h2> @@ -183,7 +183,7 @@ body: </li> <li> <h2 class="question">What is your donor privacy policy?</h2> - <p class="answer">Here is the Tor Project <a class="hyperlinks links" target="_blank" href="/privacy-policy">donor privacy policy</a>.</p> + <p class="answer">Here is the Tor Project <a class="hyperlinks links" target="_blank" href="../privacy-policy">donor privacy policy</a>.</p> </li> <li> <h2 class="question">What is your refund policy?</h2> @@ -199,7 +199,7 @@ body: </li> <li> <h2 class="question">How can I get a Tor t-shirt or stickers?</h2> - <p class="answer">A variety of thank-you gifts for donors, including t-shirts, hoodies and stickers, are presented on our main <a class="hyperlinks links" href="/">donation page</a>.</p> + <p class="answer">A variety of thank-you gifts for donors, including t-shirts, hoodies and stickers, are presented on our main <a class="hyperlinks links" href="../">donation page</a>.</p> </li> <li> <h2 class="question">If I want to stay in touch with the Tor Project, what's the best way for me to do that?</h2> @@ -240,10 +240,10 @@ body: </ol> <hr/> <div class="button-line"> - <a class="purple button" href="/state-disclosures">State Registration Disclosures</a> + <a class="purple button" href="../state-disclosures">State Registration Disclosures</a> </div> <div class="button-line"> - <a class="purple button" href="/">Back to Donate Page</a> + <a class="purple button" href="../">Back to Donate Page</a> </div> </div> </div> diff --git a/content/privacy-policy/contents.lr b/content/privacy-policy/contents.lr index 8ed10aca..4fb2ad6f 100644 --- a/content/privacy-policy/contents.lr +++ b/content/privacy-policy/contents.lr @@ -22,5 +22,5 @@ body: </div> <hr> <div class="button-line"> - <a class="purple button" href="/">Back to Donate Page</a> + <a class="purple button" href="../">Back to Donate Page</a> </div> diff --git a/content/state-disclosures/contents.lr b/content/state-disclosures/contents.lr index 07d7aa08..77c08861 100644 --- a/content/state-disclosures/contents.lr +++ b/content/state-disclosures/contents.lr @@ -31,10 +31,10 @@ body: <p>More information about <a href="http://www.labyrinthinc.com/charity-resources/nonprofit-regulations/fundrai…" target="_blank" class="hyperlinks links">state disclosure verbiage</a> and <a href="http://www.labyrinthinc.com/charity-resources/annual-charitable-state-regis…" target="_blank" class="hyperlinks links">charitable state registrations</a>.</p> <hr/> <div class="button-line"> - <a class="purple button" href="/donor-faq">Back to Donate FAQ</a> + <a class="purple button" href="../donor-faq">Back to Donate FAQ</a> </div> <div class="button-line"> - <a class="purple button" href="/">Back to Donate Page</a> + <a class="purple button" href="../">Back to Donate Page</a> </div> </div> </div>

1 0

[donate-static/staging] Update content/champions-of-privacy/contents.lr
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 7286035f83d5bb5039474762bc092d29692091b3 Author: Antonela <antonela(a)torproject.org> Date: Tue Oct 20 14:01:05 2020 +0000 Update content/champions-of-privacy/contents.lr --- content/champions-of-privacy/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/champions-of-privacy/contents.lr b/content/champions-of-privacy/contents.lr index 5f9b925c..0408394c 100644 --- a/content/champions-of-privacy/contents.lr +++ b/content/champions-of-privacy/contents.lr @@ -6,6 +6,8 @@ _template: layout.html --- body: --- +color: primary +--- html: donate-form.html --- title: Champions of Privacy

1 0

[donate-static/staging] Update content/privacy-policy/contents.lr
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 66c0cf7f14292a1453ea1027505ecdcfc2a492e8 Author: Antonela <antonela(a)torproject.org> Date: Tue Oct 20 14:03:14 2020 +0000 Update content/privacy-policy/contents.lr --- content/privacy-policy/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/privacy-policy/contents.lr b/content/privacy-policy/contents.lr index 8ed10aca..c962402d 100644 --- a/content/privacy-policy/contents.lr +++ b/content/privacy-policy/contents.lr @@ -8,6 +8,8 @@ section_id: donate --- section: Donate --- +color: primary +--- html: donate-empty.html --- body:

1 0

[donate-static/staging] Merge remote-tracking branch 'gitlab/antonela-master-patch-69656' into staging
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 470f30ca8f5277748b17750c12dfa2769fc2e0f0 Merge: 35277ff6 640594f0 Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 16:52:34 2020 +0200 Merge remote-tracking branch 'gitlab/antonela-master-patch-69656' into staging content/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[donate-static/staging] Merge remote-tracking branch 'gitlab/antonela-master-patch-92583' into staging
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit 35e30decf774be793b354c55d33d4554ac1c4922 Merge: 470f30ca 66c0cf7f Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 16:52:43 2020 +0200 Merge remote-tracking branch 'gitlab/antonela-master-patch-92583' into staging content/privacy-policy/contents.lr | 2 ++ 1 file changed, 2 insertions(+)

1 0

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

20 Oct '20

commit 43803b508eb4da55849665647c2a74f2c6325163 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 20 14:49:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- hi/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hi/torcheck.po b/hi/torcheck.po index 7cef817cb5..16ec093d8e 100644 --- a/hi/torcheck.po +++ b/hi/torcheck.po @@ -3,6 +3,7 @@ # # Translators: # Aayush M <chaayushmalik(a)gmail.com>, 2018 +# Adarsh Bharat <aadarshbharat(a)pm.me>, 2020 # Bineet kumar gaur <bineetkumar(a)live.in>, 2014 # Emma Peel, 2019 # Meghana S <meghana.cse11(a)gmail.com>, 2013 @@ -12,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-09 06:48+0000\n" -"Last-Translator: Emma Peel\n" +"PO-Revision-Date: 2020-10-20 14:39+0000\n" +"Last-Translator: Adarsh Bharat <aadarshbharat(a)pm.me>\n" "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -47,7 +48,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://support.torproject.org/#faq\">frequently asked " "questions</a>." -msgstr "" +msgstr "यदि आप एक टोर क्लाइंट का उपयोग करने का प्रयास कर रहे हैं, तो कृपया <a href=\"https://www.torproject.org/\"> टोर वेबसाइट </a> और विशेष रूप से <a href=\"https://support.torproject.org/#faq\"> अक्सर पूछे जाने वाले प्रश्न देखें </a>।" msgid "Sorry, your query failed or an unexpected response was received." msgstr "हमे खेद है । आप की पूछताछ असफ़ल रही ।" @@ -97,4 +98,4 @@ msgid "Stay Anonymous" msgstr "अनामिक रहें " msgid "Relay Search" -msgstr "" +msgstr "प्रसारण खोजें"

1 0

[donate-static/staging] Add savage button
by hiro＠torproject.org 20 Oct '20

20 Oct '20

commit c776f63ed20a5e87c8f15d6d3c504b99ddb257be Author: hiro <hiro(a)torproject.org> Date: Tue Oct 20 16:34:47 2020 +0200 Add savage button --- configs/i18n.ini | 2 +- templates/footer.html | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index b77e4192..968635ae 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = +translations = en i18npath = i18n translate_paragraphwise = False url_prefix = https://www.torproject.org/ diff --git a/templates/footer.html b/templates/footer.html index 99a22f63..979eb83c 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -62,7 +62,7 @@ </div> </div> </div> - + <div class="row"> <div class="col-12 d-flex justify-content-center"> <div class="col-sm-6 offset-lx-1 offset-sm-0 mt-5"> @@ -84,7 +84,7 @@ </div> </div> </div> - + <div class="row"> <div class="col-12 d-flex justify-content-center"> <div class="col-8 mt-5"> @@ -114,5 +114,8 @@ <script src="{{ '/static/js/modernizr.js'|asseturl }}" ></script> <script src="{{ '/static/js/download.js'|asseturl }}" ></script> <script src="{{ '/static/js/fallback.js'|asseturl }}" ></script> + <script> + $(".payment-option").append("<button class=\"credit-card payment-method selected button\"><a class=\"button\" href=\"/cryptocurrency\">Cryptocurrency</a></button>") + </script> </div> </div>

1 0

[tor-browser-build/master] ChangeLog fixups
by sysrqb＠torproject.org 20 Oct '20

20 Oct '20

commit 6067db2246f06bf387d147581a29e21af902b548 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Oct 20 13:48:41 2020 +0000 ChangeLog fixups --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 997646b..a95a67d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -100,7 +100,6 @@ Tor Browser 10.0a8 -- October 8 2020 * Bug 40014: Set correct default Security Level [android-components] * Bug 40015: Modify Fenix Home Menu [fenix] * Bug 40016: Modify Fenix Settings Menu [fenix] - * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] * Bug 40018: Disable Push functionality [fenix] * Bug 40019: Ensure missing Adjust token does not throw an exception [fenix] @@ -141,7 +140,6 @@ Tor Browser 10.0a8 -- October 8 2020 * Bug 40098: Initialize torbutton for Geckoview and make sure its features work as expected in Fenix [tor-browser] * Bug 40112: Check that caching stylesheets per document group adheres to FPI [tor-browser] * Bug 40119: Update Fenix dependencies for 81.1.2 [fenix] - * Bug 40124: Implement Network settings [fenix] * Bug 40125: Geckoview: Expose security level interface [tor-browser] * Bug 40172: Security UI not updated for non-https .onion pages in Fenix [tor-browser] * Bug 40173: Initialize security_slider in GeckoView at 4 [tor-browser] @@ -268,7 +266,6 @@ Tor Browser 10.0 -- September 22 2020 * Bug 40006: Fix new identity for 81 [torbutton] * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton] * Bug 40008: Style fixes for 78 [torbutton] - * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] * Bug 40022: Update new icons in Tor Browser branding [tor-browser] * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser]

1 0