X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=inline;f=app%2Fsrc%2Fmain%2Fassets%2Fes%2Fabout_licenses.html;h=b2a3c2ecec1886ff9792385964a1825879330714;hb=HEAD;hp=6f09b29477b725b99e6cd2666e33d815386543aa;hpb=bda37dc9784e900cb64b87af3e221e11320d9d01;p=PrivacyBrowserAndroid.git
diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html
index 6f09b294..2c5c2e44 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
Navegador Privado tiene derechos de autor © 2015-2021 por Soren Stoutner.
+Navegador Privado tiene derechos de autor 2015-2024 por Soren Stoutner.
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. -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.
Navegador Privado está construido con las librerÃas de AndroidX, @@ -54,45 +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 AdMob de Google, - que se libera bajo la Licencia del Kit de desarrollo de software para Android.
-com.stoutner.privacybrowser.views.CheckedLinearLayout
es una versión modificada de una clase incluida en el código fuente de
+
com.stoutner.privacybrowser.views.
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.
+ Copyright de modificaciones 2019 Soren Stoutner.
El archivo modificado se libera bajo la licencia GPLv3+.
- 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.
+
+
+
+ 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, 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.
+
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
@@ -103,13 +107,15 @@
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.
+ bookmark_
bookmarks.
bug_report.
call_to_action.
@@ -119,6 +125,7 @@delete.
delete_forever.
devices_other.
+disabled_by_default.
dns.
donut_small.
edit.
@@ -128,6 +135,7 @@file_download.
find_in_page.
folder.
+ folder_
home.
image.
import_contacts.
@@ -137,14 +145,18 @@language.
link_off.
list.
+list_alt_rounded_24px.
local_activity.
location_off.
lock.
map.
+ menu_
more.
-new releases.
+new_releases.
open_in_browser.
payment.
+payments_rounded.
+push_pin_filled.
question_answer.
refresh.
save.
@@ -155,8 +167,9 @@share.
smartphone.
sort.
+ sort_
style.
-subtitles.
+ subheader_
tab.
text_fields.
thumbs_up_down.
@@ -186,7 +199,7 @@The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to - share and change all versions of a program--to make sure it remains free + share and change all versions of a programâto make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to @@ -214,16 +227,16 @@ (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
-For the developers' and authors' protection, the GPL clearly explains - that there is no warranty for this free software. For both users' and - authors' sake, the GPL requires that modified versions be marked as +
For the developersâ and authorsâ protection, the GPL clearly explains + that there is no warranty for this free software. For both usersâ and + authorsâ sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of - protecting users' freedom to change the software. The systematic + protecting usersâ freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those @@ -307,7 +320,7 @@
The âCorresponding Sourceâ for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to - control those activities. However, it does not include the work's + control those activities. However, it does not include the workâs System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source @@ -349,7 +362,7 @@ the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article @@ -361,13 +374,13 @@ circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or - modification of the work as a means of enforcing, against the work's - users, your or third parties' legal rights to forbid circumvention of + modification of the work as a means of enforcing, against the workâs + users, your or third partiesâ legal rights to forbid circumvention of technological measures.
You may convey verbatim copies of the Program's source code as you +
You may convey verbatim copies of the Programâs source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any @@ -412,7 +425,7 @@ and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an âaggregateâ if the compilation and its resulting copyright are not - used to limit the access or legal rights of the compilation's users + used to limit the access or legal rights of the compilationâs users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
@@ -634,7 +647,7 @@ organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever - licenses to the work the party's predecessor in interest had or could + licenses to the work the partyâs predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. @@ -651,9 +664,9 @@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 - work thus licensed is called the contributor's âcontributor versionâ.
+ work thus licensed is called the contributorâs âcontributor versionâ. -A contributor's âessential patent claimsâ are all patent claims +
A contributorâs âessential patent claimsâ are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, @@ -664,7 +677,7 @@ this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free - patent license under the contributor's essential patent claims, to + patent license under the contributorâs essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
@@ -685,7 +698,7 @@ consistent with the requirements of this License, to extend the patent license to downstream recipients. âKnowingly relyingâ means you have actual knowledge that, but for the patent license, your conveying the - covered work in a country, or your recipient's use of the covered work + covered work in a country, or your recipientâs use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. @@ -716,7 +729,7 @@ any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not @@ -756,7 +769,7 @@ by the Free Software Foundation.
If the Program specifies that a proxy can decide which future - versions of the GNU General Public License can be used, that proxy's + versions of the GNU General Public License can be used, that proxyâs public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
@@ -812,26 +825,30 @@<one line to give the programâs name and a brief idea of what it does.> -Copyright (C) <year> <name of author> - -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 +Copyright (C) <year> <name of +author> + +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 <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
@@ -841,15 +858,15 @@ this program. If not, see<program> Copyright (C) <year> <name of author> -This program comes with ABSOLUTELY NO -WARRANTY; for details type `show w'. -This is free software, and you are -welcome to redistribute it under +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.
The hypothetical commands `show w' and `show c' should show the appropriate - parts of the General Public License. Of course, your program's commands + 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â.
You should also get your employer (if you work as a programmer) or school, @@ -875,7 +892,7 @@ for details. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure @@ -926,9 +943,9 @@ for details.
The precise terms and conditions for copying, distribution and modification follow.
-"This License" refers to version 3 of the GNU Affero General Public License.
@@ -968,7 +985,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. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source @@ -1010,7 +1027,7 @@ for details.
The Corresponding Source for a work in source code form is that same work.
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated @@ -1035,7 +1052,7 @@ for details. the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article @@ -1051,7 +1068,7 @@ for details. users, your or third parties' legal rights to forbid circumvention of technological measures.
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and @@ -1064,7 +1081,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.
-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 @@ -1105,7 +1122,7 @@ for details. in an aggregate does not cause this License to apply to the other parts of the aggregate.
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the @@ -1207,7 +1224,7 @@ for details. source code form), and must require no special password or key for unpacking, reading or copying.
-"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. @@ -1275,7 +1292,7 @@ for details. form of a separately written license, or stated as exceptions; the above requirements apply either way.
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or @@ -1303,7 +1320,7 @@ for details. reinstated, you do not qualify to receive new licenses for the same material under section 10.
-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 @@ -1314,7 +1331,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.
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and @@ -1339,7 +1356,7 @@ for details. any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-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 @@ -1408,7 +1425,7 @@ for details. any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not @@ -1420,7 +1437,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.
-Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users @@ -1441,7 +1458,7 @@ for details. combined will remain governed by version 3 of the GNU General Public 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 @@ -1467,7 +1484,7 @@ for details. author or copyright holder as a result of your choosing to follow a later version.
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT @@ -1478,7 +1495,7 @@ for details. IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-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 @@ -1490,7 +1507,7 @@ for details. EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, @@ -1501,7 +1518,7 @@ for details.
END OF TERMS AND CONDITIONS
-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 @@ -1512,29 +1529,34 @@ 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 -and a brief idea of what it does.> -Copyright (C) <year> <name of author> - -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 +<one line to give the program's +name and a brief idea of what it +does.> +Copyright (C) <year> <name of +author> + +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 <https://www.gnu.org/licenses/>.Also add information on how to contact you by electronic and paper mail.
@@ -1746,22 +1768,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.