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

diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 4ce8c5add..a1f94125e 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -38,7 +38,7 @@ for (@ARGV) {
 $in = 'interactive'->vnew('su', 'default');
 $in->do_pkgs->install('sane-backends', 'xsane', if_($in->do_pkgs->is_installed('gimp'),'xsane-gimp'));
 if ($::Manual) { manual(); quit() }
-my $wait = $in->wait_message(_("Test ports"), _("Detecting devices ..."));
+my $wait = $in->wait_message(N("Test ports"), N("Detecting devices ..."));
 @f = scanner::detect();
 $wait=undef;
 (@f) ? auto() : manual();
@@ -50,22 +50,22 @@ sub auto {
 	    my $name = $_->{val}{DESCRIPTION};
 	    $name =~ s/\s$//; #some HP entry have a trailing space, i will correct usbtable asap
 	    if ($scanner::scannerDB->{$name}{flags}{unsupported}) {
-		$in->ask_warn('scannerdrake', _("The %s is not supported by this version of Mandrake Linux.", $name));
+		$in->ask_warn('scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", $name));
 		return;
 	    }
-	    $in->ask_yesorno('scannerdrake',_("%s found on %s, configure it?",$name,$_->{port}),1) or manual();
+	    $in->ask_yesorno('scannerdrake',N("%s found on %s, configure it?",$name,$_->{port}),1) or manual();
 	    tryConfScanner($name, $_->{port});
 	} else {
-	    $in->ask_yesorno('scannerdrake',_("%s is not in the scanner database, configure it manually?", $_->{val}{DESCRIPTION}),1) and manual();
+	    $in->ask_yesorno('scannerdrake',N("%s is not in the scanner database, configure it manually?", $_->{val}{DESCRIPTION}),1) and manual();
 	}
     }
 }
 
 sub manual {
-    my $s = $in->ask_from_treelist('scannerdrake', _("Select a scanner"), '|', [' None', keys %$scanner::scannerDB], '') or return;
+    my $s = $in->ask_from_treelist('scannerdrake', N("Select a scanner"), '|', [' None', keys %$scanner::scannerDB], '') or return;
     return if $s eq ' None';
     if ($scanner::scannerDB->{$s}{flags}{unsupported}) {
-	$in->ask_warn('scannerdrake', _("The %s is not supported by this version of Mandrake Linux.", $s));
+	$in->ask_warn('scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", $s));
 	return;
     }
     tryConfScanner($s);
@@ -78,7 +78,7 @@ sub dynamic {
 	    my $name = $_->{val}{DESCRIPTION};
 	    $name =~ s/\s$//; #some HP entry have a trailing space, i will correct usbtable asap
 	    if ($scanner::scannerDB->{$name}{flags}{unsupported}) {
-		$in->ask_warn('scannerdrake', _("The %s is not supported by this version of Mandrake Linux.", $name));
+		$in->ask_warn('scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", $name));
 		return;
 	    }
 	    scanner::confScanner($name, $_->{port}) unless ($scanner::scannerDB->{$model}{flags}{unsupported});
@@ -90,34 +90,34 @@ sub tryConfScanner {
     # take care if interactive output is needed (unsupported, parallel..)
     my ($model, $port) = @_;
     if ($scanner::scannerDB->{$model}{flags}{unsupported}) {
-	$in->ask_warn('scannerdrake', _("This %s scanner is unsupported", $model));
+	$in->ask_warn('scannerdrake', N("This %s scanner is unsupported", $model));
 	return;
     }
     # if ($scanner::scannerDB->{$model}{driver} =~ /Parport/) {
-    # 	$in->ask_warn('scannerdrake', _("This %s scanner uses parallel port, which is unsupported for the moment", $model));
+    # 	$in->ask_warn('scannerdrake', N("This %s scanner uses parallel port, which is unsupported for the moment", $model));
     # 	return;
     #     }
     if ($scanner::scannerDB->{$model}{driver} =~ /SCSI/) {
-     	#$in->ask_warn('scannerdrake', _("This %s scanner uses parallel port, which is unsupported for the moment", $model));
+     	#$in->ask_warn('scannerdrake', N("This %s scanner uses parallel port, which is unsupported for the moment", $model));
      	#return;
     }
     if ($scanner::scannerDB->{$model}{ask} =~ /DEVICE/) {
 	$port = '/dev/sg0';
 	$in->ask_from('scannerdrake',
-		      _("Scannerdrake was not able to detect your %s scanner.\nPlease select the device where your scanner is plugged", $model),
+		      N("Scannerdrake was not able to detect your %s scanner.\nPlease select the device where your scanner is plugged", $model),
 		      [
-		       { label => _("choose device"), val => \$port, list => ['/dev/sg0', '/dev/sg1', '/dev/sg2', '/dev/sg3', '/dev/sg4' ], not_edit => 0, sort => 1 },
+		       { label => N("choose device"), val => \$port, list => ['/dev/sg0', '/dev/sg1', '/dev/sg2', '/dev/sg3', '/dev/sg4' ], not_edit => 0, sort => 1 },
 		      ],
 		     ) or manual();
     }
 
     if ($scanner::scannerDB->{$model}{server} =~ /printerdrake/) {
-     	$in->ask_warn('scannerdrake', _("This %s scanner must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", $model));
+     	$in->ask_warn('scannerdrake', N("This %s scanner must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", $model));
      	return;
     }
     scanner::confScanner($model,$port);
-    $in->ask_warn(_("Congratulations!"),
-		  _("Your %s scanner has been configured.\nYou may now scan documents using ``XSane'' from Multimedia/Graphics in the applications menu.", $model));
+    $in->ask_warn(N("Congratulations!"),
+		  N("Your %s scanner has been configured.\nYou may now scan documents using ``XSane'' from Multimedia/Graphics in the applications menu.", $model));
     
 }