Merge branch 'master' into i18n-simple

_includes/sections/calendar-contacts-sync.html

@@ -37,16 +37,20 @@
   include cardv2.html
   title="EteSync"
   image="/assets/img/provider/etesync.png"
-  description="<strong>EteSync</strong> 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="<strong>EteSync</strong> 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"
+  windows="https://www.etesync.com/install/dav/"
-  mac="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  mac="https://www.etesync.com/install/dav/"
-  linux="https://github.com/etesync/etesync-dav/blob/master/README.md#installation"
+  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/"
 %}
 
 <h3>{% t Worth Mentioning %}</h3>

_includes/sections/dns.html

@@ -1,34 +1,4 @@
-<h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> {% t Domain Name System (DNS) %}</h1>
+<h1 id="dns" class="anchor"><a href="#dns"><i class="fas fa-link anchor-icon"></i></a> {% t Encrypted Domain Name System (DNS) Resolvers %}</h1>
-
-{%
-  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=""
-%}
-
-<h1 id="icanndns" class="anchor"><a href="#icanndns"><i class="fas fa-link anchor-icon"></i></a> {% t Encrypted ICANN DNS Providers %}</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>{% t 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. %}</strong>
@@ -38,7 +8,7 @@
   <table class="table sortable-theme-bootstrap" data-sortable>
     <thead>
       <tr>
-        <th data-sorted="true" data-sorted-direction="ascending">{% t ICANN DNS Provider %}</th>
+        <th data-sorted="true" data-sorted-direction="ascending">{% t DNS Provider %}</th>
         <th data-sortable="true">{% t Server Locations %}</th>
         <th data-sortable="false">{% t Privacy Policy %}</th>
         <th data-sortable="true">{% t Type %}</th>
@@ -543,7 +513,7 @@
   <li>{% t QNAME Minimization - Run <code>dig +short txt qnamemintest.internet.nl</code> from the command-line (taken from <a href="https://nlnetlabs.nl/downloads/presentations/unbound_qnamemin_oarc24.pdf">this NLnet Labs presentation</a>). If you are on Windows 10, run <code>Resolve-DnsName -Type TXT -Name qnamemintest.internet.nl</code> from the PowerShell. You should see this display: <code>"HOORAY - QNAME minimisation is enabled on your resolver :)!"</code> %}</li>
 </ul>
 
-<h3 id="clients">{% t Worth Mentioning and Additional Information %}</h3>
+<h3 id="clients">{% t Software Suggestions and Additional Information %}</h3>
 
 <ul>
   <li><strong>{% t Encrypted DNS clients for desktop: %}</strong>

_includes/sections/email-providers.html

@@ -58,7 +58,7 @@
         <td data-value="2048">2 GB</td>
         <td data-value="6000">$ 60</td>
         <td data-value="1"><span class="label label-success">{% t Accepted %}</span></td>
-        <td data-value="0"><span class="label label-primary">{% t No %}</span></td>
+        <td data-value="1"><span class="label label-success">{% t Built-in %}</span></td>
         <td data-value="1"><span class="label label-success">{% t Yes %}</span></td>
       </tr>
 
@@ -78,7 +78,7 @@
         </td>
         <td data-value="2000">2 GB</td>
         <td data-value="1444">12 €</td>
-        <td data-value="1"><span class="label label-success">{% t Accepted %}</span></td>
+        <td data-value="0"><span class="label label-success">{% t No %}</span></td>
         <td data-value="1"><span class="label label-success">{% t Built-in %}</span></td>
         <td data-value="1"><span class="label label-success">{% t Yes %}</span></td>
       </tr>
@@ -220,7 +220,7 @@
         </td>
         <td data-value="10000">10 GB</td>
         <td data-value="5995">$ 59.95</td>
-        <td data-value="0"><span class="label label-success">{% t Accepted %}</span></td>
+        <td data-value="1"><span class="label label-success">{% t Accepted %}</span></td>
         <td data-value="1"><span class="label label-success">{% t Built-in %}</span></td>
         <td data-value="1"><span class="label label-success">{% t Yes %}</span></td>
       </tr>

_includes/sections/instant-messenger.html

@@ -21,24 +21,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:<a href=//www.vice.com/en_us/article/gvzw5x/secure-messaging-app-wire-stores-everyone-youve-ever-contacted-in-plain-text>Warning</a>: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"
-%}
-
 <h3>{% t Complete Comparison %}</h3>
 <ul>
 	<li><a href="{% t https://securechatguide.org/effguide.html %}">{% t securechatguide.org %}</a> - {% t Guide to Choosing a Messenger. %}</li>
@@ -75,8 +57,7 @@ web="https://app.wire.com"
   <li><a href="https://signal.org/android/apk/"> {% t Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances. %}</a></li>
   <li>{% t Independent security audits %}</li>
   <ul>
-    <li>{% t<a href="https://eprint.iacr.org/2016/1013.pdf"> A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila %}</li>
+    <li>{% t<a href="https://eprint.iacr.org/2016/1013.pdf">A Formal Security Analysis of the Signal Messaging Protocol (2019)</a> by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila %}</li>
-    <li>{% t<a href="https://wire.com/en/security/#audits">Independent security audits</a> on Wire's website %}</li>
     <li>{% t<a href="https://keybase.io/docs-assets/blog/NCC_Group_Keybase_KB2018_Public_Report_2019-02-27_v1.3.pdf">Keybase's Protocol Security Review (2019)</a> by <a href="https://www.nccgroup.trust/">NCC Group</a> %}</li>
   </ul>
 </ul>

_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 <a href="https://s3.amazonaws.com/standard-notes/security/Report-SN-Audit.pdf">independently audited (PDF)</a>.'
 website="https://standardnotes.org/"
 github="https://github.com/standardnotes"
 windows="https://standardnotes.org/#get-started"

_includes/sections/operating-systems.html

@@ -55,7 +55,7 @@ gitlab="https://salsa.debian.org/qa/debsources"
 
 <p><em>{% t <a href=" https://support.microsoft.com/en-us/help/4073757/protect-windows-devices-from-speculative-execution-side-channel-attack">This also affects Windows 10</a>, but it doesn't expose this information or mitigation instructions as easily. MacOS users check <a href="https://support.apple.com/en-us/HT210108">How to enable full mitigation for Microarchitectural Data Sampling (MDS) vulnerabilities on Apple Support</a>.%}</em></p>
 
-<p>{% t When running a enough recent Linux kernel, you can check the CPU vulnerabilities it detects by <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code>. By using <code>tail -n +1</code> instead of <code>cat</code>, the file names are also visible. %}</p>
+<p>{% t When running a recent enough Linux kernel, you can check the CPU vulnerabilities it detects by <code>tail -n +1 /sys/devices/system/cpu/vulnerabilities/*</code>. By using <code>tail -n +1</code> instead of <code>cat</code>, the file names are also visible. %}</p>
 
 <p>
     {% t In case you have an Intel CPU, you may notice "SMT vulnerable" display after running the <code>tail</code> command. To mitigate this, disable <a href="https://en.wikipedia.org/wiki/Hyper-threading">hyper-threading</a> from the UEFI/BIOS.%} {% t You can also take the following mitigation steps below if your system/distribution uses GRUB and supports <code>/etc/default/grub.d/</code>:%}

_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"
 %}
-
-
-<h3>{% t Worth Mentioning %}</h3>
-
-<ul>
-  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">{% t Wire Pro %}</a> - {% t Paid team communication with E2EE. %} <span class="badge badge-warning" data-toggle="tooltip" title="{% t While the free edition of Wire is a recommended platform, we have not tested the Pro edition. %}">{% t Untested %} <i class="far fa-question-circle"></i></span></li>
-</ul>

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."
 translate: true
 ---