1
0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00

Linux: Correct formating of license displayed in the installer

This commit is contained in:
Mounir IDRASSI
2015-08-06 05:46:24 +02:00
parent 174f7f498a
commit ff0ab2da93

View File

@@ -144,9 +144,9 @@ other names confusingly similar to the name VeraCrypt (e.g.,
Vera-Crypt, Vera Crypt, VerKrypt, etc.) Vera-Crypt, Vera Crypt, VerKrypt, etc.)
____________________________________________________________ ____________________________________________________________
Apache License Apache License
Version 2.0, January 2004 Version 2.0, January 2004
https://www.apache.org/licenses/ https://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
@@ -181,13 +181,13 @@ not limited to compiled object code, generated documentation,
and conversions to other media types. and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or "Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a Object form, made available under the License, as indicated by
copyright notice that is included in or attached to the work a copyright notice that is included in or attached to the work
(an example is provided in the Appendix below). (an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or "Derivative Works" shall mean any work, whether in Source or
Object form, that is based on (or derived from) the Work and for Object form, that is based on (or derived from) the Work and
which the editorial revisions, annotations, elaborations, or for which the editorial revisions, annotations, elaborations, or
other modifications represent, as a whole, an original work of other modifications represent, as a whole, an original work of
authorship. For the purposes of this License, Derivative Works authorship. For the purposes of this License, Derivative Works
shall not include works that remain separable from, or merely shall not include works that remain separable from, or merely
@@ -219,8 +219,8 @@ conditions of this License, each Contributor hereby grants to
You a perpetual, worldwide, non-exclusive, no-charge, You a perpetual, worldwide, non-exclusive, no-charge,
royalty-free, irrevocable copyright license to reproduce, royalty-free, irrevocable copyright license to reproduce,
prepare Derivative Works of, publicly display, publicly perform, prepare Derivative Works of, publicly display, publicly perform,
sublicense, and distribute the Work and such Derivative Works in sublicense, and distribute the Work and such Derivative Works
Source or Object form. in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions 3. Grant of Patent License. Subject to the terms and conditions
of this License, each Contributor hereby grants to You a of this License, each Contributor hereby grants to You a
@@ -255,21 +255,21 @@ that You meet the following conditions:
the Derivative Works; and the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its (d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute distribution, then any Derivative Works that You distribute
must include a readable copy of the attribution notices must include a readable copy of the attribution notices
contained within such NOTICE file, excluding those notices contained within such NOTICE file, excluding those notices
that do not pertain to any part of the Derivative Works, in that do not pertain to any part of the Derivative Works, in
at least one of the following places: within a NOTICE text at least one of the following places: within a NOTICE text
file distributed as part of the Derivative Works; within the file distributed as part of the Derivative Works; within the
Source form or documentation, if provided along with the Source form or documentation, if provided along with the
Derivative Works; or, within a display generated by the Derivative Works; or, within a display generated by the
Derivative Works, if and wherever such third-party notices Derivative Works, if and wherever such third-party notices
normally appear. The contents of the NOTICE file are for normally appear. The contents of the NOTICE file are for
informational purposes only and do not modify the License. informational purposes only and do not modify the License.
You may add Your own attribution notices within Derivative You may add Your own attribution notices within Derivative
Works that You distribute, alongside or as an addendum to Works that You distribute, alongside or as an addendum to
the NOTICE text from the Work, provided that such additional the NOTICE text from the Work, provided that such additional
attribution notices cannot be construed as modifying attribution notices cannot be construed as modifying
the License. the License.
You may add Your own copyright statement to Your modifications You may add Your own copyright statement to Your modifications
and may provide additional or different license terms and may provide additional or different license terms
@@ -323,8 +323,8 @@ choose to offer, and charge a fee for, acceptance of support,
warranty, indemnity, or other liability obligations and/or warranty, indemnity, or other liability obligations and/or
rights consistent with this License. However, in accepting such rights consistent with this License. However, in accepting such
obligations, You may act only on Your own behalf and on Your obligations, You may act only on Your own behalf and on Your
sole responsibility, not on behalf of any other Contributor, and sole responsibility, not on behalf of any other Contributor,
only if You agree to indemnify, defend, and hold each and only if You agree to indemnify, defend, and hold each
Contributor harmless for any liability incurred by, or claims Contributor harmless for any liability incurred by, or claims
asserted against, such Contributor by reason of your accepting asserted against, such Contributor by reason of your accepting
any such warranty or additional liability. any such warranty or additional liability.