X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fassets%2Fru%2Fabout_licenses.html;h=131033ac6fd52d64e7d932eea2682ae17f18b583;hb=569d223a5adb662d586a0d5cfa8fcc80bbf5a2cf;hp=399b547abc916f4623dedc6ebc85cd495919470e;hpb=d41432251a91bf373e760793a6f4831315964fc5;p=PrivacyBrowserAndroid.git
diff --git a/app/src/main/assets/ru/about_licenses.html b/app/src/main/assets/ru/about_licenses.html
index 399b547a..131033ac 100644
--- a/app/src/main/assets/ru/about_licenses.html
+++ b/app/src/main/assets/ru/about_licenses.html
@@ -1,20 +1,20 @@
+ along with Privacy Browser Android. If not, see
ÐвÑоÑÑкие пÑава Privacy Browser © 2015-2020 Soren Stoutner.
+ÐвÑоÑÑкие пÑава Privacy Browser 2015-2022 Soren Stoutner.
Privacy Browser вÑпÑÑен под лиÑензией GPLv3+. ÐолнÑй ÑекÑÑ Ð»Ð¸Ñензии пÑиведен ниже. - ÐÑÑ Ð¾Ð´Ð½Ñй код доÑÑÑпен на git.stoutner.com.
+ ÐÑÑ Ð¾Ð´Ð½Ñй код доÑÑÑпен на gitweb.stoutner.com.EasyList и EasyPrivacy @@ -52,19 +52,17 @@ и кодовой Ð±Ð°Ð·Ñ Ð¸Ð· ÑепозиÑоÑÐ¸Ñ Google Material Maven, коÑоÑÑе вÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ лиÑензией Apache 2.0.
-ÐеÑплаÑнÑй ваÑÐ¸Ð°Ð½Ñ Privacy Browser Ñоздан Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Firebase Ads, - вÑпÑÑенной по лиÑензии Android Software Development Kit License.
-com.stoutner.privacybrowser.views.CheckedLinearLayout
ÑвлÑеÑÑÑ Ð¼Ð¾Ð´Ð¸ÑиÑиÑованной веÑÑией клаÑÑа, ÑодеÑжаÑегоÑÑ Ð² иÑÑ
одном коде
+
com.stoutner.privacybrowser.views. CheckedLinearLayout
ÑвлÑеÑÑÑ Ð¼Ð¾Ð´Ð¸ÑиÑиÑованной веÑÑией клаÑÑа, ÑодеÑжаÑегоÑÑ Ð² иÑÑ
одном коде
Android Camera.
ÐÑигиналÑнÑй Ñайл бÑл вÑпÑÑен под лиÑензией Apache 2.0.
+ ÐодиÑикаÑии авÑоÑÑкиÑ
пÑав © 2019 Soren Stoutner.
ÐодиÑиÑиÑованнÑй Ñайл вÑпÑÑен под лиÑензией GPLv3+.
- ÑвлÑÑÑÑÑ Ð¿ÑоизводнÑми Ð¾Ñ security
и language
, коÑоÑÑе ÑвлÑÑÑÑÑ ÑаÑÑÑÑ
- Android Material icon set и вÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ Apache License 2.0. ÐолнÑй ÑекÑÑ Ð»Ð¸Ñензии пÑиведен ниже.
+
+ ÑвлÑÑÑÑÑ Ð¿ÑоизводнÑми Ð¾Ñ security
и language
, коÑоÑÑе ÑвлÑÑÑÑÑ ÑаÑÑÑÑ Android Material icon set и вÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´
+ Apache License 2.0. ÐолнÑй ÑекÑÑ Ð»Ð¸Ñензии пÑиведен ниже.
ÐодиÑикаÑии авÑоÑÑкиÑ
пÑав © 2016 Soren Stoutner.
ÐолÑÑеннÑе изобÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð²ÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ лиÑензией GPLv3+.
ÑвлÑÑÑÑÑ Ð¿ÑоизводнÑми Ð¾Ñ folder
и exit_to_app
, коÑоÑÑе ÑвлÑÑÑÑÑ ÑаÑÑÑÑ
@@ -94,24 +92,27 @@
cookie
бÑли ÑÐ¾Ð·Ð´Ð°Ð½Ñ Google.
Ðни вÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ Apache License 2.0
и могÑÑ Ð±ÑÑÑ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ñ Ð¸Ð· Material Design Icons. Ðн неизменен, за иÑклÑÑением Ñакой инÑоÑмаÑии, как ÑÐ²ÐµÑ Ð¸ ÑазмеÑ.
mastodon
comes from the
- Mastodon project,
- which is released under the AGPLv3+ license. The full text of the license is below.
- The image is unchanged except for layout information like color and size. It is included in Privacy Browser under the provisions in section 13 of the license.
mastodon
ÑвлÑеÑÑÑ ÑаÑÑÑÑ
+ пÑоекÑа Mastodon,
+ коÑоÑÑй вÑпÑÑкаеÑÑÑ Ð¿Ð¾Ð´ лиÑензией AGPLv3+. ÐолнÑй ÑекÑÑ Ð»Ð¸Ñензии пÑиведен ниже.
+ ÐзобÑажение не бÑло изменено, за иÑклÑÑением инÑоÑмаÑии о веÑÑÑке, в Ñом ÑиÑле ÑвеÑ, ÑазмеÑÑ Ð¸ оÑÑÑÑпÑ. Ð ÑооÑвеÑÑÑвии Ñ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñми Ñаздела 13 лиÑензии оно вклÑÑено в Privacy Browser.
СледÑÑÑие знаÑки взÑÑÑ Ð¸Ð·Android Material icon set, коÑоÑÑе вÑпÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ Apache License 2.0. Ðни неизменнÑ, за иÑклÑÑением Ñакой инÑоÑмаÑии, как ÑÐ²ÐµÑ Ð¸ ÑазмеÑ. ÐекоÑоÑÑе из Ð½Ð¸Ñ Ð±Ñли пеÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ñ Ð² ÑооÑвеÑÑÑвии Ñ Ð¸Ñ Ð¸ÑполÑзованием в коде. ÐÑигиналÑнÑе знаÑки и имена Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ñ Ð½Ð¸Ð¶Ðµ.
add.
+aod_tablet_rounded_grade200.
arrow_back.
arrow_forward.
bookmarks.
bug_report.
+call_to_action.
camera_enhance.
chrome_reader_mode.
close.
delete.
delete_forever.
devices_other.
+disabled_by_default.
dns.
donut_small.
edit.
@@ -138,6 +139,7 @@new releases.
open_in_browser.
payment.
+payments_rounded.
question_answer.
refresh.
save.
@@ -803,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.
@@ -832,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'. @@ -1505,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.
@@ -1739,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.