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/bootloader.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'perl-install/bootloader.pm') diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 0e322efe1..48879cf31 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -426,7 +426,7 @@ sub suggest { if (!$lilo->{message}) { my $msg_en = #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) -__("Welcome to %s the operating system chooser! +N_("Welcome to %s the operating system chooser! Choose an operating system in the list above or wait %d seconds for default boot. @@ -986,23 +986,23 @@ EOF output "$::prefix/boot/grub/messages", map { substr(translate($_) . "\n", 0, 78) } ( #- ensure the translated messages are not too big the hard way #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("Welcome to GRUB the operating system chooser!"), +N_("Welcome to GRUB the operating system chooser!"), #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("Use the %c and %c keys for selecting which entry is highlighted."), +N_("Use the %c and %c keys for selecting which entry is highlighted."), #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("Press enter to boot the selected OS, \'e\' to edit the"), +N_("Press enter to boot the selected OS, \'e\' to edit the"), #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("commands before booting, or \'c\' for a command-line."), +N_("commands before booting, or \'c\' for a command-line."), #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("The highlighted entry will be booted automatically in %d seconds."), +N_("The highlighted entry will be booted automatically in %d seconds."), ); my $e = "$::prefix/boot/.enough_space"; - output $e, 1; -s $e or die _("not enough room in /boot"); + output $e, 1; -s $e or die N("not enough room in /boot"); unlink $e; $f; } @@ -1102,9 +1102,9 @@ sub install_loadlin_desktop { #-PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows #-PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language - foreach (__("Desktop"), + foreach (N_("Desktop"), #-PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows - __("Start Menu")) { + N_("Start Menu")) { my $d = "$windrive/$windir/" . translate($_); -d $d or $d = "$windrive/$windir/$_"; -d $d or log::l("can't find windows $d directory"), next; @@ -1123,7 +1123,7 @@ sub install { my ($lilo, $fstab, $hds) = @_; if (my ($p) = grep { $lilo->{boot} eq "/dev/$_->{device}" } @$fstab) { - die _("You can't install the bootloader on a %s partition\n", partition_table::type2fs($p)) + die N("You can't install the bootloader on a %s partition\n", partition_table::type2fs($p)) if isThisFs('xfs', $p); } $lilo->{keytable} = keytable($lilo->{keytable}); -- cgit v1.2.1