X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fde%2Fabout_licenses.html;h=3d6411eb7f4e632cd9e7045a3a76ecab81073e42;hp=ae520ff19cf9488c2753c8c87cc1658c8f6eafac;hb=ade72400eaa718cbd0857440eb4eefa41fed633d;hpb=cd609c9888924549c03cd6509ed889cdb052d5bb diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html index ae520ff1..3d6411eb 100644 --- a/app/src/main/assets/de/about_licenses.html +++ b/app/src/main/assets/de/about_licenses.html @@ -1,24 +1,24 @@ + along with Privacy Browser Android. If not, see . --> @@ -31,11 +31,11 @@

Copyright:

-

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

+

Privacy Browser ist copyright 2015-2022 von Soren Stoutner.

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.

+ The source code is available from gitweb.stoutner.com.

Blocklists:

EasyList and EasyPrivacy @@ -55,43 +55,47 @@ und Code des Google Material Maven repository, auf, welche unter der Apache Lizenz 2.0 veröffentlicht werden.

-

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.

+

Klassen:

+

com.stoutner.privacybrowser.views.CheckedLinearLayout ist eine abgeänderte Version einer Klasse, die im Quelltext von + Android Camera enthalten ist. + Die Original-Datei wurde unter der Apache Lizenz 2.0 veröffentlicht. + Änderungen 2019 Soren Stoutner. + Die geänderte Datei wird unter der GPLv3+-Lizenz veröffentlicht.

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

+ 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, 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. - 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. - 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. - 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. - 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. + Modifications copyright 2017, 2022 Soren Stoutner. The resulting image is released under the GPLv3+ license.

+

ist abgeleitet von create_new_folder, + 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 exit_to_app, + 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 compare, + 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 + 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, + 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.

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.

@@ -104,6 +108,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.

@@ -115,6 +120,7 @@

delete.

delete_forever.

devices_other.

+

disabled_by_default.

dns.

donut_small.

edit.

@@ -133,14 +139,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.

@@ -808,28 +817,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.

@@ -837,7 +849,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'.
@@ -1510,29 +1522,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.

@@ -1744,22 +1760,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.
+ +