diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-23 19:50:24 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-23 19:50:24 +0000 |
| commit | 6ad710cf3b3b6b719ab0625bac318898e1759590 (patch) | |
| tree | 6e6f06b1e8ad0a11514bc04aee95cd89d48fbf87 /perl-install | |
| parent | e0d0347f266ae545f0b1b6ec3d638e1c41a74a38 (diff) | |
| download | drakx-6ad710cf3b3b6b719ab0625bac318898e1759590.tar drakx-6ad710cf3b3b6b719ab0625bac318898e1759590.tar.gz drakx-6ad710cf3b3b6b719ab0625bac318898e1759590.tar.bz2 drakx-6ad710cf3b3b6b719ab0625bac318898e1759590.tar.xz drakx-6ad710cf3b3b6b719ab0625bac318898e1759590.zip | |
fix some missing Mageia occurences after bogus s/mdv/mga/ cleaning on importing
(spot by perl_checker)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/drakhelp | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/draksec | 4 |
5 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 8bd102364..4089ccb21 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- draksec, drakxhelp: + o fix displaying "Mageia" - use "splash" on the kernel command line vs. "splash=silent" as per upstream code (e.g. plymouth, systemd and others) - support the "quiet" kernel command line argument to hide kernel text diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index f7c9ada70..8e19c1ae0 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - better "bootloader" message (mga#484) +- fix displaying "Mageia" in some messages Version 14.0 - 13 March 2012 diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index d06813f4e..ed5c8b497 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -180,12 +180,12 @@ sub ask_mirror { require mirror; my $mirrors = eval { - my $_w = $o->wait_message('', N("Contacting %s web site to get the list of available mirrors...")); + my $_w = $o->wait_message('', N("Contacting %s web site to get the list of available mirrors...", N("Mageia"))); mirror::list($o->{product_id}, $type); }; my $err = $@; if (!$mirrors) { - $o->ask_warn('', N("Failed contacting %s web site to get the list of available mirrors") . "\n$err"); + $o->ask_warn('', N("Failed contacting %s web site to get the list of available mirrors", N("Mageia")) . "\n$err"); return ask_url($o, $o_url); } diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp index 39781da91..8a8048c81 100755 --- a/perl-install/standalone/drakhelp +++ b/perl-install/standalone/drakhelp @@ -50,5 +50,5 @@ if (-f $instpath) { } else { $ugtk2::wm_icon = "help"; my $in = interactive->vnew; - $in->ask_warn(N("%s Help Center"), N("No Help entry for %s\n", $idlabel)); + $in->ask_warn(N("%s Help Center", N("Mageia")), N("No Help entry for %s\n", $idlabel)); } diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index 48e37573b..cf7d50a2a 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -111,7 +111,7 @@ my $common_opts = { col_spacings => 10, row_spacings => 5, mcc => 1 }; ######################## AUTH ################################### my %progs; -my $auth_string = N("Configure authentication required to access %s tools"); +my $auth_string = N("Configure authentication required to access %s tools", N("Mageia")); my %auth = ( no_passwd => N("No password"), @@ -147,7 +147,7 @@ sub set_auth_value { my %descr = ( rpmdrake => N("Software Management"), - mageiaupdate => N("%s Update"), + mageiaupdate => N("%s Update", N("Mageia")), 'drakrpm-edit-media' => N("Software Media Manager"), drak3d => N("Configure 3D Desktop effects"), xfdrake => N("Graphical Server Configuration"), |