- {% capture providers_title %}{% translate Providers %}{% endcapture %}
+ {% capture providers_title %}{% t Providers %}{% endcapture %}
{% capture providers_page %}/{% if page.language %}{{ page.language }}/{% endif %}providers/{% endcapture %}
- {% capture providers_description %}{% translate Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!%}{% endcapture %}
+ {% capture providers_description %}{% t Discover privacy-centric online services, including email providers, VPN operators, DNS administrators, and more!%}{% endcapture %}
{% include card.html color="success"
title=providers_title
@@ -16,9 +16,9 @@
description=providers_description
%}
- {% capture browsers_title %}{% translate Web Browsers %}{% endcapture %}
+ {% capture browsers_title %}{% t Web Browsers %}{% endcapture %}
{% capture browsers_page %}/{% if page.language %}{{ page.language }}/{% endif %}browsers/{% endcapture %}
- {% capture browsers_description %}{% translate Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks.%}{% endcapture %}
+ {% capture browsers_description %}{% t Find a web browser that respects your privacy, and discover how to harden your browser against tracking and leaks.%}{% endcapture %}
{% include card.html color="primary"
title=browsers_title
@@ -28,9 +28,9 @@
description=browsers_description
%}
- {% capture software_title %}{% translate Software %}{% endcapture %}
+ {% capture software_title %}{% t Software %}{% endcapture %}
{% capture software_page %}/{% if page.language %}{{ page.language }}/{% endif %}software/{% endcapture %}
- {% capture software_description %}{% translate Discover a variety of open source software built to protect your privacy and keep your digital data secure.%}{% endcapture %}
+ {% capture software_description %}{% t Discover a variety of open source software built to protect your privacy and keep your digital data secure.%}{% endcapture %}
{% include card.html color="warning"
title=software_title
@@ -40,9 +40,9 @@
description=software_description
%}
- {% capture os_title %}{% translate Operating Systems%}{% endcapture %}
+ {% capture os_title %}{% t Operating Systems%}{% endcapture %}
{% capture os_page %}/{% if page.language %}{{ page.language }}/{% endif %}operating-systems/{% endcapture %}
- {% capture os_description %}{% translate Find out how your operating system is compromising your privacy, and what simple alternatives exist.%}{% endcapture %}
+ {% capture os_description %}{% t Find out how your operating system is compromising your privacy, and what simple alternatives exist.%}{% endcapture %}
{% include card.html color="info"
title=os_title
@@ -52,9 +52,9 @@
description=os_description
%}
- {% capture services_title %}{% translate PrivacyTools Services%}{% endcapture %}
+ {% capture services_title %}{% t PrivacyTools Services%}{% endcapture %}
{% capture services_page %}/{% if page.language %}{{ page.language }}/{% endif %}services/{% endcapture %}
- {% capture services_description %}{% translate The PrivacyTools team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!%}{% endcapture %}
+ {% capture services_description %}{% t The PrivacyTools team is proud to launch a variety of privacy-centric online services, including a Mastodon instance, search engine, and more!%}{% endcapture %}
{% include card.html color="secondary"
title=services_title
@@ -64,9 +64,9 @@
description=services_description
%}
- {% capture donate_title %}{% translate Donate%}{% endcapture %}
+ {% capture donate_title %}{% t Donate%}{% endcapture %}
{% capture donate_page %}/{% if page.language %}{{ page.language }}/{% endif %}donate/{% endcapture %}
- {% capture donate_description %}{% translate We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating.%}{% endcapture %}
+ {% capture donate_description %}{% t We can't operate this site without the generous contributions we receive from our viewers. If you love privacy and our website please consider donating.%}{% endcapture %}
{% include card.html color="danger"
title=donate_title
diff --git a/_plugins/translate-tag.rb b/_plugins/translate-tag.rb
index 51fecec2..cfad1c96 100644
--- a/_plugins/translate-tag.rb
+++ b/_plugins/translate-tag.rb
@@ -35,4 +35,4 @@ module Jekyll
end
-Liquid::Template.register_tag('translate', Jekyll::TranslateTag)
+Liquid::Template.register_tag('t', Jekyll::TranslateTag)
diff --git a/index.html b/index.html
index c004650a..7796cfcd 100644
--- a/index.html
+++ b/index.html
@@ -6,10 +6,10 @@ translate: true
{% include sections/header.html %}
{% include sections/resources.html %}
-
+
-
{%translate New!%} {%translate Showcase your brand as a sponsor of PrivacyTools here and support our mission of creating a world free of mass surveillance!%}
{%translate Learn more...%}
+
{% t New!%} {% t Showcase your brand as a sponsor of PrivacyTools here and support our mission of creating a world free of mass surveillance!%}
{% t Learn more...%}
{% include sections/quotes.html %}
{% include sections/privacy-resources.html %}
diff --git a/pages/providers.html b/pages/providers.html
index 7aaf85d6..ad29b36b 100644
--- a/pages/providers.html
+++ b/pages/providers.html
@@ -6,21 +6,21 @@ description: "There's a ton of people providing services online. Discover which
translate: true
---
-
{% translate Services%}
+
{% t Services%}
-
{% translate Click on whatever service you need to view our recommendations.%}
+
{% t Click on whatever service you need to view our recommendations.%}
diff --git a/weblate-source-file.yml b/weblate-source-file.yml
index da835266..990b500c 100644
--- a/weblate-source-file.yml
+++ b/weblate-source-file.yml
@@ -119,6 +119,3 @@ Social_News_Aggregators: |
VPN: |
VPN
-Prefer_the_classic_site?_View_a_singlepage_layout.: |
- Prefer the classic site? View a single-page layout.
-
--
2.47.2
From 1472c2760ce5af634edbdeda3ef6d14381a0fe1f Mon Sep 17 00:00:00 2001
From: djoate <56777051+djoate@users.noreply.github.com>
Date: Tue, 19 Nov 2019 00:13:38 -0500
Subject: [PATCH 09/16] Code style cleanup
---
_plugins/hreflang-tag.rb | 15 ++++++++--
_plugins/translate-tag.rb | 17 +++++++++---
_plugins/translated-page-generator.rb | 40 +++++++++++++++++----------
_plugins/weblate-source-file.rb | 18 +++++++++---
4 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/_plugins/hreflang-tag.rb b/_plugins/hreflang-tag.rb
index 4ebf3ab2..4aeae1fd 100644
--- a/_plugins/hreflang-tag.rb
+++ b/_plugins/hreflang-tag.rb
@@ -1,10 +1,19 @@
# Copyright 2019 Signal
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
#
-# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
module Jekyll
diff --git a/_plugins/translate-tag.rb b/_plugins/translate-tag.rb
index cfad1c96..3464e46e 100644
--- a/_plugins/translate-tag.rb
+++ b/_plugins/translate-tag.rb
@@ -1,10 +1,19 @@
# Copyright 2019 Signal
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
#
-# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
module Jekyll
@@ -13,7 +22,7 @@ module Jekyll
def initialize(tag_name, text, tokens)
super
- @text = text.strip
+ @text = text.strip
@weblate_id = Weblate::ID.get(text)
end
diff --git a/_plugins/translated-page-generator.rb b/_plugins/translated-page-generator.rb
index 9624d240..c31d6040 100644
--- a/_plugins/translated-page-generator.rb
+++ b/_plugins/translated-page-generator.rb
@@ -1,10 +1,19 @@
# Copyright 2019 Signal
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
#
-# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
module Jekyll
@@ -22,26 +31,27 @@ module Jekyll
pages_to_translate = site.pages.select { |page| page.data["translate"] }
pages_to_translate.each do |page|
- page_title = page.data['title']
- page_title_weblate_id = Weblate::ID.get(page_title)
- page_description = page.data['description']
+ page_title = page.data['title']
+ page_title_weblate_id = Weblate::ID.get(page_title)
+ page_description = page.data['description']
page_description_weblate_id = Weblate::ID.get(page_description)
Weblate::SourceFile.add_entry(page_title_weblate_id, page_title)
Weblate::SourceFile.add_entry(page_description_weblate_id, page_description)
site.data["languages"].each_key do |language|
- translated_page = Jekyll::TranslatedPage.new(site, site.source, page.dir, page.name)
- translated_page_title = site.data["languages"][language][page_title_weblate_id]
+ translated_page = Jekyll::TranslatedPage.new(site, site.source, page.dir, page.name)
+ translated_page_title = site.data["languages"][language][page_title_weblate_id]
translated_page_description = site.data["languages"][language][page_description_weblate_id]
- translated_page.data = page.data.clone
- translated_page.data['title'] = translated_page_title.nil? ? page_title : translated_page_title.strip
- translated_page.data['description'] = translated_page_description.nil? ? page_description : translated_page_description.strip
- translated_page.data['permalink'] = "#{language}/#{page.dir}"
- translated_page.data['src_dir'] = page.dir
- translated_page.data['language'] = language
- translated_page.content = page.content
+ translated_page.data = page.data.clone
+ translated_page.data['title'] = translated_page_title.nil? ? page_title : translated_page_title.strip
+ translated_page.data['description'] = translated_page_description.nil? ? page_description
+ : translated_page_description.strip
+ translated_page.data['permalink'] = "#{language}/#{page.dir}"
+ translated_page.data['src_dir'] = page.dir
+ translated_page.data['language'] = language
+ translated_page.content = page.content
site.pages << translated_page
end
diff --git a/_plugins/weblate-source-file.rb b/_plugins/weblate-source-file.rb
index cd5ad413..df4b5377 100644
--- a/_plugins/weblate-source-file.rb
+++ b/_plugins/weblate-source-file.rb
@@ -1,16 +1,26 @@
# Copyright 2019 Signal
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+# associated documentation files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge, publish, distribute,
+# sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
#
-# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in all copies or
+# substantial portions of the Software.
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+# NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
module Weblate
class ID
def self.get(source_text)
- source_text.nil? ? source_text : source_text.strip[0..100].gsub(/[^\w\d\s\.\?\!]/, '').tr(' ', '_')
+ source_text.nil? ? source_text
+ : source_text.strip[0..100].gsub(/[^\w\d\s\.\?\!]/, '').tr(' ', '_')
end
end
--
2.47.2
From 84fbe91361d769c00b41fb63e59a053f901ad689 Mon Sep 17 00:00:00 2001
From: Patrick <32212089+xDazlD@users.noreply.github.com>
Date: Tue, 19 Nov 2019 10:55:34 -0600
Subject: [PATCH 10/16] Remove Wire (#1489)
https://blog.privacytools.io/delisting-wire/
* Remove Wire
* Delete wire.png
* Remove Wire security audit
* Remove Worth Mentioning
The only thing is Wire, which is being removed
* Remove Wire from do not use warning
---
_includes/sections/instant-messenger.html | 19 -------------------
_includes/sections/teamchat.html | 7 -------
assets/img/tools/wire.png | Bin 2113 -> 0 bytes
3 files changed, 26 deletions(-)
delete mode 100644 assets/img/tools/wire.png
diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index 1602c2b7..2d97b00d 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -22,24 +22,6 @@ android="https://signal.org/android/apk/#apk-danger"
ios="https://apps.apple.com/us/app/signal-private-messenger/id874139669"
%}
-
-{% include cardv2.html
-title="Wire"
-image="/assets/img/tools/wire.png"
-description="Wire is a free and end-to-end encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
-labels="warning:
Warning:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP"
-website="https://wire.com/"
-forum="https://forum.privacytools.io/t/discussion-wire/750"
-github="https://github.com/wireapp/"
-windows="https://wire.com/en/download"
-mac="https://wire.com/en/download"
-linux="https://wire.com/en/download"
-googleplay="https://play.google.com/store/apps/details?id=com.wire"
-android="https://wire.com/en/download"
-ios="https://itunes.apple.com/app/wire/id930944768?mt=8"
-web="https://app.wire.com"
-%}
-
Complete Comparison
- securechatguide.org - Guide to Choosing a Messenger.
@@ -77,7 +59,6 @@ web="https://app.wire.com"
- Independent security audits
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html
index 632e64e4..9c4e6a8f 100644
--- a/_includes/sections/teamchat.html
+++ b/_includes/sections/teamchat.html
@@ -58,10 +58,3 @@
firefox="https://addons.mozilla.org/en-US/firefox/addon/keybase-for-firefox/"
chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
%}
-
-
-
Worth Mentioning
-
-
- - Wire Pro - Paid team communication with E2EE. Untested
-
diff --git a/assets/img/tools/wire.png b/assets/img/tools/wire.png
deleted file mode 100644
index abae18c8efab2fdd809e979b395088a824eec55e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2113
zcmV-H2)_4;P)
MzCV_|S*
zE^l&Yo9;Xs000NTNkl>pmkQmTNF&^q5KGLndjK~aZS5^udoK&ibx9Ohl
zHg*~($fN?yBRgHVefb_YXght?~|Yp3BgC+xq*wl1@(H_GUM3)J}Ri
zf!m*2+^WAAlxp0e8LpKR*V-df>rI`*?FuqJRk#mx2`{Lghf;xipGR;*$jRPihH)M*
z=|WQPGI=g?GOX$({q5rR;Rs$-t*v&M9CqMU?Y7~4@fu#%GI`zHGG_ZpXX6J%|2x5U72(Vny>@xW_Sy8>=(b5NJ842&~7
ztvziI&^fLnRB%7}4Ca0+(&M|{(>k!j%~2f-$wjp|a#=u~)4)4g!yTL0_7EldkYDC0
z3L{{{#|Q#8e!B2=9J2E7cf<$YW@Ugde3?PvB{pz(TwH}>91Y^}oUpB>nY=IJclB`+
zxYAf=Gl2>!m_W8kt8^BaIP=Ta%CrmIL|<)p1z(%gZ@5yY_7=8=V&K)$xSg%d-rEJ<
zW9&9Wq`za*cRLFlAU6_tsx>>iz-zTt_o$hgMtbTqtDOagNs+)GI}7~0wi+2*f$B3$
zoCf}&C2kL^D{t%qFVt3tqk`Ubcrw0yhKH^7Z_R^&@8JPr&46;pf#JW1%p
zdLFney1&-mf!C`R{c%44Z&m!94&bs@fybs7_(#RjbOMiU6}T)tz_p6gz5)&?F8B&K
zsANOJo(FF5A+YZrY2Q^^zH65D`wDoU;wxVPf03rngKL1-E6RNZyhu^vE8qtegC+mJ
z+Y}_*^%3qK-WhXdj6Snil;1g<)2!qP2k{P?f{u&IS*oq_V$KZJXI>KJ_m8=bU!;S0
zvSHd@5e-q{RjJ6sedxPhP_pS)^xGrk6
zsH7&dw4pq1?cG(lsAZJ4dt3%QG(27UkD%q&MRnjWQCU;8-R%*nLv-o{QC@%3LEEj9
zn1!cHm13iHtK;O@s#o8O(~#^kX|grT%d}NTSvZ*Yn^ypoO6-btao38v(m}4$b`O}e
zi8|#n(SEQxuGe<=${y$$HWszCtZ}9Hc%iAOe+qS6$kHh@MESgG$``d17b8~3OCqf_
zahoo%3pIigkJ3fkURc^qLQWoL3NQbZfgFs--zqnWiT6s1@^WoX5MKYUY^cB=*Q<8ehg4LkaRB
zQ%(OY)H|}VkL>%lHqnZ8(Da|0v2SNOFR+5wd4?w$8}XxrT*4Rmls-|ZofyR|%2~nd
zEM+Ez5vU49Uv^y$JnEMg$$YWzf0XrCH!77`n9Keg{^UBl@s@5B&Y8JEC%7fK;D6^lg&U+W`2c_yJ%d}{Mt}nW@vF%UP^DJ%PqypgXhU?f6VYjVxim^%we5D-qv4iw
zl#`+;$!~O|*2x&JoEN?M)+PPj>(dz&|9FOL<@5!`*U(q9QXE1jRqyTF7DB%{^nI2+
z8R+_D_PZ^Nl1{=U)c_S|^wTA2{y0sMyS~U%z#1Eoz^qkJtK!b@x&S)#fvMDWC*Ayk
zsTSDXC}p!?Q9wMM=6z;bnm2F_b`B$0z!qu*&S(QQR5737bX49IxeQ`5WvpW>KXHVB
r?p>cHKrKJAm35RciGeXIZ5+`5k+MK4sB86`00000NkvXXu0mjfxYq#2
--
2.47.2
From ce7d03fea3b20b771a8e3ed017fcd94ad011261f Mon Sep 17 00:00:00 2001
From: Tom Hacohen
Date: Fri, 22 Nov 2019 07:26:06 +0200
Subject: [PATCH 11/16] EteSync: add iOS link, improve description and fix dav
bridge install links. (#1490)
The dav bridge install instructions will soon be moved so better to
use the new links now already (for now, they are just a redirect).
Add links to BSD installation instructions.
---
_includes/sections/calendar-contacts-sync.html | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html
index 40f966ac..907fb7b8 100644
--- a/_includes/sections/calendar-contacts-sync.html
+++ b/_includes/sections/calendar-contacts-sync.html
@@ -34,16 +34,20 @@
include cardv2.html
title="EteSync"
image="/assets/img/provider/etesync.png"
- description="EteSync is a secure, end-to-end encrypted, and journaled personal information (e.g. contacts and calendar) cloud synchronization and backup for Android and any OS that supports CalDAV/CardDAV. It costs $24 per year to use, or you can host the server yourself for free."
+ description="EteSync is a secure, end-to-end encrypted, and privacy-respecting cloud backup and synchronization software for your personal information (e.g. contacts and calendars). There are native clients for Android, iOS, and the web, and an adapter layer for most desktop clients. It costs $24 per year to use, or you can host the server yourself for free."
website="https://www.etesync.com/"
forum="https://forum.privacytools.io/t/discussion-etesync-calender-contacts-sync-tools/1536"
github="https://github.com/etesync"
web="https://client.etesync.com/"
- windows="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
- mac="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
- linux="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+ windows="https://www.etesync.com/install/dav/"
+ mac="https://www.etesync.com/install/dav/"
+ linux="https://www.etesync.com/install/dav/"
+ freebsd="https://www.etesync.com/install/dav/"
+ openbsd="https://www.etesync.com/install/dav/"
+ netbsd="https://www.etesync.com/install/dav/"
fdroid="https://f-droid.org/packages/com.etesync.syncadapter/"
googleplay="https://play.google.com/store/apps/details?id=com.etesync.syncadapter"
+ ios="https://www.etesync.com/install/ios/"
%}
Worth Mentioning
--
2.47.2
From 6e6ca1a25e30c515714d5f5a8a964ccd265ca306 Mon Sep 17 00:00:00 2001
From: Brian <20056195+coopbri@users.noreply.github.com>
Date: Fri, 22 Nov 2019 12:49:48 -0600
Subject: [PATCH 12/16] Fix grammar in CPU vulnerability section (#1506)
---
_includes/sections/operating-systems.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html
index c6eae044..d2ebf4cf 100644
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@@ -56,7 +56,7 @@ gitlab="https://salsa.debian.org/qa/debsources"
This also affects Windows 10, but it doesn't expose this information or mitigation instructions as easily. MacOS users check How to enable full mitigation for Microarchitectural Data Sampling (MDS) vulnerabilities on Apple Support.
-When running a enough recent Linux kernel, you can check the CPU vulnerabilities it detects by tail -n +1 /sys/devices/system/cpu/vulnerabilities/*. By using tail -n +1 instead of cat, the file names are also visible.
+When running a recent enough Linux kernel, you can check the CPU vulnerabilities it detects by tail -n +1 /sys/devices/system/cpu/vulnerabilities/*. By using tail -n +1 instead of cat, the file names are also visible.
In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the tail command. To mitigate this, disable hyper-threading from the UEFI/BIOS. You can also take the following mitigation steps below if your system/distribution uses GRUB and supports /etc/default/grub.d/:
--
2.47.2
From 0cb341a673e013fed52104147f8445040ed4bb30 Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sat, 23 Nov 2019 21:16:11 -0800
Subject: [PATCH 13/16] Add a link to audit for Standard Notes (#1512)
---
_includes/sections/notebooks.html | 2 +-
_includes/sections/teamchat.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html
index 9930001b..9ebd9de3 100644
--- a/_includes/sections/notebooks.html
+++ b/_includes/sections/notebooks.html
@@ -24,7 +24,7 @@ chrome="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmk
{% include cardv2.html
title="Standard Notes"
image="/assets/img/tools/StandardNotes.png"
-description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors."
+description='Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors. It has also been independently audited (PDF).'
website="https://standardnotes.org/"
github="https://github.com/standardnotes"
windows="https://standardnotes.org/#get-started"
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html
index 9c4e6a8f..064778e6 100644
--- a/_includes/sections/teamchat.html
+++ b/_includes/sections/teamchat.html
@@ -43,7 +43,7 @@
include cardv2.html
title="Keybase"
image="/assets/img/tools/keybase.png"
- description='Keybase provides a hosted team chat with end-to-end encryption. It has also been indepedently audited (PDF).'
+ description='Keybase provides a hosted team chat with end-to-end encryption. It has also been independently audited (PDF).'
labels="warning:Warning:The server side of Keybase runs on proprietary code and is centralized."
website="https://keybase.io/"
forum="https://forum.privacytools.io/t/discussion-keybase/1224"
--
2.47.2
From 31e1300591bf0c92ebae9aa596ed35b9c2b3cfcc Mon Sep 17 00:00:00 2001
From: nitrohorse <1514352+nitrohorse@users.noreply.github.com>
Date: Sat, 23 Nov 2019 21:27:46 -0800
Subject: [PATCH 14/16] mailbox.org no long accepts Bitcoin (#1513)
---
_includes/sections/email-providers.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index a0e9b178..d775478c 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -78,7 +78,7 @@
2 GB |
12 € |
- Accepted |
+ No |
Built-in |
Yes |
--
2.47.2
From 06322dc4a267e2d7200703236186181f77881046 Mon Sep 17 00:00:00 2001
From: Dawid Potocki
Date: Mon, 25 Nov 2019 16:17:31 +0000
Subject: [PATCH 15/16] Kolab Now Webclient now supports PGP encryption (#1521)
---
_includes/sections/email-providers.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index d775478c..dbb44ede 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -58,7 +58,7 @@
2 GB |
$ 60 |
Accepted |
- No |
+ Built-in |
Yes |
--
2.47.2
From da3f267c964a1c14d59ee767e6b820ab9e70c818 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen
Date: Tue, 26 Nov 2019 00:15:04 +0200
Subject: [PATCH 16/16] dns: cleanup legacy parts (#1372)
---
_includes/sections/dns.html | 36 +++---------------------------------
pages/providers/dns.html | 2 +-
2 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 4f9327e4..26b12213 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -1,34 +1,4 @@
- Domain Name System (DNS)
-
-{%
- include cardv2.html
- title="Njalla - Domain Registration"
- image="/assets/img/provider/Njalla.png"
- description="Njalla is a privacy-aware domain registration service based in Nevis that only needs your email or XMPP address in order to register a domain name for you. It is created by people from The Pirate Bay and IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, DASH, Bitcoin Cash and PayPal."
- website="https://njal.la/"
- tor="http://njalladnspotetti.onion"
- forum="https://forum.privacytools.io/t/discussion-njalla/339"
-%}
-
-{%
- include cardv2.html
- title="DNSCrypt-Proxy - Tool"
- image="/assets/img/tools/DNSCrypt-Proxy.png"
- description="DNSCrypt-Proxy is a command-line DNS proxy with support for the encrypted DNS protocols, DNS over HTTPS and DNSCrypt. Can cache results to improve speed, and allows filtering, forwarding, and cloaking."
- website="https://github.com/jedisct1/dnscrypt-proxy/"
- forum="https://forum.privacytools.io/t/discussion-dnscrypt-proxy/1498"
- github="https://github.com/jedisct1/dnscrypt-proxy/"
- windows="https://github.com/jedisct1/dnscrypt-proxy/releases"
- linux=""
- mac="https://github.com/jedisct1/dnscrypt-proxy/releases"
- freebsd="https://www.freshports.org/dns/dnscrypt-proxy2/"
- openbsd="http://openports.se/net/dnscrypt-proxy"
- netbsd="http://pkgsrc.se/net/dnscrypt-proxy2"
- android=""
- ios=""
-%}
-
- Encrypted ICANN DNS Providers
+ Encrypted Domain Name System (DNS) Resolvers
Note: Using an encrypted DNS resolver will not make you anonymous, nor hide your internet traffic from your Internet Service Provider. But it will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here.
@@ -38,7 +8,7 @@
- | ICANN DNS Provider |
+ DNS Provider |
Server Locations |
Privacy Policy |
Type |
@@ -570,7 +540,7 @@
QNAME Minimization - Run dig +short txt qnamemintest.internet.nl from the command-line (taken from this NLnet Labs presentation). If you are on Windows 10, run Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl from the PowerShell. You should see this display: "HOORAY - QNAME minimisation is enabled on your resolver :)!"
-Worth Mentioning and Additional Information
+Software suggestions and Additional Information
- Encrypted DNS clients for desktop:
diff --git a/pages/providers/dns.html b/pages/providers/dns.html
index c93dfce6..cf1aa1e8 100644
--- a/pages/providers/dns.html
+++ b/pages/providers/dns.html
@@ -1,7 +1,7 @@
---
layout: page
permalink: /providers/dns/
-title: "DNS / Domain Providers"
+title: "Encrypted DNS Resolvers"
description: "Don't let Google see all your DNS traffic. Discover privacy-centric alternatives to the traditional DNS providers."
---
--
2.47.2