X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fassets%2Fes%2Fabout_licenses.html;h=01188b454e73a815cb64e92a505f1ee4c4eddd6c;hp=b0d9e30c4fe1454d249716fc649281da41432f16;hb=ade72400eaa718cbd0857440eb4eefa41fed633d;hpb=1d656c562831f535aa33903d44198dd890393f4f diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html index b0d9e30c..01188b45 100644 --- a/app/src/main/assets/es/about_licenses.html +++ b/app/src/main/assets/es/about_licenses.html @@ -1,22 +1,22 @@ + along with Privacy Browser Android. If not, see . --> @@ -30,12 +30,12 @@

Derechos de autor

-

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

+

Navegador Privado tiene derechos de autor 2015-2022 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 gitweb.stoutner.com.

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

Listas de bloqueo

EasyList y EasyPrivacy @@ -54,45 +54,45 @@ 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.

-

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. + 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. +

+ 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. 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. + 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. + 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. + 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. + 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. + 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. + 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 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 @@ -108,6 +108,7 @@ 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.

@@ -119,6 +120,7 @@

delete.

delete_forever.

devices_other.

+

disabled_by_default.

dns.

donut_small.

edit.

@@ -137,14 +139,17 @@

language.

link_off.

list.

+

list_alt_rounded_24.

local_activity.

location_off.

lock.

map.

more.

-

new releases.

+

new_releases.

open_in_browser.

payment.

+

payments_rounded.

+

push_pin_filled.

question_answer.

refresh.

save.

@@ -810,28 +815,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.

@@ -1512,29 +1520,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.

@@ -1746,22 +1758,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.

+    
+