X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fen%2Fabout_licenses.html;h=5814f18d31b458847bccc067ff52f55db9f78675;hp=65770a5d15ca5f053246ce108e0e1f5a021c0644;hb=ade72400eaa718cbd0857440eb4eefa41fed633d;hpb=2bd8b7edef80b4b10cb809a198b4624c6c740c86 diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html index 65770a5d..5814f18d 100644 --- a/app/src/main/assets/en/about_licenses.html +++ b/app/src/main/assets/en/about_licenses.html @@ -53,41 +53,45 @@ which are released under the Apache License 2.0.

Classes

-

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. + Modifications copyright 2019 Soren Stoutner. 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 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, 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. + 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. + 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. + 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. + 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. + 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 @@ -131,14 +135,17 @@

language.

link_off.

list.

+

list_alt_rounded_24.

local_activity.

location_off.

lock.

map.

more.

-

new releases.

+

new_releases.

open_in_browser.

payment.

+

payments_rounded.

+

push_pin_filled.

question_answer.

refresh.

save.

@@ -804,28 +811,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 +843,7 @@ this program. If not, see

If 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 +1516,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,24 +1754,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.
+OF ANY KIND, either express or +implied. See the License for the +specific language governing +permissions and limitations under +the License.