X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fru%2Fabout_licenses_light.html;h=96f048ca1e584ea21fd61cc8fd0716b1251d0270;hp=3aacc9ac04897668b91a035d20abc0a461e0002f;hb=81179d84ced6b43360d42a4b44eb8fb329532ff4;hpb=47b689dbdaf08b9636021ddd8f72ca9ee7f11998

diff --git a/app/src/main/assets/ru/about_licenses_light.html b/app/src/main/assets/ru/about_licenses_light.html
index 3aacc9ac..96f048ca 100644
--- a/app/src/main/assets/ru/about_licenses_light.html
+++ b/app/src/main/assets/ru/about_licenses_light.html
@@ -44,16 +44,18 @@
         <p>Более подробную информацию о списках блокировки можно найти на <a href="https://easylist.to/">веб-сайте EasyList</a>.</p>
 
         <h3>Библиотеки</h3>
-        <p>Privacy Browser создан с использованием <a href="https://developer.android.com/topic/libraries/support-library/index.html">Android Support Library</a>,
-            которая выпущена под <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.</p>
-        <p>The free flavor of Privacy Browser is built with <a href="https://mvnrepository.com/artifact/com.google.firebase/firebase-ads">Firebase Ads</a>,
-            which is released under the <a href="https://developer.android.com/studio/terms">Android Software Development Kit License</a>.</p>
+        <p>Privacy Browser создан на базе библиотек <a href="https://developer.android.com/jetpack/androidx/">AndroidX</a>
+            и кодовой базы из репозитория <a href="https://mvnrepository.com/artifact/com.google.android.material/material">Google Material Maven</a>,
+            которые выпущены под лицензией <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.</p>
 
-        <h3>Classes</h3>
-        <p><code>com.stoutner.privacybrowser.views.CheckedLinearLayout</code> is a modified version of a class contained in the
-            <a href="https://android.googlesource.com/platform/packages/apps/Camera/+/master/src/com/android/camera/ui/CheckedLinearLayout.java">Android Camera</a> source code.
-            The original file was released under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
-            The modified file is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p>Бесплатный вариант Privacy Browser создан с помощью <a href="https://mvnrepository.com/artifact/com.google.firebase/firebase-ads">Firebase Ads</a>,
+            выпущенной по лицензии <a href="https://developer.android.com/studio/terms">Android Software Development Kit License</a>.</p>
+
+        <h3>Классы</h3>
+        <p><code>com.stoutner.privacybrowser.views.CheckedLinearLayout</code> является модифицированной версией класса, содержащегося в исходном коде
+            <a href="https://android.googlesource.com/platform/packages/apps/Camera/+/master/src/com/android/camera/ui/CheckedLinearLayout.java">Android Camera</a>.
+            Оригинальный файл был выпущен под лицензией <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
+            Модифицированный файл выпущен под лицензией <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+</a>.</p>
 
         <h3>Иконки</h3>
         <p><img class="left" src="../shared_images/privacy_browser.png"> <img class="left" src="../shared_images/privacy_browser_free.png"> <img class="left" src="../shared_images/warning.png">
@@ -85,12 +87,6 @@
             которые являются частью <a href="https://material.io/icons/">Android Material icon set</a> и выпущены под <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             Модификации авторских прав © 2019 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             Полученные изображения выпущены под <a href="https://www.gnu.org/licenses/gpl-3.0.html">лицензией GPLv3+</a>.</p>
-        <p><img class="left" src="../shared_images/orbot_light.png"> orbot - это модифицированная версия
-            <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">значок статуса из проекта Orbot</a>,
-            который защищен авторским правом 2009-2010 Nathan Freitas, The Guardian Project.
-            Он выпущен под <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>. Полный текст лицензии приведен ниже.
-            Модификации авторских прав © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
-            Полученные изображения выпущены под <a href="https://www.gnu.org/licenses/gpl-3.0.html">лицензией GPLv3+</a>.</p>
         <p><img class="left" src="../shared_images/cookie_light.png"> <code>cookie</code> были созданы Google. Они выпущены под <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
             и могут быть загружены из <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. Он неизменен, за исключением такой информации, как цвет и размер.</p>
         <p>Следующие значки взяты из<a href="https://material.io/icons/">Android Material icon set</a>,
@@ -101,7 +97,6 @@
         <p><img class="icon" src="../shared_images/arrow_forward_light.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmarks_light.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_light.png"> bug_report.</p>
-        <p><img class="icon" src="../shared_images/call_to_action_light.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_light.png"> camera_enhance.</p>
         <p><img class="icon" src="../shared_images/chrome_reader_mode_light.png"> chrome_reader_mode.</p>
         <p><img class="icon" src="../shared_images/close_light.png"> close.</p>
@@ -113,10 +108,10 @@
         <p><img class="icon" src="../shared_images/edit_light.png"> edit.</p>
         <p><img class="icon" src="../shared_images/expand_less_light.png"> expand_less.</p>
         <p><img class="icon" src="../shared_images/expand_more_light.png"> expand_more.</p>
+        <p><img class="icon" src="../shared_images/file_copy_light.png"> file_copy.</p>
         <p><img class="icon" src="../shared_images/file_download_light.png"> file_download.</p>
         <p><img class="icon" src="../shared_images/find_in_page_light.png"> find_in_page.</p>
         <p><img class="icon" src="../shared_images/folder_light.png"> folder.</p>
-        <p><img class="icon" src="../shared_images/fullscreen_light.png"> fullscreen.</p>
         <p><img class="icon" src="../shared_images/home_light.png"> home.</p>
         <p><img class="icon" src="../shared_images/image_light.png"> image.</p>
         <p><img class="icon" src="../shared_images/import_contacts_light.png"> import_contacts.</p>
@@ -124,6 +119,7 @@
         <p><img class="icon" src="../shared_images/important_devices_light.png"> important_devices.</p>
         <p><img class="icon" src="../shared_images/info_outline_light.png"> info_outline.</p>
         <p><img class="icon" src="../shared_images/language_light.png"> language.</p>
+        <p><img class="icon" src="../shared_images/link_off_light.png"> link_off.</p>
         <p><img class="icon" src="../shared_images/list_light.png"> list.</p>
         <p><img class="icon" src="../shared_images/local_activity_light.png"> local_activity.</p>
         <p><img class="icon" src="../shared_images/location_off_light.png"> location_off.</p>
@@ -131,15 +127,20 @@
         <p><img class="icon" src="../shared_images/map_light.png"> map.</p>
         <p><img class="icon" src="../shared_images/more_light.png"> more.</p>
         <p><img class="icon" src="../shared_images/new_releases_light.png"> new releases.</p>
+        <p><img class="icon" src="../shared_images/open_in_browser_light.png"> open_in_browser.</p>
+        <p><img class="icon" src="../shared_images/payment_light.png"> payment.</p>
         <p><img class="icon" src="../shared_images/question_answer_light.png"> question_answer.</p>
         <p><img class="icon" src="../shared_images/refresh_light.png"> refresh.</p>
+        <p><img class="icon" src="../shared_images/save_light.png"> save.</p>
         <p><img class="icon" src="../shared_images/search_light.png"> search.</p>
         <p><img class="icon" src="../shared_images/select_all_light.png"> select_all.</p>
         <p><img class="icon" src="../shared_images/settings_light.png"> settings.</p>
+        <p><img class="icon" src="../shared_images/settings_overscan_light.png"> settings_overscan.</p>
         <p><img class="icon" src="../shared_images/smartphone_light.png"> smartphone.</p>
         <p><img class="icon" src="../shared_images/sort_light.png"> sort.</p>
         <p><img class="icon" src="../shared_images/style_light.png"> style.</p>
         <p><img class="icon" src="../shared_images/subtitles_light.png"> subtitles.</p>
+        <p><img class="icon" src="../shared_images/tab_dark.png"> tab.</p>
         <p><img class="icon" src="../shared_images/text_fields_light.png"> text_fields.</p>
         <p><img class="icon" src="../shared_images/thumbs_up_down_light.png"> thumbs_up_down.</p>
         <p><img class="icon" src="../shared_images/vertical_align_bottom_light.png"> vertical_align_bottom.</p>
@@ -1058,40 +1059,4 @@ 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.</pre>
-
-        <hr/>
-
-        <h3>3-Clause BSD License</h3>
-
-        <p>Redistribution and use in source and binary forms, with or without
-            modification, are permitted provided that the following conditions are
-            met:</p>
-
-        <ul>
-            <li>Redistributions of source code must retain the above copyright
-            notice, this list of conditions and the following disclaimer.</li>
-
-            <li>Redistributions in binary form must reproduce the above
-            copyright notice, this list of conditions and the following disclaimer
-            in the documentation and/or other materials provided with the
-            distribution.</li>
-
-            <li>Neither the names of the copyright owners nor the names of its
-            contributors may be used to endorse or promote products derived from
-            this software without specific prior written permission.</li>
-        </ul>
-
-        <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-            “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-            LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-            A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-            OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-            SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-            LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-            DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-            THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-            (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-            OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
-    </body>
-</html>
\ No newline at end of file
+limitations under the License.</pre>
\ No newline at end of file