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/diskdrake/dav.pm b/perl-install/diskdrake/dav.pm
index 09510696d..73f51ee4c 100644
--- a/perl-install/diskdrake/dav.pm
+++ b/perl-install/diskdrake/dav.pm
@@ -16,7 +16,7 @@ sub main {
     my $quit;
     do {
 	$in->ask_from_({ ok => '', messages => formatAlaTeX(
-_("WebDAV is a protocol that allows you to mount a web server's directory
+N("WebDAV is a protocol that allows you to mount a web server's directory
 locally, and treat it like a local filesystem (provided the web server is
 configured as a WebDAV server). If you would like to add WebDAV mount
 points, select \"New\".")) },
@@ -24,8 +24,8 @@ points, select \"New\".")) },
 			(map { 
 			    my $dav = $_;
 			    { label => $dav->{device}, val => $dav->{mntpoint}, clicked_may_quit => sub { config($in, $dav, $all_hds); 1 } } } @$davs),
-			 { val => _("New"), clicked_may_quit => sub { create($in, $all_hds); 1 } },
-			 { val => _("Quit"), icon => "exit", clicked_may_quit => sub { $quit = 1 } },
+			 { val => N("New"), clicked_may_quit => sub { create($in, $all_hds); 1 } },
+			 { val => N("Quit"), icon => "exit", clicked_may_quit => sub { $quit = 1 } },
 		       ]);
     } until ($quit);
 
@@ -60,12 +60,12 @@ sub actions {
     my ($dav) = @_;
 
     (
-     if_($dav && $dav->{isMounted}, __("Unmount") => sub { try('Unmount', @_) }),
-     if_($dav && $dav->{mntpoint} && !$dav->{isMounted}, __("Mount") => sub { try('Mount', @_) }),
-     __("Server") => \&ask_server,
-     __("Mount point") => \&mount_point,
-     __("Options") => \&options,
-     __("Done") => sub {},
+     if_($dav && $dav->{isMounted}, N_("Unmount") => sub { try('Unmount', @_) }),
+     if_($dav && $dav->{mntpoint} && !$dav->{isMounted}, N_("Mount") => sub { try('Mount', @_) }),
+     N_("Server") => \&ask_server,
+     N_("Mount point") => \&mount_point,
+     N_("Options") => \&options,
+     N_("Done") => sub {},
     );
 }
 
@@ -74,7 +74,7 @@ sub try {
     my $f = $diskdrake::interactive::{$name} or die "unknown function $name";
     eval { $f->($in, {}, $dav) };
     if (my $err = $@) {
-	$in->ask_warn(_("Error"), formatError($err));
+	$in->ask_warn(N("Error"), formatError($err));
     }
 }
 
@@ -82,10 +82,10 @@ sub ask_server {
     my ($in, $dav, $all_hds) = @_;
 
     my $server = $dav->{device};
-    $in->ask_from('', _("Please enter the WebDAV server URL"),
+    $in->ask_from('', N("Please enter the WebDAV server URL"),
 		  [ { val => \$server } ],
 		  complete => sub {
-		      $server =~ m!https?://! or $in->ask_warn('', _("The URL must begin with http:// or https://")), return 1;
+		      $server =~ m!https?://! or $in->ask_warn('', N("The URL must begin with http:// or https://")), return 1;
 		      0;
 		  },
 		 ) or return;
@@ -106,9 +106,9 @@ sub format_dav_info {
     my ($dav) = @_;
 
     my $info = '';
-    $info .= _("Server: ") . "$dav->{device}\n" if $dav->{device};
-    $info .= _("Mount point: ") . "$dav->{mntpoint}\n" if $dav->{mntpoint};
-    $info .= _("Options: %s", $dav->{options}) if $dav->{options};
+    $info .= N("Server: ") . "$dav->{device}\n" if $dav->{device};
+    $info .= N("Mount point: ") . "$dav->{mntpoint}\n" if $dav->{mntpoint};
+    $info .= N("Options: %s", $dav->{options}) if $dav->{options};
     $info;
 }