diff options
| author | Anne Nicolas <ennael@mageia.org> | 2011-02-11 08:59:42 +0000 |
|---|---|---|
| committer | Anne Nicolas <ennael@mageia.org> | 2011-02-11 08:59:42 +0000 |
| commit | 315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff (patch) | |
| tree | a15ca2c84b9953fa72192bbcb9553c313dd4640a /perl-install/any.pm | |
| parent | 2c5ea7b5eb8d456cd2225156f2703ffd49fb01bb (diff) | |
| download | drakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.tar drakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.tar.gz drakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.tar.bz2 drakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.tar.xz drakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.zip | |
correct and remove google license
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index c9fcbae66..06050b9c6 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -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 @@ You can create additional entries or change the existing ones."), [ { format => sub { my ($e) = @_; ref($e) ? - ($b->{default} eq $e->{label} ? " * " : " ") . "$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 run_display_release_notes { } 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 @@ sub selectLanguage_install { 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"), |