X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fde%2Fabout_licenses_dark.html;h=5234e4469a5029835bfb6204da283cd71e71a33e;hp=c5a3d74463a38822b820b9e96b36346090a0cb42;hb=86e63c8ed007311ab392d4beb7dd7ba64b9c3c70;hpb=49e94a767e452d451a722bbb068e46458e404ed9 diff --git a/app/src/main/assets/de/about_licenses_dark.html b/app/src/main/assets/de/about_licenses_dark.html index c5a3d744..5234e446 100644 --- a/app/src/main/assets/de/about_licenses_dark.html +++ b/app/src/main/assets/de/about_licenses_dark.html @@ -1,139 +1,158 @@ + You should have received a copy of the GNU General Public License + along with Privacy Browser. If not, see . --> - + -

Copyright

-

Privacy Browser ist copyright © 2015-2018 von Soren Stoutner.

+

Copyright:

+

Privacy Browser ist copyright © 2015-2020 von Soren Stoutner.

-

Lizenz

+

Lizenz:

Privacy Browser ist veröffentlicht unter der GPLv3+ Lizenz. The full text of the license is below. The source code is available from git.stoutner.com.

-

Block Lists

-

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

Blocklists:

+

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.

+

More information about the blocklists can be found on the EasyList website.

-

Libraries

-

Privacy Browser is built with the Android Support Library, - which is released under the Apache License 2.0.

+

Bibliotheken:

+

Privacy Browser baut auf den AndroidX-Bibliotheken, + den Kotlin-Bibliotheken + und Code des Google Material Maven repository, + auf, welche unter der Apache Lizenz 2.0 veröffentlicht werden.

-

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

Die kostenlose Variante von Privacy Browser verwendet Firebase Ads, + welche unter der Android Software Development Kit Lizenz veröffentlicht werden.

+ +

Classes:

+

com.stoutner.privacybrowser.views.CheckedLinearLayout is a modified version of a class contained in the + Android Camera source code. + The original file was released under the Apache License 2.0. + The modified file is released under the GPLv3+ license.

+ +

Icons:

+

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

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

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

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

+

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.

-

ic_arrow_back.

-

ic_arrow_forward.

-

ic_bookmark_border.

-

ic_bug_report.

-

ic_call_to_action.

-

ic_chrome_reader_mode.

-

ic_close.

-

ic_delete.

-

ic_delete_forever.

-

ic_devices_other.

-

ic_dns.

-

ic_donut_small.

-

ic_edit.

-

ic_expand_less.

-

ic_expand_more.

-

ic_file_download.

-

ic_find_in_page.

-

ic_folder.

-

ic_fullscreen.

-

ic_home.

-

ic_image.

-

ic_import_contacts.

-

ic_important_devices.

-

ic_info_outline.

-

ic_language.

-

ic_list.

-

ic_local_activity.

-

ic_location_off.

-

ic_lock.

-

ic_map.

-

ic_more.

-

ic_question_answer.

-

ic_refresh.

-

ic_search.

-

ic_select_all.

-

ic_settings.

-

ic_smartphone.

-

ic_style.

-

ic_subtitles.

-

ic_text_fields.

-

ic_thumbs_up_down.

-

ic_vertical_align_bottom.

-

ic_vertical_align_top.

-

ic_visibility_off.

-

ic_vpn_lock.

-

ic_web.

+

add.

+

arrow_back.

+

arrow_forward.

+

bookmarks.

+

bug_report.

+

camera_enhance.

+

chrome_reader_mode.

+

close.

+

delete.

+

delete_forever.

+

devices_other.

+

dns.

+

donut_small.

+

edit.

+

expand_less.

+

expand_more.

+

file_copy.

+

file_download.

+

find_in_page.

+

folder.

+

home.

+

image.

+

import_contacts.

+

import_export.

+

important_devices.

+

info_outline.

+

language.

+

link_off.

+

list.

+

local_activity.

+

location_off.

+

lock.

+

map.

+

more.

+

new releases.

+

open_in_browser.

+

payment.

+

question_answer.

+

refresh.

+

save.

+

search.

+

select_all.

+

settings.

+

settings_overscan.

+

share.

+

smartphone.

+

sort.

+

style.

+

subtitles.

+

tab.

+

text_fields.

+

thumbs_up_down.

+

vertical_align_bottom.

+

vertical_align_top.

+

visibility_off.

+

vpn_key.

+

vpn_lock.

+

web.


@@ -1046,40 +1065,4 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. - -
- -

3-Clause BSD License

- -

Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met:

- - - -

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- - \ No newline at end of file +limitations under the License. \ No newline at end of file