Create a move bookmark to folder icon with an arrow. https://redmine.stoutner.com...
authorSoren Stoutner <soren@stoutner.com>
Fri, 22 Sep 2017 23:34:36 +0000 (16:34 -0700)
committerSoren Stoutner <soren@stoutner.com>
Fri, 22 Sep 2017 23:34:36 +0000 (16:34 -0700)
15 files changed:
app/src/main/assets/de/about_licenses_dark.html
app/src/main/assets/de/about_licenses_light.html
app/src/main/assets/en/about_licenses_dark.html
app/src/main/assets/en/about_licenses_light.html
app/src/main/assets/en/images/ic_folder_special_dark.png [deleted file]
app/src/main/assets/en/images/ic_folder_special_light.png [deleted file]
app/src/main/assets/en/images/move_to_folder_dark.png [new file with mode: 0644]
app/src/main/assets/en/images/move_to_folder_light.png [new file with mode: 0644]
app/src/main/assets/es/about_licenses_dark.html
app/src/main/assets/es/about_licenses_light.html
app/src/main/assets/it/about_licenses_dark.html
app/src/main/assets/it/about_licenses_light.html
app/src/main/res/drawable/javascript_enabled.xml
app/src/main/res/drawable/move_to_folder_dark.xml
app/src/main/res/drawable/move_to_folder_light.xml

index 7e1f5e9394475464437c7425e370dc9102897bc0..c7809e929a1b6cf158f2d3a7c3782fdd10c885e2 100644 (file)
         <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>
-        <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">
+        <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/clear_and_exit_dark.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="../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>.
-            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/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>.
+        <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>. 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/clear_and_exit_dark.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="../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>. 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/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>. 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>
+            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><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>
         <p><img class="icon" src="../en/images/ic_arrow_forward_dark.png"> ic_arrow_forward.</p>
@@ -79,7 +79,6 @@
         <p><img class="icon" src="../en/images/ic_file_download_dark.png"> ic_file_download.</p>
         <p><img class="icon" src="../en/images/ic_find_in_page_dark.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder_dark.png"> ic_folder.</p>
-        <p><img class="icon" src="../en/images/ic_folder_special_dark.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_fullscreen_dark.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home_dark.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_image_dark.png"> ic_image.</p>
index 193932fde735cacb579ee7065eb1cf4cac96cc2f..4ed8e87ab6ab897d30d113a72474e8c5d6f40ce8 100644 (file)
         <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>
-        <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">
+        <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/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="../en/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="../en/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="../en/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>. 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/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="../en/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="../en/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="../en/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>
+            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><img class="icon" src="../en/images/ic_add_light.png"> ic_add.</p>
         <p><img class="icon" src="../en/images/ic_arrow_back_light.png"> ic_arrow_back.</p>
         <p><img class="icon" src="../en/images/ic_arrow_forward_light.png"> ic_arrow_forward.</p>
@@ -79,7 +79,6 @@
         <p><img class="icon" src="../en/images/ic_file_download_light.png"> ic_file_download.</p>
         <p><img class="icon" src="../en/images/ic_find_in_page_light.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder_light.png"> ic_folder.</p>
-        <p><img class="icon" src="../en/images/ic_folder_special_light.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_fullscreen_light.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home_light.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_image_light.png"> ic_image.</p>
index 09174968367e7f99af9a81b59411ffa7fe2dff52..9bdb43d46bdfa371d1a776bb2217d3fcc2a9ca8c 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_dark.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_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>.
-            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_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>.
+        <p><img class="left" src="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>. 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/clear_and_exit_dark.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_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>. 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_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="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>. 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_dark.png"> ic_add.</p>
         <p><img class="icon" src="images/ic_arrow_back_dark.png"> ic_arrow_back.</p>
         <p><img class="icon" src="images/ic_arrow_forward_dark.png"> ic_arrow_forward.</p>
@@ -73,7 +73,6 @@
         <p><img class="icon" src="images/ic_file_download_dark.png"> ic_file_download.</p>
         <p><img class="icon" src="images/ic_find_in_page_dark.png"> ic_find_in_page.</p>
         <p><img class="icon" src="images/ic_folder_dark.png"> ic_folder.</p>
-        <p><img class="icon" src="images/ic_folder_special_dark.png"> ic_folder_special.</p>
         <p><img class="icon" src="images/ic_fullscreen_dark.png"> ic_fullscreen.</p>
         <p><img class="icon" src="images/ic_home_dark.png"> ic_home.</p>
         <p><img class="icon" src="images/ic_image_dark.png"> ic_image.</p>
index 4cb0d980ed994219618c1cae65621214a7a73cf8..48d734127ef2e975f2013ef2e2375cdccd0125f3 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>. 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/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>.
             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>
@@ -73,7 +73,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>
diff --git a/app/src/main/assets/en/images/ic_folder_special_dark.png b/app/src/main/assets/en/images/ic_folder_special_dark.png
deleted file mode 100644 (file)
index 1e637e5..0000000
Binary files a/app/src/main/assets/en/images/ic_folder_special_dark.png and /dev/null differ
diff --git a/app/src/main/assets/en/images/ic_folder_special_light.png b/app/src/main/assets/en/images/ic_folder_special_light.png
deleted file mode 100644 (file)
index 2eef308..0000000
Binary files a/app/src/main/assets/en/images/ic_folder_special_light.png and /dev/null differ
diff --git a/app/src/main/assets/en/images/move_to_folder_dark.png b/app/src/main/assets/en/images/move_to_folder_dark.png
new file mode 100644 (file)
index 0000000..343fc0b
Binary files /dev/null and b/app/src/main/assets/en/images/move_to_folder_dark.png differ
diff --git a/app/src/main/assets/en/images/move_to_folder_light.png b/app/src/main/assets/en/images/move_to_folder_light.png
new file mode 100644 (file)
index 0000000..ab353f9
Binary files /dev/null and b/app/src/main/assets/en/images/move_to_folder_light.png differ
index 8131e074a1a2c7f1a6d1efdc2dafc3b0c444032c..1ea15638f00564a5180f7b1d6fcb86a8b0a6be55 100644 (file)
         <h3>Atribuciones</h3>
         <p>La lista de servidores publicitarios usados por el bloqueador de anuncios procede de <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
             Ya que una lista de nombres de dominio es una lista de hechos, no puede tener <a href="https://www.copyright.gov/help/faq/faq-protect.html">derechos de autor</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">
+        <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">
             derivan de ic_security y de ic_language, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
             El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. Las imágenes resultantes se liberan bajo la
             <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/clear_and_exit_dark.png">
-            deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
-            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+        <p><img class="left" src="../en/images/clear_and_exit_dark.png"> deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/night_mode_dark.png">
-            deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
-            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+        <p><img class="left" src="../en/images/night_mode_dark.png"> deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/orbot_dark.png"> orbot es una versión modificada del <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icono de estado del proyecto Orbot</a>,
             que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">licencia BSD modificada (de 3 cláusulas)</a>.
@@ -79,7 +74,6 @@
         <p><img class="icon" src="../en/images/ic_file_download_dark.png"> ic_file_download.</p>
         <p><img class="icon" src="../en/images/ic_find_in_page_dark.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder_dark.png"> ic_folder.</p>
-        <p><img class="icon" src="../en/images/ic_folder_special_dark.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_fullscreen_dark.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home_dark.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_image_dark.png"> ic_image.</p>
index 54df46631de76808b326a9d41084bab8a72f3314..243dc5cd59d29e4449250a6f2cab70e776f6b7bb 100644 (file)
         <h3>Atribuciones</h3>
         <p>La lista de servidores publicitarios usados por el bloqueador de anuncios procede de <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
             Ya que una lista de nombres de dominio es una lista de hechos, no puede tener <a href="https://www.copyright.gov/help/faq/faq-protect.html">derechos de autor</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">
+        <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">
             derivan de ic_security y de ic_language, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
             El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. Las imágenes resultantes se liberan bajo la
             <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/clear_and_exit_light.png">
-            deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
-            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+        <p><img class="left" src="../en/images/clear_and_exit_light.png"> deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/night_mode_light.png">
-            deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
-            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+        <p><img class="left" src="../en/images/night_mode_light.png"> deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/orbot_light.png"> orbot es una versión modificada del <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icono de estado del proyecto Orbot</a>,
             que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">licencia BSD modificada (de 3 cláusulas)</a>.
@@ -79,7 +74,6 @@
         <p><img class="icon" src="../en/images/ic_file_download_light.png"> ic_file_download.</p>
         <p><img class="icon" src="../en/images/ic_find_in_page_light.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder_light.png"> ic_folder.</p>
-        <p><img class="icon" src="../en/images/ic_folder_special_light.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_fullscreen_light.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home_light.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_image_light.png"> ic_image.</p>
index 1bb5e7d59d5485d24a6b296e3732a55fb8b4bd11..82547ecb9a35a9303870c5465f98d28d5d784c41 100644 (file)
         <h3>Attribuzioni</h3>
         <p>La lista dei server utilizzata dalla funzionalità di blocco degli annunci è tratta da <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
             Dal momento che si tratta di una lista di domini <a href="https://www.copyright.gov/help/faq/faq-protect.html">non può essere coperta da Copyright</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">
+        <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">
             sono state derivate da ic_security e ic_language, che fanno parte dell'<a href="https://material.io/icons/">Android Material icon set</a> e sono state rilasciate sotto <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
-            Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. Le immagini risultanti sono rilasciate sotto
-            <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/clear_and_exit_dark.png">
-            è stata derivata da ic_exit_to_app, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a> ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
+            Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            Le immagini risultanti sono rilasciate sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/clear_and_exit_dark.png"> è stata derivata da ic_exit_to_app, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
             Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/night_mode_dark.png">
-            è stata derivata da ic_compare, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a> ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
+        <p><img class="left" src="../en/images/night_mode_dark.png"> è stata derivata da ic_compare, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
             Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/orbot_dark.png"> orbot è una versione modificata della <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icona di stato del progetto Orbot</a>, il cui copyright
-            è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>. Il testo completo della Licenza è riportato di seguito.
+        <p><img class="left" src="../en/images/orbot_dark.png"> orbot è una versione modificata della <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icona di stato del progetto Orbot</a>,
+            il cui copyright è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>. Il testo completo della Licenza è riportato di seguito.
             Copyright delle modifiche © 2017<a href="mailto:soren@stoutner.com">Soren Stoutner</a>. L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/cookie_dark.png"> cookie è stata creata da Google. E' stata rilasciata con <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>
             e può essere scaricata dirattamente dal <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. Non è stata modificata ad eccezione del colore e della dimensione.</p>
@@ -82,7 +79,6 @@
         <p><img class="icon" src="../en/images/ic_file_download_dark.png"> ic_file_download.</p>
         <p><img class="icon" src="../en/images/ic_find_in_page_dark.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder_dark.png"> ic_folder.</p>
-        <p><img class="icon" src="../en/images/ic_folder_special_dark.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_fullscreen_dark.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home_dark.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_image_dark.png"> ic_image.</p>
index c00e54927926b15360d0a022eedc7fddd68e65df..643997c67e0f8ffff84e64f234101477e5b4cbf9 100644 (file)
         <h3>Attribuzioni</h3>
         <p>La lista dei server utilizzata dalla funzionalità di blocco degli annunci è tratta da <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
             Dal momento che si tratta di una lista di domini <a href="https://www.copyright.gov/help/faq/faq-protect.html">non può essere coperta da Copyright</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">
+        <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">
             sono state derivate da ic_security e ic_language, che fanno parte dell'<a href="https://material.io/icons/">Android Material icon set</a> e sono state rilasciate sotto <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
-            Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. Le immagini risultanti sono rilasciate sotto
-            <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/clear_and_exit_light.png">
-            è stata derivata da ic_exit_to_app, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a> ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
+            Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            Le immagini risultanti sono rilasciate sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/clear_and_exit_light.png"> è stata derivata da ic_exit_to_app, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
             Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/night_mode_light.png">
-            è stata derivata da ic_compare, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a> ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
+        <p><img class="left" src="../en/images/night_mode_light.png"> è stata derivata da ic_compare, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
             Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
-        <p><img class="left" src="../en/images/orbot_light.png"> orbot è una versione modificata della <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icona di stato del progetto Orbot</a>, il cui copyright
-            è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>. Il testo completo della Licenza è riportato di seguito.
+        <p><img class="left" src="../en/images/orbot_light.png"> orbot è una versione modificata della <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icona di stato del progetto Orbot</a>,
+            il cui copyright è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>. Il testo completo della Licenza è riportato di seguito.
             Copyright delle modifiche © 2017<a href="mailto:soren@stoutner.com">Soren Stoutner</a>. L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/cookie_light.png"> cookie è stata creata da Google. E' stata rilasciata con <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>
             e può essere scaricata dirattamente dal <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. Non è stata modificata ad eccezione del colore e della dimensione.</p>
@@ -82,7 +79,6 @@
         <p><img class="icon" src="../en/images/ic_file_download_light.png"> ic_file_download.</p>
         <p><img class="icon" src="../en/images/ic_find_in_page_light.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder_light.png"> ic_folder.</p>
-        <p><img class="icon" src="../en/images/ic_folder_special_light.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_fullscreen_light.png"> ic_fullscreen.</p>
         <p><img class="icon" src="../en/images/ic_home_light.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_image_light.png"> ic_image.</p>
index 5631974e4bd43710a2fc1b69cb2380c9b99afa8c..49453c7b8ccb6f55097975c6bb52628424ee1336 100644 (file)
@@ -8,21 +8,21 @@
     android:viewportHeight="256.0"
     android:viewportWidth="256.0" >
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#b71c1c"
         android:pathData="m128,12.8 l-94.25,41.89 0,62.84c0,58.12 40.22,112.48 94.25,125.67 54.04,-13.2 94.25,-67.55 94.25,-125.67l0,-62.84z"
         android:strokeColor="#00000000" />
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#d32f2f"
         android:pathData="m128,0 l-104.73,46.55 0,69.82C23.27,180.95 67.96,241.34 128,256 188.04,241.34 232.73,180.95 232.73,116.36l0,-69.82L128,0ZM128,127.88 L209.45,127.88C203.29,175.83 171.29,218.53 128,231.91l0,-103.91 -81.45,0 0,-66.33L128,25.48l0,102.4z"
         android:strokeColor="#00000000" />
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillAlpha="1"
         android:fillColor="#ffffff"
index b893e40245d53d62a14216e99a78ac057cceb777..88938322f9a9b9e1236df8893785ad531feb3e51 100644 (file)
@@ -1,4 +1,5 @@
-<!-- `move_to_folder_dark.xml` comes from the Android Material icon set, where it is called `ic_folder_special`.  It is released under the Apache License 2.0. -->
+<!-- `move_to_folder_dark.xml` is derived from elements of `ic_folder` and `ic_exit_to_app`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
+    Modifications copyright © 2017 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
@@ -14,5 +15,5 @@
     <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFE0E0E0"
-        android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM17.94,17L15,15.28 12.06,17l0.78,-3.33 -2.59,-2.24 3.41,-0.29L15,8l1.34,3.14 3.41,0.29 -2.59,2.24 0.78,3.33z"/>
+        android:pathData="M4,4C2.9,4 2.01,4.9 2.01,6L2,18C2,19.1 2.9,20 4,20L20,20C21.1,20 22,19.1 22,18L22,8C22,6.9 21.1,6 20,6L12,6L10,4L4,4zM13.75,7.83L18.75,12.83L13.75,17.83L12.34,16.421L14.92,13.83L5.25,13.83L5.25,11.83L14.92,11.83L12.34,9.24L13.75,7.83z" />
 </vector>
index 98ec8c2dfb3b54f9c8fa036cea6f83b6588d1328..ee2fd4b6b02c7b37b7878b0467bb90c5fc07c03d 100644 (file)
@@ -1,4 +1,5 @@
-<!-- `move_to_folder_light.xml` comes from the Android Material icon set, where it is called `ic_folder_special`.  It is released under the Apache License 2.0. -->
+<!-- `move_to_folder_light.xml` is derived from elements of `ic_folder` and `ic_exit_to_app`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
+    Modifications copyright © 2017 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
 
 <!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
@@ -14,5 +15,5 @@
     <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM17.94,17L15,15.28 12.06,17l0.78,-3.33 -2.59,-2.24 3.41,-0.29L15,8l1.34,3.14 3.41,0.29 -2.59,2.24 0.78,3.33z"/>
+        android:pathData="M4,4C2.9,4 2.01,4.9 2.01,6L2,18C2,19.1 2.9,20 4,20L20,20C21.1,20 22,19.1 22,18L22,8C22,6.9 21.1,6 20,6L12,6L10,4L4,4zM13.75,7.83L18.75,12.83L13.75,17.83L12.34,16.421L14.92,13.83L5.25,13.83L5.25,11.83L14.92,11.83L12.34,9.24L13.75,7.83z" />
 </vector>