From: Soren Stoutner The list of ad servers used by the ad blocker comes from pgl.yoyo.org.
Because a list of domain names is a list of facts, it cannot be copyrighted.
-
-
-
+
are derived from ic_security and ic_language, which are part of the Android Material icon set and are released under the Apache License 2.0.
The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.
- is derived from ic_exit_to_app, which is part of the Android Material icon set and is released under the Apache License 2.0.
- The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
- is derived from ic_compare, which is part of the Android Material icon set and is released under the Apache License 2.0.
- The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license. orbot is a modified version of the status icon from the Orbot project, which is copyright
- 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license.
+ is derived from elements of ic_folder and ic_exit_to_app, which are part of the Android Material icon set
+ and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner.
+ The resulting image is released under the GPLv3+ license. is derived from ic_exit_to_app, which is part of the Android Material icon set
+ and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner.
+ The resulting image is released under the GPLv3+ license. is derived from ic_compare, which is part of the Android Material icon set
+ and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner.
+ The resulting image is released under the GPLv3+ license. orbot is a modified version of the status icon from the Orbot project,
+ which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license.
The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license. cookie was created by Google.
- It is released under the Apache License 2.0 and can be downloaded from Material Design Icons. It is unchanged except for layout
- information like color and size. The following icons come from the Android Material icon set, which is released under the Apache License 2.0. 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.Attribute
The following icons come from the Android Material icon set, which is released under the Apache License 2.0. + 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.
ic_add.
ic_arrow_back.
ic_arrow_forward.
@@ -79,7 +79,6 @@ic_file_download.
ic_find_in_page.
ic_folder.
-ic_folder_special.
ic_fullscreen.
ic_home.
ic_image.
diff --git a/app/src/main/assets/de/about_licenses_light.html b/app/src/main/assets/de/about_licenses_light.html index 193932fd..4ed8e87a 100644 --- a/app/src/main/assets/de/about_licenses_light.html +++ b/app/src/main/assets/de/about_licenses_light.html @@ -39,26 +39,26 @@The list of ad servers used by the ad blocker comes from pgl.yoyo.org. Because a list of domain names is a list of facts, it cannot be copyrighted.
-- - - +
are derived from ic_security and ic_language, which are part of the Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.
-- is derived from ic_exit_to_app, which is part of the Android Material icon set and is released under the Apache License 2.0. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
-- is derived from ic_compare, which is part of the Android Material icon set and is released under the Apache License 2.0. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
-orbot is a modified version of the status icon from the Orbot project, which is copyright - 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. +
is derived from elements of ic_folder and ic_exit_to_app, which are part of the Android Material icon set + and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.
+is derived from ic_exit_to_app, which is part of the Android Material icon set + and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.
+is derived from ic_compare, which is part of the Android Material icon set + and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.
+orbot is a modified version of the status icon from the Orbot project, + which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
cookie was created by Google. - It is released under the Apache License 2.0 and can be downloaded from Material Design Icons. It is unchanged except for layout - information like color and size.
-The following icons come from the Android Material icon set, which is released under the Apache License 2.0. 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.
+ It is released under the Apache License 2.0 and can be downloaded from Material Design Icons. + It is unchanged except for layout information like color and size. +The following icons come from the Android Material icon set, which is released under the Apache License 2.0. + 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.
ic_add.
ic_arrow_back.
ic_arrow_forward.
@@ -79,7 +79,6 @@ic_file_download.
ic_find_in_page.
ic_folder.
-ic_folder_special.
ic_fullscreen.
ic_home.
ic_image.
diff --git a/app/src/main/assets/en/about_licenses_dark.html b/app/src/main/assets/en/about_licenses_dark.html index 09174968..9bdb43d4 100644 --- a/app/src/main/assets/en/about_licenses_dark.html +++ b/app/src/main/assets/en/about_licenses_dark.html @@ -34,25 +34,25 @@The list of ad servers used by the ad blocker comes from pgl.yoyo.org. Because a list of domain names is a list of facts, it cannot be copyrighted.
-- - - +
are derived from ic_security and ic_language, which are part of the Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.
-- is derived from ic_exit_to_app, which is part of the Android Material icon set and is released under the Apache License 2.0. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
-- is derived from ic_compare, which is part of the Android Material icon set and is released under the Apache License 2.0. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
-orbot is a modified version of the status icon from the Orbot project, which is copyright - 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. +
is derived from elements of ic_folder and ic_exit_to_app, which are part of the Android Material icon set + and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.
+is derived from ic_exit_to_app, which is part of the Android Material icon set + and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.
+is derived from ic_compare, which is part of the Android Material icon set + and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.
+orbot is a modified version of the status icon from the Orbot project, + which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
cookie was created by Google. It is released under the Apache License 2.0 and can be downloaded from Material Design Icons. It is unchanged except for layout information like color and size.
-The following icons come from the Android Material icon set, which is released under the Apache License 2.0. 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.
+The following icons come from the Android Material icon set, which is released under the Apache License 2.0. + 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.
ic_add.
ic_arrow_back.
ic_arrow_forward.
@@ -73,7 +73,6 @@ic_file_download.
ic_find_in_page.
ic_folder.
-ic_folder_special.
ic_fullscreen.
ic_home.
ic_image.
diff --git a/app/src/main/assets/en/about_licenses_light.html b/app/src/main/assets/en/about_licenses_light.html index 4cb0d980..48d73412 100644 --- a/app/src/main/assets/en/about_licenses_light.html +++ b/app/src/main/assets/en/about_licenses_light.html @@ -34,25 +34,25 @@The list of ad servers used by the ad blocker comes from pgl.yoyo.org. Because a list of domain names is a list of facts, it cannot be copyrighted.
-- - - +
are derived from ic_security and ic_language, which are part of the Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.
-- is derived from ic_exit_to_app, which is part of the Android Material icon set and is released under the Apache License 2.0. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
-- is derived from ic_compare, which is part of the Android Material icon set and is released under the Apache License 2.0. - The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
-orbot is a modified version of the status icon from the Orbot project, which is copyright - 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. +
is derived from elements of ic_folder and ic_exit_to_app, which are part of the Android Material icon set + and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.
+is derived from ic_exit_to_app, which is part of the Android Material icon set + and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.
+is derived from ic_compare, which is part of the Android Material icon set + and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.
+orbot is a modified version of the status icon from the Orbot project, + which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.
cookie was created by Google. It is released under the Apache License 2.0 and can be downloaded from Material Design Icons. It is unchanged except for layout information like color and size.
-The following icons come from the Android Material icon set, which is released under the Apache License 2.0. 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.
+The following icons come from the Android Material icon set, which is released under the Apache License 2.0. + 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.
ic_add.
ic_arrow_back.
ic_arrow_forward.
@@ -73,7 +73,6 @@ic_file_download.
ic_find_in_page.
ic_folder.
-ic_folder_special.
ic_fullscreen.
ic_home.
ic_image.
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 index 1e637e57..00000000 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 index 2eef308a..00000000 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 index 00000000..343fc0b2 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 index 00000000..ab353f9d Binary files /dev/null and b/app/src/main/assets/en/images/move_to_folder_light.png differ diff --git a/app/src/main/assets/es/about_licenses_dark.html b/app/src/main/assets/es/about_licenses_dark.html index 8131e074..1ea15638 100644 --- a/app/src/main/assets/es/about_licenses_dark.html +++ b/app/src/main/assets/es/about_licenses_dark.html @@ -36,20 +36,15 @@La lista de servidores publicitarios usados por el bloqueador de anuncios procede de pgl.yoyo.org. Ya que una lista de nombres de dominio es una lista de hechos, no puede tener derechos de autor.
-- - - +
derivan de ic_security y de ic_language, que son parte del conjunto de iconos Android Material y son liberados bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 Soren Stoutner. Las imágenes resultantes se liberan bajo la licencia GPLv3+.
-- deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. - El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. +
deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material + y es liberado bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.
-- deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. - El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. +
deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material + y es liberado bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.
orbot es una versión modificada del icono de estado del proyecto Orbot, que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la licencia BSD modificada (de 3 cláusulas). @@ -79,7 +74,6 @@
ic_file_download.
ic_find_in_page.
ic_folder.
-ic_folder_special.
ic_fullscreen.
ic_home.
ic_image.
diff --git a/app/src/main/assets/es/about_licenses_light.html b/app/src/main/assets/es/about_licenses_light.html index 54df4663..243dc5cd 100644 --- a/app/src/main/assets/es/about_licenses_light.html +++ b/app/src/main/assets/es/about_licenses_light.html @@ -36,20 +36,15 @@La lista de servidores publicitarios usados por el bloqueador de anuncios procede de pgl.yoyo.org. Ya que una lista de nombres de dominio es una lista de hechos, no puede tener derechos de autor.
-- - - +
derivan de ic_security y de ic_language, que son parte del conjunto de iconos Android Material y son liberados bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 Soren Stoutner. Las imágenes resultantes se liberan bajo la licencia GPLv3+.
-- deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. - El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. +
deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material + y es liberado bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.
-- deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. - El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. +
deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material + y es liberado bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.
orbot es una versión modificada del icono de estado del proyecto Orbot, que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la licencia BSD modificada (de 3 cláusulas). @@ -79,7 +74,6 @@
ic_file_download.
ic_find_in_page.
ic_folder.
-ic_folder_special.
ic_fullscreen.
ic_home.
ic_image.
diff --git a/app/src/main/assets/it/about_licenses_dark.html b/app/src/main/assets/it/about_licenses_dark.html index 1bb5e7d5..82547ecb 100644 --- a/app/src/main/assets/it/about_licenses_dark.html +++ b/app/src/main/assets/it/about_licenses_dark.html @@ -40,23 +40,20 @@La lista dei server utilizzata dalla funzionalità di blocco degli annunci è tratta da pgl.yoyo.org. Dal momento che si tratta di una lista di domini non può essere coperta da Copyright.
-- - - +
sono state derivate da ic_security e ic_language, che fanno parte dell'Android Material icon set e sono state rilasciate sotto Licenza Apache 2.0. - Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 Soren Stoutner. Le immagini risultanti sono rilasciate sotto - Licenza GPLv3+.
-- è stata derivata da ic_exit_to_app, che fa parte dell'Android Material icon set ed è stata rilasciata sotto Licenza Apache 2.0. + Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 Soren Stoutner. + Le immagini risultanti sono rilasciate sotto Licenza GPLv3+.
+è stata derivata da ic_exit_to_app, che fa parte dell'Android Material icon set + ed è stata rilasciata sotto Licenza Apache 2.0. Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.
-- è stata derivata da ic_compare, che fa parte dell'Android Material icon set ed è stata rilasciata sotto Licenza Apache 2.0. +
è stata derivata da ic_compare, che fa parte dell'Android Material icon set + ed è stata rilasciata sotto Licenza Apache 2.0. Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.
-orbot è una versione modificata della icona di stato del progetto Orbot, il cui copyright - è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto 3-clause BSD license. Il testo completo della Licenza è riportato di seguito. +
orbot è una versione modificata della icona di stato del progetto Orbot, + il cui copyright è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto 3-clause BSD license. Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2017Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.
cookie è stata creata da Google. E' stata rilasciata con Licenza Apache 2.0 e può essere scaricata dirattamente dal Material Design Icons. Non è stata modificata ad eccezione del colore e della dimensione.
@@ -82,7 +79,6 @@ic_file_download.
ic_find_in_page.
ic_folder.
-ic_folder_special.
ic_fullscreen.
ic_home.
ic_image.
diff --git a/app/src/main/assets/it/about_licenses_light.html b/app/src/main/assets/it/about_licenses_light.html index c00e5492..643997c6 100644 --- a/app/src/main/assets/it/about_licenses_light.html +++ b/app/src/main/assets/it/about_licenses_light.html @@ -40,23 +40,20 @@La lista dei server utilizzata dalla funzionalità di blocco degli annunci è tratta da pgl.yoyo.org. Dal momento che si tratta di una lista di domini non può essere coperta da Copyright.
-- - - +
sono state derivate da ic_security e ic_language, che fanno parte dell'Android Material icon set e sono state rilasciate sotto Licenza Apache 2.0. - Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 Soren Stoutner. Le immagini risultanti sono rilasciate sotto - Licenza GPLv3+.
-- è stata derivata da ic_exit_to_app, che fa parte dell'Android Material icon set ed è stata rilasciata sotto Licenza Apache 2.0. + Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 Soren Stoutner. + Le immagini risultanti sono rilasciate sotto Licenza GPLv3+.
+è stata derivata da ic_exit_to_app, che fa parte dell'Android Material icon set + ed è stata rilasciata sotto Licenza Apache 2.0. Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.
-- è stata derivata da ic_compare, che fa parte dell'Android Material icon set ed è stata rilasciata sotto Licenza Apache 2.0. +
è stata derivata da ic_compare, che fa parte dell'Android Material icon set + ed è stata rilasciata sotto Licenza Apache 2.0. Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.
-orbot è una versione modificata della icona di stato del progetto Orbot, il cui copyright - è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto 3-clause BSD license. Il testo completo della Licenza è riportato di seguito. +
orbot è una versione modificata della icona di stato del progetto Orbot, + il cui copyright è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto 3-clause BSD license. Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2017Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.
cookie è stata creata da Google. E' stata rilasciata con Licenza Apache 2.0 e può essere scaricata dirattamente dal Material Design Icons. Non è stata modificata ad eccezione del colore e della dimensione.
@@ -82,7 +79,6 @@ic_file_download.
ic_find_in_page.
ic_folder.
-ic_folder_special.
ic_fullscreen.
ic_home.
ic_image.
diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml index 5631974e..49453c7b 100644 --- a/app/src/main/res/drawable/javascript_enabled.xml +++ b/app/src/main/res/drawable/javascript_enabled.xml @@ -8,21 +8,21 @@ android:viewportHeight="256.0" android:viewportWidth="256.0" > - +