X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fzh-rTW%2Fabout_licenses.html;h=d3fb878cc3b766f058dfed55669f772d5171911d;hp=741f8db7b17c7450bda70b468be530f63aacb6f2;hb=f82135d919d64d4909c37c79a18e14ceba802579;hpb=9133910bd316f6a50d478c26283c2cc5447483a7

diff --git a/app/src/main/assets/zh-rTW/about_licenses.html b/app/src/main/assets/zh-rTW/about_licenses.html
index 741f8db7..d3fb878c 100644
--- a/app/src/main/assets/zh-rTW/about_licenses.html
+++ b/app/src/main/assets/zh-rTW/about_licenses.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -43,19 +43,24 @@
         <p>Privacy Browser copyright © 2015-2017 <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 at the bottom of this document.</p>
+        <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.</p>
 
         <h3>Attributions</h3>
         <p>The list of ad servers used by the ad blocker comes from <a href="https://pgl.yoyo.org/adservers/">pgl.yoyo.org</a>.
             Because a list of domain names is a list of facts, it <a href="https://www.copyright.gov/help/faq/faq-protect.html">cannot be copyrighted</a>.</p>
-        <p>Most of the icons in Privacy Browser 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>.</p>
         <p><img class="left" src="../en/images/privacy_browser.png">
             <img class="left" src="../en/images/privacy_browser_free.png">
             <img class="left" src="../en/images/warning.png">
             <img class="left" src="../en/images/javascript_enabled.png">
-            are derived from ic_security and ic_language. Modifications were made by Soren Stoutner in 2016.</p>
-        <p>The following icons 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>
+            are derived from ic_security and ic_language, 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><img class="left" src="../en/images/orbot.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>, which is copyright
+            2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/cookie.png"> cookie was created by Google. It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>
+            and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>. It is unchanged except for layout information like color and size.</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><img class="icon" src="../en/images/ic_add.png"> ic_add.</p>
         <p><img class="icon" src="../en/images/ic_arrow_back.png"> ic_arrow_back.</p>
         <p><img class="icon" src="../en/images/ic_arrow_forward.png"> ic_arrow_forward.</p>
@@ -72,29 +77,29 @@
         <p><img class="icon" src="../en/images/ic_expand_less.png"> ic_expand_less.</p>
         <p><img class="icon" src="../en/images/ic_expand_more.png"> ic_expand_more.</p>
         <p><img class="icon" src="../en/images/ic_file_download.png"> ic_file_download.</p>
+        <p><img class="icon" src="../en/images/ic_find_in_page.png"> ic_find_in_page.</p>
         <p><img class="icon" src="../en/images/ic_folder.png"> ic_folder.</p>
         <p><img class="icon" src="../en/images/ic_folder_special.png"> ic_folder_special.</p>
         <p><img class="icon" src="../en/images/ic_home.png"> ic_home.</p>
         <p><img class="icon" src="../en/images/ic_import_contacts.png"> ic_import_contacts.</p>
+        <p><img class="icon" src="../en/images/ic_important_devices.png"> ic_important_devices.</p>
         <p><img class="icon" src="../en/images/ic_info_outline.png"> ic_info_outline.</p>
         <p><img class="icon" src="../en/images/ic_language.png"> ic_language.</p>
         <p><img class="icon" src="../en/images/ic_list.png"> ic_list.</p>
+        <p><img class="icon" src="../en/images/ic_local_activity.png"> ic_local_activity.</p>
         <p><img class="icon" src="../en/images/ic_location_off.png"> ic_location_off.</p>
         <p><img class="icon" src="../en/images/ic_more.png"> ic_more.</p>
         <p><img class="icon" src="../en/images/ic_question_answer.png"> ic_question_answer.</p>
+        <p><img class="icon" src="../en/images/ic_search.png"> ic_search.</p>
         <p><img class="icon" src="../en/images/ic_select_all.png"> ic_select_all.</p>
         <p><img class="icon" src="../en/images/ic_settings.png"> ic_settings.</p>
         <p><img class="icon" src="../en/images/ic_subtitles.png"> ic_subtitles.</p>
         <p><img class="icon" src="../en/images/ic_text_fields.png"> ic_text_fields.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_bottom.png"> ic_vertical_align_bottom.</p>
         <p><img class="icon" src="../en/images/ic_vertical_align_top.png"> ic_vertical_align_top.</p>
+        <p><img class="icon" src="../en/images/ic_visibility_off.png"> ic_visibility_off.</p>
         <p><img class="icon" src="../en/images/ic_web.png"> ic_web.</p>
 
-        <br/>
-
-        <p><img class="left" src="../en/images/cookie.png"> cookie was created by Google.
-            It is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a> and can be downloaded from <a href="https://materialdesignicons.com/icon/cookie">Material Design Icons</a>.</p>
-
         <hr/>
 
         <h3>GNU General Public License</h3>
@@ -726,5 +731,318 @@
             copy of the Program in return for a fee.</p>
 
         <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>How to Apply These Terms to Your New Programs</h3>
+
+        <p>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
+            free software which everyone can redistribute and change under these terms.</p>
+
+        <p>To do so, attach the following notices to the program.  It is safest
+            to attach them to the start of each source file to most effectively
+            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.</p>
+
+        <pre>&lt;one line to give the program’s name
+and a brief idea of what it does.&gt;
+Copyright (C) &lt;year&gt;  &lt;name of author&gt;
+
+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
+&lt;http://www.gnu.org/licenses/&gt;.</pre>
+
+        <p>Also add information on how to contact you by electronic and paper mail.</p>
+
+        <p>If the program does terminal interaction, make it output a short
+            notice like this when it starts in an interactive mode:</p>
+
+        <pre>&lt;program&gt;  Copyright (C) &lt;year&gt;
+&lt;name of author&gt;
+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.</pre>
+
+        <p>The hypothetical commands `show w' and `show c' should show the appropriate
+            parts of the General Public License.  Of course, your program's commands
+            might be different; for a GUI interface, you would use an “about box”.</p>
+
+        <p>You should also get your employer (if you work as a programmer) or school,
+            if any, to sign a “copyright disclaimer” for the program, if necessary.
+            For more information on this, and how to apply and follow the GNU GPL, see
+            <<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>>.</p>
+
+        <p>The GNU General Public License does not permit incorporating your program
+            into proprietary programs.  If your program is a subroutine library, you
+            may consider it more useful to permit linking proprietary applications with
+            the library.  If this is what you want to do, use the GNU Lesser General
+            Public License instead of this License.  But first, please read
+            <<a href="http://www.gnu.org/philosophy/why-not-lgpl.html">http://www.gnu.org/philosophy/why-not-lgpl.html</a>>.</p>
+
+        <hr/>
+
+        <h3>Apache License</h3>
+        <p>Version 2.0, January 2004</p>
+        <p><a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a></p>
+
+        <h3>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</h3>
+
+        <h4>1. Definitions.</h4>
+
+        <p>“License” shall mean the terms and conditions for use, reproduction, and
+            distribution as defined by Sections 1 through 9 of this document.</p>
+
+        <p>“Licensor” shall mean the copyright owner or entity authorized by the
+            copyright owner that is granting the License.</p>
+
+        <p>“Legal Entity” shall mean the union of the acting entity and all other
+            entities that control, are controlled by, or are under common control with
+            that entity. For the purposes of this definition, “control” means (i) the
+            power, direct or indirect, to cause the direction or management of such
+            entity, whether by contract or otherwise, or (ii) ownership of fifty
+            percent (50%) or more of the outstanding shares, or (iii) beneficial
+            ownership of such entity.</p>
+
+        <p>“You” (or “Your”) shall mean an individual or Legal Entity exercising
+            permissions granted by this License.</p>
+
+        <p>“Source” form shall mean the preferred form for making modifications,
+            including but not limited to software source code, documentation source,
+            and configuration files.</p>
+
+        <p>“Object” form shall mean any form resulting from mechanical transformation
+            or translation of a Source form, including but not limited to compiled
+            object code, generated documentation, and conversions to other media types.</p>
+
+        <p>“Work” shall mean the work of authorship, whether in Source or Object form,
+            made available under the License, as indicated by a copyright notice that
+            is included in or attached to the work (an example is provided in the
+            Appendix below).</p>
+
+        <p>“Derivative Works” shall mean any work, whether in Source or Object form,
+            that is based on (or derived from) the Work and for which the editorial
+            revisions, annotations, elaborations, or other modifications represent, as
+            a whole, an original work of authorship. For the purposes of this License,
+            Derivative Works shall not include works that remain separable from, or
+            merely link (or bind by name) to the interfaces of, the Work and Derivative
+            Works thereof.</p>
+
+        <p>“Contribution” shall mean any work of authorship, including the original
+            version of the Work and any modifications or additions to that Work or
+            Derivative Works thereof, that is intentionally submitted to Licensor for
+            inclusion in the Work by the copyright owner or by an individual or Legal
+            Entity authorized to submit on behalf of the copyright owner. For the
+            purposes of this definition, “submitted” means any form of electronic,
+            verbal, or written communication sent to the Licensor or its
+            representatives, including but not limited to communication on electronic
+            mailing lists, source code control systems, and issue tracking systems that
+            are managed by, or on behalf of, the Licensor for the purpose of discussing
+            and improving the Work, but excluding communication that is conspicuously
+            marked or otherwise designated in writing by the copyright owner as “Not a
+            Contribution.”</p>
+
+        <p>“Contributor” shall mean Licensor and any individual or Legal Entity on
+            behalf of whom a Contribution has been received by Licensor and
+            subsequently incorporated within the Work.</p>
+
+        <h4>2. Grant of Copyright License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby
+            grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+            irrevocable copyright license to reproduce, prepare Derivative Works of, publicly
+            display, publicly perform, sublicense, and distribute the Work and such
+            Derivative Works in Source or Object form.</p>
+
+        <h4>3. Grant of Patent License.</h4>
+
+        <p>Subject to the terms and conditions of this License, each Contributor hereby grants
+            to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+            (except as stated in this section) patent license to make, have made, use,
+            offer to sell, sell, import, and otherwise transfer the Work, where such
+            license applies only to those patent claims licensable by such Contributor
+            that are necessarily infringed by their Contribution(s) alone or by
+            combination of their Contribution(s) with the Work to which such
+            Contribution(s) was submitted. If You institute patent litigation against
+            any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+            that the Work or a Contribution incorporated within the Work constitutes
+            direct or contributory patent infringement, then any patent licenses
+            granted to You under this License for that Work shall terminate as of the
+            date such litigation is filed.</p>
+
+        <h4>4. Redistribution.</h4>
+
+        <p>You may reproduce and distribute copies of the Work or Derivative Works thereof
+            in any medium, with or without modifications, and in Source or Object form, provided
+            that You meet the following conditions:</p>
+
+        <ol>
+            <li>You must give any other recipients of the Work or Derivative Works a
+                copy of this License; and</li>
+
+            <li>You must cause any modified files to carry prominent notices stating
+                that You changed the files; and</li>
+
+            <li>You must retain, in the Source form of any Derivative Works that You
+                distribute, all copyright, patent, trademark, and attribution notices from
+                the Source form of the Work, excluding those notices that do not pertain to
+                any part of the Derivative Works; and</li>
+
+            <li>If the Work includes a “NOTICE” text file as part of its distribution,
+                then any Derivative Works that You distribute must include a readable copy
+                of the attribution notices contained within such NOTICE file, excluding
+                those notices that do not pertain to any part of the Derivative Works, in
+                at least one of the following places: within a NOTICE text file distributed
+                as part of the Derivative Works; within the Source form or documentation,
+                if provided along with the Derivative Works; or, within a display generated
+                by the Derivative Works, if and wherever such third-party notices normally
+                appear. The contents of the NOTICE file are for informational purposes only
+                and do not modify the License. You may add Your own attribution notices
+                within Derivative Works that You distribute, alongside or as an addendum to
+                the NOTICE text from the Work, provided that such additional attribution
+                notices cannot be construed as modifying the License.
+                <br/>
+                <br/>
+                You may add Your own copyright statement to Your modifications and may
+                provide additional or different license terms and conditions for use,
+                reproduction, or distribution of Your modifications, or for any such
+                Derivative Works as a whole, provided Your use, reproduction, and
+                distribution of the Work otherwise complies with the conditions stated in
+                this License.</li>
+        </ol>
+
+        <h4>5. Submission of Contributions.</h4>
+
+        <p>Unless You explicitly state otherwise, any Contribution intentionally submitted for
+            inclusion in the Work by You to the Licensor shall be under the terms and
+            conditions of this License, without any additional terms or conditions.
+            Notwithstanding the above, nothing herein shall supersede or modify the
+            terms of any separate license agreement you may have executed with Licensor
+            regarding such Contributions.</p>
+
+        <h4>6. Trademarks.</h4>
+
+        <p>This License does not grant permission to use the trade names, trademarks, service marks,
+            or product names of the Licensor, except as required for reasonable and customary use
+            in describing the origin of the Work and reproducing the content of the
+            NOTICE file.</p>
+
+        <h4>7. Disclaimer of Warranty.</h4>
+
+        <p>Unless required by applicable law or agreed to in writing, Licensor provides the Work
+            (and each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT
+            WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+            without limitation, any warranties or conditions of TITLE,
+            NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+            are solely responsible for determining the appropriateness of using or
+            redistributing the Work and assume any risks associated with Your exercise
+            of permissions under this License.</p>
+
+        <h4>8. Limitation of Liability.</h4>
+
+        <p>In no event and under no legal theory, whether in tort (including negligence), contract,
+            or otherwise, unless required by applicable law (such as deliberate and
+            grossly negligent acts) or agreed to in writing, shall any Contributor be
+            liable to You for damages, including any direct, indirect, special,
+            incidental, or consequential damages of any character arising as a result
+            of this License or out of the use or inability to use the Work (including
+            but not limited to damages for loss of goodwill, work stoppage, computer
+            failure or malfunction, or any and all other commercial damages or losses),
+            even if such Contributor has been advised of the possibility of such
+            damages.</p>
+
+        <h4>9. Accepting Warranty or Additional Liability.</h4>
+
+        <p>While redistributing the Work or Derivative Works thereof, You may choose
+            to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+            or other liability obligations and/or rights consistent with this License.
+            However, in accepting such obligations, You may act only on Your own behalf
+            and on Your sole responsibility, not on behalf of any other Contributor,
+            and only if You agree to indemnify, defend, and hold each Contributor
+            harmless for any liability incurred by, or claims asserted against, such
+            Contributor by reason of your accepting any such warranty or additional
+            liability.</p>
+
+        <p>END OF TERMS AND CONDITIONS</p>
+
+        <h3>APPENDIX: How to apply the Apache License to your work</h3>
+
+        <p>To apply the Apache License to your work, attach the following boilerplate
+            notice, with the fields enclosed by brackets “[]” replaced with your own
+            identifying information. (Don’t include the brackets!) The text should be
+            enclosed in the appropriate comment syntax for the file format. We also
+            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.</p>
+        <pre>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
+
+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.</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