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/service_harddrake b/perl-install/standalone/service_harddrake
index 964a59592..84097e9a9 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -4,7 +4,7 @@ use lib qw(/usr/lib/libDrakX);
 
 use strict;
 use standalone;     #- warning, standalone must be loaded very first, for 'explanations'
-use MDK::Common;
+use common;
 use interactive;
 use harddrake::data;
 use Storable qw(store retrieve);
@@ -41,11 +41,11 @@ foreach (@harddrake::data::tree) {
     my $msg;
     my @was_removed = difference2([ keys %$oldconfig ], [ keys %ID ]);
     if (@was_removed) {
-	$msg .= _("Some devices in the \"%s\" hardware class were removed:\n", $item) .
+	$msg .= N("Some devices in the \"%s\" hardware class were removed:\n", $item) .
 	    "- ". harddrake::data::custom_id($oldconfig->{$_}, $item) ." was removed\n" foreach @was_removed . "\n";
     }
     my @added = difference2([ keys %ID ], [ keys %$oldconfig ]);
-    $msg .= _("Some devices were added:\n", $item) if @added;
+    $msg .= N("Some devices were added:\n", $item) if @added;
     $msg .= "- ". harddrake::data::custom_id($ID{$_}, $item) ." was added\n" foreach (@added);
     @added || @was_removed or next;
     next unless (-x $configurator);
@@ -61,7 +61,7 @@ foreach (@harddrake::data::tree) {
     if ($no) {
 	require interactive;
 	undef $wait;
-	$wait = $in->wait_message(_('Please wait'), _('Hardware probing in progress'));
+	$wait = $in->wait_message(N("Please wait"), N("Hardware probing in progress"));
     } elsif ($res) {
 	if (my $pid = fork) {
 	    wait;