Merge branch 'master' into i18n

This commit is contained in:
djoate
2019-11-02 02:09:50 -04:00
127 changed files with 2586 additions and 1382 deletions

View File

@ -23,19 +23,6 @@
{%- capture title9 -%}{% t browser_addons.noScript_security_suite_title %}{%- endcapture -%}
{%- capture descr9 -%}<strong>{% t browser_addons.noScript_security_suite %}</strong> {% t browser_addons.noScript_security_suite_description %}{%- endcapture -%}
{% include cardv2.html
title=title1
image="/assets/img/addons/privacy-badger.png"
description=descr1
website="https://www.eff.org/privacybadger"
forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
github="https://github.com/EFForg/privacybadger"
firefox=""
chrome=""
opera=""
android=""
%}
{% include cardv2.html
title=title2
image="/assets/img/addons/ublock-origin.png"
@ -43,12 +30,10 @@ description=descr2
website="https://addons.mozilla.org/firefox/addon/ublock-origin/"
forum="https://forum.privacytools.io/t/discussion-ublock-origin/266"
github="https://github.com/gorhill/uBlock/"
firefox=""
chrome=""
safari=""
opera=""
edge=""
android=""
firefox="https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/"
chrome="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm"
opera="https://addons.opera.com/en/extensions/details/ublock/"
edge="https://www.microsoft.com/en-us/p/ublock-origin/9nblggh444l4"
%}
{% include cardv2.html
@ -58,8 +43,8 @@ description=descr3
website="https://addons.mozilla.org/firefox/addon/cookie-autodelete/"
forum="https://forum.privacytools.io/t/discussion-cookie-autodelete/267"
github="https://github.com/Cookie-AutoDelete/Cookie-AutoDelete"
firefox=""
chrome=""
firefox="https://addons.mozilla.org/en-US/firefox/addon/cookie-autodelete"
chrome="https://chrome.google.com/webstore/detail/cookie-autodelete/fhcgjolkccmbidfldomjliifgaodjagh"
%}
{% include cardv2.html
@ -69,10 +54,9 @@ description=descr4
website="https://www.eff.org/https-everywhere"
forum="https://forum.privacytools.io/t/discussion-https-everywhere/268"
github="https://github.com/EFForg/https-everywhere"
firefox=""
chrome=""
android=""
opera=""
firefox="https://addons.mozilla.org/en-US/firefox/addon/https-everywhere"
chrome="https://chrome.google.com/webstore/detail/https-everywhere/gcbommkclmclpchllfjekcdonpmejbdp"
opera="https://addons.opera.com/en/extensions/details/https-everywhere"
%}
{% include cardv2.html
@ -82,9 +66,9 @@ description=descr5
website="https://decentraleyes.org/"
forum="https://forum.privacytools.io/t/discussion-decentraleyes/269"
gitlab="https://git.synz.io/Synzvato/decentraleyes"
firefox=""
chrome=""
opera=""
firefox="https://addons.mozilla.org/en-US/firefox/addon/decentraleyes"
chrome="https://chrome.google.com/webstore/detail/decentraleyes/ldpochfccmkkmhdbclfhpagapcfdljkj"
opera="https://addons.opera.com/en/extensions/details/decentraleyes"
%}
{% include cardv2.html
@ -92,12 +76,11 @@ title=title6
image="/assets/img/addons/tosdr.png"
description=descr6
website="https://tosdr.org/"
forum="https://forum.privacytools.io/t/discussion-decentraleyes/270"
forum="https://forum.privacytools.io/t/discussion-terms-of-service-didn-t-read/270"
github="https://github.com/tosdr/"
firefox=""
chrome=""
opera=""
safari=""
firefox="https://addons.mozilla.org/en-US/firefox/addon/terms-of-service-didnt-read/"
chrome="https://chrome.google.com/webstore/detail/terms-of-service-didn%E2%80%99t-r/hjdoplcnndgiblooccencgcggcoihigg"
opera="https://addons.opera.com/en/extensions/details/terms-of-service-didnt-read"
%}
{% include cardv2.html
@ -107,12 +90,23 @@ description=descr7
website="https://snowflake.torproject.org"
forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
firefox=""
chrome=""
firefox="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake"
chrome="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie"
%}
{% include cardv2.html
title="Privacy Badger: Stop Tracking"
image="/assets/img/addons/privacy-badger.png"
description="<strong>Privacy Badger</strong> is a browser add-on that stops advertisers and other third-party trackers from secretly tracking where you go and what pages you look at on the web. Privacy Badger learns about trackers as you browse."
website="https://www.eff.org/privacybadger"
forum="https://forum.privacytools.io/t/discussion-privacy-badger/265"
github="https://github.com/EFForg/privacybadger"
firefox="https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17"
chrome="https://chrome.google.com/webstore/detail/privacy-badger/pkehgijcmpdhfbdbbnkijodmdjhbjlgp"
opera="https://addons.opera.com/en/extensions/details/privacy-badger/"
%}
<h2>{% t browser_addons.for_experts_only %}</h2>
<h2>{% t browser_addons.for_power_users_only %}</h2>
<div class="alert alert-warning" role="alert">
<strong>{% t browser_addons.addon_warning %}</strong>
@ -125,9 +119,9 @@ description=descr8
website="https://addons.mozilla.org/firefox/addon/umatrix/"
forum="https://forum.privacytools.io/t/discussion-umatrix/271"
github="https://github.com/gorhill/uMatrix"
firefox=""
chrome=""
opera=""
firefox="https://addons.mozilla.org/en-US/firefox/addon/umatrix"
chrome="https://chrome.google.com/webstore/detail/umatrix/ogfcmafjalglgifnmanfmnieipoejdcf"
opera="https://addons.opera.com/en/extensions/details/umatrix"
%}
{% include cardv2.html
@ -137,6 +131,6 @@ description=descr9
website="https://addons.mozilla.org/firefox/addon/noscript/"
forum="https://forum.privacytools.io/t/discussion-noscript-security-suite/272"
github="https://github.com/hackademix/noscript"
firefox=""
chrome=""
firefox="https://addons.mozilla.org/en-US/firefox/addon/noscript"
chrome="https://chrome.google.com/webstore/detail/noscript/doojmbjmlfjjnbmnoijecmcbfeoakpjm"
%}