X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fes%2Fabout_licenses.html;h=798f330980183be5c97522ff19fd3410999e5256;hb=70da2a558d6e35c38adb596479c36f7e451dc9a5;hp=d8159635cf9374116e46ebf4fbb6b0b1a739d74e;hpb=f3b9172adedd74f705ddc0beac80798ae84f2920;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html index d8159635..798f3309 100644 --- a/app/src/main/assets/es/about_licenses.html +++ b/app/src/main/assets/es/about_licenses.html @@ -1,24 +1,24 @@ + along with Privacy Browser Android. If not, see . --> - + @@ -26,18 +26,20 @@ + + Licenses

Derechos de autor

-

Navegador Privado tiene derechos de autor © 2015-2021 por Soren Stoutner.

+

Navegador Privado tiene derechos de autor 2015-2024 por Soren Stoutner.

Licencia

Navegador Privado está liberado bajo la licencia GPLv3+. El texto completo de la licencia se encuentra en la parte inferior de este documento (se deja en el idioma original). - El código fuente está disponible en git.stoutner.com.

+ El código fuente está disponible en gitweb.stoutner.com.

-

Listas de bloqueo

+

Listas de filtros

EasyList y EasyPrivacy tienen licencia dual bajo las licencias GPLv3+ y Creative Commons Attribution-ShareAlike 3.0+ Unported. Navegador Privado las incorpora usando la opción GPLv3+.

@@ -46,7 +48,7 @@ se liberan bajo la licencia Creative Commons Attribution 3.0 Unported, la cual es compatible con la GPLv3+. Las listas se incluyen sin cambios en Navegador Privado.

-

Más información sobre las listas de bloqueo puede encontrarse en la página web de EasyList.

+

Encontrará más información sobre las listas de filtros en la página web de EasyList.

Librerías

Navegador Privado está construido con las librerías de AndroidX, @@ -54,44 +56,47 @@ y código del repositorio de Google Material Maven, que se publican bajo la Licencia Apache 2.0.

-

El sabor o versión libre de Navegador Privado está construido con anuncios de Firebase, - que se libera bajo la Licencia del Android Software Development Kit.

-

Clases

-

com.stoutner.privacybrowser.views.CheckedLinearLayout es una versión modificada de una clase incluida en el código fuente de +

com.stoutner.privacybrowser.views.CheckedLinearLayout es una versión modificada de una clase incluida en el código fuente de Android Camera. El archivo original se liberó bajo la Licencia Apache 2.0. + Copyright de modificaciones 2019 Soren Stoutner. El archivo modificado se libera bajo la licencia GPLv3+.

Iconos

-

- derivan de security y de language, - que son parte del conjunto de iconos Android Material - y son liberados bajo la Licencia Apache 2.0. - El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 Soren Stoutner. +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt + derivan de security y de language, que son parte del conjunto de iconos Android Material y son liberados bajo la + Licencia Apache 2.0. + El texto completo de la licencia se encuentra debajo. Copyright de modificaciones 2016-2017,2021-2023 Soren Stoutner. Las imágenes resultantes se liberan bajo la licencia GPLv3+.

deriva de elementos de folder y exit_to_app, que son parte del - conjunto de iconos Android Material y son liberados bajo la Licencia Apache 2.0. - Copyright de modificaciones © 2017 Soren Stoutner. + conjunto de iconos Android Material y son liberados bajo la Licencia Apache 2.0. + Copyright de modificaciones 2017, 2022 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

deriva de elementos de bookmark y create_new_folder, que son parte del - conjunto de iconos Android Material y son liberados bajo la Licencia Apache 2.0. - Copyright de modificaciones © 2017 Soren Stoutner. + conjunto de iconos Android Material y son liberados bajo la Licencia Apache 2.0. + Copyright de modificaciones 2017, 2022 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

deriva de create_new_folder, - que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. - Copyright de modificaciones © 2017 Soren Stoutner. + que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. + Copyright de modificaciones 2017, 2022 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

deriva de exit_to_app, - que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. - Copyright de modificaciones © 2017 Soren Stoutner. + que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. + Copyright de modificaciones 2017, 2022 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

deriva de compare, - que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. - Copyright de modificaciones © 2017 Soren Stoutner. + que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. + Copyright de modificaciones 2017, 2022 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

-

deriva de sort, que es parte del conjunto de iconos Android Material - y es liberado bajo la Licencia Apache 2.0. Copyright de modificaciones © 2019 Soren Stoutner. +

Sort Selected deriva de sort, que es parte del conjunto de iconos Android Material + y es liberado bajo la Licencia Apache 2.0. Copyright de modificaciones 2019, 2022 Soren Stoutner. + La imagen resultante se libera bajo la licencia GPLv3+.

+

Push Pin deriva de push_pin_selected, + que es parte del conjunto de iconos Android Material y es liberado bajo la Licencia Apache 2.0. + Copyright de modificaciones 2019-2020, 2022 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

cookie fue creado por Google. Es liberado bajo la licencia Apache 2.0 @@ -102,21 +107,24 @@ que se libera bajo la licencia AGPLv3+. El texto completo de la licencia está abajo. La imagen no ha cambiado excepto por la información de diseño como el color, el tamaño y el margen. Está incluida en el Navegador de Privacidad bajo las disposiciones de la sección 13 de la licencia.

-

Los siguientes iconos proceden de conjunto de iconos Android Material, +

Los siguientes iconos proceden de conjunto de iconos Android Material, el cual es liberado bajo la licencia Apache 2.0. Están sin cambios, excepto por la información de diseño como el color y el tamaño. Algunos de ellos se han renombrado para que coincida con su uso en el código. Los iconos y los nombres originales se muestran a continuación.

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.

@@ -135,14 +143,18 @@

language.

link_off.

list.

+

list_alt_rounded_24px.

local_activity.

location_off.

lock.

map.

+

menu_rounded_weight400_grade0_24px.

more.

-

new releases.

+

new_releases.

open_in_browser.

payment.

+

payments_rounded.

+

push_pin_filled.

question_answer.

refresh.

save.

@@ -154,6 +166,7 @@

smartphone.

sort.

style.

+

subheader_rounded_weight400_grade0_48px.

subtitles.

tab.

text_fields.

@@ -808,28 +821,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.

@@ -873,7 +889,7 @@ for details.
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

-

Preamble

+

Preamble

The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure @@ -924,9 +940,9 @@ for details.

The precise terms and conditions for copying, distribution and modification follow.

-

TERMS AND CONDITIONS

+

TERMS AND CONDITIONS

-

0. Definitions.

+

0. Definitions.

"This License" refers to version 3 of the GNU Affero General Public License.

@@ -966,7 +982,7 @@ for details. the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.

-

1. Source Code.

+

1. Source Code.

The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source @@ -1008,7 +1024,7 @@ for details.

The Corresponding Source for a work in source code form is that same work.

-

2. Basic Permissions.

+

2. Basic Permissions.

All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated @@ -1033,7 +1049,7 @@ for details. the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.

-

3. Protecting Users' Legal Rights From Anti-Circumvention Law.

+

3. Protecting Users' Legal Rights From Anti-Circumvention Law.

No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article @@ -1049,7 +1065,7 @@ for details. users, your or third parties' legal rights to forbid circumvention of technological measures.

-

4. Conveying Verbatim Copies.

+

4. Conveying Verbatim Copies.

You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and @@ -1062,7 +1078,7 @@ for details.

You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.

-

5. Conveying Modified Source Versions.

+

5. Conveying Modified Source Versions.

You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the @@ -1103,7 +1119,7 @@ for details. in an aggregate does not cause this License to apply to the other parts of the aggregate.

-

6. Conveying Non-Source Forms.

+

6. Conveying Non-Source Forms.

You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the @@ -1205,7 +1221,7 @@ for details. source code form), and must require no special password or key for unpacking, reading or copying.

-

7. Additional Terms.

+

7. Additional Terms.

"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. @@ -1273,7 +1289,7 @@ for details. form of a separately written license, or stated as exceptions; the above requirements apply either way.

-

8. Termination.

+

8. Termination.

You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or @@ -1301,7 +1317,7 @@ for details. reinstated, you do not qualify to receive new licenses for the same material under section 10.

-

9. Acceptance Not Required for Having Copies.

+

9. Acceptance Not Required for Having Copies.

You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work @@ -1312,7 +1328,7 @@ for details. not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.

-

10. Automatic Licensing of Downstream Recipients.

+

10. Automatic Licensing of Downstream Recipients.

Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and @@ -1337,7 +1353,7 @@ for details. any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.

-

11. Patents.

+

11. Patents.

A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The @@ -1406,7 +1422,7 @@ for details. any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.

-

12. No Surrender of Others' Freedom.

+

12. No Surrender of Others' Freedom.

If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not @@ -1418,7 +1434,7 @@ for details. the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.

-

13. Remote Network Interaction; Use with the GNU General Public License.

+

13. Remote Network Interaction; Use with the GNU General Public License.

Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users @@ -1439,7 +1455,7 @@ for details. combined will remain governed by version 3 of the GNU General Public License.

-

14. Revised Versions of this License.

+

14. Revised Versions of this License.

The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new @@ -1465,7 +1481,7 @@ for details. author or copyright holder as a result of your choosing to follow a later version.

-

15. Disclaimer of Warranty.

+

15. Disclaimer of Warranty.

THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT @@ -1476,7 +1492,7 @@ for details. IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-

16. Limitation of Liability.

+

16. Limitation of Liability.

IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS @@ -1488,7 +1504,7 @@ for details. EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-

17. Interpretation of Sections 15 and 16.

+

17. Interpretation of Sections 15 and 16.

If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, @@ -1499,7 +1515,7 @@ for details.

END OF TERMS AND CONDITIONS

-

How to Apply These Terms to Your New Programs

+

How to Apply These Terms to Your New Programs

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 @@ -1510,29 +1526,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.

@@ -1744,22 +1764,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.
+ +