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!

7 files changed, 85 insertions, 85 deletions

diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index adf1a26a7..e35df200b 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -13,15 +13,15 @@ my $force_xf4 = arch() =~ /ppc|ia64/;
 
 
 my %VideoRams = (
-     256 => __("256 kB"),
-     512 => __("512 kB"),
-    1024 => __("1 MB"),
-    2048 => __("2 MB"),
-    4096 => __("4 MB"),
-    8192 => __("8 MB"),
-   16384 => __("16 MB"),
-   32768 => __("32 MB"),
-   65536 => __("64 MB or more"),
+     256 => N_("256 kB"),
+     512 => N_("512 kB"),
+    1024 => N_("1 MB"),
+    2048 => N_("2 MB"),
+    4096 => N_("4 MB"),
+    8192 => N_("8 MB"),
+   16384 => N_("16 MB"),
+   32768 => N_("32 MB"),
+   65536 => N_("64 MB or more"),
 );
 
 our %serversdriver = arch() =~ /^sparc/ ? (
@@ -200,7 +200,7 @@ sub card_config__not_listed {
     );
 
     my $r = $in->ask_from_treelistf(
-	_("X server"), _("Choose a X server"), '|', 
+	N("X server"), N("Choose a X server"), '|', 
 	sub { $_[0] =~ /^Vendor\|($vendors_regexp)\s*-?(.*)/ ? "Vendor|$1|$2" : 
 	      $_[0] =~ /^Vendor\|(.*)/ ? "Vendor|Other|$1" : $_[0] },
 	\@list, 
@@ -227,8 +227,8 @@ sub multi_head_choose {
 
     my @choices = multi_head_choices('', @cards);
 
-    my $tc = $in->ask_from_listf(_("Multi-head configuration"),
-				 _("Your system support multiple head configuration.
+    my $tc = $in->ask_from_listf(N("Multi-head configuration"),
+				 N("Your system support multiple head configuration.
 What do you want to do?"), sub { $_[0]{text} }, \@choices) or return;
 
     $tc->{code} or die internal_error();
@@ -283,7 +283,7 @@ sub configure {
 
     $card->{prog} = install_server($card, $options, $do_pkgs);
     
-    $in->ask_from('', _("Select the memory size of your graphics card"),
+    $in->ask_from('', N("Select the memory size of your graphics card"),
 		  [ { val => \ ($card->{VideoRam} = $options->{VideoRam_probed} || 4096),
 		      type => 'list',
 		      list => [ ikeys %VideoRams ],
@@ -344,9 +344,9 @@ sub xfree_and_glx_choose {
 
     my $tc = 
       $auto ? $choices[0] :
-	$in->ask_from_listf(_("XFree configuration"), 
+	$in->ask_from_listf(N("XFree configuration"), 
 			    formatAlaTeX(join("\n\n\n", (grep { $_ } map { $_->{more_messages} } @choices),
-					      _("Which configuration of XFree do you want to have?"))), 
+					      N("Which configuration of XFree do you want to have?"))), 
 			    sub { $_[0]{text} }, \@choices) or return;
     log::l("Using $tc->{text}");
     $tc->{code}();
@@ -378,13 +378,13 @@ sub multi_head_choices {
 	    $card->{Xinerama} = $_[0];
 	    $card;
 	};
-	my $independent = { text => _("Configure all heads independently"), code => sub { $configure_multi_head->('') } };
-	my $xinerama    = { text => _("Use Xinerama extension"),            code => sub { $configure_multi_head->(1) } };
+	my $independent = { text => N("Configure all heads independently"), code => sub { $configure_multi_head->('') } };
+	my $xinerama    = { text => N("Use Xinerama extension"),            code => sub { $configure_multi_head->(1) } };
 	push @choices, $want_Xinerama ? ($xinerama, $independent) : ($independent, $xinerama);
     }
 
     foreach my $c (@cards) {
-	push @choices, { text => _("Configure only card \"%s\"%s", $c->{description}, $c->{BusID} && " ($c->{BusID})"),
+	push @choices, { text => N("Configure only card \"%s\"%s", $c->{description}, $c->{BusID} && " ($c->{BusID})"),
 			 code => sub { $c } };
     }
     @choices;
@@ -396,8 +396,8 @@ sub xfree_and_glx_choices {
     #- XFree version available, better to parse available package and get version from it.
     my ($xf4_ver, $xf3_ver) = ('4.2.1', '3.3.6');
 
-    my $xf3 = if_($card->{server}, { text => _("XFree %s", $xf3_ver), code => sub { $card->{prefer_xf3} = 1 } });
-    my $xf4 = if_($card->{Driver}, { text => _("XFree %s", $xf4_ver), code => sub { $card->{prefer_xf3} = 0 } });
+    my $xf3 = if_($card->{server}, { text => N("XFree %s", $xf3_ver), code => sub { $card->{prefer_xf3} = 1 } });
+    my $xf4 = if_($card->{Driver}, { text => N("XFree %s", $xf4_ver), code => sub { $card->{prefer_xf3} = 0 } });
 
     #- no XFree3 with multi-head
     my @choices = grep { $_ } ($card->{cards} ? $xf4 : $card->{prefer_xf3} ? ($xf3, $xf4) : ($xf4, $xf3));
@@ -408,12 +408,12 @@ sub xfree_and_glx_choices {
     #- try to figure if 3D acceleration is supported
     #- by XFree 3.3 but not XFree 4 then ask user to keep XFree 3.3 ?
     if ($card->{UTAH_GLX}) {
-	my $e = { text => _("XFree %s with 3D hardware acceleration", $xf3_ver),
+	my $e = { text => N("XFree %s with 3D hardware acceleration", $xf3_ver),
 			    code => sub { $card->{prefer_xf3} = 1; $card->{use_UTAH_GLX} = 1 },
 			    more_messages => ($card->{Driver} && !$card->{DRI_GLX} ?
-_("Your card can have 3D hardware acceleration support but only with XFree %s.
+N("Your card can have 3D hardware acceleration support but only with XFree %s.
 Your card is supported by XFree %s which may have a better support in 2D.", $xf3_ver, $xf4_ver) :
-_("Your card can have 3D hardware acceleration support with XFree %s.", $xf3_ver)),
+N("Your card can have 3D hardware acceleration support with XFree %s.", $xf3_ver)),
 			  };
 	$card->{prefer_xf3} ? unshift(@choices, $e) : push(@choices, $e);
     }
@@ -421,36 +421,36 @@ _("Your card can have 3D hardware acceleration support with XFree %s.", $xf3_ver
     #- an expert user may want to try to use an EXPERIMENTAL 3D acceleration, currenlty
     #- this is with Utah GLX and so, it can provide a way of testing.
     if ($card->{UTAH_GLX_EXPERIMENTAL} && $::expert) {
-	push @choices, { text => _("XFree %s with EXPERIMENTAL 3D hardware acceleration", $xf3_ver),
+	push @choices, { text => N("XFree %s with EXPERIMENTAL 3D hardware acceleration", $xf3_ver),
 			 code => sub { $card->{prefer_xf3} = 1; $card->{use_UTAH_GLX} = 1 },
 			 more_messages => (using_xf4($card) && !$card->{DRI_GLX} ?
-_("Your card can have 3D hardware acceleration support but only with XFree %s,
+N("Your card can have 3D hardware acceleration support but only with XFree %s,
 NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.
 Your card is supported by XFree %s which may have a better support in 2D.", $xf3_ver, $xf4_ver) :
-_("Your card can have 3D hardware acceleration support with XFree %s,
+N("Your card can have 3D hardware acceleration support with XFree %s,
 NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)),
 		       };
     }
 
     #- ask the expert or any user on second pass user to enable or not hardware acceleration support.
     if ($card->{DRI_GLX}) {
-	unshift @choices, { text => _("XFree %s with 3D hardware acceleration", $xf4_ver),
+	unshift @choices, { text => N("XFree %s with 3D hardware acceleration", $xf4_ver),
 			    code => sub { $card->{prefer_xf3} = 0; $card->{use_DRI_GLX} = 1 },
-			    more_messages => _("Your card can have 3D hardware acceleration support with XFree %s.", $xf4_ver),
+			    more_messages => N("Your card can have 3D hardware acceleration support with XFree %s.", $xf4_ver),
 			  };
     }
 
     #- an expert user may want to try to use an EXPERIMENTAL 3D acceleration.
     if ($card->{DRI_GLX_EXPERIMENTAL} && $::expert) {
-	push @choices, { text => _("XFree %s with EXPERIMENTAL 3D hardware acceleration", $xf4_ver),
+	push @choices, { text => N("XFree %s with EXPERIMENTAL 3D hardware acceleration", $xf4_ver),
 			 code => sub { $card->{prefer_xf3} = 0; $card->{use_DRI_GLX} = 1 },
-			 more_messages => _("Your card can have 3D hardware acceleration support with XFree %s,
+			 more_messages => N("Your card can have 3D hardware acceleration support with XFree %s,
 NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf4_ver),
 		       };
     }
 
     if (arch() =~ /ppc/ && $ENV{DISPLAY}) {
-	push @choices, { text => _("Xpmac (installation display driver)"), code => sub { 
+	push @choices, { text => N("Xpmac (installation display driver)"), code => sub { 
 			     #- HACK: re-allowing XFree 3
 			     $::force_xf4 = 0;
 			     $card->{server} = "Xpmac";
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index d7fd47eaf..f9472def5 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -73,8 +73,8 @@ sub configure_chooser_raw {
     my %texts;
 
     my $update_texts = sub {
-	$texts{card} = $X->{card} && $X->{card}{BoardName} || _("Custom");
-	$texts{monitor} = $X->{monitor} && $X->{monitor}{ModelName} || _("Custom");
+	$texts{card} = $X->{card} && $X->{card}{BoardName} || N("Custom");
+	$texts{monitor} = $X->{monitor} && $X->{monitor}{ModelName} || N("Custom");
 	$texts{resolution} = Xconfig::resolution_and_depth::to_string($X->{resolution});
 
 	$texts{$_} =~ s/(.{20}).*/$1.../ foreach keys %texts; #- ensure not too long
@@ -99,27 +99,27 @@ sub configure_chooser_raw {
     my $ok;
     $in->ask_from_({ ok => '' }, 
 		   [
-		    { label => _("Graphic Card"), val => \$texts{card}, icon => "eth_card_mini", clicked => sub { 
+		    { label => N("Graphic Card"), val => \$texts{card}, icon => "eth_card_mini", clicked => sub { 
 			  $may_set->('card', Xconfig::card::configure($in, $raw_X, $do_pkgs, 0, $options));
 		      } },
-		    { label => _("Monitor"), val => \$texts{monitor}, icon => "ic82-systemeplus-40", clicked => sub { 
+		    { label => N("Monitor"), val => \$texts{monitor}, icon => "ic82-systemeplus-40", clicked => sub { 
 			  $may_set->('monitor', Xconfig::monitor::configure($in, $raw_X));
 		      } },
-		    { label => _("Resolution"), val => \$texts{resolution}, icon => "X", disabled => sub { !$X->{card} || !$X->{monitor} },
+		    { label => N("Resolution"), val => \$texts{resolution}, icon => "X", disabled => sub { !$X->{card} || !$X->{monitor} },
 		      clicked => sub {
 			  $may_set->('resolution', Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitor}));
 		      } },
 		        if_(Xconfig::card::check_bad_card($X->{card}) || $::isStandalone,
-		     { val => _("Test"), icon => "warning", disabled => sub { !$X->{card} || !$X->{monitor} },
+		     { val => N("Test"), icon => "warning", disabled => sub { !$X->{card} || !$X->{monitor} },
 		       clicked => sub { 
 			  $ok = Xconfig::test::test($in, $raw_X, $X->{card}, 'auto', 0);
 		      } },
 			),
-		    { val => _("Options"), icon => "ic82-tape-40", clicked => sub {
+		    { val => N("Options"), icon => "ic82-tape-40", clicked => sub {
 			  Xconfig::various::various($in, $X->{card}, $options);
 			  $X->{various} = 'done';
 		      } },
-		    { val => $::isInstall ? _("Ok") : _("Quit"), icon => "exit", clicked_may_quit => sub { 1 } },
+		    { val => $::isInstall ? N("Ok") : N("Quit"), icon => "exit", clicked_may_quit => sub { 1 } },
 		   ]);
     $ok, $modified;
 }
@@ -142,7 +142,7 @@ sub configure_chooser {
 sub may_write {
     my ($in, $raw_X, $X, $ok) = @_;
 
-    $ok ||= $in->ask_yesorno('', _("Keep the changes?
+    $ok ||= $in->ask_yesorno('', N("Keep the changes?
 The current configuration is:
 
 %s", Xconfig::various::info($raw_X, $X->{card})), 1);
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index 6efc9b600..dedac149c 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -90,13 +90,13 @@ sub choose {
 	}
     };
 
-    $in->ask_from(_("Monitor"), _("Choose a monitor"), 
+    $in->ask_from(N("Monitor"), N("Choose a monitor"), 
 		  [ { val => \$merged_name, separator => '|', 
 		      list => ['Custom', "Plug'n Play", sort keys %h_monitors],
-		      format => sub { $_[0] eq 'Custom' ? _("Custom") : 
-				      $_[0] eq "Plug'n Play" ? _("Plug'n Play") . " ($monitor->{ModelName})" :
-				      $_[0] =~ /^Generic\|(.*)/ ? _("Generic") . "|$1" :  
-				      _("Vendor") . "|$_[0]" },
+		      format => sub { $_[0] eq 'Custom' ? N("Custom") : 
+				      $_[0] eq "Plug'n Play" ? N("Plug'n Play") . " ($monitor->{ModelName})" :
+				      $_[0] =~ /^Generic\|(.*)/ ? N("Generic") . "|$1" :  
+				      N("Vendor") . "|$_[0]" },
 		      sort => 0 } ]) or return;
 
     if ($merged_name eq "Plug'n Play") {
@@ -106,20 +106,20 @@ sub choose {
 	    $monitor->{VendorName} = "Plug'n Play";
 	} else {
 	    delete $monitor->{VendorName};
-	    $in->ask_warn('', _("Plug'n Play probing failed. Please choose a precise monitor"));
+	    $in->ask_warn('', N("Plug'n Play probing failed. Please choose a precise monitor"));
 	    goto ask_monitor;
 	}
     } elsif ($merged_name eq 'Custom') {
 	$in->ask_from('',
-_("The two critical parameters are the vertical refresh rate, which is the rate
+N("The two critical parameters are the vertical refresh rate, which is the rate
 at which the whole screen is refreshed, and most importantly the horizontal
 sync rate, which is the rate at which scanlines are displayed.
 
 It is VERY IMPORTANT that you do not specify a monitor type with a sync range
 that is beyond the capabilities of your monitor: you may damage your monitor.
  If in doubt, choose a conservative setting."),
-		      [ { val => \$monitor->{HorizSync}, list => \@HorizSync_ranges, label => _("Horizontal refresh rate"), not_edit => 0 },
-			{ val => \$monitor->{VertRefresh}, list => \@VertRefresh_ranges, label => _("Vertical refresh rate"), not_edit => 0 } ]) or goto &choose;
+		      [ { val => \$monitor->{HorizSync}, list => \@HorizSync_ranges, label => N("Horizontal refresh rate"), not_edit => 0 },
+			{ val => \$monitor->{VertRefresh}, list => \@VertRefresh_ranges, label => N("Vertical refresh rate"), not_edit => 0 } ]) or goto &choose;
 	delete @$monitor{'VendorName', 'ModelName', 'EISA_ID'};
     } else {
 	put_in_hash($monitor, $h_monitors{$merged_name});
diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm
index 2842ad121..c39704d9a 100644
--- a/perl-install/Xconfig/resolution_and_depth.pm
+++ b/perl-install/Xconfig/resolution_and_depth.pm
@@ -9,11 +9,11 @@ use common;
 
 
 our %depth2text = (
-      8 => __("256 colors (8 bits)"),
-     15 => __("32 thousand colors (15 bits)"),
-     16 => __("65 thousand colors (16 bits)"),
-     24 => __("16 million colors (24 bits)"),
-     32 => __("4 billion colors (32 bits)"),
+      8 => N_("256 colors (8 bits)"),
+     15 => N_("32 thousand colors (15 bits)"),
+     16 => N_("65 thousand colors (16 bits)"),
+     24 => N_("16 million colors (24 bits)"),
+     32 => N_("4 billion colors (32 bits)"),
 );
 our @depths_available = ikeys(%depth2text);
 
@@ -104,7 +104,7 @@ sub allowed {
 	push @resolution_and_depth,
 	  map {
 	      my $Depth = $_;
-	      map { /(\d+)x(\d+)/; { X => $1, Y => $2, Depth => $Depth } } @resolutions;
+	      map { m/(\d+)x(\d+)/; { X => $1, Y => $2, Depth => $Depth } } @resolutions;
 	  } @depths;
     }
     $prefered_depth, @resolution_and_depth;
@@ -127,7 +127,7 @@ sub choose {
     my ($in, $default_resolution, @resolutions) = @_;
 
     my $resolution = $default_resolution || {};
-    $in->ask_from(_("Resolutions"), "",
+    $in->ask_from(N("Resolutions"), "",
 		  [ {
 		     val => \$resolution, type => 'list', sort => 0,
 		     list => [ sort { $a->{X} <=> $b->{X} } @resolutions ],
@@ -207,7 +207,7 @@ sub choose_gtk {
 
     require my_gtk;
     my_gtk->import(qw(:helpers :wrappers));
-    my $W = my_gtk->new(_("Resolution"));
+    my $W = my_gtk->new(N("Resolution"));
 
     my %monitor_images_x_res = do {
 	my @l = qw(640 800 1024 1152 1280 1400 1600 1920 2048);
@@ -252,8 +252,8 @@ sub choose_gtk {
     $set_chosen_x_res->($chosen_x_res, $chosen_y_res);
 
     gtkadd($W->{window},
-	   gtkpack_($W->create_box_with_title(_("Choose the resolution and the color depth"),
-					      if_($card->{BoardName}, "(" . _("Graphics card: %s", $card->{BoardName}) . ")"),
+	   gtkpack_($W->create_box_with_title(N("Choose the resolution and the color depth"),
+					      if_($card->{BoardName}, "(" . N("Graphics card: %s", $card->{BoardName}) . ")"),
 					     ),
 		    1, gtkpack2(new Gtk::VBox(0,0),
 				gtkpack2__(new Gtk::VBox(0, 15),
@@ -266,7 +266,7 @@ sub choose_gtk {
 						   ),
 					  ),
 			       ),
-		    0, gtkadd($W->create_okcancel(_("Ok"), _("Cancel"))),
+		    0, gtkadd($W->create_okcancel(N("Ok"), N("Cancel"))),
 		    ));
     $depth_combo->disable_activate;
     $depth_combo->set_use_arrows_always(1);
diff --git a/perl-install/Xconfig/test.pm b/perl-install/Xconfig/test.pm
index fec3bffe7..d5b2f1334 100644
--- a/perl-install/Xconfig/test.pm
+++ b/perl-install/Xconfig/test.pm
@@ -27,8 +27,8 @@ sub test {
 
     if ($bad_card || !$auto) {
 	my $msg = 
-	$in->ask_yesorno(_("Test of the configuration"), 
-			 _("Do you want to test the configuration?") . ($bad_card ? "\n" . _("Warning: testing this graphic card may freeze your computer") : ''),
+	$in->ask_yesorno(N("Test of the configuration"), 
+			 N("Do you want to test the configuration?") . ($bad_card ? "\n" . N("Warning: testing this graphic card may freeze your computer") : ''),
 			 !$bad_card) or return 1;
     }
 
@@ -76,7 +76,7 @@ sub test {
 		    while (<F>) {
 			/reporting a problem/ and last;
 			push @msg, $_;
-			$in->ask_warn('', [ _("An error occurred:"), " ", @msg, _("\ntry to change some parameters") ]);
+			$in->ask_warn('', [ N("An error occurred:"), " ", @msg, N("\ntry to change some parameters") ]);
 			return 0;
 		    }
 		}
@@ -88,7 +88,7 @@ sub test {
 			/^$/ and last;
 			push @msg, $_;
 		    }
-		    $in->ask_warn('', [ _("An error occurred:"), " ", @msg, _("\ntry to change some parameters") ]);
+		    $in->ask_warn('', [ N("An error occurred:"), " ", @msg, N("\ntry to change some parameters") ]);
 		    return 0;
 		}
 	    }
@@ -121,7 +121,7 @@ sub test {
         my $text = Gtk::Label->new;
         my $time = 12;
         Gtk->timeout_add(1000, sub {
-	    $text->set(_("Leaving in %d seconds", $time));
+	    $text->set(N("Leaving in %d seconds", $time));
 	    $time-- or Gtk->main_quit;
             1;
 	});
@@ -132,12 +132,12 @@ sub test {
             if -r "$::prefix/$background" && -x "$::prefix/$qiv";
 
         my $in = interactive::gtk->new;
-	$in->exit($in->ask_yesorno('', [ _("Is this the correct setting?"), $text ], 0) ? 0 : 222);
+	$in->exit($in->ask_yesorno('', [ N("Is this the correct setting?"), $text ], 0) ? 0 : 222);
     };
     my $rc = close F;
     my $err = $?;
 
-    $rc || $err == 222 << 8 or $in->ask_warn('', _("An error occurred, try to change some parameters"));
+    $rc || $err == 222 << 8 or $in->ask_warn('', N("An error occurred, try to change some parameters"));
 
     unlink "$::prefix/$f", "$::prefix/$f-4";
     unlink "/tmp/.X11-unix/X9" if $::prefix;
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm
index 75497109e..85b90bba0 100644
--- a/perl-install/Xconfig/various.pm
+++ b/perl-install/Xconfig/various.pm
@@ -20,26 +20,26 @@ sub info {
     my $info;
     my $xf_ver = Xconfig::card::using_xf4($card) ? "4.2.1" : "3.3.6";
     my $title = $card->{use_DRI_GLX} || $card->{use_UTAH_GLX} ?
-		 _("XFree %s with 3D hardware acceleration", $xf_ver) : _("XFree %s", $xf_ver);
+		 N("XFree %s with 3D hardware acceleration", $xf_ver) : N("XFree %s", $xf_ver);
     my $keyboard = eval { $raw_X->get_keyboard } || {};
     my $monitor = eval { $raw_X->get_monitor } || {};
     my $device = eval { $raw_X->get_device } || {};
     my $mouse = eval { first($raw_X->get_mice) } || {};
 
-    $info .= _("Keyboard layout: %s\n", $keyboard->{XkbLayout});
-    $info .= _("Mouse type: %s\n", $mouse->{Protocol});
-    $info .= _("Mouse device: %s\n", $mouse->{Device}) if $::expert;
-    $info .= _("Monitor: %s\n", $monitor->{ModelName});
-    $info .= _("Monitor HorizSync: %s\n", $monitor->{HorizSync}) if $::expert;
-    $info .= _("Monitor VertRefresh: %s\n", $monitor->{VertRefresh}) if $::expert;
-    $info .= _("Graphics card: %s\n", $device->{VendorName} . ' '. $device->{BoardName});
-    $info .= _("Graphics memory: %s kB\n", $device->{VideoRam}) if $device->{VideoRam};
+    $info .= N("Keyboard layout: %s\n", $keyboard->{XkbLayout});
+    $info .= N("Mouse type: %s\n", $mouse->{Protocol});
+    $info .= N("Mouse device: %s\n", $mouse->{Device}) if $::expert;
+    $info .= N("Monitor: %s\n", $monitor->{ModelName});
+    $info .= N("Monitor HorizSync: %s\n", $monitor->{HorizSync}) if $::expert;
+    $info .= N("Monitor VertRefresh: %s\n", $monitor->{VertRefresh}) if $::expert;
+    $info .= N("Graphics card: %s\n", $device->{VendorName} . ' '. $device->{BoardName});
+    $info .= N("Graphics memory: %s kB\n", $device->{VideoRam}) if $device->{VideoRam};
     if (my $resolution = eval { $raw_X->get_resolution }) {
-	$info .= _("Color depth: %s\n", translate($Xconfig::resolution_and_depth::depth2text{$resolution->{Depth}}));
-	$info .= _("Resolution: %s\n", join('x', @$resolution{'X', 'Y'}));
+	$info .= N("Color depth: %s\n", translate($Xconfig::resolution_and_depth::depth2text{$resolution->{Depth}}));
+	$info .= N("Resolution: %s\n", join('x', @$resolution{'X', 'Y'}));
     }
-    $info .= _("XFree86 server: %s\n", $card->{server}) if $card->{server};
-    $info .= _("XFree86 driver: %s\n", $device->{Driver}) if $device->{Driver};
+    $info .= N("XFree86 server: %s\n", $card->{server}) if $card->{server};
+    $info .= N("XFree86 driver: %s\n", $device->{Driver}) if $device->{Driver};
     "$title\n\n$info";
 }
 
@@ -58,8 +58,8 @@ sub choose_xdm {
     if (!$auto || $::isStandalone) {
 	$in->set_help('configureXxdm') if !$::isStandalone;
 
-	$xdm = $in->ask_yesorno(_("Graphical interface at startup"),
-_("I can setup your computer to automatically start the graphical interface (XFree) upon booting.
+	$xdm = $in->ask_yesorno(N("Graphical interface at startup"),
+N("I can setup your computer to automatically start the graphical interface (XFree) upon booting.
 Would you like XFree to start when you reboot?"), $xdm) or return;
     }
     any::runlevel($::prefix, $xdm ? 5 : 3);
@@ -70,7 +70,7 @@ sub tvout {
 
     $card->{FB_TVOUT} && Xconfig::card::using_xf4($card) && $options->{allowFB} or return;
 
-    $in->ask_yesorno('', _("Your graphic card seems to have a TV-OUT connector.
+    $in->ask_yesorno('', N("Your graphic card seems to have a TV-OUT connector.
 It can be configured to work using frame-buffer.
 
 For this you have to plug your graphic card to your TV before booting your computer.
@@ -82,7 +82,7 @@ Do you have this feature?")) or return;
     require timezone;
     my $norm = timezone::read()->{timezone} =~ /America/ ? 'NTSC' : 'PAL';
 
-    $norm = $in->ask_from_list('', _("What norm is your TV using?"), [ 'NTSC', 'PAL' ], $norm) or return;
+    $norm = $in->ask_from_list('', N("What norm is your TV using?"), [ 'NTSC', 'PAL' ], $norm) or return;
 
     configure_FB_TVOUT({ norm => $norm });
 }
diff --git a/perl-install/Xconfig/xfreeX.pm b/perl-install/Xconfig/xfreeX.pm
index 665b47177..e809e693b 100644
--- a/perl-install/Xconfig/xfreeX.pm
+++ b/perl-install/Xconfig/xfreeX.pm
@@ -190,7 +190,7 @@ sub set_resolution {
 		    '"default"';
 		} else {
 		    my @Modes = grep { 
-			/(\d+)x(\d+)/;
+			m/(\d+)x(\d+)/;
 			$1 <= $resolution->{X} && (!$resolution->{Y} || $2 <= $resolution->{Y});
 		    } reverse our @resolutions;
 		    join(" ", map { qq("$_") } @Modes);