diff options
Diffstat (limited to 'perl-install/Xconfig/various.pm')
-rw-r--r-- | perl-install/Xconfig/various.pm | 34 |
1 files changed, 17 insertions, 17 deletions
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 }); } |