X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fde%2Fabout_licenses.html;h=ae111a14467c97f8ec5d196a2a660ab0ea2dff99;hp=2e8dc4387d1e2a538a0e80ea30f139997012ec5b;hb=HEAD;hpb=328f475a9c15749bef2aa5899dcf207963b197e8 diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html index 2e8dc438..ae111a14 100644 --- a/app/src/main/assets/de/about_licenses.html +++ b/app/src/main/assets/de/about_licenses.html @@ -1,5 +1,5 @@ - +
@@ -27,17 +27,19 @@ + +Privacy Browser ist copyright 2015-2023 von Soren Stoutner.
+Privacy Browser ist copyright 2015-2024 von Soren Stoutner.
Privacy Browser ist veröffentlicht unter der GPLv3+ Lizenz. The full text of the license is below. The source code is available from gitweb.stoutner.com.
-EasyList and EasyPrivacy are dual licensed under the GPLv3+ and the Creative Commons Attribution-ShareAlike 3.0+ Unported licenses. @@ -47,7 +49,7 @@ 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.
-More information about the blocklists can be found on the EasyList website.
+More information about the filter lists can be found on the EasyList website.
Privacy Browser baut auf den AndroidX-Bibliotheken, @@ -63,9 +65,9 @@ Die geänderte Datei wird unter der GPLv3+-Lizenz veröffentlicht.
- - +
+
+
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-2017,2021-2023 Soren Stoutner.
@@ -91,10 +93,10 @@
das Teil des Android Material icon set unter der Apache Lizenz 2.0 veröffentlicht wird.
Ãnderungen Copyright 2017, 2022 Soren Stoutner.
Die resultierende Grafik wird unter der GPLv3+ Lizenz veröffentlicht.
ist abgeleitet von sort
, das Teil des Android Material icon set
+
ist abgeleitet von sort
, das Teil des Android Material icon set
unter der Apache Lizenz 2.0 veröffentlicht wird. Ãnderungen Copyright 2019, 2022 Soren Stoutner.
Die resultierende Grafik wird unter der GPLv3+ Lizenz veröffentlicht.
ist abgeleitet von push_pin_selected
,
+
ist abgeleitet von push_pin_selected
,
das Teil des Android Material icon set unter der Apache Lizenz 2.0 veröffentlicht wird.
Ãnderungen Copyright 2019-2020, 2022 Soren Stoutner.
Die resultierende Grafik wird unter der GPLv3+ Lizenz veröffentlicht.
aod_tablet_rounded_grade200.
arrow_back.
arrow_forward.
+ bookmark_
bookmarks.
bug_report.
call_to_action.
@@ -132,6 +135,7 @@file_download.
find_in_page.
folder.
+ folder_
home.
image.
import_contacts.
@@ -141,11 +145,12 @@language.
link_off.
list.
-list_alt_rounded_24.
+list_alt_rounded_24px.
local_activity.
location_off.
lock.
map.
+ menu_
more.
new_releases.
open_in_browser.
@@ -163,7 +168,7 @@smartphone.
sort.
style.
-subtitles.
+ subheader_
tab.
text_fields.
thumbs_up_down.
@@ -177,9 +182,7 @@Offizielle deutsche Ãbersetzung der GNU General Public License
- -Version 3, 29 June 2007
+Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
@@ -819,18 +822,18 @@ state the exclusion of warranty; and each file should have at least the âcopyrightâ line and a pointer to where the full notice is found. -<one line to give the programâs name +<one line to give the programâs name and a brief idea of what it does.> Copyright (C) <year> <name of author> This program 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. +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. This program is distributed in the hope that it will be useful, but @@ -843,7 +846,8 @@ details. You should have received a copy of the GNU General Public License -along with this program. If not, see +along with this program. If not, +see <http://www.gnu.org/licenses/>.Also add information on how to contact you by electronic and paper mail.
@@ -851,12 +855,12 @@ along with this program. If not, seeIf the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
-<program> Copyright (C) <year> +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -<program> Copyright (C) <year> <name of author> -This program comes with ABSOLUTELY NO -WARRANTY; for details type `show w'. -This is free software, and you are -welcome to redistribute it under +This program comes with ABSOLUTELY +NO WARRANTY; for details type `show +w'. This is free software, and you +are welcome to redistribute it under certain conditions; type `show c' for details.@@ -887,7 +891,7 @@ for details.Preamble
+Preamble
The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure @@ -938,9 +942,9 @@ for details.
The precise terms and conditions for copying, distribution and modification follow.
-"This License" refers to version 3 of the GNU Affero General Public License.
@@ -980,7 +984,7 @@ for details. the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source @@ -1022,7 +1026,7 @@ for details.
The Corresponding Source for a work in source code form is that same work.
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated @@ -1047,7 +1051,7 @@ for details. the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article @@ -1063,7 +1067,7 @@ for details. users, your or third parties' legal rights to forbid circumvention of technological measures.
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and @@ -1076,7 +1080,7 @@ for details.
You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the @@ -1117,7 +1121,7 @@ for details. in an aggregate does not cause this License to apply to the other parts of the aggregate.
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the @@ -1219,7 +1223,7 @@ for details. source code form), and must require no special password or key for unpacking, reading or copying.
-"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. @@ -1287,7 +1291,7 @@ for details. form of a separately written license, or stated as exceptions; the above requirements apply either way.
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or @@ -1315,7 +1319,7 @@ for details. reinstated, you do not qualify to receive new licenses for the same material under section 10.
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work @@ -1326,7 +1330,7 @@ for details. not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and @@ -1351,7 +1355,7 @@ for details. any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The @@ -1420,7 +1424,7 @@ for details. any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not @@ -1432,7 +1436,7 @@ for details. the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users @@ -1453,7 +1457,7 @@ for details. combined will remain governed by version 3 of the GNU General Public License.
-The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new @@ -1479,7 +1483,7 @@ for details. author or copyright holder as a result of your choosing to follow a later version.
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT @@ -1490,7 +1494,7 @@ for details. IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS @@ -1502,7 +1506,7 @@ for details. EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, @@ -1513,7 +1517,7 @@ for details.
END OF TERMS AND CONDITIONS
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -1524,19 +1528,20 @@ for details. state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-<one line to give the program's name -and a brief idea of what it does.> +<one line to give the program's +name and a brief idea of what it +does.> Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero -General Public License as published -by the Free Software Foundation, -either version 3 of the License, -or (at your option) any later -version. +it under the terms of the GNU +Affero General Public License as +published by the Free Software +Foundation, either version 3 of the +License, or (at your option) any +later version. This program is distributed in the hope that it will be useful, but @@ -1763,15 +1768,15 @@ If not, see on the same âprinted pageâ as the copyright notice for easier identification within third-party archives. -Copyright [yyyy] [name of copyright +Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the âLicenseâ); you may not use this file except in compliance with the License. -You may obtain a copy of the License -at +You may obtain a copy of the +License at http://www.apache.org/licenses/ LICENSE-2.0