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

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

27 Jul '20

commit 234bc6f30f4a0663d71cb9b64618cffd06b22773 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 14:46:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl.po b/nl.po index 4c706b5156..cea0313c46 100644 --- a/nl.po +++ b/nl.po @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-27 05:58+0200\n" -"PO-Revision-Date: 2020-07-27 12:13+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-07-27 14:46+0000\n" +"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

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

27 Jul '20

commit 6438eac4597f8931d4622bc673849e39bcefdc48 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 27 14:45:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- nl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nl.po b/nl.po index a09333af95..404779709c 100644 --- a/nl.po +++ b/nl.po @@ -37,8 +37,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-27 05:58+0200\n" -"PO-Revision-Date: 2020-07-27 12:13+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-07-27 14:45+0000\n" +"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -683,13 +683,13 @@ msgstr "Bestanden bewaren in de map 'Persistent'" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "Welcome Screen" -msgstr "" +msgstr "Welkomstscherm" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "" "Beta: only the additional setting to enable the Unsafe Browser is made " "persistent" -msgstr "" +msgstr "Bèta: alleen de extra instelling voor het inschakelen van de Onveilige Browser is permanent gemaakt" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Browser Bookmarks"

1 0

[tpo/staging] Merge branch 'master' into 'master'
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 992048474405c20504f8528bdd93bdb39568caae Merge: 45325bd0 647c3f8d Author: Antonela <antonela(a)torproject.org> Date: Mon Jul 27 13:51:28 2020 +0000 Merge branch 'master' into 'master' Rebase master See merge request antonela/tpo!2 assets/static/images/membership/green.png | Bin 0 -> 239288 bytes assets/static/images/membership/header.png | Bin 0 -> 334841 bytes assets/static/images/membership/logos/Avast.png | Bin 0 -> 78009 bytes .../static/images/membership/logos/MullvadVPN.svg | 197 +++++++++++++++++++++ assets/static/images/membership/shallot.png | Bin 0 -> 208458 bytes assets/static/images/membership/vidalia.png | Bin 0 -> 169283 bytes .../static/images/sponsors/Bertha_Foundation.jpg | Bin 0 -> 451667 bytes content/about/membership/contents.lr | 13 ++ content/about/sponsors/Bertha/contents.lr | 19 ++ templates/membership.html | 138 +++++++++++++++ 10 files changed, 367 insertions(+)

1 0

[tpo/staging] 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/staging] Update members
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit cfd88badb0f3f7784870c558bb923741d5c35e23 Author: antonela <antonela(a)torproject.org> Date: Mon Jul 27 11:02:57 2020 -0300 Update members --- assets/static/images/membership/logos/MullvadVPN.png | Bin 0 -> 21976 bytes templates/membership.html | 11 +++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/static/images/membership/logos/MullvadVPN.png b/assets/static/images/membership/logos/MullvadVPN.png new file mode 100644 index 00000000..2758df73 Binary files /dev/null and b/assets/static/images/membership/logos/MullvadVPN.png differ diff --git a/templates/membership.html b/templates/membership.html index 171b5285..6d915086 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> - 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>. + 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>. </p> </div> </div> @@ -51,10 +51,9 @@ <h3 class="col-12 text-primary display-4">Shallot Onion Members</h3> <div class="col-md-4 col-xl-4 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="{{ '../../static/images/membership/logos/MullvadVPN.svg' }}" alt="MullvadVPN"> + <img class="card-img-top" src="#" alt=""> <div class="card-body"> - <p><a href="#" class="h4">Mullvad VPN</a></p> - Mullvad is a VPN service that helps users keep their online activity, identity, and location private. With a fundamental belief in privacy as a universal right, Mullvad's ultimate goal is to make Internet censorship and mass surveillance ineffective. + <p><a href="#" class="h4"></a></p> </div> </div> </div> @@ -81,12 +80,12 @@ <h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/Avast.png' }}" alt="Avast"> + <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/avast.png' }}" alt="Avast"> </div> </div> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> - <img class="card-img-top" src="#" alt=""> + <img class="card-img-top p-3" src="{{ '../../static/images/membership/logos/MullvadVPN.png' }}" alt="MullvadVPN"> </div> </div> <div class="col-md-3 col-xl-3 my-2">

1 0

[tpo/staging] Adding Bertha Foundation to Sponsors page
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 0641ae60c5557a2a1e0cc2d75bddd4fa0ba19d53 Author: gus <gus(a)torproject.org> Date: Mon Jul 20 17:04:43 2020 -0400 Adding Bertha Foundation to Sponsors page --- content/about/sponsors/Bertha/contents.lr | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/content/about/sponsors/Bertha/contents.lr b/content/about/sponsors/Bertha/contents.lr new file mode 100644 index 00000000..aa07c4d6 --- /dev/null +++ b/content/about/sponsors/Bertha/contents.lr @@ -0,0 +1,19 @@ +_model: sponsor +--- +active: true +--- +time: 2020-2021 +--- +name: Bertha Foundation +--- +key: 23 +--- +logo: /static/images/sponsors/Bertha_Foundation.jpg +--- +_hidden: yes +--- +link: https://berthafoundation.org/ +--- +description: + +Bertha Foundation supports activists, storytellers, and lawyers who are working to bring about social and economic justice and human rights for all. The Bertha Challenge is a global fellowship that invites activists and investigative journalists to spend a year exploring a pressing social justice challenge. The 2020-2021 Bertha Challenge question focuses on the global climate and ecological crises.

1 0

[tpo/staging] Removed l10n tags from the template. It is not needed now.
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 694f44c5cdb02eb29a32d4dacd550e7d830114cd Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 12:06:41 2020 -0300 Removed l10n tags from the template. It is not needed now. --- templates/membership.html | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index 6fc3cbd0..58a98ed2 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -1,11 +1,11 @@ <div class="container py-3"> - <h3 class="text-primary display-5">{{ _('Show your support for privacy online') }}</h3> - <p>{{ _('When your organization joins the Tor Project’s Membership Program, you are demonstrating your commitment to privacy online and supporting Tor’s agility and development. In return, you become a closer part of our community with three specific benefits: access to our Onion Advisors group to help you integrate Tor into your product, inclusion in conversations and exclusive meetings with the Tor Project team to learn about what we are cooking at Tor, and public promotion of your membership. - If you are interested in becoming a member, please reach out to us at giving(a)torproject.org.') }}</p> + <h3 class="text-primary display-5">Show your support for privacy online</h3> + <p>When your organization joins the Tor Project’s Membership Program, you are demonstrating your commitment to privacy online and supporting Tor’s agility and development. In return, you become a closer part of our community with three specific benefits: access to our Onion Advisors group to help you integrate Tor into your product, inclusion in conversations and exclusive meetings with the Tor Project team to learn about what we are cooking at Tor, and public promotion of your membership. + If you are interested in becoming a member, please reach out to us at giving(a)torproject.org.</p> </div> <div class="container py-3"> - <h3 class="text-primary display-5">{{ _('Membership Tiers') }}</h3> - <p>{{ _('Membership tiers differ in their level of public promotion. No matter the level of your contribution, members receive the same community benefits: access to our Onion Advisors group to help integrate Tor into your project and inclusion in conversations and exclusive meetings with the Tor Project team. At Tor, we love all of the onions, but shallots are the tastiest!') }}</p> + <h3 class="text-primary display-5">Membership Tiers</h3> + <p>Membership tiers differ in their level of public promotion. No matter the level of your contribution, members receive the same community benefits: access to our Onion Advisors group to help integrate Tor into your project and inclusion in conversations and exclusive meetings with the Tor Project team. At Tor, we love all of the onions, but shallots are the tastiest!</p> </div> <div class="container"> <div class="row py-3"> @@ -13,9 +13,9 @@ <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/green.png' }}" /> </div> <div class="col-sm-8"> - <h4 class="h2 col-12 text-primary p-0">{{ _('Green Onion Member') }}</h4> - <p class="nick">{{ _('$10,000 - $49,999 per year') }}</p> - <p>{{ _('Your organization’s name, linking back to your website, is featured on our Membership Program page.') }}</p> + <h4 class="h2 col-12 text-primary p-0">Green Onion Member</h4> + <p class="nick">$10,000 - $49,999 per year</p> + <p>Your organization’s name, linking back to your website, is featured on our Membership Program page.</p> </div> </div> <div class="row py-3"> @@ -23,9 +23,9 @@ <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/vidalia.png' }}" /> </div> <div class="col-sm-8"> - <h4 class="h2 col-12 text-primary p-0">{{ _('Vidalia Onion Member') }}</h4> - <p class="nick">{{ _('$50,000 - $99,999 per year') }}</p> - <p>{{ _('Your organization’s logo, linking back to your website, is featured on our Membership Program page. We will also engage in social media promotion.') }}</p> + <h4 class="h2 col-12 text-primary p-0">Vidalia Onion Member</h4> + <p class="nick">$50,000 - $99,999 per year</p> + <p>Your organization’s logo, linking back to your website, is featured on our Membership Program page. We will also engage in social media promotion.</p> </div> </div> <div class="row py-3"> @@ -33,15 +33,15 @@ <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/shallot.png' }}" /> </div> <div class="col-sm-8"> - <h4 class="h2 col-12 text-primary p-0">{{ _('Shallot Onion Member') }}</h4> - <p class="nick">{{ _('≥ $100,000 per year year') }}</p> - <p>{{ _('Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.') }}</p> + <h4 class="h2 col-12 text-primary p-0">Shallot Onion Member</h4> + <p class="nick">≥ $100,000 per year year</p> + <p>Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.</p> </div> </div> </div> <div class="container"> <div class="row py-5"> - <h3 class="col-12 text-primary display-4">{{ _('Shallot Onion Members') }}</h3> + <h3 class="col-12 text-primary display-4">Shallot Onion Members</h3> <div class="col-md-4 col-xl-4 my-2"> <div class="card border-1 h-100"> <img class="card-img-top" src="#" alt="Card image cap"> @@ -73,7 +73,7 @@ </div> <div class="container"> <div class="row py-5"> - <h3 class="col-12 text-primary display-4">{{ _('Vidalia Onion Members') }}</h3> + <h3 class="col-12 text-primary display-4">Vidalia Onion Members</h3> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> <img class="card-img-top" src="#" alt="Card image cap"> @@ -146,7 +146,6 @@ </div> </div> <div class="row col-sm-8 py-5 text-center mx-auto"> - <h2 class="text-primary text-center mx-auto">{{ _('Become a Member') }}</h2> - <p class="text-center"> - {{ _('Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.') }}</p> + <h2 class="text-primary text-center mx-auto">Become a Member</h2> + <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.</p> </div>

1 0

[tpo/staging] Update contents.lr
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 9cf593db0f42ea1c78baf9c5a47e48394378306f Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 12:12:33 2020 -0300 Update contents.lr --- content/about/membership/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/membership/contents.lr b/content/about/membership/contents.lr index fd7aa00f..3c3465c6 100644 --- a/content/about/membership/contents.lr +++ b/content/about/membership/contents.lr @@ -10,4 +10,4 @@ title: Membership --- body: -Community has always been at the heart of Tor's strength. In this spirit, we created the Tor Project's Membership Program. Our goal is to build a supportive relationship between our nonprofit and private sector companies and organizations that use our technology or want to support our mission. +Community has always been at the heart of Tor's strength. In this spirit, we created the Tor Project's Membership Program. Our goal is to build a supportive relationship between our nonprofit and private sector organizations that use our technology or want to support our mission.

1 0

[tpo/staging] uploading new logo for Bertha Foundation
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 810669078e870202953c6e46e508dbc916fd6a0c Author: Bekeela Davila <bekeela(a)torproject.org> Date: Mon Jul 20 20:03:36 2020 +0000 uploading new logo for Bertha Foundation --- assets/static/images/sponsors/Bertha_Foundation.jpg | Bin 0 -> 451667 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/sponsors/Bertha_Foundation.jpg b/assets/static/images/sponsors/Bertha_Foundation.jpg new file mode 100644 index 00000000..558051ea Binary files /dev/null and b/assets/static/images/sponsors/Bertha_Foundation.jpg differ

1 0

[tpo/staging] Fix images url
by hiro＠torproject.org 27 Jul '20

27 Jul '20

commit 78300c166856da114ccfbd994e549fc9df70c6af Author: antonela <antonela(a)torproject.org> Date: Fri Jul 24 12:26:45 2020 -0300 Fix images url --- templates/membership.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index 58a98ed2..c1d0982c 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -10,7 +10,7 @@ <div class="container"> <div class="row py-3"> <div class="col"> - <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/green.png' }}" /> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/green.png' }}" /> </div> <div class="col-sm-8"> <h4 class="h2 col-12 text-primary p-0">Green Onion Member</h4> @@ -20,7 +20,7 @@ </div> <div class="row py-3"> <div class="col"> - <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/vidalia.png' }}" /> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/vidalia.png' }}" /> </div> <div class="col-sm-8"> <h4 class="h2 col-12 text-primary p-0">Vidalia Onion Member</h4> @@ -30,7 +30,7 @@ </div> <div class="row py-3"> <div class="col"> - <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '/static/images/membership/shallot.png' }}" /> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/shallot.png' }}" /> </div> <div class="col-sm-8"> <h4 class="h2 col-12 text-primary p-0">Shallot Onion Member</h4> @@ -145,7 +145,7 @@ </div> </div> </div> -<div class="row col-sm-8 py-5 text-center mx-auto"> +<div class="row col-sm-8 py-5 text-center mx-auto bg-membership" style="background-image:url('static/images/membership/shallot.png')"/> <h2 class="text-primary text-center mx-auto">Become a Member</h2> <p class="text-center">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at giving(a)torproject.org to get started.</p> </div>

1 0