X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fen%2Fabout_licenses.html;h=7330e3a42a00cddc2f8a2e8e568532756ee58594;hb=refs%2Ftags%2Fv3.12.2;hp=10ef8059ef42732a841e94db999037decf79d7b0;hpb=cd609c9888924549c03cd6509ed889cdb052d5bb;p=PrivacyBrowserAndroid.git
diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html
index 10ef8059..7330e3a4 100644
--- a/app/src/main/assets/en/about_licenses.html
+++ b/app/src/main/assets/en/about_licenses.html
@@ -1,20 +1,20 @@
+ along with Privacy Browser Android. If not, see
Privacy Browser copyright © 2015-2021 Soren Stoutner.
+Privacy Browser copyright 2015-2022 Soren Stoutner.
Privacy Browser is released under the GPLv3+ license. The full text of the license is below. - The source code is available from git.stoutner.com.
+ The source code is available from gitweb.stoutner.com.EasyList and EasyPrivacy @@ -52,19 +52,17 @@ and code from the Google Material Maven repository, which are released under the Apache License 2.0.
-The free flavor of Privacy Browser is built with Firebase Ads, - which is released under the Android Software Development Kit License.
-com.stoutner.privacybrowser.views.CheckedLinearLayout
is a modified version of a class contained in the
+
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.
+ 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 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 folder
and exit_to_app
,
@@ -102,6 +100,7 @@
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.
bookmarks.
@@ -113,6 +112,7 @@delete.
delete_forever.
devices_other.
+disabled_by_default.
dns.
donut_small.
edit.
@@ -139,6 +139,7 @@new releases.
open_in_browser.
payment.
+payments_rounded.
question_answer.
refresh.
save.
@@ -804,28 +805,31 @@ 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> +Copyright (C) <year> <name of +author> -This program is free software: you can -redistribute it and/or modify +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 +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.
@@ -833,7 +837,7 @@ 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> +<program> Copyright (C) <year> <name of author> This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. @@ -1506,29 +1510,33 @@ 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 +<one line to give the program's name and a brief idea of what it does.> -Copyright (C) <year> <name of author> +Copyright (C) <year> <name of +author> -This program is free software: you can -redistribute it and/or modify +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 +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.
@@ -1740,22 +1748,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.