Modified: drakx/trunk/perl-install/any.pm
===================================================================
--- drakx/trunk/perl-install/any.pm 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/any.pm 2011-02-11 08:59:42 UTC (rev 509)
@@ -1,4 +1,4 @@
-package any; # $Id: any.pm 270668 2010-08-19 16:10:50Z nanardon $
+package any; # $Id$
use diagnostics;
use strict;
@@ -638,7 +638,7 @@
format => sub {
my ($e) = @_;
ref($e) ?
- ($b->{default} eq $e->{label} ? " \xA0* " : " \xA0 ") . "$e->{label} ($e->{kernel_or_dev})" :
+ ($b->{default} eq $e->{label} ? " * " : " ") . "$e->{label} ($e->{kernel_or_dev})" :
translate($e);
}, list => $b->{entries},
} ], Add => $Add, Modify => $Modify, Remove => $Remove, Up => $Up, Down => $Down)) {
@@ -1054,22 +1054,17 @@
}
sub acceptLicense {
- my ($in, $google) = @_;
+ my ($in) = @_;
require messages;
my $release_notes = get_release_notes($in);
my $r = $::testing ? 'Accept' : 'Refuse';
- my $license = join("\n\n\n",
- messages::main_license($google, $google),
- messages::warning_about_patents(),
- if_($google, messages::google_provisions()));
-
$in->ask_from_({ title => N("License agreement"),
focus_first => 1,
cancel => N("Quit"),
- messages => formatAlaTeX($license),
+ messages => formatAlaTeX(messages::main_license() . "\n\n\n" . messages::warning_about_patents()),
interactive_help_id => 'acceptLicense',
callbacks => { ok_disabled => sub { $r eq 'Refuse' } },
},
@@ -1130,7 +1125,7 @@
my $non_utf8 = 0;
add2hash($common, { cancel => '',
focus_first => 1,
- advanced_messages => formatAlaTeX(N("Mageia Linux can support multiple languages. Select
+ advanced_messages => formatAlaTeX(N("Mandriva Linux can support multiple languages. Select
the languages you would like to install. They will be available
when your installation is complete and you restart your system.")),
advanced_label => N("Multi languages"),
Modified: drakx/trunk/perl-install/messages.pm
===================================================================
--- drakx/trunk/perl-install/messages.pm 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/messages.pm 2011-02-11 08:59:42 UTC (rev 509)
@@ -7,9 +7,6 @@
sub main_license {
- #TODO: Change the API to not use $google, which is unused now
- my ($us, $google) = @_;
-
#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
N("Introduction
@@ -89,23 +86,7 @@
The terms and conditions of this License are governed by the Laws of France.
All disputes on the terms of this license will preferably be settled out of court. As a last
resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.
-For any question on this document, please contact Mageia",
-$us ? "\n\n" . N("You agree not to (i) sell, export, re-export, transfer, divert, disclose technical data, or
-dispose of, any Software to any person, entity, or destination prohibited by US export laws
-or regulations including, without limitation, Cuba, Iran, North Korea, Sudan and Syria; or
-(ii) use any Software for any use prohibited by the laws or regulations of the United States.
-
-U.S. GOVERNMENT RESTRICTED RIGHTS.
-
-The Software Products and any accompanying documentation are and shall be deemed to be
-\"commercial computer software\" and \"commercial computer software documentation,\" respectively,
-as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, modification, reproduction,
-release, performance, display or disclosure of the Software and any accompanying documentation
-by the United States Government shall be governed solely by the terms of this Agreement and any
-other applicable licence agreements and shall be prohibited except to the extent expressly permitted
-by the terms of this Agreement.") . "\n" : '',
-N("Most of these components are governed under the terms and conditions of the GNU
-General Public Licence, hereafter called \"GPL\", or of similar licenses."));
+For any question on this document, please contact Mageia.
}
sub warning_about_patents() {
Modified: drakx/trunk/perl-install/share/po/af.po
===================================================================
--- drakx/trunk/perl-install/share/po/af.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/af.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4815,8 +4815,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4831,8 +4831,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4877,8 +4877,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
@@ -6735,8 +6735,7 @@
" --help - vertoon hierdie hulp boodskap.\n"
" --report - program behoort een van die Mageia nutsprogramme te "
"wees\n"
-" --incedent - program behoort een van die Mageia nutsprogramme te "
-"wees"
+" --incedent - program behoort een van die Mageia nutsprogramme te wees"
#: standalone.pm:66
#, c-format
Modified: drakx/trunk/perl-install/share/po/am.po
===================================================================
--- drakx/trunk/perl-install/share/po/am.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/am.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4613,8 +4613,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4629,8 +4629,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4675,8 +4675,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
Modified: drakx/trunk/perl-install/share/po/ar.po
===================================================================
--- drakx/trunk/perl-install/share/po/ar.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/ar.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4810,8 +4810,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4826,8 +4826,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4872,8 +4872,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
@@ -4970,8 +4970,8 @@
"قوانين الملكيّة الفكريّة وحقوق النّشر المنطبقة على البرمجيّات.\n"
"تحتفظ ماندريبا ش.م. بحقّها في تعديل أو تكييف المنتجات البرمجيّة، بحذافيرها \n"
"أو أجزاء معيّنة منها، بشتّى الطّرق ولسائر الأغراض.\n"
-"\"Mageia\" و \"Mageia Linux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة "
-"لماندريبا ش.م. \n"
+"\"Mageia\" و \"Mageia Linux\" والشّعارات المتعلّقة هي علاماتٌ تجاريّة لماندريبا "
+"ش.م. \n"
"\n"
"\n"
"5. القوانين الحاكمة \n"
Modified: drakx/trunk/perl-install/share/po/az.po
===================================================================
--- drakx/trunk/perl-install/share/po/az.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/az.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4822,8 +4822,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4838,8 +4838,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4884,8 +4884,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
@@ -4943,23 +4943,23 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Mageia will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
+"Mageia will, in no circumstances and to the extent permitted by law, be "
+"liable for any special,\n"
"incidental, direct or indirect damages whatsoever (including without "
"limitation damages for loss of \n"
"business, interruption of business, financial loss, legal fees and penalties "
"resulting from a court \n"
"judgment, or any other consequential loss) arising out of the use or "
"inability to use the Software \n"
-"Products, even if Mageia has been advised of the possibility or "
-"occurence of such \n"
+"Products, even if Mageia has been advised of the possibility or occurence of "
+"such \n"
"damages.\n"
"\n"
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, Mageia or its distributors will, in "
-"no circumstances, be \n"
+"To the extent permitted by law, Mageia or its distributors will, in no "
+"circumstances, be \n"
"liable for any special, incidental, direct or indirect damages whatsoever "
"(including without \n"
"limitation damages for loss of business, interruption of business, financial "
@@ -5002,8 +5002,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
+"Mageia reserves its rights to modify or adapt the Software Products, as a "
+"whole or in \n"
"parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
Modified: drakx/trunk/perl-install/share/po/be.po
===================================================================
--- drakx/trunk/perl-install/share/po/be.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/be.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4635,8 +4635,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4651,8 +4651,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4697,8 +4697,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
Modified: drakx/trunk/perl-install/share/po/bg.po
===================================================================
--- drakx/trunk/perl-install/share/po/bg.po 2011-02-10 22:40:02 UTC (rev 508)
+++ drakx/trunk/perl-install/share/po/bg.po 2011-02-11 08:59:42 UTC (rev 509)
@@ -4806,8 +4806,8 @@
"The Software Products and attached documentation are provided \"as is\", "
"with no warranty, to the \n"
"extent permitted by law.\n"
-"Neither Mageia nor its licensors or suppliers will, in any "
-"circumstances and to the extent \n"
+"Neither Mageia nor its licensors or suppliers will, in any circumstances and "
+"to the extent \n"
"permitted by law, be liable for any special, incidental, direct or indirect "
"damages whatsoever \n"
"(including without limitation damages for loss of business, interruption of "
@@ -4822,8 +4822,8 @@
"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
"COUNTRIES\n"
"\n"
-"To the extent permitted by law, neither Mageia nor its licensors, "
-"suppliers or\n"
+"To the extent permitted by law, neither Mageia nor its licensors, suppliers "
+"or\n"
"distributors will, in any circumstances, be liable for any special, "
"incidental, direct or indirect \n"
"damages whatsoever (including without limitation damages for loss of "
@@ -4868,8 +4868,8 @@
"respective authors and are \n"
"protected by intellectual property and copyright laws applicable to software "
"programs.\n"
-"Mageia and its suppliers and licensors reserves their rights to "
-"modify or adapt the Software \n"
+"Mageia and its suppliers and licensors reserves their rights to modify or "
+"adapt the Software \n"
"Products, as a whole or in parts, by all means and for all purposes.\n"
"\"Mageia\", \"Mageia Linux\" and associated logos are trademarks of "
"Mageia \n"
@@ -4926,22 +4926,22 @@
"Софтуерните Продукти и приложената документация се предоставят \"такива "
"каквито са\", без гаранция,\n"
"в рамките на разрешеното от закона.\n"
-"Mageia, при никакви обстоятелства и в рамките на закона, не е "
-"отговорна за каквито да e\n"
+"Mageia, при никакви обстоятелства и в рамките на закона, не е отговорна за "
+"каквито да e\n"
"умишлени, случайни, преки или косвени щети (включително загуба на данни за "
"работа, прекратяване на,\n"
"работа, финансови загуби, законни данъци и наказания в резултат на съдебно "
"решение или каквато и да е\n"
"друга произлизащи от това загуби) произтичащи от употребата или от "
"невъзможността да се употреби\n"
-"Софтуерния Продукт, даже ако Mageia да е известила за възможността "
-"или случването на такава загуба.\n"
+"Софтуерния Продукт, даже ако Mageia да е известила за възможността или "
+"случването на такава загуба.\n"
"\n"
"ОГРАНИЧЕНА ОТГОВОРНОСТ СВЪРЗАНА С ПРИТЕЖАВАНЕТО ИЛИ ИЗПОЛЗВАНЕТО НА ЗАБРАНЕН "
"СОФТУЕР В НЯКОИ СТРАНИ\n"
"\n"
-"В рамките на закона, Mageia и нейните дистрибутори няма при никакви "
-"условия да бъдат\n"
+"В рамките на закона, Mageia и нейните дистрибутори няма при никакви условия "
+"да бъдат\n"
"отговорни за каквито и да било умишлени, случайни, преки или косвени щети "
"(включително загуба на данни\n"
"за работа, прекратяване на, работа, финансови загуби, законни данъци и "
@@ -4972,8 +4972,8 @@
"към Mageia.\n"
"Програмите разработени от Mageia се управляват от GPL Лиценза. "
"Документацията написана\n"
-"от Mageia се управлява от специален лиценз. Моля, погледнете "
-"документацията за\n"
+"от Mageia се управлява от специален лиценз. Моля, погледнете документацията "
+"за\n"
"повече информация.\n"
"\n"
"\n"
@@ -4983,8 +4983,8 @@
"съответните им автори и са\n"
"защитени от законите за интелектуалната собственост и за копиране прилагани "
"за софтуерните програми.\n"
-"Mageia запазва правото си да модифицира и пригодява Софтуерния "
-"Продукт, като цяло или на\n"
+"Mageia запазва правото си да модифицира и пригодява Софтуерния Продукт, като "
+"цяло или на\n"
@@ Diff output truncated at 20000 characters. @@