]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/blobdiff - app/src/main/assets/en/about_licenses.html
Remove the free flavor. https://redmine.stoutner.com/issues/786
[PrivacyBrowserAndroid.git] / app / src / main / assets / en / about_licenses.html
index 51d8c029672998bdc70f1ade126d64648b5c6390..1f9f2d9326b11bca3c010551215689e7596cc06f 100644 (file)
@@ -1,5 +1,5 @@
 <!--
-  Copyright © 2016-2020 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2021 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
 
     <body>
         <h3>Copyright</h3>
-        <p>Privacy Browser copyright © 2015-2020 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
+        <p>Privacy Browser copyright © 2015-2021 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
         <h3>License</h3>
         <p>Privacy Browser is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>. The full text of the license is below.
-            The source code is available from <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=summary">git.stoutner.com</a>.</p>
+            The source code is available from <a href="https://gitweb.stoutner.com/?p=PrivacyBrowser.git;a=summary">gitweb.stoutner.com</a>.</p>
 
         <h3>Blocklists</h3>
         <p><a href="https://easylist.to/easylist/easylist.txt">EasyList</a> and <a href="https://easylist.to/easylist/easyprivacy.txt">EasyPrivacy</a>
             and code from the <a href="https://mvnrepository.com/artifact/com.google.android.material/material">Google Material Maven repository</a>,
             which are released under the <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>,
+        <p>The free flavor of Privacy Browser is built with <a href="https://developers.google.com/admob/android/quick-start">Google’s AdMob</a>,
             which is released under the <a href="https://developer.android.com/studio/terms">Android Software Development Kit License</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>.
+            Modifications copyright © 2019 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The modified file is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
 
         <h3>Icons</h3>
-        <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/privacy_browser_free.svg"/> <img class="left" src="../shared_images/warning.svg"/>
-            <img class="left" src="../shared_images/javascript_enabled.svg"/> are derived from <code>security</code> and <code>language</code>,
-            which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
+        <p><img class="left" src="../shared_images/privacy_browser.svg"/> <img class="left" src="../shared_images/warning.svg"/> <img class="left" src="../shared_images/javascript_enabled.svg"/>
+            are derived from <code>security</code> and <code>language</code>, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the
+            <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><svg class="left"><use href="../shared_images/move_to_folder.svg#icon"/></svg> is derived from elements of <code>folder</code> and <code>exit_to_app</code>,
@@ -97,7 +98,7 @@
         <p><svg class="left"><use href="../shared_images/mastodon.svg#icon"/></svg> <code>mastodon</code> comes from the
             <a href="https://github.com/tootsuite/mastodon/blob/master/app/javascript/images/logo_transparent_black.svg">Mastodon project</a>,
             which is released under the <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">AGPLv3+ license</a>. 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.</p>
+            The image is unchanged except for layout information like color, size, and margin. It is included in Privacy Browser under the provisions in section 13 of the license.</p>
         <p>The following icons come from the <a href="https://material.io/icons/">Android Material icon set</a>,
             which is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             They are unchanged except for layout information like color and size. Some of them have been renamed to match their use in the code. The original icons and names are shown below.</p>
         <p><svg class="icon"><use href="../shared_images/arrow_forward.svg#icon"/></svg> arrow_forward.</p>
         <p><svg class="icon"><use href="../shared_images/bookmarks.svg#icon"/></svg> bookmarks.</p>
         <p><svg class="icon"><use href="../shared_images/bug_report.svg#icon"/></svg> bug_report.</p>
+        <p><svg class="icon"><use href="../shared_images/call_to_action.svg#icon"/></svg> call_to_action.</p>
         <p><svg class="icon"><use href="../shared_images/camera_enhance.svg#icon"/></svg> camera_enhance.</p>
         <p><svg class="icon"><use href="../shared_images/chrome_reader_mode.svg#icon"/></svg> chrome_reader_mode.</p>
         <p><svg class="icon"><use href="../shared_images/close.svg#icon"/></svg> close.</p>