diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-11-06 13:20:21 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-11-06 13:20:21 +0000 |
commit | 9091151d546e5d749b47e2efce3ff651784fcc8c (patch) | |
tree | 2be2bec5e60f21ffe431eeef74095896ae5efe7f /perl-install/standalone/livedrake | |
parent | 68a1a2a6f2b9fdb1fd0c833cd9b3d8dcb9d8fd5c (diff) | |
download | drakx-9091151d546e5d749b47e2efce3ff651784fcc8c.tar drakx-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.gz drakx-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.bz2 drakx-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.xz drakx-9091151d546e5d749b47e2efce3ff651784fcc8c.zip |
replace "_" with "N" and "__" with "N_"
rationale:
- currently, we use _("xxx") as a shorthand for gettext("xxx"). It
also used to call xgettext with --keyword=_
- alas, function &_ is global and not by package (notice esp. that _
is not exported in common.pm)
- this lead to big ugly pb with packages defining their own &_,
overriding common.pm's &_
- a fix is to set @::textdomains to add a new domain (the default
being "libDrakX")
but relying on the global "_" is still dangerous!
Diffstat (limited to 'perl-install/standalone/livedrake')
-rwxr-xr-x | perl-install/standalone/livedrake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/standalone/livedrake b/perl-install/standalone/livedrake index 9c2af4c03..be4f9894a 100755 --- a/perl-install/standalone/livedrake +++ b/perl-install/standalone/livedrake @@ -21,8 +21,8 @@ my $cd_mntpoint = "/mnt/cdrom"; while (! -x "$cd_mntpoint/Mandrake/mdkinst/usr/bin/perl-install/live_install") { ejectCdrom(); - $in->ask_okcancel(_("Change Cd-Rom"), -_("Please insert the Installation Cd-Rom in your drive and press Ok when done. + $in->ask_okcancel(N("Change Cd-Rom"), +N("Please insert the Installation Cd-Rom in your drive and press Ok when done. If you don't have it, press Cancel to avoid live upgrade."), 1) or $in->exit(0); run_program::run("mount", "/mnt/cdrom"); } @@ -32,7 +32,7 @@ if (-x "$cd_mntpoint/Mandrake/mdkinst/usr/bin/perl-install/live_install") { $::testing or exec "./live_install"; } -$in->ask_warn('', _("Unable to start live upgrade !!!\n")); +$in->ask_warn('', N("Unable to start live upgrade !!!\n")); $in->exit(1); sub ejectCdrom { |