X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fru%2Fabout_licenses.html;h=ea12fd22727948380e9aa2797c6207aac6939848;hb=e065315a36c804626a7dba38d3edad05e9fdb473;hp=e90d87f5406f8a9b98e38db0c64e747b71afab7d;hpb=1fa721c8dfc1213cd252ab9cdba14991d5983768;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/assets/ru/about_licenses.html b/app/src/main/assets/ru/about_licenses.html index e90d87f5..ea12fd22 100644 --- a/app/src/main/assets/ru/about_licenses.html +++ b/app/src/main/assets/ru/about_licenses.html @@ -1,22 +1,22 @@ + along with Privacy Browser Android. If not, see . --> - + @@ -24,17 +24,19 @@ + + Licenses

Авторские права

-

Авторские права Privacy Browser © 2015-2021 Soren Stoutner.

+

Авторские права Privacy Browser 2015-2024 Soren Stoutner.

Лицензия

Privacy Browser выпущен под лицензией GPLv3+. Полный текст лицензии приведен ниже. - Исходный код доступен на git.stoutner.com.

+ Исходный код доступен на gitweb.stoutner.com.

-

Списки блокировки

+

Списки фильтрации

EasyList и EasyPrivacy лицензированы под лицензиями GPLv3+ и Creative Commons Attribution-ShareAlike 3.0+ Unported. @@ -44,7 +46,7 @@ выпущены под лицензией Creative Commons Attribution 3.0 Unported, которая совместима с GPLv3+. Списки включены без изменений в Privacy Browser.

-

Более подробную информацию о списках блокировки можно найти на веб-сайте EasyList.

+

Более подробную информацию о списках фильтрации можно найти на сайте EasyList.

Библиотеки

Privacy Browser создан на базе библиотек AndroidX, @@ -52,45 +54,48 @@ и кодовой базы из репозитория Google Material Maven, которые выпущены под лицензией Apache 2.0.

-

Бесплатный вариант Privacy Browser создан с помощью Google’s AdMob, - выпущенной по лицензии Android Software Development Kit License.

-

Классы

-

com.stoutner.privacybrowser.views.CheckedLinearLayout является модифицированной версией класса, содержащегося в исходном коде +

com.stoutner.privacybrowser.views.CheckedLinearLayout является модифицированной версией класса, содержащегося в исходном коде Android Camera. Оригинальный файл был выпущен под лицензией Apache 2.0. - Модификации авторских прав © 2019 Soren Stoutner. + Модификации авторских прав 2019 Soren Stoutner. Модифицированный файл выпущен под лицензией GPLv3+.

Иконки

-

- являются производными от security и language, которые являются частью - Android Material icon set и выпущены под Apache License 2.0. Полный текст лицензии приведен ниже. - Модификации авторских прав © 2016 Soren Stoutner. +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt + являются производными от security и language, которые являются частью Android Material icon set и выпущены под + Apache License 2.0. Полный текст лицензии приведен ниже. + Модификации авторских прав 2016-2017,2021-2023 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

являются производными от folder и exit_to_app, которые являются частью - Android Material icon set и выпущены под Apache License 2.0. - Модификации авторских прав © 2017 Soren Stoutner. + Android Material icon set и выпущены под Apache License 2.0. + Модификации авторских прав 2017, 2022 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

являются производными от bookmark и create_new_folder, которые являются частью - Android Material icon set и выпущены под Apache License 2.0. - Модификации авторских прав © 2017 Soren Stoutner. + Android Material icon set и выпущены под Apache License 2.0. + Модификации авторских прав 2017, 2022 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

являются производными от create_new_folder, которые являются частью - Android Material icon set и выпущены под Apache License 2.0. - Модификации авторских прав © 2017 Soren Stoutner. + Android Material icon set и выпущены под Apache License 2.0. + Модификации авторских прав 2017, 2022 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

являются производными от exit_to_app, - которые являются частью Android Material icon set и выпущены под Apache License 2.0. - Модификации авторских прав © 2017 Soren Stoutner. + которые являются частью Android Material icon set и выпущены под Apache License 2.0. + Модификации авторских прав 2017, 2022 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

являются производными от compare, - которые являются частью Android Material icon set и выпущены под Apache License 2.0. - Модификации авторских прав © 2017 Soren Stoutner. + которые являются частью Android Material icon set и выпущены под Apache License 2.0. + Модификации авторских прав 2017, 2022 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

-

являются производными от sort, - которые являются частью Android Material icon set и выпущены под Apache License 2.0. - Модификации авторских прав © 2019 Soren Stoutner. +

Sort Selected являются производными от sort, + которые являются частью Android Material icon set и выпущены под Apache License 2.0. + Модификации авторских прав 2019, 2022 Soren Stoutner. + Полученные изображения выпущены под лицензией GPLv3+.

+

Push Pin являются производными от push_pin_selected, + которые являются частью Android Material icon set и выпущены под Apache License 2.0. + Модификации авторских прав 2019-2020, 2022 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

cookie были созданы Google. Они выпущены под Apache License 2.0 @@ -99,10 +104,11 @@ проекта Mastodon, который выпускается под лицензией AGPLv3+. Полный текст лицензии приведен ниже. Изображение не было изменено, за исключением информации о верстке, в том числе цвет, размеры и отступы. В соответствии с положениями раздела 13 лицензии оно включено в Privacy Browser.

-

Следующие значки взяты изAndroid Material icon set, +

Следующие значки взяты изAndroid Material icon set, которые выпущены под Apache License 2.0. Они неизменны, за исключением такой информации, как цвет и размер. Некоторые из них были переименованы в соответствии с их использованием в коде. Оригинальные значки и имена показаны ниже.

add.

+

aod_tablet_rounded_grade200.

arrow_back.

arrow_forward.

bookmarks.

@@ -114,6 +120,7 @@

delete.

delete_forever.

devices_other.

+

disabled_by_default.

dns.

donut_small.

edit.

@@ -132,14 +139,18 @@

language.

link_off.

list.

+

list_alt_rounded_24px.

local_activity.

location_off.

lock.

map.

+

menu_rounded_weight400_grade0_24px.

more.

-

new releases.

+

new_releases.

open_in_browser.

payment.

+

payments_rounded.

+

push_pin_filled.

question_answer.

refresh.

save.

@@ -151,7 +162,7 @@

smartphone.

sort.

style.

-

subtitles.

+

subheader_rounded_weight400_grade0_48px.

tab.

text_fields.

thumbs_up_down.

@@ -805,28 +816,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.

@@ -834,7 +848,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'.
@@ -870,7 +884,7 @@ for details.

             Everyone is permitted to copy and distribute verbatim copies
             of this license document, but changing it is not allowed.

 
-        
Preamble

+        
Preamble

 
         
The GNU Affero General Public License is a free, copyleft license
             for software and other kinds of works, specifically designed to ensure
@@ -921,9 +935,9 @@ for details.

         
The precise terms and conditions for copying, distribution and
             modification follow.

 
-        
TERMS AND CONDITIONS

+        
TERMS AND CONDITIONS

 
-        
0. Definitions.

+        
0. Definitions.

 
         
"This License" refers to version 3 of the GNU Affero General Public
             License.

@@ -963,7 +977,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.

-

1. Source Code.

+

1. Source Code.

The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source @@ -1005,7 +1019,7 @@ for details.

The Corresponding Source for a work in source code form is that same work.

-

2. Basic Permissions.

+

2. Basic Permissions.

All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated @@ -1030,7 +1044,7 @@ for details. the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.

-

3. Protecting Users' Legal Rights From Anti-Circumvention Law.

+

3. Protecting Users' Legal Rights From Anti-Circumvention Law.

No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article @@ -1046,7 +1060,7 @@ for details. users, your or third parties' legal rights to forbid circumvention of technological measures.

-

4. Conveying Verbatim Copies.

+

4. Conveying Verbatim Copies.

You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and @@ -1059,7 +1073,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.

-

5. Conveying Modified Source Versions.

+

5. Conveying Modified Source Versions.

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 @@ -1100,7 +1114,7 @@ for details. in an aggregate does not cause this License to apply to the other parts of the aggregate.

-

6. Conveying Non-Source Forms.

+

6. Conveying Non-Source Forms.

You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the @@ -1202,7 +1216,7 @@ for details. source code form), and must require no special password or key for unpacking, reading or copying.

-

7. Additional Terms.

+

7. Additional Terms.

"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. @@ -1270,7 +1284,7 @@ for details. form of a separately written license, or stated as exceptions; the above requirements apply either way.

-

8. Termination.

+

8. Termination.

You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or @@ -1298,7 +1312,7 @@ for details. reinstated, you do not qualify to receive new licenses for the same material under section 10.

-

9. Acceptance Not Required for Having Copies.

+

9. Acceptance Not Required for Having Copies.

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 @@ -1309,7 +1323,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.

-

10. Automatic Licensing of Downstream Recipients.

+

10. Automatic Licensing of Downstream Recipients.

Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and @@ -1334,7 +1348,7 @@ for details. any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.

-

11. Patents.

+

11. Patents.

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 @@ -1403,7 +1417,7 @@ for details. any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.

-

12. No Surrender of Others' Freedom.

+

12. No Surrender of Others' Freedom.

If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not @@ -1415,7 +1429,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.

-

13. Remote Network Interaction; Use with the GNU General Public License.

+

13. Remote Network Interaction; Use with the GNU General Public License.

Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users @@ -1436,7 +1450,7 @@ for details. combined will remain governed by version 3 of the GNU General Public License.

-

14. Revised Versions of this License.

+

14. Revised Versions of this 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 @@ -1462,7 +1476,7 @@ for details. author or copyright holder as a result of your choosing to follow a later version.

-

15. Disclaimer of Warranty.

+

15. Disclaimer of Warranty.

THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT @@ -1473,7 +1487,7 @@ for details. IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-

16. Limitation of Liability.

+

16. Limitation of Liability.

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 @@ -1485,7 +1499,7 @@ for details. EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-

17. Interpretation of Sections 15 and 16.

+

17. Interpretation of Sections 15 and 16.

If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, @@ -1496,7 +1510,7 @@ for details.

END OF TERMS AND CONDITIONS

-

How to Apply These Terms to Your New Programs

+

How to Apply These Terms to Your New Programs

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 @@ -1507,29 +1521,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.

@@ -1741,22 +1759,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.

+    
+