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

diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 903d9d0b3..a4930e616 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -76,14 +76,14 @@ network::netconnect::load_conf($netcnx, $netc, $intf);
 my $window1 = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel;
 $window1->signal_connect (delete_event => sub { Gtk->exit(0) });
 $window1->set_position(1);
-$window1->set_title(_("Network configuration (%d adapters)", @all_cards));
+$window1->set_title(N("Network configuration (%d adapters)", @all_cards));
 $window1->border_width(10);
 $::isEmbedded or $window1->set_usize(500, 400);
 my $vbox1 = new Gtk::VBox(0,10);
 $window1->add($vbox1);
 my $hbox1 = new Gtk::HBox(0,0);
 $vbox1->pack_start($hbox1,0,0,0);
-$hbox1->pack_start(new Gtk::Label(_("Profile: ")),0,0,0);
+$hbox1->pack_start(new Gtk::Label(N("Profile: ")),0,0,0);
 
 my $combo1 = new Gtk::Combo;
 $combo1->set_popdown_strings (network::netconnect::get_profiles());
@@ -91,13 +91,13 @@ my $old_profile = $netcnx->{PROFILE};
 $combo1->entry->set_text($netcnx->{PROFILE} ? $netcnx->{PROFILE} : "default");
 $combo1->entry->set_editable(0);
 $hbox1->pack_start($combo1,0,0,0);
-my $button_del = new Gtk::Button(_("Del profile..."));
+my $button_del = new Gtk::Button(N("Del profile..."));
 $button_del->signal_connect(clicked => sub {
 				 my $dialog = new Gtk::Dialog();
 				 $dialog->set_position(1);
 				 $dialog->vbox->set_border_width(10);
 				 $dialog->signal_connect (delete_event => sub { Gtk->main_quit() });
-				 $dialog->vbox->pack_start(new Gtk::Label(_("Profile to delete:")),1,1,0);
+				 $dialog->vbox->pack_start(new Gtk::Label(N("Profile to delete:")),1,1,0);
  				 my $combo_dialog = new Gtk::Combo;
 				 $combo_dialog->set_popdown_strings (grep { ! /default/ } network::netconnect::get_profiles());
 				 $combo_dialog->entry->set_editable(0);
@@ -105,14 +105,14 @@ $button_del->signal_connect(clicked => sub {
 				 my $bbox_dialog = new Gtk::HButtonBox;
 				 $dialog->action_area->add($bbox_dialog);
 				 $bbox_dialog->set_layout(-end);
-				 my $button_ok = new Gtk::Button _("OK");
+				 my $button_ok = new Gtk::Button N("OK");
 				 $button_ok->signal_connect (clicked => sub {
 								  network::netconnect::del_profile($netcnx, $combo_dialog->entry->get_text());
 								  $netcnx->{PROFILE} eq $combo_dialog->entry->get_text() and $netcnx->{PROFILE} = "default";
 								  Gtk->main_quit();
 							      });
 				 $bbox_dialog->add($button_ok);
-				 my $button_cancel = new Gtk::Button _("Cancel");
+				 my $button_cancel = new Gtk::Button N("Cancel");
 				 $button_cancel->signal_connect (clicked => sub { Gtk->main_quit() });
 				 $bbox_dialog->add($button_cancel);
 				 $dialog->show_all;
@@ -125,26 +125,26 @@ $button_del->signal_connect(clicked => sub {
 			     });
 $hbox1->pack_start($button_del,0,0,5);
 $button_del->set_sensitive(network::netconnect::get_profiles() > 1);
-my $button_new = new Gtk::Button(_("New profile..."));
+my $button_new = new Gtk::Button(N("New profile..."));
 $button_new->signal_connect(clicked => sub {
 				 my $dialog = new Gtk::Dialog();
 				 $dialog->set_position(1);
 				 $dialog->vbox->set_border_width(10);
 				 $dialog->signal_connect (delete_event => sub { Gtk->main_quit() });
-				 $dialog->vbox->pack_start(new Gtk::Label(_("Name of the profile to create (the new profile is created as a copy of the current one) :")),1,1,0);
+				 $dialog->vbox->pack_start(new Gtk::Label(N("Name of the profile to create (the new profile is created as a copy of the current one) :")),1,1,0);
 				 my $entry_dialog = new Gtk::Entry;
 				 $dialog->vbox->pack_start($entry_dialog,1,1,0);
 				 my $bbox_dialog = new Gtk::HButtonBox;
 				 $dialog->action_area->add($bbox_dialog);
 				 $bbox_dialog->set_layout(-end);
-				 my $button_ok = new Gtk::Button _("OK");
+				 my $button_ok = new Gtk::Button N("OK");
 				 $button_ok->signal_connect (clicked => sub {
 								  network::netconnect::add_profile($netcnx, $entry_dialog->get_text());
 								  $netcnx->{PROFILE} = $entry_dialog->get_text();
 								  Gtk->main_quit();
 							      });
 				 $bbox_dialog->add($button_ok);
-				 my $button_cancel = new Gtk::Button _("Cancel");
+				 my $button_cancel = new Gtk::Button N("Cancel");
 				 $button_cancel->signal_connect (clicked => sub { Gtk->main_quit() });
 				 $bbox_dialog->add($button_cancel);
 				 $dialog->show_all;
@@ -157,14 +157,14 @@ $button_new->signal_connect(clicked => sub {
 $hbox1->pack_start($button_new,0,0,5);
 my $hbox2 = new Gtk::HBox(0,0);
 $vbox1->pack_start($hbox2,0,0,0);
-$hbox2->pack_start(new Gtk::Label(_("Hostname: ")),0,0,0);
+$hbox2->pack_start(new Gtk::Label(N("Hostname: ")),0,0,0);
 my $hostname = chomp_(`hostname`);
 my $label_host = new Gtk::Label($hostname);
 $hbox2->pack_start($label_host,0,0,0);
 
 #$vbox1->pack_start(new Gtk::HSeparator,1,1,5);
 
-my $frame1 = new Gtk::Frame (_("Internet access"));
+my $frame1 = new Gtk::Frame (N("Internet access"));
 $vbox1->pack_start($frame1,1,1,0);
 my $vbox_frame1 = new Gtk::VBox(0,0);
 $vbox_frame1->set_border_width(5);
@@ -177,28 +177,28 @@ $table1->set_col_spacings(5);
 $vbox_frame1->pack_start($table1,1,1,0);
 #attach (table, child, left_attach, right_attach, top_attach, bottom_attach, xoptions, yoptions, xpadding, ypadding)
 #$table->attach($button[0], 0, 1, 0, 1, {expand=>1,fill=>1}, {expand=>1,fill=>1},0,0);
-$table1->attach(new Gtk::Label(_("Type:")), 0, 1, 0, 1, 'fill', 'fill',0,0);
+$table1->attach(new Gtk::Label(N("Type:")), 0, 1, 0, 1, 'fill', 'fill',0,0);
 my $label4 = new Gtk::Label($netcnx->{type});
 $table1->attach($label4, 1, 2, 0, 1, 'fill', 'fill',0,0);
-my $label5 = new Gtk::Label($netcnx->{type} eq 'lan' ? _("Gateway:") : _("Interface:"));
+my $label5 = new Gtk::Label($netcnx->{type} eq 'lan' ? N("Gateway:") : N("Interface:"));
 $table1->attach($label5, 0, 1, 1, 2, 'fill', 'fill',0,0);
 my $label6 = new Gtk::Label($netcnx->{type} eq 'lan' ? $netc->{GATEWAY} : $netcnx->{NET_INTERFACE});
 $table1->attach($label6, 1, 2, 1, 2, 'fill', 'fill',0,0);
 my $isconnected = -1;
 #-sub connected_local {
 #-    print "in connected local\n";
-#-    my $w = $in->wait_message('', _("Testing your connection..."), 1);
+#-    my $w = $in->wait_message('', N("Testing your connection..."), 1);
 #-    Gtk->main_iteration while Gtk->events_pending;
 #-    $isconnected = connected();
 #-}
-my $label7 = new Gtk::Label(_("Status:"));
+my $label7 = new Gtk::Label(N("Status:"));
 $table1->attach($label7, 0, 1, 2, 3, 'fill', 'fill',0,0);
-my $label8 = new Gtk::Label(_("Testing your connection..."));
+my $label8 = new Gtk::Label(N("Testing your connection..."));
 $table1->attach($label8, 1, 2, 2, 3, 'fill', 'fill',0,0);
 
 my $warning_label1 = new Gtk::Label("");
 $vbox_frame1->pack_start($warning_label1,0,0,0);
-my $button2 = new Gtk::Button(_("Wait please"));
+my $button2 = new Gtk::Button(N("Wait please"));
 $button2->set_sensitive(0);
 $button2->signal_connect(clicked => sub {
 			     if (!$isconnected && cat_($connect_prog) =~ m|/usr/bin/kppp| && -e '/usr/bin/kppp') {
@@ -216,19 +216,19 @@ $table1->attach($button2, 2, 3, 2, 3, 'fill', 'fill',0,0);
 #$table1->attach($button1, 2, 3, 1, 2, 'fill', 'fill',0,0);
 
 my $hbox_frame1_button = new Gtk::HBox(0,0);
-my $button1 = new Gtk::Button(_("Configure Internet Access..."));
+my $button1 = new Gtk::Button(N("Configure Internet Access..."));
 $button1->signal_connect(clicked => [ \&configure_net, '', $netcnx, $netc, $intf]);
 $hbox_frame1_button->pack_start($button1, 0, 0, 0);
 $vbox_frame1->pack_start($hbox_frame1_button,0,0,0);
 
 #$vbox1->pack_start(new Gtk::HSeparator,1,1,5);
 
-my $frame2 = new Gtk::Frame (_("LAN configuration"));
+my $frame2 = new Gtk::Frame (N("LAN configuration"));
 $vbox1->pack_start($frame2,1,1,0);
 my $vbox2 = new Gtk::VBox(0,0);
 $vbox2->set_border_width(5);
 $frame2->add($vbox2);
-my $clist1 = new_with_titles Gtk::CList("", _("Interface"), _("IP address"), _("Protocol"), _("Driver"), _("State"));
+my $clist1 = new_with_titles Gtk::CList("", N("Interface"), N("IP address"), N("Protocol"), N("Driver"), N("State"));
 $clist1->set_column_auto_resize($_,1) foreach (0..4);
 $clist1->column_titles_passive();
 $clist1->set_shadow_type('etched_out');
@@ -240,7 +240,7 @@ my $ip_regexp = qr/(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/;
 build_clist();
 
 my $hbox3 = new Gtk::HBox(0,0);
-my $button3 = new Gtk::Button(_("Configure Local Area Network..."));
+my $button3 = new Gtk::Button(N("Configure Local Area Network..."));
 $button3->signal_connect(clicked => [ \&configure_lan, '', $netcnx, $netc, $intf]);
 $hbox3->pack_start($button3, 0, 0, 0);
 $vbox2->pack_start($hbox3, 0, 0, 0);
@@ -252,8 +252,8 @@ $vbox1->pack_start($bbox0,0,0,0);
 $bbox0->set_layout(-end);
 
 
-$bbox0->add(new Gtk::Label(_("Click here to launch the wizard ->")));
-my $button_wizard = new Gtk::Button _("Wizard...");
+$bbox0->add(new Gtk::Label(N("Click here to launch the wizard ->")));
+my $button_wizard = new Gtk::Button N("Wizard...");
 $button_wizard->signal_connect(clicked => sub {
 				     $::isWizard = 1;
 				     system("drakconnect --wizard");
@@ -271,34 +271,34 @@ $vbox1->pack_start($bbox1,0,0,0);
 $bbox1->set_layout(-end);
 #$bbox1->set_border_width(5);
 
-my $button_expert = new Gtk::Button _("Expert Mode");
+my $button_expert = new Gtk::Button N("Expert Mode");
 $button_expert->signal_connect (clicked => sub {
 				     foreach ($button1, $button3) { $expert_mode ? $_->hide() : $_->show() }
-				     $button_expert->child->set($expert_mode ? _("Expert Mode") : _("Normal Mode"));
+				     $button_expert->child->set($expert_mode ? N("Expert Mode") : N("Normal Mode"));
 				     $expert_mode = !$expert_mode;
 				 });
 $bbox1->add($button_expert);
 
-my $button_apply = new Gtk::Button _("Apply");
+my $button_apply = new Gtk::Button N("Apply");
 $button_apply->signal_connect (clicked => sub {
 				 apply();
 			     });
 $button_apply->set_sensitive(0);
 $bbox1->add($button_apply);
 
-my $button_cancel = new Gtk::Button _("Cancel");
+my $button_cancel = new Gtk::Button N("Cancel");
 $button_cancel->signal_connect (clicked => sub {
 				     $combo1->entry->set_text($old_profile);
 				     update();
 				     quit_global();
 				 });
 $bbox1->add($button_cancel);
-my $button_ok = new Gtk::Button _("OK");
+my $button_ok = new Gtk::Button N("OK");
 $button_ok->signal_connect (clicked => sub {
 				 my $dialog = new Gtk::Dialog();
 				 $dialog->set_position(1);
 				 $dialog->vbox->set_border_width(10);
-				 my $label = new Gtk::Label(_("Please Wait... Applying the configuration"));
+				 my $label = new Gtk::Label(N("Please Wait... Applying the configuration"));
 				 $dialog->signal_connect (delete_event => sub { Gtk->main_quit() });
 				 $dialog->vbox->pack_start($label,1,1,20);
 				 $dialog->show_all;
@@ -372,7 +372,7 @@ sub update {
     my $h = chomp_(`hostname`);
     $label_host->set ($h);
     $label4->set($netcnx->{type});
-    $label5->set($netcnx->{type} eq 'lan' ? _("Gateway:") : _("Interface:"));
+    $label5->set($netcnx->{type} eq 'lan' ? N("Gateway:") : N("Interface:"));
     $label6->set($netcnx->{type} eq 'lan' ? $netc->{GATEWAY} : $netcnx->{NET_INTERFACE});
     $clist1->freeze();
     $clist1->clear();
@@ -380,8 +380,8 @@ sub update {
     $clist1->thaw();
     $button_del->set_sensitive(network::netconnect::get_profiles() > 1);
     $isconnected !=-1 or return 1;
-    $label8->set($isconnected ? _("Connected") : _("Not connected"));
-    $button2->child->set($isconnected ? _("Disconnect...") : _("Connect..."));
+    $label8->set($isconnected ? N("Connected") : N("Not connected"));
+    $button2->child->set($isconnected ? N("Disconnect...") : N("Connect..."));
     $button2->set_sensitive(1);
     1;
 }
@@ -400,11 +400,11 @@ sub update2 {
         $isconnected = $to_update;
         if ($isconnected != -1) {
             if ($isconnected && !in_ifconfig($netcnx->{NET_INTERFACE})) {
-                $warning_label1->set(_("Warning, another Internet connection has been detected, maybe using your network"));
+                $warning_label1->set(N("Warning, another Internet connection has been detected, maybe using your network"));
                 $isconnected = 0;
             } else { $warning_label1->set("") }
-            $label8->set($isconnected ? _("Connected") : _("Not connected"));
-            $button2->child->set($isconnected ? _("Disconnect...") : _("Connect..."));
+            $label8->set($isconnected ? N("Connected") : N("Not connected"));
+            $button2->child->set($isconnected ? N("Disconnect...") : N("Connect..."));
             $button2->set_sensitive(1);
         }
     }
@@ -427,12 +427,12 @@ sub configure_lan {
 	$dialog->set_position(1);
 	$dialog->vbox->set_border_width(10);
 	$dialog->signal_connect (delete_event => sub { Gtk->main_quit() });
-	$dialog->vbox->pack_start(new Gtk::Label(_("You don't have any configured interface.
+	$dialog->vbox->pack_start(new Gtk::Label(N("You don't have any configured interface.
 Configure them first by clicking on 'Configure'")),1,1,0);
 	my $bbox_dialog = new Gtk::HButtonBox;
 	$dialog->action_area->add($bbox_dialog);
 	$bbox_dialog->set_layout(-end);
-	my $button_ok = new Gtk::Button _("OK");
+	my $button_ok = new Gtk::Button N("OK");
 	$button_ok->signal_connect (clicked => sub { Gtk->main_quit() });
 	$bbox_dialog->add($button_ok);
 	$dialog->show_all;
@@ -445,11 +445,11 @@ Configure them first by clicking on 'Configure'")),1,1,0);
     $window->set_policy (1, 1, 1);
     $window->signal_connect (delete_event => sub { Gtk->main_quit });
     $window->set_position(1);
-    $window->set_title(_("LAN configuration"));
+    $window->set_title(N("LAN configuration"));
     $window->border_width(10);
     my $vbox1 = new Gtk::VBox(0,0);
     $window->add($vbox1);
-    $vbox1->pack_start(new Gtk::Label(_("LAN Configuration")),0,1,0);
+    $vbox1->pack_start(new Gtk::Label(N("LAN Configuration")),0,1,0);
     my $notebook = new Gtk::Notebook;
     $vbox1->pack_start($notebook,0,1,0);
     my @eth_data;
@@ -460,15 +460,15 @@ Configure them first by clicking on 'Configure'")),1,1,0);
 	$card_tab[2*$_+1] = \@conf_data;
 	my $vbox_local = new Gtk::VBox(0,0);
 	$vbox_local->set_border_width(10);
-	$vbox_local->pack_start(new Gtk::Label(_("Adapter %s: %s", $_+1 , "eth$_")),1,1,0);
+	$vbox_local->pack_start(new Gtk::Label(N("Adapter %s: %s", $_+1 , "eth$_")),1,1,0);
 	#	Eth${_}Hostname = $netc->{HOSTNAME}
 	#       Eth${_}HostAlias = " . do { $netc->{HOSTNAME} =~ /([^\.]*)\./; $1 } . "
 	#	Eth${_}Driver = $all_cards[$_]->[1]
-        @conf_data = ([_("IP address"), \$intf->{"eth$_"}{IPADDR}],
-			 [_("Netmask"), \$intf->{"eth$_"}{NETMASK}],
-			 [_("Boot Protocol"), \$intf->{"eth$_"}{BOOTPROTO}, ["static", "dhcp", "bootp"]],
-			 [_("Started on boot"), \$intf->{"eth$_"}{ONBOOT} , ["yes", "no"]],
-			 [_("DHCP client"), \$netcnx->{dhcp_client}]
+        @conf_data = ([N("IP address"), \$intf->{"eth$_"}{IPADDR}],
+			 [N("Netmask"), \$intf->{"eth$_"}{NETMASK}],
+			 [N("Boot Protocol"), \$intf->{"eth$_"}{BOOTPROTO}, ["static", "dhcp", "bootp"]],
+			 [N("Started on boot"), \$intf->{"eth$_"}{ONBOOT} , ["yes", "no"]],
+			 [N("DHCP client"), \$netcnx->{dhcp_client}]
 			);
 	my $i = 0;
 	foreach my $j (@conf_data) {
@@ -493,13 +493,13 @@ Configure them first by clicking on 'Configure'")),1,1,0);
 	my $c = $_;
 	my $widget_temp;
 	if (-e "$prefix/etc/sysconfig/network-scripts/ifcfg-eth$c") {
-	    $widget_temp = gtksignal_connect(new Gtk::Button(ethisup($c) ? _("deactivate now") : _("activate now")),
+	    $widget_temp = gtksignal_connect(new Gtk::Button(ethisup($c) ? N("deactivate now") : N("activate now")),
 					     clicked => sub {
 						 system("/sbin/if".(ethisup($c)?"down" : "up")." eth$c");
-						 gtkbuttonset($_[0], ethisup($c)? _("deactivate now") : _("activate now"));
+						 gtkbuttonset($_[0], ethisup($c)? N("deactivate now") : N("activate now"));
 					     });
 	} else {
-	    $widget_temp = _("This interface has not been configured yet.\nLaunch the configuration wizard in the main window");
+	    $widget_temp = N("This interface has not been configured yet.\nLaunch the configuration wizard in the main window");
 	}
 	$vbox_local->pack_start(gtkpack__(new Gtk::HBox(0,0),
 					  $widget_temp
@@ -518,7 +518,7 @@ Configure them first by clicking on 'Configure'")),1,1,0);
     my $bbox1 = new Gtk::HButtonBox;
     $vbox1->pack_start($bbox1,0,0,10);
     $bbox1->set_layout(-end);
-    my $button_ok = new Gtk::Button(_("OK"));
+    my $button_ok = new Gtk::Button(N("OK"));
     $button_ok->signal_connect (clicked => sub {
 				     foreach (0..$#all_cards) {
 					 my $i = 0;
@@ -534,7 +534,7 @@ Configure them first by clicking on 'Configure'")),1,1,0);
 				     $window->destroy(); Gtk->main_quit;
 				 });
     $bbox1->add($button_ok);
-    my $button_cancel = new Gtk::Button(_("Cancel"));
+    my $button_cancel = new Gtk::Button(N("Cancel"));
     $button_cancel->signal_connect (clicked => sub { $window->destroy(); Gtk->main_quit });
     $bbox1->add($button_cancel);
 
@@ -556,12 +556,12 @@ sub configure_net {
 	$dialog->set_position(1);
 	$dialog->vbox->set_border_width(10);
 	$dialog->signal_connect (delete_event => sub { Gtk->main_quit() });
-	$dialog->vbox->pack_start(new Gtk::Label(_("You don't have any internet connection.
+	$dialog->vbox->pack_start(new Gtk::Label(N("You don't have any internet connection.
 Create one first by clicking on 'Configure'")),1,1,0);
 	my $bbox_dialog = new Gtk::HButtonBox;
 	$dialog->action_area->add($bbox_dialog);
 	$bbox_dialog->set_layout(-end);
-	my $button_ok = new Gtk::Button _("OK");
+	my $button_ok = new Gtk::Button N("OK");
 	$button_ok->signal_connect (clicked => sub {
 					 Gtk->main_quit();
 				     });
@@ -580,56 +580,56 @@ Create one first by clicking on 'Configure'")),1,1,0);
     $window->set_policy (1, 1, 1);
     $window->signal_connect (delete_event => sub { Gtk->main_quit });
     $window->set_position(1);
-    $window->set_title(_("Internet connection configuration"));
+    $window->set_title(N("Internet connection configuration"));
     $window->border_width(10);
     my $vbox1 = new Gtk::VBox(0,0);
     $window->add($vbox1);
-    $vbox1->pack_start(new Gtk::Label(_("Internet Connection Configuration")),0,1,0);
+    $vbox1->pack_start(new Gtk::Label(N("Internet Connection Configuration")),0,1,0);
 
     $vbox1->pack_start(new Gtk::HSeparator,0,0,5);
     my $table1 = new Gtk::Table (2, 4, 0);
     $table1->set_row_spacings(5);
     $table1->set_col_spacings(5);
     $vbox1->pack_start($table1,0,0,0);
-    $table1->attach(new Gtk::Label(_("Profile: ")), 0, 1, 0, 1, 'fill', 'fill',0,0);
-    $table1->attach(new Gtk::Label(_($netcnx->{PROFILE})), 1, 2, 0, 1, 'fill', 'fill',0,0);
-    $table1->attach(new Gtk::Label(_("Connection type: ")), 0, 1, 1, 2, 'fill', 'fill',0,0);
-    $table1->attach(new Gtk::Label(_($netcnx->{type})), 1, 2, 1, 2, 'fill', 'fill',0,0);
-#    my $button1 = new Gtk::Button(_("Reconfigure using wizard..."));
+    $table1->attach(new Gtk::Label(N("Profile: ")), 0, 1, 0, 1, 'fill', 'fill',0,0);
+    $table1->attach(new Gtk::Label(translate($netcnx->{PROFILE})), 1, 2, 0, 1, 'fill', 'fill',0,0);
+    $table1->attach(new Gtk::Label(N("Connection type: ")), 0, 1, 1, 2, 'fill', 'fill',0,0);
+    $table1->attach(new Gtk::Label(translate($netcnx->{type})), 1, 2, 1, 2, 'fill', 'fill',0,0);
+#    my $button1 = new Gtk::Button(N("Reconfigure using wizard..."));
 #    $table1->attach($button1, 2, 4, 0, 2, 'fill', 'fill',0,0);
     $vbox1->pack_start(new Gtk::HSeparator,0,0,5);
 
-    my $frame1 = new Gtk::Frame (_("Parameters"));
+    my $frame1 = new Gtk::Frame (N("Parameters"));
     $vbox1->pack_start($frame1,1,1,0);
     my $vbox2 = new Gtk::VBox(0,0);
     $frame1->add($vbox2);
     my $i = 0;
-    my @conf_data = ([_("Card IRQ"), \$cnx->{irq} ],
-		     [_("Card mem (DMA)"), \$cnx->{mem} ],
-		     [_("Card IO"), \$cnx->{io} ],
-		     [_("Card IO_0"), \$cnx->{io0} ],
-		     [_("Card IO_1"), \$cnx->{io1} ],
-		     [_("Your personal phone number"), \$cnx->{phone_in} ],
-		     [_("Provider name (ex provider.net)"), \$netc->{DOMAINNAME2}],
-		     [_("Provider phone number"), \$cnx->{phone_out} ],
-		     [_("Provider dns 1 (optional)"), \$netc->{dnsServer2}],
-		     [_("Provider dns 2 (optional)"), \$netc->{dnsServer3}],
-		     [_("Account Login (user name)"), \$cnx->{login} ],
-		     [_("Account Password"), \$cnx->{passwd} ],
-		     [_("Dialing mode"), \$cnx->{dialing_mode}, [ "auto", "manual"] ],
-		     [_("Gateway"), \$netc->{GATEWAY}],
-		     [_("Connection name"), \$cnx->{connection} ],
-		     [_("Phone number"), \$cnx->{phone} ],
-		     [_("Login ID"), \$cnx->{login} ],
-		     [_("Password"), \$cnx->{passwd} ],
-		     [_("Authentication"), \$cnx->{auth}, [ _("PAP"), _("Terminal-based"), _("Script-based"), __("CHAP") ] ],
-		     [_("Domain name"), \$cnx->{domain} ],
-		     [_("First DNS Server (optional)"), \$cnx->{dns1} ],
-		     [_("Second DNS Server (optional)"), \$cnx->{dns2} ],
-		     [_("Ethernet Card"), \$netc->{NET_DEVICE}, [ 'eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5','eth6', 'eth7', 'eth8', 'eth9' ]],
-		     [_("DHCP Client"), \$netcnx->{dhcp_client}, ["dhcpcd", "dhcpxd", "dhcp-client"] ],
-		     [_("Connection speed"), \$cnx->{speed}, ["64 Kb/s", "128 Kb/s"]],
-		     [_("Connection timeout (in sec)"), \$cnx->{huptimeout} ]
+    my @conf_data = ([N("Card IRQ"), \$cnx->{irq} ],
+		     [N("Card mem (DMA)"), \$cnx->{mem} ],
+		     [N("Card IO"), \$cnx->{io} ],
+		     [N("Card IO_0"), \$cnx->{io0} ],
+		     [N("Card IO_1"), \$cnx->{io1} ],
+		     [N("Your personal phone number"), \$cnx->{phone_in} ],
+		     [N("Provider name (ex provider.net)"), \$netc->{DOMAINNAME2}],
+		     [N("Provider phone number"), \$cnx->{phone_out} ],
+		     [N("Provider dns 1 (optional)"), \$netc->{dnsServer2}],
+		     [N("Provider dns 2 (optional)"), \$netc->{dnsServer3}],
+		     [N("Account Login (user name)"), \$cnx->{login} ],
+		     [N("Account Password"), \$cnx->{passwd} ],
+		     [N("Dialing mode"), \$cnx->{dialing_mode}, [ "auto", "manual"] ],
+		     [N("Gateway"), \$netc->{GATEWAY}],
+		     [N("Connection name"), \$cnx->{connection} ],
+		     [N("Phone number"), \$cnx->{phone} ],
+		     [N("Login ID"), \$cnx->{login} ],
+		     [N("Password"), \$cnx->{passwd} ],
+		     [N("Authentication"), \$cnx->{auth}, [ N("PAP"), N("Terminal-based"), N("Script-based"), N_("CHAP") ] ],
+		     [N("Domain name"), \$cnx->{domain} ],
+		     [N("First DNS Server (optional)"), \$cnx->{dns1} ],
+		     [N("Second DNS Server (optional)"), \$cnx->{dns2} ],
+		     [N("Ethernet Card"), \$netc->{NET_DEVICE}, [ 'eth0', 'eth1', 'eth2', 'eth3', 'eth4', 'eth5','eth6', 'eth7', 'eth8', 'eth9' ]],
+		     [N("DHCP Client"), \$netcnx->{dhcp_client}, ["dhcpcd", "dhcpxd", "dhcp-client"] ],
+		     [N("Connection speed"), \$cnx->{speed}, ["64 Kb/s", "128 Kb/s"]],
+		     [N("Connection timeout (in sec)"), \$cnx->{huptimeout} ]
 );
     foreach (@conf_data) {
 	$infos[2*$i] = new Gtk::HBox(0,0);
@@ -646,7 +646,7 @@ Create one first by clicking on 'Configure'")),1,1,0);
 	    $infos[2*$i+1] = new Gtk::Entry();
 	    $infos[2*$i]->pack_start($infos[2*$i+1],0,0,0);
 	    #hide password if Entry Password
-	    if ($_->[0] eq _("Account Password") || $_->[0] eq _("Password")) { $infos[2*$i+1]->set_visibility(0) };
+	    if ($_->[0] eq N("Account Password") || $_->[0] eq N("Password")) { $infos[2*$i+1]->set_visibility(0) };
 	}
 	$infos[2*$i+1]->set_text(${$_->[1]});
   	$i++;
@@ -664,7 +664,7 @@ Create one first by clicking on 'Configure'")),1,1,0);
     my $bbox1 = new Gtk::HButtonBox;
     $vbox1->pack_start($bbox1,0,0,0);
     $bbox1->set_layout(-end);
-    my $button_ok = new Gtk::Button _("OK");
+    my $button_ok = new Gtk::Button N("OK");
     $button_ok->signal_connect (clicked => sub {
 				     $i = 0;
 				     foreach (@mask) {
@@ -676,7 +676,7 @@ Create one first by clicking on 'Configure'")),1,1,0);
 				     $window->destroy(); Gtk->main_quit;
 				 });
     $bbox1->add($button_ok);
-    my $button_cancel = new Gtk::Button _("Cancel");
+    my $button_cancel = new Gtk::Button N("Cancel");
     $button_cancel->signal_connect (clicked => sub { $window->destroy(); Gtk->main_quit });
     $bbox1->add($button_cancel);