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, 2 insertions, 2 deletions

diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm
index 43b58aa62..836fc0030 100644
--- a/perl-install/interactive/newt.pm
+++ b/perl-install/interactive/newt.pm
@@ -191,9 +191,9 @@ sub ask_fromW_real {
     my ($b1, $b2) = map { simplify_string($_) }
       (exists $common->{ok} ? 
        ($common->{ok}, $common->{cancel}) :
-       ($::isWizard ? _("Next") : _("Ok"), $common->{cancel} || ($::isWizard ? _("<- Previous") : _("Cancel"))));
+       ($::isWizard ? N("Next") : N("Ok"), $common->{cancel} || ($::isWizard ? N("<- Previous") : N("Cancel"))));
     #- b1 is always displayed, so giving it some label :-(
-    $b1 ||= $::isWizard ? _("Next") : _("Ok");
+    $b1 ||= $::isWizard ? N("Next") : N("Ok");
     my @b2 = if_($b2, $b2);
     my ($buttons, $ok, $cancel) = Newt::Grid::ButtonBar($::isWizard ? (@b2, $b1) : ($b1, @b2));
     ($ok, $cancel) = ($cancel, $ok) if $::isWizard;