summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-18 10:40:18 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-18 10:40:18 +0000
commit9d9ee242d965ac757019fbae69eece330d3e458c (patch)
tree62f6b43d47d707595e66158273ebef22e7b74f2c
parent67afe2ac4709b4a15226b277d876ca56dee5dbbb (diff)
downloaddrakx-backup-do-not-use-9d9ee242d965ac757019fbae69eece330d3e458c.tar
drakx-backup-do-not-use-9d9ee242d965ac757019fbae69eece330d3e458c.tar.gz
drakx-backup-do-not-use-9d9ee242d965ac757019fbae69eece330d3e458c.tar.bz2
drakx-backup-do-not-use-9d9ee242d965ac757019fbae69eece330d3e458c.tar.xz
drakx-backup-do-not-use-9d9ee242d965ac757019fbae69eece330d3e458c.zip
(main_license_raw) split license titles from their paragraphs
(thus enabling to render them as bold later)
-rw-r--r--perl-install/messages.pm26
1 files changed, 13 insertions, 13 deletions
diff --git a/perl-install/messages.pm b/perl-install/messages.pm
index 1df8d1b2e..30758f166 100644
--- a/perl-install/messages.pm
+++ b/perl-install/messages.pm
@@ -15,18 +15,18 @@ sub main_license() {
sub main_license_raw() {
join("\n\n\n",
-N("Introduction
+N("Introduction"),
-The operating system and the different components available in the Mageia distribution
+N("The operating system and the different components available in the Mageia distribution
shall be called the \"Software Products\" hereafter. The Software Products include, but are not
restricted to, the set of programs, methods, rules and documentation related to the operating
system and the different components of the Mageia distribution, and any applications
distributed with these products provided by Mageia's licensors or suppliers."),
-N("1. License Agreement
+N("1. License Agreement"),
-Please read this document carefully. This document is a license agreement between you and
+N("Please read this document carefully. This document is a license agreement between you and
Mageia which applies to the Software Products.
By installing, duplicating or using any of the Software Products in any manner, you explicitly
accept and fully agree to conform to the terms and conditions of this License.
@@ -38,10 +38,10 @@ License. Upon termination of the License, you must immediately destroy all copi
Software Products."),
-#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
-N("2. Limited Warranty
+N("2. Limited Warranty"),
-The Software Products and attached documentation are provided \"as is\", with no warranty, to the
+#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
+N("The Software Products and attached documentation are provided \"as is\", with no warranty, to the
extent permitted by law.
Neither Mageia nor its licensors or suppliers will, in any circumstances and to the extent
permitted by law, be liable for any special, incidental, direct or indirect damages whatsoever
@@ -65,9 +65,9 @@ However, because some jurisdictions do not allow the exclusion or limitation or
consequential or incidental damages, the above limitation may not apply to you."),
-N("3. The GPL License and Related Licenses
+N("3. The GPL License and Related Licenses"),
-The Software Products consist of components created by different persons or entities.
+N("The Software Products consist of components created by different persons or entities.
Most of these licenses allow you to use, duplicate, adapt or redistribute the components which
they cover. Please read carefully the terms and conditions of the license agreement for each component
before using any component. Any question on a component license should be addressed to the component
@@ -76,18 +76,18 @@ The programs developed by Mageia are governed by the GPL License. Documentation
by Mageia is governed by \"%s\" License.", "CC-By-SA"),
-N("4. Intellectual Property Rights
+N("4. Intellectual Property Rights"),
-All rights to the components of the Software Products belong to their respective authors and are
+N("All rights to the components of the Software Products belong to their respective authors and are
protected by intellectual property and copyright laws applicable to software programs.
Mageia and its suppliers and licensors reserves their rights to modify or adapt the Software
Products, as a whole or in parts, by all means and for all purposes.
\"Mageia\" and associated logos are trademarks of %s", "Mageia.Org"),
-N("5. Governing Laws
+N("5. Governing Laws "),
-If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this
+N("If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this
portion is excluded from this contract. You remain bound by the other applicable sections of the
agreement.
The terms and conditions of this License are governed by the Laws of France.