X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fde%2Fabout_licenses_dark.html;h=c5a3d74463a38822b820b9e96b36346090a0cb42;hp=3565a5121f1d4a156bd848c3a8c5a296f1bdb26a;hb=49e94a767e452d451a722bbb068e46458e404ed9;hpb=b1e8283303ee9f0804218058514a6299445b3af3

diff --git a/app/src/main/assets/de/about_licenses_dark.html b/app/src/main/assets/de/about_licenses_dark.html
index 3565a512..c5a3d744 100644
--- a/app/src/main/assets/de/about_licenses_dark.html
+++ b/app/src/main/assets/de/about_licenses_dark.html
@@ -36,19 +36,36 @@
         <p>Privacy Browser ist veröffentlicht unter der <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ Lizenz</a>. The full text of the license is below.
             The source code is available from <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=summary">git.stoutner.com</a>.</p>
 
-        <h3>Attribute</h3>
-        <p>The list of ad servers used by the ad blocker comes from <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
-            Because a list of domain names is a list of facts, it <a href="https://www.copyright.gov/help/faq/faq-protect.html">cannot be copyrighted</a>.</p>
+        <h3>Block Lists</h3>
+        <p><a href="https://easylist.to/easylist/easylist.txt">EasyList</a> and <a href="https://easylist.to/easylist/easyprivacy.txt">EasyPrivacy</a> are
+            <a href="https://easylist.to/pages/licence.html">dual licensed</a> under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+</a>
+            and the <a href="https://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0+ Unported</a> licenses.
+            Privacy Browser incorporates them using the GPLv3+ option.</p>
+
+        <p><a href="https://easylist.to/easylist/fanboy-annoyance.txt">Fanboy’s Annoyance List</a> and <a href="https://easylist.to/easylist/fanboy-social.txt">Fanboy’s Social Blocking List</a>
+            are released under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 Unported license</a>,
+            which is <a href="https://www.gnu.org/licenses/license-list.en.html#ccby">compatible with the GPLv3+</a>.
+            The lists are included unchanged in Privacy Browser.</p>
+
+        <p>More information about the block lists can be found on the <a href="https://easylist.to/">EasyList website</a>.</p>
+
+        <h3>Libraries</h3>
         <p>Privacy Browser is built with the <a href="https://developer.android.com/topic/libraries/support-library/index.html">Android Support Library</a>,
             which is released under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.</p>
-        <p><img class="left" src="../en/images/privacy_browser.png"> <img class="left" src="../en/images/privacy_browser_free.png"> <img class="left" src="../en/images/warning.png"> <img class="left" src="../en/images/javascript_enabled.png">
-            are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
-            The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
-        <p><img class="left" src="../en/images/move_to_folder_dark.png"> is derived from elements of ic_folder and ic_exit_to_app, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+
+        <h3>Icons</h3>
+        <p><img class="left" src="../en/images/privacy_browser.png"> <img class="left" src="../en/images/privacy_browser_free.png"> <img class="left" src="../en/images/warning.png">
+            <img class="left" src="../en/images/javascript_enabled.png"> are derived from ic_security and ic_language, which are part of the
+            <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/move_to_folder_dark.png"> is derived from elements of ic_folder and ic_exit_to_app, which are part of the
+            <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
-        <p><img class="left" src="../en/images/create_bookmark_dark.png"> is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+        <p><img class="left" src="../en/images/create_bookmark_dark.png"> is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the
+            <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+            Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/create_folder_dark.png"> is derived from ic_create_new_folder, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
             and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
@@ -59,13 +76,16 @@
         <p><img class="left" src="../en/images/night_mode_dark.png"> is derived from ic_compare, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
             and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
-        <p><img class="left" src="../en/images/orbot_dark.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>,
+        <p><img class="left" src="../en/images/orbot_dark.png"> orbot is a modified version of
+            <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>,
             which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
-            The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
-        <p><img class="left" src="../en/images/cookie_dark.png"> cookie was created by Google.
-            It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>.
+            The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/cookie_dark.png"> cookie was created by Google. It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
+            and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>.
             It is unchanged except for layout information like color and size.</p>
-        <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>, which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+        <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>,
+            which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             They are unchanged except for layout information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.</p>
         <p><img class="icon" src="../en/images/ic_add_dark.png"> ic_add.</p>
         <p><img class="icon" src="../en/images/ic_arrow_back_dark.png"> ic_arrow_back.</p>
@@ -108,6 +128,7 @@
         <p><img class="icon" src="../en/images/ic_style_dark.png"> ic_style.</p>
         <p><img class="icon" src="../en/images/ic_subtitles_dark.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields_dark.png"> ic_text_fields.</p>
+        <p><img class="icon" src="../en/images/ic_thumbs_up_down_dark.png"> ic_thumbs_up_down.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom_dark.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_top_dark.png"> ic_vertical_align_top.</p>
         <p><img class="icon" src="../en/images/ic_visibility_off_dark.png"> ic_visibility_off.</p>