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

diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 759b2ad30..fd4559853 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -13,7 +13,7 @@ use c;
 
 local $_ = join '', @ARGV;
 
-/-h/ and die _("usage: keyboarddrake [--expert] [keyboard]\n");
+/-h/ and die N("usage: keyboarddrake [--expert] [keyboard]\n");
 
 $::expert = /-expert/;
 
@@ -28,8 +28,8 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
   begin:
     $::isEmbedded and kill 'USR2', $::CCPID;
   choose:
-    $keyboard->{KEYBOARD} = $in->ask_from_listf(_("Keyboard"),
-						_("Please, choose your keyboard layout."),
+    $keyboard->{KEYBOARD} = $in->ask_from_listf(N("Keyboard"),
+						N("Please, choose your keyboard layout."),
 						\&keyboard::KEYBOARD2text,
 						[ keyboard::KEYBOARDs() ],
 						$keyboard->{KEYBOARD}) or goto end;
@@ -38,7 +38,7 @@ if (my ($kb) = grep { !/^-/ } @ARGV) {
 }
 
 if ($::expert) {
-    my $isNotDelete = !$in->ask_yesorno("BackSpace", _("Do you want the BackSpace to return Delete in console?"), 1);
+    my $isNotDelete = !$in->ask_yesorno("BackSpace", N("Do you want the BackSpace to return Delete in console?"), 1);
     $keyboard->{BACKSPACE} = $isNotDelete ? "BackSpace" : "Delete";
 }