X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=inline;f=app%2Fsrc%2Fmain%2Fassets%2Ffr%2Fabout_licenses.html;fp=app%2Fsrc%2Fmain%2Fassets%2Ffr%2Fabout_licenses.html;h=740f16e89a350c1c506307e4d1be4e877c73922c;hb=569d223a5adb662d586a0d5cfa8fcc80bbf5a2cf;hp=fcfe1db972b18d9d17376d6b03c2146e88eddfc7;hpb=d3c309fe8c26c856d96229ed947eb7f2d9f750e8;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/assets/fr/about_licenses.html b/app/src/main/assets/fr/about_licenses.html index fcfe1db9..740f16e8 100644 --- a/app/src/main/assets/fr/about_licenses.html +++ b/app/src/main/assets/fr/about_licenses.html @@ -55,7 +55,7 @@ publiés sous la Licence Apache 2.0.
com.stoutner.privacybrowser.views.CheckedLinearLayout
est une version modifiée d'une classe contenue dans le code source de la
+
com.stoutner.privacybrowser.views. CheckedLinearLayout
est une version modifiée d'une classe contenue dans le code source de la
Caméra Android.
Le fichier d'origine a été publié sous la Licence Apache 2.0.
Modifications copyright © 2019 Soren Stoutner.
@@ -811,28 +811,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.
@@ -840,7 +843,7 @@ this program. If not, seeIf the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
-<program> Copyright (C) <year> +<program> Copyright (C) <year> <name of author> This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. @@ -1513,29 +1516,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.
@@ -1747,24 +1754,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.+OF ANY KIND, either express or +implied. See the License for the +specific language governing +permissions and limitations under +the License.