X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fde%2Fabout_licenses_light.html;h=7b5b0cb42858a6e131fd33780c4744da2e695a32;hp=5d028e5bc030f223b507b94084d24bac71ed5d5c;hb=69b0fea4c49422f5e3c377994c4cf249bdc5a434;hpb=49e94a767e452d451a722bbb068e46458e404ed9 diff --git a/app/src/main/assets/de/about_licenses_light.html b/app/src/main/assets/de/about_licenses_light.html index 5d028e5b..7b5b0cb4 100644 --- a/app/src/main/assets/de/about_licenses_light.html +++ b/app/src/main/assets/de/about_licenses_light.html @@ -3,29 +3,25 @@ Translation 2016 Aaron Gerlach . Copyright assigned to Soren Stoutner . - Diese Datei ist Teil von Privacy Browser . + This file is part of Privacy Browser . - Privacy Browser ist eine kostenlose Software: Sie kÃ¶nnen sie - unter den Bedingungen der GNU General Public License weiterverteilen - mit Berufung auf die verÃ¶ffentlichte Fassung der Free Software - Foundation, entweder Version 3 der Lizenz oder (nach Ihrer - MÃ¶glichkeit) jede neuere Version. + Privacy Browser is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Privacy Browser wird in der Hoffnung vertrieben nÃ¼tzlich zu sein, - jedoch OHNE JEGLICHE GARANTIE; auch ohne die implizierte - Garantie auf MARKTGÃNGLICHKEIT oder BEREITSCHAFT FÃR - BESTIMMTE ANWENDUNGEN. Nutzen Sie die GNU General Public - License fÃ¼r mehr Details. - - Sie sollten eine Kopie der GNU General Public License zusammen mit - Privacy Browser erhalten haben. Wenn nicht, besuchen Sie - . --> + Privacy Browser is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> - + @@ -37,15 +33,14 @@ The source code is available from git.stoutner.com.

Block Lists

EasyList and EasyPrivacy are - dual licensed under the GPLv3+ +

EasyList and EasyPrivacy + are dual licensed under the GPLv3+ and the Creative Commons Attribution-ShareAlike 3.0+ Unported licenses. Privacy Browser incorporates them using the GPLv3+ option.

Fanboyâs Annoyance List and Fanboyâs Social Blocking List are released under the Creative Commons Attribution 3.0 Unported license, - which is compatible with the GPLv3+. - The lists are included unchanged in Privacy Browser.

+ which is compatible with the GPLv3+. The lists are included unchanged in Privacy Browser.

More information about the block lists can be found on the EasyList website.

@@ -54,85 +49,90 @@ which is released under the Apache License 2.0.

Icons

- 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. +

+ are derived from security and 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 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. +

is derived from elements of folder and exit_to_app, + which are part of the Android Material icon set + and are released under the Apache License 2.0. Modifications copyright Â© 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the +

is derived from elements of bookmark and create_new_folder, which are part of the Android Material icon set and are released under the Apache License 2.0. Modifications copyright Â© 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from create_new_folder, + which is part of the Android Material icon set and is released under the Apache License 2.0. + 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 +

is derived from exit_to_app, which is part of the Android Material icon set and is released under the Apache License 2.0. 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 +

is derived from compare, which is part of the Android Material icon set and is released under the Apache License 2.0. Modifications copyright Â© 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

orbot is a modified version of +

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 +

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.

ic_add.