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!

1 files changed, 3 insertions, 5 deletions

diff --git a/perl-install/install_steps_newt.pm b/perl-install/install_steps_newt.pm
index 4ea47e564..0b70e2039 100644
--- a/perl-install/install_steps_newt.pm
+++ b/perl-install/install_steps_newt.pm
@@ -16,23 +16,21 @@ use devices;
 use lang;
 use common;
 
-my $banner = __();
-
 sub banner {
-    my $banner = translate(__("Mandrake Linux Installation %s"));
+    my $banner = translate(N_("Mandrake Linux Installation %s"));
     my $l = first(Newt::GetScreenSize()) - length($banner) - length($_[0]) + 1;
     Newt::DrawRootText(0, 0, sprintf($banner, ' ' x $l . $_[0]));
     Newt::Refresh();
 }
 
-sub new($$) {
+sub new {
     my ($type, $o) = @_;
 
     interactive::newt->new;
 
     banner('');
 #-PO This string must fit in a 80-char wide text screen
-    Newt::PushHelpLine(_("  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "));
+    Newt::PushHelpLine(N("  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "));
 
     (bless {}, ref $type || $type)->SUPER::new($o);
 }