]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/assets/en/about_licenses_light.html
Create a floating action button for creating bookmark folders. https://redmine.stout...
[PrivacyBrowserAndroid.git] / app / src / main / assets / en / about_licenses_light.html
index 4cb0d980ed994219618c1cae65621214a7a73cf8..1cebdb2c40e845984ce30872b4da5d13fb58bd3b 100644 (file)
         <h3>Attributions</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>
-        <p><img class="left" src="images/privacy_browser.png">
-            <img class="left" src="images/privacy_browser_free.png">
-            <img class="left" src="images/warning.png">
-            <img class="left" src="images/javascript_enabled.png">
+        <p><img class="left" src="images/privacy_browser.png"> <img class="left" src="images/privacy_browser_free.png"> <img class="left" src="images/warning.png"> <img class="left" src="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="images/clear_and_exit_light.png">
-            is derived from ic_exit_to_app, 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>.
-            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="images/night_mode_light.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>.
-            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="images/orbot_light.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>.
+        <p><img class="left" src="images/move_to_folder_light.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="images/create_bookmark_light.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="images/create_folder_light.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>.
+            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="images/clear_and_exit_light.png"> is derived from ic_exit_to_app, 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="images/night_mode_light.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="images/orbot_light.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="images/cookie_light.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>. 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>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="images/ic_add_light.png"> ic_add.</p>
         <p><img class="icon" src="images/ic_arrow_back_light.png"> ic_arrow_back.</p>
         <p><img class="icon" src="images/ic_arrow_forward_light.png"> ic_arrow_forward.</p>
@@ -61,7 +67,6 @@
         <p><img class="icon" src="images/ic_call_to_action_light.png"> ic_call_to_action.</p>
         <p><img class="icon" src="images/ic_chrome_reader_mode_light.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="images/ic_close_light.png"> ic_close.</p>
-        <p><img class="icon" src="images/ic_create_new_folder_light.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="images/ic_delete_light.png"> ic_delete.</p>
         <p><img class="icon" src="images/ic_delete_forever_light.png"> ic_delete_forever.</p>
         <p><img class="icon" src="images/ic_devices_other_light.png"> ic_devices_other.</p>
@@ -73,7 +78,6 @@
         <p><img class="icon" src="images/ic_file_download_light.png"> ic_file_download.</p>
         <p><img class="icon" src="images/ic_find_in_page_light.png"> ic_find_in_page.</p>
         <p><img class="icon" src="images/ic_folder_light.png"> ic_folder.</p>
-        <p><img class="icon" src="images/ic_folder_special_light.png"> ic_folder_special.</p>
         <p><img class="icon" src="images/ic_fullscreen_light.png"> ic_fullscreen.</p>
         <p><img class="icon" src="images/ic_home_light.png"> ic_home.</p>
         <p><img class="icon" src="images/ic_image_light.png"> ic_image.</p>