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

diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug
index 5957a07b3..59bd74c0f 100755
--- a/perl-install/standalone/drakbug
+++ b/perl-install/standalone/drakbug
@@ -37,16 +37,16 @@ my $prog;
 my $incident=0;
 
 sub usage {
-    print STDERR _("drakbug version %s
+    print STDERR N("drakbug version %s
 Copyright (C) 2002 MandrakeSoft.
 This is free software and may be redistributed under the terms of the GNU GPL.
 
 usage: drakbug [OPTIONS] [PROGRAM_NAME]
 
 OPTIONS:
-", $version) . _("  --help            - print this help message.
-") . "\n" . _("  --report          - program should be one of mandrake tools
-") . "\n" . _("  --incident        - program should be one of mandrake tools
+", $version) . N("  --help            - print this help message.
+") . "\n" . N("  --report          - program should be one of mandrake tools
+") . "\n" . N("  --incident        - program should be one of mandrake tools
 ");
     exit(0);
 }
@@ -61,29 +61,29 @@ my $window_g = new Gtk::Window -toplevel;
 $window_g->set_policy($false,$false,$true);
 $window_g->set_position(1);
 $window_g->border_width(5);
-$window_g->set_title(_("Mandrake Bug Report Tool"));
+$window_g->set_title(N("Mandrake Bug Report Tool"));
 #$window_g->set_usize(540, 350);
 $window_g->signal_connect("delete_event", \&quit_global);
 
 my $mdk_app = { 
-	       _("Mandrake Control Center") => 'drakconf',
-	       _("First Time Wizard") => 'drakfw',
-	       _("Synchronization tool") => 'draksync',  
-	       _("Standalone Tools") => ['adduserdrake','diskdrake','drakautoinst','drakbackup','drakboot','drakbug','drakfloppy','drakfont','drakgw','drakconnect','drakxservices','drakxtv','keyboardrake','logdrake','mousedrake','net_monitor','printerdrake','scannerdrake','drakfirewall','XFdrake'],
-	       _("HardDrake") => 'harddrake2',
-	       _("Mandrake Online") => 'mdkonline',
-	       _("Menudrake") => 'menudrake',
-	       _("Msec") => 'msec',
-	       _("Remote Control") => 'rfbdrake',
-	       _("Software Manager") => 'rpmdrake',
-	       _("Urpmi") => 'urpmi',
-	       _("Windows Migration tool") => 'transfugdrake',
-	       _("Userdrake") => 'userdrake',
-	       _("Configuration Wizards") => 'wizdrake',
+	       N("Mandrake Control Center") => 'drakconf',
+	       N("First Time Wizard") => 'drakfw',
+	       N("Synchronization tool") => 'draksync',  
+	       N("Standalone Tools") => ['adduserdrake','diskdrake','drakautoinst','drakbackup','drakboot','drakbug','drakfloppy','drakfont','drakgw','drakconnect','drakxservices','drakxtv','keyboardrake','logdrake','mousedrake','net_monitor','printerdrake','scannerdrake','drakfirewall','XFdrake'],
+	       N("HardDrake") => 'harddrake2',
+	       N("Mandrake Online") => 'mdkonline',
+	       N("Menudrake") => 'menudrake',
+	       N("Msec") => 'msec',
+	       N("Remote Control") => 'rfbdrake',
+	       N("Software Manager") => 'rpmdrake',
+	       N("Urpmi") => 'urpmi',
+	       N("Windows Migration tool") => 'transfugdrake',
+	       N("Userdrake") => 'userdrake',
+	       N("Configuration Wizards") => 'wizdrake',
 	      };
 
 my @generic_tool = keys %{$mdk_app}; 
-my @all_drakxtools = @ { $mdk_app->{_("Standalone Tools")} };
+my @all_drakxtools = @ { $mdk_app->{N("Standalone Tools")} };
 push(@generic_tool,@all_drakxtools);
 
 my $kernel_release = chomp_(`uname -r`);
@@ -94,10 +94,10 @@ my $table = new Gtk::Table(4,2,'TRUE');
 #$table->set_border_width(5);
 $table->set_row_spacings(10);
 $table->set_col_spacings(5);
-$table->attach(new Gtk::Label(_("Application:")), 0, 1, 0, 1,'fill', 'fill',20,0);
-$table->attach(new Gtk::Label(_("Package: ")), 0, 1, 1, 2, 'fill', 'fill',0,0);
-$table->attach(new Gtk::Label(_("Kernel:")), 0, 1, 2, 3, 'fill', 'fill',0,0);
-$table->attach(new Gtk::Label(_("Release: ")), 0, 1, 3, 4, 'fill', 'fill',0,0);
+$table->attach(new Gtk::Label(N("Application:")), 0, 1, 0, 1,'fill', 'fill',20,0);
+$table->attach(new Gtk::Label(N("Package: ")), 0, 1, 1, 2, 'fill', 'fill',0,0);
+$table->attach(new Gtk::Label(N("Kernel:")), 0, 1, 2, 3, 'fill', 'fill',0,0);
+$table->attach(new Gtk::Label(N("Release: ")), 0, 1, 3, 4, 'fill', 'fill',0,0);
 $table->attach(my $comb_app = new Gtk::Combo(), 1, 2, 0, 1, 'fill', 'fill',0,0);
 $comb_app->set_usize(270,undef);
 $comb_app->set_popdown_strings("",sort(@generic_tool));
@@ -112,7 +112,7 @@ gtkpack2__(
 	   gtkpack2__(my $vbx = new Gtk::VBox(0,5),
 		      gtkadd($table),
 		      gtkpack(new Gtk::HBox(0,0),
-			      gtkpack(gtkset_justify(new Gtk::Label(_("\n\nTo submit a bug report, click on the button report.\nThis will open  a web browser window  on https://drakbug.mandrakesoft.com\n where you'll find a form to fill in.The information displayed above will be \ntransferred to that server\n\n")),"left")),
+			      gtkpack(gtkset_justify(new Gtk::Label(N("\n\nTo submit a bug report, click on the button report.\nThis will open  a web browser window  on https://drakbug.mandrakesoft.com\n where you'll find a form to fill in.The information displayed above will be \ntransferred to that server\n\n")),"left")),
 			     ),
 		      gtkpack(new Gtk::HSeparator),
 		      
@@ -127,11 +127,11 @@ if (defined $prog) {
 $comb_app->entry->signal_connect('changed', sub { update_app($comb_app->entry->get_text()) });
 my $kernel = $kernel_rel->get_chars(0,-1);
 my $hbx = new Gtk::HBox(0,0);
-my $Close_Button = new Gtk::Button(_("Close"));
+my $Close_Button = new Gtk::Button(N("Close"));
 $Close_Button->signal_connect(clicked => sub { Gtk->exit(0) });
 $hbx->pack_start($Close_Button,0,0,0);
 
-my $Report_Button = new Gtk::Button(_("Report"));
+my $Report_Button = new Gtk::Button(N("Report"));
 $Report_Button->signal_connect(clicked => sub { my $options = "mdkbugreport=1";
 						$options.="&incident=1" if $incident;
 						$p = $package->get_text(); $k=$kernel_rel->get_text(); ($r =parse_release()) =~ s/\s//;
@@ -153,13 +153,13 @@ sub update_app {
     my ($text) = @_;
     my $app_choice;
     $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}";
-    if (member($text,@all_drakxtools) || $text eq _("Standalone Tools")) {
+    if (member($text,@all_drakxtools) || $text eq N("Standalone Tools")) {
 	$app_choice = chomp_(`rpm -q drakxtools`) ;
-    } elsif (member($text,keys %{$mdk_app}) && $text ne _("Standalone Tools")) {	
+    } elsif (member($text,keys %{$mdk_app}) && $text ne N("Standalone Tools")) {	
 	$app_choice = get_package($mdk_app->{$text});
     } else {
 	LOOP: while (($key,$value) = each %{$mdk_app}) {
-	    next if $key eq _("Standalone Tools");
+	    next if $key eq N("Standalone Tools");
 	    if ($value eq $text) { 
 		$app_choice = get_package($text);
 		$prog = $key; 
@@ -168,7 +168,7 @@ sub update_app {
 	}
 	
     }
-    $app_choice ne '' ? $package->set_text("$app_choice") : $package->set_text(_("Not installed"));
+    $app_choice ne '' ? $package->set_text("$app_choice") : $package->set_text(N("Not installed"));
 }
 
 my %packages;
@@ -180,7 +180,7 @@ sub get_package {
     if (!defined $rpm_package) {
         $which_app = chomp_(`which '$executable' 2> /dev/null`);
         # deush, rpm can takes some time aka it'll sleeps if something has opened rpm db !
-        $rpm_package = $which_app eq "" ? _("Package not installed") : chomp_(`rpm -qf '$which_app' 2>&1`);
+        $rpm_package = $which_app eq "" ? N("Package not installed") : chomp_(`rpm -qf '$which_app' 2>&1`);
         $packages{$executable} = $rpm_package;
     }
     $rpm_package;
@@ -193,14 +193,14 @@ sub parse_release {
 
 sub connect_bugzilla {
     my($url) = @_;
-    my $w = $in->wait_message('',_("connecting to Bugzilla wizard ...")); 
+    my $w = $in->wait_message('',N("connecting to Bugzilla wizard ...")); 
     sleep(3);
     exec $ENV{BROWSER},$url if exists $ENV{BROWSER} ;
     my @browser = qw (mozilla konqueror galeon);
     foreach (@browser) {
 	if (-e "/usr/bin/$_") { standalone::explanations("Contacting $url with $_\n "); exec $_,$url } 
     }
-    $in->ask_warn('', _("No browser available! Please install one"));
+    $in->ask_warn('', N("No browser available! Please install one"));
 }
 
 sub read_app_context {