From 9a4d3fbbd479d4b4da9ff8c4b2513fae881d3caa Mon Sep 17 00:00:00 2001 From: nitrohorse <1514352+nitrohorse@users.noreply.github.com> Date: Sat, 2 Nov 2019 22:10:01 +0000 Subject: [PATCH 1/5] DNS: Replace BlahDNS's Switzerland server with its new Finland server (#1455) --- _includes/sections/dns.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html index d684e70f..4f9327e4 100644 --- a/_includes/sections/dns.html +++ b/_includes/sections/dns.html @@ -98,16 +98,16 @@ - - Switzerland, - - - - Japan, + + Finland, - Germany + Germany, + + + + Japan -- 2.49.1 From 0114589219ece6e8d18b592344975df2b8bef95b Mon Sep 17 00:00:00 2001 From: djoate <56777051+djoate@users.noreply.github.com> Date: Sat, 2 Nov 2019 21:15:20 -0400 Subject: [PATCH 2/5] donate.html: key strings into en.yml --- _i18n/en.yml | 9 +++++++-- pages/donate.html | 14 +++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 20af8428..741f9dab 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -247,11 +247,17 @@ participate: contributors: "Contributor List" thanks: "This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you." donate: + opencollective_card_title: "Donate via OpenCollective" + opencollective_card_text: "If you are able, please consider contributing to our development and outreach programs. Contributions via OpenCollective to privacytools.io are tax deductible for US taxpayers. These funds are transparently and primarily used to cover server costs." + opencollective_card_contribute: "Contribute" + opencollective_card_moreinfo: "More Info" cta: "Please Donate" ad_free: "Our website is free of advertisements and not affiliated with any listed providers." costs: "Your donation will cover our costs for servers, domains, coffee, beer, and pizza." bitcoin: "We prefer Bitcoin donations to be above $5 due to the state of the network's transaction fees." bitcoin2: "You are welcome to donate any smaller or larger amount on any other cryptocurrency, such as Bitcoin Cash, Ethereum, or Stellar." + other_crypto_no_receipt: "You may also contribute via the cryptocurrencies below; however, we will not be able to provide a receipt for your contribution." + convert_opencollective: "Your contribution will be considered an anonymous, unrestricted contribution and paid to our Fiscal Host at OpenCollective when we convert to currency." more: "More Cryptocurrencies" the: "The" team: "privacytools.io team" @@ -313,8 +319,7 @@ pc_os: arch_descr: "A simple, lightweight Linux distribution. It is composed predominantly of free and open-source software, and supports community involvement." trisquel_descr: "Derived from Ubuntu, this project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed." parabola_descr: "is a completely open source version of Arch Linux." - whonix_descr: 'A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" - and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.' + whonix_descr: 'A Debian-based security-focused Linux distribution. It aims to provide privacy, security and anonymity on the internet. The operating system consists of two virtual machines, a "Workstation" and a Tor "Gateway". All communication are forced through the Tor network to accomplish this.' mobile_os: mobile_operating_systems: "Mobile Operating Systems" google_warning: "Even though the source code of the following OS is provided, installing Google Apps may compromise your setup." diff --git a/pages/donate.html b/pages/donate.html index 2ba79e42..badbd188 100644 --- a/pages/donate.html +++ b/pages/donate.html @@ -11,18 +11,18 @@ permalink: /donate/
-
Donate via OpenCollective
+
{% t donate.opencollective_card_title %}
-

If you are able, please consider contributing to our development and outreach programs. Contributions via OpenCollective to privacytools.io are tax deductible for US taxpayers. These funds are transparently and primarily used to cover server costs.

- Contribute - More Info +

{% t donate.opencollective_card_text %}

+ {% t donate.opencollective_card_contribute %} + {% t donate.opencollective_card_moreinfo %}
-

Please Donate

+

{% t donate.cta %}

-

Our website is free of advertisements and not affiliated with any listed providers.
Your donation will cover our costs for servers, domains, coffee, beer, and pizza.

-

You may also contribute via the cryptocurrencies below, however we will not be able to provide a receipt for your contribution.
Your contribution will be considered an anonymous, unrestricted contribution and paid to our Fiscal Host at OpenCollective when we convert to currency.

+

{% t donate.ad_free %}
{% t donate.costs %}

+

{% t donate.other_crypto_no_receipt %}
{% t donate.convert_opencollective %}

-- 2.49.1 From 9c16719b0851b26e35d177f39dcf64e325bcccea Mon Sep 17 00:00:00 2001 From: djoate <56777051+djoate@users.noreply.github.com> Date: Sat, 2 Nov 2019 21:44:54 -0400 Subject: [PATCH 3/5] navbar: fix unkeyed strings --- _i18n/en.yml | 1 + _includes/nav.html | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 741f9dab..319d9831 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -7,6 +7,7 @@ global: download: "Download" related_information: "Related Information" contrib: "This software may depend on or recommend non-free software." + theme: "Theme" aria: nav_toggle: "Toggle navigation" service_descriptions: diff --git a/_includes/nav.html b/_includes/nav.html index 0a5e16b5..7d9d0cf0 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -126,7 +126,7 @@
- Services + {% t service_descriptions.services %} @@ -146,7 +146,7 @@ {% t resources.sponsors %} - Theme + {% t global.theme %} -- 2.49.1 From ab7095faf1bd917b302b49f91e64a362dad6f5eb Mon Sep 17 00:00:00 2001 From: djoate <56777051+djoate@users.noreply.github.com> Date: Sat, 2 Nov 2019 22:19:17 -0400 Subject: [PATCH 4/5] sponsors.html: key strings into en.yml --- _i18n/en.yml | 27 ++++++++++++++++++++++++++ pages/sponsors.html | 46 ++++++++++++++++++++++----------------------- 2 files changed, 50 insertions(+), 23 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 319d9831..cf268580 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -247,6 +247,33 @@ participate: github_d: "The complete website source code is available on GitHub. Join our developer team!" contributors: "Contributor List" thanks: "This is a community project aiming to deliver the best information available to improve privacy online. Thank you for participating. This project needs you." +sponsors: + sponsors_ptio: "Sponsors of privacytools.io" + community_proj: "The privacytools.io website and services are a community project. There is no advertising, affiliate links, or other forms of monetization." + donations_support: "Your donations here directly support hosting this website and compensating contributors to this project." + become_a_sponsor: "Become a Sponsor" + donate_directly: "Donate Directly" + why_sponsor: "Why sponsor privacytools.io?" + designed_to_allow: "This sponsorship program is designed to allow companies, organizations, and individuals partner with the privacytools.io team to support our vision of a more privacy-respecting internet and the greater online community." + recognize_privacy: "With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!" + recognized_on_ptio: "As a sponsor of privacytools.io, your company will be widely recognized in a variety of ways, some of which we've detailed below." + general_info: "General Information" + stats_pageviews_featured: "This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution." + info_link: "Info" + bronze_sponsorship: "Bronze Sponsorship" + bronze_recognition: "Your name and link along with a small logo or avatar on the sponsors page of this website." + silver_sponsorship: "Silver Sponsorship" + silver_recognition: "Your medium-sized logo as a link at the top of our sponsors page." + gold_sponsorship: "Gold Sponsorship" + gold_recognition: "Your medium-sized logo as a link on the privacytools.io homepage and at the very top of our sponsors page." + we_will_not_provide: "We will not provide..." + details_for_not_provide: "We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above." + tax_and_financial_info: "Tax and Financial Information" + contribs_handled_by_opencol: "Your contribution to privacytools.io will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is" + tax_deducible: "tax-deductible" + non_profit_and_anons_no_sponsorship: "As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above." + more_information: "More Information" + questions_to_email: "If you are interested and have further questions, you are welcome to reach out to us directly at" donate: opencollective_card_title: "Donate via OpenCollective" opencollective_card_text: "If you are able, please consider contributing to our development and outreach programs. Contributions via OpenCollective to privacytools.io are tax deductible for US taxpayers. These funds are transparently and primarily used to cover server costs." diff --git a/pages/sponsors.html b/pages/sponsors.html index df99c9f7..bd2ede4e 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -8,42 +8,42 @@ permalink: /sponsors/
-

Sponsors of privacytools.io

+

{% t sponsors.sponsors_ptio %}

-

The privacytools.io website and services are a community project. There is no advertising, affiliate links, or other forms of monetization.
Your donations here directly support hosting this website and compensating contributors to this project.

+

{% t sponsors.community_proj %}
{% t sponsors.donations_support %}

- Become a Sponsor - Donate Directly + {% t sponsors.become_a_sponsor %} + {% t sponsors.donate_directly %}

-

Why sponsor privacytools.io?

-

This sponsorship program is designed to allow companies, organizations, and individuals partner with the privacytools.io team to support our vision of a more privacy-respecting internet and the greater online community.

-

With this exposure and sponsorship, your customers will recognize your intrinsic understanding and commitment to user privacy. Moreover, you'll directly contribute to our mission of spreading privacy-respecting tools and knowledge worldwide!

-

As a sponsor of privacytools.io, your company will be widely recognized in a variety of ways, some of which we've detailed below.

-
General Information
-

This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.

-
🥉 Bronze Sponsorship - Info
+

{% t sponsors.why_sponsor %}

+

{% t sponsors.designed_to_allow %}

+

{% t sponsors.recognize_privacy %}

+

{% t sponsors.recognized_on_ptio %}

+
{% t sponsors.general_info %}
+

{% t sponsors.stats_pageviews_featured %}

+
🥉 {% t sponsors.bronze_sponsorship %} - {% t sponsors.info_link %}
-
🥈 Silver Sponsorship - Info
+
🥈 {% t sponsors.silver_sponsorship %} - {% t sponsors.info_link %}
-
🥇 Gold Sponsorship - Info
+
🥇 {% t sponsors.gold_sponsorship %} - {% t sponsors.info_link %}
-
We will not provide...
-

We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above.

-
Tax and Financial Information
-

Your contribution to privacytools.io will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is tax deductible. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above.

-
More Information
-

If you are interested and have further questions, you are welcome to reach out to us directly at sponsors@privacytools.io.

+
{% t sponsors.we_will_not_provide %}
+

{% t sponsors.details_for_not_provide %}

+
{% t sponsors.tax_and_financial_info %}
+

{% t sponsors.handled_by_opencollective %} {% t sponsors.tax_deducible %}. {% t sponsors.non_profit_and_anons_no_sponsorship %}

+
{% t sponsors.more_information %}
+

{% t sponsors.questions_to_email %} sponsors@privacytools.io.

- Become a Sponsor + {% t sponsors.become_a_sponsor %}
-- 2.49.1 From a007e37a5f79f0d72dad69e5448a898424bf63ac Mon Sep 17 00:00:00 2001 From: djoate <56777051+djoate@users.noreply.github.com> Date: Sun, 3 Nov 2019 01:33:00 -0400 Subject: [PATCH 5/5] Don't break up sentences for --- _i18n/en.yml | 4 +--- pages/sponsors.html | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index cf268580..7347c0bf 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -269,9 +269,7 @@ sponsors: we_will_not_provide: "We will not provide..." details_for_not_provide: "We pride ourselves on our integrity and commitment to spreading unbiased and fact-based information regarding privacy and privacy-respecting tools. All tools we recommend throughout our website are subject to strict criteria as judged by our team and the community across our various platforms. Your sponsorship will not grant your organization any special consideration when choosing our recommendations throughout the website, a process which we make clear via our transparent ledger on OpenCollective and our public discussions on GitHub. Your sponsorship benefits are limited to those outlined above." tax_and_financial_info: "Tax and Financial Information" - contribs_handled_by_opencol: "Your contribution to privacytools.io will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is" - tax_deducible: "tax-deductible" - non_profit_and_anons_no_sponsorship: "As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above." + tax_and_financial_info_details: "Your contribution to privacytools.io will be handled by the Open Collective Foundation 501(c)(3). For US companies and taxpayers, this means your contribution is tax-deductible. As a non-profit, your sponsorship contribution will not be used for private profit and will only be used to cover expenses incurred by the project. All of our transactions (donations and expenses) are published transparently on OpenCollective. For the benefit of our readership, anonymous contributions will not be eligible for the sponsorship opportunities outlined above." more_information: "More Information" questions_to_email: "If you are interested and have further questions, you are welcome to reach out to us directly at" donate: diff --git a/pages/sponsors.html b/pages/sponsors.html index bd2ede4e..f17b30c8 100644 --- a/pages/sponsors.html +++ b/pages/sponsors.html @@ -40,7 +40,7 @@ permalink: /sponsors/
{% t sponsors.we_will_not_provide %}

{% t sponsors.details_for_not_provide %}

{% t sponsors.tax_and_financial_info %}
-

{% t sponsors.handled_by_opencollective %} {% t sponsors.tax_deducible %}. {% t sponsors.non_profit_and_anons_no_sponsorship %}

+

{% t sponsors.tax_and_financial_info_details %}

{% t sponsors.more_information %}

{% t sponsors.questions_to_email %} sponsors@privacytools.io.

-- 2.49.1