]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/assets/ru/about_licenses_dark.html
Add share, copy, and save options to About > Version. https://redmine.stoutner.com...
[PrivacyBrowserAndroid.git] / app / src / main / assets / ru / about_licenses_dark.html
index cd6badf1df22ca10826e7ddc68d285fcedf23949..31185614a4193be85f68fc1b6fa94c1963a5c064 100644 (file)
@@ -1,5 +1,5 @@
 <!--
 <!--
-  Copyright © 2016-2019 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -25,7 +25,7 @@
 
     <body>
         <h3>Авторские права</h3>
 
     <body>
         <h3>Авторские права</h3>
-        <p>Авторские права Privacy Browser © 2015-2019 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
+        <p>Авторские права Privacy Browser © 2015-2020 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
         <h3>Лицензия</h3>
         <p>Privacy Browser выпущен под <a href="https://www.gnu.org/licenses/gpl-3.0.html">лицензией GPLv3+</a>. Полный текст лицензии приведен ниже.
 
         <h3>Лицензия</h3>
         <p>Privacy Browser выпущен под <a href="https://www.gnu.org/licenses/gpl-3.0.html">лицензией GPLv3+</a>. Полный текст лицензии приведен ниже.
         <p>Более подробную информацию о списках блокировки можно найти на <a href="https://easylist.to/">веб-сайте EasyList</a>.</p>
 
         <h3>Библиотеки</h3>
         <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>Privacy Browser создан на базе библиотек <a href="https://developer.android.com/jetpack/androidx/">AndroidX</a>,
+            <a href="https://github.com/JetBrains/kotlin/tree/master/license">Kotlin</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>
+
+        <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">
 
         <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">
             которые являются частью <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>
             которые являются частью <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_dark.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_dark.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>,
         <p><img class="left" src="../shared_images/cookie_dark.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>,
@@ -93,7 +98,6 @@
         <p><img class="icon" src="../shared_images/arrow_forward_dark.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmarks_dark.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_dark.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_dark.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmarks_dark.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_dark.png"> bug_report.</p>
-        <p><img class="icon" src="../shared_images/call_to_action_dark.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_dark.png"> camera_enhance.</p>
         <p><img class="icon" src="../shared_images/chrome_reader_mode_dark.png"> chrome_reader_mode.</p>
         <p><img class="icon" src="../shared_images/close_dark.png"> close.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_dark.png"> camera_enhance.</p>
         <p><img class="icon" src="../shared_images/chrome_reader_mode_dark.png"> chrome_reader_mode.</p>
         <p><img class="icon" src="../shared_images/close_dark.png"> close.</p>
         <p><img class="icon" src="../shared_images/edit_dark.png"> edit.</p>
         <p><img class="icon" src="../shared_images/expand_less_dark.png"> expand_less.</p>
         <p><img class="icon" src="../shared_images/expand_more_dark.png"> expand_more.</p>
         <p><img class="icon" src="../shared_images/edit_dark.png"> edit.</p>
         <p><img class="icon" src="../shared_images/expand_less_dark.png"> expand_less.</p>
         <p><img class="icon" src="../shared_images/expand_more_dark.png"> expand_more.</p>
+        <p><img class="icon" src="../shared_images/file_copy_dark.png"> file_copy.</p>
         <p><img class="icon" src="../shared_images/file_download_dark.png"> file_download.</p>
         <p><img class="icon" src="../shared_images/find_in_page_dark.png"> find_in_page.</p>
         <p><img class="icon" src="../shared_images/folder_dark.png"> folder.</p>
         <p><img class="icon" src="../shared_images/file_download_dark.png"> file_download.</p>
         <p><img class="icon" src="../shared_images/find_in_page_dark.png"> find_in_page.</p>
         <p><img class="icon" src="../shared_images/folder_dark.png"> folder.</p>
-        <p><img class="icon" src="../shared_images/fullscreen_dark.png"> fullscreen.</p>
         <p><img class="icon" src="../shared_images/home_dark.png"> home.</p>
         <p><img class="icon" src="../shared_images/image_dark.png"> image.</p>
         <p><img class="icon" src="../shared_images/import_contacts_dark.png"> import_contacts.</p>
         <p><img class="icon" src="../shared_images/home_dark.png"> home.</p>
         <p><img class="icon" src="../shared_images/image_dark.png"> image.</p>
         <p><img class="icon" src="../shared_images/import_contacts_dark.png"> import_contacts.</p>
         <p><img class="icon" src="../shared_images/important_devices_dark.png"> important_devices.</p>
         <p><img class="icon" src="../shared_images/info_outline_dark.png"> info_outline.</p>
         <p><img class="icon" src="../shared_images/language_dark.png"> language.</p>
         <p><img class="icon" src="../shared_images/important_devices_dark.png"> important_devices.</p>
         <p><img class="icon" src="../shared_images/info_outline_dark.png"> info_outline.</p>
         <p><img class="icon" src="../shared_images/language_dark.png"> language.</p>
+        <p><img class="icon" src="../shared_images/link_off_dark.png"> link_off.</p>
         <p><img class="icon" src="../shared_images/list_dark.png"> list.</p>
         <p><img class="icon" src="../shared_images/local_activity_dark.png"> local_activity.</p>
         <p><img class="icon" src="../shared_images/location_off_dark.png"> location_off.</p>
         <p><img class="icon" src="../shared_images/list_dark.png"> list.</p>
         <p><img class="icon" src="../shared_images/local_activity_dark.png"> local_activity.</p>
         <p><img class="icon" src="../shared_images/location_off_dark.png"> location_off.</p>
         <p><img class="icon" src="../shared_images/map_dark.png"> map.</p>
         <p><img class="icon" src="../shared_images/more_dark.png"> more.</p>
         <p><img class="icon" src="../shared_images/new_releases_dark.png"> new releases.</p>
         <p><img class="icon" src="../shared_images/map_dark.png"> map.</p>
         <p><img class="icon" src="../shared_images/more_dark.png"> more.</p>
         <p><img class="icon" src="../shared_images/new_releases_dark.png"> new releases.</p>
+        <p><img class="icon" src="../shared_images/open_in_browser_dark.png"> open_in_browser.</p>
+        <p><img class="icon" src="../shared_images/payment_dark.png"> payment.</p>
         <p><img class="icon" src="../shared_images/question_answer_dark.png"> question_answer.</p>
         <p><img class="icon" src="../shared_images/refresh_dark.png"> refresh.</p>
         <p><img class="icon" src="../shared_images/question_answer_dark.png"> question_answer.</p>
         <p><img class="icon" src="../shared_images/refresh_dark.png"> refresh.</p>
+        <p><img class="icon" src="../shared_images/save_dark.png"> save.</p>
         <p><img class="icon" src="../shared_images/search_dark.png"> search.</p>
         <p><img class="icon" src="../shared_images/select_all_dark.png"> select_all.</p>
         <p><img class="icon" src="../shared_images/settings_dark.png"> settings.</p>
         <p><img class="icon" src="../shared_images/search_dark.png"> search.</p>
         <p><img class="icon" src="../shared_images/select_all_dark.png"> select_all.</p>
         <p><img class="icon" src="../shared_images/settings_dark.png"> settings.</p>
+        <p><img class="icon" src="../shared_images/settings_overscan_dark.png"> settings_overscan.</p>
+        <p><img class="icon" src="../shared_images/share_night.png"> share.</p>
         <p><img class="icon" src="../shared_images/smartphone_dark.png"> smartphone.</p>
         <p><img class="icon" src="../shared_images/sort_dark.png"> sort.</p>
         <p><img class="icon" src="../shared_images/style_dark.png"> style.</p>
         <p><img class="icon" src="../shared_images/subtitles_dark.png"> subtitles.</p>
         <p><img class="icon" src="../shared_images/smartphone_dark.png"> smartphone.</p>
         <p><img class="icon" src="../shared_images/sort_dark.png"> sort.</p>
         <p><img class="icon" src="../shared_images/style_dark.png"> style.</p>
         <p><img class="icon" src="../shared_images/subtitles_dark.png"> subtitles.</p>
+        <p><img class="icon" src="../shared_images/tab_dark.png"> tab.</p>
         <p><img class="icon" src="../shared_images/text_fields_dark.png"> text_fields.</p>
         <p><img class="icon" src="../shared_images/thumbs_up_down_dark.png"> thumbs_up_down.</p>
         <p><img class="icon" src="../shared_images/vertical_align_bottom_dark.png"> vertical_align_bottom.</p>
         <p><img class="icon" src="../shared_images/text_fields_dark.png"> text_fields.</p>
         <p><img class="icon" src="../shared_images/thumbs_up_down_dark.png"> thumbs_up_down.</p>
         <p><img class="icon" src="../shared_images/vertical_align_bottom_dark.png"> vertical_align_bottom.</p>
@@ -1050,40 +1061,4 @@ WITHOUT WARRANTIES OR CONDITIONS
 OF ANY KIND, either express or implied.
 See the License for the specific
 language governing permissions and
 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