X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=inline;f=app%2Fsrc%2Fmain%2Fassets%2Fen%2Fabout_licenses.html;h=7330e3a42a00cddc2f8a2e8e568532756ee58594;hb=HEAD;hp=0cf851b4782b5df61d8e33b4105a2223b005867a;hpb=b1f88361f33fde911642f568e71936c33bdcc530;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html index 0cf851b4..6b53802f 100644 --- a/app/src/main/assets/en/about_licenses.html +++ b/app/src/main/assets/en/about_licenses.html @@ -1,5 +1,5 @@ - +
@@ -24,17 +24,19 @@ + +Privacy Browser copyright © 2015-2022 Soren Stoutner.
+Privacy Browser copyright 2015-2024 Soren Stoutner.
Privacy Browser is released under the GPLv3+ license. The full text of the license is below. - The source code is available from gitweb.stoutner.com.
+ 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. @@ -44,7 +46,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 is built with the AndroidX Libraries, @@ -53,41 +55,47 @@ which are released under the Apache License 2.0.
com.stoutner.privacybrowser.views.CheckedLinearLayout
is a modified version of a class contained in the
+
com.stoutner.privacybrowser.views.
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.
- Modifications copyright © 2019 Soren Stoutner.
+ Modifications copyright 2019 Soren Stoutner.
The modified file is released under the GPLv3+ license.
- are derived from security
and language
, which are part of the Android Material icon set and are released under the
+
+
+
+ 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 full text of the license is below. Modifications copyright 2016-2017,2021-2023 Soren Stoutner.
The resulting images are released under the GPLv3+ license.
is derived from elements of folder
and exit_to_app
,
- which are part of the Android Material icon set
+ which are part of the Android Material icon set
and are released under the Apache License 2.0.
- Modifications copyright © 2017 Soren Stoutner.
+ Modifications copyright 2017, 2022 Soren Stoutner.
The resulting image is released under the GPLv3+ license.
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.
+ Android Material icon set and are released under the Apache License 2.0.
+ Modifications copyright 2017, 2022 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.
+ which is part of the Android Material icon set and is released under the Apache License 2.0.
+ Modifications copyright 2017, 2022 Soren Stoutner.
The resulting image is released under the GPLv3+ license.
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.
+ which is part of the Android Material icon set and is released under the Apache License 2.0.
+ Modifications copyright 2017, 2022 Soren Stoutner.
The resulting image is released under the GPLv3+ license.
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.
+ which is part of the Android Material icon set and is released under the Apache License 2.0.
+ Modifications copyright 2017, 2022 Soren Stoutner.
The resulting image is released under the GPLv3+ license.
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.
+
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, 2022 Soren Stoutner.
+ The resulting image is released under the GPLv3+ license.
is derived from push_pin_selected
,
+ which is part of the Android Material icon set and is released under the Apache License 2.0.
+ Modifications copyright 2019-2020, 2022 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
@@ -96,12 +104,14 @@
Mastodon project,
which is released under the AGPLv3+ license. The full text of the license is below.
The image is unchanged except for layout information like color, size, and margin. It is included in Privacy Browser under the provisions in section 13 of the license.
The following icons come from the Android Material icon set, +
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.
add.
+aod_tablet_rounded_grade200.
arrow_back.
arrow_forward.
+ bookmark_
bookmarks.
bug_report.
call_to_action.
@@ -111,6 +121,7 @@delete.
delete_forever.
devices_other.
+disabled_by_default.
dns.
donut_small.
edit.
@@ -120,6 +131,7 @@file_download.
find_in_page.
folder.
+ folder_
home.
image.
import_contacts.
@@ -129,14 +141,18 @@language.
link_off.
list.
+list_alt_rounded_24px.
local_activity.
location_off.
lock.
map.
+ menu_
more.
-new releases.
+new_releases.
open_in_browser.
payment.
+payments_rounded.
+push_pin_filled.
question_answer.
refresh.
save.
@@ -148,7 +164,7 @@smartphone.
sort.
style.
-subtitles.
+ subheader_
tab.
text_fields.
thumbs_up_down.
@@ -802,28 +818,32 @@ 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. - -This program 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 -this program. If not, see +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. + +This program 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 this program. If not, +see <http://www.gnu.org/licenses/>.Also add information on how to contact you by electronic and paper mail.
@@ -831,12 +851,12 @@ 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.@@ -867,7 +887,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 @@ -918,9 +938,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.
@@ -960,7 +980,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 @@ -1002,7 +1022,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 @@ -1027,7 +1047,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 @@ -1043,7 +1063,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 @@ -1056,7 +1076,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 @@ -1097,7 +1117,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 @@ -1199,7 +1219,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. @@ -1267,7 +1287,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 @@ -1295,7 +1315,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 @@ -1306,7 +1326,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 @@ -1331,7 +1351,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 @@ -1400,7 +1420,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 @@ -1412,7 +1432,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 @@ -1433,7 +1453,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 @@ -1459,7 +1479,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 @@ -1470,7 +1490,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 @@ -1482,7 +1502,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, @@ -1493,7 +1513,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 @@ -1504,29 +1524,34 @@ 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.> -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. - -This program 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 -Affero General Public License for more -details. - -You should have received a copy of the -GNU Affero General Public License -along with this program. If not, see +<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. + +This program 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 +Affero General Public License for +more details. + +You should have received a copy of +the GNU Affero General Public +License along with this program. +If not, see <https://www.gnu.org/licenses/>.Also add information on how to contact you by electronic and paper mail.
@@ -1738,22 +1763,29 @@ along with this program. If not, see recommend that a file or class name and description of purpose be included on the same âprinted pageâ as the copyright notice for easier identification within third-party archives. -Copyright [yyyy] [name of copyright owner] + ++ +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 +http://www.apache.org/licenses/ +LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an âAS ISâ BASIS, 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.\ No newline at end of file +OF ANY KIND, either express or +implied. See the License for the +specific language governing +permissions and limitations under +the License.