X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fassets%2Fru%2Fabout_licenses.html;h=4c99e7ba0d4ce6c81a9b793a91de3260734beb94;hb=d10e8d5d2aa8b82c8884c8c3e964d010e3519107;hp=81caa7d6b9a1a57c5cab8732f9f28da6c8baec98;hpb=bda37dc9784e900cb64b87af3e221e11320d9d01;p=PrivacyBrowserAndroid.git
diff --git a/app/src/main/assets/ru/about_licenses.html b/app/src/main/assets/ru/about_licenses.html
index 81caa7d6..4c99e7ba 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
ÐвÑоÑÑкие пÑава 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 вÑÑÑоена плаÑÑоÑма AdMob Ð¾Ñ Google, - коÑоÑÐ°Ñ Ð²ÑпÑÑкаеÑÑÑ Ð¿Ð¾Ð´ лиÑензиейAndroid Software Development Kit.
-com.stoutner.privacybrowser.views.CheckedLinearLayout
ÑвлÑеÑÑÑ Ð¼Ð¾Ð´Ð¸ÑиÑиÑованной веÑÑией клаÑÑа, ÑодеÑжаÑегоÑÑ Ð² иÑÑ
одном коде
+
com.stoutner.privacybrowser.views.
ÑвлÑеÑÑÑ Ð¼Ð¾Ð´Ð¸ÑиÑиÑованной веÑÑией клаÑÑа, ÑодеÑжаÑегоÑÑ Ð² иÑÑ
одном коде
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.
+
+
+
+ ÑвлÑÑÑÑÑ Ð¿ÑоизводнÑми Ð¾Ñ 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, 2022 Soren Stoutner.
ÐолÑÑеннÑе изобÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð²ÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ лиÑензией GPLv3+.
ÑвлÑÑÑÑÑ Ð¿ÑоизводнÑми Ð¾Ñ sort
,
- коÑоÑÑе ÑвлÑÑÑÑÑ ÑаÑÑÑÑ Android Material icon set и вÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ Apache License 2.0.
- ÐодиÑикаÑии авÑоÑÑкиÑ
пÑав © 2019 Soren Stoutner.
+
ÑвлÑÑÑÑÑ Ð¿ÑоизводнÑми Ð¾Ñ push_pin_selected
,
+ коÑоÑÑе ÑвлÑÑÑÑÑ ÑаÑÑÑÑ Android Material icon set и вÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ Apache License 2.0.
+ ÐодиÑикаÑии авÑоÑÑкиÑ
пÑав 2019-2020, 2022 Soren Stoutner.
ÐолÑÑеннÑе изобÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð²ÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ лиÑензией GPLv3+.
cookie
бÑли ÑÐ¾Ð·Ð´Ð°Ð½Ñ Google.
Ðни вÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ Apache License 2.0
@@ -99,12 +104,14 @@
пÑоекÑа 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.
+ bookmark_
bookmarks.
bug_report.
call_to_action.
@@ -114,6 +121,7 @@delete.
delete_forever.
devices_other.
+disabled_by_default.
dns.
donut_small.
edit.
@@ -123,6 +131,7 @@file_download.
find_in_page.
folder.
+ folder_
home.
image.
import_contacts.
@@ -132,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.
@@ -151,7 +164,7 @@smartphone.
sort.
style.
-subtitles.
+ subheader_
tab.
text_fields.
thumbs_up_down.
@@ -807,26 +820,30 @@<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.
@@ -836,10 +853,10 @@ this program. If not, see<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.@@ -870,7 +887,7 @@ for details. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -
The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure @@ -921,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.
@@ -963,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 @@ -1005,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 @@ -1030,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 @@ -1046,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 @@ -1059,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 @@ -1100,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 @@ -1202,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. @@ -1270,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 @@ -1298,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 @@ -1309,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 @@ -1334,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 @@ -1403,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 @@ -1415,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 @@ -1436,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 @@ -1462,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 @@ -1473,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 @@ -1485,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, @@ -1496,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 @@ -1507,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.
@@ -1741,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.