From 70da2a558d6e35c38adb596479c36f7e451dc9a5 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Fri, 19 Jan 2024 14:19:59 -0700 Subject: [PATCH] Fix tabs being created without a corresponding page. https://redmine.stoutner.com/issues/1136 --- COPYING | 2 +- app/build.gradle | 6 +- app/src/main/assets/de/about_licenses.html | 60 +++++++++--------- app/src/main/assets/en/about_licenses.html | 60 +++++++++--------- app/src/main/assets/es/about_licenses.html | 60 +++++++++--------- app/src/main/assets/fr/about_changelog.html | 40 ++++++------ app/src/main/assets/fr/about_licenses.html | 60 +++++++++--------- app/src/main/assets/it/about_licenses.html | 60 +++++++++--------- .../main/assets/pt-rBR/about_licenses.html | 63 ++++++++++--------- app/src/main/assets/ru/about_licenses.html | 60 +++++++++--------- app/src/main/assets/tr/about_licenses.html | 60 +++++++++--------- .../main/assets/zh-rCN/about_licenses.html | 60 +++++++++--------- .../activities/MainWebViewActivity.kt | 28 +++++---- .../PopulateFilterListsCoroutine.kt | 4 +- .../helpers/DomainsDatabaseHelper.kt | 39 ++---------- app/src/main/res/layout/url_app_bar.xml | 4 +- app/src/main/res/values-fr/strings.xml | 17 ++++- build.gradle | 4 +- .../metadata/android/fr-FR/changelogs/72.txt | 12 ++++ 19 files changed, 358 insertions(+), 341 deletions(-) create mode 100644 fastlane/metadata/android/fr-FR/changelogs/72.txt diff --git a/COPYING b/COPYING index f302d42b..b7227ff6 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Privacy Browser Android copyright 2015-2023 Soren Stoutner . +Privacy Browser Android copyright 2015-2024 Soren Stoutner . This file is part of Privacy Browser Android . diff --git a/app/build.gradle b/app/build.gradle index 8a16a90c..6389bf19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 Soren Stoutner . + * Copyright 2016-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -59,7 +59,7 @@ android { } buildFeatures { - // Generate BuildConfig so it can be accessed from withing the app. + // Generate BuildConfig so it can be accessed from within the app. buildConfig = true } @@ -91,7 +91,7 @@ dependencies { implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.drawerlayout:drawerlayout:1.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.viewpager:viewpager:1.0.0' diff --git a/app/src/main/assets/de/about_licenses.html b/app/src/main/assets/de/about_licenses.html index 3af3b7d8..124a4294 100644 --- a/app/src/main/assets/de/about_licenses.html +++ b/app/src/main/assets/de/about_licenses.html @@ -1,5 +1,5 @@ - + @@ -27,11 +27,13 @@ + + Licenses

Copyright:

-

Privacy Browser ist copyright 2015-2023 von Soren Stoutner.

+

Privacy Browser ist copyright 2015-2024 von Soren Stoutner.

Lizenz:

Privacy Browser ist veröffentlicht unter der GPLv3+ Lizenz. The full text of the license is below. @@ -63,9 +65,9 @@ Die geänderte Datei wird unter der GPLv3+-Lizenz veröffentlicht.

Icons:

-

- - +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt are derived from security and language, which are part of the Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright 2016-2017,2021-2023 Soren Stoutner. @@ -91,10 +93,10 @@ das Teil des Android Material icon set unter der Apache Lizenz 2.0 veröffentlicht wird. Änderungen Copyright 2017, 2022 Soren Stoutner. Die resultierende Grafik wird unter der GPLv3+ Lizenz veröffentlicht.

-

ist abgeleitet von sort, das Teil des Android Material icon set +

Sort Selected ist abgeleitet von sort, das Teil des Android Material icon set unter der Apache Lizenz 2.0 veröffentlicht wird. Änderungen Copyright 2019, 2022 Soren Stoutner. Die resultierende Grafik wird unter der GPLv3+ Lizenz veröffentlicht.

-

ist abgeleitet von push_pin_selected, +

Push Pin ist abgeleitet von push_pin_selected, das Teil des Android Material icon set unter der Apache Lizenz 2.0 veröffentlicht wird. Änderungen Copyright 2019-2020, 2022 Soren Stoutner. Die resultierende Grafik wird unter der GPLv3+ Lizenz veröffentlicht.

@@ -889,7 +891,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 @@ -940,9 +942,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.

@@ -982,7 +984,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 @@ -1024,7 +1026,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 @@ -1049,7 +1051,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 @@ -1065,7 +1067,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 @@ -1078,7 +1080,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 @@ -1119,7 +1121,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 @@ -1221,7 +1223,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. @@ -1289,7 +1291,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 @@ -1317,7 +1319,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 @@ -1328,7 +1330,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 @@ -1353,7 +1355,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 @@ -1422,7 +1424,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 @@ -1434,7 +1436,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 @@ -1455,7 +1457,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 @@ -1481,7 +1483,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 @@ -1492,7 +1494,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 @@ -1504,7 +1506,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, @@ -1515,7 +1517,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 diff --git a/app/src/main/assets/en/about_licenses.html b/app/src/main/assets/en/about_licenses.html index 437ae6b4..03a1b58b 100644 --- a/app/src/main/assets/en/about_licenses.html +++ b/app/src/main/assets/en/about_licenses.html @@ -1,5 +1,5 @@ - + @@ -24,11 +24,13 @@ + + Licenses

Copyright

-

Privacy Browser copyright 2015-2023 Soren Stoutner.

+

Privacy Browser copyright 2015-2024 Soren Stoutner.

License

Privacy Browser is released under the GPLv3+ license. The full text of the license is below. @@ -60,9 +62,9 @@ The modified file is released under the GPLv3+ license.

Icons

-

- - +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt are derived from security and language, which are part of the Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright 2016-2017,2021-2023 Soren Stoutner. @@ -88,10 +90,10 @@ which is part of the Android Material icon set and is released under the Apache License 2.0. Modifications copyright 2017, 2022 Soren Stoutner. The resulting image is released under the GPLv3+ license.

-

is derived from sort, which is part of the Android Material icon set +

Sort Selected is derived from sort, which is part of the Android Material icon set and is released under the Apache License 2.0. Modifications copyright 2019, 2022 Soren Stoutner. The resulting image is released under the GPLv3+ license.

-

is derived from push_pin_selected, +

Push Pin is derived from push_pin_selected, which is part of the Android Material icon set and is released under the Apache License 2.0. Modifications copyright 2019-2020, 2022 Soren Stoutner. The resulting image is released under the GPLv3+ license.

@@ -883,7 +885,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 @@ -934,9 +936,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.

@@ -976,7 +978,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 @@ -1018,7 +1020,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 @@ -1043,7 +1045,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 @@ -1059,7 +1061,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 @@ -1072,7 +1074,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 @@ -1113,7 +1115,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 @@ -1215,7 +1217,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. @@ -1283,7 +1285,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 @@ -1311,7 +1313,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 @@ -1322,7 +1324,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 @@ -1347,7 +1349,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 @@ -1416,7 +1418,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 @@ -1428,7 +1430,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 @@ -1449,7 +1451,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 @@ -1475,7 +1477,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 @@ -1486,7 +1488,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 @@ -1498,7 +1500,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, @@ -1509,7 +1511,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 diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html index a88798fe..798f3309 100644 --- a/app/src/main/assets/es/about_licenses.html +++ b/app/src/main/assets/es/about_licenses.html @@ -1,5 +1,5 @@ - + @@ -26,11 +26,13 @@ + + Licenses

Derechos de autor

-

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

+

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

Licencia

Navegador Privado está liberado bajo la licencia GPLv3+. @@ -62,9 +64,9 @@ El archivo modificado se libera bajo la licencia GPLv3+.

Iconos

-

- - +

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. @@ -89,10 +91,10 @@ 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 +

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

-

deriva de push_pin_selected, +

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

@@ -887,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 @@ -938,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.

@@ -980,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 @@ -1022,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 @@ -1047,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 @@ -1063,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 @@ -1076,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 @@ -1117,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 @@ -1219,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. @@ -1287,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 @@ -1315,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 @@ -1326,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 @@ -1351,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 @@ -1420,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 @@ -1432,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 @@ -1453,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 @@ -1479,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 @@ -1490,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 @@ -1502,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, @@ -1513,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 diff --git a/app/src/main/assets/fr/about_changelog.html b/app/src/main/assets/fr/about_changelog.html index 366679d7..01981e23 100644 --- a/app/src/main/assets/fr/about_changelog.html +++ b/app/src/main/assets/fr/about_changelog.html @@ -1,7 +1,7 @@ - + @@ -26,28 +26,30 @@ + + Changelog

3.16 (version du code 72)

20 Novembre 2023 - API minimale : 24, API optimale : 34

diff --git a/app/src/main/assets/fr/about_licenses.html b/app/src/main/assets/fr/about_licenses.html index fc2d04cf..d734afb4 100644 --- a/app/src/main/assets/fr/about_licenses.html +++ b/app/src/main/assets/fr/about_licenses.html @@ -1,5 +1,5 @@ - + @@ -26,11 +26,13 @@ + + Licenses

Copyright

-

Privacy Browser copyright 2015-2023 Soren Stoutner.

+

Privacy Browser copyright 2015-2024 Soren Stoutner.

Licence

rivacy Browser est publié sous la licence GPLv3+. Le texte complet de la licence est ci-dessous. @@ -62,9 +64,9 @@ Le fichier modifié est publié sous la licence GPLv3+.

Icônes

-

- - +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt sont dérivés de security et de language, qui font partie de l'ensemble d'icônes Matériel Android et sont publiés sous la Licence Apache 2.0. Le texte complet de la licence est ci-dessous. Modifications copyright 2016-2017,2021-2023 Soren Stoutner. @@ -90,11 +92,11 @@ qui fait partie de l'ensemble d'icônes Matériel Android et sont publiés sous Licence Apache 2.0. Modifications copyright 2017, 2022 Soren Stoutner. L'image résultante est publiée sous la licence GPLv3+.

-

est dérivée de l'élément sort, +

Sort Selected est dérivée de l'élément sort, qui fait partie de l'ensemble d'icônes Matériel Android et sont publiés sous Licence Apache 2.0. Modifications copyright 2019, 2022 Soren Stoutner. L'image résultante est publiée sous la licence GPLv3+.

-

est dérivée de l'élément push_pin_selected, +

Push Pin est dérivée de l'élément push_pin_selected, qui fait partie de l'ensemble d'icônes Matériel Android et sont publiés sous Licence Apache 2.0. Modifications copyright 2019-2020, 2022 Soren Stoutner. L'image résultante est publiée sous la licence GPLv3+.

@@ -889,7 +891,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 @@ -940,9 +942,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.

@@ -982,7 +984,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 @@ -1024,7 +1026,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 @@ -1049,7 +1051,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 @@ -1065,7 +1067,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 @@ -1078,7 +1080,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 @@ -1119,7 +1121,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 @@ -1221,7 +1223,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. @@ -1289,7 +1291,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 @@ -1317,7 +1319,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 @@ -1328,7 +1330,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 @@ -1353,7 +1355,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 @@ -1422,7 +1424,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 @@ -1434,7 +1436,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 @@ -1455,7 +1457,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 @@ -1481,7 +1483,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 @@ -1492,7 +1494,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 @@ -1504,7 +1506,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, @@ -1515,7 +1517,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 diff --git a/app/src/main/assets/it/about_licenses.html b/app/src/main/assets/it/about_licenses.html index 466a4f66..1e8f396d 100644 --- a/app/src/main/assets/it/about_licenses.html +++ b/app/src/main/assets/it/about_licenses.html @@ -1,5 +1,5 @@ - + @@ -26,11 +26,13 @@ + + Licenses

Copyright

-

Privacy Browser copyright 2015-2023: Soren Stoutner.

+

Privacy Browser copyright 2015-2024: Soren Stoutner.

Licenza

Privacy Browser è rilasciato con Licenza GPLv3+ . @@ -67,9 +69,9 @@ Il file modificato è rilasciato sotto la Licenza GPLv3+.

Icone

-

- - +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt sono state derivate da security e language, che fanno parte dell'Android Material icon set e sono state rilasciate sotto Licenza Apache 2.0. Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche 2016-2017,2021-2023 Soren Stoutner. @@ -94,11 +96,11 @@ che fa parte dell'Android Material icon set ed è stata rilasciata sotto Licenza Apache 2.0. Copyright delle modifiche 2017, 2020 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.

-

è stata derivata da sort, +

Sort Selected è stata derivata da sort, che fa parte dell'Android Material icon set ed è stata rilasciata sotto Licenza Apache 2.0. Copyright delle modifiche 2019, 2020 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.

-

è stata derivata da push_pin_selected, +

Push Pin è stata derivata da push_pin_selected, che fa parte dell'Android Material icon set ed è stata rilasciata sotto Licenza Apache 2.0. Copyright delle modifiche 2019-2020, 2020 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.

@@ -983,7 +985,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 @@ -1034,9 +1036,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.

@@ -1076,7 +1078,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 @@ -1118,7 +1120,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 @@ -1143,7 +1145,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 @@ -1159,7 +1161,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 @@ -1172,7 +1174,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 @@ -1213,7 +1215,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 @@ -1315,7 +1317,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. @@ -1383,7 +1385,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 @@ -1411,7 +1413,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 @@ -1422,7 +1424,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 @@ -1447,7 +1449,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 @@ -1516,7 +1518,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 @@ -1528,7 +1530,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 @@ -1549,7 +1551,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 @@ -1575,7 +1577,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 @@ -1586,7 +1588,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 @@ -1598,7 +1600,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, @@ -1609,7 +1611,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 diff --git a/app/src/main/assets/pt-rBR/about_licenses.html b/app/src/main/assets/pt-rBR/about_licenses.html index bbc93151..871a9a8f 100644 --- a/app/src/main/assets/pt-rBR/about_licenses.html +++ b/app/src/main/assets/pt-rBR/about_licenses.html @@ -1,5 +1,5 @@ - + @@ -26,11 +26,13 @@ + + Licenses

Copyright

-

Privacy Browser copyright 2015-2023 Soren Stoutner.

+

Privacy Browser copyright 2015-2024 Soren Stoutner.

License

Privacy Browser is released under the GPLv3+ license. The full text of the license is below. @@ -62,9 +64,9 @@ O arquivo modificado é liberado sob a licença GPLv3+.

Icons

-

- - +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt are derived from security and language, which are part of the Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright 2016-2017,2021-2023 Soren Stoutner. @@ -90,10 +92,11 @@ que faz parte do conjunto de ícones do Android Material é lançado sob a Licença Apache 2.0. Direitos autorais das modificações 2017, 2022 Soren Stoutner. A imagem resultante é liberada sob a licença GPLv3+.

-

é deridado de sort, que faz parte do conjunto de ícones do Android Material - é lançado sob a Licença Apache 2.0. Direitos autorais das modificações 2019, 2022 Soren Stoutner. +

Sort Selected é deridado de sort, que faz parte do + conjunto de ícones do Android Material é lançado sob a Licença Apache 2.0. + Direitos autorais das modificações 2019, 2022 Soren Stoutner. A imagem resultante é liberada sob a licença GPLv3+.

-

é deridado de push_pin_selected, +

Push Pin é deridado de push_pin_selected, que faz parte do conjunto de ícones do Android Material é lançado sob a Licença Apache 2.0. Direitos autorais das modificações 2019-2020, 2022 Soren Stoutner. A imagem resultante é liberada sob a licença GPLv3+.

@@ -885,7 +888,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 @@ -936,9 +939,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.

@@ -978,7 +981,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 @@ -1020,7 +1023,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 @@ -1045,7 +1048,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 @@ -1061,7 +1064,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 @@ -1074,7 +1077,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 @@ -1115,7 +1118,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 @@ -1217,7 +1220,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. @@ -1285,7 +1288,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 @@ -1313,7 +1316,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 @@ -1324,7 +1327,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 @@ -1349,7 +1352,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 @@ -1418,7 +1421,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 @@ -1430,7 +1433,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 @@ -1451,7 +1454,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 @@ -1477,7 +1480,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 @@ -1488,7 +1491,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 @@ -1500,7 +1503,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, @@ -1511,7 +1514,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 diff --git a/app/src/main/assets/ru/about_licenses.html b/app/src/main/assets/ru/about_licenses.html index b2d58794..d27bb47c 100644 --- a/app/src/main/assets/ru/about_licenses.html +++ b/app/src/main/assets/ru/about_licenses.html @@ -1,5 +1,5 @@ - + @@ -24,11 +24,13 @@ + + Licenses

Авторские права

-

Авторские права Privacy Browser 2015-2023 Soren Stoutner.

+

Авторские права Privacy Browser 2015-2024 Soren Stoutner.

Лицензия

Privacy Browser выпущен под лицензией GPLv3+. Полный текст лицензии приведен ниже. @@ -60,9 +62,9 @@ Модифицированный файл выпущен под лицензией GPLv3+.

Иконки

-

- - +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt являются производными от security и language, которые являются частью Android Material icon set и выпущены под Apache License 2.0. Полный текст лицензии приведен ниже. Модификации авторских прав 2016-2017,2021-2023 Soren Stoutner. @@ -87,11 +89,11 @@ которые являются частью Android Material icon set и выпущены под Apache License 2.0. Модификации авторских прав 2017, 2022 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

-

являются производными от sort, +

Sort Selected являются производными от sort, которые являются частью Android Material icon set и выпущены под Apache License 2.0. Модификации авторских прав 2019, 2022 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

-

являются производными от push_pin_selected, +

Push Pin являются производными от push_pin_selected, которые являются частью Android Material icon set и выпущены под Apache License 2.0. Модификации авторских прав 2019-2020, 2022 Soren Stoutner. Полученные изображения выпущены под лицензией GPLv3+.

@@ -883,7 +885,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 @@ -934,9 +936,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.

@@ -976,7 +978,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 @@ -1018,7 +1020,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 @@ -1043,7 +1045,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 @@ -1059,7 +1061,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 @@ -1072,7 +1074,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 @@ -1113,7 +1115,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 @@ -1215,7 +1217,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. @@ -1283,7 +1285,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 @@ -1311,7 +1313,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 @@ -1322,7 +1324,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 @@ -1347,7 +1349,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 @@ -1416,7 +1418,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 @@ -1428,7 +1430,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 @@ -1449,7 +1451,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 @@ -1475,7 +1477,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 @@ -1486,7 +1488,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 @@ -1498,7 +1500,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, @@ -1509,7 +1511,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 diff --git a/app/src/main/assets/tr/about_licenses.html b/app/src/main/assets/tr/about_licenses.html index 509e3567..4d9688e2 100644 --- a/app/src/main/assets/tr/about_licenses.html +++ b/app/src/main/assets/tr/about_licenses.html @@ -1,5 +1,5 @@ - + @@ -24,11 +24,13 @@ + + Licenses

Telif Hakkı

-

Privacy Browser telif hakkı 2015-2023 Soren Stoutner.

+

Privacy Browser telif hakkı 2015-2024 Soren Stoutner.

Lisans

Privacy Browser GPLv3+ lisansı altında yayınlandı. Lisansın tam metni aşağıdadır. @@ -61,9 +63,9 @@ Değiştirilen dosya GPLv3+ lisansı altında yayınlandı.

Simgeler

-

- - +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt Apache License 2.0 altında yayınlanan ve Android Material simge setinin bir parçası olan security ve language'den elde edilmiştir. Lisansın tüm metni aşağıdadır. Değişikliklerin telif hakkı 2016-2017,2021-2023 Soren Stoutner. @@ -88,11 +90,11 @@ Android Material simge setinin bir parçası olan compare'den elde edilmiştir. Değişikliklerin telif hakkı 2017, 2022 Soren Stoutner. Ortaya çıkan görüntü GPLv3+ lisansı altında yayınlandı.

-

Apache License 2.0 altında yayınlanan ve +

Sort Selected Apache License 2.0 altında yayınlanan ve Android Material simge setinin bir parçası olan sort'dan elde edilmiştir. Değişikliklerin telif hakkı 2019, 2022 Soren Stoutner. Ortaya çıkan görüntü GPLv3+ lisansı altında yayınlandı.

-

Apache License 2.0 altında yayınlanan ve +

Push Pin Apache License 2.0 altında yayınlanan ve Android Material simge setinin bir parçası olan push_pin_selected'dan elde edilmiştir. Değişikliklerin telif hakkı 2019-2020, 2022 Soren Stoutner. Ortaya çıkan görüntü GPLv3+ lisansı altında yayınlandı.

@@ -884,7 +886,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 @@ -935,9 +937,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.

@@ -977,7 +979,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 @@ -1019,7 +1021,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 @@ -1044,7 +1046,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 @@ -1060,7 +1062,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 @@ -1073,7 +1075,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 @@ -1114,7 +1116,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 @@ -1216,7 +1218,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. @@ -1284,7 +1286,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 @@ -1312,7 +1314,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 @@ -1323,7 +1325,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 @@ -1348,7 +1350,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 @@ -1417,7 +1419,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 @@ -1429,7 +1431,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 @@ -1450,7 +1452,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 @@ -1476,7 +1478,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 @@ -1487,7 +1489,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 @@ -1499,7 +1501,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, @@ -1510,7 +1512,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 diff --git a/app/src/main/assets/zh-rCN/about_licenses.html b/app/src/main/assets/zh-rCN/about_licenses.html index 99ca707f..5703c65a 100644 --- a/app/src/main/assets/zh-rCN/about_licenses.html +++ b/app/src/main/assets/zh-rCN/about_licenses.html @@ -1,5 +1,5 @@ - + @@ -26,11 +26,13 @@ + + Licenses

Copyright

-

Privacy Browser copyright 2015-2023 Soren Stoutner.

+

Privacy Browser copyright 2015-2024 Soren Stoutner.

证书

Privacy Browser基于GPLv3+ license发布。 @@ -61,9 +63,9 @@ 改良版本在GPLv3+ license下发布。

图标

-

- - +

Privacy Browser Warning + JavaScript Enabled + Privacy Browser Alt 出自 security和language, Android Material icon set中的一部分,在 Apache License 2.0下发布。 完整的证书内容在下面。Modifications copyright 2016-2017,2021-2023 Soren Stoutner. @@ -89,10 +91,10 @@ 是Android Material icon set的一部分,在Apache License 2.0证书下发布。 修改版本版权所有 2017, 2022 Soren Stoutner. 生成的图标在 GPLv3+ license下发布。

-

出自sort,是Android Material icon set的一部分。 +

Sort Selected出自sort,是Android Material icon set的一部分。 在Apache License 2.0下发布。 修改版本版权所有 2019, 2022 Soren Stoutner. 生成的图标在GPLv3+ license下发布。

-

出自push_pin_selected, +

Push Pin出自push_pin_selected, 是Android Material icon set的一部分。在Apache License 2.0下发布。 修改版本版权所有 2019-2020, 2022 Soren Stoutner. 生成的图标在GPLv3+ license下发布。

@@ -884,7 +886,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 @@ -935,9 +937,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.

@@ -977,7 +979,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 @@ -1019,7 +1021,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 @@ -1044,7 +1046,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 @@ -1060,7 +1062,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 @@ -1073,7 +1075,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 @@ -1114,7 +1116,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 @@ -1216,7 +1218,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. @@ -1284,7 +1286,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 @@ -1312,7 +1314,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 @@ -1323,7 +1325,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 @@ -1348,7 +1350,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 @@ -1417,7 +1419,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 @@ -1429,7 +1431,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 @@ -1450,7 +1452,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 @@ -1476,7 +1478,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 @@ -1487,7 +1489,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 @@ -1499,7 +1501,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, @@ -1510,7 +1512,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 diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt index 85b3ae76..ed6ecb36 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebViewActivity.kt @@ -1,5 +1,5 @@ /* - * Copyright 2015-2023 Soren Stoutner . + * Copyright 2015-2024 Soren Stoutner . * * Download cookie code contributed 2017 Hendrik Knackstedt. Copyright assigned to Soren Stoutner . * @@ -646,7 +646,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Initialize the WebView state adapter. webViewStateAdapter = WebViewStateAdapter(this, bottomAppBar) - // Set the pager adapter on the web view pager. + // Set the WebView pager adapter. webViewViewPager2.adapter = webViewStateAdapter // Store up to 100 tabs in memory. @@ -2221,7 +2221,7 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Set the font size integer. val fontSizeInt = if (textZoomInt == defaultFontSizeString.toInt()) // The current system default is used, which is encoded as a zoom of `0`. - 0 + SYSTEM_DEFAULT else // A custom font size is used. textZoomInt @@ -3007,17 +3007,21 @@ class MainWebViewActivity : AppCompatActivity(), CreateBookmarkDialog.CreateBook // Clear the focus from the URL edit text, so that it will be populated with the information from the new tab. urlEditText.clearFocus() - // Get the new tab position. - val newTabPosition = if (adjacent) // The new tab position is immediately to the right of the current tab position. - tabLayout.selectedTabPosition + 1 - else // The new tab position is at the end. The tab positions are 0 indexed, so the new page number will match the current count. - tabLayout.tabCount + // Add the new tab after the tab layout has quiesced. + // Otherwise, there can be problems when restoring a large number of tabs and processing a new intent at the same time. + tabLayout.post { + // Get the new tab position. + val newTabPosition = if (adjacent) // The new tab position is immediately to the right of the current tab position. + tabLayout.selectedTabPosition + 1 + else // The new tab position is at the end. The tab positions are 0 indexed, so the new page number will match the current count. + tabLayout.tabCount - // Add the new WebView page. - webViewStateAdapter!!.addPage(newTabPosition, urlString) + // Add the new WebView page. + webViewStateAdapter!!.addPage(newTabPosition, urlString) - // Add the new tab. - addNewTab(newTabPosition, moveToTab) + // Add the new tab. + addNewTab(newTabPosition, moveToTab) + } } private fun addNewTab(newTabPosition: Int, moveToTab: Boolean) { diff --git a/app/src/main/java/com/stoutner/privacybrowser/coroutines/PopulateFilterListsCoroutine.kt b/app/src/main/java/com/stoutner/privacybrowser/coroutines/PopulateFilterListsCoroutine.kt index 1ee2dbf0..94711533 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/coroutines/PopulateFilterListsCoroutine.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/coroutines/PopulateFilterListsCoroutine.kt @@ -1,5 +1,5 @@ /* - * Copyright 2019,2021-2023 Soren Stoutner . + * Copyright 2019,2021-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -139,7 +139,7 @@ class PopulateFilterListsCoroutine(context: Context) { // Enable the sliding drawers. drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED) - // Add the first tab. + // Continue loading the app. populateFilterListsListener.finishedPopulatingFilterLists(combinedFilterLists) } } diff --git a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt index a10bdca5..dea4c75f 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/helpers/DomainsDatabaseHelper.kt @@ -1,5 +1,5 @@ /* - * Copyright 2017-2023 Soren Stoutner . + * Copyright 2017-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -409,40 +409,9 @@ class DomainsDatabaseHelper(private val appContext: Context) : SQLiteOpenHelper( } fun addDomain(domainName: String): Int { - // Instantiate a content values. - val domainContentValues = ContentValues() - - // Create entries for the database fields. The ID is created automatically. The pinned SSL certificate information is not created unless added by the user. - domainContentValues.put(DOMAIN_NAME, domainName) - domainContentValues.put(ENABLE_JAVASCRIPT, SYSTEM_DEFAULT) - domainContentValues.put(COOKIES, SYSTEM_DEFAULT) - domainContentValues.put(ENABLE_DOM_STORAGE, SYSTEM_DEFAULT) - domainContentValues.put(ENABLE_FORM_DATA, SYSTEM_DEFAULT) // Form data can be removed once the minimum API >= 26. - domainContentValues.put(USER_AGENT, appContext.getString(R.string.system_default_user_agent)) - domainContentValues.put(ENABLE_EASYLIST, SYSTEM_DEFAULT) - domainContentValues.put(ENABLE_EASYPRIVACY, SYSTEM_DEFAULT) - domainContentValues.put(ENABLE_FANBOYS_ANNOYANCE_LIST, SYSTEM_DEFAULT) - domainContentValues.put(ENABLE_FANBOYS_SOCIAL_BLOCKING_LIST, SYSTEM_DEFAULT) - domainContentValues.put(ULTRALIST, SYSTEM_DEFAULT) - domainContentValues.put(ENABLE_ULTRAPRIVACY, SYSTEM_DEFAULT) - domainContentValues.put(BLOCK_ALL_THIRD_PARTY_REQUESTS, SYSTEM_DEFAULT) - domainContentValues.put(FONT_SIZE, SYSTEM_DEFAULT) - domainContentValues.put(SWIPE_TO_REFRESH, SYSTEM_DEFAULT) - domainContentValues.put(WEBVIEW_THEME, SYSTEM_DEFAULT) - domainContentValues.put(WIDE_VIEWPORT, SYSTEM_DEFAULT) - domainContentValues.put(DISPLAY_IMAGES, SYSTEM_DEFAULT) - - // Get a writable database handle. - val domainsDatabase = this.writableDatabase - - // Insert a new row and store the resulting database ID. - val newDomainDatabaseId = domainsDatabase.insert(DOMAINS_TABLE, null, domainContentValues).toInt() - - // Close the database handle. - domainsDatabase.close() - - // Return the new domain database ID. - return newDomainDatabaseId + // Add the domain with default settings. + return addDomain(domainName, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, appContext.getString(R.string.system_default_user_agent), SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, + SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT, SYSTEM_DEFAULT) } fun addDomain(domainName: String, javaScriptInt: Int, cookiesInt: Int, domStorageInt: Int, formDataInt: Int, userAgentName: String, easyListInt: Int, easyPrivacyInt: Int, fanboysAnnoyanceListInt: Int, diff --git a/app/src/main/res/layout/url_app_bar.xml b/app/src/main/res/layout/url_app_bar.xml index 84886efb..da8fcea3 100644 --- a/app/src/main/res/layout/url_app_bar.xml +++ b/app/src/main/res/layout/url_app_bar.xml @@ -1,7 +1,7 @@ + + Favoris et paramètres + Format de base de données SQLite + format HTML Chiffrement Aucun @@ -446,9 +451,12 @@ Déchiffrer Privacy Browser Android %1$s Paramètres - Schema %2$d.pbs Privacy Browser Android %1$s Paramètres - Schema %2$d.pbs.aes + Privacy Browser Favoris.html Export effectué. L\'export a échoué : %1$s L\'import a échoué : %1$s + %1$d dossiers et favoris importés. + %1$d dossiers et favoris exportés. Copie @@ -627,6 +635,9 @@ Appuyez deux fois pour basculer en mode plein écran. Masquer la barre d\'application Masquer la barre d\'applications contenant l\'URL. + Afficher sous les éléments découpés + Affiche le site web sous les éléments découpés, tels que les encoches d\'appareil photo. + La modification de ce paramètre entraînera le redémarrage de Privacy Browser. Tout effacer Efface les cookies, le stockage DOM, les données de formulaire, le logcat et le cache de WebView. diff --git a/build.gradle b/build.gradle index 64eb513d..5bd3722b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2016-2023 Soren Stoutner . + * Copyright 2016-2024 Soren Stoutner . * * This file is part of Privacy Browser Android . * @@ -26,7 +26,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.2.0' + classpath 'com.android.tools.build:gradle:8.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0" // NOTE: Do not place your application dependencies here; they belong diff --git a/fastlane/metadata/android/fr-FR/changelogs/72.txt b/fastlane/metadata/android/fr-FR/changelogs/72.txt new file mode 100644 index 00000000..173ca311 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/72.txt @@ -0,0 +1,12 @@ +• Ajout de l'importation et de l'exportation des signets vers un fichier HTML. +• Ouverture de nouveaux onglets adjacents à l'onglet actuel. +• Choix par défaut des paramètres actuels à la volée lors de l'ajout de nouveaux paramètres de domaine. +• Ajout d'une entrée dans le menu de navigation pour faire défiler vers le bas/haut de la page. +• Défilement initial du panneau de navigation vers le bas lors de l'utilisation de la barre d'application inférieure. +• Affichage des informations SSL dans les en-têtes de vue. +• Ajout d'options pour copier, partager et enregistrer les en-têtes de vue. +• Ajout d'entrées de partage aux menus contextuels de la WebView. +• Correction de plusieurs bugs avec les onglets après la restauration des pages au redémarrage. +• Correction de plusieurs petits problèmes d'interface graphiques. +• Élévation de l'API cible vers 34 (Android 14). +• Traduction française mise à jour fournie par Kévin L. \ No newline at end of file -- 2.45.2