From 9091151d546e5d749b47e2efce3ff651784fcc8c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 6 Nov 2002 13:20:21 +0000 Subject: 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! --- perl-install/standalone/livedrake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/standalone/livedrake') 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 { -- cgit v1.2.1