diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-11-06 13:20:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-11-06 13:20:21 +0000 |
| commit | 9091151d546e5d749b47e2efce3ff651784fcc8c (patch) | |
| tree | 2be2bec5e60f21ffe431eeef74095896ae5efe7f | |
| parent | 68a1a2a6f2b9fdb1fd0c833cd9b3d8dcb9d8fd5c (diff) | |
| download | drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.gz drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.bz2 drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.tar.xz drakx-backup-do-not-use-9091151d546e5d749b47e2efce3ff651784fcc8c.zip | |
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!
112 files changed, 3175 insertions, 3169 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); diff --git a/perl-install/any.pm b/perl-install/any.pm index de2f7ac93..8403d39e7 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -105,12 +105,12 @@ sub setupBootloader { if ($automatic) { #- automatic } elsif ($semi_auto) { - my @l = (__("First sector of drive (MBR)"), __("First sector of boot partition")); + my @l = (N_("First sector of drive (MBR)"), N_("First sector of boot partition")); $in->set_help('setupBootloaderBeginner') unless $::isStandalone; if (arch() =~ /sparc/) { - $b->{use_partition} = $in->ask_from_list_(_("SILO Installation"), - _("Where do you want to install the bootloader?"), + $b->{use_partition} = $in->ask_from_list_(N("SILO Installation"), + N("Where do you want to install the bootloader?"), \@l, $l[$b->{use_partition}]) or return 0; } elsif (arch() =~ /ppc/) { if (defined $partition_table::mac::bootstrap_part) { @@ -122,33 +122,33 @@ sub setupBootloader { } else { my $boot = $hds->[0]{device}; my $onmbr = "/dev/$boot" eq $b->{boot}; - $b->{boot} = "/dev/" . ($in->ask_from_list_(_("LILO/grub Installation"), - _("Where do you want to install the bootloader?"), + $b->{boot} = "/dev/" . ($in->ask_from_list_(N("LILO/grub Installation"), + N("Where do you want to install the bootloader?"), \@l, $l[!$onmbr]) eq $l[0] ? $boot : fsedit::get_root($fstab, 'boot')->{device}); } } else { $in->set_help(arch() =~ /sparc/ ? "setupSILOGeneral" : arch() =~ /ppc/ ? 'setupYabootGeneral' :"setupBootloader") unless $::isStandalone; #- TO MERGE ? - my @silo_install_lang = (_("First sector of drive (MBR)"), _("First sector of boot partition")); + my @silo_install_lang = (N("First sector of drive (MBR)"), N("First sector of boot partition")); my $silo_install_lang = $silo_install_lang[$b->{use_partition}]; my %bootloaders = (if_(exists $b->{methods}{silo}, - __("SILO") => sub { $b->{methods}{silo} = 1 }), + N_("SILO") => sub { $b->{methods}{silo} = 1 }), if_(exists $b->{methods}{lilo}, - __("LILO with text menu") => sub { $b->{methods}{lilo} = "lilo-menu" }, - __("LILO with graphical menu") => sub { $b->{methods}{lilo} = "lilo-graphic" }), + N_("LILO with text menu") => sub { $b->{methods}{lilo} = "lilo-menu" }, + N_("LILO with graphical menu") => sub { $b->{methods}{lilo} = "lilo-graphic" }), if_(exists $b->{methods}{grub}, #- put lilo if grub is chosen, so that /etc/lilo.conf is generated - __("Grub") => sub { $b->{methods}{grub} = 1; + N_("Grub") => sub { $b->{methods}{grub} = 1; exists $b->{methods}{lilo} and $b->{methods}{lilo} = "lilo-menu" }), if_(exists $b->{methods}{loadlin}, - __("Boot from DOS/Windows (loadlin)") => sub { $b->{methods}{loadlin} = 1 }), + N_("Boot from DOS/Windows (loadlin)") => sub { $b->{methods}{loadlin} = 1 }), if_(exists $b->{methods}{yaboot}, - __("Yaboot") => sub { $b->{methods}{yaboot} = 1 }), + N_("Yaboot") => sub { $b->{methods}{yaboot} = 1 }), ); - my $bootloader = arch() =~ /sparc/ ? __("SILO") : arch() =~ /ppc/ ? __("Yaboot") : __("LILO with graphical menu"); + my $bootloader = arch() =~ /sparc/ ? N_("SILO") : arch() =~ /ppc/ ? N_("Yaboot") : N_("LILO with graphical menu"); my $profiles = bootloader::has_profiles($b); my $memsize = bootloader::get_append($b, 'mem'); my $prev_clean_tmp = my $clean_tmp = grep { $_->{mntpoint} eq '/tmp' } @{$all_hds->{special} ||= []}; @@ -156,46 +156,46 @@ sub setupBootloader { $b->{password2} ||= $b->{password} ||= ''; $b->{vga} ||= 'normal'; if (arch() !~ /ppc/) { - $in->ask_from('', _("Bootloader main options"), [ -{ label => _("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate }, + $in->ask_from('', N("Bootloader main options"), [ +{ label => N("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate }, arch() =~ /sparc/ ? ( -{ label => _("Bootloader installation"), val => \$silo_install_lang, list => \@silo_install_lang }, +{ label => N("Bootloader installation"), val => \$silo_install_lang, list => \@silo_install_lang }, ) : if_(arch() !~ /ia64/, -{ label => _("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } (@$hds, grep { !isFat($_) } @$fstab)), detect_devices::floppies_dev() ], not_edit => !$::expert }, -{ label => _("Compact"), val => \$b->{compact}, type => "bool", text => _("compact"), advanced => 1 }, -{ label => _("Video mode"), val => \$b->{vga}, list => [ keys %bootloader::vga_modes ], not_edit => !$::expert, format => sub { $bootloader::vga_modes{$_[0]} }, advanced => 1 }, +{ label => N("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } (@$hds, grep { !isFat($_) } @$fstab)), detect_devices::floppies_dev() ], not_edit => !$::expert }, +{ label => N("Compact"), val => \$b->{compact}, type => "bool", text => N("compact"), advanced => 1 }, +{ label => N("Video mode"), val => \$b->{vga}, list => [ keys %bootloader::vga_modes ], not_edit => !$::expert, format => sub { $bootloader::vga_modes{$_[0]} }, advanced => 1 }, ), -{ label => _("Delay before booting default image"), val => \$b->{timeout} }, +{ label => N("Delay before booting default image"), val => \$b->{timeout} }, if_($security >= 4 || $b->{password} || $b->{restricted}, -{ label => _("Password"), val => \$b->{password}, hidden => 1 }, -{ label => _("Password (again)"), val => \$b->{password2}, hidden => 1 }, -{ label => _("Restrict command line options"), val => \$b->{restricted}, type => "bool", text => _("restrict") }, +{ label => N("Password"), val => \$b->{password}, hidden => 1 }, +{ label => N("Password (again)"), val => \$b->{password2}, hidden => 1 }, +{ label => N("Restrict command line options"), val => \$b->{restricted}, type => "bool", text => N("restrict") }, ), -{ label => _("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 }, -{ label => _("Precise RAM size if needed (found %d MB)", availableRamMB()), val => \$memsize, advanced => 1 }, +{ label => N("Clean /tmp at each boot"), val => \$clean_tmp, type => 'bool', advanced => 1 }, +{ label => N("Precise RAM size if needed (found %d MB)", availableRamMB()), val => \$memsize, advanced => 1 }, if_(detect_devices::isLaptop(), -{ label => _("Enable multi profiles"), val => \$profiles, type => 'bool', advanced => 1 }, +{ label => N("Enable multi profiles"), val => \$profiles, type => 'bool', advanced => 1 }, ), ], complete => sub { - !$memsize || $memsize =~ /K$/ || $memsize =~ s/^(\d+)M?$/$1M/i or $in->ask_warn('', _("Give the ram size in MB")), return 1; -#- $security > 4 && length($b->{password}) < 6 and $in->ask_warn('', _("At this level of security, a password (and a good one) in lilo is requested")), return 1; - $b->{restricted} && !$b->{password} and $in->ask_warn('', _("Option ``Restrict command line options'' is of no use without a password")), return 1; - $b->{password} eq $b->{password2} or !$b->{restricted} or $in->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return 1; + !$memsize || $memsize =~ /K$/ || $memsize =~ s/^(\d+)M?$/$1M/i or $in->ask_warn('', N("Give the ram size in MB")), return 1; +#- $security > 4 && length($b->{password}) < 6 and $in->ask_warn('', N("At this level of security, a password (and a good one) in lilo is requested")), return 1; + $b->{restricted} && !$b->{password} and $in->ask_warn('', N("Option ``Restrict command line options'' is of no use without a password")), return 1; + $b->{password} eq $b->{password2} or !$b->{restricted} or $in->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return 1; 0; } ) or return 0; } else { $b->{boot} = $partition_table::mac::bootstrap_part; - $in->ask_from('', _("Bootloader main options"), [ - { label => _("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate }, - { label => _("Init Message"), val => \$b->{'init-message'} }, - { label => _("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } (grep { isAppleBootstrap($_) } @$fstab))], not_edit => !$::expert }, - { label => _("Open Firmware Delay"), val => \$b->{delay} }, - { label => _("Kernel Boot Timeout"), val => \$b->{timeout} }, - { label => _("Enable CD Boot?"), val => \$b->{enablecdboot}, type => "bool" }, - { label => _("Enable OF Boot?"), val => \$b->{enableofboot}, type => "bool" }, - { label => _("Default OS?"), val=> \$b->{defaultos}, list => [ 'linux', 'macos', 'macosx', 'darwin' ] }, + $in->ask_from('', N("Bootloader main options"), [ + { label => N("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate }, + { label => N("Init Message"), val => \$b->{'init-message'} }, + { label => N("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } (grep { isAppleBootstrap($_) } @$fstab))], not_edit => !$::expert }, + { label => N("Open Firmware Delay"), val => \$b->{delay} }, + { label => N("Kernel Boot Timeout"), val => \$b->{timeout} }, + { label => N("Enable CD Boot?"), val => \$b->{enablecdboot}, type => "bool" }, + { label => N("Enable OF Boot?"), val => \$b->{enableofboot}, type => "bool" }, + { label => N("Default OS?"), val=> \$b->{defaultos}, list => [ 'linux', 'macos', 'macosx', 'darwin' ] }, ]) or return 0; } @@ -207,7 +207,7 @@ sub setupBootloader { #- at least one method grep_each { $::b } %{$b->{methods}} or return 0; - $b->{use_partition} = $silo_install_lang eq _("First sector of drive (MBR)") ? 0 : 1; + $b->{use_partition} = $silo_install_lang eq N("First sector of drive (MBR)") ? 0 : 1; bootloader::set_profiles($b, $profiles); bootloader::add_append($b, "mem", $memsize); @@ -229,7 +229,7 @@ sub setupBootloader { is_empty_hash_ref($b->{bios}) && #- some bios mapping already there arch() !~ /ppc/) { log::l("mixed_kind_of_disks"); - my $hd = $in->ask_from_listf('', _("You decided to install the bootloader on a partition. + my $hd = $in->ask_from_listf('', N("You decided to install the bootloader on a partition. This implies you already have a bootloader on the hard drive you boot (eg: System Commander). On which drive are you booting?"), \&partition_table::description, $hds) or goto &setupBootloader; @@ -245,7 +245,7 @@ On which drive are you booting?"), \&partition_table::description, $hds) or goto $in->ask_from_( { messages => -_("Here are the entries on your boot menu so far. +N("Here are the entries on your boot menu so far. You can add some more or change the existing ones."), ok => '', }, @@ -255,7 +255,7 @@ You can add some more or change the existing ones."), "$e->{label} ($e->{kernel_or_dev})" . ($b->{default} eq $e->{label} && " *") : translate($e); }, list => [ @{$b->{entries}} ], allow_empty_list => 1 }, - (map { my $s = $_; { val => translate($_), clicked_may_quit => sub { $c = $s; 1 } } } (if_(@{$b->{entries}} > 0, __("Modify")), __("Add"), __("Done"))), + (map { my $s = $_; { val => translate($_), clicked_may_quit => sub { $c = $s; 1 } } } (if_(@{$b->{entries}} > 0, N_("Modify")), N_("Add"), N_("Done"))), ] ); !$c || $c eq "Done" and last; @@ -263,9 +263,9 @@ You can add some more or change the existing ones."), if ($c eq "Add") { my @labels = map { $_->{label} } @{$b->{entries}}; my $prefix; - if ($in->ask_from_list_('', _("Which type of entry do you want to add?"), - [ __("Linux"), arch() =~ /sparc/ ? __("Other OS (SunOS...)") : arch() =~ /ppc/ ? - __("Other OS (MacOS...)") : __("Other OS (windows...)") ] + if ($in->ask_from_list_('', N("Which type of entry do you want to add?"), + [ N_("Linux"), arch() =~ /sparc/ ? N_("Other OS (SunOS...)") : arch() =~ /ppc/ ? + N_("Other OS (MacOS...)") : N_("Other OS (windows...)") ] ) eq "Linux") { $e = { type => 'image', root => '/dev/' . fsedit::get_root($fstab)->{device}, #- assume a good default. @@ -284,53 +284,53 @@ You can add some more or change the existing ones."), my @l; if ($e->{type} eq "image") { @l = ( -{ label => _("Image"), val => \$e->{kernel_or_dev}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/vmlinuz*") ], not_edit => 0 }, -{ label => _("Root"), val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, -{ label => _("Append"), val => \$e->{append} }, +{ label => N("Image"), val => \$e->{kernel_or_dev}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/vmlinuz*") ], not_edit => 0 }, +{ label => N("Root"), val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, +{ label => N("Append"), val => \$e->{append} }, if_(arch !~ /ppc|ia64/, -{ label => _("Video mode"), val => \$e->{vga}, list => [ keys %bootloader::vga_modes ], format => sub { $bootloader::vga_modes{$_[0]} }, not_edit => !$::expert }, +{ label => N("Video mode"), val => \$e->{vga}, list => [ keys %bootloader::vga_modes ], format => sub { $bootloader::vga_modes{$_[0]} }, not_edit => !$::expert }, ), -{ label => _("Initrd"), val => \$e->{initrd}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/initrd*") ], not_edit => 0 }, -{ label => _("Read-write"), val => \$e->{'read-write'}, type => 'bool' } +{ label => N("Initrd"), val => \$e->{initrd}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/initrd*") ], not_edit => 0 }, +{ label => N("Read-write"), val => \$e->{'read-write'}, type => 'bool' } ); @l = @l[0..2] unless $::expert; } else { @l = ( -{ label => _("Root"), val => \$e->{kernel_or_dev}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, +{ label => N("Root"), val => \$e->{kernel_or_dev}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, if_(arch() !~ /sparc|ppc|ia64/, -{ label => _("Table"), val => \$e->{table}, list => [ '', map { "/dev/$_->{device}" } @$hds ], not_edit => !$::expert }, -{ label => _("Unsafe"), val => \$e->{unsafe}, type => 'bool' } +{ label => N("Table"), val => \$e->{table}, list => [ '', map { "/dev/$_->{device}" } @$hds ], not_edit => !$::expert }, +{ label => N("Unsafe"), val => \$e->{unsafe}, type => 'bool' } ), ); @l = $l[0] unless $::expert; } if (arch() !~ /ppc/) { @l = ( -{ label => _("Label"), val => \$e->{label} }, +{ label => N("Label"), val => \$e->{label} }, @l, -{ label => _("Default"), val => \$default, type => 'bool' }, +{ label => N("Default"), val => \$default, type => 'bool' }, ); } else { - unshift @l, { label => _("Label"), val => \$e->{label}, list => ['macos', 'macosx', 'darwin'] }; + unshift @l, { label => N("Label"), val => \$e->{label}, list => ['macos', 'macosx', 'darwin'] }; if ($e->{type} eq "image") { - @l = ({ label => _("Label"), val => \$e->{label} }, - $::expert ? @l[1..4] : (@l[1..2], { label => _("Append"), val => \$e->{append} }) , - if_($::expert, { label => _("Initrd-size"), val => \$e->{initrdsize}, list => [ '', '4096', '8192', '16384', '24576' ] }), + @l = ({ label => N("Label"), val => \$e->{label} }, + $::expert ? @l[1..4] : (@l[1..2], { label => N("Append"), val => \$e->{append} }) , + if_($::expert, { label => N("Initrd-size"), val => \$e->{initrdsize}, list => [ '', '4096', '8192', '16384', '24576' ] }), if_($::expert, $l[5]), - { label => _("NoVideo"), val => \$e->{novideo}, type => 'bool' }, - { label => _("Default"), val => \$default, type => 'bool' } + { label => N("NoVideo"), val => \$e->{novideo}, type => 'bool' }, + { label => N("Default"), val => \$default, type => 'bool' } ); } } if ($in->ask_from_( { - if_($c ne "Add", cancel => _("Remove entry")), + if_($c ne "Add", cancel => N("Remove entry")), callbacks => { complete => sub { - $e->{label} or $in->ask_warn('', _("Empty label not allowed")), return 1; - $e->{kernel_or_dev} or $in->ask_warn('', $e->{type} eq 'image' ? _("You must specify a kernel image") : _("You must specify a root partition")), return 1; - member(lc $e->{label}, map { lc $_->{label} } grep { $_ != $e } @{$b->{entries}}) and $in->ask_warn('', _("This label is already used")), return 1; + $e->{label} or $in->ask_warn('', N("Empty label not allowed")), return 1; + $e->{kernel_or_dev} or $in->ask_warn('', $e->{type} eq 'image' ? N("You must specify a kernel image") : N("You must specify a root partition")), return 1; + member(lc $e->{label}, map { lc $_->{label} } grep { $_ != $e } @{$b->{entries}}) and $in->ask_warn('', N("This label is already used")), return 1; 0; } } }, \@l)) { $b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default}; @@ -654,12 +654,12 @@ sub load_category__prompt_for_more { while (1) { my $msg = @l ? - [ _("Found %s %s interfaces", join(", ", @l), $msg_type), - _("Do you have another one?") ] : - _("Do you have any %s interfaces?", $msg_type); + [ N("Found %s %s interfaces", join(", ", @l), $msg_type), + N("Do you have another one?") ] : + N("Do you have any %s interfaces?", $msg_type); - my $opt = [ __("Yes"), __("No") ]; - push @$opt, __("See hardware info") if $::expert; + my $opt = [ N_("Yes"), N_("No") ]; + push @$opt, N_("See hardware info") if $::expert; #my $r = $in->ask_from_list_('', $msg, $opt, "No") or die 'already displayed'; my $r = $in->ask_from_list_('', $msg, $opt, "No") or return; if ($r eq "No") { return @l } @@ -676,8 +676,8 @@ sub wait_load_module { #-PO: the first %s is the card type (scsi, network, sound,...) #-PO: the second is the vendor+model name $in->wait_message('', - [ _("Installing driver for %s card %s", $category, $text), - if_($::expert, _("(module %s)", $module)) + [ N("Installing driver for %s card %s", $category, $text), + if_($::expert, N("(module %s)", $module)) ]); } @@ -688,15 +688,15 @@ sub load_module__ask_options { if (@parameters) { $in->ask_from('', - _("You may now provide its options to module %s.\nNote that any address should be entered with the prefix 0x like '0x123'", $module_descr), + N("You may now provide its options to module %s.\nNote that any address should be entered with the prefix 0x like '0x123'", $module_descr), [ map { { label => $_->[0] . ($_->[1] ? " ($_->[1])" : ''), help => $_->[2], val => \$_->[3] } } @parameters ], ) or return; [ map { if_($_->[3], "$_->[0]=$_->[3]") } @parameters ]; } else { my $s = $in->ask_from_entry('', -_("You may now provide options to module %s. +N("You may now provide options to module %s. Options are in format ``name=value name2=value2 ...''. -For instance, ``io=0x300 irq=7''", $module_descr), _("Module options:")) or return; +For instance, ``io=0x300 irq=7''", $module_descr), N("Module options:")) or return; [ split ' ', $s ]; } } @@ -708,7 +708,7 @@ sub load_category__prompt { my %available_modules = map_each { $::a => $::b ? "$::a ($::b)" : $::a } modules::category2modules_and_description($category); my $module = $in->ask_from_listf('', #-PO: the %s is the driver type (scsi, network, sound,...) - _("Which %s driver should I try?", $msg_type), + N("Which %s driver should I try?", $msg_type), sub { $available_modules{$_[0]} }, [ keys %available_modules ]) or return; my $module_descr = $available_modules{$module}; @@ -717,11 +717,11 @@ sub load_category__prompt { require modparm; my @parameters = modparm::parameters($module); if (@parameters && $in->ask_from_list_('', -_("In some cases, the %s driver needs to have extra information to work +N("In some cases, the %s driver needs to have extra information to work properly, although it normally works fine without. Would you like to specify extra options for it or allow the driver to probe your machine for the information it needs? Occasionally, probing will hang a computer, but it should -not cause any damage.", $module_descr), [ __("Autoprobe"), __("Specify options") ], 'Autoprobe') ne 'Autoprobe') { +not cause any damage.", $module_descr), [ N_("Autoprobe"), N_("Specify options") ], 'Autoprobe') ne 'Autoprobe') { $options = load_module__ask_options($in, $module_descr, \@parameters) or return; } while (1) { @@ -733,7 +733,7 @@ not cause any damage.", $module_descr), [ __("Autoprobe"), __("Specify options") return $module_descr if !$@; $in->ask_yesorno('', -_("Loading module %s failed. +N("Loading module %s failed. Do you want to try again with other parameters?", $module_descr), 1) or return; $options = load_module__ask_options($in, $module_descr, \@parameters) or return; @@ -749,33 +749,33 @@ sub ask_users { my @icons = facesnames($prefix); my %high_security_groups = ( - xgrp => _("access to X programs"), - rpm => _("access to rpm tools"), - wheel => _("allow \"su\""), - adm => _("access to administrative files"), - ntools => _("access to network tools"), - ctools => _("access to compilation tools"), + xgrp => N("access to X programs"), + rpm => N("access to rpm tools"), + wheel => N("allow \"su\""), + adm => N("access to administrative files"), + ntools => N("access to network tools"), + ctools => N("access to compilation tools"), ); while (1) { $u->{password2} ||= $u->{password} ||= ''; $u->{shell} ||= '/bin/bash'; - my $names = @$users ? _("(already added %s)", join(", ", map { $_->{realname} || $_->{name} } @$users)) : ''; + my $names = @$users ? N("(already added %s)", join(", ", map { $_->{realname} || $_->{name} } @$users)) : ''; my %groups; my $verif = sub { - $u->{password} eq $u->{password2} or $in->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,2); - $security > 3 && length($u->{password}) < 6 and $in->ask_warn('', _("This password is too simple")), return (1,2); - $u->{name} or $in->ask_warn('', _("Please give a user name")), return (1,0); - $u->{name} =~ /^[a-z0-9_-]+$/ or $in->ask_warn('', _("The user name must contain only lower cased letters, numbers, `-' and `_'")), return (1,0); - length($u->{name}) <= 32 or $in->ask_warn('', _("The user name is too long")), return (1,0); - member($u->{name}, 'root', map { $_->{name} } @$users) and $in->ask_warn('', _("This user name is already added")), return (1,0); + $u->{password} eq $u->{password2} or $in->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return (1,2); + $security > 3 && length($u->{password}) < 6 and $in->ask_warn('', N("This password is too simple")), return (1,2); + $u->{name} or $in->ask_warn('', N("Please give a user name")), return (1,0); + $u->{name} =~ /^[a-z0-9_-]+$/ or $in->ask_warn('', N("The user name must contain only lower cased letters, numbers, `-' and `_'")), return (1,0); + length($u->{name}) <= 32 or $in->ask_warn('', N("The user name is too long")), return (1,0); + member($u->{name}, 'root', map { $_->{name} } @$users) and $in->ask_warn('', N("This user name is already added")), return (1,0); return 0; }; my $ret = $in->ask_from_( - { title => _("Add user"), - messages => _("Enter a user\n%s", $names), - ok => _("Accept user"), - cancel => $security < 4 || @$users ? _("Done") : '', + { title => N("Add user"), + messages => N("Enter a user\n%s", $names), + ok => N("Accept user"), + cancel => $security < 4 || @$users ? N("Done") : '', callbacks => { focus_out => sub { if ($_[0] eq 0) { @@ -785,13 +785,13 @@ sub ask_users { complete => $verif, canceled => sub { $u->{name} ? &$verif : 0 }, } }, [ - { label => _("Real name"), val => \$u->{realname} }, - { label => _("User name"), val => \$u->{name} }, - { label => _("Password"),val => \$u->{password}, hidden => 1 }, - { label => _("Password (again)"), val => \$u->{password2}, hidden => 1 }, - { label => _("Shell"), val => \$u->{shell}, list => [ shells($prefix) ], not_edit => !$::expert, advanced => 1 }, + { label => N("Real name"), val => \$u->{realname} }, + { label => N("User name"), val => \$u->{name} }, + { label => N("Password"),val => \$u->{password}, hidden => 1 }, + { label => N("Password (again)"), val => \$u->{password2}, hidden => 1 }, + { label => N("Shell"), val => \$u->{shell}, list => [ shells($prefix) ], not_edit => !$::expert, advanced => 1 }, if_($security <= 3 && @icons, - { label => _("Icon"), val => \ ($u->{icon} ||= 'man'), list => \@icons, icon2f => sub { face2png($_[0], $prefix) }, format => \&translate }, + { label => N("Icon"), val => \ ($u->{icon} ||= 'man'), list => \@icons, icon2f => sub { face2png($_[0], $prefix) }, format => \&translate }, ), if_($security > 3, map { @@ -818,13 +818,13 @@ sub autologin { add2hash_($o, { autologin => $users[0] }); $in->ask_from_( - { title => _("Autologin"), - messages => _("I can set up your computer to automatically log on one user. + { title => N("Autologin"), + messages => N("I can set up your computer to automatically log on one user. Do you want to use this feature?"), - ok => _("Yes"), - cancel => _("No") }, - [ { label => _("Choose the default user:"), val => \$o->{autologin}, list => \@users }, - { label => _("Choose the window manager to run:"), val => \$o->{desktop}, list => \@wm } ] + ok => N("Yes"), + cancel => N("No") }, + [ { label => N("Choose the default user:"), val => \$o->{autologin}, list => \@users }, + { label => N("Choose the window manager to run:"), val => \$o->{desktop}, list => \@wm } ] ) or delete $o->{autologin}; } else { @@ -839,9 +839,9 @@ sub selectLanguage { exclude_non_installed_langs => !$::isInstall, ); $in->ask_from_( - { messages => _("Please choose a language to use."), + { messages => N("Please choose a language to use."), title => 'language choice', - advanced_messages => formatAlaTeX(_("Mandrake Linux can support multiple languages. Select + advanced_messages => formatAlaTeX(N("Mandrake Linux can support multiple languages. Select the languages you would like to install. They will be available when your installation is complete and you restart your system.")), callbacks => { @@ -855,7 +855,7 @@ when your installation is complete and you restart your system.")), text => $_->[1], advanced => 1, } } sort { $a->[1] cmp $b->[1] } map { [ $_, lang::lang2text($_) ] } lang::list()), - { val => \$langs->{all}, type => 'bool', text => _("All"), advanced => 1 }), + { val => \$langs->{all}, type => 'bool', text => N("All"), advanced => 1 }), ]) or return; $langs->{$lang} = 1; $lang; @@ -976,7 +976,7 @@ sub fileshare_config { my $file = '/etc/security/fileshare.conf'; my %conf = getVarsFromSh($file); - my @l = (__("No sharing"), __("Allow all users"), __("Custom")); + my @l = (N_("No sharing"), N_("Allow all users"), N_("Custom")); my $restrict = exists $conf{RESTRICT} ? text2bool($conf{RESTRICT}) : 1; if ($restrict) { @@ -986,10 +986,10 @@ sub fileshare_config { my @have = grep { -e $type2file{$_}[0] } @wanted; if (!@have) { if (@wanted == 1) { - $in->ask_okcancel('', _("The package %s needs to be installed. Do you want to install it?", $type2file{$wanted[0]}[1]), 1) or return; + $in->ask_okcancel('', N("The package %s needs to be installed. Do you want to install it?", $type2file{$wanted[0]}[1]), 1) or return; } else { my %choices; - my $wanted = $in->ask_many_from_list('', _("You can export using NFS or Samba. Please select which you'd like to use."), + my $wanted = $in->ask_many_from_list('', N("You can export using NFS or Samba. Please select which you'd like to use."), { list => \@wanted }) or return; @wanted = @$wanted or return; } @@ -997,13 +997,13 @@ sub fileshare_config { @have = grep { -e $type2file{$_}[0] } @wanted; } if (!@have) { - $in->ask_warn('', _("Mandatory package %s is missing", $wanted[0])); + $in->ask_warn('', N("Mandatory package %s is missing", $wanted[0])); return; } } my $r = $in->ask_from_list_('fileshare', -_("Would you like to allow users to share some of their directories? +N("Would you like to allow users to share some of their directories? Allowing this will permit users to simply click on \"Share\" in konqueror and nautilus. \"Custom\" permit a per-user granularity. @@ -1017,9 +1017,9 @@ Allowing this will permit users to simply click on \"Share\" in konqueror and na # custom if ($in->ask_from_no_check( { - -e '/usr/bin/userdrake' ? (ok => _("Launch userdrake"), cancel => _("Cancel")) : (cancel => ''), + -e '/usr/bin/userdrake' ? (ok => N("Launch userdrake"), cancel => N("Cancel")) : (cancel => ''), messages => -_("The per-user sharing uses the group \"fileshare\". +N("The per-user sharing uses the group \"fileshare\". You can use userdrake to add a user in this group.") }, [])) { if (!fork) { exec "userdrake" or c::_exit(0) } @@ -1070,38 +1070,38 @@ sub choose_security_level { my $expert_file = "/etc/security/msec/expert_mode"; my %l = ( - 0 => _("Welcome To Crackers"), - 1 => _("Poor"), - 2 => _("Standard"), - 3 => _("High"), - 4 => _("Higher"), - 5 => _("Paranoid"), + 0 => N("Welcome To Crackers"), + 1 => N("Poor"), + 2 => N("Standard"), + 3 => N("High"), + 4 => N("Higher"), + 5 => N("Paranoid"), ); my %help = ( - 0 => _("This level is to be used with care. It makes your system more easy to use, + 0 => N("This level is to be used with care. It makes your system more easy to use, but very sensitive: it must not be used for a machine connected to others or to the Internet. There is no password access."), - 1 => _("Password are now enabled, but use as a networked computer is still not recommended."), - 2 => _("This is the standard security recommended for a computer that will be used to connect to the Internet as a client."), - 3 => _("There are already some restrictions, and more automatic checks are run every night."), - 4 => _("With this security level, the use of this system as a server becomes possible. + 1 => N("Password are now enabled, but use as a networked computer is still not recommended."), + 2 => N("This is the standard security recommended for a computer that will be used to connect to the Internet as a client."), + 3 => N("There are already some restrictions, and more automatic checks are run every night."), + 4 => N("With this security level, the use of this system as a server becomes possible. The security is now high enough to use the system as a server which can accept connections from many clients. Note: if your machine is only a client on the Internet, you should choose a lower level."), - 5 => _("This is similar to the previous level, but the system is entirely closed and security features are at their maximum."), + 5 => N("This is similar to the previous level, but the system is entirely closed and security features are at their maximum."), ); delete @l{0,1}; delete $l{5} if !$::expert; $in->ask_from( - _("DrakSec Basic Options"), - _("Please choose the desired security level") . "\n\n" . + N("DrakSec Basic Options"), + N("Please choose the desired security level") . "\n\n" . join('', map { "$l{$_}: " . formatAlaTeX($help{$_}) . "\n\n" } ikeys %l), [ - { label => _("Security level"), val => $security, list => [ sort keys %l ], format => sub { $l{$_} } }, + { label => N("Security level"), val => $security, list => [ sort keys %l ], format => sub { $l{$_} } }, if_($in->do_pkgs->is_installed('libsafe') && arch() =~ /^i.86/, - { label => _("Use libsafe for servers"), val => $libsafe, type => 'bool', text => - _("A library which defends against buffer overflow and format string attacks.") } ), - { label => _("Security Administrator (login or email)"), val => $email, }, + { label => N("Use libsafe for servers"), val => $libsafe, type => 'bool', text => + N("A library which defends against buffer overflow and format string attacks.") } ), + { label => N("Security Administrator (login or email)"), val => $email, }, ], ); } @@ -1190,7 +1190,7 @@ sub keyboard_group_toggle_choose { if (my $grp_toggles = keyboard::grp_toggles($keyboard)) { my $GRP_TOGGLE = $keyboard->{GRP_TOGGLE} || 'caps_toggle'; - $GRP_TOGGLE = $in->ask_from_listf('', _("Here you can choose the key or key combination that will + $GRP_TOGGLE = $in->ask_from_listf('', N("Here you can choose the key or key combination that will allow switching between the different keyboard layouts (eg: latin and non latin)"), sub { $grp_toggles->{$_[0]} }, [ sort keys %$grp_toggles ], $GRP_TOGGLE) or return; diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 0e322efe1..48879cf31 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -426,7 +426,7 @@ sub suggest { if (!$lilo->{message}) { my $msg_en = #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) -__("Welcome to %s the operating system chooser! +N_("Welcome to %s the operating system chooser! Choose an operating system in the list above or wait %d seconds for default boot. @@ -986,23 +986,23 @@ EOF output "$::prefix/boot/grub/messages", map { substr(translate($_) . "\n", 0, 78) } ( #- ensure the translated messages are not too big the hard way #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("Welcome to GRUB the operating system chooser!"), +N_("Welcome to GRUB the operating system chooser!"), #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("Use the %c and %c keys for selecting which entry is highlighted."), +N_("Use the %c and %c keys for selecting which entry is highlighted."), #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("Press enter to boot the selected OS, \'e\' to edit the"), +N_("Press enter to boot the selected OS, \'e\' to edit the"), #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("commands before booting, or \'c\' for a command-line."), +N_("commands before booting, or \'c\' for a command-line."), #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) #-PO: and keep them smaller than 79 chars long -__("The highlighted entry will be booted automatically in %d seconds."), +N_("The highlighted entry will be booted automatically in %d seconds."), ); my $e = "$::prefix/boot/.enough_space"; - output $e, 1; -s $e or die _("not enough room in /boot"); + output $e, 1; -s $e or die N("not enough room in /boot"); unlink $e; $f; } @@ -1102,9 +1102,9 @@ sub install_loadlin_desktop { #-PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows #-PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language - foreach (__("Desktop"), + foreach (N_("Desktop"), #-PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows - __("Start Menu")) { + N_("Start Menu")) { my $d = "$windrive/$windir/" . translate($_); -d $d or $d = "$windrive/$windir/$_"; -d $d or log::l("can't find windows $d directory"), next; @@ -1123,7 +1123,7 @@ sub install { my ($lilo, $fstab, $hds) = @_; if (my ($p) = grep { $lilo->{boot} eq "/dev/$_->{device}" } @$fstab) { - die _("You can't install the bootloader on a %s partition\n", partition_table::type2fs($p)) + die N("You can't install the bootloader on a %s partition\n", partition_table::type2fs($p)) if isThisFs('xfs', $p); } $lilo->{keytable} = keytable($lilo->{keytable}); diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm index 07d90b4fb..1b8707826 100644 --- a/perl-install/bootlook.pm +++ b/perl-install/bootlook.pm @@ -43,7 +43,7 @@ if ($::isEmbedded) { my $in = 'interactive'->vnew('su', 'default'); local $_ = join '', @ARGV; -/-h/ and die _("no help implemented yet.\n"); +/-h/ and die N("no help implemented yet.\n"); /-version/ and die 'version: $Id$'."\n"; my @winm; @@ -59,7 +59,7 @@ my $lilogrub = chomp_(`detectloader -q`); my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window ("toplevel"); $window->signal_connect(delete_event => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) }); -$window->set_title(_("Boot Style Configuration")); +$window->set_title(N("Boot Style Configuration")); $window->border_width(2); #$window->realize; @@ -76,8 +76,8 @@ $window->border_width(2); ### menus definition # the menus are not shown # but they provides shiny shortcut like C-q -my @menu_items = ( { path => _("/_File"), type => '<Branch>' }, - { path => _("/File/_Quit"), accelerator => _("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) } }, +my @menu_items = ( { path => N("/_File"), type => '<Branch>' }, + { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) } }, ); my $menubar = ugtk::create_factory_menu($window, @menu_items); ######### menus end @@ -88,14 +88,14 @@ $user_combo->entry->set_text($auto_mode{autologin}) if ($auto_mode{autologin}); my $desktop_combo =new Gtk::Combo; $desktop_combo->set_popdown_strings(get_wm()); $desktop_combo->entry->set_text($auto_mode{desktop}) if ($auto_mode{desktop}); -my $a_c_button = new Gtk::RadioButton (_("NewStyle Categorizing Monitor")); -my $a_h_button = new Gtk::RadioButton _("NewStyle Monitor"), $a_c_button; -my $a_v_button = new Gtk::RadioButton _("Traditional Monitor"), $a_c_button; -my $a_g_button = new Gtk::RadioButton _("Traditional Gtk+ Monitor"),$a_c_button ; -my $a_button = new Gtk::CheckButton(_("Launch Aurora at boot time")); +my $a_c_button = new Gtk::RadioButton (N("NewStyle Categorizing Monitor")); +my $a_h_button = new Gtk::RadioButton N("NewStyle Monitor"), $a_c_button; +my $a_v_button = new Gtk::RadioButton N("Traditional Monitor"), $a_c_button; +my $a_g_button = new Gtk::RadioButton N("Traditional Gtk+ Monitor"),$a_c_button ; +my $a_button = new Gtk::CheckButton(N("Launch Aurora at boot time")); my $a_box = new Gtk::VBox(0, 0); my $x_box = new Gtk::VBox(0, 0); -my $disp_mode = arch() =~ /ppc/ ? _("Yaboot mode") : _("Lilo/grub mode"); +my $disp_mode = arch() =~ /ppc/ ? N("Yaboot mode") : N("Lilo/grub mode"); my %themes = ('path'=>'/usr/share/bootsplash/themes/', 'default'=>'Mandrake', @@ -143,9 +143,9 @@ my $lilo_pic = gtkpng($themes{'def_thmb'}); my $boot_pixbuf ; my $boot_pic = gtkpng($themes{'def_thmb'}); -my $thm_button = new Gtk::Button(_("Install themes")); -my $logo_thm = new Gtk::CheckButton(_("Display theme\nunder console")); -my $B_create = new Gtk::Button(_("Create new theme")); +my $thm_button = new Gtk::Button(N("Install themes")); +my $logo_thm = new Gtk::CheckButton(N("Display theme\nunder console")); +my $B_create = new Gtk::Button(N("Create new theme")); my $keep_logo = 1; $logo_thm->set_active(1); $logo_thm->signal_connect(clicked => sub { invbool(\$keep_logo) }); @@ -189,15 +189,15 @@ sub { #lilo installation if (-f $themes{'path'}.$combo{'lilo'}->entry->get_text() . $themes{'lilo'}{'file'}) { use MDK::Common::File; - standalone::explanations(_("Backup %s to %s.old",$lilomsg,$lilomsg)); + standalone::explanations(N("Backup %s to %s.old",$lilomsg,$lilomsg)); cp_af($lilomsg,"/boot/message-graphic.old") ; - #can't use this anymore or $in->ask_warn(_("Error"), _("unable to backup lilo message")); - standalone::explanations(_("Copy %s to %s",$themes{'path'} . $combo{'lilo'}->entry->get_text() . $themes{'lilo'}{'file'},$lilomsg)); + #can't use this anymore or $in->ask_warn(N("Error"), N("unable to backup lilo message")); + standalone::explanations(N("Copy %s to %s",$themes{'path'} . $combo{'lilo'}->entry->get_text() . $themes{'lilo'}{'file'},$lilomsg)); cp_af($themes{'path'} . $combo{'lilo'}->entry->get_text() . $themes{'lilo'}{'file'}, $lilomsg) ; - #can't use this anymore or $in->ask_warn(_("Error"), _("can't change lilo message")); + #can't use this anymore or $in->ask_warn(N("Error"), N("can't change lilo message")); } else { $error = 1; - $in->ask_warn(_("Error"), _("Lilo message not found")); + $in->ask_warn(N("Error"), N("Lilo message not found")); } #bootsplash install if ( -f $themes{'path'} . $combo{'boot'}->entry->get_text() . $themes{'boot'}{'path'} . "bootsplash-$cur_res.jpg") { @@ -227,9 +227,9 @@ THEME=" . $combo{'boot'}->entry->get_text() . " LOGO_CONSOLE=" . ($keep_logo ? 'yes' : 'no') . "\n"; if (-f $boot_conf_file) { eval { output($boot_conf_file, $bootsplash_cont) }; - $@ and $in->ask_warn(_("Error"), _("Can't write /etc/sysconfig/bootsplash.")) or standalone::explanations(_("Write %s",$boot_conf_file)); + $@ and $in->ask_warn(N("Error"), N("Can't write /etc/sysconfig/bootsplash.")) or standalone::explanations(N("Write %s",$boot_conf_file)); } else { - $in->ask_warn(_("Error"), _("Can't write /etc/sysconfig/bootsplash\nFile not found.")); + $in->ask_warn(N("Error"), N("Can't write /etc/sysconfig/bootsplash\nFile not found.")); $error = 1; } } else { @@ -239,24 +239,24 @@ LOGO_CONSOLE=" . ($keep_logo ? 'yes' : 'no') . "\n"; if (!$error) { foreach (map { if_(m|^initrd-(.*)\.img|, $1) } all('/boot')){ if ( system("mkinitrd -f /boot/initrd-$_.img $_" ) ) { - $in->ask_warn(_("Error"), - _("Can't launch mkinitrd -f /boot/initrd-%s.img %s.", $_,$_)); + $in->ask_warn(N("Error"), + N("Can't launch mkinitrd -f /boot/initrd-%s.img %s.", $_,$_)); $error = 1; } else { - standalone::explanations(_("Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'.", $_,$_)); + standalone::explanations(N("Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'.", $_,$_)); } } } if (system('lilo')) { - $in->ask_warn(_("Error"), -_("Can't relaunch LiLo! + $in->ask_warn(N("Error"), +N("Can't relaunch LiLo! Launch \"lilo\" as root in command line to complete LiLo theme installation.")); $error = 1; } else { - standalone::explanations(_("Relaunch 'lilo'")); + standalone::explanations(N("Relaunch 'lilo'")); } - $in->ask_warn(_(($error)?"Error":"Notice"), - _($error?"Theme installation failed!":"LiLo and Bootsplash themes installation successfull")); + $in->ask_warn($error ? N("Error") : N("Notice"), + $error ? N("Theme installation failed!") : N("LiLo and Bootsplash themes installation successfull")); }); gtkadd($window, @@ -264,36 +264,36 @@ gtkadd($window, gtkadd (new Gtk::Frame ("$disp_mode"), # gtkpack__(new Gtk::VBox(0,0), (gtkpack_(gtkset_border_width(new Gtk::HBox(0, 0),5), - 1,_("You are currently using %s as your boot manager. + 1,N("You are currently using %s as your boot manager. Click on Configure to launch the setup wizard.", $lilogrub), - 0,gtksignal_connect(new Gtk::Button (_("Configure")), clicked => $::lilo_choice), + 0,gtksignal_connect(new Gtk::Button (N("Configure")), clicked => $::lilo_choice), )), # "" #we need some place under the button -- replaced by gtkset_border_width( for the moment # ) ), #Splash Selector - gtkadd(my $thm_frame = new Gtk::Frame( _("Splash selection") ), + gtkadd(my $thm_frame = new Gtk::Frame( N("Splash selection") ), gtkpack__(gtkset_border_width(new Gtk::HBox(0,5),5), gtkpack__(new Gtk::VBox(0,5), - _("Themes"), + N("Themes"), $combo{'thms'}, - _("\nSelect theme for\nlilo and bootsplash,\nyou can choose\nthem separatly"), + N("\nSelect theme for\nlilo and bootsplash,\nyou can choose\nthem separatly"), $logo_thm), gtkpack__(new Gtk::VBox(0,5), - _("Lilo screen"), + N("Lilo screen"), $combo{'lilo'}, $lilo_pic, $B_create), gtkpack__(new Gtk::VBox(0,5), - _("Bootsplash"), + N("Bootsplash"), $combo{'boot'}, $boot_pic, $thm_button)) ), # aurora -# gtkadd (new Gtk::Frame (_("Boot mode")), +# gtkadd (new Gtk::Frame (N("Boot mode")), # gtkpack__ (new Gtk::HBox(0,0), # gtkpack__ (new Gtk::VBox(0, 5), # gtksignal_connect ($a_button, clicked => sub { @@ -321,16 +321,16 @@ Click on Configure to launch the setup wizard.", $lilogrub), # ) # ), # X - gtkadd (new Gtk::Frame (_("System mode")), + gtkadd (new Gtk::Frame (N("System mode")), gtkpack__ (new Gtk::VBox(0, 5), - gtksignal_connect(gtkset_active(new Gtk::CheckButton (_("Launch the graphical environment when your system starts")), $x_mode), clicked => sub { + gtksignal_connect(gtkset_active(new Gtk::CheckButton (N("Launch the graphical environment when your system starts")), $x_mode), clicked => sub { $x_box->set_sensitive(!$x_mode); $x_mode = !$x_mode; }), gtkpack__ (gtkset_sensitive ($x_box, $x_mode), - gtkset_active($x_no_button = new Gtk::RadioButton (_("No, I don't want autologin")), !$l_mode), + gtkset_active($x_no_button = new Gtk::RadioButton (N("No, I don't want autologin")), !$l_mode), gtkpack__ (new Gtk::HBox(0, 10), - gtkset_active($x_yes_button = new Gtk::RadioButton((_("Yes, I want autologin with this (user, desktop)")), $x_no_button), $l_mode), + gtkset_active($x_yes_button = new Gtk::RadioButton((N("Yes, I want autologin with this (user, desktop)")), $x_no_button), $l_mode), gtkpack__ (new Gtk::VBox(0, 10), $user_combo, $desktop_combo @@ -340,8 +340,8 @@ Click on Configure to launch the setup wizard.", $lilogrub), ) ), gtkadd (gtkset_layout(new Gtk::HButtonBox,-end), - gtksignal_connect(new Gtk::Button(_("OK")), clicked => sub{ updateInit(); updateAutologin(); updateAurora(); $::isEmbedded ? kill('USR1',$::CCPID) : Gtk->exit(0) }), - gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) }) + gtksignal_connect(new Gtk::Button(N("OK")), clicked => sub{ updateInit(); updateAutologin(); updateAurora(); $::isEmbedded ? kill('USR1',$::CCPID) : Gtk->exit(0) }), + gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) }) ) ) ); @@ -400,7 +400,7 @@ sub print_hello { sub isXlaunched { my $line; - open INITTAB, "/etc/inittab" or die _("can not open /etc/inittab for reading: %s", $!); + open INITTAB, "/etc/inittab" or die N("can not open /etc/inittab for reading: %s", $!); while (<INITTAB>) { if (/id:([1-6]):initdefault:/) { $line = $_; last } } diff --git a/perl-install/common.pm b/perl-install/common.pm index 6104b0b34..58872df01 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -8,7 +8,7 @@ use vars qw(@ISA @EXPORT $SECTORSIZE); @ISA = qw(Exporter); # no need to export ``_'' -@EXPORT = qw($SECTORSIZE __ translate untranslate formatXiB removeXiBSuffix formatTime setVirtual makedev unmakedev salt); +@EXPORT = qw($SECTORSIZE N N_ translate untranslate formatXiB removeXiBSuffix formatTime setVirtual makedev unmakedev salt); # perl_checker: RE-EXPORT-ALL push @EXPORT, @MDK::Common::EXPORT; @@ -24,11 +24,11 @@ $SECTORSIZE = 512; #-##################################################################################### -sub _ { +sub N { my $s = shift @_; my $t = translate($s); sprintf $t, @_; } -sub __ { $_[0] } +sub N_ { $_[0] } sub salt { my ($nb) = @_; @@ -96,7 +96,7 @@ sub formatXiB { ($nb, $base) = ($newnb, $newbase); $base >= 1024 ? ($newbase = $base / 1024) : ($newnb = $nb / 1024); }; - foreach ('', _("KB"), _("MB"), _("GB")) { + foreach ('', N("KB"), N("MB"), N("GB")) { $decr->(); if ($newnb < 1 && $newnb * $newbase < 1) { my $v = $nb * $base; @@ -104,7 +104,7 @@ sub formatXiB { return int($v) . ($s ? ".$s" : '') . $_; } } - int($newnb * $newbase) . _("TB"); + int($newnb * $newbase) . N("TB"); } sub formatTime { @@ -112,11 +112,11 @@ sub formatTime { if ($h) { sprintf "%02d:%02d", $h, $m; } elsif ($m > 1) { - _("%d minutes", $m); + N("%d minutes", $m); } elsif ($m == 1) { - _("1 minute"); + N("1 minute"); } else { - _("%d seconds", $s); + N("%d seconds", $s); } } @@ -161,14 +161,14 @@ sub take_screenshot { my $dir = screenshot_dir__and_move() . '/DrakX-screenshots'; my $warn; if (!-e $dir) { - mkdir $dir or $in->ask_warn('', _("Can't make screenshots before partitioning")), return; + mkdir $dir or $in->ask_warn('', N("Can't make screenshots before partitioning")), return; $warn = 1; } my $nb = 1; $nb++ while -e "$dir/$nb.png"; system("fb2png /dev/fb0 $dir/$nb.png 0"); - $in->ask_warn('', _("Screenshots will be available after install in %s", "/root/DrakX-screenshots")) if $warn; + $in->ask_warn('', N("Screenshots will be available after install in %s", "/root/DrakX-screenshots")) if $warn; } sub join_lines { diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm index ca302b02e..eae03336d 100644 --- a/perl-install/crypto.pm +++ b/perl-install/crypto.pm @@ -11,31 +11,31 @@ use log; use ftp; %url2land = ( - fr => _("France"), - cr => _("Costa Rica"), - be => _("Belgium"), - cz => _("Czech Republic"), - de => _("Germany"), - gr => _("Greece"), - no => _("Norway"), - se => _("Sweden"), - nl => _("Netherlands"), - it => _("Italy"), - at => _("Austria"), + fr => N("France"), + cr => N("Costa Rica"), + be => N("Belgium"), + cz => N("Czech Republic"), + de => N("Germany"), + gr => N("Greece"), + no => N("Norway"), + se => N("Sweden"), + nl => N("Netherlands"), + it => N("Italy"), + at => N("Austria"), ); %land2tzs = ( - _("France") => [ 'Europe/Paris', 'Europe/Brussels', 'Europe/Berlin' ], - _("Belgium") => [ 'Europe/Brussels', 'Europe/Paris', 'Europe/Berlin' ], - _("Czech Republic") => [ 'Europe/Prague', 'Europe/Berlin' ], - _("Germany") => [ 'Europe/Berlin', 'Europe/Prague' ], - _("Greece") => [ 'Europe/Athens', 'Europe/Prague' ], - _("Norway") => [ 'Europe/Oslo', 'Europe/Stockholm' ], - _("Sweden") => [ 'Europe/Stockholm', 'Europe/Oslo' ], - _("United States") => [ 'America/New_York', 'Canada/Atlantic', 'Asia/Tokyo', 'Australia/Sydney', 'Europe/Paris' ], - _("Netherlands") => [ 'Europe/Amsterdam', 'Europe/Brussels', 'Europe/Berlin' ], - _("Italy") => [ 'Europe/Rome', 'Europe/Brussels', 'Europe/Paris' ], - _("Austria") => [ 'Europe/Vienna', 'Europe/Brussels', 'Europe/Berlin' ], + N("France") => [ 'Europe/Paris', 'Europe/Brussels', 'Europe/Berlin' ], + N("Belgium") => [ 'Europe/Brussels', 'Europe/Paris', 'Europe/Berlin' ], + N("Czech Republic") => [ 'Europe/Prague', 'Europe/Berlin' ], + N("Germany") => [ 'Europe/Berlin', 'Europe/Prague' ], + N("Greece") => [ 'Europe/Athens', 'Europe/Prague' ], + N("Norway") => [ 'Europe/Oslo', 'Europe/Stockholm' ], + N("Sweden") => [ 'Europe/Stockholm', 'Europe/Oslo' ], + N("United States") => [ 'America/New_York', 'Canada/Atlantic', 'Asia/Tokyo', 'Australia/Sydney', 'Europe/Paris' ], + N("Netherlands") => [ 'Europe/Amsterdam', 'Europe/Brussels', 'Europe/Berlin' ], + N("Italy") => [ 'Europe/Rome', 'Europe/Brussels', 'Europe/Paris' ], + N("Austria") => [ 'Europe/Vienna', 'Europe/Brussels', 'Europe/Berlin' ], ); %static_mirrors = ( @@ -58,7 +58,7 @@ sub mirrors { my ($arch, $url, $dir) = m|updates([^:]*):ftp://([^/]*)(/\S*)| or next; MDK::Common::System::compat_arch($arch) or log::l("ignoring updates from $url because of incompatible arch: $arch"), next; - my $land = _("United States"); + my $land = N("United States"); foreach (keys %url2land) { my $qu = quotemeta $_; $url =~ /\.$qu(?:\..*)?$/ and $land = $url2land{$_}; 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; } diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm index 454da1735..f8852466c 100644 --- a/perl-install/diskdrake/hd_gtk.pm +++ b/perl-install/diskdrake/hd_gtk.pm @@ -91,10 +91,10 @@ sub main { $w->sync; $done_button->grab_focus; $my_gtk::pop_it = 1; - $in->ask_okcancel(_("Read carefully!"), _("Please make a backup of your data first"), 1) or return + $in->ask_okcancel(N("Read carefully!"), N("Please make a backup of your data first"), 1) or return if $::isStandalone; $in->ask_warn('', -_("If you plan to use aboot, be carefull to leave a free space (2048 sectors is enough) +N("If you plan to use aboot, be carefull to leave a free space (2048 sectors is enough) at the beginning of the disk")) if (arch() eq 'alpha') and !$::isEmbedded; $w->main; @@ -113,7 +113,7 @@ sub try_ { my $v = eval { $f->($in, @args, $all_hds) }; if (my $err = $@) { $err =~ /setstep/ and die ''; - $in->ask_warn(_("Error"), formatError($err)); + $in->ask_warn(N("Error"), formatError($err)); } $current_entry = '' if !diskdrake::interactive::is_part_existing($current_entry, $all_hds); @@ -148,9 +148,9 @@ sub add_kind2notebook { sub general_action_box { my ($box, $nowizard) = @_; $_->widget->destroy foreach $box->children; - my @actions = (if_($::isInstall && !$nowizard, __("Wizard")), + my @actions = (if_($::isInstall && !$nowizard, N_("Wizard")), diskdrake::interactive::general_possible_actions($in, $all_hds), - __("Done")); + N_("Done")); foreach my $s (@actions) { my $button = new Gtk::Button(translate($s)); $done_button = $button if $s eq 'Done'; @@ -181,14 +181,14 @@ sub per_entry_action_box { $w; } diskdrake::interactive::part_possible_actions($in, kind2hd($kind), $entry, $all_hds); - gtkadd($box, gtkadd(new Gtk::Frame(_("Choose action")), + gtkadd($box, gtkadd(new Gtk::Frame(N("Choose action")), createScrolledWindow(gtkpack__(new Gtk::VBox(0,0), @buttons)))) if @buttons; } else { my $txt = !$::isStandalone && fsedit::is_one_big_fat($all_hds->{hds}) ? -_("You have one big FAT partition +N("You have one big FAT partition (generally used by MicroSoft Dos/Windows). I suggest you first resize that partition -(click on it, then click on \"Resize\")") : _("Please click on a partition"); +(click on it, then click on \"Resize\")") : N("Please click on a partition"); gtkpack($box, gtktext_insert(new Gtk::Text, $txt)); } } @@ -202,7 +202,7 @@ sub per_entry_info_box { } elsif ($kind->{type} =~ /hd|lvm/) { $info = diskdrake::interactive::format_hd_info($kind->{val}); } - gtkpack($box, gtkadd(new Gtk::Frame(_("Details")), gtkset_justify(new Gtk::Label($info), 'left'))); + gtkpack($box, gtkadd(new Gtk::Frame(N("Details")), gtkset_justify(new Gtk::Label($info), 'left'))); } sub current_kind_changed { @@ -249,7 +249,7 @@ sub create_automatic_notebooks { my $b = $_->{marked} or $notebook_widget->remove_page($::i); $b; } @notebook; - @notebook or die _("No hard drives found"); + @notebook or die N("No hard drives found"); } ################################################################################ @@ -320,12 +320,12 @@ sub hd2kind { } sub filesystems_button_box() { - my @types = (__("Ext2"), __("Journalised FS"), __("Swap"), arch() =~ /sparc/ ? __("SunOS") : arch() eq "ppc" ? __("HFS") : __("FAT"), - __("Other"), __("Empty")); + my @types = (N_("Ext2"), N_("Journalised FS"), N_("Swap"), arch() =~ /sparc/ ? N_("SunOS") : arch() eq "ppc" ? N_("HFS") : N_("FAT"), + N_("Other"), N_("Empty")); my %name2type = (Ext2 => 0x83, 'Journalised FS' => 0x483, Swap => 0x82, Other => 1, FAT => 0xb, HFS => 0x402); gtkpack(new Gtk::HBox(0,0), - _("Filesystem types:"), + N("Filesystem types:"), map { my $w = new Gtk::Button(translate($_)); my $t = $name2type{$_}; $w->signal_connect(clicked => sub { try_('', \&createOrChangeType, $t, current_hd(), current_part()) }); @@ -342,14 +342,14 @@ sub createOrChangeType { { type => 0, start => 1, size => $hd->{totalsectors} - 1 }; $part or return; if ($type == 1) { - $in->ask_warn('', _("Use ``%s'' instead", $part->{type} ? _("Type") : _("Create"))); + $in->ask_warn('', N("Use ``%s'' instead", $part->{type} ? N("Type") : N("Create"))); } elsif (!$type) { - $in->ask_warn('', _("Use ``%s'' instead", _("Delete"))) if $part->{type}; + $in->ask_warn('', N("Use ``%s'' instead", N("Delete"))) if $part->{type}; } elsif ($part->{type}) { return unless $::expert; return if $type == $part->{type}; - isBusy($part) and $in->ask_warn('', _("Use ``Unmount'' first")), return; - diskdrake::interactive::ask_alldatawillbelost($in, $part, __("After changing type of partition %s, all data on this partition will be lost")) or return; + isBusy($part) and $in->ask_warn('', N("Use ``Unmount'' first")), return; + diskdrake::interactive::ask_alldatawillbelost($in, $part, N_("After changing type of partition %s, all data on this partition will be lost")) or return; diskdrake::interactive::check_type($in, $type, $hd, $part) and fsedit::change_type($type, $hd, $part); } else { $part->{type} = $type; diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 9020e999f..c28000c95 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -172,7 +172,7 @@ sub main { my ($current_part, $current_hd); while (1) { - my $choose_txt = $current_part ? __("Choose another partition") : __("Choose a partition"); + my $choose_txt = $current_part ? N_("Choose another partition") : N_("Choose a partition"); my $parts_and_holes = [ fsedit::get_all_fstab_and_holes($all_hds) ]; my $choose_part = sub { $current_part = $in->ask_from_listf('diskdrake', translate($choose_txt), sub { format_part_info_short(fsedit::part2hd($_[0], $all_hds), $_[0]) }, $parts_and_holes, $current_part) || return; @@ -197,7 +197,7 @@ sub main { my $a; if ($current_part) { $in->ask_from_({ - cancel => _("Exit"), + cancel => N("Exit"), title => 'diskdrake', messages => format_part_info($current_hd, $current_part), }, @@ -211,7 +211,7 @@ sub main { } return if eval { Done($in, $all_hds) }; if (my $err = $@) { - $in->ask_warn(_("Error"), formatError($err)); + $in->ask_warn(N("Error"), formatError($err)); } goto &main; } @@ -223,7 +223,7 @@ sub main { # general actions ################################################################################ sub general_possible_actions { - __("Undo"), ($::expert ? __("Toggle to normal mode") : __("Toggle to expert mode")); + N_("Undo"), ($::expert ? N_("Toggle to normal mode") : N_("Toggle to expert mode")); } @@ -242,17 +242,17 @@ sub Done { eval { raid::verify($all_hds->{raids}) }; if (my $err = $@) { $::expert or die; - $in->ask_okcancel('', [ formatError($err), _("Continue anyway?")]) or return; + $in->ask_okcancel('', [ formatError($err), N("Continue anyway?")]) or return; } foreach (@{$all_hds->{hds}}) { if (!write_partitions($in, $_)) { return if !$::isStandalone; - $in->ask_yesorno(_("Quit without saving"), _("Quit without writing the partition table?"), 1) or return; + $in->ask_yesorno(N("Quit without saving"), N("Quit without writing the partition table?"), 1) or return; } } if (!$::isInstall) { my $new = fs::fstab_to_string($all_hds); - if ($new ne $all_hds->{current_fstab} && $in->ask_yesorno('', _("Do you want to save /etc/fstab modifications"), 1)) { + if ($new ne $all_hds->{current_fstab} && $in->ask_yesorno('', N("Do you want to save /etc/fstab modifications"), 1)) { $all_hds->{current_fstab} = $new; fs::write_fstab($all_hds); } @@ -266,14 +266,14 @@ sub Done { sub hd_possible_actions { my ($in, $hd, $all_hds) = @_; ( - if_(!$hd->{readonly} || $hd->{getting_rid_of_readonly_allowed}, __("Clear all")), - if_(!$hd->{readonly} && $::isInstall, __("Auto allocate")), - __("More"), + if_(!$hd->{readonly} || $hd->{getting_rid_of_readonly_allowed}, N_("Clear all")), + if_(!$hd->{readonly} && $::isInstall, N_("Auto allocate")), + N_("More"), ); } sub hd_possible_actions_interactive { my ($in, $hd, $all_hds) = @_; - &hd_possible_actions, __("Hard drive information"); + &hd_possible_actions, N_("Hard drive information"); } sub Clear_all { @@ -305,9 +305,9 @@ sub Auto_allocate { $@ =~ /partition table already full/ or die; $in->ask_warn("", [ - _("All primary partitions are used"), - _("I can't add any more partition"), - _("To have more partitions, please delete one to be able to create an extended partition"), + N("All primary partitions are used"), + N("I can't add any more partition"), + N("To have more partitions, please delete one to be able to create an extended partition"), ]); } } @@ -317,16 +317,16 @@ sub More { $in->ask_from('', '', [ - { val => _("Save partition table"), clicked_may_quit => sub { SaveInFile($in, $hd); 1 } }, - { val => _("Restore partition table"), clicked_may_quit => sub { ReadFromFile($in, $hd); 1 } }, - { val => _("Rescue partition table"), clicked_may_quit => sub { Rescuept($in, $hd); 1 } }, + { val => N("Save partition table"), clicked_may_quit => sub { SaveInFile($in, $hd); 1 } }, + { val => N("Restore partition table"), clicked_may_quit => sub { ReadFromFile($in, $hd); 1 } }, + { val => N("Rescue partition table"), clicked_may_quit => sub { Rescuept($in, $hd); 1 } }, if_($::isInstall, - { val => _("Reload partition table"), clicked => sub { + { val => N("Reload partition table"), clicked => sub { $::o->{all_hds} = fsedit::empty_all_hds(); die "setstep doPartitionDisks\n" if $::setstep; } }), if_($::isInstall, - { text => _("Removable media automounting"), val => \$::o->{useSupermount}, type => 'bool' }, + { text => N("Removable media automounting"), val => \$::o->{useSupermount}, type => 'bool' }, ), ], ); @@ -335,19 +335,19 @@ sub More { sub ReadFromFile { my ($in, $hd) = @_; - my $file = $::isStandalone ? $in->ask_file(_("Select file")) : devices::make("fd0") or return; + my $file = $::isStandalone ? $in->ask_file(N("Select file")) : devices::make("fd0") or return; eval { catch_cdie { partition_table::load($hd, $file) } sub { $@ =~ /bad totalsectors/ or return; $in->ask_yesorno('', -_("The backup partition table has not the same size +N("The backup partition table has not the same size Still continue?"), 0); }; }; if (my $err = $@) { - $in->ask_warn(_("Error"), formatError($err)); + $in->ask_warn(N("Error"), formatError($err)); } } @@ -355,26 +355,26 @@ sub SaveInFile { my ($in, $hd) = @_; my $file = $::isStandalone ? - $in->ask_file(_("Select file")) : - $in->ask_okcancel(_("Warning"), -_("Insert a floppy in drive + $in->ask_file(N("Select file")) : + $in->ask_okcancel(N("Warning"), +N("Insert a floppy in drive All data on this floppy will be lost"), 1) && devices::make(detect_devices::floppy()) or return; eval { partition_table::save($hd, $file) }; if (my $err = $@) { - $in->ask_warn(_("Error"), formatError($err)); + $in->ask_warn(N("Error"), formatError($err)); } } sub Rescuept { my ($in, $hd) = @_; - my $w = $in->wait_message('', _("Trying to rescue partition table")); + my $w = $in->wait_message('', N("Trying to rescue partition table")); fsedit::rescuept($hd); } sub Hd_info { my ($in, $hd) = @_; - $in->ask_warn('', [ _("Detailed information"), format_hd_info($hd) ]); + $in->ask_warn('', [ N("Detailed information"), format_hd_info($hd) ]); } ################################################################################ @@ -386,21 +386,21 @@ sub part_possible_actions { $part or return; my %actions = my @l = ( - __("Mount point") => '($part->{real_mntpoint} && common::usingRamdisk()) || (!isBusy && !isSwap && !isNonMountable)', - __("Type") => '!isBusy && $::expert && (!readonly || ($part->{type} & 0xff) == 0x83)', - __("Options") => '$::expert', - __("Resize") => '!isBusy && !readonly && !isSpecial || isLVM($hd) && isMounted && isThisFs("xfs", $part)', - __("Move") => '!isBusy && !readonly && !isSpecial && $::expert && 0', # disable for the moment - __("Format") => '!isBusy && !readonly && ($::expert || $::isStandalone)', - __("Mount") => '!isBusy && (hasMntpoint || isSwap) && maybeFormatted && ($::expert || $::isStandalone)', - __("Add to RAID") => '!isBusy && isRawRAID && !isSpecial', - __("Add to LVM") => '!isBusy && isRawLVM', - __("Unmount") => '!$part->{real_mntpoint} && isMounted', - __("Delete") => '!isBusy && !readonly', - __("Remove from RAID") => 'isPartOfRAID', - __("Remove from LVM") => 'isPartOfLVM', - __("Modify RAID") => 'isPartOfRAID && !isMounted($all_hds->{raids}[$part->{raid}])', - __("Use for loopback") => '!$part->{real_mntpoint} && isMountableRW && !isSpecial && hasMntpoint && $::expert', + N_("Mount point") => '($part->{real_mntpoint} && common::usingRamdisk()) || (!isBusy && !isSwap && !isNonMountable)', + N_("Type") => '!isBusy && $::expert && (!readonly || ($part->{type} & 0xff) == 0x83)', + N_("Options") => '$::expert', + N_("Resize") => '!isBusy && !readonly && !isSpecial || isLVM($hd) && isMounted && isThisFs("xfs", $part)', + N_("Move") => '!isBusy && !readonly && !isSpecial && $::expert && 0', # disable for the moment + N_("Format") => '!isBusy && !readonly && ($::expert || $::isStandalone)', + N_("Mount") => '!isBusy && (hasMntpoint || isSwap) && maybeFormatted && ($::expert || $::isStandalone)', + N_("Add to RAID") => '!isBusy && isRawRAID && !isSpecial', + N_("Add to LVM") => '!isBusy && isRawLVM', + N_("Unmount") => '!$part->{real_mntpoint} && isMounted', + N_("Delete") => '!isBusy && !readonly', + N_("Remove from RAID") => 'isPartOfRAID', + N_("Remove from LVM") => 'isPartOfLVM', + N_("Modify RAID") => 'isPartOfRAID && !isMounted($all_hds->{raids}[$part->{raid}])', + N_("Use for loopback") => '!$part->{real_mntpoint} && isMountableRW && !isSpecial && hasMntpoint && $::expert', ); my ($actions_names) = list2kv(@l); my %macros = ( @@ -409,7 +409,7 @@ sub part_possible_actions { isPrimary => 'isPrimary($part, $hd)', ); if ($part->{type} == 0) { - if_(!$hd->{readonly}, __("Create")); + if_(!$hd->{readonly}, N_("Create")); } else { grep { my $cond = $actions{$_}; @@ -440,18 +440,18 @@ sub Create { my $mb_size = $part->{size} >> 11; my $has_startsector = ($::expert || arch() !~ /i.86/) && !isLVM($hd); - my $w = $in->ask_from(_("Create a new partition"), '', + my $w = $in->ask_from(N("Create a new partition"), '', [ if_($has_startsector, - { label => _("Start sector: "), val => \$part->{start}, min => $def_start, max => ($max - min_partition_size($hd)), type => 'range' }, + { label => N("Start sector: "), val => \$part->{start}, min => $def_start, max => ($max - min_partition_size($hd)), type => 'range' }, ), - { label => _("Size in MB: "), val => \$mb_size, min => min_partition_size($hd) >> 11, max => $def_size >> 11, type => 'range' }, - { label => _("Filesystem type: "), val => \$type, list => [ partition_table::important_types() ], sort => 0 }, - { label => _("Mount point: "), val => \$part->{mntpoint}, list => [ fsedit::suggestions_mntpoint($all_hds), '' ], + { label => N("Size in MB: "), val => \$mb_size, min => min_partition_size($hd) >> 11, max => $def_size >> 11, type => 'range' }, + { label => N("Filesystem type: "), val => \$type, list => [ partition_table::important_types() ], sort => 0 }, + { label => N("Mount point: "), val => \$part->{mntpoint}, list => [ fsedit::suggestions_mntpoint($all_hds), '' ], disabled => sub { my $p = { type => name2type($type) }; isSwap($p) || isNonMountable($p) }, type => 'combo', not_edit => 0, }, if_($::expert && $hd->hasExtended, - { label => _("Preference: "), val => \$primaryOrExtended, list => [ '', "Extended", "Primary", if_($::expert, "Extended_0x85") ] }, + { label => N("Preference: "), val => \$primaryOrExtended, list => [ '', "Extended", "Primary", if_($::expert, "Extended_0x85") ] }, ), ], changed => sub { if ($part->{start} + ($mb_size << 11) > $max) { @@ -476,12 +476,12 @@ sub Create { eval { fsedit::add($hd, $part, $all_hds, { force => 1, primaryOrExtended => $primaryOrExtended }) }; if (my $err = $@) { if ($err =~ /raw_add/ && $hd->hasExtended && !$hd->{primary}{extended}) { - $in->ask_warn(_("Error"), _("You can't create a new partition + $in->ask_warn(N("Error"), N("You can't create a new partition (since you reached the maximal number of primary partitions). First remove a primary partition and create an extended partition.")); return 0; } else { - $in->ask_warn(_("Error"), $@); + $in->ask_warn(N("Error"), $@); return 1; } } @@ -506,7 +506,7 @@ sub Delete { lvm::lv_delete($hd, $part); } elsif (isLoopback($part)) { my $f = "$part->{loopback_device}{mntpoint}$part->{loopback_file}"; - if (-e $f && $in->ask_yesorno('', _("Remove the loopback file?"))) { + if (-e $f && $in->ask_yesorno('', N("Remove the loopback file?"))) { unlink $f; } my $l = $part->{loopback_device}{loopback}; @@ -525,7 +525,7 @@ sub Delete { sub Type { my ($in, $hd, $part) = @_; - my $warn = sub { ask_alldatawillbelost($in, $part, __("After changing type of partition %s, all data on this partition will be lost")) }; + my $warn = sub { ask_alldatawillbelost($in, $part, N_("After changing type of partition %s, all data on this partition will be lost")) }; #- for ext2, warn after choosing as ext2->ext3 can be achieved without loosing any data :) isExt2($part) or $warn->() or return; @@ -536,14 +536,14 @@ sub Type { @types = grep { (name2type($_) & 0xff) == 0x83 } @types if $hd->{readonly}; my $type_name = type2name($part->{type}); - $in->ask_from(_("Change partition type"), - _("Which filesystem do you want?"), - [ { label => _("Type"), val => \$type_name, list => \@types, sort => 0, not_edit => !$::expert } ]) or return; + $in->ask_from(N("Change partition type"), + N("Which filesystem do you want?"), + [ { label => N("Type"), val => \$type_name, list => \@types, sort => 0, not_edit => !$::expert } ]) or return; my $type = $type_name && name2type($type_name); if (isExt2($part) && isThisFs('ext3', { type => $type })) { - my $w = $in->wait_message('', _("Switching from ext2 to ext3")); + my $w = $in->wait_message('', N("Switching from ext2 to ext3")); if (run_program::run("tune2fs", "-j", devices::make($part->{device}))) { $part->{type} = $type; $part->{isFormatted} = 1; #- assume that if tune2fs works, partition is formatted @@ -573,14 +573,14 @@ sub Mount_point { }; $in->ask_from( '', - isLoopback($part) ? _("Where do you want to mount loopback file %s?", $part->{loopback_file}) : - _("Where do you want to mount device %s?", $part->{device}), - [ { label => _("Mount point"), val => \$mntpoint, + isLoopback($part) ? N("Where do you want to mount loopback file %s?", $part->{loopback_file}) : + N("Where do you want to mount device %s?", $part->{device}), + [ { label => N("Mount point"), val => \$mntpoint, list => [ if_($mntpoint, $mntpoint), fsedit::suggestions_mntpoint($all_hds), '' ], not_edit => 0 } ], complete => sub { !isPartOfLoopback($part) || $mntpoint or $in->ask_warn('', -_("Can't unset mount point as this partition is used for loop back. +N("Can't unset mount point as this partition is used for loop back. Remove the loopback first")), return 1; $part->{mntpoint} eq $mntpoint || check_mntpoint($in, $mntpoint, $hd, $part, $all_hds) or return 1; $migrate_files = need_migration($in, $mntpoint) or return 1; @@ -601,8 +601,8 @@ sub Mount_point_raw_hd { my $mntpoint = $part->{mntpoint} || shift @propositions; $in->ask_from( '', - _("Where do you want to mount %s?", $part->{device}), - [ { label => _("Mount point"), val => \$mntpoint, + N("Where do you want to mount %s?", $part->{device}), + [ { label => N("Mount point"), val => \$mntpoint, list => [ if_($mntpoint, $mntpoint), '', @propositions ], not_edit => 0 } ], complete => sub { @@ -625,7 +625,7 @@ sub Resize { if (isFat($part)) { write_partitions($in, $hd) or return; #- try to resize without losing data - my $w = $in->wait_message(_("Resizing"), _("Computing FAT filesystem bounds")); + my $w = $in->wait_message(N("Resizing"), N("Computing FAT filesystem bounds")); $nice_resize{fat} = resize_fat::main->new($part->{device}, devices::make($part->{device})); $min = max($min, $nice_resize{fat}->min_size); @@ -657,20 +657,20 @@ sub Resize { #- make sure that even after normalizing the size to cylinder boundaries, the minimun will be saved, #- this save at least a cylinder (less than 8Mb). $min += partition_table::raw::cylinder_size($hd); - $min >= $max and return $in->ask_warn('', _("This partition is not resizeable")); + $min >= $max and return $in->ask_warn('', N("This partition is not resizeable")); #- for these, we have tools to resize partition table #- without losing data (or at least we hope so :-) if (%nice_resize) { - ask_alldatamaybelost($in, $part, __("All data on this partition should be backed-up")) or return; + ask_alldatamaybelost($in, $part, N_("All data on this partition should be backed-up")) or return; } else { - ask_alldatawillbelost($in, $part, __("After resizing partition %s, all data on this partition will be lost")) or return; + ask_alldatawillbelost($in, $part, N_("After resizing partition %s, all data on this partition will be lost")) or return; } } my $mb_size = $part->{size} >> 11; - $in->ask_from(_("Resize"), _("Choose the new size"), [ - { label => _("New size in MB: "), val => \$mb_size, min => $min >> 11, max => $max >> 11, type => 'range' }, + $in->ask_from(N("Resize"), N("Choose the new size"), [ + { label => N("New size in MB: "), val => \$mb_size, min => $min >> 11, max => $max >> 11, type => 'range' }, ]) or return; @@ -684,7 +684,7 @@ sub Resize { undef $@; my $b = before_leaving { $@ and $part->{size} = $oldsize }; - my $w = $in->wait_message(_("Resizing"), ''); + my $w = $in->wait_message(N("Resizing"), ''); if (isLVM($hd)) { lvm::lv_resize($part, $oldsize) if $size > $oldsize; @@ -722,13 +722,13 @@ sub Resize { } sub Move { my ($in, $hd, $part, $all_hds) = @_; - my $hd2 = $in->ask_from_listf(_("Move"), - _("Which disk do you want to move it to?"), \&partition_table::description, @{$all_hds->{hds}}) or return; - my $start2 = $in->ask_from_entry(_("Sector"), - _("Which sector do you want to move it to?")); + my $hd2 = $in->ask_from_listf(N("Move"), + N("Which disk do you want to move it to?"), \&partition_table::description, @{$all_hds->{hds}}) or return; + my $start2 = $in->ask_from_entry(N("Sector"), + N("Which sector do you want to move it to?")); defined $start2 or return; - my $w = $in->wait_message(_("Moving"), _("Moving partition...")); + my $w = $in->wait_message(N("Moving"), N("Moving partition...")); fsedit::move($hd, $part, $hd2, $start2); } sub Format { @@ -745,8 +745,8 @@ sub Add2RAID { my $raids = $all_hds->{raids}; local $_ = @$raids == () ? "new" : - $in->ask_from_list_('', _("Choose an existing RAID to add to"), - [ (grep { $_ } map_index { $_ && "md$::i" } @$raids), __("new") ]) or return; + $in->ask_from_list_('', N("Choose an existing RAID to add to"), + [ (grep { $_ } map_index { $_ && "md$::i" } @$raids), N_("new") ]) or return; if (/new/) { my $nb1 = raid::new($raids, $part); @@ -761,12 +761,12 @@ sub Add2LVM { my $lvms = $all_hds->{lvms}; write_partitions($in, $_) or return foreach isRAID($part) ? @{$all_hds->{hds}} : $hd; - my $lvm = $in->ask_from_listf_('', _("Choose an existing LVM to add to"), + my $lvm = $in->ask_from_listf_('', N("Choose an existing LVM to add to"), sub { ref $_[0] ? $_[0]{VG_name} : $_[0] }, - [ @$lvms, __("new") ]) or return; + [ @$lvms, N_("new") ]) or return; if (!ref $lvm) { # create new lvm - my $name = $in->ask_from_entry('', _("LVM name?")) or return; + my $name = $in->ask_from_entry('', N("LVM name?")) or return; $name =~ s/\W/_/g; $name = substr($name, 0, 63); # max length must be < NAME_LEN / 2 where NAME_LEN is 128 $lvm = bless { disks => [], VG_name => $name }, 'lvm'; @@ -807,7 +807,7 @@ sub Loopback { write_partitions($in, $hd) or return; - my $handle = any::inspect($real_part) or $in->ask_warn('', _("This partition can't be used for loopback")), return; + my $handle = any::inspect($real_part) or $in->ask_warn('', N("This partition can't be used for loopback")), return; my ($min, $max) = (1, loopback::getFree($handle->{dir}, $real_part)); $max = max($max, 1 << (31 - 9)) if isFat($real_part); #- FAT doesn't handle file size bigger than 2GB @@ -820,17 +820,17 @@ sub Loopback { my $type = type2name($part->{type}); my $mb_size = $part->{size} >> 11; - $in->ask_from(_("Loopback"), '', [ - { label => _("Loopback file name: "), val => \$part->{loopback_file} }, - { label => _("Size in MB: "), val => \$mb_size, min => $min >> 11, max => $max >> 11, type => 'range' }, - { label => _("Filesystem type: "), val => \$type, list => [ partition_table::important_types() ], not_edit => !$::expert, sort => 0 }, + $in->ask_from(N("Loopback"), '', [ + { label => N("Loopback file name: "), val => \$part->{loopback_file} }, + { label => N("Size in MB: "), val => \$mb_size, min => $min >> 11, max => $max >> 11, type => 'range' }, + { label => N("Filesystem type: "), val => \$type, list => [ partition_table::important_types() ], not_edit => !$::expert, sort => 0 }, ], complete => sub { - $part->{loopback_file} or $in->ask_warn('', _("Give a file name")), return 1, 0; + $part->{loopback_file} or $in->ask_warn('', N("Give a file name")), return 1, 0; $part->{loopback_file} =~ s|^([^/])|/$1|; if (my $size = loopback::verifFile($handle->{dir}, $part->{loopback_file}, $real_part)) { - $size == -1 and $in->ask_warn('', _("File already used by another loopback, choose another one")), return 1, 0; - $in->ask_yesorno('', _("File already exists. Use it?")) or return 1, 0; + $size == -1 and $in->ask_warn('', N("File already used by another loopback, choose another one")), return 1, 0; + $in->ask_yesorno('', N("File already exists. Use it?")) or return 1, 0; delete $part->{notFormatted}; $part->{size} = divide($size, 512); } else { @@ -853,14 +853,14 @@ sub Options { my %help = fs::mount_options_help(keys %$options); my $prev_user = $options->{user}; - $in->ask_from(_("Mount options"), + $in->ask_from(N("Mount options"), '', [ (map { { label => $_, text => scalar warp_text(formatAlaTeX($help{$_})), val => \$options->{$_}, advanced => !$part->{rootDevice} && !member($_, @simple_options), if_(!/=$/, type => 'bool'), } } keys %$options), - { label => _("Various"), val => \$unknown, advanced => 1 }, + { label => N("Various"), val => \$unknown, advanced => 1 }, ], changed => sub { if ($prev_user != $options->{user}) { @@ -924,9 +924,9 @@ sub modifyRAID { my $md = "md$nb"; $in->ask_from('', '', [ -{ label => _("device"), val => \$md, list => [ map { "md$_" } grep { $nb == $_ || !$raids->[$_] } 0..8 ] }, -{ label => _("level"), val => \$raids->[$nb]{level}, list => [ qw(0 1 4 5 linear) ] }, -{ label => _("chunk size"), val => \$raids->[$nb]{'chunk-size'} }, +{ label => N("device"), val => \$md, list => [ map { "md$_" } grep { $nb == $_ || !$raids->[$_] } 0..8 ] }, +{ label => N("level"), val => \$raids->[$nb]{level}, list => [ qw(0 1 4 5 linear) ] }, +{ label => N("chunk size"), val => \$raids->[$nb]{'chunk-size'} }, ], ) or return; raid::updateSize($raids->[$nb]); # changing the raid level changes the size available @@ -941,7 +941,8 @@ sub ask_alldatamaybelost { #- here we may have a non-formatted or a formatted partition #- -> doing as if it was formatted - $in->ask_okcancel(_("Read carefully!"), [ _("Be careful: this operation is dangerous."), _($msg, $part->{device}) ], 1); + $in->ask_okcancel(N("Read carefully!"), + [ N("Be careful: this operation is dangerous."), sprintf(translate($msg), $part->{device}) ], 1); } sub ask_alldatawillbelost { my ($in, $part, $msg) = @_; @@ -950,13 +951,13 @@ sub ask_alldatawillbelost { #- here we may have a non-formatted or a formatted partition #- -> doing as if it was formatted - $in->ask_okcancel(_("Read carefully!"), _($msg, $part->{device}), 1); + $in->ask_okcancel(N("Read carefully!"), sprintf(translate($msg), $part->{device}), 1); } sub partitions_suggestions { my ($in) = @_; my $t = $::expert ? - $in->ask_from_list_('', _("What type of partitioning?"), [ keys %fsedit::suggestions ]) : + $in->ask_from_list_('', N("What type of partitioning?"), [ keys %fsedit::suggestions ]) : 'simple'; $fsedit::suggestions{$t}; } @@ -972,7 +973,7 @@ sub check_type { if (my $pkg = fsedit::package_needed_for_partition_type({ type => $type })) { my $fs = type2fs({ type => $type }); if (!-x "/sbin/mkfs.$fs") { - $in->ask_yesorno('', _("The package %s is needed. Install it?", $pkg), 1) or return; + $in->ask_yesorno('', N("The package %s is needed. Install it?", $pkg), 1) or return; $in->do_pkgs->install($pkg); } -x "/sbin/mkfs.$fs" or $in->ask_warn('', "Mandatory package $pkg is missing"), return; @@ -986,17 +987,17 @@ sub check_mntpoint { local $_ = $@; if (m|/boot ending on cylinder > 1024|) { $in->ask_warn('', -_("Sorry I won't accept to create /boot so far onto the drive (on a cylinder > 1024). +N("Sorry I won't accept to create /boot so far onto the drive (on a cylinder > 1024). Either you use LILO and it won't work, or you don't use LILO and you don't need /boot")); } elsif (m|/ ending on cylinder > 1024|) { $in->ask_warn('', -_("The partition you've selected to add as root (/) is physically located beyond +N("The partition you've selected to add as root (/) is physically located beyond the 1024th cylinder of the hard drive, and you have no /boot partition. If you plan to use the LILO boot manager, be careful to add a /boot partition")); undef $_; } elsif (m|raid / with no /boot|) { $in->ask_warn('', -_("You've selected a software RAID partition as root (/). +N("You've selected a software RAID partition as root (/). No bootloader is able to handle this without a /boot partition. So be careful to add a /boot partition")); undef $_; @@ -1016,11 +1017,11 @@ sub write_partitions { $hd->{isDirty} or return 1; isLVM($hd) and return 1; - $in->ask_okcancel(_("Read carefully!"), _("Partition table of drive %s is going to be written to disk!", $hd->{device}), 1) or return; + $in->ask_okcancel(N("Read carefully!"), N("Partition table of drive %s is going to be written to disk!", $hd->{device}), 1) or return; if (!$::testing) { partition_table::write($hd); } - $hd->{rebootNeeded} and die _("You'll need to reboot before the modification can take place"); + $hd->{rebootNeeded} and die N("You'll need to reboot before the modification can take place"); 1; } @@ -1031,11 +1032,11 @@ sub unmount { sub format_ { my ($in, $hd, $part, $all_hds) = @_; write_partitions($in, $_) or return foreach isRAID($part) ? @{$all_hds->{hds}} : $hd; - ask_alldatawillbelost($in, $part, __("After formatting partition %s, all data on this partition will be lost")) or return; + ask_alldatawillbelost($in, $part, N_("After formatting partition %s, all data on this partition will be lost")) or return; $part->{isFormatted} = 0; #- force format; - my $w = $in->wait_message(_("Formatting"), - isLoopback($part) ? _("Formatting loopback file %s", $part->{loopback_file}) : - _("Formatting partition %s", $part->{device})); + my $w = $in->wait_message(N("Formatting"), + isLoopback($part) ? N("Formatting loopback file %s", $part->{loopback_file}) : + N("Formatting partition %s", $part->{device})); fs::format_part($all_hds->{raids}, $part); 1; } @@ -1046,8 +1047,8 @@ sub need_migration { my @l = grep { $_ ne "lost+found" } all($mntpoint); if (@l && $::isStandalone) { my $choice; - my @choices = (__("Move files to the new partition"), __("Hide files")); - $in->ask_from('', _("Directory %s already contains data\n(%s)", $mntpoint, formatList(5, @l)), + my @choices = (N_("Move files to the new partition"), N_("Hide files")); + $in->ask_from('', N("Directory %s already contains data\n(%s)", $mntpoint, formatList(5, @l)), [ { val => \$choice, list => \@choices, type => 'list' } ]) or return; $choice eq $choices[0] ? 'migrate' : 'hide'; } else { @@ -1058,15 +1059,15 @@ sub need_migration { sub migrate_files { my ($in, $hd, $part, $all_hds) = @_; - my $wait = $in->wait_message('', _("Moving files to the new partition")); + my $wait = $in->wait_message('', N("Moving files to the new partition")); my $handle = any::inspect($part, '', 'rw'); my @l = glob_("$part->{mntpoint}/*"); foreach (@l) { - $wait->set(_("Copying %s", $_)); + $wait->set(N("Copying %s", $_)); system("cp", "-a", $_, $handle->{dir}); } foreach (@l) { - $wait->set(_("Removing %s", $_)); + $wait->set(N("Removing %s", $_)); system("rm", "-rf", $_); } } @@ -1076,7 +1077,7 @@ sub warn_if_renumbered { my $l = delete $hd->{partitionsRenumbered}; return if is_empty_array_ref($l); - my @l = map { _("partition %s is now known as %s", @$_) } @$l; + my @l = map { N("partition %s is now known as %s", @$_) } @$l; $in->ask_warn('', join("\n", 'Partitions have been renumbered: ', @l)); } @@ -1096,49 +1097,49 @@ sub format_part_info { my $info = ''; - $info .= _("Mount point: ") . "$part->{mntpoint}\n" if $part->{mntpoint}; - $info .= _("Device: ") . "$part->{device}\n" if $part->{device} && !isLoopback($part); - $info .= _("DOS drive letter: %s (just a guess)\n", $part->{device_windobe}) if $part->{device_windobe}; + $info .= N("Mount point: ") . "$part->{mntpoint}\n" if $part->{mntpoint}; + $info .= N("Device: ") . "$part->{device}\n" if $part->{device} && !isLoopback($part); + $info .= N("DOS drive letter: %s (just a guess)\n", $part->{device_windobe}) if $part->{device_windobe}; if (arch() eq "ppc") { my $new_value = $part->{pType}; $new_value =~ s/[^A-Za-z0-9_]//g; - $info .= _("Type: ") . $new_value . ($::expert ? sprintf " (0x%x)", $part->{type} : '') . "\n"; + $info .= N("Type: ") . $new_value . ($::expert ? sprintf " (0x%x)", $part->{type} : '') . "\n"; if (defined $part->{pName}) { $new_value = $part->{pName}; $new_value =~ s/[^A-Za-z0-9_]//g; - $info .= _("Name: ") . $new_value . "\n"; + $info .= N("Name: ") . $new_value . "\n"; } } elsif ($part->{type}) { my $type = substr(type2name($part->{type}), 0, 40); # limit the length - $info .= _("Type: ") . $type . ($::expert ? sprintf " (0x%x)", $part->{type} : '') . "\n"; + $info .= N("Type: ") . $type . ($::expert ? sprintf " (0x%x)", $part->{type} : '') . "\n"; } else { - $info .= _("Empty") . "\n"; + $info .= N("Empty") . "\n"; } - $info .= _("Start: sector %s\n", $part->{start}) if $::expert && !isSpecial($part); - $info .= _("Size: %s", formatXiB($part->{size}, 512)); + $info .= N("Start: sector %s\n", $part->{start}) if $::expert && !isSpecial($part); + $info .= N("Size: %s", formatXiB($part->{size}, 512)); $info .= sprintf " (%s%%)", int 100 * $part->{size} / $hd->{totalsectors} if $hd->{totalsectors}; - $info .= _(", %s sectors", $part->{size}) if $::expert; + $info .= N(", %s sectors", $part->{size}) if $::expert; $info .= "\n"; - $info .= _("Cylinder %d to %d\n", $part->{start} / $hd->cylinder_size(), ($part->{start} + $part->{size} - 1) / $hd->cylinder_size()) if ($::expert || !$part->{type}) && !isSpecial($part); - $info .= _("Formatted\n") if $part->{isFormatted}; - $info .= _("Not formatted\n") if !$part->{isFormatted} && $part->{notFormatted}; - $info .= _("Mounted\n") if $part->{isMounted}; - $info .= _("RAID md%s\n", $part->{raid}) if isPartOfRAID($part); + $info .= N("Cylinder %d to %d\n", $part->{start} / $hd->cylinder_size(), ($part->{start} + $part->{size} - 1) / $hd->cylinder_size()) if ($::expert || !$part->{type}) && !isSpecial($part); + $info .= N("Formatted\n") if $part->{isFormatted}; + $info .= N("Not formatted\n") if !$part->{isFormatted} && $part->{notFormatted}; + $info .= N("Mounted\n") if $part->{isMounted}; + $info .= N("RAID md%s\n", $part->{raid}) if isPartOfRAID($part); $info .= sprintf "LVM %s\n", $part->{lvm} if isPartOfLVM($part); - $info .= _("Loopback file(s):\n %s\n", join(", ", map { $_->{loopback_file} } @{$part->{loopback}})) if isPartOfLoopback($part); - $info .= _("Partition booted by default\n (for MS-DOS boot, not for lilo)\n") if $part->{active} && $::expert; + $info .= N("Loopback file(s):\n %s\n", join(", ", map { $_->{loopback_file} } @{$part->{loopback}})) if isPartOfLoopback($part); + $info .= N("Partition booted by default\n (for MS-DOS boot, not for lilo)\n") if $part->{active} && $::expert; if (isRAID($part)) { - $info .= _("Level %s\n", $part->{level}); - $info .= _("Chunk size %s\n", $part->{'chunk-size'}); - $info .= _("RAID-disks %s\n", join ", ", map { $_->{device} } @{$part->{disks}}); + $info .= N("Level %s\n", $part->{level}); + $info .= N("Chunk size %s\n", $part->{'chunk-size'}); + $info .= N("RAID-disks %s\n", join ", ", map { $_->{device} } @{$part->{disks}}); } elsif (isLoopback($part)) { - $info .= _("Loopback file name: %s", $part->{loopback_file}); + $info .= N("Loopback file name: %s", $part->{loopback_file}); } if (isApple($part)) { - $info .= _("\nChances are, this partition is\na Driver partition, you should\nprobably leave it alone.\n"); + $info .= N("\nChances are, this partition is\na Driver partition, you should\nprobably leave it alone.\n"); } if (isAppleBootstrap($part)) { - $info .= _("\nThis special Bootstrap\npartition is for\ndual-booting your system.\n"); + $info .= N("\nThis special Bootstrap\npartition is for\ndual-booting your system.\n"); } # restrict the length of the lines $info =~ s/(.{60}).*/$1.../mg; @@ -1156,14 +1157,14 @@ sub format_hd_info { my ($hd) = @_; my $info = ''; - $info .= _("Device: ") . "$hd->{device}\n"; - $info .= _("Read-only") . "\n" if $hd->{readonly}; - $info .= _("Size: %s\n", formatXiB($hd->{totalsectors}, 512)) if $hd->{totalsectors}; - $info .= _("Geometry: %s cylinders, %s heads, %s sectors\n", @{$hd->{geom}}{qw(cylinders heads sectors)}) if $::expert && $hd->{geom}; - $info .= _("Info: ") . ($hd->{info} || $hd->{media_type}) . "\n" if $::expert && ($hd->{info} || $hd->{media_type}); - $info .= _("LVM-disks %s\n", join ", ", map { $_->{device} } @{$hd->{disks}}) if isLVM($hd) && $hd->{disks}; - $info .= _("Partition table type: %s\n", $1) if $::expert && ref($hd) =~ /_([^_]+)$/; - $info .= _("on channel %d id %d\n", $hd->{channel}, $hd->{id}) if $::expert && exists $hd->{channel}; + $info .= N("Device: ") . "$hd->{device}\n"; + $info .= N("Read-only") . "\n" if $hd->{readonly}; + $info .= N("Size: %s\n", formatXiB($hd->{totalsectors}, 512)) if $hd->{totalsectors}; + $info .= N("Geometry: %s cylinders, %s heads, %s sectors\n", @{$hd->{geom}}{qw(cylinders heads sectors)}) if $::expert && $hd->{geom}; + $info .= N("Info: ") . ($hd->{info} || $hd->{media_type}) . "\n" if $::expert && ($hd->{info} || $hd->{media_type}); + $info .= N("LVM-disks %s\n", join ", ", map { $_->{device} } @{$hd->{disks}}) if isLVM($hd) && $hd->{disks}; + $info .= N("Partition table type: %s\n", $1) if $::expert && ref($hd) =~ /_([^_]+)$/; + $info .= N("on channel %d id %d\n", $hd->{channel}, $hd->{id}) if $::expert && exists $hd->{channel}; $info; } @@ -1171,13 +1172,13 @@ sub format_raw_hd_info { my ($raw_hd) = @_; my $info = ''; - $info .= _("Mount point: ") . "$raw_hd->{mntpoint}\n" if $raw_hd->{mntpoint}; + $info .= N("Mount point: ") . "$raw_hd->{mntpoint}\n" if $raw_hd->{mntpoint}; $info .= format_hd_info($raw_hd); if ($raw_hd->{type}) { my $type = substr(type2name($raw_hd->{type}), 0, 40); # limit the length - $info .= _("Type: ") . $type . "\n"; + $info .= N("Type: ") . $type . "\n"; } - $info .= _("Options: %s", $raw_hd->{options}) if $raw_hd->{options}; + $info .= N("Options: %s", $raw_hd->{options}) if $raw_hd->{options}; $info; } @@ -1193,15 +1194,15 @@ sub choose_encrypt_key { my ($encrypt_key, $encrypt_key2); $in->ask_from_( { - title => _("Filesystem encryption key"), - messages => _("Choose your filesystem encryption key"), + title => N("Filesystem encryption key"), + messages => N("Choose your filesystem encryption key"), callbacks => { complete => sub { - length $encrypt_key < 20 and $in->ask_warn('', _("This encryption key is too simple (must be at least %d characters long)", 20)), return (1,0); - $encrypt_key eq $encrypt_key2 or $in->ask_warn('', [ _("The encryption keys do not match"), _("Please try again") ]), return (1,1); + length $encrypt_key < 20 and $in->ask_warn('', N("This encryption key is too simple (must be at least %d characters long)", 20)), return (1,0); + $encrypt_key eq $encrypt_key2 or $in->ask_warn('', [ N("The encryption keys do not match"), N("Please try again") ]), return (1,1); return 0 } } }, [ -{ label => _("Encryption key"), val => \$encrypt_key, hidden => 1 }, -{ label => _("Encryption key (again)"), val => \$encrypt_key2, hidden => 1 }, +{ label => N("Encryption key"), val => \$encrypt_key, hidden => 1 }, +{ label => N("Encryption key (again)"), val => \$encrypt_key2, hidden => 1 }, ]) && $encrypt_key; } diff --git a/perl-install/diskdrake/removable.pm b/perl-install/diskdrake/removable.pm index f781f43d0..f0222d10e 100644 --- a/perl-install/diskdrake/removable.pm +++ b/perl-install/diskdrake/removable.pm @@ -21,10 +21,10 @@ sub main { sub actions { ( - __("Mount point") => \&mount_point, - __("Options") => \&options, - __("Type") => \&type, - __("Done") => \&done, + N_("Mount point") => \&mount_point, + N_("Options") => \&options, + N_("Type") => \&type, + N_("Done") => \&done, ); } @@ -44,9 +44,9 @@ sub type { my ($in, $raw_hd) = @_; my @fs = ('auto', fs::auto_fs()); my $type = $raw_hd->{type}; - $in->ask_from(_("Change type"), - _("Which filesystem do you want?"), - [ { label => _("Type"), val => \$type, list => [@fs], not_edit => !$::expert } ]) or return; + $in->ask_from(N("Change type"), + N("Which filesystem do you want?"), + [ { label => N("Type"), val => \$type, list => [@fs], not_edit => !$::expert } ]) or return; $raw_hd->{type} = $type; } diff --git a/perl-install/diskdrake/removable_gtk.pm b/perl-install/diskdrake/removable_gtk.pm index da897b67a..cfc1ee35e 100644 --- a/perl-install/diskdrake/removable_gtk.pm +++ b/perl-install/diskdrake/removable_gtk.pm @@ -12,20 +12,20 @@ sub per_entry_action_box { if ($entry) { my @l = ( - _("Mount point") => \&raw_hd_mount_point, - _("Options") => \&raw_hd_options, - _("Type") => \&removable_type, + N("Mount point") => \&raw_hd_mount_point, + N("Options") => \&raw_hd_options, + N("Type") => \&removable_type, ); @buttons = map_each { my ($txt, $f) = @_; gtksignal_connect(new Gtk::Button($txt), clicked => sub { try_('', $f, $entry) }); } group_by2 @l; - gtkadd($box, gtkadd(new Gtk::Frame(_("Choose action")), + gtkadd($box, gtkadd(new Gtk::Frame(N("Choose action")), createScrolledWindow(gtkpack__(new Gtk::VBox(0,0), @buttons)))) if @buttons; } else { - my $txt = _("Please click on a medium"); + my $txt = N("Please click on a medium"); gtkpack($box, gtktext_insert(new Gtk::Text, $txt)); } } diff --git a/perl-install/diskdrake/smbnfs_gtk.pm b/perl-install/diskdrake/smbnfs_gtk.pm index 031e9ed8c..5e901fd9e 100644 --- a/perl-install/diskdrake/smbnfs_gtk.pm +++ b/perl-install/diskdrake/smbnfs_gtk.pm @@ -42,7 +42,7 @@ sub try_ { my ($kind, $name, $f, @args) = @_; eval { $f->($in, @args, $all_hds) }; if (my $err = $@) { - $in->ask_warn(_("Error"), formatError($err)); + $in->ask_warn(N("Error"), formatError($err)); } update($kind); Gtk->main_quit if member($name, 'Cancel', 'Done'); @@ -66,7 +66,7 @@ sub per_entry_info_box { if ($entry) { $info = diskdrake::interactive::format_raw_hd_info($entry); } - gtkpack($box, gtkadd(new Gtk::Frame(_("Details")), gtkset_justify(new Gtk::Label($info), 'left'))); + gtkpack($box, gtkadd(new Gtk::Frame(N("Details")), gtkset_justify(new Gtk::Label($info), 'left'))); } sub per_entry_action_box { @@ -78,14 +78,14 @@ sub per_entry_action_box { push @buttons, map { my $s = $_; gtksignal_connect(new Gtk::Button(translate($s)), clicked => sub { try($kind, $s, {}, $entry) }); - } (if_($entry->{isMounted}, __("Unmount")), - if_($entry->{mntpoint} && !$entry->{isMounted}, __("Mount"))) if $entry; + } (if_($entry->{isMounted}, N_("Unmount")), + if_($entry->{mntpoint} && !$entry->{isMounted}, N_("Mount"))) if $entry; my @l = ( - if_($entry, __("Mount point") => \&raw_hd_mount_point), - if_($entry && $entry->{mntpoint}, __("Options") => \&raw_hd_options), - __("Cancel") => sub {}, - __("Done") => \&done, + if_($entry, N_("Mount point") => \&raw_hd_mount_point), + if_($entry && $entry->{mntpoint}, N_("Options") => \&raw_hd_options), + N_("Cancel") => sub {}, + N_("Done") => \&done, ); push @buttons, map { my ($txt, $f) = @$_; @@ -159,12 +159,12 @@ sub import_ctree { return @l if !$@; if ($server->{username}) { - $in->ask_warn('', _("Can't login using username %s (bad password?)", $server->{username})); + $in->ask_warn('', N("Can't login using username %s (bad password?)", $server->{username})); network::smb::remove_bad_credentials($server); } else { if (my @l = network::smb::authentifications_available($server)) { - my $user = $in->ask_from_list_(_("Domain Authentication Required"), - _("Which username"), [ @l, __("Another one") ]) or return; + my $user = $in->ask_from_list_(N("Domain Authentication Required"), + N("Which username"), [ @l, N_("Another one") ]) or return; if ($user ne 'Another one') { network::smb::read_credentials($server, $user); goto $find_exports; @@ -172,12 +172,12 @@ sub import_ctree { } } - if ($in->ask_from(_("Domain Authentication Required"), - _("Please enter your username, password and domain name to access this host."), + if ($in->ask_from(N("Domain Authentication Required"), + N("Please enter your username, password and domain name to access this host."), [ - { label => _("Username"), val => \$server->{username} }, - { label => _("Password"), val => \$server->{password}, hidden => 1 }, - { label => _("Domain"), val => \$server->{domain} }, + { label => N("Username"), val => \$server->{username} }, + { label => N("Password"), val => \$server->{password}, hidden => 1 }, + { label => N("Domain"), val => \$server->{domain} }, ])) { goto $find_exports; } else { @@ -197,7 +197,7 @@ sub import_ctree { }; { - my $search = new Gtk::Button(_("Search servers")); + my $search = new Gtk::Button(N("Search servers")); gtkpack__($info_box, gtksignal_connect($search, clicked => sub { diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 57e1cfb26..67a56c609 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -544,8 +544,8 @@ sub format_ext2($@) { my ($dev, @options) = @_; $dev =~ m,(rd|ida|cciss)/, and push @options, qw(-b 4096 -R stride=16); #- For RAID only. push @options, qw(-b 1024 -O none) if arch() =~ /alpha/; - run_program::run('mke2fs', '-F', @options, devices::make($dev)) or die _("%s formatting of %s failed", "ext2", $dev); - run_program::run('mke2fs', '-F', @options, devices::make($dev)) or die _("%s formatting of %s failed", grep { $_ eq '-j' } @options ? "ext3" : "ext2", $dev); + run_program::run('mke2fs', '-F', @options, devices::make($dev)) or die N("%s formatting of %s failed", "ext2", $dev); + run_program::run('mke2fs', '-F', @options, devices::make($dev)) or die N("%s formatting of %s failed", grep { $_ eq '-j' } @options ? "ext3" : "ext2", $dev); } sub format_ext3 { my ($dev, @options) = @_; @@ -555,23 +555,23 @@ sub format_ext3 { sub format_reiserfs { my ($dev, @options) = @_; #TODO add -h tea - run_program::run("mkreiserfs", "-ff", @options, devices::make($dev)) or die _("%s formatting of %s failed", "reiserfs", $dev); + run_program::run("mkreiserfs", "-ff", @options, devices::make($dev)) or die N("%s formatting of %s failed", "reiserfs", $dev); } sub format_xfs { my ($dev, @options) = @_; - run_program::run("mkfs.xfs", "-f", "-q", @options, devices::make($dev)) or die _("%s formatting of %s failed", "xfs", $dev); + run_program::run("mkfs.xfs", "-f", "-q", @options, devices::make($dev)) or die N("%s formatting of %s failed", "xfs", $dev); } sub format_jfs { my ($dev, @options) = @_; - run_program::run("mkfs.jfs", "-f", @options, devices::make($dev)) or die _("%s formatting of %s failed", "jfs", $dev); + run_program::run("mkfs.jfs", "-f", @options, devices::make($dev)) or die N("%s formatting of %s failed", "jfs", $dev); } sub format_dos { my ($dev, @options) = @_; - run_program::run("mkdosfs", @options, devices::make($dev)) or die _("%s formatting of %s failed", "dos", $dev); + run_program::run("mkdosfs", @options, devices::make($dev)) or die N("%s formatting of %s failed", "dos", $dev); } sub format_hfs { my ($dev, @options) = @_; - run_program::run("hformat", @options, devices::make($dev)) or die _("%s formatting of %s failed", "HFS", $dev); + run_program::run("hformat", @options, devices::make($dev)) or die N("%s formatting of %s failed", "HFS", $dev); } sub real_format_part { my ($part) = @_; @@ -608,7 +608,7 @@ sub real_format_part { my $check_blocks = grep { /^-c$/ } @options; swap::make($dev, $check_blocks); } else { - die _("I don't know how to format %s in type %s", $part->{device}, type2name($part->{type})); + die N("I don't know how to format %s in type %s", $part->{device}, type2name($part->{type})); } $part->{isFormatted} = 1; } @@ -682,7 +682,7 @@ sub mount { my @fs_modules = qw(vfat hfs romfs ufs reiserfs xfs jfs ext3); if (member($fs, 'smb', 'smbfs', 'nfs', 'davfs', 'ntfs') && $::isStandalone) { - system('mount', '-t', $fs, $dev, $where, if_($options, '-o', $options)) == 0 or die _("mounting partition %s in directory %s failed", $dev, $where); + system('mount', '-t', $fs, $dev, $where, if_($options, '-o', $options)) == 0 or die N("mounting partition %s in directory %s failed", $dev, $where); return; #- do not update mtab, already done by mount(8) } elsif (member($fs, 'ext2', 'proc', 'usbdevfs', 'iso9660', @fs_modules)) { $where =~ s|/$||; @@ -725,7 +725,7 @@ sub mount { eval { modules::load('isofs') }; } log::l("calling mount($dev, $where, $fs, $flag, $mount_opt)"); - syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die _("mounting partition %s in directory %s failed", $dev, $where) . " ($!)"; + syscall_('mount', $dev, $where, $fs, $flag, $mount_opt) or die N("mounting partition %s in directory %s failed", $dev, $where) . " ($!)"; } else { log::l("skipping mounting $fs partition"); return; @@ -740,7 +740,7 @@ sub umount { my ($mntpoint) = @_; $mntpoint =~ s|/$||; log::l("calling umount($mntpoint)"); - syscall_('umount', $mntpoint) or die _("error unmounting %s: %s", $mntpoint, "$!"); + syscall_('umount', $mntpoint) or die N("error unmounting %s: %s", $mntpoint, "$!"); substInFile { $_ = '' if /(^|\s)$mntpoint\s/ } '/etc/mtab'; #- don't care about error, if we can't read, we won't manage to write... (and mess mtab) } diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm index c262bcd59..fd346495e 100644 --- a/perl-install/fsedit.pm +++ b/perl-install/fsedit.pm @@ -18,16 +18,16 @@ use log; use fs; %suggestions = ( - __("simple") => [ + N_("simple") => [ { mntpoint => "/", size => 300 << 11, type =>0x483, ratio => 5, maxsize =>5500 << 11 }, { mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 }, { mntpoint => "/home", size => 300 << 11, type =>0x483, ratio => 3 }, - ], __("with /usr") => [ + ], N_("with /usr") => [ { mntpoint => "/", size => 150 << 11, type =>0x483, ratio => 1, maxsize =>1000 << 11 }, { mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 1, maxsize => 250 << 11 }, { mntpoint => "/usr", size => 300 << 11, type =>0x483, ratio => 4, maxsize =>4000 << 11 }, { mntpoint => "/home", size => 100 << 11, type =>0x483, ratio => 3 }, - ], __("server") => [ + ], N_("server") => [ { mntpoint => "/", size => 150 << 11, type =>0x483, ratio => 1, maxsize => 250 << 11 }, { mntpoint => "swap", size => 64 << 11, type => 0x82, ratio => 2, maxsize => 400 << 11 }, { mntpoint => "/usr", size => 300 << 11, type =>0x483, ratio => 4, maxsize =>4000 << 11 }, @@ -236,8 +236,8 @@ sub get_hds { if ($in) { catch_cdie { hds($flags, sub { my ($dev, $err) = @_; - $in->ask_yesorno(_("Error"), -_("I can't read the partition table of device %s, it's too corrupted for me :( + $in->ask_yesorno(N("Error"), +N("I can't read the partition table of device %s, it's too corrupted for me :( I can try to go on, erasing over bad partitions (ALL DATA will be lost!). The other solution is to not allow DrakX to modify the partition table. (the error is %s) @@ -498,8 +498,8 @@ sub get_root { &get_root_ || {} } #- do this before modifying $part->{type} sub check_type { my ($type, $hd, $part) = @_; - isThisFs("jfs", { type => $type }) && $part->{size} < 16 << 11 and die _("You can't use JFS for partitions smaller than 16MB"); - isThisFs("reiserfs", { type => $type }) && $part->{size} < 32 << 11 and die _("You can't use ReiserFS for partitions smaller than 32MB"); + isThisFs("jfs", { type => $type }) && $part->{size} < 16 << 11 and die N("You can't use JFS for partitions smaller than 16MB"); + isThisFs("reiserfs", { type => $type }) && $part->{size} < 32 << 11 and die N("You can't use ReiserFS for partitions smaller than 32MB"); } sub package_needed_for_partition_type { @@ -518,18 +518,18 @@ sub check_mntpoint { my ($mntpoint, $hd, $part, $all_hds) = @_; $mntpoint eq '' || isSwap($part) || isNonMountable($part) and return; - $mntpoint =~ m|^/| or die _("Mount points must begin with a leading /"); - $mntpoint ne $part->{mntpoint} && has_mntpoint($mntpoint, $all_hds) and die _("There is already a partition with mount point %s\n", $mntpoint); + $mntpoint =~ m|^/| or die N("Mount points must begin with a leading /"); + $mntpoint ne $part->{mntpoint} && has_mntpoint($mntpoint, $all_hds) and die N("There is already a partition with mount point %s\n", $mntpoint); die "raid / with no /boot" if $mntpoint eq "/" && isRAID($part) && !has_mntpoint("/boot", $all_hds); - die _("You can't use a LVM Logical Volume for mount point %s", $mntpoint) + die N("You can't use a LVM Logical Volume for mount point %s", $mntpoint) if ($mntpoint eq '/' || $mntpoint eq '/boot') && isLVM($hd); - die _("This directory should remain within the root filesystem") + die N("This directory should remain within the root filesystem") if member($mntpoint, qw(/bin /dev /etc /lib /sbin /root /mnt)); - die _("You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n") + die N("You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n") if !isTrueFS($part) && member($mntpoint, qw(/ /home /tmp /usr /var)); - die _("You can't use an encrypted file system for mount point %s", $mntpoint) + die N("You can't use an encrypted file system for mount point %s", $mntpoint) if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot)); local $part->{mntpoint} = $mntpoint; @@ -596,9 +596,9 @@ sub auto_allocate { if ($before == listlength(fsedit::get_all_fstab($all_hds))) { # find out why auto_allocate failed if (my @l = grep { !has_mntpoint($_->{mntpoint}, $all_hds) } @$suggestions_) { - die _("Not enough free space for auto-allocating"); + die N("Not enough free space for auto-allocating"); } else { - die _("Nothing to do"); + die N("Nothing to do"); } } } @@ -691,7 +691,7 @@ sub move { local (*F, *G); sysopen F, $hd->{file}, 0 or die ''; - sysopen G, $hd2->{file}, 2 or die _("Error opening %s for writing: %s", $hd2->{file}, "$!"); + sysopen G, $hd2->{file}, 2 or die N("Error opening %s for writing: %s", $hd2->{file}, "$!"); my $base = $part1->{start}; my $base2 = $part2->{start}; diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index efa673ed1..372ce504b 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -67,7 +67,7 @@ sub custom_id { my ($device, $str) = @_; defined($device->{device}) ? $device->{device} : (defined($device->{processor}) ? - "$device->{vendor_id} $device->{name} " . _("cpu number ") . $device->{processor} : + "$device->{vendor_id} $device->{name} " . N("cpu number ") . $device->{processor} : (defined($device->{description}) ? $device->{description} : $str)); } diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index 4e2c0c21e..6c8c80d69 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -165,23 +165,23 @@ sub switch { if ($alternative) { my $new_driver = $alternative->[0]; if ($new_driver eq 'unknown') { - $in->ask_warn(_("No alternative driver"), - _("There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\"", + $in->ask_warn(N("No alternative driver"), + N("There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\"", $device->{description}, $driver)); - } elsif ($in->ask_from(_("Sound configuration"), - _("Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s).", + } elsif ($in->ask_from(N("Sound configuration"), + N("Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s).", $device->{description}) . - _("\n\nYour card currently use the %s\"%s\" driver (default driver for your card is \"%s\")", ($driver =~ /^snd-/ ? "ALSA " : "OSS "), $driver, $device->{driver}), + N("\n\nYour card currently use the %s\"%s\" driver (default driver for your card is \"%s\")", ($driver =~ /^snd-/ ? "ALSA " : "OSS "), $driver, $device->{driver}), [ - { label => _("Driver:"), val => \$new_driver, list => $alternative, default => $new_driver, sort =>1, format => sub { + { label => N("Driver:"), val => \$new_driver, list => $alternative, default => $new_driver, sort =>1, format => sub { my %des = category2modules_and_description('multimedia/sound'); "$_[0] (". $des{$_[0]} . ')' }, allow_empty_list => 1 }, { - val => _("Help"), disabled => sub { }, + val => N("Help"), disabled => sub { }, clicked => sub { - $in->ask_warn(_("Switching between ALSA and OSS help"), - _("OSS (Open Sound System) was the first sound API. It's an OS independant sound API (it's available on most unices systems) but it's a very basic and limited API. + $in->ask_warn(N("Switching between ALSA and OSS help"), + N("OSS (Open Sound System) was the first sound API. It's an OS independant sound API (it's available on most unices systems) but it's a very basic and limited API. What's more, OSS drivers all reinvent the wheel. ALSA (Advanced Linux Sound Architecture) is a modularized architecture which @@ -197,20 +197,20 @@ To use alsa, one can either use: { return if ($new_driver eq $driver); standalone::explanations("switching audio driver from '$driver' to '$new_driver'\n"); - $in->ask_warn(_("Warning"), _("The old \"%s\" driver is blacklisted.\n + $in->ask_warn(N("Warning"), N("The old \"%s\" driver is blacklisted.\n It has been reported to oopses the kernel on unloading.\n The new \"%s\" driver'll only be used on next bootstrap.", $driver, $new_driver)) if $blacklisted; - my $wait = $in->wait_message(_("Please wait"),_("Please Wait... Applying the configuration")); + my $wait = $in->wait_message(N("Please wait"),N("Please Wait... Applying the configuration")); do_switch($driver, $new_driver); undef $wait; } } elsif ($driver eq "unknown") { - $in->ask_warn(_("No known driver"), - _("There's no known driver for your sound card (%s)", + $in->ask_warn(N("No known driver"), + N("There's no known driver for your sound card (%s)", $device->{description})); } else { - $in->ask_warn(_("Unkown driver"), - _("The \"%s\" driver for your sound card is unlisted\n + $in->ask_warn(N("Unkown driver"), + N("The \"%s\" driver for your sound card is unlisted\n Please send the output of the \"lspcidrake -v\" command to <install at mandrakesoft dot com> with subject: unlisted sound driver \"%s\"") diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm index b2ec58a9e..627abeed2 100644 --- a/perl-install/harddrake/ui.pm +++ b/perl-install/harddrake/ui.pm @@ -11,33 +11,33 @@ use interactive; # { field => [ short_translation, full_description] } my %fields = ( - "alternative_drivers" => [ _("Alternative drivers"), - _("the list of alternative drivers for this sound card")], + "alternative_drivers" => [ N("Alternative drivers"), + N("the list of alternative drivers for this sound card")], "bus" => - [ _("Bus"), - _("this is the physical bus on which the device is plugged (eg: PCI, USB, ...)")], - "channel" => [_("Channel"), _("EIDE/SCSI channel")], + [ N("Bus"), + N("this is the physical bus on which the device is plugged (eg: PCI, USB, ...)")], + "channel" => [N("Channel"), N("EIDE/SCSI channel")], "bus_id" => - [ _("Bus identification"), - _("- PCI and USB devices: this list the vendor, device, subvendor and subdevice PCI/USB ids")], + [ N("Bus identification"), + N("- PCI and USB devices: this list the vendor, device, subvendor and subdevice PCI/USB ids")], "bus_location" => - [ _("Location on the bus"), - _("- pci devices: this gives the PCI slot, device and function of this card + [ N("Location on the bus"), + N("- pci devices: this gives the PCI slot, device and function of this card - eide devices: the device is either a slave or a master device - scsi devices: the scsi bus and the scsi device ids")], - "description" => [ _("Description"), _("this field describe the device")], - "device" => [ _("Old device file"), - _("old static device name used in dev package")], - "devfs_device" => [ _("New devfs device"), - _("new dinamic device name generated by incore kernel devfs")], - "driver" => [ _("Module"), _("the module of the GNU/Linux kernel that handle that device")], - "media_type" => [ _("Media class"), _("class of hardware device")], - "Model" => [_("Model"), _("hard disk model")], - "nbuttons" => [ _("Number of buttons"), "the number of buttons the mouse have"], - "name" => [ _("Name"), "the name of the cpu"], - "processor" => [ _("Processor ID"), _("the number of the processor")], - "Vendor" => [ _("Vendor"), _("the vendor name of the device")], - "vendor_id" => [ _("Vendor"), _("the vendor name of the processor")] + "description" => [ N("Description"), N("this field describe the device")], + "device" => [ N("Old device file"), + N("old static device name used in dev package")], + "devfs_device" => [ N("New devfs device"), + N("new dinamic device name generated by incore kernel devfs")], + "driver" => [ N("Module"), N("the module of the GNU/Linux kernel that handle that device")], + "media_type" => [ N("Media class"), N("class of hardware device")], + "Model" => [N("Model"), N("hard disk model")], + "nbuttons" => [ N("Number of buttons"), "the number of buttons the mouse have"], + "name" => [ N("Name"), "the name of the cpu"], + "processor" => [ N("Processor ID"), N("the number of the processor")], + "Vendor" => [ N("Vendor"), N("the vendor name of the device")], + "vendor_id" => [ N("Vendor"), N("the vendor name of the processor")] ); @@ -67,28 +67,28 @@ my ($modem_check_box, $printer_check_box); my @menu_items = ( - { path => _("/_File"), type => '<Branch>' }, - { path => _("/_File")._("/_Quit"), accelerator => _("<control>Q"), callback => \&quit_global }, -# { path => _("/_Options")._("/Autodetect _printers"), type => '<CheckItem>', + { path => N("/_File"), type => '<Branch>' }, + { path => N("/_File").N("/_Quit"), accelerator => N("<control>Q"), callback => \&quit_global }, +# { path => N("/_Options").N("/Autodetect _printers"), type => '<CheckItem>', # callback => sub { $options{PRINTERS_DETECTION} ^= 1 } }, -# { path => _("/_Options")._("/Autodetect _modems"), type => '<CheckItem>', +# { path => N("/_Options").N("/Autodetect _modems"), type => '<CheckItem>', # callback => sub { $options{MODEMS_DETECTION} ^= 1 } }, - { path => _("/_Help"), type => '<Branch>' }, + { path => N("/_Help"), type => '<Branch>' }, { - path => _("/_Help")._("/_Help..."), + path => N("/_Help").N("/_Help..."), callback => sub { - $in->ask_warn(_("Harddrake help"), - _("Description of the fields:\n\n") + $in->ask_warn(N("Harddrake help"), + N("Description of the fields:\n\n") . join("\n\n", map { if_($fields{$_}[0], "$fields{$_}[0]: $fields{$_}[1]")} keys %fields)); } }, - { path => _("/_Help")._("/_Report Bug"), + { path => N("/_Help").N("/_Report Bug"), callback => sub { unless (fork) { exec("drakbug --report harddrake2 &") } } }, - { path => _("/_Help")._("/_About..."), + { path => N("/_Help").N("/_About..."), callback => sub { - $in->ask_warn(_("About Harddrake"), - join ("", _("This is HardDrake, a Mandrake hardware configuration tool.\nVersion:"), " $harddrake::data::version\n", - _("Author:"), " Thierry Vignaud <tvignaud\@mandrakesoft.com> \n\n" , + $in->ask_warn(N("About Harddrake"), + join ("", N("This is HardDrake, a Mandrake hardware configuration tool.\nVersion:"), " $harddrake::data::version\n", + N("Author:"), " Thierry Vignaud <tvignaud\@mandrakesoft.com> \n\n" , formatAlaTeX($license))); } } @@ -103,7 +103,7 @@ sub detect { next if $Ident =~ /(MODEM|PRINTER)/ && "@ARGV" =~ /test/; next if $Ident =~ /MODEM/ && !$options{MODEMS_DETECTION}; next if $Ident =~ /PRINTER/ && !$options{PRINTERS_DETECTION}; -# print _("Probing %s class\n", $Ident); +# print N("Probing %s class\n", $Ident); # standalone::explanations("Probing %s class\n", $Ident); my @devices = &$detector; @@ -125,7 +125,7 @@ sub detect { } # EIDE detection incoherency: if (exists $_->{bus} && $_->{bus} eq 'ide') { - $_->{channel} = _($_->{channel} ? "secondary" : "primary"); + $_->{channel} = $_->{channel} ? N("secondary") : N("primary"); delete $_->{info}; } elsif ((exists $_->{id}) && ($_->{bus} ne 'PCI')) { # SCSI detection incoherency: @@ -150,7 +150,7 @@ sub new { my ($sig_id, $wait); unless ($::isEmbedded) { $in = 'interactive'->vnew('su', 'default'); - $wait = $in->wait_message(_("Please wait"), _("Detection in progress")); + $wait = $in->wait_message(N("Please wait"), N("Detection in progress")); my_gtk::flush; } %options = getVarsFromSh($conffile); @@ -158,7 +158,7 @@ sub new { # Build the gui add_icon_path('/usr/share/pixmaps/harddrake2/'); - $w = my_gtk->new((_("Harddrake2 version ") . $harddrake::data::version)); + $w = my_gtk->new((N("Harddrake2 version ") . $harddrake::data::version)); $w->{window}->set_usize(760, 550) unless $::isEmbedded; $options{MODEMS_DETECTION} = 1 unless defined $options{MODEMS_DETECTION}; $options{PRINTERS_DETECTION} = 1 unless defined $options{PRINTERS_DETECTION}; @@ -170,18 +170,18 @@ sub new { my $statusbar = new Gtk::Statusbar)); $main_vbox->set_child_packing($statusbar, 0, 0, 0, 'start'); if ($::isEmbedded) { - $main_vbox->add(gtksignal_connect(my $but = new Gtk::Button(_("Quit")), + $main_vbox->add(gtksignal_connect(my $but = new Gtk::Button(N("Quit")), 'clicked' => \&quit_global)); $main_vbox->set_child_packing($but, 0, 0, 0, 'start'); } else { $main_vbox->set_child_packing($menubar, 0, 0, 0, 'start') } - $hpaned->pack1(gtkadd(new Gtk::Frame(_("Detected hardware")), createScrolledWindow(my $tree = new Gtk::CTree(1, 0))), 1, 1); + $hpaned->pack1(gtkadd(new Gtk::Frame(N("Detected hardware")), createScrolledWindow(my $tree = new Gtk::CTree(1, 0))), 1, 1); $hpaned->pack2(my $vbox = gtkadd(gtkadd(gtkadd(new Gtk::VBox, - gtkadd(new Gtk::Frame(_("Information")), + gtkadd(new Gtk::Frame(N("Information")), gtkadd(new Gtk::HBox, createScrolledWindow(my $text = new Gtk::Text)))), - my $module_cfg_button = new Gtk::Button(_("Configure module"))), - my $config_button = new Gtk::Button(_("Run config tool"))), 1, 1); + my $module_cfg_button = new Gtk::Button(N("Configure module"))), + my $config_button = new Gtk::Button(N("Run config tool"))), 1, 1); $vbox->set_child_packing($config_button, 0, 0, 0, 'start'); $vbox->set_child_packing($module_cfg_button, 0, 0, 0, 'start'); @@ -229,7 +229,7 @@ sub new { $IDs{tool} = $config_button->signal_connect(clicked => sub { return if defined $pid; if ($pid = fork()) { - $sig_id = $statusbar->push($statusbar->get_context_id("id"), _("Running \"%s\" ...", $configurator)); + $sig_id = $statusbar->push($statusbar->get_context_id("id"), N("Running \"%s\" ...", $configurator)); } else { exec($configurator) or die "$configurator missing\n" } }) ; $config_button->show; diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm index 414d26a84..47cce15cf 100644 --- a/perl-install/harddrake/v4l.pm +++ b/perl-install/harddrake/v4l.pm @@ -11,7 +11,7 @@ use modules; # please update me on bttv update : -my $default = _("Auto-detect"); +my $default = N("Auto-detect"); # TODO: split %tuners_lst in per driver perl source files that get transformed in Storable files my %tuners_lst = ( @@ -61,8 +61,8 @@ my %tuners_lst = # Tweaked from Cardlist my $cards_lst = { 'bttv' => { - _("Auto-detect") => -1, - _("Unknown|Generic") => 0, + N("Auto-detect") => -1, + N("Unknown|Generic") => 0, "M|Miro|PCTV" => 1, "Hauppauge|bt848" => 2, "S|STB|Hauppauge 878" => 3, @@ -94,8 +94,8 @@ my $cards_lst = { "A|Askey|CPH06X (bt878)" => 24, "G|Guillemot|Maxi TV Video 3" => 24, "A|Askey|CPH05X (bt878)" => 24, - _("Unknown|CPH05X (bt878) [many vendors]") => 24, - _("Unknown|CPH06X (bt878) [many vendors]") => 24, + N("Unknown|CPH05X (bt878) [many vendors]") => 24, + N("Unknown|CPH06X (bt878) [many vendors]") => 24, "T|Terratec|Terra TV+ Version 1.0 (Bt848)" => 25, "Vobis|TV-Boostar" => 25, "T|Terratec|TV-Boostar" => 25, @@ -182,7 +182,7 @@ my $cards_lst = { "Hauppauge|WinTV PVR" => 80 }, 'saa7134' => { - _("Unknown|Generic") => 0, + N("Unknown|Generic") => 0, "Proteus|Pro [philips reference design]" => 1, "LifeView|FlyVIDEO3000" => 2, "LifeView|FlyVIDEO2000" => 3, @@ -197,7 +197,7 @@ my $cards_lst = { my %pll_lst = ( - -1 => _("Default"), + -1 => N("Default"), 0 => "don't use pll", 1 => "28 Mhz Crystal (X)", 2 =>"35 Mhz Crystal" @@ -206,15 +206,15 @@ my %pll_lst = sub config { my ($in, $driver) = @_; my %conf = (gbuffers => 4, card => $default, tuner => -1, radio => 0, pll => -1); - if ($in->ask_from("BTTV configuration", _("For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters. + if ($in->ask_from("BTTV configuration", N("For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters. If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed"), [ - { label => _("Card model:"), val => \$conf{card}, list => [keys %{$cards_lst->{$driver}}], type => 'combo', default => -1, sort =>1, separator => '|'}, - { label => _("Tuner type:"), val => \$conf{tuner}, list => [keys %tuners_lst], format => sub { $tuners_lst{$_[0]} }, sort => 1, separator => '|'}, - { label => _("Number of capture buffers:"), val => \$conf{gbuffers}, min=>2, max=>32, sort => 1, default => 0, type=>'range', advanced =>1, help => _("number of capture buffers for mmap'ed capture")}, + { label => N("Card model:"), val => \$conf{card}, list => [keys %{$cards_lst->{$driver}}], type => 'combo', default => -1, sort =>1, separator => '|'}, + { label => N("Tuner type:"), val => \$conf{tuner}, list => [keys %tuners_lst], format => sub { $tuners_lst{$_[0]} }, sort => 1, separator => '|'}, + { label => N("Number of capture buffers:"), val => \$conf{gbuffers}, min=>2, max=>32, sort => 1, default => 0, type=>'range', advanced =>1, help => N("number of capture buffers for mmap'ed capture")}, if_($driver eq 'bttv', - { label => _("PLL setting:"), val => \$conf{pll}, list => [keys %pll_lst], format => sub { $pll_lst{$_[0]} }, sort => 1, default => 0, advanced =>1}, - { label => _("Radio support:"), val => \$conf{radio}, type => "bool", text => _("enable radio support")}), + { label => N("PLL setting:"), val => \$conf{pll}, list => [keys %pll_lst], format => sub { $pll_lst{$_[0]} }, sort => 1, default => 0, advanced =>1}, + { label => N("Radio support:"), val => \$conf{radio}, type => "bool", text => N("enable radio support")}), ] )) { diff --git a/perl-install/help.pm b/perl-install/help.pm index b7a3ab9ff..75659d7db 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -10,7 +10,7 @@ use common; empty => '', addUser => -__("GNU/Linux is a multiuser system, and this means that each user can have his +N_("GNU/Linux is a multiuser system, and this means that each user can have his own preferences, his own files and so on. You can read the ``User Guide'' to learn more this concept. But unlike \"root\", which is the administrator, the users you add here will not be entitled to change @@ -45,7 +45,7 @@ security), choose the desired user and window manager, then click \"Yes\". If you are not interested in this feature, click \"No\"."), ask_mntpoint_s => -__("Listed above are the existing Linux partitions detected on your hard drive. +N_("Listed above are the existing Linux partitions detected on your hard drive. You can keep the choices made by the wizard, they are good for most common installations. If you make any changes, you must at least define a root partition (\"/\"). Do not choose too small a partition or you will not be @@ -76,12 +76,12 @@ With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means \"second lowest SCSI ID\", etc."), chooseCd => -__("The Mandrake Linux installation is spread out over several CD-ROMs. DrakX +N_("The Mandrake Linux installation is spread out over several CD-ROMs. DrakX knows if a selected package is located on another CD-ROM and will eject the current CD and ask you to insert a different one as required."), choosePackages => -__("It is now time to specify which programs you wish to install on your +N_("It is now time to specify which programs you wish to install on your system. There are thousands of packages available for Mandrake Linux, and you are not supposed to know them all by heart. @@ -132,7 +132,7 @@ groups to avoid installing any new package. This is useful to repair or update an existing system."), choosePackagesTree => -__("Finally, depending on whether or not you chose to be able to select +N_("Finally, depending on whether or not you chose to be able to select individual packages, you will be presented a tree containing all packages classified by groups and subgroups. While browsing the tree, you can select entire groups, subgroups, or individual packages. @@ -168,7 +168,7 @@ another installation. See the second tip of the previous step on how to create such a floppy disk."), configureNetwork => -__("You are now able to set up your Internet/network connection. If you wish to +N_("You are now able to set up your Internet/network connection. If you wish to connect your computer to the Internet or to a local network, click \"OK\". The autodetection of network devices and modem will be launched. If this detection fails, uncheck the \"Use auto-detection\" box next time. You may @@ -190,7 +190,7 @@ If you wish to configure the network later after installation, or if you are finished configuring your network connection, click \"Cancel\"."), configureServices => -__("You may now choose which services you wish to start at boot time. +N_("You may now choose which services you wish to start at boot time. Here are listed all the services available with the current installation. Review them carefully and uncheck those which are not always needed at boot @@ -207,7 +207,7 @@ enabled on a server. In general, select only the services you really need. !!"), configureTimezoneGMT => -__("GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in +N_("GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in local time according to the time zone you selected. It is however possible to deactivate this by unselecting \"Hardware clock set to GMT\" so that the hardware clock is the same as the system clock. This is useful when the @@ -221,7 +221,7 @@ actually install on your machine a time server which can be optionally used by other machines on your local network."), configureX => -__("X (for X Window System) is the heart of the GNU/Linux graphical interface +N_("X (for X Window System) is the heart of the GNU/Linux graphical interface on which all the graphical environments (KDE, GNOME, AfterStep, WindowMaker, etc.) bundled with Mandrake Linux rely. @@ -243,14 +243,14 @@ configuration section of the user guide for more information on how to configure your display."), configureXxdm => -__("Finally, you will be asked whether you want to see the graphical interface +N_("Finally, you will be asked whether you want to see the graphical interface at boot. Note this question will be asked even if you chose not to test the configuration. Obviously, you want to answer \"No\" if your machine is to act as a server, or if you were not successful in getting the display configured."), createBootdisk => -__("The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by +N_("The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<< at the prompt. But in case your computer cannot boot from the CD-ROM, you should come back to this step for help in at least two situations: @@ -274,7 +274,7 @@ need. You will not have to format it since DrakX will rewrite the whole disk."), doPartitionDisks => -__("You now need to choose where you want to install the Mandrake Linux +N_("You now need to choose where you want to install the Mandrake Linux operating system on your hard drive. If your hard drive is empty or if an existing operating system is using all the available space, you will need to partition it. Basically, partitioning a hard drive consists of logically @@ -344,7 +344,7 @@ here, refer to the section ``Managing Your Partitions'' of the ````Starter Guide''''"), exitInstall => -__("There you are. Installation is now completed and your GNU/Linux system is +N_("There you are. Installation is now completed and your GNU/Linux system is ready to use. Just click \"OK\" to reboot the system. You can start GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as soon as the computer has booted up again. @@ -375,7 +375,7 @@ the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<. \"mformat a:\")"), formatPartitions => -__("Any partitions that have been newly defined must be formatted for use +N_("Any partitions that have been newly defined must be formatted for use (formatting means creating a filesystem on it). At this time, you may wish to reformat some already existing partitions to @@ -401,7 +401,7 @@ Click on \"Advanced\" if you wish to select partitions that will be checked for bad blocks on the disk."), installPackages => -__("Your new Mandrake Linux operating system is currently being installed. +N_("Your new Mandrake Linux operating system is currently being installed. Depending on the number of packages you will be installing and the speed of your computer, this operation could take from a few minutes to a significant amount of time. @@ -409,7 +409,7 @@ significant amount of time. Please be patient."), installUpdates => -__("At the time you are installing Mandrake Linux, it is likely that some +N_("At the time you are installing Mandrake Linux, it is likely that some packages have been updated since the initial release. Some bugs may have been fixed, and security issues solved. To allow you to benefit from these updates, you are now able to download them from the Internet. Choose @@ -422,14 +422,14 @@ appears: review the selection, and press \"Install\" to retrieve and install the selected package(s), or \"Cancel\" to abort."), license => -__("Before continuing, you should read carefully the terms of the license. It +N_("Before continuing, you should read carefully the terms of the license. It covers the whole Mandrake Linux distribution, and if you do not agree with all the terms included in it, click on the \"Refuse\" button which will immediately terminate the installation. To continue with the installation, click on the \"Accept\" button."), miscellaneous => -__("At this point, it is time to choose the security level desired for the +N_("At this point, it is time to choose the security level desired for the machine. As a rule of thumb, the more exposed the machine is, and the more the data stored in it is crucial, the higher the security level should be. However, a higher security level is generally obtained at the expense of @@ -439,7 +439,7 @@ get more information about the meaning of these levels. If you do not know what to choose, keep the default option."), partition_with_diskdrake => -__("At this point, you need to choose which partition(s) will be used for the +N_("At this point, you need to choose which partition(s) will be used for the installation of your Mandrake Linux system. If partitions have already been defined, either from a previous installation of GNU/Linux or from another partitioning tool, you can use existing partitions. Otherwise, hard drive @@ -510,7 +510,7 @@ may find it a useful place to store a spare kernel and ramdisk images for emergency boot situations."), resizeFATChoose => -__("More than one Microsoft partition has been detected on your hard drive. +N_("More than one Microsoft partition has been detected on your hard drive. Please choose the one you want to resize in order to install your new Mandrake Linux operating system. @@ -541,10 +541,10 @@ With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means disk or partition is called \"C:\")."), resizeFATWait => -__("Please be patient. This operation can take several minutes."), +N_("Please be patient. This operation can take several minutes."), selectInstallClass => -__("DrakX now needs to know if you want to perform a default (\"Recommended\") +N_("DrakX now needs to know if you want to perform a default (\"Recommended\") installation or if you want to have greater control (\"Expert\") over your installation. You can also choose to do a new installation or upgrade your existing Mandrake Linux system: @@ -579,7 +579,7 @@ so it is not recommended that those without a fair amount of experience select this installation class."), selectKeyboard => -__("Normally, DrakX selects the right keyboard for you (depending on the +N_("Normally, DrakX selects the right keyboard for you (depending on the language you have chosen). However, you might not have a keyboard that corresponds exactly to your language: for example, if you are an English speaking Swiss person, you may still want your keyboard to be a Swiss @@ -595,7 +595,7 @@ asked in the next dialog to choose the key binding that will switch the keyboard layout between the latin and non-latin layouts."), selectLanguage => -__("The first step is to choose your preferred language. +N_("The first step is to choose your preferred language. Please choose your preferred language for installation and system usage. @@ -614,7 +614,7 @@ To switch from one language to the other, you can launch the language, or as a simple user to only change that user's default language."), selectMouse => -__("DrakX generally detects the number of buttons your mouse possesses. If not, +N_("DrakX generally detects the number of buttons your mouse possesses. If not, it assumes you have a two-button mouse and will set it up for third-button emulation. DrakX will automatically know whether it is a PS/2, serial or USB mouse. @@ -635,11 +635,11 @@ your mouse to activate it correctly. Then test that all buttons and movements are correct."), selectSerialPort => -__("Please select the correct port. For example, the \"COM1\" port under +N_("Please select the correct port. For example, the \"COM1\" port under Windows is named \"ttyS0\" under GNU/Linux."), setRootPassword => -__("This is the most crucial decision in regards with the security of your +N_("This is the most crucial decision in regards with the security of your GNU/Linux system: you have to enter the \"root\" password. \"Root\" is the system administrator and is the only one authorized to make updates, add users, change the overall system configuration, and so on. In short, @@ -675,7 +675,7 @@ If your computer is not connected to any administrated network, you will want to choose \"Local files\" for authentication."), setupBootloader => -__("LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally +N_("LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally automated. In fact, DrakX analyzes the disk boot sector and acts accordingly, depending on what it finds there: @@ -715,7 +715,7 @@ Clicking the \"Advanced\" button in this dialog will offer many advanced options, which are reserved for the expert user."), setupBootloaderAddEntry => -__("After you have configured the general bootloader parameters, the list of +N_("After you have configured the general bootloader parameters, the list of boot options which will be available at boot time will be displayed. If there is another operating system installed on your machine, it will @@ -729,14 +729,14 @@ anyone. In which case, you can delete the corresponding entries. But then, you will need a boot disk in order to boot those other operating systems!"), setupBootloaderBeginner => -__("You must indicate where you wish to place the information required to boot +N_("You must indicate where you wish to place the information required to boot GNU/Linux. Unless you know exactly what you are doing, choose \"First sector of drive (MBR)\"."), setupDefaultSpooler => -__("Here, we select a printing system for your computer. Other OSes may offer +N_("Here, we select a printing system for your computer. Other OSes may offer you one, but Mandrake Linux offers two. * \"pdq\" -- which means ``print, don't queue'', is the choice if you have @@ -756,7 +756,7 @@ emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has graphical front-ends for printing or choosing printer options."), setupSCSI => -__("DrakX now detects any IDE device present in your computer. It will also +N_("DrakX now detects any IDE device present in your computer. It will also scan for one or more PCI SCSI cards on your system. If a SCSI card is found, DrakX will automatically install the appropriate driver. @@ -778,7 +778,7 @@ If DrakX is not able to probe for the options which need to be passed, you will need to manually provide options to the driver."), setupYabootAddEntry => -__("You can add additional entries for yaboot, either for other operating +N_("You can add additional entries for yaboot, either for other operating systems, alternate kernels, or for an emergency boot image. For other OSes, the entry consists only of a label and the \"root\" @@ -825,7 +825,7 @@ also be highlighted with a ``*'', if you press [Tab] to see the boot selections."), setupYabootGeneral => -__("Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot +N_("Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot either GNU/Linux, MacOS or MacOSX if present on your computer. Normally, these other operating systems are correctly detected and installed. If this is not the case, you can add an entry by hand in this screen. Be careful to @@ -857,7 +857,7 @@ Open Firmware at the first boot prompt; Firmware Delay expires."), summary => -__("Here are presented various parameters concerning your machine. Depending on +N_("Here are presented various parameters concerning your machine. Depending on your installed hardware, you may (or may not), see the following entries: * \"Mouse\": check the current mouse configuration and click on the button @@ -888,12 +888,12 @@ displayed here. You can click on the button to change the parameters associated to it."), takeOverHdChoose => -__("Choose the hard drive you want to erase in order to install your new +N_("Choose the hard drive you want to erase in order to install your new Mandrake Linux partition. Be careful, all data present on it will be lost and will not be recoverable!"), takeOverHdConfirm => -__("Click on \"OK\" if you want to delete all data and partitions present on +N_("Click on \"OK\" if you want to delete all data and partitions present on this hard drive. Be careful, after clicking on \"OK\", you will not be able to recover any data and partitions present on this hard drive, including any Windows data. diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 5e1c1d280..a699a5ebd 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -108,7 +108,7 @@ sub setupSCSI { my ($clicked, $ent_number, $auto) = @_; if (!$::live && !$::g_auto_install && !$o->{blank} && !$::testing && !$::uml_install) { - -s modules::cz_file() or die _("Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file()); + -s modules::cz_file() or die N("Can't access kernel modules corresponding to your kernel (file %s is missing), this generally means your boot floppy in not in sync with the Installation medium (please create a newer boot floppy)", modules::cz_file()); } installStepsCall($o, $auto, 'setupSCSI', $clicked); @@ -164,7 +164,7 @@ sub formatPartitions { if ($want_root_formated) { foreach ('/usr') { my $part = fsedit::mntpoint2part($_, $o->{fstab}) or next; - $part->{toFormat} or die _("You must also format %s", $_); + $part->{toFormat} or die N("You must also format %s", $_); } } installStepsCall($o, $auto, 'formatMountPartitions', $o->{fstab}) if !$::testing; diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index e5871b014..76eab06ad 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -420,7 +420,7 @@ sub warnAboutNaughtyServers { my ($o) = @_; my @naughtyServers = pkgs::naughtyServers($o->{packages}) or return 1; if (!$o->ask_yesorno('', -formatAlaTeX(_("You have selected the following server(s): %s +formatAlaTeX(N("You have selected the following server(s): %s These servers are activated by default. They don't have any known security @@ -438,7 +438,7 @@ sub warnAboutRemovedPackages { my ($o, $packages) = @_; my @removedPackages = keys %{$packages->{state}{ask_remove} || {}} or return; if (!$o->ask_yesorno('', -formatAlaTeX(_("The following packages will be removed to allow upgrading your system: %s +formatAlaTeX(N("The following packages will be removed to allow upgrading your system: %s Do you really want to remove these packages? @@ -468,7 +468,7 @@ sub setAuthentication { #run_program::rooted($o->{prefix}, "/usr/sbin/chkauth", "yp", $domain, "-s", $nis); $o->pkg_install("ypbind"); my $domain = $o->{netc}{NISDOMAIN}; - $domain || $nis ne "broadcast" or die _("Can't use broadcast with no NIS domain"); + $domain || $nis ne "broadcast" or die N("Can't use broadcast with no NIS domain"); my $t = $domain ? "domain $domain" . ($nis ne "broadcast" && " server") : "ypserver"; substInFile { @@ -878,11 +878,11 @@ sub g_default_packages { my $floppy = detect_devices::floppy(); while (1) { - $o->ask_okcancel('', _("Insert a FAT formatted floppy in drive %s", $floppy), 1) or return; + $o->ask_okcancel('', N("Insert a FAT formatted floppy in drive %s", $floppy), 1) or return; eval { fs::mount(devices::make($floppy), "/floppy", "vfat", 0) }; last if !$@; - $o->ask_warn('', _("This floppy is not FAT formatted")); + $o->ask_warn('', N("This floppy is not FAT formatted")); } require Data::Dumper; @@ -894,7 +894,7 @@ sub g_default_packages { $str, "\0"); fs::umount("/floppy"); - $quiet or $o->ask_warn('', _("To use this saved packages selection, boot installation with ``linux defcfg=floppy''")); + $quiet or $o->ask_warn('', N("To use this saved packages selection, boot installation with ``linux defcfg=floppy''")); } sub loadO { @@ -917,7 +917,7 @@ sub loadO { -e "$f.pl" and $f .= ".pl" unless -e $f; my $fh; - if (-e $f) { open $fh, $f } else { $fh = getFile($f) or die _("Error reading file %s", $f) } + if (-e $f) { open $fh, $f } else { $fh = getFile($f) or die N("Error reading file %s", $f) } { local $/ = "\0"; no strict; @@ -1039,7 +1039,7 @@ sub getHds { } if (is_empty_array_ref($hds)) { #- no way - die _("An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem"); + die N("An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem"); } #- try to figure out if the same number of hds is available, use them if ok. @@ -1207,12 +1207,12 @@ sub ensure_is_installed { my ($do, $pkg, $file, $auto) = @_; if (! -e "$::prefix$file") { - $do->{o}->ask_okcancel('', _("The package %s needs to be installed. Do you want to install it?", $pkg), 1) + $do->{o}->ask_okcancel('', N("The package %s needs to be installed. Do you want to install it?", $pkg), 1) or return if !$auto; $do->{o}->do_pkgs->install($pkg); } if (! -e "$::prefix$file") { - $do->{o}->ask_warn('', _("Mandatory package %s is missing", $pkg)); + $do->{o}->ask_warn('', N("Mandatory package %s is missing", $pkg)); return; } 1; diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 89517dffb..08d11e269 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -76,7 +76,7 @@ sub create_big_help { gtkadd($w->{window}, gtkpack_(new Gtk::VBox(0,0), 1, createScrolledWindow(gtktext_insert(new Gtk::Text, $o->{current_help})), - 0, gtksignal_connect(my $ok = new Gtk::Button(_("Ok")), "clicked" => sub { Gtk->main_quit }), + 0, gtksignal_connect(my $ok = new Gtk::Button(N("Ok")), "clicked" => sub { Gtk->main_quit }), )); $ok->grab_focus; $w->main; diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index 5c1766351..f1efc2730 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -20,7 +20,7 @@ sub tellAboutProprietaryModules { my ($o) = @_; my @l = grep { $_ } map { $_->{driver} =~ /^Bad:(.*)/ && $1 } detect_devices::probeall(); $o->ask_warn('', formatAlaTeX( -_("Some hardware on your computer needs ``proprietary'' drivers to work. +N("Some hardware on your computer needs ``proprietary'' drivers to work. You can find some information about them at: %s", join(", ", @l)))) if @l; } @@ -55,16 +55,16 @@ sub partition_with_diskdrake { unless (fsedit::get_root_(\@fstab)) { $ok = 0; - $o->ask_okcancel('', _("You must have a root partition. + $o->ask_okcancel('', N("You must have a root partition. For this, create a partition (or click on an existing one). Then choose action ``Mount point'' and set it to `/'"), 1) or return; } if (!grep { isSwap($_) } @fstab) { - $o->ask_warn('', _("You must have a swap partition")), $ok = 0 if !$::expert; - $ok &&= $o->ask_okcancel('', _("You don't have a swap partition.\n\nContinue anyway?")); + $o->ask_warn('', N("You must have a swap partition")), $ok = 0 if !$::expert; + $ok &&= $o->ask_okcancel('', N("You don't have a swap partition.\n\nContinue anyway?")); } if (arch() =~ /ia64/ && !fsedit::has_mntpoint("/boot/efi", $all_hds)) { - $o->ask_warn('', _("You must have a FAT partition mounted in /boot/efi")); + $o->ask_warn('', N("You must have a FAT partition mounted in /boot/efi")); $ok = ''; } } until $ok; @@ -89,9 +89,9 @@ sub partitionWizardSolutions { my @hds_rw = grep { !$_->{readonly} } @$hds; my @hds_can_add = grep { $_->can_raw_add } @hds_rw; if (fsedit::free_space(@hds_can_add) > $min_linux) { - $solutions{free_space} = [ 20, _("Use free space"), sub { fsedit::auto_allocate($all_hds); 1 } ] + $solutions{free_space} = [ 20, N("Use free space"), sub { fsedit::auto_allocate($all_hds); 1 } ] } else { - push @wizlog, _("Not enough free space to allocate new partitions") . ": " . + push @wizlog, N("Not enough free space to allocate new partitions") . ": " . (@hds_can_add ? fsedit::free_space(@hds_can_add) . " < $min_linux" : "no harddrive on which partitions can be added"); @@ -99,23 +99,23 @@ sub partitionWizardSolutions { if (my @truefs = grep { isTrueFS($_) } @$fstab) { #- value twice the ext2 partitions - $solutions{existing_part} = [ 6 + @truefs + @$fstab, _("Use existing partitions"), sub { $o->ask_mntpoint_s($fstab) } ] + $solutions{existing_part} = [ 6 + @truefs + @$fstab, N("Use existing partitions"), sub { $o->ask_mntpoint_s($fstab) } ] } else { - push @wizlog, _("There is no existing partition to use"); + push @wizlog, N("There is no existing partition to use"); } my @fats = grep { isFat($_) } @$fstab; fs::df($_) foreach @fats; if (my @ok_forloopback = sort { $b->{free} <=> $a->{free} } grep { $_->{free} > $min_linux + $min_swap + $min_freewin } @fats) { $solutions{loopback} = - [ -10 - @fats, _("Use the Windows partition for loopback"), + [ -10 - @fats, N("Use the Windows partition for loopback"), sub { my ($s_root, $s_swap); - my $part = $o->ask_from_listf('', _("Which partition do you want to use for Linux4Win?"), \&partition_table::description, \@ok_forloopback) or return; + my $part = $o->ask_from_listf('', N("Which partition do you want to use for Linux4Win?"), \&partition_table::description, \@ok_forloopback) or return; $max_swap = $min_swap + 1 if $part->{free} - $max_swap < $min_linux; - $o->ask_from('', _("Choose the sizes"), [ - { label => _("Root partition size in MB: "), val => \$s_root, min => $min_linux >> 11, max => min($part->{free} - $max_swap, $max_linux) >> 11, type => 'range' }, - { label => _("Swap partition size in MB: "), val => \$s_swap, min => $min_swap >> 11, max => $max_swap >> 11, type => 'range' }, + $o->ask_from('', N("Choose the sizes"), [ + { label => N("Root partition size in MB: "), val => \$s_root, min => $min_linux >> 11, max => min($part->{free} - $max_swap, $max_linux) >> 11, type => 'range' }, + { label => N("Swap partition size in MB: "), val => \$s_swap, min => $min_swap >> 11, max => $max_swap >> 11, type => 'range' }, ]) or return; push @{$part->{loopback}}, { type =>0x483, loopback_file => '/lnx4win/linuxsys.img', mntpoint => '/', size => $s_root << 11, loopback_device => $part, notFormatted => 1 }, @@ -125,19 +125,19 @@ sub partitionWizardSolutions { } ]; my @ok_for_resize_fat = grep { !fsedit::part2hd($_, $all_hds)->{readonly} } @ok_forloopback; $solutions{resize_fat} = - [ 6 - @fats, _("Use the free space on the Windows partition"), + [ 6 - @fats, N("Use the free space on the Windows partition"), sub { $o->set_help('resizeFATChoose'); - my $part = $o->ask_from_listf('', _("Which partition do you want to resize?"), \&partition_table::description, \@ok_for_resize_fat) or return; + my $part = $o->ask_from_listf('', N("Which partition do you want to resize?"), \&partition_table::description, \@ok_for_resize_fat) or return; $o->set_help('resizeFATWait'); - my $w = $o->wait_message(_("Resizing"), _("Resizing Windows partition")); + my $w = $o->wait_message(N("Resizing"), N("Resizing Windows partition")); require resize_fat::main; my $resize_fat = eval { resize_fat::main->new($part->{device}, devices::make($part->{device})) }; - $@ and die _("The FAT resizer is unable to handle your partition, + $@ and die N("The FAT resizer is unable to handle your partition, the following error occured: %s", $@); my $min_win = $resize_fat->min_size; - $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die _("Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrake Linux installation."); - $o->ask_okcancel('', _("WARNING! + $part->{size} > $min_linux + $min_swap + $min_freewin + $min_win or die N("Your Windows partition is too fragmented. Please reboot your computer under Windows, run the ``defrag'' utility, then restart the Mandrake Linux installation."); + $o->ask_okcancel('', N("WARNING! DrakX will now resize your Windows partition. Be careful: this operation is dangerous. If you have not already done @@ -147,15 +147,15 @@ installation. You should also backup your data. When sure, press Ok.")) or return; my $mb_size = $part->{size} >> 11; - $o->ask_from('', _("Which size do you want to keep for Windows on"), [ - { label => _("partition %s", partition_table::description($part)), val => \$mb_size, min => $min_win >> 11, max => ($part->{size} - $min_linux - $min_swap) >> 11, type => 'range' }, + $o->ask_from('', N("Which size do you want to keep for Windows on"), [ + { label => N("partition %s", partition_table::description($part)), val => \$mb_size, min => $min_win >> 11, max => ($part->{size} - $min_linux - $min_swap) >> 11, type => 'range' }, ]) or return; my $size = from_Mb($mb_size, $min_win, $part->{size}); local *log::l = sub { $w->set(join(' ', @_)) }; eval { $resize_fat->resize($size) }; - $@ and die _("FAT resizing failed: %s", $@); + $@ and die N("FAT resizing failed: %s", $@); $part->{size} = $size; $part->{isFormatted} = 1; @@ -170,19 +170,19 @@ When sure, press Ok.")) or return; 1; } ] if @ok_for_resize_fat; } else { - push @wizlog, _("There is no FAT partition to resize or to use as loopback (or not enough space left)") . + push @wizlog, N("There is no FAT partition to resize or to use as loopback (or not enough space left)") . @fats ? "\nFAT partitions:" . join('', map { "\n $_->{device} $_->{free} (" . ($min_linux + $min_swap + $min_freewin) . ")" } @fats) : ''; } if (@$fstab && @hds_rw) { $solutions{wipe_drive} = - [ 10, fsedit::is_one_big_fat($hds) ? _("Remove Windows(TM)") : _("Erase entire disk"), + [ 10, fsedit::is_one_big_fat($hds) ? N("Remove Windows(TM)") : N("Erase entire disk"), sub { $o->set_help('takeOverHdChoose'); - my $hd = $o->ask_from_listf('', _("You have more than one hard drive, which one do you install linux on?"), + my $hd = $o->ask_from_listf('', N("You have more than one hard drive, which one do you install linux on?"), \&partition_table::description, \@hds_rw) or return; $o->set_help('takeOverHdConfirm'); - $o->ask_okcancel('', _("ALL existing partitions and their data will be lost on drive %s", partition_table::description($hd))) or return; + $o->ask_okcancel('', N("ALL existing partitions and their data will be lost on drive %s", partition_table::description($hd))) or return; partition_table::raw::zero_MBR($hd); fsedit::auto_allocate($all_hds); 1; @@ -190,14 +190,14 @@ When sure, press Ok.")) or return; } if (@hds_rw) { - $solutions{diskdrake} = [ 0, _("Custom disk partitioning"), sub { partition_with_diskdrake($o, $all_hds, 'nowizard') } ]; + $solutions{diskdrake} = [ 0, N("Custom disk partitioning"), sub { partition_with_diskdrake($o, $all_hds, 'nowizard') } ]; } $solutions{fdisk} = - [ -10, _("Use fdisk"), sub { + [ -10, N("Use fdisk"), sub { $o->enter_console; foreach (@$hds) { - print "\n" x 10, _("You can now partition %s. + print "\n" x 10, N("You can now partition %s. When you are done, don't forget to save using `w'", partition_table::description($_)); print "\n\n"; my $pid = 0; @@ -226,7 +226,7 @@ sub partitionWizard { if ($solutions{loopback}) { %solutions = (loopback => $solutions{loopback}); } else { - $o->ask_warn('', _("You don't have enough free space on your Windows partition")) if grep { isFat($_) } fsedit::get_all_fstab($o->{all_hds}); + $o->ask_warn('', N("You don't have enough free space on your Windows partition")) if grep { isFat($_) } fsedit::get_all_fstab($o->{all_hds}); } } @@ -242,14 +242,14 @@ sub partitionWizard { @solutions = @sol if @sol > 1; log::l("solutions: ", int @solutions); - @solutions or $o->ask_warn('', _("I can't find any room for installing")), die 'already displayed'; + @solutions or $o->ask_warn('', N("I can't find any room for installing")), die 'already displayed'; log::l('HERE: ', join(',', map { $_->[1] } @solutions)); - if (my $sol = $o->ask_from_listf('', _("The DrakX Partitioning wizard found the following solutions:"), sub { $_[0][1] }, \@solutions)) { + if (my $sol = $o->ask_from_listf('', N("The DrakX Partitioning wizard found the following solutions:"), sub { $_[0][1] }, \@solutions)) { log::l("partitionWizard calling solution $sol->[1]"); my $ok = eval { $sol->[2]->() }; die if $@ =~ /setstep/; - $@ and $o->ask_warn('', _("Partitioning failed: %s", $@)); + $@ and $o->ask_warn('', N("Partitioning failed: %s", $@)); $ok or goto &partitionWizard; } else { $nodiskdrake ? return : die "setstep setupSCSI\n"; @@ -259,12 +259,12 @@ sub partitionWizard { sub upNetwork { my ($o, $pppAvoided) = @_; - my $w = $o->wait_message('', _("Bringing up the network")); + my $w = $o->wait_message('', N("Bringing up the network")); install_steps::upNetwork($o, $pppAvoided); } sub downNetwork { my ($o, $pppOnly) = @_; - my $w = $o->wait_message('', _("Bringing down the network")); + my $w = $o->wait_message('', N("Bringing down the network")); install_steps::downNetwork($o, $pppOnly); } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 86e645d40..cb4fbffef 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -72,8 +72,8 @@ sub leavingStep { while (my $f = shift @{$o->{steps}{$step}{toBeDone} || []}) { eval { &$f() }; - $o->ask_warn(_("Error"), [ -_("An error occurred, but I don't know how to handle it nicely. + $o->ask_warn(N("Error"), [ +N("An error occurred, but I don't know how to handle it nicely. Continue at your own risk."), $@ ]) if $@; } } @@ -166,7 +166,7 @@ sub doPartitionDisksAfter { } if (arch() =~ /ia64/ && !fsedit::has_mntpoint("/boot/efi", $o->{all_hds})) { - die _("You must have a FAT partition mounted in /boot/efi"); + die N("You must have a FAT partition mounted in /boot/efi"); } if ($o->{partitioning}{use_existing_root}) { @@ -208,7 +208,7 @@ sub ask_mntpoint_s { next unless $m && $m ne 'swap'; #- there may be a lot of swap. - $m{$m} and die _("Duplicate mount point %s", $m); + $m{$m} and die N("Duplicate mount point %s", $m); $m{$m} = 1; #- in case the type does not correspond, force it to ext3 @@ -377,7 +377,7 @@ sub afterInstallPackages($) { return if $::g_auto_install; - die _("Some important packages didn't get installed properly. + die N("Some important packages didn't get installed properly. Either your cdrom drive or your cdrom is defective. Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm\" ") if grep { m|read failed: Input/output error| } cat_("$o->{prefix}/root/drakx/install.log"); @@ -449,7 +449,7 @@ Consoles 1,3,4,7 may also contain interesting information"; my $kdmrc = "$o->{prefix}/usr/share/config/kdm/kdmrc"; my $kde_charset = lang::charset2kde_charset(lang::lang2charset($o->{lang})); - my $welcome = c::to_utf8(_("Welcome to %s", '%n')); + my $welcome = c::to_utf8(N("Welcome to %s", '%n')); substInFile { s/^(GreetString)=.*/$1=$welcome/; s/^(Language)=.*/$1=$LANG/; @@ -545,7 +545,7 @@ GridHeight=70 my @l = detect_devices::floppies_dev(); foreach (qw(blank updatemodules)) { - $o->{$_} eq "1" and $o->{$_} = $l[0] || die _("No floppy drive available"); + $o->{$_} eq "1" and $o->{$_} = $l[0] || die N("No floppy drive available"); } $o->{blank} and $o->copyKernelFromFloppy(); @@ -784,7 +784,7 @@ sub createBootdisk($) { my @l = detect_devices::floppies_dev(); - $dev = shift @l || die _("No floppy drive available") + $dev = shift @l || die N("No floppy drive available") if $dev eq "1"; #- special case meaning autochoose return if $::testing; diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm index 734403f90..07e960b5e 100644 --- a/perl-install/install_steps_auto_install.pm +++ b/perl-install/install_steps_auto_install.pm @@ -73,7 +73,7 @@ sub configureNetwork { sub enteringStep { my ($o, $step) = @_; - my ($s, $t) = (__("Entering step `%s'\n"), $o->{steps}{$step}{text}); + my ($s, $t) = (N_("Entering step `%s'\n"), $o->{steps}{$step}{text}); ($s, $t) = (translate($s), translate($t)) if $ENV{LANG} !~ /ja|ko|zh/; print sprintf($s, $t); $o->install_steps::enteringStep($step); diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 09ce1dc09..d0ba9cb74 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -147,7 +147,7 @@ sub selectLanguage { $o->SUPER::selectLanguage; $o->ask_warn('', -_("Your system is low on resources. You may have some problem installing +N("Your system is low on resources. You may have some problem installing Mandrake Linux. If that occurs, you can try a text install instead. For this, press `F1' when booting on CDROM, then enter `text'.")) if $first_time && availableRamMB() < 60; # 60MB @@ -158,10 +158,10 @@ sub selectInstallClass1 { my ($o, $verif, $l, $def, $l2, $def2) = @_; $::live || @$l == 1 || !@$l2 and return $o->SUPER::selectInstallClass1($verif, $l, $def, $l2, $def2); - my $w = my_gtk->new(_("Install Class")); + my $w = my_gtk->new(N("Install Class")); my $focused; gtkadd($w->{window}, - gtkpack($w->create_box_with_title(_("Please choose one of the following classes of installation:")), + gtkpack($w->create_box_with_title(N("Please choose one of the following classes of installation:")), (my @radios = gtkradio($def, @$l)), gtkadd(create_vbox(), map { my $v = $_; @@ -234,7 +234,7 @@ sub reallyChooseGroups { translate($path), map { $entry->($_) } grep { $o->{compssUsers}{$_}{path} eq $path } @{$o->{compssUsersSorted}}; }; gtkadd($w->{window}, - gtkpack($w->create_box_with_title(_("Package Group Selection")), + gtkpack($w->create_box_with_title(N("Package Group Selection")), gtkpack_(new Gtk::VBox(0,0), 1, gtkpack_(new Gtk::HBox(0,0), $o->{meta_class} eq 'server' ? ( @@ -267,12 +267,12 @@ sub reallyChooseGroups { gtkadd(new Gtk::HBox(0,0), $w_size, if_($individual, do { - my $check = Gtk::CheckButton->new(_("Individual package selection")); + my $check = Gtk::CheckButton->new(N("Individual package selection")); $check->set_active($$individual); $check->signal_connect(clicked => sub { $$individual = $check->get_active }); $check; }), - gtksignal_connect(new Gtk::Button(_("Ok")), clicked => sub { Gtk->main_quit }), + gtksignal_connect(new Gtk::Button(N("Ok")), clicked => sub { Gtk->main_quit }), ), ), ); @@ -290,7 +290,7 @@ sub choosePackagesTree { my $common; $common = { get_status => sub { my $size = pkgs::selectedSize($packages); - _("Total size: %d / %d MB", pkgs::correctSize($size / sqr(1024)), $available / sqr(1024)); + N("Total size: %d / %d MB", pkgs::correctSize($size / sqr(1024)), $available / sqr(1024)); }, node_state => sub { my $p = pkgs::packageByName($packages,$_[0]) or return; @@ -322,7 +322,7 @@ sub choosePackagesTree { } my $root2 = join('|', map { translate($_) } split('\|', $root)); $add_node->($_, $root2) foreach sort @firstchoice; - $add_node->($_, $root2 . '|' . _("Other")) foreach sort @others; + $add_node->($_, $root2 . '|' . N("Other")) foreach sort @others; } } }, @@ -332,11 +332,11 @@ sub choosePackagesTree { my $imp = translate($pkgs::compssListDesc{$p->flag_base ? 5 : $p->rate}); - my $info = $@ ? _("Bad package") : - (_("Name: %s\n", $p->name) . - _("Version: %s\n", $p->version . '-' . $p->release) . - _("Size: %d KB\n", $p->size / 1024) . - ($imp && _("Importance: %s\n", $imp)) . "\n" . + my $info = $@ ? N("Bad package") : + (N("Name: %s\n", $p->name) . + N("Version: %s\n", $p->version . '-' . $p->release) . + N("Size: %d KB\n", $p->size / 1024) . + ($imp && N("Importance: %s\n", $imp)) . "\n" . formatLines(c::from_utf8($p->description))); return $info; }, @@ -358,13 +358,13 @@ sub choosePackagesTree { $p->flag_selected or $size += $p->size; } if (pkgs::correctSize($size / sqr(1024)) > $available / sqr(1024)) { - return $o->ask_warn('', _("You can't select this package as there is not enough space left to install it")); + return $o->ask_warn('', N("You can't select this package as there is not enough space left to install it")); } @l > @n && $common->{state}{auto_deps} and $o->ask_okcancel('', [ $isSelection ? - _("The following packages are going to be installed") : - _("The following packages are going to be removed"), + N("The following packages are going to be installed") : + N("The following packages are going to be removed"), common::formatList(20, sort @l) ], 1) || return; if ($isSelection) { pkgs::selectPackage($packages, $_) foreach @n; @@ -376,11 +376,11 @@ sub choosePackagesTree { $set_state->($_, $p->flag_selected ? 'selected' : 'unselected'); } } else { - $o->ask_warn('', _("You can't select/unselect this package")); + $o->ask_warn('', N("You can't select/unselect this package")); } }, grep_allowed_to_toggle => sub { - grep { $_ ne _("Other") && !pkgs::packageByName($packages, $_)->flag_base } @_; + grep { $_ ne N("Other") && !pkgs::packageByName($packages, $_)->flag_base } @_; }, grep_unselected => sub { grep { !pkgs::packageByName($packages, $_)->flag_selected } @_; @@ -388,30 +388,30 @@ sub choosePackagesTree { check_interactive_to_toggle => sub { my $p = pkgs::packageByName($packages, $_[0]) or return; if ($p->flag_base) { - $o->ask_warn('', _("This is a mandatory package, it can't be unselected")); + $o->ask_warn('', N("This is a mandatory package, it can't be unselected")); } elsif ($p->flag_installed && !$p->flag_upgrade) { - $o->ask_warn('', _("You can't unselect this package. It is already installed")); + $o->ask_warn('', N("You can't unselect this package. It is already installed")); } elsif ($p->flag_selected && $p->flag_installed) { if ($::expert) { - $o->ask_yesorno('', _("This package must be upgraded.\nAre you sure you want to deselect it?")) or return; + $o->ask_yesorno('', N("This package must be upgraded.\nAre you sure you want to deselect it?")) or return; return 1; } else { - $o->ask_warn('', _("You can't unselect this package. It must be upgraded")); + $o->ask_warn('', N("You can't unselect this package. It must be upgraded")); } } else { return 1 } return; }, - auto_deps => _("Show automatically selected packages"), - ok => _("Install"), - cancel => $limit_to_medium && _("Cancel"), + auto_deps => N("Show automatically selected packages"), + ok => N("Install"), + cancel => $limit_to_medium && N("Cancel"), icons => [ { icon => 'floppy', - help => _("Load/Save on floppy"), - wait_message => _("Updating package selection"), + help => N("Load/Save on floppy"), + wait_message => N("Updating package selection"), code => sub { $o->loadSavePackagesOnFloppy($packages); 1 }, }, if_(0, { icon => 'feather', - help => _("Minimal install"), + help => N("Minimal install"), code => sub { install_any::unselectMostPackages($o); @@ -426,7 +426,7 @@ sub choosePackagesTree { }; $o->set_help('choosePackagesTree'); - $o->ask_browse_tree_info('', _("Choose the packages you want to install"), $common); + $o->ask_browse_tree_info('', N("Choose the packages you want to install"), $common); } #------------------------------------------------------------------------------ @@ -442,32 +442,32 @@ sub installPackages { my ($current_total_size, $last_size, $nb, $total_size, $start_time, $last_dtime, $trans_progress_total); - my $w = my_gtk->new(_("Installing")); + my $w = my_gtk->new(N("Installing")); $w->sync; my $text = new Gtk::Label; my ($advertising, $change_time, $i); my $show_advertising if 0; $show_advertising = to_bool(@install_any::advertising_images) if !defined $show_advertising; - my ($msg, $msg_time_remaining, $msg_time_total) = map { new Gtk::Label($_) } '', (_("Estimating")) x 2; + my ($msg, $msg_time_remaining, $msg_time_total) = map { new Gtk::Label($_) } '', (N("Estimating")) x 2; my ($progress, $progress_total) = map { new Gtk::ProgressBar } (1..2); $w->{rwindow}->set_policy(1, 1, 1); gtkadd($w->{window}, my $box = new Gtk::VBox(0,10)); $box->pack_end(gtkshow(gtkpack(gtkset_usize(new Gtk::VBox(0,5), $::windowwidth * 0.6, 0), $msg, $progress, create_packtable({}, - [_("Time remaining "), $msg_time_remaining], -# [_("Total time "), $msg_time_total], + [N("Time remaining "), $msg_time_remaining], +# [N("Total time "), $msg_time_total], ), $text, $progress_total, gtkadd(create_hbox(), - my $cancel = new Gtk::Button(_("Cancel")), - my $details = new Gtk::Button(_("Details")), + my $cancel = new Gtk::Button(N("Cancel")), + my $details = new Gtk::Button(N("Details")), ), )), 0, 1, 0); $details->hide if !@install_any::advertising_images; $w->sync; - $msg->set(_("Please wait, preparing installation...")); + $msg->set(N("Please wait, preparing installation...")); gtkset_mousecursor_normal($cancel->window); gtkset_mousecursor_normal($details->window); my $advertize = sub { @@ -551,12 +551,12 @@ sub installPackages { $nb = $amount; $total_size = $total; $current_total_size = 0; $start_time = time(); - $msg->set(_("%d packages", $nb)); + $msg->set(N("%d packages", $nb)); $w->flush; } elsif ($type eq 'inst' && $subtype eq 'start') { $progress->update(0); my $p = $data->{depslist}[$id]; - $msg->set(_("Installing package %s", $p->name)); + $msg->set(N("Installing package %s", $p->name)); $current_total_size += $last_size; $last_size = $p->size; $text->set((split /\n/, c::from_utf8($p->summary))[0] || ''); @@ -593,8 +593,8 @@ sub installPackages { my $name = pkgs::mediumDescr($o->{packages}, $medium); local $| = 1; print "\a"; my $time = time(); - my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($install_steps_interactive::com_license), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept"); - $r &&= $o->ask_okcancel('', _("Change your Cd-Rom! + my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($install_steps_interactive::com_license), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept"); + $r &&= $o->ask_okcancel('', N("Change your Cd-Rom! Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done. If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $name), 1); @@ -608,11 +608,11 @@ If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $na sub { if ($@ =~ /^error ordering package list: (.*)/) { $o->ask_yesorno('', [ -_("There was an error ordering packages:"), $1, _("Go on anyway?") ], 1) and return 1; +N("There was an error ordering packages:"), $1, N("Go on anyway?") ], 1) and return 1; ${$_[0]} = "already displayed"; } elsif ($@ =~ /^error installing package list: (.*)/) { $o->ask_yesorno('', [ -_("There was an error installing packages:"), $1, _("Go on anyway?") ], 1) and return 1; +N("There was an error installing packages:"), $1, N("Go on anyway?") ], 1) and return 1; ${$_[0]} = "already displayed"; } 0; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 26585229a..8e5e45ef6 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -7,7 +7,7 @@ use vars qw(@ISA $new_bootstrap $com_license); @ISA = qw(install_steps); -$com_license = _(" +$com_license = N(" Warning Please read carefully the terms below. If you disagree with any @@ -64,7 +64,7 @@ use log; #-###################################################################################### sub errorInStep($$) { my ($o, $err) = @_; - $o->ask_warn(_("Error"), [ _("An error occurred"), formatError($err) ]); + $o->ask_warn(N("Error"), [ N("An error occurred"), formatError($err) ]); } sub kill_action { @@ -82,7 +82,7 @@ sub selectLanguage { my ($o) = @_; $o->{lang} = any::selectLanguage($o, $o->{lang}, $o->{langs} ||= {}) - || return $o->ask_yesorno('', _("Do you really want to leave the installation?")) ? $o->exit : &selectLanguage; + || return $o->ask_yesorno('', N("Do you really want to leave the installation?")) ? $o->exit : &selectLanguage; install_steps::selectLanguage($o); $o->charsetChanged; @@ -98,7 +98,7 @@ least read and write in that language; and possibly more (various fonts, spell checkers, various programs translated etc. that varies from language to language).")) if $o->{lang} !~ /^en/ && !lang::load_mo(); } else { - #- don't use _( ) for this, as it is never translated + #- no need to have this in po since it is never translated $o->ask_warn('', "The characters of your language can't be displayed in console, so the messages will be displayed in english during installation") if $ENV{LANGUAGE} eq 'C'; } @@ -109,8 +109,8 @@ sub acceptLicence { return if $o->{useless_thing_accepted}; $o->set_help('license'); - $o->{useless_thing_accepted} = $o->ask_from_list_(_("License agreement"), formatAlaTeX( -_("Introduction + $o->{useless_thing_accepted} = $o->ask_from_list_(N("License agreement"), formatAlaTeX( +N("Introduction The operating system and the different components available in the Mandrake Linux distribution shall be called the \"Software Products\" hereafter. The Software Products include, but are not @@ -192,9 +192,9 @@ Software included may be covered by patents in your country. For example, the MP3 decoders included may require a licence for further usage (see http://www.mp3licensing.com for more details). If you are unsure if a patent may be applicable to you, check your local laws. -"), [ __("Accept"), __("Refuse") ], "Refuse") eq "Accept" and return; +"), [ N_("Accept"), N_("Refuse") ], "Refuse") eq "Accept" and return; - $o->ask_yesorno('', _("Are you sure you refuse the licence?"), 1) and $o->exit; + $o->ask_yesorno('', N("Are you sure you refuse the licence?"), 1) and $o->exit; &acceptLicence; } @@ -214,10 +214,10 @@ sub selectKeyboard { my $other; my $ext_keyboard = my $KEYBOARD = $o->{keyboard}{KEYBOARD}; $o->ask_from_( - { title => _("Keyboard"), - messages => _("Please choose your keyboard layout."), - advanced_messages => _("Here is the full list of keyboards available"), - advanced_label => _("More"), + { title => N("Keyboard"), + messages => N("Please choose your keyboard layout."), + advanced_messages => N("Here is the full list of keyboards available"), + advanced_label => N("More"), callbacks => { changed => sub { $other = $_[0]==1 } }, }, [ if_(@best > 1, { val => \$KEYBOARD, type => 'list', format => $format, sort => 1, @@ -234,11 +234,11 @@ sub selectKeyboard { #------------------------------------------------------------------------------ sub selectInstallClass1 { my ($o, $verif, $l, $def, $l2, $def2) = @_; - $verif->($o->ask_from_list(_("Install Class"), _("Which installation class do you want?"), $l, $def) || die 'already displayed'); + $verif->($o->ask_from_list(N("Install Class"), N("Which installation class do you want?"), $l, $def) || die 'already displayed'); return if !@$l2; - $::live ? 'Update' : $o->ask_from_list_(_("Install/Update"), _("Is this an install or an update?"), $l2, $def2); + $::live ? 'Update' : $o->ask_from_list_(N("Install/Update"), N("Is this an install or an update?"), $l2, $def2); } #------------------------------------------------------------------------------ @@ -247,22 +247,22 @@ sub selectInstallClass { my %c = my @c = ( if_(!$::corporate, - _("Recommended") => "beginner", + N("Recommended") => "beginner", ), if_($o->{meta_class} ne 'desktop', - _("Expert") => "expert", + N("Expert") => "expert", ), ); - %c = @c = (_("Expert") => "expert") if $::expert && !$clicked; + %c = @c = (N("Expert") => "expert") if $::expert && !$clicked; $o->set_help('selectInstallClassCorpo') if $::corporate; my $verifInstallClass = sub { $::expert = $c{$_[0]} eq "expert" }; - my $installMode = $o->{isUpgrade} ? $o->{keepConfiguration} ? __("Upgrade packages only") : __("Upgrade") : __("Install"); + my $installMode = $o->{isUpgrade} ? $o->{keepConfiguration} ? N_("Upgrade packages only") : N_("Upgrade") : N_("Install"); if ($installMode = $o->selectInstallClass1($verifInstallClass, first(list2kv(@c)), ${{reverse %c}}{$::expert ? "expert" : "beginner"}, - exists $o->{isUpgrade} ? [] : [ __("Install"), __("Upgrade"), __("Upgrade packages only") ], $installMode)) { + exists $o->{isUpgrade} ? [] : [ N_("Install"), N_("Upgrade"), N_("Upgrade packages only") ], $installMode)) { log::l("install class: $installMode"); $o->{isUpgrade} = $installMode =~ /Upgrade/; $o->{keepConfiguration} = $installMode =~ /packages only/; @@ -279,14 +279,14 @@ sub selectMouse { my $prev = $o->{mouse}{type} . '|' . $o->{mouse}{name}; $o->{mouse} = mouse::fullname2mouse( - $o->ask_from_treelist_('', _("Please choose the type of your mouse."), + $o->ask_from_treelist_('', N("Please choose the type of your mouse."), '|', [ mouse::fullnames() ], $prev) || return) if $force; if ($force && $o->{mouse}{type} eq 'serial') { $o->set_help('selectSerialPort'); $o->{mouse}{device} = - $o->ask_from_listf(_("Mouse Port"), - _("Please choose on which serial port your mouse is connected to."), + $o->ask_from_listf(N("Mouse Port"), + N("Please choose on which serial port your mouse is connected to."), \&mouse::serial_port2text, [ mouse::serial_ports() ]) or return; } @@ -294,10 +294,10 @@ sub selectMouse { #- set a sane default F11/F12 $o->{mouse}{button2_key} = 87; $o->{mouse}{button3_key} = 88; - $o->ask_from('', _("Buttons emulation"), + $o->ask_from('', N("Buttons emulation"), [ - { label => _("Button 2 Emulation"), val => \$o->{mouse}{button2_key}, list => [ mouse::ppc_one_button_keys() ], format => \&mouse::ppc_one_button_key2text }, - { label => _("Button 3 Emulation"), val => \$o->{mouse}{button3_key}, list => [ mouse::ppc_one_button_keys() ], format => \&mouse::ppc_one_button_key2text }, + { label => N("Button 2 Emulation"), val => \$o->{mouse}{button2_key}, list => [ mouse::ppc_one_button_keys() ], format => \&mouse::ppc_one_button_key2text }, + { label => N("Button 3 Emulation"), val => \$o->{mouse}{button3_key}, list => [ mouse::ppc_one_button_keys() ], format => \&mouse::ppc_one_button_key2text }, ]) or return; } @@ -318,14 +318,14 @@ sub setupSCSI { if (!$::noauto && arch() =~ /i.86/) { if ($o->{pcmcia} ||= !$::testing && c::pcmcia_probe()) { - my $w = $o->wait_message(_("PCMCIA"), _("Configuring PCMCIA cards...")); + my $w = $o->wait_message(N("PCMCIA"), N("Configuring PCMCIA cards...")); my $results = modules::configure_pcmcia($o->{pcmcia}); $w = undef; $results and $o->ask_warn('', $results); } } { - my $w = $o->wait_message(_("IDE"), _("Configuring IDE")); + my $w = $o->wait_message(N("IDE"), N("Configuring IDE")); modules::load(modules::category2modules('disk/cdrom')); } any::load_category($o, 'bus/firewire', 1); @@ -342,10 +342,10 @@ sub ask_mntpoint_s { my @fstab = grep { isTrueFS($_) } @$fstab; @fstab = grep { isSwap($_) } @$fstab if @fstab == 0; @fstab = @$fstab if @fstab == 0; - die _("No partition available") if @fstab == 0; + die N("No partition available") if @fstab == 0; { - my $w = $o->wait_message('', _("Scanning partitions to find mount points")); + my $w = $o->wait_message('', N("Scanning partitions to find mount points")); install_any::suggest_mount_points($fstab, $o->{prefix}, 'uniq'); log::l("default mntpoint $_->{mntpoint} $_->{device}") foreach @fstab; } @@ -353,7 +353,7 @@ sub ask_mntpoint_s { $fstab[0]{mntpoint} = '/'; } else { $o->ask_from('', - _("Choose the mount points"), + N("Choose the mount points"), [ map { { label => partition_table::description($_), val => \$_->{mntpoint}, not_edit => 0, @@ -383,7 +383,7 @@ sub doPartitionDisks { fsedit::add($freepart->{hd}, { start => $freepart->{start}, size => 1 << 11, type => 0x401, mntpoint => '' }, $o->{all_hds}, { force => 1, primaryOrExtended => 'Primary' }); $new_bootstrap = 1; } else { - $o->ask_warn('',_("No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake")); + $o->ask_warn('',N("No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake")); } } } @@ -392,9 +392,9 @@ sub doPartitionDisks { # either one root is defined (and all is ok), or we take the first one we find my $p = fsedit::get_root_($o->{fstab}); if (!$p) { - my @l = install_any::find_root_parts($o->{fstab}, $o->{prefix}) or die _("No root partition found to perform an upgrade"); - $p = $o->ask_from_listf(_("Root Partition"), - _("What is the root partition (/) of your system?"), + my @l = install_any::find_root_parts($o->{fstab}, $o->{prefix}) or die N("No root partition found to perform an upgrade"); + $p = $o->ask_from_listf(N("Root Partition"), + N("What is the root partition (/) of your system?"), \&partition_table::description, \@l) or die "setstep exitInstall\n"; } install_any::use_root_part($o->{all_hds}, $p, $o->{prefix}); @@ -408,7 +408,7 @@ sub doPartitionDisks { #------------------------------------------------------------------------------ sub rebootNeeded { my ($o) = @_; - $o->ask_warn('', _("You need to reboot for the partition table modifications to take place")); + $o->ask_warn('', N("You need to reboot for the partition table modifications to take place")); install_steps::rebootNeeded($o); } @@ -432,8 +432,8 @@ sub choosePartitionsToFormat { $_->{toFormatTmp} = $_->{toFormat} || $_->{toFormatUnsure} foreach @l; $o->ask_from_( - { messages => _("Choose the partitions you want to format"), - advanced_messages => _("Check bad blocks?"), + { messages => N("Choose the partitions you want to format"), + advanced_messages => N("Check bad blocks?"), }, [ map { my $e = $_; @@ -460,31 +460,31 @@ sub formatMountPartitions { catch_cdie { fs::formatMount_all($o->{all_hds}{raids}, $o->{fstab}, $o->{prefix}, sub { my ($part) = @_; - $w ||= $o->wait_message('', _("Formatting partitions")); + $w ||= $o->wait_message('', N("Formatting partitions")); $w->set(isLoopback($part) ? - _("Creating and formatting file %s", $part->{loopback_file}) : - _("Formatting partition %s", $part->{device})); + N("Creating and formatting file %s", $part->{loopback_file}) : + N("Formatting partition %s", $part->{device})); }); } sub { $@ =~ /fsck failed on (\S+)/ or return; - $o->ask_yesorno('', _("Failed to check filesystem %s. Do you want to repair the errors? (beware, you can loose data)", $1), 1); + $o->ask_yesorno('', N("Failed to check filesystem %s. Do you want to repair the errors? (beware, you can loose data)", $1), 1); }; - die _("Not enough swap space to fulfill installation, please add some") if availableMemory < 40 * 1024; + die N("Not enough swap space to fulfill installation, please add some") if availableMemory < 40 * 1024; } #------------------------------------------------------------------------------ sub setPackages { my ($o, $rebuild_needed) = @_; - my $w = $o->wait_message('', $rebuild_needed ? _("Looking for available packages and rebuilding rpm database...") : - _("Looking for available packages...")); + my $w = $o->wait_message('', $rebuild_needed ? N("Looking for available packages and rebuilding rpm database...") : + N("Looking for available packages...")); install_any::setPackages($o, $rebuild_needed); - $w->set(_("Looking at packages already installed...")); + $w->set(N("Looking at packages already installed...")); pkgs::selectPackagesAlreadyInstalled($o->{packages}, $o->{prefix}); if ($rebuild_needed) { - $w->set(_("Finding packages to upgrade...")); + $w->set(N("Finding packages to upgrade...")); pkgs::selectPackagesToUpgrade($o->{packages}, $o->{prefix}); } } @@ -502,7 +502,7 @@ sub choosePackages { require pkgs; my $min_size = pkgs::selectedSize($packages); - $min_size < $availableC or die _("Your system does not have enough space left for installation or upgrade (%d > %d)", $min_size, $availableC); + $min_size < $availableC or die N("Your system does not have enough space left for installation or upgrade (%d > %d)", $min_size, $availableC); my $min_mark = $::expert ? 3 : 4; @@ -526,7 +526,7 @@ sub choosePackages { sub choosePackagesTree { my ($o, $packages, $limit_to_medium) = @_; - $o->ask_many_from_list('', _("Choose the packages you want to install"), + $o->ask_many_from_list('', N("Choose the packages you want to install"), { list => [ grep { !$limit_to_medium || pkgs::packageMedium($packages, $_) == $limit_to_medium } @{$packages->{depslist}} ], @@ -538,18 +538,18 @@ sub choosePackagesTree { sub loadSavePackagesOnFloppy { my ($o, $packages) = @_; $o->ask_from('', -_("Please choose load or save package selection on floppy. +N("Please choose load or save package selection on floppy. The format is the same as auto_install generated floppies."), - [ { val => \ (my $choice), list => [ __("Load from floppy"), __("Save on floppy") ], format => \&translate, type => 'list' } ]) or return; + [ { val => \ (my $choice), list => [ N_("Load from floppy"), N_("Save on floppy") ], format => \&translate, type => 'list' } ]) or return; if ($choice eq 'Load from floppy') { while (1) { - my $w = $o->wait_message(_("Package selection"), _("Loading from floppy")); + my $w = $o->wait_message(N("Package selection"), N("Loading from floppy")); log::l("load package selection from floppy"); my $O = eval { install_any::loadO(undef, 'floppy') }; if ($@) { $w = undef; #- close wait message. - $o->ask_okcancel('', _("Insert a floppy containing package selection")) + $o->ask_okcancel('', N("Insert a floppy containing package selection")) or return; } else { install_any::unselectMostPackages($o); @@ -618,7 +618,7 @@ sub chooseGroups { #- if a profile is deselected, deselect everything (easier than deselecting the profile packages) $unselect_all ||= $size > $lsize; $size = $lsize; - _("Total size: %d / %d MB", pkgs::correctSize($size / sqr(1024)), $available_size); + N("Total size: %d / %d MB", pkgs::correctSize($size / sqr(1024)), $available_size); }; while (1) { @@ -631,7 +631,7 @@ sub chooseGroups { $o->reallyChooseGroups($size_to_display, $individual, \%val) or return; last if pkgs::correctSize($size / sqr(1024)) < $available_size; - $o->ask_warn('', _("Selected size is larger than available space")); + $o->ask_warn('', N("Selected size is larger than available space")); } $o->{compssUsersChoice}{$_} = 0 foreach map { @{$compssUsers->{$_}{flags}} } grep { !$val{$_} } keys %val; @@ -646,14 +646,14 @@ sub chooseGroups { my $docs = !$o->{excludedocs}; my $minimal = !grep { $_ } values %{$o->{compssUsersChoice}}; - $o->ask_from(_("Type of install"), - _("You haven't selected any group of packages. + $o->ask_from(N("Type of install"), + N("You haven't selected any group of packages. Please choose the minimal installation you want:"), [ - { val => \$o->{compssUsersChoice}{X}, type => 'bool', text => _("With X"), disabled => sub { $minimal } }, + { val => \$o->{compssUsersChoice}{X}, type => 'bool', text => N("With X"), disabled => sub { $minimal } }, if_($::expert || $minimal, - { val => \$docs, type => 'bool', text => _("With basic documentation (recommended!)"), disabled => sub { $minimal } }, - { val => \$minimal, type => 'bool', text => _("Truly minimal install (especially no urpmi)") }, + { val => \$docs, type => 'bool', text => N("With basic documentation (recommended!)"), disabled => sub { $minimal } }, + { val => \$minimal, type => 'bool', text => N("Truly minimal install (especially no urpmi)") }, ), ], changed => sub { $o->{compssUsersChoice}{X} = $docs = 0 if $minimal }, @@ -680,7 +680,7 @@ sub reallyChooseGroups { my $size_text = &$size_to_display; my ($path, $all); - $o->ask_from('', _("Package Group Selection"), [ + $o->ask_from('', N("Package Group Selection"), [ { val => \$size_text, type => 'label' }, {}, (map { my $old = $path; @@ -694,8 +694,8 @@ sub reallyChooseGroups { help => translate($o->{compssUsers}{$_}{descr}), } } @{$o->{compssUsersSorted}}), - if_($o->{meta_class} eq 'desktop', { text => _("All"), val => \$all, type => 'bool' }), - if_($individual, { text => _("Individual package selection"), val => $individual, advanced => 1, type => 'bool' }), + if_($o->{meta_class} eq 'desktop', { text => N("All"), val => \$all, type => 'bool' }), + if_($individual, { text => N("Individual package selection"), val => $individual, advanced => 1, type => 'bool' }), ], changed => sub { $size_text = &$size_to_display }) or return; if ($all) { @@ -738,12 +738,12 @@ sub chooseCD { $o->set_help('chooseCD'); $o->ask_many_from_list('', -_("If you have all the CDs in the list below, click Ok. +N("If you have all the CDs in the list below, click Ok. If you have none of those CDs, click Cancel. If only some CDs are missing, unselect them, then click Ok."), { list => \@mediumsDescr, - label => sub { _("Cd-Rom labeled \"%s\"", $_[0]) }, + label => sub { N("Cd-Rom labeled \"%s\"", $_[0]) }, val => sub { \$mediumsDescr{$_[0]} }, }) or do { $mediumsDescr{$_} = 0 foreach @mediumsDescr; #- force unselection of other CDs. @@ -764,7 +764,7 @@ sub installPackages { my ($o, $packages) = @_; my ($current, $total) = (0, 0); - my $w = $o->wait_message(_("Installing"), _("Preparing installation")); + my $w = $o->wait_message(N("Installing"), N("Preparing installation")); my $old = \&pkgs::installCallback; local *pkgs::installCallback = sub { @@ -773,7 +773,7 @@ sub installPackages { $total = $_total; } elsif ($type eq 'inst' && $subtype eq 'start') { my $p = $data->{depslist}[$id]; - $w->set(_("Installing package %s\n%d%%", $p->name, $total && 100 * $current / $total)); + $w->set(N("Installing package %s\n%d%%", $p->name, $total && 100 * $current / $total)); $current += $p->size; } else { goto $old } }; @@ -788,8 +788,8 @@ sub installPackages { $method eq 'cdrom' && !$::oem and do { my $name = pkgs::mediumDescr($o->{packages}, $medium); local $| = 1; print "\a"; - my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($com_license), [ __("Accept"), __("Refuse") ], "Accept") eq "Accept"); - $r &&= $o->ask_okcancel('', _("Change your Cd-Rom! + my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX($com_license), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept"); + $r &&= $o->ask_okcancel('', N("Change your Cd-Rom! Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done. If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $name), 1); @@ -801,11 +801,11 @@ If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $na sub { if ($@ =~ /^error ordering package list: (.*)/) { $o->ask_yesorno('', [ -_("There was an error ordering packages:"), $1, _("Go on anyway?") ], 1) and return 1; +N("There was an error ordering packages:"), $1, N("Go on anyway?") ], 1) and return 1; ${$_[0]} = "already displayed"; } elsif ($@ =~ /^error installing package list: (.*)/) { $o->ask_yesorno('', [ -_("There was an error installing packages:"), $1, _("Go on anyway?") ], 1) and return 1; +N("There was an error installing packages:"), $1, N("Go on anyway?") ], 1) and return 1; ${$_[0]} = "already displayed"; } 0; @@ -819,19 +819,19 @@ _("There was an error installing packages:"), $1, _("Go on anyway?") ], 1) and r sub afterInstallPackages($) { my ($o) = @_; - my $w = $o->wait_message('', _("Post-install configuration")); + my $w = $o->wait_message('', N("Post-install configuration")); $o->SUPER::afterInstallPackages($o); } sub copyKernelFromFloppy { my ($o) = @_; - $o->ask_okcancel('', _("Please insert the Boot floppy used in drive %s", $o->{blank}), 1) or return; + $o->ask_okcancel('', N("Please insert the Boot floppy used in drive %s", $o->{blank}), 1) or return; $o->SUPER::copyKernelFromFloppy(); } sub updateModulesFromFloppy { my ($o) = @_; - $o->ask_okcancel('', _("Please insert the Update Modules floppy in drive %s", $o->{updatemodules}), 1) or return; + $o->ask_okcancel('', N("Please insert the Update Modules floppy in drive %s", $o->{updatemodules}), 1) or return; $o->SUPER::updateModulesFromFloppy(); } @@ -851,7 +851,7 @@ sub configureNetwork { #------------------------------------------------------------------------------ sub installCrypto { my $license = -_("You now have the opportunity to download encryption software. +N("You now have the opportunity to download encryption software. WARNING: @@ -890,7 +890,7 @@ sub installUpdates { is_empty_hash_ref($u) and $o->ask_yesorno('', formatAlaTeX( -_("You now have the opportunity to download updated packages. These packages +N("You now have the opportunity to download updated packages. These packages have been released after the distribution was released. They may contain security or bug fixes. @@ -905,12 +905,12 @@ Do you want to install the updates ?"))) || return; require crypto; eval { my @mirrors = do { my $w = $o->wait_message('', - _("Contacting Mandrake Linux web site to get the list of available mirrors...")); + N("Contacting Mandrake Linux web site to get the list of available mirrors...")); crypto::mirrors() }; #- if no mirror have been found, use current time zone and propose among available. $u->{mirror} ||= crypto::bestMirror($o->{timezone}{timezone}); $u->{mirror} = $o->ask_from_treelistf('', - _("Choose a mirror from which to get the packages"), + N("Choose a mirror from which to get the packages"), '|', \&crypto::mirror2text, \@mirrors, @@ -919,7 +919,7 @@ Do you want to install the updates ?"))) || return; return if $@ || !$u->{mirror}; my $update_medium = do { - my $w = $o->wait_message('', _("Contacting the mirror to get the list of available packages...")); + my $w = $o->wait_message('', N("Contacting the mirror to get the list of available packages...")); crypto::getPackages($o->{prefix}, $o->{packages}, $u->{mirror}); }; @@ -947,20 +947,20 @@ sub configureTimezone { my ($o, $clicked) = @_; require timezone; - $o->{timezone}{timezone} = $o->ask_from_treelist('', _("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone}) || return; + $o->{timezone}{timezone} = $o->ask_from_treelist('', N("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone}) || return; $o->set_help('configureTimezoneGMT'); my $ntp = to_bool($o->{timezone}{ntp}); $o->ask_from('', '', [ - { text => _("Hardware clock set to GMT"), val => \$o->{timezone}{UTC}, type => 'bool' }, - { text => _("Automatic time synchronization (using NTP)"), val => \$ntp, type => 'bool' }, + { text => N("Hardware clock set to GMT"), val => \$o->{timezone}{UTC}, type => 'bool' }, + { text => N("Automatic time synchronization (using NTP)"), val => \$ntp, type => 'bool' }, ]) or goto &configureTimezone if $::expert || $clicked; if ($ntp) { my @servers = split("\n", timezone::ntp_servers()); $o->ask_from('', '', - [ { label => _("NTP Server"), val => \$o->{timezone}{ntp}, list => \@servers, not_edit => 0 } ] + [ { label => N("NTP Server"), val => \$o->{timezone}{ntp}, list => \@servers, not_edit => 0 } ] ) or goto &configureTimezone; $o->{timezone}{ntp} =~ s/.*\((.+)\)/$1/; } else { @@ -994,15 +994,15 @@ sub summary { my $format_printers = sub { my $printer = $o->{printer}; if (is_empty_hash_ref($printer->{configured})) { - pkgs::packageByName($o->{packages}, 'cups')->flag_installed and return _("Remote CUPS server"); - return _("No printer"); + pkgs::packageByName($o->{packages}, 'cups')->flag_installed and return N("Remote CUPS server"); + return N("No printer"); } my $entry; foreach ($printer->{currentqueue}, map { $_->{queuedata} } ($printer->{configured}{$printer->{DEFAULT}}, values %{$printer->{configured}})) { $_ && ($_->{make} || $_->{model}) and return "$_->{make} $_->{model}"; } - return _("Remote CUPS server"); #- fall back in case of something wrong. + return N("Remote CUPS server"); #- fall back in case of something wrong. }; my @sound_cards = (arch() =~ /ppc/ ? \&modules::load_category : \&modules::probe_category)->('multimedia/sound'); @@ -1012,37 +1012,37 @@ sub summary { my $isa_sound_card = !@sound_cards && ($o->{compssUsersChoice}{GAMES} || $o->{compssUsersChoice}{AUDIO}) && sub { - if ($o->ask_yesorno('', _("Do you have an ISA sound card?"))) { + if ($o->ask_yesorno('', N("Do you have an ISA sound card?"))) { $o->do_pkgs->install('sndconfig'); - $o->ask_warn('', _("Run \"sndconfig\" after installation to configure your sound card")); + $o->ask_warn('', N("Run \"sndconfig\" after installation to configure your sound card")); } else { - $o->ask_warn('', _("No sound card detected. Try \"harddrake\" after installation")); + $o->ask_warn('', N("No sound card detected. Try \"harddrake\" after installation")); } }; $o->ask_from_({ - messages => _("Summary"), + messages => N("Summary"), cancel => '', }, [ -{ label => _("Mouse"), val => \$mouse_name, clicked => sub { $o->selectMouse(1); mouse::write($o, $o->{mouse}); &$format_mouse } }, -{ label => _("Keyboard"), val => \$o->{keyboard}, clicked => sub { $o->selectKeyboard(1) }, format => sub { translate(keyboard::keyboard2text($_[0])) } }, -{ label => _("Timezone"), val => \$o->{timezone}{timezone}, clicked => sub { $o->configureTimezone(1) } }, -{ label => _("Printer"), val => \$o->{printer}, clicked => sub { $o->configurePrinter(1) }, format => $format_printers }, +{ label => N("Mouse"), val => \$mouse_name, clicked => sub { $o->selectMouse(1); mouse::write($o, $o->{mouse}); &$format_mouse } }, +{ label => N("Keyboard"), val => \$o->{keyboard}, clicked => sub { $o->selectKeyboard(1) }, format => sub { translate(keyboard::keyboard2text($_[0])) } }, +{ label => N("Timezone"), val => \$o->{timezone}{timezone}, clicked => sub { $o->configureTimezone(1) } }, +{ label => N("Printer"), val => \$o->{printer}, clicked => sub { $o->configurePrinter(1) }, format => $format_printers }, (map { -{ label => _("ISDN card"), val => $_->{description}, clicked => sub { $o->configureNetwork } } +{ label => N("ISDN card"), val => $_->{description}, clicked => sub { $o->configureNetwork } } } grep { $_->{driver} eq 'hisax' } detect_devices::probeall()), (map { my $device = $_; - { label => _("Sound card"), val => $_->{description}, clicked => sub { + { label => N("Sound card"), val => $_->{description}, clicked => sub { require harddrake::sound; harddrake::sound::config($o, $device) } } } @sound_cards), - if_($isa_sound_card, { label => _("Sound card"), clicked => $isa_sound_card }), + if_($isa_sound_card, { label => N("Sound card"), clicked => $isa_sound_card }), (map { my $driver = $_->{driver}; - { label => _("TV card"), val => $_->{description}, clicked => sub { + { label => N("TV card"), val => $_->{description}, clicked => sub { require harddrake::v4l; harddrake::v4l::config($o, $driver); } @@ -1084,10 +1084,10 @@ sub configurePrinter { sub setRootPassword { my ($o, $clicked) = @_; my $sup = $o->{superuser} ||= {}; - my $auth = ($o->{authentication}{LDAP} && __("LDAP") || - $o->{authentication}{NIS} && __("NIS") || - $o->{authentication}{winbind} && __("Windows Domain") || - __("Local files")); + my $auth = ($o->{authentication}{LDAP} && N_("LDAP") || + $o->{authentication}{NIS} && N_("NIS") || + $o->{authentication}{winbind} && N_("Windows Domain") || + N_("Local files")); $sup->{password2} ||= $sup->{password} ||= ""; return if $o->{security} < 1 && !$clicked; @@ -1096,49 +1096,49 @@ sub setRootPassword { $o->ask_from_( { - title => _("Set root password"), - messages => _("Set root password"), - cancel => ($o->{security} <= 2 && !$::corporate ? _("No password") : ''), + title => N("Set root password"), + messages => N("Set root password"), + cancel => ($o->{security} <= 2 && !$::corporate ? N("No password") : ''), callbacks => { complete => sub { - $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,0); + $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return (1,0); length $sup->{password} < 2 * $o->{security} - and $o->ask_warn('', _("This password is too short (it must be at least %d characters long)", 2 * $o->{security})), return (1,0); + and $o->ask_warn('', N("This password is too short (it must be at least %d characters long)", 2 * $o->{security})), return (1,0); return 0 } } }, [ -{ label => _("Password"), val => \$sup->{password}, hidden => 1 }, -{ label => _("Password (again)"), val => \$sup->{password2}, hidden => 1 }, +{ label => N("Password"), val => \$sup->{password}, hidden => 1 }, +{ label => N("Password (again)"), val => \$sup->{password2}, hidden => 1 }, if_($::expert, -{ label => _("Authentication"), val => \$auth, list => [ __("Local files"), __("LDAP"), __("NIS"), __("Windows Domain") ], format => \&translate }, +{ label => N("Authentication"), val => \$auth, list => [ N_("Local files"), N_("LDAP"), N_("NIS"), N_("Windows Domain") ], format => \&translate }, ), ]) or return; - if ($auth eq __("LDAP")) { + if ($auth eq N_("LDAP")) { $o->{authentication}{LDAP} ||= 'ldap.' . $o->{netc}{DOMAINNAME}; $o->{netc}{LDAPDOMAIN} ||= join (',', map { "dc=$_" } split /\./, $o->{netc}{DOMAINNAME}); $o->ask_from('', - _("Authentication LDAP"), - [ { label => _("LDAP Base dn"), val => \$o->{netc}{LDAPDOMAIN} }, - { label => _("LDAP Server"), val => \$o->{authentication}{LDAP} }, + N("Authentication LDAP"), + [ { label => N("LDAP Base dn"), val => \$o->{netc}{LDAPDOMAIN} }, + { label => N("LDAP Server"), val => \$o->{authentication}{LDAP} }, ]) or goto &setRootPassword; } else { $o->{authentication}{LDAP} = '' } - if ($auth eq __("NIS")) { + if ($auth eq N_("NIS")) { $o->{authentication}{NIS} ||= 'broadcast'; $o->ask_from('', - _("Authentication NIS"), - [ { label => _("NIS Domain"), val => \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}) }, - { label => _("NIS Server"), val => \$o->{authentication}{NIS}, list => ["broadcast"], not_edit => 0 }, + N("Authentication NIS"), + [ { label => N("NIS Domain"), val => \ ($o->{netc}{NISDOMAIN} ||= $o->{netc}{DOMAINNAME}) }, + { label => N("NIS Server"), val => \$o->{authentication}{NIS}, list => ["broadcast"], not_edit => 0 }, ]) or goto &setRootPassword; } else { $o->{authentication}{NIS} = '' } - if ($auth eq __("Windows Domain")) { + if ($auth eq N_("Windows Domain")) { #- maybe we should browse the network like diskdrake --smb and get the 'doze server names in a list #- but networking isn't setup yet necessarily - $o->ask_warn('', _("For this to work for a W2K PDC, you will probably need to have the admin run: C:\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add and reboot the server.\nYou will also need the username/password of a Domain Admin to join the machine to the Windows(TM) domain.\nIf networking is not yet enabled, Drakx will attempt to join the domain after the network setup step.\nShould this setup fail for some reason and domain authentication is not working, run 'smbpasswd -j DOMAIN -U USER%PASSWORD' using your Windows(tm) Domain, and Admin Username/Password, after system boot.\nThe command 'wbinfo -t' will test whether your authentication secrets are good.")); + $o->ask_warn('', N("For this to work for a W2K PDC, you will probably need to have the admin run: C:\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add and reboot the server.\nYou will also need the username/password of a Domain Admin to join the machine to the Windows(TM) domain.\nIf networking is not yet enabled, Drakx will attempt to join the domain after the network setup step.\nShould this setup fail for some reason and domain authentication is not working, run 'smbpasswd -j DOMAIN -U USER%PASSWORD' using your Windows(tm) Domain, and Admin Username/Password, after system boot.\nThe command 'wbinfo -t' will test whether your authentication secrets are good.")); $o->ask_from('', - _("Authentication Windows Domain"), - [ { label => _("Windows Domain"), val => \ ($o->{netc}{WINDOMAIN} ||= $o->{netc}{DOMAINNAME}) }, - { label => _("Domain Admin User Name"), val => \$o->{authentication}{winbind} }, - { label => _("Domain Admin Password"), val => \$o->{authentication}{winpass}, hidden => 1 }, + N("Authentication Windows Domain"), + [ { label => N("Windows Domain"), val => \ ($o->{netc}{WINDOMAIN} ||= $o->{netc}{DOMAINNAME}) }, + { label => N("Domain Admin User Name"), val => \$o->{authentication}{winbind} }, + { label => N("Domain Admin Password"), val => \$o->{authentication}{winpass}, hidden => 1 }, ]) or goto &setRootPassword; } else { $o->{authentication}{winbind} = '' } install_steps::setRootPassword($o); @@ -1173,7 +1173,7 @@ sub createBootdisk { if (arch() =~ /sparc/) { #- as probing floppies is a bit more different on sparc, assume always /dev/fd0. $o->ask_okcancel('', - _("A custom bootdisk provides a way of booting into your Linux system without + N("A custom bootdisk provides a way of booting into your Linux system without depending on the normal bootloader. This is useful if you don't want to install SILO on your system, or another operating system removes SILO, or SILO doesn't work with your hardware configuration. A custom bootdisk can also be used with @@ -1189,20 +1189,20 @@ drive and press \"Ok\"."), } else { my @l = detect_devices::floppies_dev(); my %l = ( - 'fd0' => _("First floppy drive"), - 'fd1' => _("Second floppy drive"), - 'Skip' => _("Skip"), + 'fd0' => N("First floppy drive"), + 'fd1' => N("Second floppy drive"), + 'Skip' => N("Skip"), ); if ($first_time || @l == 1) { $o->ask_yesorno('', formatAlaTeX( - _("A custom bootdisk provides a way of booting into your Linux system without + N("A custom bootdisk provides a way of booting into your Linux system without depending on the normal bootloader. This is useful if you don't want to install LILO (or grub) on your system, or another operating system removes LILO, or LILO doesn't work with your hardware configuration. A custom bootdisk can also be used with the Mandrake rescue image, making it much easier to recover from severe system failures. Would you like to create a bootdisk for your system? -%s", isThisFs('xfs', fsedit::get_root($o->{fstab})) ? _(" +%s", isThisFs('xfs', fsedit::get_root($o->{fstab})) ? N(" (WARNING! You're using XFS for your root partition, creating a bootdisk on a 1.44 Mb floppy will probably fail, @@ -1210,25 +1210,25 @@ because XFS needs a very large driver).") : '')), $o->{mkbootdisk}) or return $o->{mkbootdisk} = ''; $o->{mkbootdisk} = $l[0] if !$o->{mkbootdisk} || $o->{mkbootdisk} eq "1"; } else { - @l or die _("Sorry, no floppy drive available"); + @l or die N("Sorry, no floppy drive available"); $o->ask_from_( { - messages => _("Choose the floppy drive you want to use to make the bootdisk"), + messages => N("Choose the floppy drive you want to use to make the bootdisk"), }, [ { val => \$o->{mkbootdisk}, list => \@l, format => sub { $l{$_[0]} || $_[0] } } ] ) or return; } - $o->ask_warn('', _("Insert a floppy in %s", $l{$o->{mkbootdisk}} || $o->{mkbootdisk})); + $o->ask_warn('', N("Insert a floppy in %s", $l{$o->{mkbootdisk}} || $o->{mkbootdisk})); } - my $w = $o->wait_message('', _("Creating bootdisk...")); + my $w = $o->wait_message('', N("Creating bootdisk...")); install_steps::createBootdisk($o); } #------------------------------------------------------------------------------ sub setupBootloaderBefore { my ($o) = @_; - my $w = $o->wait_message('', _("Preparing bootloader...")); + my $w = $o->wait_message('', N("Preparing bootloader...")); $o->set_help('empty'); $o->SUPER::setupBootloaderBefore($o); } @@ -1239,29 +1239,29 @@ sub setupBootloader { if (arch() =~ /ppc/) { my $machtype = detect_devices::get_mac_generation(); if ($machtype !~ /NewWorld/) { - $o->ask_warn('', _("You appear to have an OldWorld or Unknown\n machine, the yaboot bootloader will not work for you.\nThe install will continue, but you'll\n need to use BootX to boot your machine")); + $o->ask_warn('', N("You appear to have an OldWorld or Unknown\n machine, the yaboot bootloader will not work for you.\nThe install will continue, but you'll\n need to use BootX to boot your machine")); log::l("OldWorld or Unknown Machine - no yaboot setup"); return; } } if (arch() =~ /^alpha/) { - $o->ask_yesorno('', _("Do you want to use aboot?"), 1) or return; + $o->ask_yesorno('', N("Do you want to use aboot?"), 1) or return; catch_cdie { $o->SUPER::setupBootloader } sub { $o->ask_yesorno('', -_("Error installing aboot, +N("Error installing aboot, try to force installation even if that destroys the first partition?")); }; } else { any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}, $o->{prefix}, $more) or return; { - my $w = $o->wait_message('', _("Installing bootloader")); + my $w = $o->wait_message('', N("Installing bootloader")); eval { $o->SUPER::setupBootloader }; } if (my $err = $@) { $err =~ /failed$/ or die; $o->ask_warn('', - [ _("Installation of bootloader failed. The following error occured:"), + [ N("Installation of bootloader failed. The following error occured:"), grep { !/^Warning:/ } cat_("$o->{prefix}/tmp/.error") ]); unlink "$o->{prefix}/tmp/.error"; die "already displayed"; @@ -1269,7 +1269,7 @@ try to force installation even if that destroys the first partition?")); my $of_boot = cat_("$o->{prefix}/tmp/of_boot_dev") || die "Can't open $o->{prefix}/tmp/of_boot_dev"; chop($of_boot); unlink "$o->{prefix}/tmp/.error"; - $o->ask_warn('', _("You may need to change your Open Firmware boot-device to\n enable the bootloader. If you don't see the bootloader prompt at\n reboot, hold down Command-Option-O-F at reboot and enter:\n setenv boot-device %s,\\\\:tbxi\n Then type: shut-down\nAt your next boot you should see the bootloader prompt.", $of_boot)); + $o->ask_warn('', N("You may need to change your Open Firmware boot-device to\n enable the bootloader. If you don't see the bootloader prompt at\n reboot, hold down Command-Option-O-F at reboot and enter:\n setenv boot-device %s,\\\\:tbxi\n Then type: shut-down\nAt your next boot you should see the bootloader prompt.", $of_boot)); } } } @@ -1303,11 +1303,11 @@ sub generateAutoInstFloppy { my $floppy = detect_devices::floppy(); - $o->ask_okcancel('', _("Insert a blank floppy in drive %s", $floppy), 1) or return; + $o->ask_okcancel('', N("Insert a blank floppy in drive %s", $floppy), 1) or return; my $dev = devices::make($floppy); { - my $w = $o->wait_message('', _("Creating auto install floppy...")); + my $w = $o->wait_message('', N("Creating auto install floppy...")); install_any::getAndSaveAutoInstallFloppy($o, $replay, $dev) or return; } common::sync(); #- if you shall remove the floppy right after the LED switches off @@ -1318,7 +1318,7 @@ sub exitInstall { my ($o, $alldone) = @_; return $o->{step} = '' unless $alldone || $o->ask_yesorno('', -_("Some steps are not completed. +N("Some steps are not completed. Do you really want to quit now?"), 0); @@ -1329,7 +1329,7 @@ Do you really want to quit now?"), 0); $o->ask_from_no_check( { messages => formatAlaTeX( -_("Congratulations, installation is complete. +N("Congratulations, installation is complete. Remove the boot media and press return to reboot. @@ -1342,22 +1342,22 @@ consult the Errata available from: Information on configuring your system is available in the post install chapter of the Official Mandrake Linux User's Guide.", -_("http://www.mandrakelinux.com/en/90errata.php3"))), +N("http://www.mandrakelinux.com/en/90errata.php3"))), cancel => '', }, [ if_($::expert, - { val => \ (my $t1 = _("Generate auto install floppy")), clicked => sub { + { val => \ (my $t1 = N("Generate auto install floppy")), clicked => sub { my $t = $o->ask_from_list_('', -_("The auto install can be fully automated if wanted, +N("The auto install can be fully automated if wanted, in that case it will take over the hard drive!! (this is meant for installing on another box). You may prefer to replay the installation. -"), [ __("Replay"), __("Automated") ]); +"), [ N_("Replay"), N_("Automated") ]); $t and $o->generateAutoInstFloppy($t eq 'Replay'); }, advanced => 1 }, - { val => \ (my $t2 = _("Save packages selection")), clicked => sub { install_any::g_default_packages($o) }, advanced => 1 }, + { val => \ (my $t2 = N("Save packages selection")), clicked => sub { install_any::g_default_packages($o) }, advanced => 1 }, ), ] ) if $alldone && !$::g_auto_install; diff --git a/perl-install/install_steps_newt.pm b/perl-install/install_steps_newt.pm index 4ea47e564..0b70e2039 100644 --- a/perl-install/install_steps_newt.pm +++ b/perl-install/install_steps_newt.pm @@ -16,23 +16,21 @@ use devices; use lang; use common; -my $banner = __(); - sub banner { - my $banner = translate(__("Mandrake Linux Installation %s")); + my $banner = translate(N_("Mandrake Linux Installation %s")); my $l = first(Newt::GetScreenSize()) - length($banner) - length($_[0]) + 1; Newt::DrawRootText(0, 0, sprintf($banner, ' ' x $l . $_[0])); Newt::Refresh(); } -sub new($$) { +sub new { my ($type, $o) = @_; interactive::newt->new; banner(''); #-PO This string must fit in a 80-char wide text screen - Newt::PushHelpLine(_(" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen ")); + Newt::PushHelpLine(N(" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen ")); (bless {}, ref $type || $type)->SUPER::new($o); } diff --git a/perl-install/install_steps_stdio.pm b/perl-install/install_steps_stdio.pm index 1c0ea9abc..a2cfdd0f5 100644 --- a/perl-install/install_steps_stdio.pm +++ b/perl-install/install_steps_stdio.pm @@ -19,7 +19,7 @@ sub new($$) { sub enteringStep { my ($o, $step) = @_; - print _("Entering step `%s'\n", translate($o->{steps}{$step}{text})); + print N("Entering step `%s'\n", translate($o->{steps}{$step}{text})); $o->SUPER::enteringStep($step); } sub leavingStep { diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index 6fec361b6..b18b3223d 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -84,9 +84,9 @@ sub vnew { if ($ENV{DISPLAY} && system('/usr/X11R6/bin/xtest') == 0) { if ($su && $>) { if (fuzzy_pidofs(qr/\bkwin\b/) > 0) { - exec("kdesu", "-c", "$0 @ARGV") or die _("kdesu missing"); + exec("kdesu", "-c", "$0 @ARGV") or die N("kdesu missing"); } else { - exec { 'consolehelper' } $0, @ARGV or die _("consolehelper missing"); + exec { 'consolehelper' } $0, @ARGV or die N("consolehelper missing"); } } eval { require interactive::gtk }; @@ -97,7 +97,7 @@ sub vnew { } } else { if ($su && $>) { - exec { 'consolehelper' } $0, @ARGV or die _("consolehelper missing"); + exec { 'consolehelper' } $0, @ARGV or die N("consolehelper missing"); } } @@ -124,12 +124,12 @@ sub exit { exit($_[0]) } sub ask_warn { my ($o, $title, $message) = @_; local $::isWizard=0; - ask_from_listf_no_check($o, $title, $message, undef, [ _("Ok") ]); + ask_from_listf_no_check($o, $title, $message, undef, [ N("Ok") ]); } sub ask_yesorno { my ($o, $title, $message, $def, $help) = @_; - ask_from_list_($o, $title, $message, [ __("Yes"), __("No") ], $def ? "Yes" : "No", $help) eq "Yes"; + ask_from_list_($o, $title, $message, [ N_("Yes"), N_("No") ], $def ? "Yes" : "No", $help) eq "Yes"; } sub ask_okcancel { @@ -139,7 +139,7 @@ sub ask_okcancel { $::no_separator = 1; $o->ask_from_no_check({ title => $title, messages => $message, focus_cancel => !$def }); } else { - ask_from_list_($o, $title, $message, [ __("Ok"), __("Cancel") ], $def ? "Ok" : "Cancel", $help) eq "Ok"; + ask_from_list_($o, $title, $message, [ N_("Ok"), N_("Cancel") ], $def ? "Ok" : "Cancel", $help) eq "Ok"; } } @@ -149,7 +149,7 @@ sub ask_file { } sub ask_fileW { my ($o, $title, $dir) = @_; - $o->ask_from_entry($title, _("Choose a file")); + $o->ask_from_entry($title, N("Choose a file")); } sub ask_from_list { @@ -315,8 +315,8 @@ sub ask_from_normalize { if (!$common->{title} && $::isStandalone) { ($common->{title} = $0) =~ s|.*/||; } - $common->{advanced_label} ||= _("Advanced"); - $common->{advanced_label_close} ||= _("Basic"); + $common->{advanced_label} ||= N("Advanced"); + $common->{advanced_label_close} ||= N("Basic"); $common->{$_} = [ deref($common->{$_}) ] foreach qw(messages advanced_messages); add2hash_($common->{callbacks} ||= {}, { changed => sub {}, focus_out => sub {}, complete => sub { 0 }, canceled => sub { 0 }, advanced => sub {} }); } @@ -342,7 +342,7 @@ sub ask_from_real { sub ask_browse_tree_info { my ($o, $title, $message, $common) = @_; - add2hash_($common, { ok => _("Ok"), cancel => _("Cancel") }); + add2hash_($common, { ok => N("Ok"), cancel => N("Cancel") }); add2hash_($common, { title => $title, message => $message }); add2hash_($common, { grep_allowed_to_toggle => sub { @_ }, grep_unselected => sub { grep { $common->{node_state}($_) eq 'unselected' } @_ }, @@ -379,7 +379,7 @@ sub ask_browse_tree_info_refW { #- default definition, do not use with too many sub wait_message { my ($o, $title, $message, $temp) = @_; - my $w = $o->wait_messageW($title, [ _("Please wait"), deref($message) ]); + my $w = $o->wait_messageW($title, [ N("Please wait"), deref($message) ]); push @tempory::objects, $w if $temp; my $b = before_leaving { $o->wait_message_endW($w) }; diff --git a/perl-install/interactive/http.pm b/perl-install/interactive/http.pm index cc48ee19a..826a6da5c 100644 --- a/perl-install/interactive/http.pm +++ b/perl-install/interactive/http.pm @@ -101,8 +101,8 @@ sub ask_fromW { print "</table>\n"; print $q->p(); - print $q->submit(-name => 'ok_submit', -value => $common->{ok} || _("Ok")); - print $q->submit(-name => 'cancel_submit', -value => $common->{cancel} || _("Cancel")) if $common->{cancel} || !exists $common->{ok}; + print $q->submit(-name => 'ok_submit', -value => $common->{ok} || N("Ok")); + print $q->submit(-name => 'cancel_submit', -value => $common->{cancel} || N("Cancel")) if $common->{cancel} || !exists $common->{ok}; print $q->hidden('state'), $q->hidden('uid'); print $q->end_form, $q->end_html; @@ -116,8 +116,8 @@ sub ask_fromW { last if $q->param('uid') == $uid; open_stdout(); # re-open for writing - cont_stdout(_("Error")); - print $q->h1(_("Error")), $q->p("Sorry, you can't go back"); + cont_stdout(N("Error")); + print $q->h1(N("Error")), $q->p("Sorry, you can't go back"); goto redisplay; } each_index { @@ -150,7 +150,7 @@ sub wait_message_nextW { } sub wait_message_endW { my ($o, $w) = @_; - p(_("Done")); + p(N("Done")); print "\n" . CGI::p(); } diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm index 43b58aa62..836fc0030 100644 --- a/perl-install/interactive/newt.pm +++ b/perl-install/interactive/newt.pm @@ -191,9 +191,9 @@ sub ask_fromW_real { my ($b1, $b2) = map { simplify_string($_) } (exists $common->{ok} ? ($common->{ok}, $common->{cancel}) : - ($::isWizard ? _("Next") : _("Ok"), $common->{cancel} || ($::isWizard ? _("<- Previous") : _("Cancel")))); + ($::isWizard ? N("Next") : N("Ok"), $common->{cancel} || ($::isWizard ? N("<- Previous") : N("Cancel")))); #- b1 is always displayed, so giving it some label :-( - $b1 ||= $::isWizard ? _("Next") : _("Ok"); + $b1 ||= $::isWizard ? N("Next") : N("Ok"); my @b2 = if_($b2, $b2); my ($buttons, $ok, $cancel) = Newt::Grid::ButtonBar($::isWizard ? (@b2, $b1) : ($b1, @b2)); ($ok, $cancel) = ($cancel, $ok) if $::isWizard; diff --git a/perl-install/interactive/stdio.pm b/perl-install/interactive/stdio.pm index 635adfb83..10e749205 100644 --- a/perl-install/interactive/stdio.pm +++ b/perl-install/interactive/stdio.pm @@ -26,8 +26,8 @@ sub good_choice { my ($def_s, $max) = @_; my $i; do { - defined $i and print _("Bad choice, try again\n"); - print _("Your choice? (default %s) ", $def_s); + defined $i and print N("Bad choice, try again\n"); + print N("Your choice? (default %s) ", $def_s); $i = readln(); } until (!$i || check_it($i, $max)); $i; @@ -36,7 +36,7 @@ sub good_choice { sub ask_fromW { my ($o, $common, $l, $l2) = @_; - add2hash_($common, { ok => _("Ok"), cancel => _("Cancel") }) if !exists $common->{ok}; + add2hash_($common, { ok => N("Ok"), cancel => N("Cancel") }) if !exists $common->{ok}; ask_fromW_begin: @@ -51,7 +51,7 @@ ask_fromW_begin: if ($e->{type} eq 'entry') { my $t = "\t$e->{label} $e->{text}\n"; if ($already_entries) { - length($already_entries) > 1 and print _("Entries you'll have to fill:\n%s", $already_entries); + length($already_entries) > 1 and print N("Entries you'll have to fill:\n%s", $already_entries); $already_entries = 1; print $t; } else { @@ -67,7 +67,7 @@ ask_fromW_begin: if ($e->{type} eq 'bool') { print "$e->{text} $e->{label}\n"; - print _("Your choice? (0/1, default `%s') ", ${$e->{val}} || '0'); + print N("Your choice? (0/1, default `%s') ", ${$e->{val}} || '0'); my $i = readln(); if ($i ne '') { to_bool($i) != to_bool(${$e->{val}}) and $common->{callbacks}{changed}->($ind); @@ -92,8 +92,8 @@ ask_fromW_begin: print "Setting to <", $i ? ${$e->{list}}[$i-1] : ${$e->{val}}, ">\n"; $i and ${$e->{val}} = ${$e->{list}}[$i-1], $common->{callbacks}{changed}->($ind); } elsif ($e->{type} eq 'button') { - print _("Button `%s': %s", $e->{label}, may_apply($e->{format}, ${$e->{val}})), " $e->{text}\n"; - print _("Do you want to click on this button?"); + print N("Button `%s': %s", $e->{label}, may_apply($e->{format}, ${$e->{val}})), " $e->{text}\n"; + print N("Do you want to click on this button?"); my $i = readln(); ($i && $i !~ /^n/i) and $e->{clicked_may_quit}(), $common->{callbacks}{changed}->($ind); } elsif ($e->{type} eq 'label') { @@ -102,7 +102,7 @@ ask_fromW_begin: print $t; } elsif ($e->{type} eq 'entry') { print "$e->{label} $e->{text}\n"; - print _("Your choice? (default `%s'%s) ", ${$e->{val}}, ${$e->{val}} ne '' ? _(" enter `void' for void entry") : ''); + print N("Your choice? (default `%s'%s) ", ${$e->{val}}, ${$e->{val}} ne '' ? N(" enter `void' for void entry") : ''); my $i = readln(); ${$e->{val}} = $i || ${$e->{val}}; ${$e->{val}} = '' if ${$e->{val}} eq 'void'; @@ -120,10 +120,10 @@ ask_fromW_begin: $predo_widget->($_) foreach @$l; if (listlength(@$l) > 30) { my $ll = listlength(@$l); - print _("=> There are many things to choose from (%s).\n", $ll); + print N("=> There are many things to choose from (%s).\n", $ll); ask_fromW_handle_verylonglist: - print _( -"Please choose the first number of the 10-range you wish to edit, + print +N("Please choose the first number of the 10-range you wish to edit, or just hit Enter to proceed. Your choice? "); my $i = readln(); @@ -136,18 +136,18 @@ Your choice? "); } my $lab; - each_index { $labels[$::i] && (($lab = $format_label->($_)) ne $labels[$::i]) and print _("=> Notice, a label changed:\n%s", $lab) } + each_index { $labels[$::i] && (($lab = $format_label->($_)) ne $labels[$::i]) and print N("=> Notice, a label changed:\n%s", $lab) } grep { $_->{type} eq 'label' } @$l; my $i; - if (listlength(@$l) != 1 || $common->{ok} ne _("Ok") || $common->{cancel} ne _("Cancel")) { - print "[1] ", $common->{ok} || _("Ok"); + if (listlength(@$l) != 1 || $common->{ok} ne N("Ok") || $common->{cancel} ne N("Cancel")) { + print "[1] ", $common->{ok} || N("Ok"); $common->{cancel} and print " [2] $common->{cancel}"; - @$l and print " [9] ", _("Re-submit"); + @$l and print " [9] ", N("Re-submit"); print "\n"; do { - defined $i and print _("Bad choice, try again\n"); - print _("Your choice? (default %s) ", $common->{focus_cancel} ? $common->{cancel} : $common->{ok}); + defined $i and print N("Bad choice, try again\n"); + print N("Your choice? (default %s) ", $common->{focus_cancel} ? $common->{cancel} : $common->{ok}); $i = readln() || ($common->{focus_cancel} ? "2" : "1"); } until (check_it($i, 9)); $i == 9 and goto ask_fromW_begin; diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 2694b5ddc..7f6b64b3c 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -149,131 +149,131 @@ my @usb2keyboard = #- a multigroup layout (eg: one with latin/non-latin letters) my %keyboards = ( arch() =~ /^sparc/ ? ( - "cz" => [ __("Czech (QWERTZ)"), "sunt5-cz-us", "cz", 0 ], - "de" => [ __("German"), "sunt5-de-latin1", "de", 0 ], - "dvorak" => [ __("Dvorak"), "sundvorak", "dvorak",0 ], - "es" => [ __("Spanish"), "sunt5-es", "es", 0 ], - "fi" => [ __("Finnish"), "sunt5-fi-latin1", "fi", 0 ], - "fr" => [ __("French"), "sunt5-fr-latin1", "fr", 0 ], - "no" => [ __("Norwegian"), "sunt4-no-latin1", "no", 0 ], - "pl" => [ __("Polish"), "sun-pl-altgraph", "pl", 0 ], - "ru" => [ __("Russian"), "sunt5-ru", "ru", 1 ], + "cz" => [ N_("Czech (QWERTZ)"), "sunt5-cz-us", "cz", 0 ], + "de" => [ N_("German"), "sunt5-de-latin1", "de", 0 ], + "dvorak" => [ N_("Dvorak"), "sundvorak", "dvorak",0 ], + "es" => [ N_("Spanish"), "sunt5-es", "es", 0 ], + "fi" => [ N_("Finnish"), "sunt5-fi-latin1", "fi", 0 ], + "fr" => [ N_("French"), "sunt5-fr-latin1", "fr", 0 ], + "no" => [ N_("Norwegian"), "sunt4-no-latin1", "no", 0 ], + "pl" => [ N_("Polish"), "sun-pl-altgraph", "pl", 0 ], + "ru" => [ N_("Russian"), "sunt5-ru", "ru", 1 ], # TODO: check the console map - "se" => [ __("Swedish"), "sunt5-fi-latin1", "se", 0 ], - "uk" => [ __("UK keyboard"), "sunt5-uk", "gb", 0 ], - "us" => [ __("US keyboard"), "sunkeymap", "us", 0 ], + "se" => [ N_("Swedish"), "sunt5-fi-latin1", "se", 0 ], + "uk" => [ N_("UK keyboard"), "sunt5-uk", "gb", 0 ], + "us" => [ N_("US keyboard"), "sunkeymap", "us", 0 ], ) : ( - "al" => [ __("Albanian"), "al", "al", 0 ], - "am_old" => [ __("Armenian (old)"),"am_old", "am(old)", 1 ], - "am" => [ __("Armenian (typewriter)"),"am-armscii8","am", 1 ], - "am_phonetic" => [ __("Armenian (phonetic)"),"am_phonetic","am(phonetic)",1 ], -#-"ar_azerty" => [ __("Arabic (AZERTY)"),"ar-8859_6","ar(azerty)",1 ], -#-"ar_azerty_d" => [ __("Arabic (AZERTY, arabic digits)"),"ar-8859_6","ar(azerty_digits)",1 ], -#-"ar" => [ __("Arabic (QWERTY)"),"ar-8859_6", "ar", 1 ], -#-"ar_d" => [ __("Arabic (QWERTY, arabic digits)"),"ar-8859_6","ar(digits)",1 ], - "az" => [ __("Azerbaidjani (latin)"),"az", "az", 0 ], -#"a3" => [ __("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)",1 ], - "be" => [ __("Belgian"), "be2-latin1", "be", 0 ], - "ben"=> [ __("Bengali"), "us", "ben", 1 ], -"bg_phonetic" => [ __("Bulgarian (phonetic)"),"bg", "bg(phonetic)", 1 ], - "bg" => [ __("Bulgarian (BDS)"), "bg", "bg", 1 ], - "br" => [ __("Brazilian (ABNT-2)"),"br-abnt2", "br", 0 ], + "al" => [ N_("Albanian"), "al", "al", 0 ], + "am_old" => [ N_("Armenian (old)"),"am_old", "am(old)", 1 ], + "am" => [ N_("Armenian (typewriter)"),"am-armscii8","am", 1 ], + "am_phonetic" => [ N_("Armenian (phonetic)"),"am_phonetic","am(phonetic)",1 ], +#-"ar_azerty" => [ N_("Arabic (AZERTY)"),"ar-8859_6","ar(azerty)",1 ], +#-"ar_azerty_d" => [ N_("Arabic (AZERTY, arabic digits)"),"ar-8859_6","ar(azerty_digits)",1 ], +#-"ar" => [ N_("Arabic (QWERTY)"),"ar-8859_6", "ar", 1 ], +#-"ar_d" => [ N_("Arabic (QWERTY, arabic digits)"),"ar-8859_6","ar(digits)",1 ], + "az" => [ N_("Azerbaidjani (latin)"),"az", "az", 0 ], +#"a3" => [ N_("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)",1 ], + "be" => [ N_("Belgian"), "be2-latin1", "be", 0 ], + "ben"=> [ N_("Bengali"), "us", "ben", 1 ], +"bg_phonetic" => [ N_("Bulgarian (phonetic)"),"bg", "bg(phonetic)", 1 ], + "bg" => [ N_("Bulgarian (BDS)"), "bg", "bg", 1 ], + "br" => [ N_("Brazilian (ABNT-2)"),"br-abnt2", "br", 0 ], #- Bosnia and Croatia use the same layout, but people are confused if there #- isn't an antry for their country - "bs" => [ __("Bosnian"), "croat", "hr", 0 ], - "by" => [ __("Belarusian"), "by-cp1251", "by", 1 ], - "ch_de" => [ __("Swiss (German layout)"), "sg-latin1", "de_CH", 0 ], - "ch_fr" => [ __("Swiss (French layout)"), "fr_CH-latin1", "fr_CH", 0 ], - "cz" => [ __("Czech (QWERTZ)"), "cz-latin2", "cz", 0 ], - "cz_qwerty" => [ __("Czech (QWERTY)"), "cz-lat2", "cz_qwerty", 0 ], - "de" => [ __("German"), "de-latin1", "de", 0 ], - "de_nodeadkeys" => [ __("German (no dead keys)"), "de-latin1-nodeadkeys", "de(nodeadkeys)", 0 ], - "dev" => [ __("Devanagari"), "us", "dev", 0 ], - "dk" => [ __("Danish"), "dk-latin1", "dk", 0 ], - "dvorak" => [ __("Dvorak (US)"), "pc-dvorak-latin1", "dvorak", 0 ], - "dvorak_no" => [ __("Dvorak (Norwegian)"), "no-dvorak", "dvorak(no)", 0 ], - "dvorak_se" => [ __("Dvorak (Swedish)"), "se-dvorak", "dvorak(se)", 0 ], - "ee" => [ __("Estonian"), "ee-latin9", "ee", 0 ], - "es" => [ __("Spanish"), "es-latin1", "es", 0 ], - "fi" => [ __("Finnish"), "fi-latin1", "fi", 0 ], - "fr" => [ __("French"), "fr-latin1", "fr", 0 ], - "ge_ru"=>[__("Georgian (\"Russian\" layout)"),"ge_ru-georgian_academy","ge_ru",1], - "ge_la"=>[__("Georgian (\"Latin\" layout)"),"ge_la-georgian_academy","ge_la",1], - "gr" => [ __("Greek"), "gr-8859_7", "el", 1 ], - "guj"=> [ __("Gujarati"), "us", "guj", 1 ], - "gur"=> [ __("Gurmukhi"), "us", "gur", 1 ], - "hu" => [ __("Hungarian"), "hu-latin2", "hu", 0 ], - "hr" => [ __("Croatian"), "croat", "hr", 0 ], - "il" => [ __("Israeli"), "il-8859_8", "il", 1 ], - "il_phonetic" => [ __("Israeli (Phonetic)"), "hebrew", "il_phonetic", 1 ], - "ir" => [ __("Iranian"), "ir-isiri_3342", "ir", 1 ], - "is" => [ __("Icelandic"), "is-latin1", "is", 0 ], - "it" => [ __("Italian"), "it-latin1", "it", 0 ], - "iu" => [ __("Inuktitut"), "us", "iu", 1 ], - "jp" => [ __("Japanese 106 keys"), "jp106", "jp", 1 ], + "bs" => [ N_("Bosnian"), "croat", "hr", 0 ], + "by" => [ N_("Belarusian"), "by-cp1251", "by", 1 ], + "ch_de" => [ N_("Swiss (German layout)"), "sg-latin1", "de_CH", 0 ], + "ch_fr" => [ N_("Swiss (French layout)"), "fr_CH-latin1", "fr_CH", 0 ], + "cz" => [ N_("Czech (QWERTZ)"), "cz-latin2", "cz", 0 ], + "cz_qwerty" => [ N_("Czech (QWERTY)"), "cz-lat2", "cz_qwerty", 0 ], + "de" => [ N_("German"), "de-latin1", "de", 0 ], + "de_nodeadkeys" => [ N_("German (no dead keys)"), "de-latin1-nodeadkeys", "de(nodeadkeys)", 0 ], + "dev" => [ N_("Devanagari"), "us", "dev", 0 ], + "dk" => [ N_("Danish"), "dk-latin1", "dk", 0 ], + "dvorak" => [ N_("Dvorak (US)"), "pc-dvorak-latin1", "dvorak", 0 ], + "dvorak_no" => [ N_("Dvorak (Norwegian)"), "no-dvorak", "dvorak(no)", 0 ], + "dvorak_se" => [ N_("Dvorak (Swedish)"), "se-dvorak", "dvorak(se)", 0 ], + "ee" => [ N_("Estonian"), "ee-latin9", "ee", 0 ], + "es" => [ N_("Spanish"), "es-latin1", "es", 0 ], + "fi" => [ N_("Finnish"), "fi-latin1", "fi", 0 ], + "fr" => [ N_("French"), "fr-latin1", "fr", 0 ], + "ge_ru"=>[N_("Georgian (\"Russian\" layout)"),"ge_ru-georgian_academy","ge_ru",1], + "ge_la"=>[N_("Georgian (\"Latin\" layout)"),"ge_la-georgian_academy","ge_la",1], + "gr" => [ N_("Greek"), "gr-8859_7", "el", 1 ], + "guj"=> [ N_("Gujarati"), "us", "guj", 1 ], + "gur"=> [ N_("Gurmukhi"), "us", "gur", 1 ], + "hu" => [ N_("Hungarian"), "hu-latin2", "hu", 0 ], + "hr" => [ N_("Croatian"), "croat", "hr", 0 ], + "il" => [ N_("Israeli"), "il-8859_8", "il", 1 ], + "il_phonetic" => [ N_("Israeli (Phonetic)"), "hebrew", "il_phonetic", 1 ], + "ir" => [ N_("Iranian"), "ir-isiri_3342", "ir", 1 ], + "is" => [ N_("Icelandic"), "is-latin1", "is", 0 ], + "it" => [ N_("Italian"), "it-latin1", "it", 0 ], + "iu" => [ N_("Inuktitut"), "us", "iu", 1 ], + "jp" => [ N_("Japanese 106 keys"), "jp106", "jp", 1 ], #There is no XKB korean file yet; but using xmodmap one disables # some functioanlity; "us" used for XKB until this is fixed - "kr" => [ __("Korean keyboard"), "us", "us", 1 ], - "la" => [ __("Latin American"), "la-latin1", "la", 0 ], - "lao"=> [ __("Laotian"), "us", "lao", 1 ], - "lt" => [ __("Lithuanian AZERTY (old)"), "lt-latin7", "lt_a", 0 ], + "kr" => [ N_("Korean keyboard"), "us", "us", 1 ], + "la" => [ N_("Latin American"), "la-latin1", "la", 0 ], + "lao"=> [ N_("Laotian"), "us", "lao", 1 ], + "lt" => [ N_("Lithuanian AZERTY (old)"), "lt-latin7", "lt_a", 0 ], #- TODO: write a console kbd map for lt_new - "lt_new" => [ __("Lithuanian AZERTY (new)"), "lt-latin7", "lt_std", 0 ], - "lt_b" => [ __("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt", 1 ], - "lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p", 0 ], - "lv" => [ __("Latvian"), "lv-latin7", "lv", 0 ], - "mk" => [ __("Macedonian"), "mk", "mk", 1 ], - "mm" => [ __("Myanmar (Burmese)"),"us", "mm", 1 ], - "mng"=> [ __("Mongolian (cyrillic)"),"us", "mng", 1 ], - "mt" => [ __("Maltese (UK)"), "uk", "mt", 0 ], - "mt_us" => [ __("Maltese (US)"),"us", "mt_us", 0 ], - "nl" => [ __("Dutch"), "nl-latin1", "nl", 0 ], - "no" => [ __("Norwegian"), "no-latin1", "no", 0 ], - "pl" => [ __("Polish (qwerty layout)"), "pl", "pl", 0 ], - "pl2" => [ __("Polish (qwertz layout)"), "pl-latin2", "pl2", 0 ], - "pt" => [ __("Portuguese"), "pt-latin1", "pt", 0 ], - "qc" => [ __("Canadian (Quebec)"), "qc-latin1", "ca_enhanced", 0 ], + "lt_new" => [ N_("Lithuanian AZERTY (new)"), "lt-latin7", "lt_std", 0 ], + "lt_b" => [ N_("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt", 1 ], + "lt_p" => [ N_("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p", 0 ], + "lv" => [ N_("Latvian"), "lv-latin7", "lv", 0 ], + "mk" => [ N_("Macedonian"), "mk", "mk", 1 ], + "mm" => [ N_("Myanmar (Burmese)"),"us", "mm", 1 ], + "mng"=> [ N_("Mongolian (cyrillic)"),"us", "mng", 1 ], + "mt" => [ N_("Maltese (UK)"), "uk", "mt", 0 ], + "mt_us" => [ N_("Maltese (US)"),"us", "mt_us", 0 ], + "nl" => [ N_("Dutch"), "nl-latin1", "nl", 0 ], + "no" => [ N_("Norwegian"), "no-latin1", "no", 0 ], + "pl" => [ N_("Polish (qwerty layout)"), "pl", "pl", 0 ], + "pl2" => [ N_("Polish (qwertz layout)"), "pl-latin2", "pl2", 0 ], + "pt" => [ N_("Portuguese"), "pt-latin1", "pt", 0 ], + "qc" => [ N_("Canadian (Quebec)"), "qc-latin1", "ca_enhanced", 0 ], #- TODO: write a console kbd map for ro2 - "ro2" => [ __("Romanian (qwertz)"), "ro2", "ro2", 0 ], - "ro" => [ __("Romanian (qwerty)"), "ro", "ro", 0 ], - "ru" => [ __("Russian"), "ru4", "ru(winkeys)", 1 ], - "ru_yawerty" => [ __("Russian (Yawerty)"), "ru-yawerty", "ru_yawerty", 1 ], - "se" => [ __("Swedish"), "se-latin1", "se", 0 ], - "si" => [ __("Slovenian"), "slovene", "si", 0 ], - "sk" => [ __("Slovakian (QWERTZ)"), "sk-qwertz", "sk", 0 ], - "sk_qwerty" => [ __("Slovakian (QWERTY)"), "sk-qwerty", "sk_qwerty", 0 ], + "ro2" => [ N_("Romanian (qwertz)"), "ro2", "ro2", 0 ], + "ro" => [ N_("Romanian (qwerty)"), "ro", "ro", 0 ], + "ru" => [ N_("Russian"), "ru4", "ru(winkeys)", 1 ], + "ru_yawerty" => [ N_("Russian (Yawerty)"), "ru-yawerty", "ru_yawerty", 1 ], + "se" => [ N_("Swedish"), "se-latin1", "se", 0 ], + "si" => [ N_("Slovenian"), "slovene", "si", 0 ], + "sk" => [ N_("Slovakian (QWERTZ)"), "sk-qwertz", "sk", 0 ], + "sk_qwerty" => [ N_("Slovakian (QWERTY)"), "sk-qwerty", "sk_qwerty", 0 ], # TODO: console map - "sr" => [ __("Serbian (cyrillic)"), "sr", "sr", 0 ], + "sr" => [ N_("Serbian (cyrillic)"), "sr", "sr", 0 ], # no console kbd that I'm aware of - "tml" => [ __("Tamil (Unicode)"), "us", "tml", 1 ], - "tscii" => [ __("Tamil (TSCII)"), "us", "tscii", 1 ], - "th" => [ __("Thai keyboard"), "th", "th", 1 ], + "tml" => [ N_("Tamil (Unicode)"), "us", "tml", 1 ], + "tscii" => [ N_("Tamil (TSCII)"), "us", "tscii", 1 ], + "th" => [ N_("Thai keyboard"), "th", "th", 1 ], # TODO: console map - "tj" => [ __("Tajik keyboard"), "ru4", "tj", 1 ], - "tr_f" => [ __("Turkish (traditional \"F\" model)"), "trf", "tr_f", 0 ], - "tr_q" => [ __("Turkish (modern \"Q\" model)"), "tr_q-latin5", "tr", 0 ], -#-"tw => [ __("Chineses bopomofo"), "tw", "tw", 1 ], - "ua" => [ __("Ukrainian"), "ua", "ua", 1 ], - "uk" => [ __("UK keyboard"), "uk", "gb", 0 ], - "us" => [ __("US keyboard"), "us", "us", 0 ], - "us_intl" => [ __("US keyboard (international)"), "us-latin1", "us_intl", 0 ], - "vn" => [ __("Vietnamese \"numeric row\" QWERTY"),"vn-tcvn", "vn(toggle)", 0 ], - "yu" => [ __("Yugoslavian (latin)"), "sr", "yu", 0 ], + "tj" => [ N_("Tajik keyboard"), "ru4", "tj", 1 ], + "tr_f" => [ N_("Turkish (traditional \"F\" model)"), "trf", "tr_f", 0 ], + "tr_q" => [ N_("Turkish (modern \"Q\" model)"), "tr_q-latin5", "tr", 0 ], +#-"tw => [ N_("Chineses bopomofo"), "tw", "tw", 1 ], + "ua" => [ N_("Ukrainian"), "ua", "ua", 1 ], + "uk" => [ N_("UK keyboard"), "uk", "gb", 0 ], + "us" => [ N_("US keyboard"), "us", "us", 0 ], + "us_intl" => [ N_("US keyboard (international)"), "us-latin1", "us_intl", 0 ], + "vn" => [ N_("Vietnamese \"numeric row\" QWERTY"),"vn-tcvn", "vn(toggle)", 0 ], + "yu" => [ N_("Yugoslavian (latin)"), "sr", "yu", 0 ], ), ); #- list of possible choices for the key combinations to toggle XKB groups #- (eg in X86Config file: XkbOptions "grp:toggle") my %grp_toggles = ( - toggle => _("Right Alt key"), - shift_toggle => _("Both Shift keys simultaneously"), - ctrl_shift_toggle => _("Control and Shift keys simultaneously"), - caps_toggle => _("CapsLock key"), - ctrl_alt_toggle => _("Ctrl and Alt keys simultaneously"), - alt_shift_toggle => _("Alt and Shift keys simultaneously"), - menu_toggle => _("\"Menu\" key"), - lwin_toggle => _("Left \"Windows\" key"), - rwin_toggle => _("Right \"Windows\" key"), + toggle => N("Right Alt key"), + shift_toggle => N("Both Shift keys simultaneously"), + ctrl_shift_toggle => N("Control and Shift keys simultaneously"), + caps_toggle => N("CapsLock key"), + ctrl_alt_toggle => N("Ctrl and Alt keys simultaneously"), + alt_shift_toggle => N("Alt and Shift keys simultaneously"), + menu_toggle => N("\"Menu\" key"), + lwin_toggle => N("Left \"Windows\" key"), + rwin_toggle => N("Right \"Windows\" key"), ); diff --git a/perl-install/loopback.pm b/perl-install/loopback.pm index 6129e6c6d..5d1200d90 100644 --- a/perl-install/loopback.pm +++ b/perl-install/loopback.pm @@ -29,7 +29,7 @@ sub check_circular_mounts { my $check; $check = sub { my ($part, @seen) = @_; push @seen, $part->{mntpoint} || return; - @seen > 1 && $part->{mntpoint} eq $base_mntpoint and die _("Circular mounts %s\n", join(", ", @seen)); + @seen > 1 && $part->{mntpoint} eq $base_mntpoint and die N("Circular mounts %s\n", join(", ", @seen)); if (my $part = fs::up_mount_point($part->{mntpoint}, $fstab)) { #- '/' carrier is a special case, it will be mounted first $check->($part, @seen) if !carryRootLoopback($part); diff --git a/perl-install/lvm.pm b/perl-install/lvm.pm index c5a336d22..37965485f 100644 --- a/perl-install/lvm.pm +++ b/perl-install/lvm.pm @@ -100,7 +100,7 @@ sub vg_add { sub vg_destroy { my ($lvm) = @_; - is_empty_array_ref($lvm->{primary}{normal}) or die _("Remove the logical volumes first\n"); + is_empty_array_ref($lvm->{primary}{normal}) or die N("Remove the logical volumes first\n"); run('vgchange', '-a', 'n', $lvm->{VG_name}); run_or_die('vgremove', $lvm->{VG_name}); foreach (@{$lvm->{disks}}) { diff --git a/perl-install/modparm.pm b/perl-install/modparm.pm index fcfd3093e..70da67c47 100644 --- a/perl-install/modparm.pm +++ b/perl-install/modparm.pm @@ -15,7 +15,7 @@ sub parameters { my $modinfo = '/sbin/modinfo'; -x $modinfo or $modinfo = '/usr/bin/modinfo'; - -x $modinfo or die _('modinfo is not available'); + -x $modinfo or die N("modinfo is not available"); if (!$::isStandalone && !$::testing) { modules::extract_modules('/tmp', $module); @@ -47,11 +47,11 @@ sub parameters { #- print "STILL HAVE ($_)\n" if $_; my $format = $min == 1 && $max == 1 ? - ($is_a_number ? _("a number") : '') : + ($is_a_number ? N("a number") : '') : $min == $max ? - ($is_a_number ? _("%d comma separated numbers", $min) : _("%d comma separated strings", $min)) : + ($is_a_number ? N("%d comma separated numbers", $min) : N("%d comma separated strings", $min)) : $min == 1 ? - ($is_a_number ? _("comma separated numbers") : _("comma separated strings")) : + ($is_a_number ? N("comma separated numbers") : N("comma separated strings")) : ''; #- too weird and buggy, do not display it push @parameters, [ $name, $format, $description ]; } diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 5e61f3847..a757b50c2 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -290,7 +290,7 @@ sub configure_pcmcia { $running = 1; if (c::kernel_version() =~ /^2\.2/) { - my $msg = _("PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."); + my $msg = N("PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."); log::l($msg); return $msg; } diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm index f0e4ae09a..b4ce5280e 100644 --- a/perl-install/modules/interactive.pm +++ b/perl-install/modules/interactive.pm @@ -13,7 +13,7 @@ sub config_window { my ($name, $format, $description) = @$_; push @l, { label => $name, help => "$description\n[$format]", val => \$conf{$name} }; } - if ($in->ask_from("Module configuration", _("You can configure each parameter of the module here."), \@l)) { + if ($in->ask_from("Module configuration", N("You can configure each parameter of the module here."), \@l)) { my $options = join(' ', map { if_($conf{$_}, "$_=$conf{$_}") } keys %conf); if ($options) { modules::set_options($_->{driver}, $options); diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 2ba077c5c..d19fc9f69 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -22,59 +22,59 @@ my %mice = ( 'sunmouse' => [ [ 'sunmouse' ], - [ [ 3, 'sun', 'sun', __("Sun - Mouse") ] + [ [ 3, 'sun', 'sun', N_("Sun - Mouse") ] ]] ) : ( 'PS/2' => [ [ 'psaux' ], - [ [ 2, 'ps/2', 'PS/2', __("Standard") ], - [ 5, 'ps/2', 'MouseManPlusPS/2', __("Logitech MouseMan+") ], - [ 5, 'imps2', 'IMPS/2', __("Generic PS2 Wheel Mouse") ], - [ 5, 'ps/2', 'GlidePointPS/2', __("GlidePoint") ], + [ [ 2, 'ps/2', 'PS/2', N_("Standard") ], + [ 5, 'ps/2', 'MouseManPlusPS/2', N_("Logitech MouseMan+") ], + [ 5, 'imps2', 'IMPS/2', N_("Generic PS2 Wheel Mouse") ], + [ 5, 'ps/2', 'GlidePointPS/2', N_("GlidePoint") ], '', - [ 5, 'ps/2', 'ThinkingMousePS/2', __("Kensington Thinking Mouse") ], - [ 5, 'netmouse', 'NetMousePS/2', __("Genius NetMouse") ], - [ 5, 'netmouse', 'NetScrollPS/2', __("Genius NetScroll") ], - [ 7, 'ps/2', 'ExplorerPS/2', __("Microsoft Explorer") ], + [ 5, 'ps/2', 'ThinkingMousePS/2', N_("Kensington Thinking Mouse") ], + [ 5, 'netmouse', 'NetMousePS/2', N_("Genius NetMouse") ], + [ 5, 'netmouse', 'NetScrollPS/2', N_("Genius NetScroll") ], + [ 7, 'ps/2', 'ExplorerPS/2', N_("Microsoft Explorer") ], ]], 'USB' => [ [ 'usbmouse' ], - [ if_(arch() eq 'ppc', [ 1, 'ps/2', 'PS/2', __("1 button") ]), - [ 2, 'ps/2', 'PS/2', __("Generic 2 Button Mouse") ], - [ 3, 'ps/2', 'PS/2', __("Generic") ], - [ 5, 'ps/2', 'IMPS/2', __("Wheel") ], - [ 7, 'ps/2', 'ExplorerPS/2', __("Microsoft Explorer") ], + [ if_(arch() eq 'ppc', [ 1, 'ps/2', 'PS/2', N_("1 button") ]), + [ 2, 'ps/2', 'PS/2', N_("Generic 2 Button Mouse") ], + [ 3, 'ps/2', 'PS/2', N_("Generic") ], + [ 5, 'ps/2', 'IMPS/2', N_("Wheel") ], + [ 7, 'ps/2', 'ExplorerPS/2', N_("Microsoft Explorer") ], ]], - __("serial") => + N_("serial") => [ [ map { "ttyS$_" } 0..3 ], - [ [ 2, 'Microsoft', 'Microsoft', __("Generic 2 Button Mouse") ], - [ 3, 'Microsoft', 'Microsoft', __("Generic 3 Button Mouse") ], - [ 5, 'ms3', 'IntelliMouse', __("Microsoft IntelliMouse") ], - [ 3, 'MouseMan', 'MouseMan', __("Logitech MouseMan") ], - [ 2, 'MouseSystems', 'MouseSystems', __("Mouse Systems") ], + [ [ 2, 'Microsoft', 'Microsoft', N_("Generic 2 Button Mouse") ], + [ 3, 'Microsoft', 'Microsoft', N_("Generic 3 Button Mouse") ], + [ 5, 'ms3', 'IntelliMouse', N_("Microsoft IntelliMouse") ], + [ 3, 'MouseMan', 'MouseMan', N_("Logitech MouseMan") ], + [ 2, 'MouseSystems', 'MouseSystems', N_("Mouse Systems") ], '', - [ 3, 'logim', 'MouseMan', __("Logitech CC Series") ], - [ 5, 'pnp', 'IntelliMouse', __("Logitech MouseMan+/FirstMouse+") ], - [ 5, 'ms3', 'IntelliMouse', __("Genius NetMouse") ], - [ 2, 'MMSeries', 'MMSeries', __("MM Series") ], - [ 2, 'MMHitTab', 'MMHittab', __("MM HitTablet") ], - [ 3, 'Logitech', 'Logitech', __("Logitech Mouse (serial, old C7 type)") ], - [ 3, 'Microsoft', 'ThinkingMouse', __("Kensington Thinking Mouse") ], + [ 3, 'logim', 'MouseMan', N_("Logitech CC Series") ], + [ 5, 'pnp', 'IntelliMouse', N_("Logitech MouseMan+/FirstMouse+") ], + [ 5, 'ms3', 'IntelliMouse', N_("Genius NetMouse") ], + [ 2, 'MMSeries', 'MMSeries', N_("MM Series") ], + [ 2, 'MMHitTab', 'MMHittab', N_("MM HitTablet") ], + [ 3, 'Logitech', 'Logitech', N_("Logitech Mouse (serial, old C7 type)") ], + [ 3, 'Microsoft', 'ThinkingMouse', N_("Kensington Thinking Mouse") ], ]], - __("busmouse") => + N_("busmouse") => [ [ arch() eq 'ppc' ? 'adbmouse' : ('atibm', 'inportbm', 'logibm') ], - [ if_(arch() eq 'ppc', [ 1, 'Busmouse', 'BusMouse', __("1 button") ]), - [ 2, 'Busmouse', 'BusMouse', __("2 buttons") ], - [ 3, 'Busmouse', 'BusMouse', __("3 buttons") ], + [ if_(arch() eq 'ppc', [ 1, 'Busmouse', 'BusMouse', N_("1 button") ]), + [ 2, 'Busmouse', 'BusMouse', N_("2 buttons") ], + [ 3, 'Busmouse', 'BusMouse', N_("3 buttons") ], ]], - __("none") => + N_("none") => [ [ 'none' ], - [ [ 0, 'none', 'Microsoft', __("No mouse") ], + [ [ 0, 'none', 'Microsoft', N_("No mouse") ], ]], ); @@ -162,7 +162,7 @@ sub fullnames { my $l = raw2mouse($type, $_); "$type|$l->{name}"; } else { - $type .= "|[" . _("Other") . "]"; + $type .= "|[" . N("Other") . "]"; ''; } } @{$::b->[1]} @@ -483,9 +483,9 @@ sub test_mouse { 210, 350); if ($::isInstall) { my $bad_mouse = member($mouse->{XMOUSETYPE}, 'IMPS/2', 'ExplorerPS/2'); - $draw_text->(_("Please test the mouse"), $height - 120); - $draw_text->(_("To activate the mouse,"), $height - 105) if $bad_mouse; - $draw_text->(_("MOVE YOUR WHEEL!"), $height - 90) if $bad_mouse; + $draw_text->(N("Please test the mouse"), $height - 120); + $draw_text->(N("To activate the mouse,"), $height - 105) if $bad_mouse; + $draw_text->(N("MOVE YOUR WHEEL!"), $height - 90) if $bad_mouse; $darea->window->draw_rectangle($darea->style->bg_gc('normal'), 1, 0, $height-65, $width, $height); } }; diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index cde2d0ea2..90e463162 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -62,7 +62,7 @@ sub new { my ($im_left, $mask_left) = gtkcreate_png($::Wizard_pix_left || "wiz_default_left.png"); my ($y2, $x2) = $im_left->get_size; my $style = $draw1->style->copy(); - $style->font(Gtk::Gdk::Font->fontset_load(_("-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"))); + $style->font(Gtk::Gdk::Font->fontset_load(N("-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"))); my $w = $style->font->string_width($::Wizard_title); $draw1->signal_connect(expose_event => sub { for (my $i = 0; $i < (540/$y1); $i++) { @@ -156,11 +156,11 @@ END { &exit() } sub create_okcancel { my ($w, $ok, $cancel, $spread, @other) = @_; $spread ||= $::isWizard ? "end" : "spread"; - $cancel = $::isWizard ? _("<- Previous") : _("Cancel") if !defined $cancel && !defined $ok; - $ok = $::isWizard ? ($::Wizard_finished ? _("Finish") : _("Next ->")) : _("Ok") if !defined $ok; + $cancel = $::isWizard ? N("<- Previous") : N("Cancel") if !defined $cancel && !defined $ok; + $ok = $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next ->")) : N("Ok") if !defined $ok; my $b1 = gtksignal_connect($w->{ok} = new Gtk::Button($ok), clicked => $w->{ok_clicked} || sub { $w->{retval} = 1; Gtk->main_quit }); my $b2 = $cancel && gtksignal_connect($w->{cancel} = new Gtk::Button($cancel), clicked => $w->{cancel_clicked} || sub { log::l("default cancel_clicked"); undef $w->{retval}; Gtk->main_quit }); - $::isWizard and gtksignal_connect($w->{wizcancel} = new Gtk::Button(_("Cancel")), clicked => sub { die 'wizcancel' }); + $::isWizard and gtksignal_connect($w->{wizcancel} = new Gtk::Button(N("Cancel")), clicked => sub { die 'wizcancel' }); my @l = grep { $_ } $::isWizard ? ($w->{wizcancel}, $::Wizard_no_previous ? () : $b2, $b1): ($b1, $b2); push @l, map { gtksignal_connect(new Gtk::Button($_->[0]), clicked => $_->[1]) } @other; @@ -284,8 +284,8 @@ sub _create_window($$) { #-############################################################################### sub ask_warn { my $w = my_gtk->new(shift @_); $w->_ask_warn(@_); main($w) } -sub ask_yesorno { my $w = my_gtk->new(shift @_); $w->_ask_okcancel(@_, _("Yes"), _("No")); main($w) } -sub ask_okcancel { my $w = my_gtk->new(shift @_); $w->_ask_okcancel(@_, _("Is this correct?"), _("Ok"), _("Cancel")); main($w) } +sub ask_yesorno { my $w = my_gtk->new(shift @_); $w->_ask_okcancel(@_, N("Yes"), N("No")); main($w) } +sub ask_okcancel { my $w = my_gtk->new(shift @_); $w->_ask_okcancel(@_, N("Is this correct?"), N("Ok"), N("Cancel")); main($w) } sub ask_from_entry { my $w = my_gtk->new(shift @_); $w->_ask_from_entry(@_); main($w) } sub ask_dir { my $w = my_gtk->new(shift @_); $w->_ask_dir(@_); main($w) } @@ -308,7 +308,7 @@ sub _ask_warn($@) { my ($o, @msgs) = @_; gtkadd($o->{window}, gtkpack($o->create_box_with_title(@msgs), - gtksignal_connect(my $w = new Gtk::Button(_("Ok")), "clicked" => sub { Gtk->main_quit }), + gtksignal_connect(my $w = new Gtk::Button(N("Ok")), "clicked" => sub { Gtk->main_quit }), ), ); $w->grab_focus; @@ -357,7 +357,7 @@ sub ask_browse_tree_info { 0, $common->{message}, 1, gtkpack(new Gtk::HBox(0,0), createScrolledWindow($tree), - gtkadd(gtkset_usize(new Gtk::Frame(_("Info")), $::windowwidth - 490, 0), + gtkadd(gtkset_usize(new Gtk::Frame(N("Info")), $::windowwidth - 490, 0), createScrolledWindow(my $info = new Gtk::Text), )), 0, my $l = new Gtk::HBox(0,15), @@ -378,9 +378,9 @@ sub ask_browse_tree_info { $go->grab_focus; $w->{rwindow}->show_all; - my @toolbar = (ftout => [ _("Expand Tree") , sub { $tree->expand_recursive(undef) } ], - ftin => [ _("Collapse Tree") , sub { $tree->collapse_recursive(undef) } ], - reload => [ _("Toggle between flat and group sorted"), sub { invbool(\$common->{state}{flat}); $common->{rebuild_tree}->() } ]); + my @toolbar = (ftout => [ N("Expand Tree") , sub { $tree->expand_recursive(undef) } ], + ftin => [ N("Collapse Tree") , sub { $tree->collapse_recursive(undef) } ], + reload => [ N("Toggle between flat and group sorted"), sub { invbool(\$common->{state}{flat}); $common->{rebuild_tree}->() } ]); foreach my $ic (@{$common->{icons} || []}) { push @toolbar, ($ic->{icon} => [ $ic->{help}, sub { if ($ic->{code}) { diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index 7516a70de..57eb93ff7 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -16,18 +16,18 @@ sub configure { my ($netcnx, $netc, $intf, $first_time) = @_; $::isInstall and $in->set_help('configureNetworkADSL'); conf_adsl_step1: - # my $type = $in->ask_from_list_(_("Connect to the Internet"), - # _("The most common way to connect with adsl is pppoe. + # my $type = $in->ask_from_list_(N("Connect to the Internet"), + # N("The most common way to connect with adsl is pppoe. # Some connections use pptp, a few ones use dhcp. - # If you don't know, choose 'use pppoe'"), [__("use pppoe"), __("use pptp"), __("use dhcp"), __("Alcatel speedtouch usb"), __("ECI Hi-Focus")]) or return; + # If you don't know, choose 'use pppoe'"), [N_("use pppoe"), N_("use pptp"), N_("use dhcp"), N_("Alcatel speedtouch usb"), N_("ECI Hi-Focus")]) or return; my @l = ( - [__("use pppoe"), - __("use pptp"), - __("use dhcp"), - __("Alcatel speedtouch usb") . if_($netc->{autodetect}{adsl}{speedtouch}, " - detected")] + [N_("use pppoe"), + N_("use pptp"), + N_("use dhcp"), + N_("Alcatel speedtouch usb") . if_($netc->{autodetect}{adsl}{speedtouch}, " - detected")] ); - my $type = $in->ask_from_list_(_("Connect to the Internet"), - _("The most common way to connect with adsl is pppoe. + my $type = $in->ask_from_list_(N("Connect to the Internet"), + N("The most common way to connect with adsl is pppoe. Some connections use pptp, a few ones use dhcp. If you don't know, choose 'use pppoe'"), @l) or return; $type =~ s/use //; @@ -38,8 +38,8 @@ If you don't know, choose 'use pppoe'"), @l) or return; adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1; #-network::configureNetwork($prefix, $netc, $in, $intf, $first_time); # if ($::isStandalone and $netc->{NET_DEVICE}) { -# $in->ask_yesorno(_("Network interface"), -# _("I'm about to restart the network device %s. Do you agree?", $netc->{NET_DEVICE}), 1) +# $in->ask_yesorno(N("Network interface"), +# N("I'm about to restart the network device %s. Do you agree?", $netc->{NET_DEVICE}), 1) # and system("$prefix/sbin/ifdown $netc->{NET_DEVICE}; $prefix/sbin/ifup $netc->{NET_DEVICE}"); # } } @@ -151,10 +151,10 @@ user "$adsl->{login}" ['ppp-compress-26', 'ppp_deflate']); $::isStandalone and modules::write_conf($prefix); $in->do_pkgs->what_provides("speedtouch_mgmt") and $in->do_pkgs->install('speedtouch_mgmt'); - -e "$prefix/usr/share/speedtouch/mgmt.o" or $in->ask_warn('', _('You need the alcatel microcode. + -e "$prefix/usr/share/speedtouch/mgmt.o" or $in->ask_warn('', N("You need the alcatel microcode. Download it at http://www.speedtouchdsl.com/dvrreg_lx.htm -and copy the mgmt.o in /usr/share/speedtouch')); +and copy the mgmt.o in /usr/share/speedtouch")); } if ($adsl_type eq 'eci') { diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm index 55e4af694..7e1e225aa 100644 --- a/perl-install/network/drakfirewall.pm +++ b/perl-install/network/drakfirewall.pm @@ -9,12 +9,12 @@ use common; my @all_servers = ( { - name => _("Web Server"), + name => N("Web Server"), pkg => 'apache apache-mod_perl boa', ports => '80/tcp 443/tcp', }, { - name => _("Domain Name Server"), + name => N("Domain Name Server"), pkg => 'bind', ports => '53/tcp 53/udp', }, @@ -29,12 +29,12 @@ my @all_servers = ports => '20/tcp 21/tcp', }, { - name => _("Mail Server"), + name => N("Mail Server"), pkg => 'sendmail postfix qmail', ports => '25/tcp', }, { - name => _("POP and IMAP Server"), + name => N("POP and IMAP Server"), pkg => 'imap courier-imap-pop', ports => '109/tcp 110/tcp 143/tcp', }, @@ -108,7 +108,7 @@ sub get_ports { sub set_ports { my ($disabled, $ports) = @_; - my $shorewall = network::shorewall::read() || network::shorewall::default_interfaces() or die _("No network card"); + my $shorewall = network::shorewall::read() || network::shorewall::default_interfaces() or die N("No network card"); $shorewall->{disabled} = $disabled; $shorewall->{ports} = $$ports; @@ -126,13 +126,13 @@ sub get_conf { } elsif (my $shorewall = network::shorewall::read()) { $shorewall->{disabled}, from_ports(\$shorewall->{ports}); } else { - $in->ask_okcancel('', _("drakfirewall configurator + $in->ask_okcancel('', N("drakfirewall configurator This configures a personal firewall for this Mandrake Linux machine. For a powerful dedicated firewall solution, please look to the specialized MandrakeSecurity Firewall distribution."), 1) or return; - $in->ask_okcancel('', _("drakfirewall configurator + $in->ask_okcancel('', N("drakfirewall configurator Make sure you have configured your Network/Internet access with drakconnect before going any further."), 1) or return; @@ -149,14 +149,14 @@ sub choose { my @l = grep { $_->{on} || !$_->{hide} } @all_servers; $in->ask_from_({ - messages => _("Which services would you like to allow the Internet to connect to?"), - advanced_messages => _("You can enter miscellaneous ports. + messages => N("Which services would you like to allow the Internet to connect to?"), + advanced_messages => N("You can enter miscellaneous ports. Valid examples are: 139/tcp 139/udp. Have a look at /etc/services for information."), callbacks => { complete => sub { if (my $invalid_port = check_ports_syntax($unlisted)) { - $in->ask_warn('', _("Invalid port given: %s. + $in->ask_warn('', N("Invalid port given: %s. The proper format is \"port/tcp\" or \"port/udp\", where port is between 1 and 65535.", $invalid_port)); return 1; @@ -164,9 +164,9 @@ where port is between 1 and 65535.", $invalid_port)); }, }}, [ - { text => _("Everything (no firewall)"), val => \$disabled, type => 'bool' }, + { text => N("Everything (no firewall)"), val => \$disabled, type => 'bool' }, (map { { text => $_->{name}, val => \$_->{on}, type => 'bool', disabled => sub { $disabled } } } @l), - { label => _("Other ports"), val => \$unlisted, advanced => 1, disabled => sub { $disabled } } + { label => N("Other ports"), val => \$unlisted, advanced => 1, disabled => sub { $disabled } } ]) or return; $disabled, to_ports([ grep { $_->{on} } @l ], $unlisted); diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index beade3468..82b5ff82f 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -18,12 +18,12 @@ sub configure_cable { $::isInstall and $in->set_help('configureNetworkCable'); $netcnx->{type}='cable'; # $netcnx->{cable}={}; - # $in->ask_from_entries_ref(_("Cable connection"), - # _("Please enter your host name if you know it. + # $in->ask_from_entries_ref(N("Cable connection"), + # N("Please enter your host name if you know it. # Some DHCP servers require the hostname to work. # Your host name should be a fully-qualified host name, # such as ``mybox.mylab.myco.com''."), - # [_("Host name:")], [ \$netcnx->{cable}{hostname} ]); + # [N("Host name:")], [ \$netcnx->{cable}{hostname} ]); if ($::expert) { my @m = ( { description => "dhcpcd", @@ -33,8 +33,8 @@ sub configure_cable { { description => "dhcp-client", c => 4}, ); - if (my $f = $in->ask_from_listf(_("Connect to the Internet"), - _("Which dhcp client do you want to use? + if (my $f = $in->ask_from_listf(N("Connect to the Internet"), + N("Which dhcp client do you want to use? Default is dhcpcd"), sub { $_[0]{description} }, \@m)) { @@ -85,12 +85,12 @@ sub conf_network_card { any::load_category($in, 'network/main|usb', !$::expert, 1); my @all_cards = conf_network_card_backend($netc, $intf, $type, undef, $ipadr, $netadr); my $interface; - @all_cards == () and $in->ask_warn('', _("No ethernet network adapter has been detected on your system. + @all_cards == () and $in->ask_warn('', N("No ethernet network adapter has been detected on your system. I cannot set up this connection type.")) and return; @all_cards == 1 and $interface = $all_cards[0][0] and goto l1; again : - $interface = $in->ask_from_list(_("Choose the network interface"), - _("Please choose which network adapter you want to use to connect to Internet"), + $interface = $in->ask_from_list(N("Choose the network interface"), + N("Please choose which network adapter you want to use to connect to Internet"), [ map { $_->[0] . ($_->[1] ? " (using module $_->[1])" : "") } @all_cards ] ) or return; defined $interface or goto again; @@ -99,8 +99,8 @@ I cannot set up this connection type.")) and return; my $device = conf_network_card_backend($netc, $intf, $type, $interface, $ipadr, $netadr, $interface); # if ( $::isStandalone and !($type eq "dhcp")) { -# $in->ask_yesorno(_("Network interface"), -# _("I'm about to restart the network device:\n") . $device . _("\nDo you agree?"), 1) and configureNetwork2($in, $prefix, $netc, $intf) and system("$prefix/sbin/ifdown $device;$prefix/sbin/ifup $device"); +# $in->ask_yesorno(N("Network interface"), +# N("I'm about to restart the network device:\n") . $device . N("\nDo you agree?"), 1) and configureNetwork2($in, $prefix, $netc, $intf) and system("$prefix/sbin/ifdown $device;$prefix/sbin/ifup $device"); # } 1; } @@ -165,8 +165,8 @@ sub go_ethernet { $netc->{NET_INTERFACE}=$netc->{NET_DEVICE}; configureNetwork($netc, $intf, $first_time) or return; # if ( $::isStandalone and $netc->{NET_DEVICE}) { -# $in->ask_yesorno(_("Network interface"), -# _("I'm about to restart the network device %s. Do you agree?", $netc->{NET_DEVICE}), 1) and system("$prefix/sbin/ifdown $netc->{NET_DEVICE}; $prefix/sbin/ifup $netc->{NET_DEVICE}"); +# $in->ask_yesorno(N("Network interface"), +# N("I'm about to restart the network device %s. Do you agree?", $netc->{NET_DEVICE}), 1) and system("$prefix/sbin/ifdown $netc->{NET_DEVICE}; $prefix/sbin/ifup $netc->{NET_DEVICE}"); # } 1; } @@ -175,7 +175,7 @@ sub configureNetwork { my ($netc, $intf, $first_time) = @_; local $_; any::load_category($in, 'network/main|usb|pcmcia', !$::expert, 1) or return; - my @l = detect_devices::getNet() or die _("no network card found"); + my @l = detect_devices::getNet() or die N("no network card found"); my @all_cards = conf_network_card_backend ($netc, $intf, undef, undef, undef, undef); configureNetwork_step_1: @@ -191,7 +191,7 @@ sub configureNetwork { $n_card++; } #- { - #- my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain...")); + #- my $wait = $o->wait_message(N("Hostname"), N("Determining host name and domain...")); #- network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf}); #- } $last or return; @@ -199,12 +199,12 @@ sub configureNetwork { $netc->{minus_one} = 1; my $dhcp_hostname = $netc->{HOSTNAME}; $::isInstall and $in->set_help('configureNetworkHostDHCP'); - $in->ask_from(_("Configuring network"), -_("Please enter your host name if you know it. + $in->ask_from(N("Configuring network"), +N("Please enter your host name if you know it. Some DHCP servers require the hostname to work. Your host name should be a fully-qualified host name, such as ``mybox.mylab.myco.com''."), - [ { label => _("Host name"), val => \$netc->{HOSTNAME} }]) or goto configureNetwork_step_1; + [ { label => N("Host name"), val => \$netc->{HOSTNAME} }]) or goto configureNetwork_step_1; $netc->{HOSTNAME} ne $dhcp_hostname and $netc->{DHCP_HOSTNAME} = $netc->{HOSTNAME}; } else { configureNetworkNet($in, $netc, $last ||= {}, @l) or goto configureNetwork_step_1; diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index 8dfeb0fdf..cd084bb2a 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -18,8 +18,8 @@ sub configure { isdn_step_1: defined $netc->{autodetect}{isdn}{id} and goto intern_pci; $::isInstall and $in->set_help('configureNetworkISDN'); - my $e = $in->ask_from_list_(_("Network Configuration Wizard"), - _("What kind is your ISDN connection?"), [ __("Internal ISDN card"), __("External ISDN modem")] + my $e = $in->ask_from_list_(N("Network Configuration Wizard"), + N("What kind is your ISDN connection?"), [ N_("Internal ISDN card"), N_("External ISDN modem")] ) or return; if ($e =~ /card/) { intern_pci: @@ -41,8 +41,8 @@ sub configure { sub isdn_write_config { my ($isdn, $netc) = @_; isdn_write_config_step_1: - my $e = $in->ask_from_list_(_("Network Configuration Wizard"), - _("Which ISDN configuration do you prefer? + my $e = $in->ask_from_list_(N("Network Configuration Wizard"), + N("Which ISDN configuration do you prefer? * The Old configuration uses isdn4net. It contains powerful tools, but is tricky to configure, and not standard. @@ -51,7 +51,7 @@ sub isdn_write_config { standard, but with less tools. We recommand the light configuration. -"), [ __("New configuration (isdn-light)"), __("Old configuration (isdn4net)")] +"), [ N_("New configuration (isdn-light)"), N_("Old configuration (isdn4net)")] ) or return; my ($rmpackage, $instpackage) = $e =~ /light/ ? ('isdn4net', 'isdn-light') : ('isdn-light', 'isdn4net'); if (!$::isStandalone) { @@ -167,7 +167,7 @@ sub isdn_ask_info { my ($isdn, $netc) = @_; my $f = "$ENV{SHARE_PATH}/ldetect-lst/isdn.db"; $f = "$prefix$f" if !-e $f; - my $str = $in->ask_from_treelist(_("ISDN Configuration"), _("Select your provider.\nIf it isn't listed, choose Unlisted."), + my $str = $in->ask_from_treelist(N("ISDN Configuration"), N("Select your provider.\nIf it isn't listed, choose Unlisted."), '|', ['Unlisted - edit manually', read_providers_backend($f)], 'Unlisted - edit manually') or return; @@ -180,13 +180,13 @@ sub isdn_ask_info { sub isdn_ask_protocol { my @toto = ( - { description => $::expert ? _("Europe protocol (EDSS1)") : _("Europe protocol"), + { description => $::expert ? N("Europe protocol (EDSS1)") : N("Europe protocol"), protokol => 2}, - { description => $::expert ? _("Protocol for the rest of the world\nNo D-Channel (leased lines)") : _("Protocol for the rest of the world"), + { description => $::expert ? N("Protocol for the rest of the world\nNo D-Channel (leased lines)") : N("Protocol for the rest of the world"), protokol => 3} ); - my $e = $in->ask_from_listf(_("ISDN Configuration"), - _("Which protocol do you want to use?"), + my $e = $in->ask_from_listf(N("ISDN Configuration"), + N("Which protocol do you want to use?"), sub { $_[0]{description} }, \@toto) or return 0; $e->{protokol}; @@ -197,31 +197,31 @@ sub isdn_ask { #- ISDN card already detected if (!$::expert && defined $netc->{autodetect}{isdn}{card_type}) { - $in->ask_yesorno(_("ISDN Configuration"), _("Found \"%s\" interface do you want to use it ?",$netc->{autodetect}{isdn}{description}), 1) or return; + $in->ask_yesorno(N("ISDN Configuration"), N("Found \"%s\" interface do you want to use it ?",$netc->{autodetect}{isdn}{description}), 1) or return; $isdn->{$_} = $netc->{autodetect}{isdn}{$_} foreach qw(description vendor id card_type driver type mem io io0 io1 irq firmware); goto isdn_ask_step_3; } isdn_ask_step_1: - my $e = $in->ask_from_list_(_("ISDN Configuration"), - $label . "\n" . _("What kind of card do you have?"), - [ __("ISA / PCMCIA"), __("PCI"), __("I don't know") ] + my $e = $in->ask_from_list_(N("ISDN Configuration"), + $label . "\n" . N("What kind of card do you have?"), + [ N_("ISA / PCMCIA"), N_("PCI"), N_("I don't know") ] ) or return; if ($e =~ /PCI/) { $isdn->{card_type} = 'pci'; } else { - $in->ask_from_list_(_("ISDN Configuration"), - _(" + $in->ask_from_list_(N("ISDN Configuration"), + N(" If you have an ISA card, the values on the next screen should be right.\n If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card. "), - [ __("Continue"), __("Abort") ]) eq 'Continue' or goto isdn_ask_step_1; + [ N_("Continue"), N_("Abort") ]) eq 'Continue' or goto isdn_ask_step_1; $isdn->{card_type} = 'isa'; } isdn_ask_step_2: - $e = $in->ask_from_listf(_("ISDN Configuration"), - _("Which is your ISDN card?"), + $e = $in->ask_from_listf(N("ISDN Configuration"), + N("Which is your ISDN card?"), sub { $_[0]{description} }, [ grep { $_->{card} eq $isdn->{card_type} } @isdndata ]) or goto isdn_ask_step_1; $e->{$_} and $isdn->{$_} = $e->{$_} foreach qw(driver type mem io io0 io1 irq firmware); @@ -240,7 +240,7 @@ sub isdn_detect { log::l("found isdn card : $isdn->{description}; vendor : $isdn->{vendor}; id : $isdn->{id}; driver : $isdn->{driver}\n"); $isdn->{description} =~ s/\|/ -- /; if ($isdn->{type} eq '') { - isdn_ask($isdn, $netc, _("I have detected an ISDN PCI card, but I don't know its type. Please select a PCI card on the next screen.")) or return; + isdn_ask($isdn, $netc, N("I have detected an ISDN PCI card, but I don't know its type. Please select a PCI card on the next screen.")) or return; } else { isdn_detect_step_1: $isdn->{protocol}=isdn_ask_protocol() or return; @@ -249,7 +249,7 @@ sub isdn_detect { isdn_write_config($isdn, $netc) or goto isdn_detect_step_2; } } else { - isdn_ask($isdn, $netc, _("No ISDN PCI card found. Please select one on the next screen.")) or return; + isdn_ask($isdn, $netc, N("No ISDN PCI card found. Please select one on the next screen.")) or return; } $netc->{$_}='ippp0' foreach 'NET_DEVICE', 'NET_INTERFACE'; 1; diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm index e5134fa47..6bde79dff 100644 --- a/perl-install/network/modem.pm +++ b/perl-install/network/modem.pm @@ -36,20 +36,20 @@ sub pppConfig { $mouse ||={}; $mouse->{device} ||= readlink "$prefix/dev/mouse"; $::isInstall and $in->set_help('selectSerialPort'); - $modem->{device} ||= $in->ask_from_listf('', _("Please choose which serial port your modem is connected to."), + $modem->{device} ||= $in->ask_from_listf('', N("Please choose which serial port your modem is connected to."), \&mouse::serial_port2text, [ grep { $_ ne $mouse->{device} } (mouse::serial_ports(), if_(-e '/dev/modem', '/dev/modem')) ]) || return; $::isStandalone || $in->set_help('configureNetworkISP'); - $in->ask_from('', _("Dialup options"), [ -{ label => _("Connection name"), val => \$modem->{connection} }, -{ label => _("Phone number"), val => \$modem->{phone} }, -{ label => _("Login ID"), val => \$modem->{login} }, -{ label => _("Password"), val => \$modem->{passwd}, hidden => 1 }, -{ label => _("Authentication"), val => \$modem->{auth}, list => [ __("PAP"), __("Terminal-based"), __("Script-based"), __("CHAP") ] }, -{ label => _("Domain name"), val => \$modem->{domain} }, -{ label => _("First DNS Server (optional)"), val => \$modem->{dns1} }, -{ label => _("Second DNS Server (optional)"), val => \$modem->{dns2} }, + $in->ask_from('', N("Dialup options"), [ +{ label => N("Connection name"), val => \$modem->{connection} }, +{ label => N("Phone number"), val => \$modem->{phone} }, +{ label => N("Login ID"), val => \$modem->{login} }, +{ label => N("Password"), val => \$modem->{passwd}, hidden => 1 }, +{ label => N("Authentication"), val => \$modem->{auth}, list => [ N_("PAP"), N_("Terminal-based"), N_("Script-based"), N_("CHAP") ] }, +{ label => N("Domain name"), val => \$modem->{domain} }, +{ label => N("First DNS Server (optional)"), val => \$modem->{dns1} }, +{ label => N("Second DNS Server (optional)"), val => \$modem->{dns2} }, ]) or return; $netc->{DOMAINNAME2} = $modem->{domain}; any::pppConfig($in, $modem, $prefix); @@ -66,12 +66,12 @@ sub winmodemConfigure { my $temp; /Hcf/ and $temp = "hcf"; /Hsf/ and $temp = "hsf"; - $temp and $in->do_pkgs->what_provides("${temp}linmodem") and $type="${temp}linmodem"; + $temp and $in->do_pkgs->what_provides("${temp}linmodem") and $type = "${temp}linmodem"; } - $type || $in->ask_warn(_("Warning"), _("Your modem isn't supported by the system. + $type || $in->ask_warn(N("Warning"), N("Your modem isn't supported by the system. Take a look at http://www.linmodems.org")) && return 1; - my $e = $in->ask_from_list(_("Title"), _("\"%s\" based winmodem detected, do you want to install needed software ?", $type), [_("Install rpm"), _("Do nothing")]) or return 0; + my $e = $in->ask_from_list(N("Title"), N("\"%s\" based winmodem detected, do you want to install needed software ?", $type), [N("Install rpm"), N("Do nothing")]) or return 0; $e =~ /rpm/ ? $in->do_pkgs->install($type) : return 1; 1; } diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 4d29e2739..f515d85ef 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -26,24 +26,24 @@ sub intro { read_net_conf($prefix, $netcnx, $netc); if (!$::isWizard) { if (connected()) { - $text = _("You are currently connected to internet.") . (-e $disconnect_file ? _("\nYou can disconnect or reconfigure your connection.") : _("\nYou can reconfigure your connection.")); + $text = N("You are currently connected to internet.") . (-e $disconnect_file ? N("\nYou can disconnect or reconfigure your connection.") : N("\nYou can reconfigure your connection.")); $connected = 1; } else { - $text = _("You are not currently connected to Internet.") . (-e $connect_file ? _("\nYou can connect to Internet or reconfigure your connection.") : _("\nYou can reconfigure your connection.")); + $text = N("You are not currently connected to Internet.") . (-e $connect_file ? N("\nYou can connect to Internet or reconfigure your connection.") : N("\nYou can reconfigure your connection.")); $connected = 0; } my @l = ( - !$connected && -e $connect_file ? { description => _("Connect"), + !$connected && -e $connect_file ? { description => N("Connect"), c => 1} : (), - $connected && -e $disconnect_file ? { description => _("Disconnect"), + $connected && -e $disconnect_file ? { description => N("Disconnect"), c => 2} : (), - { description => _("Configure the connection"), + { description => N("Configure the connection"), c => 3}, - { description => _("Cancel"), + { description => N("Cancel"), c => 4}, ); - my $e = $in->ask_from_listf(_("Internet connection & configuration"), - _($text), + my $e = $in->ask_from_listf(N("Internet connection & configuration"), + translate($text), sub { $_[0]{description} }, \@l); run_program::rooted($prefix, $connect_prog) if ($e->{c}==1); @@ -91,21 +91,21 @@ sub pre_func { $::Wizard_splash = 1; require my_gtk; my_gtk->import(qw(:wrappers)); - my $W = my_gtk->new(_("Network Configuration Wizard")); + my $W = my_gtk->new(N("Network Configuration Wizard")); gtkadd($W->{window}, gtkpack_(new Gtk::VBox(0, 0), 1, write_on_pixmap(gtkpng ("drakconnect_step"), 20,200, - _("We are now going to configure the %s connection.",_($text)), + N("We are now going to configure the %s connection.", translate($text)), ), - 0, $W->create_okcancel(_("OK")) + 0, $W->create_okcancel(N("OK")) ) ); $W->main; $::Wizard_splash = 0; } else { #- for i18n : %s is the type of connection of the list: (modem, isdn, adsl, cable, local network); - $in->ask_okcancel(_("Network Configuration Wizard"), _("\n\n\nWe are now going to configure the %s connection.\n\n\nPress OK to continue.",_($_[0])), 1); + $in->ask_okcancel(N("Network Configuration Wizard"), N("\n\n\nWe are now going to configure the %s connection.\n\n\nPress OK to continue.", translate($_[0])), 1); } undef $::Wizard_no_previous; } @@ -134,8 +134,8 @@ sub main { my $direct_net_install; if ($first_time && $::isInstall && ($in->{method} eq "ftp" || $in->{method} eq "http" || $in->{method} eq "nfs")) { - (!($::expert || $noauto) or $in->ask_okcancel(_("Network Configuration"), - _("Because you are doing a network installation, your network is already configured. + (!($::expert || $noauto) or $in->ask_okcancel(N("Network Configuration"), + N("Because you are doing a network installation, your network is already configured. Click on Ok to keep your configuration, or cancel to reconfigure your Internet & Network connection. "), 1)) and do { $netcnx->{type}='lan'; @@ -160,22 +160,22 @@ ifdown eth0 step_1: $::Wizard_no_previous=1; my @profiles = get_profiles(); - $in->ask_from(_("Network Configuration Wizard"), - _("Welcome to The Network Configuration Wizard. + $in->ask_from(N("Network Configuration Wizard"), + N("Welcome to The Network Configuration Wizard. We are about to configure your internet/network connection. If you don't want to use the auto detection, deselect the checkbox. "), [ - if_(@profiles > 1, { label => _("Choose the profile to configure"), val => \$netcnx->{PROFILE}, list => \@profiles }), - { label => _("Use auto detection"), val => \$netc->{autodetection}, type => 'bool' }, - if_($::isStandalone, { label => _("Expert Mode"), val => \$::expert, type => 'bool' }), + if_(@profiles > 1, { label => N("Choose the profile to configure"), val => \$netcnx->{PROFILE}, list => \@profiles }), + { label => N("Use auto detection"), val => \$netc->{autodetection}, type => 'bool' }, + if_($::isStandalone, { label => N("Expert Mode"), val => \$::expert, type => 'bool' }), ] ) or goto step_5; undef $::Wizard_no_previous; set_profile($netcnx); if ($netc->{autodetection}) { - my $w = $in->wait_message(_("Network Configuration Wizard"), _("Detecting devices...")); + my $w = $in->wait_message(N("Network Configuration Wizard"), N("Detecting devices...")); detect($netc->{autodetect}, $::isInstall && ($in->{method} eq "ftp" || $in->{method} eq "http" || $in->{method} eq "nfs")); } @@ -186,24 +186,24 @@ If you don't want to use the auto detection, deselect the checkbox. $conf{$_} = $netc->{autodetect}{$_} ? 1 : 0 foreach 'modem', 'winmodem', 'adsl', 'cable', 'lan'; $conf{isdn} = $netc->{autodetect}{isdn}{description} ? 1: 0; # my @l = ( -# [_("Normal modem connection"), $netc->{autodetect}{modem}, __("detected on port %s"), \$conf{modem}], -# [_("ISDN connection"), $netc->{autodetect}{isdn}{description}, __("detected %s"), \$conf{isdn}], -# [_("ADSL connection"), $netc->{autodetect}{adsl}, __("detected"), \$conf{adsl}], -# [_("Cable connection"), $netc->{autodetect}{cable}, __("cable connection detected"), \$conf{cable}], -# [_("LAN connection"), $netc->{autodetect}{lan}, __("ethernet card(s) detected"), \$conf{lan}] +# [N("Normal modem connection"), $netc->{autodetect}{modem}, N_("detected on port %s"), \$conf{modem}], +# [N("ISDN connection"), $netc->{autodetect}{isdn}{description}, N_("detected %s"), \$conf{isdn}], +# [N("ADSL connection"), $netc->{autodetect}{adsl}, N_("detected"), \$conf{adsl}], +# [N("Cable connection"), $netc->{autodetect}{cable}, N_("cable connection detected"), \$conf{cable}], +# [N("LAN connection"), $netc->{autodetect}{lan}, N_("ethernet card(s) detected"), \$conf{lan}] # ); my $i = 0; map { defined $set_default or do { $_->[1] and $set_default = $i }; $i++ } @l; @l = ( -[_("Normal modem connection") . if_($netc->{autodetect}{modem}, " - " . _("detected on port %s", $netc->{autodetect}{modem})), \$conf{modem}], -[_("Winmodem connection") . if_($netc->{autodetect}{winmodem}, " - " . _("detected")), \$conf{winmodem}], -[_("ISDN connection") . if_($netc->{autodetect}{isdn}{description}, " - " . _("detected %s", $netc->{autodetect}{isdn}{description})), \$conf{isdn}], -[_("ADSL connection") . if_($netc->{autodetect}{adsl}, " - " . _("detected")), \$conf{adsl}], -[_("Cable connection") . if_($netc->{autodetect}{cable}, " - " . _("cable connection detected")), \$conf{cable}], -[_("LAN connection") . if_($netc->{autodetect}{lan}, " - " . _("ethernet card(s) detected")), \$conf{lan}] +[N("Normal modem connection") . if_($netc->{autodetect}{modem}, " - " . N("detected on port %s", $netc->{autodetect}{modem})), \$conf{modem}], +[N("Winmodem connection") . if_($netc->{autodetect}{winmodem}, " - " . N("detected")), \$conf{winmodem}], +[N("ISDN connection") . if_($netc->{autodetect}{isdn}{description}, " - " . N("detected %s", $netc->{autodetect}{isdn}{description})), \$conf{isdn}], +[N("ADSL connection") . if_($netc->{autodetect}{adsl}, " - " . N("detected")), \$conf{adsl}], +[N("Cable connection") . if_($netc->{autodetect}{cable}, " - " . N("cable connection detected")), \$conf{cable}], +[N("LAN connection") . if_($netc->{autodetect}{lan}, " - " . N("ethernet card(s) detected")), \$conf{lan}] ); $::isInstall and $in->set_help('configureNetwork'); - my $e = $in->ask_from(_("Network Configuration Wizard"), _("Choose the connection you want to configure"), + my $e = $in->ask_from(N("Network Configuration Wizard"), N("Choose the connection you want to configure"), [ map { { label => $_->[0], val => $_->[1], type => 'bool' } } @l ], changed => sub { return if !$netc->{autodetection}; @@ -227,15 +227,15 @@ If you don't want to use the auto detection, deselect the checkbox. my $nb = keys %{$netc->{internet_cnx}}; if ($nb < 1) { } elsif ($nb > 1) { - $in->ask_from(_("Network Configuration Wizard"), - _("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n" . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center")), - [ { label => _("Internet connection"), val => \$netc->{internet_cnx_choice}, list => [ keys %{$netc->{internet_cnx}} ]} ] + $in->ask_from(N("Network Configuration Wizard"), + N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n" . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center")), + [ { label => N("Internet connection"), val => \$netc->{internet_cnx_choice}, list => [ keys %{$netc->{internet_cnx}} ]} ] ) or goto step_2; } elsif ($nb == 1) { $netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0]; } member($netc->{internet_cnx_choice}, ('adsl', 'isdn')) and - $netc->{at_boot} = $in->ask_yesorno(_("Network Configuration Wizard"), _("Do you want to start the connection at boot?")); + $netc->{at_boot} = $in->ask_yesorno(N("Network Configuration Wizard"), N("Do you want to start the connection at boot?")); if ($netc->{internet_cnx_choice} ) { write_cnx_script($netc); $netcnx->{type} = $netc->{internet_cnx}{$netc->{internet_cnx_choice}}{type}; @@ -249,12 +249,12 @@ If you don't want to use the auto detection, deselect the checkbox. network::configureNetwork2($in, $prefix, $netc, $intf); my $network_configured = 1; - if ($netconnect::need_restart_network && $::isStandalone and ($::expert or $in->ask_yesorno(_("Network configuration"), - _("The network needs to be restarted"), 1))) { + if ($netconnect::need_restart_network && $::isStandalone and ($::expert or $in->ask_yesorno(N("Network configuration"), + N("The network needs to be restarted"), 1))) { #- run_program::rooted($prefix, "/etc/rc.d/init.d/network stop"); if (!run_program::rooted($prefix, "/etc/rc.d/init.d/network restart")) { $success = 0; - $in->ask_okcancel(_("Network Configuration"), _("A problem occured while restarting the network: \n\n%s", `/etc/rc.d/init.d/network restart`), 0); + $in->ask_okcancel(N("Network Configuration"), N("A problem occured while restarting the network: \n\n%s", `/etc/rc.d/init.d/network restart`), 0); } } @@ -264,17 +264,17 @@ If you don't want to use the auto detection, deselect the checkbox. step_3: - my $m = $success ? _("Congratulations, the network and Internet configuration is finished. + my $m = $success ? N("Congratulations, the network and Internet configuration is finished. The configuration will now be applied to your system. ") . if_($::isStandalone && $in->isa('interactive_gtk'), -_("After this is done, we recommend that you restart your X environment to avoid any hostname-related problems.")) - : _("Problems occured during configuration. +N("After this is done, we recommend that you restart your X environment to avoid any hostname-related problems.")) + : N("Problems occured during configuration. Test your connection via net_monitor or mcc. If your connection doesn't work, you might want to relaunch the configuration."); if ($::isWizard) { $::Wizard_no_previous=1; $::Wizard_finished=1; - $in->ask_okcancel(_("Network Configuration"), $m, 1); + $in->ask_okcancel(N("Network Configuration"), $m, 1); undef $::Wizard_no_previous; undef $::Wizard_finished; } else { $::isStandalone and $in->ask_warn('', $m) } @@ -343,8 +343,8 @@ fi #- any::load_category($in, 'network/main|usb', !$::expert, 1); #- $netc->{nb_cards} = listlength(detect_devices::getNet()); #- }; -#- ($netc->{nb_cards} - $netc->{minus_one} - (get_net_device($prefix) =~ /eth.+/ ? 1 : 0) > 0) and $in->ask_okcancel(_("Network Configuration"), -#-_("Now that your Internet connection is configured, +#- ($netc->{nb_cards} - $netc->{minus_one} - (get_net_device($prefix) =~ /eth.+/ ? 1 : 0) > 0) and $in->ask_okcancel(N("Network Configuration"), +#-N("Now that your Internet connection is configured, #-your computer can be configured to share its Internet connection. #-Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). #- diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 3e7f8222a..4c92ead01 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -192,7 +192,7 @@ sub addDefaultRoute { sub sethostname { my ($netc) = @_; - syscall_('sethostname', $netc->{HOSTNAME}, length $netc->{HOSTNAME}) or log::l("sethostname failed: $!"); + syscall_("sethostname", $netc->{HOSTNAME}, length $netc->{HOSTNAME}) or log::l("sethostname failed: $!"); } sub resolv($) { @@ -290,12 +290,12 @@ sub configureNetworkIntf { } if ($net_device eq $intf->{DEVICE}) { $skip and return 1; - $text = _("WARNING: this device has been previously configured to connect to the Internet. + $text = N("WARNING: this device has been previously configured to connect to the Internet. Simply accept to keep this device configured. Modifying the fields below will override this configuration."); } else { - $text = _("Please enter the IP configuration for this machine. + $text = N("Please enter the IP configuration for this machine. Each item should be entered as an IP address in dotted-decimal notation (for example, 1.2.3.4)."); } @@ -305,13 +305,13 @@ notation (for example, 1.2.3.4)."); my $onboot = 1; my @fields = qw(IPADDR NETMASK); $::isStandalone or $in->set_help('configureNetworkIP'); - $in->ask_from(_("Configuring network device %s", $intf->{DEVICE}), - (_("Configuring network device %s", $intf->{DEVICE}) . ($module ? _(" (driver %s)", $module) : '') ."\n\n") . + $in->ask_from(N("Configuring network device %s", $intf->{DEVICE}), + (N("Configuring network device %s", $intf->{DEVICE}) . ($module ? N(" (driver %s)", $module) : '') ."\n\n") . $text, - [ { label => _("IP address"), val => \$intf->{IPADDR}, disabled => sub { $pump } }, - { label => _("Netmask"), val => \$intf->{NETMASK}, disabled => sub { $pump } }, - { label => _("Automatic IP"), val => \$pump, type => "bool", text => _("(bootp/dhcp)") }, - if_($::expert, { label => _("Start at boot"), val => \$onboot, type => "bool" }), + [ { label => N("IP address"), val => \$intf->{IPADDR}, disabled => sub { $pump } }, + { label => N("Netmask"), val => \$intf->{NETMASK}, disabled => sub { $pump } }, + { label => N("Automatic IP"), val => \$pump, type => "bool", text => N("(bootp/dhcp)") }, + if_($::expert, { label => N("Start at boot"), val => \$onboot, type => "bool" }), if_($intf->{wireless_eth}, { label => "WIRELESS_MODE", val => \$intf->{WIRELESS_MODE}, list => [ "Ad-hoc", "Managed", "Master", "Repeater", "Secondary", "Auto"] }, { label => "WIRELESS_ESSID", val => \$intf->{WIRELESS_ESSID} }, @@ -332,17 +332,17 @@ notation (for example, 1.2.3.4)."); return 0 if $pump; for (my $i = 0; $i < @fields; $i++) { unless (is_ip($intf->{$fields[$i]})) { - $in->ask_warn('', _("IP address should be in format 1.2.3.4")); + $in->ask_warn('', N("IP address should be in format 1.2.3.4")); return (1,$i); } return 0; } if ($intf->{WIRELESS_FREQ} !~ /[0-9.]*[kGM]/) { - $in->ask_warn('', _('Freq should have the suffix k, M or G (for example, "2.46G" for 2.46 GHz frequency), or add enough \'0\'.')); + $in->ask_warn('', N("Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough \'0\'.")); return (1,6); } if ($intf->{WIRELESS_RATE} !~ /[0-9.]*[kGM]/) { - $in->ask_warn('', _('Rate should have the suffix k, M or G (for example, "11M" for 11M), or add enough \'0\'.')); + $in->ask_warn('', N("Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough \'0\'.")); return (1,8); } }, @@ -361,25 +361,25 @@ sub configureNetworkNet { #- $netc->{GATEWAY} ||= gateway($intf->{IPADDR}); $::isInstall and $in->set_help('configureNetworkHost'); - $in->ask_from(_("Configuring network"), -_("Please enter your host name. + $in->ask_from(N("Configuring network"), +N("Please enter your host name. Your host name should be a fully-qualified host name, such as ``mybox.mylab.myco.com''. You may also enter the IP address of the gateway if you have one"), - [ { label => _("Host name"), val => \$netc->{HOSTNAME} }, - { label => _("DNS server"), val => \$netc->{dnsServer} }, - { label => _("Gateway (e.g. %s)", $gateway_ex), val => \$netc->{GATEWAY} }, + [ { label => N("Host name"), val => \$netc->{HOSTNAME} }, + { label => N("DNS server"), val => \$netc->{dnsServer} }, + { label => N("Gateway (e.g. %s)", $gateway_ex), val => \$netc->{GATEWAY} }, if_(@devices > 1, - { label => _("Gateway device"), val => \$netc->{GATEWAYDEV}, list => \@devices }, + { label => N("Gateway device"), val => \$netc->{GATEWAYDEV}, list => \@devices }, ), ], complete => sub { if ($netc->{dnsServer} and !is_ip($netc->{dnsServer})) { - $in->ask_warn('', _("DNS server address should be in format 1.2.3.4")); + $in->ask_warn('', N("DNS server address should be in format 1.2.3.4")); return 1; } if ($netc->{GATEWAY} and !is_ip($netc->{GATEWAY})) { - $in->ask_warn('', _("Gateway address should be in format 1.2.3.4")); + $in->ask_warn('', N("Gateway address should be in format 1.2.3.4")); return 1; } 0; @@ -393,14 +393,14 @@ sub miscellaneousNetwork { $::isInstall and $in->set_help('configureNetworkProxy'); $u->{track_network_id} = detect_devices::isLaptop(); $::expert || $clicked and ($in->ask_from('', - _("Proxies configuration"), - [ { label => _("HTTP proxy"), val => \$u->{http_proxy} }, - { label => _("FTP proxy"), val => \$u->{ftp_proxy} }, - if_(!$no_track_net, { label => _("Track network card id (useful for laptops)"), val => \$u->{track_network_id}, type => "bool" }), + N("Proxies configuration"), + [ { label => N("HTTP proxy"), val => \$u->{http_proxy} }, + { label => N("FTP proxy"), val => \$u->{ftp_proxy} }, + if_(!$no_track_net, { label => N("Track network card id (useful for laptops)"), val => \$u->{track_network_id}, type => "bool" }), ], complete => sub { - $u->{http_proxy} =~ m,^($|http://), or $in->ask_warn('', _("Proxy should be http://...")), return 1,0; - $u->{ftp_proxy} =~ m,^($|ftp://|http://), or $in->ask_warn('', _("Url should begin with 'ftp:' or 'http:'")), return 1,1; + $u->{http_proxy} =~ m,^($|http://), or $in->ask_warn('', N("Proxy should be http://...")), return 1,0; + $u->{ftp_proxy} =~ m,^($|ftp://|http://), or $in->ask_warn('', N("Url should begin with 'ftp:' or 'http:'")), return 1,1; 0; } ) or return); diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm index 941d5673d..d93817e9e 100644 --- a/perl-install/network/shorewall.pm +++ b/perl-install/network/shorewall.pm @@ -23,8 +23,8 @@ sub check_iptables { -x '/sbin/iptables' && listlength(`/sbin/iptables -t nat -nL`) > 8; }; - !$existing_config || $in->ask_okcancel(_("Firewalling configuration detected!"), - _("Warning! An existing firewalling configuration has been detected. You may need some manual fix after installation.")); + !$existing_config || $in->ask_okcancel(N("Firewalling configuration detected!"), + N("Warning! An existing firewalling configuration has been detected. You may need some manual fix after installation.")); } sub set_config_file { diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index 8f81c4c1b..dba446beb 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -38,12 +38,12 @@ sub ask_connect_now { my ($type) = @_; $::Wizard_no_previous=1; #- FIXME : code the exception to be generated by ask_yesorno, to be able to remove the $::Wizard_no_previous=1; - if ($in->ask_yesorno(_("Internet configuration"), - _("Do you want to try to connect to the Internet now?") + if ($in->ask_yesorno(N("Internet configuration"), + N("Do you want to try to connect to the Internet now?") )) { my $up; { - my $w = $in->wait_message('', _("Testing your connection..."), 1); + my $w = $in->wait_message('', N("Testing your connection..."), 1); connect_backend(); my $s = 30; $type =~ /modem/ and $s = 50; @@ -53,14 +53,14 @@ sub ask_connect_now { my $netc = {}; $up = connected(); } - my $m = $up ? (_("The system is now connected to Internet.") . - if_($::isInstall, _("For security reason, it will be disconnected now.")) ) : - _("The system doesn't seem to be connected to internet. + my $m = $up ? (N("The system is now connected to Internet.") . + if_($::isInstall, N("For security reason, it will be disconnected now.")) ) : + N("The system doesn't seem to be connected to internet. Try to reconfigure your connection."); if ($::isWizard) { $::Wizard_no_previous=1; $::Wizard_finished=1; - $in->ask_okcancel(_("Network Configuration"), $m, 1); + $in->ask_okcancel(N("Network Configuration"), $m, 1); undef $::Wizard_no_previous; undef $::Wizard_finished; } else { $in->ask_warn('', $m) } @@ -79,29 +79,29 @@ sub read_providers_backend { my ($file) = @_; map { /(.*?)=>/ } catMaybeCompress sub ask_info2 { my ($cnx, $netc) = @_; $::isInstall and $in->set_help('configureNetworkDNS'); - $in->ask_from(_("Connection Configuration"), - _("Please fill or check the field below"), + $in->ask_from(N("Connection Configuration"), + N("Please fill or check the field below"), [ - if__($cnx->{irq}, { label => _("Card IRQ"), val => \$cnx->{irq} }) , - if__($cnx->{mem}, { label => _("Card mem (DMA)"), val => \$cnx->{mem} }), - if__($cnx->{io}, { label => _("Card IO"), val => \$cnx->{io} }), - if__($cnx->{io0}, { label => _("Card IO_0"), val => \$cnx->{io0} }), - if__($cnx->{io1}, { label => _("Card IO_1"), val => \$cnx->{io1} }), - if__($cnx->{phone_in}, { label => _("Your personal phone number"), val => \$cnx->{phone_in} }), - if__($netc->{DOMAINNAME2}, { label => _("Provider name (ex provider.net)"), val => \$netc->{DOMAINNAME2} }), - if__($cnx->{phone_out}, { label => _("Provider phone number"), val => \$cnx->{phone_out} }), - if__($netc->{dnsServer2}, { label => _("Provider dns 1 (optional)"), val => \$netc->{dnsServer2} }), - if__($netc->{dnsServer3}, { label => _("Provider dns 2 (optional)"), val => \$netc->{dnsServer3} }), - if__($cnx->{vpivci}, { label => _("Choose your country"), val => \$netc->{vpivci}, list => detect_timezone() }), - if__($cnx->{dialing_mode}, { label => _("Dialing mode"), val => \$cnx->{dialing_mode},list=>["auto","manual"]}), - if__($cnx->{speed}, { label => _("Connection speed"), val => \$cnx->{speed}, list => ["64 Kb/s", "128 Kb/s"]}), - if__($cnx->{huptimeout}, { label => _("Connection timeout (in sec)"), val => \$cnx->{huptimeout} }), - if__($cnx->{login}, { label => _("Account Login (user name)"), val => \$cnx->{login} }), - if__($cnx->{passwd}, { label => _("Account Password"), val => \$cnx->{passwd}, hidden => 1 }), + if__($cnx->{irq}, { label => N("Card IRQ"), val => \$cnx->{irq} }) , + if__($cnx->{mem}, { label => N("Card mem (DMA)"), val => \$cnx->{mem} }), + if__($cnx->{io}, { label => N("Card IO"), val => \$cnx->{io} }), + if__($cnx->{io0}, { label => N("Card IO_0"), val => \$cnx->{io0} }), + if__($cnx->{io1}, { label => N("Card IO_1"), val => \$cnx->{io1} }), + if__($cnx->{phone_in}, { label => N("Your personal phone number"), val => \$cnx->{phone_in} }), + if__($netc->{DOMAINNAME2}, { label => N("Provider name (ex provider.net)"), val => \$netc->{DOMAINNAME2} }), + if__($cnx->{phone_out}, { label => N("Provider phone number"), val => \$cnx->{phone_out} }), + if__($netc->{dnsServer2}, { label => N("Provider dns 1 (optional)"), val => \$netc->{dnsServer2} }), + if__($netc->{dnsServer3}, { label => N("Provider dns 2 (optional)"), val => \$netc->{dnsServer3} }), + if__($cnx->{vpivci}, { label => N("Choose your country"), val => \$netc->{vpivci}, list => detect_timezone() }), + if__($cnx->{dialing_mode}, { label => N("Dialing mode"), val => \$cnx->{dialing_mode},list=>["auto","manual"]}), + if__($cnx->{speed}, { label => N("Connection speed"), val => \$cnx->{speed}, list => ["64 Kb/s", "128 Kb/s"]}), + if__($cnx->{huptimeout}, { label => N("Connection timeout (in sec)"), val => \$cnx->{huptimeout} }), + if__($cnx->{login}, { label => N("Account Login (user name)"), val => \$cnx->{login} }), + if__($cnx->{passwd}, { label => N("Account Password"), val => \$cnx->{passwd}, hidden => 1 }), ] ) or return; if ($netc->{vpivci}) { - foreach ([_("Netherlands"), '8_48'], [_("France"), '8_35'], [_("Belgium"), '8_35'], [_("Italy"), '8_35'], [_("United Kingdom"), '0_38'], [_("United States"), '8_35']) { + foreach ([N("Netherlands"), '8_48'], [N("France"), '8_35'], [N("Belgium"), '8_35'], [N("Italy"), '8_35'], [N("United Kingdom"), '0_38'], [N("United States"), '8_35']) { $netc->{vpivci} eq $_->[0] and $netc->{vpivci} = $_->[1]; } } @@ -110,12 +110,12 @@ sub ask_info2 { sub detect_timezone { my %tmz2country = ( - 'Europe/Paris' => _("France"), - 'Europe/Amsterdam' => _("Netherlands"), - 'Europe/Rome' => _("Italy"), - 'Europe/Brussels' => _("Belgium"), - 'America/New_York' => _("United States"), - 'Europe/London' => _("United Kingdom") + 'Europe/Paris' => N("France"), + 'Europe/Amsterdam' => N("Netherlands"), + 'Europe/Rome' => N("Italy"), + 'Europe/Brussels' => N("Belgium"), + 'America/New_York' => N("United States"), + 'Europe/London' => N("United Kingdom") ); my %tm_parse = MDK::Common::System::getVarsFromSh('/etc/sysconfig/clock'); foreach (keys %tmz2country) { diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 787e4e416..d7e0ccbce 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -596,11 +596,11 @@ sub write { my @magic_parts = grep { $_->{isMounted} && $_->{real_mntpoint} } get_normal_parts($hd); foreach (@magic_parts) { - syscall_('umount', $_->{real_mntpoint}) or log::l(_("error unmounting %s: %s", $_->{real_mntpoint}, "$!")); + syscall_('umount', $_->{real_mntpoint}) or log::l(N("error unmounting %s: %s", $_->{real_mntpoint}, "$!")); } $hd->kernel_read; foreach (@magic_parts) { - syscall_('mount', , $_->{real_mntpoint}, type2fs($_), c::MS_MGC_VAL()) or log::l(_("mount failed: ") . "$!"); + syscall_('mount', , $_->{real_mntpoint}, type2fs($_), c::MS_MGC_VAL()) or log::l(N("mount failed: ") . "$!"); } } $hd->{needKernelReread} = 0; @@ -664,7 +664,7 @@ sub add_primary { } sub add_extended { - arch() =~ /^sparc|ppc/ and die _("Extended partition not supported on this platform"); + arch() =~ /^sparc|ppc/ and die N("Extended partition not supported on this platform"); my ($hd, $part, $extended_type) = @_; $extended_type =~ s/Extended_?//; @@ -682,7 +682,7 @@ sub add_extended { local $e->{size} = $end - $start; eval { verifyPrimary($hd->{primary}) }; $@ and die -_("You have a hole in your partition table but I can't use it. +N("You have a hole in your partition table but I can't use it. The only solution is to move your primary partitions to have the hole next to the extended partitions."); } } @@ -765,16 +765,16 @@ sub load { my ($hd, $file, $force) = @_; local *F; - open F, $file or die _("Error reading file %s", $file); + open F, $file or die N("Error reading file %s", $file); my $h; { local $/ = "\0"; eval <F>; } - $@ and die _("Restoring from file %s failed: %s", $file, $@); + $@ and die N("Restoring from file %s failed: %s", $file, $@); - ref $h eq 'ARRAY' or die _("Bad backup file"); + ref $h eq 'ARRAY' or die N("Bad backup file"); my %h; @h{@fields2save} = @$h; @@ -796,5 +796,5 @@ sub save { require Data::Dumper; open F, ">$file" and print F Data::Dumper->Dump([\@h], ['$h']), "\0" - or die _("Error writing to file %s", $file); + or die N("Error writing to file %s", $file); } diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm index 89a89cffd..47e275a2d 100644 --- a/perl-install/partition_table/raw.pm +++ b/perl-install/partition_table/raw.pm @@ -186,7 +186,7 @@ sub test_for_bad_drives { my $tmp2; &$seek; sysread F, $tmp2, $SECTORSIZE or die "test_for_bad_drives: can't even read again ($!)"; $tmp eq $tmp2 or die -_("Something bad is happening on your drive. +N("Something bad is happening on your drive. A test to check the integrity of data has failed. It means writing anything on the disk will end up with random trash"); } diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index a7784ce85..ff7f7506f 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -23,11 +23,11 @@ my @preferred = qw(perl-GTK postfix gcc gcc-cpp gcc-c++ proftpd ghostscript-X vi #- lower bound on the left ( aka 90 means [90-100[ ) %compssListDesc = ( - 5 => __("must have"), - 4 => __("important"), - 3 => __("very nice"), - 2 => __("nice"), - 1 => __("maybe"), + 5 => N_("must have"), + 4 => N_("important"), + 3 => N_("very nice"), + 2 => N_("nice"), + 1 => N_("maybe"), ); #- constant for small transaction. diff --git a/perl-install/printer.pm b/perl-install/printer.pm index bac8eef54..8f01ea1ba 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -25,24 +25,24 @@ my $ptalinitread = 0; our %spoolers = ('ppq' => { 'help' => "/usr/bin/lphelp %s |", 'print_command' => 'lpr-pdq', - 'long_name' =>_("PDQ - Print, Don't Queue"), - 'short_name' => _("PDQ") + 'long_name' =>N("PDQ - Print, Don't Queue"), + 'short_name' => N("PDQ") }, 'lpd' => { 'help' => "/usr/bin/pdq -h -P %s 2>&1 |", 'print_command' => 'lpr-cups', - 'long_name' => _("LPD - Line Printer Daemon"), - 'short_name' => _("LPD") + 'long_name' => N("LPD - Line Printer Daemon"), + 'short_name' => N("LPD") }, 'lprng' => { 'print_command' => 'lpr-lpd', - 'long_name' => _("LPRng - LPR New Generation"), - 'short_name' => _("LPRng") + 'long_name' => N("LPRng - LPR New Generation"), + 'short_name' => N("LPRng") }, 'cups' => { 'print_command' => 'lpr-cups', - 'long_name' => _("CUPS - Common Unix Printing System"), - 'short_name' => _("CUPS") + 'long_name' => N("CUPS - Common Unix Printing System"), + 'short_name' => N("CUPS") } ); our %spooler_inv = map { $spooler{$_}{long_name} => $_ } keys %spoolers; @@ -50,15 +50,15 @@ our %spooler_inv = map { $spooler{$_}{long_name} => $_ } keys %spoolers; our %shortspooler_inv = map { $spooler{$_}{short_name} => $_ } keys %spoolers; %printer_type = ( - _("Local printer") => "LOCAL", - _("Remote printer") => "REMOTE", - _("Printer on remote CUPS server") => "CUPS", - _("Printer on remote lpd server") => "LPD", - _("Network printer (TCP/Socket)") => "SOCKET", - _("Printer on SMB/Windows 95/98/NT server") => "SMB", - _("Printer on NetWare server") => "NCP", - _("Enter a printer device URI") => "URI", - _("Pipe job into a command") => "POSTPIPE" + N("Local printer") => "LOCAL", + N("Remote printer") => "REMOTE", + N("Printer on remote CUPS server") => "CUPS", + N("Printer on remote lpd server") => "LPD", + N("Network printer (TCP/Socket)") => "SOCKET", + N("Printer on SMB/Windows 95/98/NT server") => "SMB", + N("Printer on NetWare server") => "NCP", + N("Enter a printer device URI") => "URI", + N("Pipe job into a command") => "POSTPIPE" ); our %printer_type_inv = reverse %printer_type; @@ -351,7 +351,7 @@ sub getSNMPModel { open F, ($::testing ? $prefix : "chroot $prefix/ ") . "/bin/sh -c \"scli -1 -c 'show printer info' $host\" |" or return { CLASS => 'PRINTER', - MODEL => _("Unknown Model"), + MODEL => N("Unknown Model"), MANUFACTURER => "", DESCRIPTION => "", SERIALNUMBER => "" @@ -393,7 +393,7 @@ sub getSNMPModel { # We couldn't determine a model if ($model eq "") { - $model = _("Unknown Model"); + $model = N("Unknown Model"); } # Remove trailing spaces @@ -572,7 +572,7 @@ sub whatNetPrinter { for my $share (@shares) { push @res, { port => "smb://$host/$share->{name}", val => { CLASS => 'PRINTER', - MODEL => _("Unknown Model"), + MODEL => N("Unknown Model"), MANUFACTURER => "", DESCRIPTION => "$share->{description}", @@ -793,7 +793,7 @@ sub read_configured_queues($) { $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{args} = read_cups_options($QUEUES[$i]{queuedata}{queue}); } $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{make} ||= ""; - $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{model} ||= _("Unknown model"); + $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{model} ||= N("Unknown model"); } else { $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{make} = $QUEUES[$i]{make}; $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{model} = $QUEUES[$i]{model}; @@ -821,48 +821,48 @@ sub make_menuentry { my $connect = $printer->{configured}{$queue}{queuedata}{connect}; my $localremote; if (($connect =~ m!^file:!) || ($connect =~ m!^ptal:/mlc:!)) { - $localremote = _("Local Printers"); + $localremote = N("Local Printers"); } else { - $localremote = _("Remote Printers"); + $localremote = N("Remote Printers"); } my $make = $printer->{configured}{$queue}{queuedata}{make}; my $model = $printer->{configured}{$queue}{queuedata}{model}; my $connection; if ($connect =~ m!^file:/dev/lp(\d+)$!) { my $number = $1; - $connection = _(" on parallel port \#%s", $number); + $connection = N(" on parallel port \#%s", $number); } elsif ($connect =~ m!^file:/dev/usb/lp(\d+)$!) { my $number = $1; - $connection = _(", USB printer \#%s", $number); + $connection = N(", USB printer \#%s", $number); } elsif ($connect =~ m!^ptal:/(.+)$!) { my $ptaldevice = $1; if ($ptaldevice =~ /^mlc:par:(\d+)$/) { my $number = $1; - $connection = _(", multi-function device on parallel port \#%s", + $connection = N(", multi-function device on parallel port \#%s", $number); } elsif ($ptaldevice =~ /^mlc:usb:/) { - $connection = _(", multi-function device on USB"); + $connection = N(", multi-function device on USB"); } elsif ($ptaldevice =~ /^hpjd:/) { - $connection = _(", multi-function device on HP JetDirect"); + $connection = N(", multi-function device on HP JetDirect"); } else { - $connection = _(", multi-function device"); + $connection = N(", multi-function device"); } } elsif ($connect =~ m!^file:(.+)$!) { - $connection = _(", printing to %s", $1); + $connection = N(", printing to %s", $1); } elsif ($connect =~ m!^lpd://([^/]+)/([^/]+)/?$!) { - $connection = _(" on LPD server \"%s\", printer \"%s\"", $2, $1); + $connection = N(" on LPD server \"%s\", printer \"%s\"", $2, $1); } elsif ($connect =~ m!^socket://([^/:]+):([^/:]+)/?$!) { - $connection = _(", TCP/IP host \"%s\", port %s", $1, $2); + $connection = N(", TCP/IP host \"%s\", port %s", $1, $2); } elsif (($connect =~ m!^smb://([^/\@]+)/([^/\@]+)/?$!) || ($connect =~ m!^smb://.*/([^/\@]+)/([^/\@]+)/?$!) || ($connect =~ m!^smb://.*\@([^/\@]+)/([^/\@]+)/?$!)) { - $connection = _(" on SMB/Windows server \"%s\", share \"%s\"", $1, $2); + $connection = N(" on SMB/Windows server \"%s\", share \"%s\"", $1, $2); } elsif (($connect =~ m!^ncp://([^/\@]+)/([^/\@]+)/?$!) || ($connect =~ m!^ncp://.*/([^/\@]+)/([^/\@]+)/?$!) || ($connect =~ m!^ncp://.*\@([^/\@]+)/([^/\@]+)/?$!)) { - $connection = _(" on Novell server \"%s\", printer \"%s\"", $1, $2); + $connection = N(" on Novell server \"%s\", printer \"%s\"", $1, $2); } elsif ($connect =~ m!^postpipe:(.+)$!) { - $connection = _(", using command %s", $1); + $connection = N(", using command %s", $1); } else { $connection = ($::expert ? ", URI: $connect" : ""); } @@ -981,10 +981,10 @@ sub read_printer_db(;$) { # Add raw queue if ($spooler ne "pdq") { - $entry->{ENTRY} = _("Raw printer (No driver)"); + $entry->{ENTRY} = N("Raw printer (No driver)"); $entry->{driver} = "raw"; $entry->{make} = ""; - $entry->{model} = _("Unknown model"); + $entry->{model} = N("Unknown model"); map { $thedb{$entry->{ENTRY}}{$_} = $entry->{$_} } keys %$entry; } @@ -994,8 +994,8 @@ sub read_printer_db(;$) { #&$install('cups-drivers') unless $::testing; #my $w; #if ($in) { - # $w = $in->wait_message(_("CUPS starting"), - # _("Reading CUPS drivers database...")); + # $w = $in->wait_message(N("CUPS starting"), + # N("Reading CUPS drivers database...")); #} poll_ppd_base(); } @@ -1153,9 +1153,9 @@ sub read_cups_printer_list { my $comment = ""; if (($2 =~ m!^ipp://([^/:]+)[:/]!) && (!$printer->{configured}{$queuename})) { - $comment = _("(on %s)", $1); + $comment = N("(on %s)", $1); } else { - $comment = _("(on this machine)"); + $comment = N("(on this machine)"); } push (@printerlist, "$queuename $comment"); } @@ -1180,13 +1180,13 @@ sub get_cups_remote_queues { my $comment = ""; if (($2 =~ m!^ipp://([^/:]+)[:/]!) && (!$printer->{configured}{$queuename})) { - $comment = _("On CUPS server \"%s\"", $1); + $comment = N("On CUPS server \"%s\"", $1); my $sep = "!"; push (@printerlist, - ($::expert ? _("CUPS") . $sep : "") . - _("Remote Printers") . "$sep$queuename: $comment" + ($::expert ? N("CUPS") . $sep : "") . + N("Remote Printers") . "$sep$queuename: $comment" . ($queuename eq $printer->{DEFAULT} ? - _(" (Default)") : (""))); + N(" (Default)") : (""))); } } } @@ -1376,7 +1376,7 @@ sub get_descr_from_ppd { my %ppd; #- if there is no ppd, this means this is a raw queue. - local *F; open F, "$prefix/etc/cups/ppd/$printer->{OLD_QUEUE}.ppd" or return "|" . _("Unknown model"); + local *F; open F, "$prefix/etc/cups/ppd/$printer->{OLD_QUEUE}.ppd" or return "|" . N("Unknown model"); # "OTHERS|Generic PostScript printer|PostScript (en)"; local $_; while (<F>) { @@ -1907,7 +1907,7 @@ sub configure_hpoj { # $model is for the PTAL device name, so make sure that it is unique # so in the case of the model name auto-detection having failed leave # the port number or the host name as model name. - my $searchunknown = _("Unknown model"); + my $searchunknown = N("Unknown model"); if (($_->{val}{MODEL}) && ($_->{val}{MODEL} !~ /$searchunknown/i) && ($_->{val}{MODEL} !~ /^\s*$/)) { diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index ab462b977..b5c674702 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -22,10 +22,10 @@ sub choose_printer_type { $autodetect = 1 if ($printer->{AUTODETECT}); my @printertypes = printer::printer_type($printer); $in->ask_from_( - { title => _("Select Printer Connection"), - messages => _("How is the printer connected?") . + { title => N("Select Printer Connection"), + messages => N("How is the printer connected?") . ($printer->{SPOOLER} eq "cups" ? - _(" + N(" Printers on remote CUPS servers you do not have to configure here; these printers will be automatically detected.") : ()) }, [ @@ -33,7 +33,7 @@ Printers on remote CUPS servers you do not have to configure here; these printer list => \@printertypes, not_edit => 1, sort => 0, type => 'list' }, - { text => _("Printer auto-detection (Local, TCP/Socket, and SMB printers)"), + { text => N("Printer auto-detection (Local, TCP/Socket, and SMB printers)"), type => 'bool', val => \$autodetect } ] ) or return 0; @@ -81,28 +81,28 @@ sub config_cups { #- information is written in this file. if ($in->ask_from_ - ({ title => ($::expert ? _("CUPS configuration") : - _("Specify CUPS server")), - messages => _("To get access to printers on remote CUPS servers in your local network you do not have to configure anything; the CUPS servers inform your machine automatically about their printers. All printers currently known to your machine are listed in the \"Remote printers\" section in the main window of Printerdrake. When your CUPS server is not in your local network, you have to enter the CUPS server IP address and optionally the port number to get the printer information from the server, otherwise leave these fields blank.") . - ($::expert ? "\n" . _(" + ({ title => ($::expert ? N("CUPS configuration") : + N("Specify CUPS server")), + messages => N("To get access to printers on remote CUPS servers in your local network you do not have to configure anything; the CUPS servers inform your machine automatically about their printers. All printers currently known to your machine are listed in the \"Remote printers\" section in the main window of Printerdrake. When your CUPS server is not in your local network, you have to enter the CUPS server IP address and optionally the port number to get the printer information from the server, otherwise leave these fields blank.") . + ($::expert ? "\n" . N(" Normally, CUPS is automatically configured according to your network environment, so that you can access the printers on the CUPS servers in your local network. If this does not work correctly, turn off \"Automatic CUPS configuration\" and edit your file /etc/cups/cupsd.conf manually. Do not forget to restart CUPS afterwards (command: \"service cups restart\").") : ()), callbacks => { complete => sub { unless (!$server || network::is_ip($server)) { - $in->ask_warn('', _("The IP address should look like 192.168.1.20")); + $in->ask_warn('', N("The IP address should look like 192.168.1.20")); return (1,0); } if ($port !~ /^\d*$/) { - $in->ask_warn('', _("The port number should be an integer!")); + $in->ask_warn('', N("The port number should be an integer!")); return (1,1); } return 0; } } }, [ - { label => _("CUPS server IP"), val => \$server }, - { label => _("Port"), val => \$port }, + { label => N("CUPS server IP"), val => \$server }, + { label => N("Port"), val => \$port }, ($::expert ? - { text => _("Automatic CUPS configuration"), type => 'bool', + { text => N("Automatic CUPS configuration"), type => 'bool', val => \$autoconf } : ()), ] )) { @@ -180,8 +180,8 @@ sub first_time_dialog { return 1 if (printer::get_default_spooler () or $::isInstall); # Wait message - my $w = $in->wait_message(_("Printerdrake"), - _("Checking your system...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Checking your system...")); # Auto-detect local printers my @autodetected = local_detect(); @@ -189,7 +189,7 @@ sub first_time_dialog { my $localprinterspresent; if (@autodetected == ()) { $localprinterspresent = 0; - push (@printerlist, _("There are no printers found which are directly connected to your machine")); + push (@printerlist, N("There are no printers found which are directly connected to your machine")); } else { $localprinterspresent = 1; for my $printer (@autodetected) { @@ -201,30 +201,30 @@ sub first_time_dialog { if (@printerlist != ()) { unshift (@printerlist, ($morethanoneprinters ? - _("The following printers\n\n") : - _("The following printer\n\n"))); + N("The following printers\n\n") : + N("The following printer\n\n"))); if ($unknown_printers == 1) { - push (@printerlist, _("\nand one unknown printer are ")); + push (@printerlist, N("\nand one unknown printer are ")); } elsif ($unknown_printers > 1) { - push (@printerlist, _("\nand %d unknown printers are ", + push (@printerlist, N("\nand %d unknown printers are ", $unknown_printers)); } else { push (@printerlist, ($morethanoneprinters ? - _("\nare ") : - _("\nis "))); + N("\nare ") : + N("\nis "))); } - push (@printerlist, _("directly connected to your system")); + push (@printerlist, N("directly connected to your system")); } else { if ($unknown_printers == 1) { - push (@printerlist, _("\nThere is one unknown printer directly connected to your system")); + push (@printerlist, N("\nThere is one unknown printer directly connected to your system")); } elsif ($unknown_printers > 1) { - push (@printerlist, _("\nThere are %d unknown printers directly connected to your system", + push (@printerlist, N("\nThere are %d unknown printers directly connected to your system", $unknown_printers)); } } } push (@printerlist, - _(" (Make sure that all your printers are connected and turned on).\n")); + N(" (Make sure that all your printers are connected and turned on).\n")); my $localprinters = join('', @printerlist); # Do we have a local network? @@ -238,19 +238,19 @@ sub first_time_dialog { # Finish building the dialog text my $question = ($havelocalnetworks ? ($localprinterspresent ? - _("Do you want to enable printing on the printers mentioned above or on printers in the local network?\n") : - _("Do you want to enable printing on printers in the local network?\n")) : + N("Do you want to enable printing on the printers mentioned above or on printers in the local network?\n") : + N("Do you want to enable printing on printers in the local network?\n")) : ($localprinterspresent ? - _("Do you want to enable printing on the printers mentioned above?\n") : - _("Are you sure that you want to set up printing on this machine?\n"))); - my $warning = _("NOTE: Depending on the printer model and the printing system up to %d MB of additional software will be installed.", 80); + N("Do you want to enable printing on the printers mentioned above?\n") : + N("Are you sure that you want to set up printing on this machine?\n"))); + my $warning = N("NOTE: Depending on the printer model and the printing system up to %d MB of additional software will be installed.", 80); my $dialogtext = "$localprinters\n$question\n$warning"; # Close wait message undef $w; # Show dialog - $in->ask_yesorno(_("Printerdrake"), $dialogtext, 0); + $in->ask_yesorno(N("Printerdrake"), $dialogtext, 0); } sub wizard_welcome { @@ -282,8 +282,8 @@ sub wizard_welcome { if ($::expert) { if ($::isWizard) { $ret = $in->ask_okcancel - (_("Add a new printer"), - _(" + (N("Add a new printer"), + N(" Welcome to the Printer Setup Wizard This wizard allows you to install local or remote printers to be used from this machine and also from other machines in the network. @@ -294,9 +294,9 @@ It asks you for all necessary information to set up the printer and gives you ac } } else { $ret = $in->ask_from_ - ({title => _("Add a new printer"), + ({title => N("Add a new printer"), messages => ($printer->{SPOOLER} ne "pdq" ? - ($havelocalnetworks ? _(" + ($havelocalnetworks ? N(" Welcome to the Printer Setup Wizard This wizard will help you to install your printer(s) connected to this computer, connected directly to the network or to a remote Windows machine. @@ -305,7 +305,7 @@ If you have printer(s) connected to this machine, Please plug it/them in on this Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you don't need it. - Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now.") : _(" + Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now.") : N(" Welcome to the Printer Setup Wizard This wizard will help you to install your printer(s) connected to this computer. @@ -313,7 +313,7 @@ This wizard will help you to install your printer(s) connected to this computer. If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now.")) : - ($havelocalnetworks ? _(" + ($havelocalnetworks ? N(" Welcome to the Printer Setup Wizard This wizard will help you to install your printer(s) connected to this computer or connected directly to the network. @@ -322,7 +322,7 @@ If you have printer(s) connected to this machine, Please plug it/them in on this Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you don't need it. - Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now.") : _(" + Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now.") : N(" Welcome to the Printer Setup Wizard This wizard will help you to install your printer(s) connected to this computer. @@ -331,13 +331,13 @@ If you have printer(s) connected to this machine, Please plug it/them in on this Click on \"Next\" when you are ready, and on \"Cancel\" when you do not want to set up your printer(s) now.")))}, [ - { text => _("Auto-detect printers connected to this machine"), type => 'bool', + { text => N("Auto-detect printers connected to this machine"), type => 'bool', val => \$autodetectlocal}, ($havelocalnetworks ? - ({ text => _("Auto-detect printers connected directly to the local network"), type => 'bool', + ({ text => N("Auto-detect printers connected directly to the local network"), type => 'bool', val => \$autodetectnetwork}, ($printer->{SPOOLER} ne "pdq" ? - { text => _("Auto-detect printers connected to machines running Microsoft Windows"), type => 'bool', + { text => N("Auto-detect printers connected to machines running Microsoft Windows"), type => 'bool', val => \$autodetectsmb } : ())) : ()) ]); if ($autodetectlocal) { @@ -364,8 +364,8 @@ If you have printer(s) connected to this machine, Please plug it/them in on this sub wizard_congratulations { my ($in) = @_; if ($in) { - $in->ask_okcancel(_("Add a new printer"), - _(" + $in->ask_okcancel(N("Add a new printer"), + N(" Congratulations, your printer is now installed and configured! You can print using the \"Print\" command of your application (usually in the \"File\" menu). @@ -402,7 +402,7 @@ sub setup_local_autoscan { (!printer::files_exist((qw(/usr/bin/smbclient))))) { $in->do_pkgs->install('samba-client'); } - my $w = $in->wait_message(_("Printer auto-detection"), _("Detecting devices...")); + my $w = $in->wait_message(N("Printer auto-detection"), N("Detecting devices...")); # When HPOJ is running, it blocks the printer ports on which it is # configured, so we stop it here. If it is not installed or not # configured, this command has no effect. @@ -417,29 +417,29 @@ sub setup_local_autoscan { if ($p->{val}{DESCRIPTION}) { my $menustr = $p->{val}{DESCRIPTION}; if ($p->{port} =~ m!^/dev/lp(\d+)$!) { - $menustr .= _(" on parallel port \#%s", $1); + $menustr .= N(" on parallel port \#%s", $1); } elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) { - $menustr .= _(", USB printer \#%s", $1); + $menustr .= N(", USB printer \#%s", $1); } elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) { - $menustr .= _(", network printer \"%s\", port %s", $1, $2); + $menustr .= N(", network printer \"%s\", port %s", $1, $2); } elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) { - $menustr .= _(", printer \"%s\" on SMB/Windows server \"%s\"", $2, $1); + $menustr .= N(", printer \"%s\" on SMB/Windows server \"%s\"", $2, $1); } if ($::expert) { $menustr .= " ($p->{port})"; } $menuentries->{$menustr} = $p->{port}; - push @str, _("Detected %s", $menustr); + push @str, N("Detected %s", $menustr); } else { my $menustr; if ($p->{port} =~ m!^/dev/lp(\d+)$!) { - $menustr = _("Printer on parallel port \#%s", $1); + $menustr = N("Printer on parallel port \#%s", $1); } elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) { - $menustr = _("USB printer \#%s", $1); + $menustr = N("USB printer \#%s", $1); } elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) { - $menustr .= _("Network printer \"%s\", port %s", $1, $2); + $menustr .= N("Network printer \"%s\", port %s", $1, $2); } elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) { - $menustr .= _("Printer \"%s\" on SMB/Windows server \"%s\"", $2, $1); + $menustr .= N("Printer \"%s\" on SMB/Windows server \"%s\"", $2, $1); } if ($::expert) { $menustr .= " ($p->{port})"; @@ -464,9 +464,9 @@ sub setup_local_autoscan { } my $menustr; if ($q =~ m!^/dev/lp(\d+)$!) { - $menustr = _("Printer on parallel port \#%s", $1); + $menustr = N("Printer on parallel port \#%s", $1); } elsif ($q =~ m!^/dev/usb/lp(\d+)$!) { - $menustr = _("USB printer \#%s", $1); + $menustr = N("USB printer \#%s", $1); } if ($::expert) { $menustr .= " ($q)"; @@ -483,12 +483,12 @@ sub setup_local_autoscan { $printer->{MORETHANONE} = ($#autodetected > 0); my $m; for ($m = 0; $m <= 2; $m++) { - my $menustr = _("Printer on parallel port \#%s", $m); + my $menustr = N("Printer on parallel port \#%s", $m); if ($::expert) { $menustr .= " (/dev/lp$m)"; } $menuentries->{$menustr} = "/dev/lp$m"; - $menustr = _("USB printer \#%s", $m); + $menustr = N("USB printer \#%s", $m); if ($::expert) { $menustr .= " (/dev/usb/lp$m)"; } @@ -575,12 +575,12 @@ sub setup_local_autoscan { $printer->{MANUAL} = 1; if ($::expert) { $device = $in->ask_from_entry - (_("Local Printer"), - _("No local printer found! To manually install a printer enter a device name/file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."), + (N("Local Printer"), + N("No local printer found! To manually install a printer enter a device name/file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."), { complete => sub { unless ($menuchoice ne "") { - $in->ask_warn('', _("You must enter a device or file name!")); + $in->ask_warn('', N("You must enter a device or file name!")); return (1,0); } return 0; @@ -590,8 +590,8 @@ sub setup_local_autoscan { return 0; } } else { - $in->ask_warn(_("Printer auto-detection"), - _("No printer found!")); + $in->ask_warn(N("Printer auto-detection"), + N("No printer found!")); return 0; } } else { @@ -600,26 +600,26 @@ sub setup_local_autoscan { if (!$in->ask_from_ ( { title => ($expert_or_modify ? - _("Local Printer") : - _("Available printers")), + N("Local Printer") : + N("Available printers")), messages => (($do_auto_detect ? ($::expert ? (($#menuentrieslist == 0) ? - _("The following printer was auto-detected, if it is not the one you want to configure, enter a device name/file name in the input line") : - _("Here is a list of all auto-detected printers. Please choose the printer you want to set up or enter a device name/file name in the input line")) : + N("The following printer was auto-detected, if it is not the one you want to configure, enter a device name/file name in the input line") : + N("Here is a list of all auto-detected printers. Please choose the printer you want to set up or enter a device name/file name in the input line")) : (($#menuentrieslist == 0) ? - _("The following printer was auto-detected. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\".") : - _("Here is a list of all auto-detected printers. Please choose the printer you want to set up. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\"."))) : + N("The following printer was auto-detected. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\".") : + N("Here is a list of all auto-detected printers. Please choose the printer you want to set up. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\"."))) : ($::expert ? - _("Please choose the port where your printer is connected to or enter a device name/file name in the input line") : - _("Please choose the port where your printer is connected to."))) . + N("Please choose the port where your printer is connected to or enter a device name/file name in the input line") : + N("Please choose the port where your printer is connected to."))) . ($::expert ? - _(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...).") : + N(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...).") : ())), callbacks => { complete => sub { unless ($menuchoice ne "") { - $in->ask_warn('', _("You must choose/enter a printer/device!")); + $in->ask_warn('', N("You must choose/enter a printer/device!")); return (1,0); } return 0; @@ -639,7 +639,7 @@ sub setup_local_autoscan { not_edit => !$::expert, format => \&translate, sort => 0, allow_empty_list => 1, type => 'list' }, (((!$::expert) && ($do_auto_detect) && ($printer->{NEW})) ? - { text => _("Manual configuration"), type => 'bool', + { text => N("Manual configuration"), type => 'bool', val => \$manualconf } : ()), ] )) { @@ -693,17 +693,17 @@ sub setup_lpd { $remotequeue = "lp"; } - return if !$in->ask_from(_("Remote lpd Printer Options"), -_("To use a remote lpd printer, you need to supply the hostname of the printer server and the printer name on that server."), [ -{ label => _("Remote host name"), val => \$remotehost }, -{ label => _("Remote printer name"), val => \$remotequeue } ], + return if !$in->ask_from(N("Remote lpd Printer Options"), +N("To use a remote lpd printer, you need to supply the hostname of the printer server and the printer name on that server."), [ +{ label => N("Remote host name"), val => \$remotehost }, +{ label => N("Remote printer name"), val => \$remotequeue } ], complete => sub { unless ($remotehost ne "") { - $in->ask_warn('', _("Remote host name missing!")); + $in->ask_warn('', N("Remote host name missing!")); return (1,0); } unless ($remotequeue ne "") { - $in->ask_warn('', _("Remote printer name missing!")); + $in->ask_warn('', N("Remote printer name missing!")); return (1,1); } return 0; @@ -727,7 +727,7 @@ complete => sub { if ((defined($modelinfo)) && ($modelinfo->{MANUFACTURER} ne "") && ($modelinfo->{MODEL} ne "")) { - $in->ask_warn('', _("Detected model: %s %s", + $in->ask_warn('', N("Detected model: %s %s", $modelinfo->{MANUFACTURER}, $modelinfo->{MODEL})); $auto_hpoj = 1; } else { @@ -805,7 +805,7 @@ sub setup_smb { (!printer::files_exist((qw(/usr/bin/smbclient))))) { $in->do_pkgs->install('samba-client'); } - my $w = $in->wait_message(_("Printer auto-detection"), _("Scanning network...")); + my $w = $in->wait_message(N("Printer auto-detection"), N("Scanning network...")); @autodetected = net_smb_detect(); for my $p (@autodetected) { my $menustr; @@ -814,10 +814,10 @@ sub setup_smb { my $share = $2; if ($p->{val}{DESCRIPTION}) { $menustr = $p->{val}{DESCRIPTION}; - $menustr .= _(", printer \"%s\" on server \"%s\"", + $menustr .= N(", printer \"%s\" on server \"%s\"", $share, $server); } else { - $menustr = _("Printer \"%s\" on server \"%s\"", + $menustr = N("Printer \"%s\" on server \"%s\"", $share, $server); } $menuentries->{$menustr} = $p->{port}; @@ -835,10 +835,10 @@ sub setup_smb { my $menustr; if ($printer->{currentqueue}{make}) { $menustr = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}"; - $menustr .= _(", printer \"%s\" on server \"%s\"", + $menustr .= N(", printer \"%s\" on server \"%s\"", $smbshare, $smbserver); } else { - $menustr = _("Printer \"%s\" on server \"%s\"", + $menustr = N("Printer \"%s\" on server \"%s\"", $smbshare, $smbserver); } $menuentries->{$menustr} = "smb://$smbserver/$smbshare"; @@ -858,39 +858,39 @@ sub setup_smb { } return 0 if !$in->ask_from - (_("SMB (Windows 9x/NT) Printer Options"), - _("To print to a SMB printer, you need to provide the SMB host name (Note! It may be different from its TCP/IP hostname!) and possibly the IP address of the print server, as well as the share name for the printer you wish to access and any applicable user name, password, and workgroup information.") . - ($autodetect ? _(" If the desired printer was auto-detected, simply choose it from the list and then add user name, password, and/or workgroup if needed.") : ""), - [{ label => _("SMB server host"), val => \$smbserver }, - { label => _("SMB server IP"), val => \$smbserverip }, - { label => _("Share name"), val => \$smbshare }, - { label => _("User name"), val => \$smbuser }, - { label => _("Password"), val => \$smbpassword, hidden => 1 }, - { label => _("Workgroup"), val => \$workgroup }, + (N("SMB (Windows 9x/NT) Printer Options"), + N("To print to a SMB printer, you need to provide the SMB host name (Note! It may be different from its TCP/IP hostname!) and possibly the IP address of the print server, as well as the share name for the printer you wish to access and any applicable user name, password, and workgroup information.") . + ($autodetect ? N(" If the desired printer was auto-detected, simply choose it from the list and then add user name, password, and/or workgroup if needed.") : ""), + [{ label => N("SMB server host"), val => \$smbserver }, + { label => N("SMB server IP"), val => \$smbserverip }, + { label => N("Share name"), val => \$smbshare }, + { label => N("User name"), val => \$smbuser }, + { label => N("Password"), val => \$smbpassword, hidden => 1 }, + { label => N("Workgroup"), val => \$workgroup }, ($autodetect ? - { label => _("Auto-detected"), + { label => N("Auto-detected"), val => \$menuchoice, list => \@menuentrieslist, not_edit => 1, format => \&translate, sort => 0, allow_empty_list => 1, type => 'combo' } : ()) ], complete => sub { unless ((network::is_ip($smbserverip)) || ($smbserverip eq "")) { - $in->ask_warn('', _("IP address should be in format 1.2.3.4")); + $in->ask_warn('', N("IP address should be in format 1.2.3.4")); return (1,1); } unless (($smbserver ne "") || ($smbserverip ne "")) { - $in->ask_warn('', _("Either the server name or the server's IP must be given!")); + $in->ask_warn('', N("Either the server name or the server's IP must be given!")); return (1,0); } unless ($smbshare ne "") { - $in->ask_warn('', _("Samba share name missing!")); + $in->ask_warn('', N("Samba share name missing!")); return (1,2); } unless ($smbpassword eq "") { local $::isWizard = 0; my $yes = $in->ask_yesorno - (_("SECURITY WARNING!"), - _("You are about to set up printing to a Windows account with password. Due to a fault in the architecture of the Samba client software the password is put in clear text into the command line of the Samba client used to transmit the print job to the Windows server. So it is possible for every user on this machine to display the password on the screen by issuing commands as \"ps auxwww\". + (N("SECURITY WARNING!"), + N("You are about to set up printing to a Windows account with password. Due to a fault in the architecture of the Samba client software the password is put in clear text into the command line of the Samba client used to transmit the print job to the Windows server. So it is possible for every user on this machine to display the password on the screen by issuing commands as \"ps auxwww\". We recommend to make use of one of the following alternatives (in all cases you have to make sure that only machines from your local network have access to your Windows server, for example by means of a firewall): @@ -898,12 +898,12 @@ Use a password-less account on your Windows server, as the \"GUEST\" account or Set up your Windows server to make the printer available under the LPD protocol. Then set up printing from this machine with the \"%s\" connection type in Printerdrake. -", _("Printer on remote lpd server")) . +", N("Printer on remote lpd server")) . ($::expert ? - _("Set up your Windows server to make the printer available under the IPP protocol and set up printing from this machine with the \"%s\" connection type in Printerdrake. + N("Set up your Windows server to make the printer available under the IPP protocol and set up printing from this machine with the \"%s\" connection type in Printerdrake. -", _("Enter a printer device URI")) : "") . -_("Connect your printer to a Linux server and let your Windows machine(s) connect to it as a client. +", N("Enter a printer device URI")) : "") . +N("Connect your printer to a Linux server and let your Windows machine(s) connect to it as a client. Do you really want to continue setting up this printer as you are doing now?"), 0); return 0 if $yes; @@ -975,19 +975,19 @@ sub setup_ncp { } } - return 0 if !$in->ask_from(_("NetWare Printer Options"), -_("To print on a NetWare printer, you need to provide the NetWare print server name (Note! it may be different from its TCP/IP hostname!) as well as the print queue name for the printer you wish to access and any applicable user name and password."), [ -{ label => _("Printer Server"), val => \$ncpserver }, -{ label => _("Print Queue Name"), val => \$ncpqueue }, -{ label => _("User name"), val => \$ncpuser }, -{ label => _("Password"), val => \$ncppassword, hidden => 1 } ], + return 0 if !$in->ask_from(N("NetWare Printer Options"), +N("To print on a NetWare printer, you need to provide the NetWare print server name (Note! it may be different from its TCP/IP hostname!) as well as the print queue name for the printer you wish to access and any applicable user name and password."), [ +{ label => N("Printer Server"), val => \$ncpserver }, +{ label => N("Print Queue Name"), val => \$ncpqueue }, +{ label => N("User name"), val => \$ncpuser }, +{ label => N("Password"), val => \$ncppassword, hidden => 1 } ], complete => sub { unless ($ncpserver ne "") { - $in->ask_warn('', _("NCP server name missing!")); + $in->ask_warn('', N("NCP server name missing!")); return (1,0); } unless ($ncpqueue ne "") { - $in->ask_warn('', _("NCP queue name missing!")); + $in->ask_warn('', N("NCP queue name missing!")); return (1,1); } return 0; @@ -1045,7 +1045,7 @@ sub setup_socket { my $oldmenuchoice = ""; if ($printer->{AUTODETECT}) { $autodetect = 1; - my $w = $in->wait_message(_("Printer auto-detection"), _("Scanning network...")); + my $w = $in->wait_message(N("Printer auto-detection"), N("Scanning network...")); @autodetected = net_detect(); for my $p (@autodetected) { my $menustr; @@ -1054,10 +1054,10 @@ sub setup_socket { my $port = $2; if ($p->{val}{DESCRIPTION}) { $menustr = $p->{val}{DESCRIPTION}; - $menustr .= _(", host \"%s\", port %s", + $menustr .= N(", host \"%s\", port %s", $host, $port); } else { - $menustr = _("Host \"%s\", port %s", $host, $port); + $menustr = N("Host \"%s\", port %s", $host, $port); } $menuentries->{$menustr} = $p->{port}; if (($host eq $remotehost) && @@ -1074,10 +1074,10 @@ sub setup_socket { my $menustr; if ($printer->{currentqueue}{make}) { $menustr = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}"; - $menustr .= _(", host \"%s\", port %s", + $menustr .= N(", host \"%s\", port %s", $remotehost, $remoteport); } else { - $menustr = _("Host \"%s\", port %s", + $menustr = N("Host \"%s\", port %s", $remotehost, $remoteport); } $menuentries->{$menustr} = "socket://$remotehost:$remoteport"; @@ -1097,19 +1097,19 @@ sub setup_socket { return 0 if !$in->ask_from_ ({ - title => _("TCP/Socket Printer Options"), + title => N("TCP/Socket Printer Options"), messages => ($autodetect ? - _("Choose one of the auto-detected printers from the list or enter the hostname or IP and the optional port number (default is 9100) into the input fields.") : - _("To print to a TCP or socket printer, you need to provide the host name or IP of the printer and optionally the port number (default is 9100). On HP JetDirect servers the port number is usually 9100, on other servers it can vary. See the manual of your hardware.")), + N("Choose one of the auto-detected printers from the list or enter the hostname or IP and the optional port number (default is 9100) into the input fields.") : + N("To print to a TCP or socket printer, you need to provide the host name or IP of the printer and optionally the port number (default is 9100). On HP JetDirect servers the port number is usually 9100, on other servers it can vary. See the manual of your hardware.")), callbacks => { complete => sub { unless ($remotehost ne "") { $in->ask_warn - ('', _("Printer host name or IP missing!")); + ('', N("Printer host name or IP missing!")); return (1,0); } unless ($remoteport =~ /^[0-9]+$/) { - $in->ask_warn('', _("The port number should be an integer!")); + $in->ask_warn('', N("The port number should be an integer!")); return (1,1); } return 0; @@ -1127,9 +1127,9 @@ sub setup_socket { } }, [ - { label => ($autodetect ? "" : _("Printer host name or IP")), + { label => ($autodetect ? "" : N("Printer host name or IP")), val => \$remotehost }, - { label => ($autodetect ? "" : _("Port")), val => \$remoteport }, + { label => ($autodetect ? "" : N("Port")), val => \$remoteport }, ($autodetect ? { val => \$menuchoice, list => \@menuentrieslist, not_edit => 0, format => \&translate, sort => 0, @@ -1177,9 +1177,9 @@ sub setup_uri { my ($printer, $in, $upNetwork) = @_; $in->set_help('setupURI') if $::isInstall; - return if !$in->ask_from(_("Printer Device URI"), -_("You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Note that not all URI types are supported by all the spoolers."), [ -{ label => _("Printer Device URI"), + return if !$in->ask_from(N("Printer Device URI"), +N("You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Note that not all URI types are supported by all the spoolers."), [ +{ label => N("Printer Device URI"), val => \$printer->{currentqueue}{connect}, list => [ $printer->{currentqueue}{connect}, "file:/", @@ -1193,7 +1193,7 @@ list => [ $printer->{currentqueue}{connect}, ], not_edit => 0 }, ], complete => sub { unless ($printer->{currentqueue}{connect} =~ /[^:]+:.+/) { - $in->ask_warn('', _("A valid URI must be entered!")); + $in->ask_warn('', N("A valid URI must be entered!")); return (1,0); } return 0; @@ -1244,7 +1244,7 @@ complete => sub { if ((defined($modelinfo)) && ($modelinfo->{MANUFACTURER} ne "") && ($modelinfo->{MODEL} ne "")) { - $in->ask_warn('', _("Detected model: %s %s", + $in->ask_warn('', N("Detected model: %s %s", $modelinfo->{MANUFACTURER}, $modelinfo->{MODEL})); $auto_hpoj = 1; @@ -1280,13 +1280,13 @@ sub setup_postpipe { $commandline = ""; } - return if !$in->ask_from(_("Pipe into command"), -_("Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer."), [ -{ label => _("Command line"), + return if !$in->ask_from(N("Pipe into command"), +N("Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer."), [ +{ label => N("Command line"), val => \$commandline }, ], complete => sub { unless ($commandline ne "") { - $in->ask_warn('', _("A command line must be entered!")); + $in->ask_warn('', N("A command line must be entered!")); return (1,0); } return 0; @@ -1312,13 +1312,13 @@ sub setup_common { if (($device =~ /^\/dev\//) || ($device =~ /^socket:\/\//)) { # Ask user whether he has a multi-function device when he didn't # do auto-detection or when auto-detection failed - my $searchunknown = _("Unknown model"); + my $searchunknown = N("Unknown model"); if ((!$do_auto_detect) || ($makemodel =~ /$searchunknown/i) || ($makemodel =~ /^\s*$/)) { local $::isWizard = 0; - $isHPOJ = $in->ask_yesorno(_("Add a new printer"), - _("Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"), 0); + $isHPOJ = $in->ask_yesorno(N("Add a new printer"), + N("Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"), 0); } if (($makemodel =~ /HP\s+(OfficeJet|PSC|PhotoSmart|LaserJet\s+(1200|1220|2200|3200|33.0))/i) || ($makemodel =~ /Sony\s+IJP[\s\-]+V[\s\-]+100/i) || @@ -1328,14 +1328,14 @@ sub setup_common { (!printer::files_exist((qw(/usr/sbin/ptal-mlcd /usr/sbin/ptal-init /usr/bin/xojpanel))))) { - my $w = $in->wait_message(_("Printerdrake"), - _("Installing HPOJ package...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Installing HPOJ package...")); $in->do_pkgs->install('hpoj', 'xojpanel'); } # Configure and start HPOJ my $w = $in->wait_message - (_("Printerdrake"), - _("Checking device and configuring HPOJ...")); + (N("Printerdrake"), + N("Checking device and configuring HPOJ...")); $ptaldevice = printer::configure_hpoj($device, @autodetected); if ($ptaldevice) { @@ -1354,8 +1354,8 @@ sub setup_common { '/usr/bin/xsane-gimp' : ()))))) { my $w = $in->wait_message - (_("Printerdrake"), - _("Installing SANE packages...")); + (N("Printerdrake"), + N("Installing SANE packages...")); $in->do_pkgs->install('sane-backends', 'sane-frontends', 'xsane', 'libsane-hpoj0', @@ -1378,8 +1378,8 @@ sub setup_common { /usr/bin/MToolsFM )))) { my $w = $in->wait_message - (_("Printerdrake"), - _("Installing mtools packages...")); + (N("Printerdrake"), + N("Installing mtools packages...")); $in->do_pkgs->install('mtools', 'mtoolsfm'); } # Configure mtools/MToolsFM for photo card access @@ -1391,14 +1391,14 @@ sub setup_common { $text = scanner_help($makemodel, "ptal:/$ptaldevice"); if ($text) { $in->ask_warn - (_("Scanning on your HP multi-function device"), + (N("Scanning on your HP multi-function device"), $text); } # Inform user about how to access photo cards with his MF # device $text = photocard_help($makemodel, "ptal:/$ptaldevice"); if ($text) { - $in->ask_warn(_("Photo memory card access on your HP multi-function device"), + $in->ask_warn(N("Photo memory card access on your HP multi-function device"), $text); } # make the DeviceURI from $ptaldevice. @@ -1428,20 +1428,14 @@ sub setup_common { ($device !~ /^socket:/) && ($device !~ /^http:/) && ($device !~ /^ipp:/)) { - my $w = $in->wait_message - ('_("Printerdrake")', - _("Making printer port available for CUPS...")); - if ($ptaldevice eq "") { - printer::assure_device_is_available_for_cups($device); - } else { - printer::assure_device_is_available_for_cups($ptaldevice); - } + my $w = $in->wait_message(N("Printerdrake"), N("Making printer port available for CUPS...")); + printer::assure_device_is_available_for_cups($ptaldevice || $device); } #- Read the printer driver database if necessary if ((keys %printer::thedb) == 0) { - my $w = $in->wait_message(_("Printerdrake"), - _("Reading printer database...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Reading printer database...")); printer::read_printer_db($printer->{SPOOLER}); } @@ -1533,17 +1527,17 @@ sub choose_printer_name { my $default = $printer->{currentqueue}{queue}; $in->ask_from_ ( - { title => _("Enter Printer Name and Comments"), - #cancel => !$printer->{configured}{$queue} ? '' : _("Remove queue"), + { title => N("Enter Printer Name and Comments"), + #cancel => !$printer->{configured}{$queue} ? '' : N("Remove queue"), callbacks => { complete => sub { unless ($printer->{currentqueue}{queue} =~ /^\w+$/) { - $in->ask_warn('', _("Name of printer should contain only letters, numbers and the underscore")); + $in->ask_warn('', N("Name of printer should contain only letters, numbers and the underscore")); return (1,0); } local $::isWizard = 0; if (($printer->{configured}{$printer->{currentqueue}{queue}}) && ($printer->{currentqueue}{queue} ne $default) && - (!$in->ask_yesorno('', _("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?", + (!$in->ask_yesorno('', N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?", $printer->{currentqueue}{queue}), 0))) { return (1,0); # Let the user correct the name @@ -1552,10 +1546,10 @@ sub choose_printer_name { }, }, messages => -_("Every printer needs a name (for example \"printer\"). The Description and Location fields do not need to be filled in. They are comments for the users.") }, - [ { label => _("Name of printer"), val => \$printer->{currentqueue}{queue} }, - { label => _("Description"), val => \$printer->{currentqueue}{desc} }, - { label => _("Location"), val => \$printer->{currentqueue}{loc} }, +N("Every printer needs a name (for example \"printer\"). The Description and Location fields do not need to be filled in. They are comments for the users.") }, + [ { label => N("Name of printer"), val => \$printer->{currentqueue}{queue} }, + { label => N("Description"), val => \$printer->{currentqueue}{desc} }, + { label => N("Location"), val => \$printer->{currentqueue}{loc} }, ]) or return 0; $printer->{QUEUE} = $printer->{currentqueue}{queue}; @@ -1566,12 +1560,12 @@ sub get_db_entry { my ($printer, $in) = @_; #- Read the printer driver database if necessary if ((keys %printer::thedb) == 0) { - my $w = $in->wait_message(_("Printerdrake"), - _("Reading printer database...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Reading printer database...")); printer::read_printer_db($printer->{SPOOLER}); } - my $w = $in->wait_message(_("Printerdrake"), - _("Preparing printer database...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Preparing printer database...")); my $queue = $printer->{OLD_QUEUE}; if ($printer->{configured}{$queue}) { # The queue was already configured @@ -1668,18 +1662,18 @@ sub is_model_correct { } $dbentry =~ s/\|/ /g; my $res = $in->ask_from_list_ - (_("Your printer model"), - _("Printerdrake has compared the model name resulting from the printer auto-detection with the models listed in its printer database to find the best match. This choice can be wrong, especially when your printer is not listed at all in the database. So check whether the choice is correct and click \"The model is correct\" if so and if not, click \"Select model manually\" so that you can choose your printer model manually on the next screen. + (N("Your printer model"), + N("Printerdrake has compared the model name resulting from the printer auto-detection with the models listed in its printer database to find the best match. This choice can be wrong, especially when your printer is not listed at all in the database. So check whether the choice is correct and click \"The model is correct\" if so and if not, click \"Select model manually\" so that you can choose your printer model manually on the next screen. For your printer Printerdrake has found: %s", $dbentry), - [_("The model is correct"), - _("Select model manually")], - ($printer->{MANUALMODEL} ? _("Select model manually") : - _("The model is correct"))); + [N("The model is correct"), + N("Select model manually")], + ($printer->{MANUALMODEL} ? N("Select model manually") : + N("The model is correct"))); return 0 if !$res; - $printer->{MANUALMODEL} = ($res eq _("Select model manually")); + $printer->{MANUALMODEL} = ($res eq N("Select model manually")); 1; } @@ -1688,20 +1682,20 @@ sub choose_model { $in->set_help('chooseModel') if $::isInstall; #- Read the printer driver database if necessary if ((keys %printer::thedb) == 0) { - my $w = $in->wait_message(_("Printerdrake"), - _("Reading printer database...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Reading printer database...")); printer::read_printer_db($printer->{SPOOLER}); } if (!member($printer->{DBENTRY}, keys(%printer::thedb))) { - $printer->{DBENTRY} = _("Raw printer (No driver)"); + $printer->{DBENTRY} = N("Raw printer (No driver)"); } # Choose the printer/driver from the list - return ($printer->{DBENTRY} = $in->ask_from_treelist(_("Printer model selection"), - _("Which printer model do you have?") . - _(" + return ($printer->{DBENTRY} = $in->ask_from_treelist(N("Printer model selection"), + N("Which printer model do you have?") . + N(" Please check whether Printerdrake did the auto-detection of your printer model correctly. Search the correct model in the list when the cursor is standing on a wrong model or on \"Raw printer\".") . " " . -_("If your printer is not listed, choose a compatible (see printer manual) or a similar one."), '|', +N("If your printer is not listed, choose a compatible (see printer manual) or a similar one."), '|', [ keys %printer::thedb ], $printer->{DBENTRY})); } @@ -1710,8 +1704,8 @@ sub get_printer_info { my ($printer, $in) = @_; #- Read the printer driver database if necessary #if ((keys %printer::thedb) == 0) { - # my $w = $in->wait_message(_("Printerdrake"), - # _("Reading printer database...")); + # my $w = $in->wait_message(N("Printerdrake"), + # N("Reading printer database...")); # printer::read_printer_db($printer->{SPOOLER}); #} my $queue = $printer->{OLD_QUEUE}; @@ -1778,8 +1772,8 @@ sub get_printer_info { if ($printer->{currentqueue}{driver} eq 'oki4w') { if ($printer->{currentqueue}{connect} ne 'file:/dev/lp0') { - $in->ask_warn(_("OKI winprinter configuration"), - _("You are configuring an OKI laser winprinter. These printers\nuse a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver.")); + $in->ask_warn(N("OKI winprinter configuration"), + N("You are configuring an OKI laser winprinter. These printers\nuse a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver.")); } $printer->{currentqueue}{connect} = 'file:/dev/null'; # Start the oki4daemon @@ -1822,8 +1816,8 @@ sub get_printer_info { $printer->{SPECIAL_OPTIONS} .= " -o Port=USB3"; } else { - $in->ask_warn(_("Lexmark inkjet configuration"), - _("The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to.")); + $in->ask_warn(N("Lexmark inkjet configuration"), + N("The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to.")); return 0; } # Set device permissions @@ -1849,12 +1843,12 @@ sub get_printer_info { if (!printer::files_exist("/usr/local/lexmark/$drivertype/$drivertype")) { # Driver installation failed, probably we do not have # the commercial CDs - $in->ask_warn(_("Lexmark inkjet configuration"), - _("To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program.")); + $in->ask_warn(N("Lexmark inkjet configuration"), + N("To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program.")); } } elsif ($printer->{currentqueue}{driver} eq 'pbmtozjs') { - $in->ask_warn(_("GDI Laser Printer using the Zenographics ZJ-Stream Format"), - _("Your printer belongs to the group of GDI laser printers (winprinters) sold by different manufacturers which uses the Zenographics ZJ-stream raster format for the data sent to the printer. The driver for these printers is still in a very early development stage and so it will perhaps not always work properly. Especially it is possible that the printer only works when you choose the A4 paper size. + $in->ask_warn(N("GDI Laser Printer using the Zenographics ZJ-Stream Format"), + N("Your printer belongs to the group of GDI laser printers (winprinters) sold by different manufacturers which uses the Zenographics ZJ-stream raster format for the data sent to the printer. The driver for these printers is still in a very early development stage and so it will perhaps not always work properly. Especially it is possible that the printer only works when you choose the A4 paper size. Some of these printers, as the HP LaserJet 1000, for which this driver was originally created, need their firmware to be uploaded to them after they are turned on. In the case of the HP LaserJet 1000 you have to search the printer's Windows driver CD or your Windows partition for the file \"sihp1000.img\" and upload the file to the printer with one of the following commands: @@ -2077,7 +2071,7 @@ sub setup_options { if ((!$printer->{NEW}) or ($::expert) or ($printer->{MANUAL})) { return 0 if !$in->ask_from ($windowtitle, - _("Printer default settings + N("Printer default settings You should make sure that the page size and the ink type/printing mode (if available) and also the hardware configuration of laser printers (memory, duplex unit, extra trays) are set correctly. Note that with a very high printout quality/resolution printing can get substantially slower."), \@widgets, @@ -2086,16 +2080,16 @@ You should make sure that the page size and the ink type/printing mode (if avail for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) { if (($printer->{ARGS}[$i]{type} eq 'int') || ($printer->{ARGS}[$i]{type} eq 'float')) { unless (($printer->{ARGS}[$i]{type} ne 'int') || ($userinputs[$i] =~ /^[\-\+]?[0-9]+$/)) { - $in->ask_warn('', _("Option %s must be an integer number!", $printer->{ARGS}[$i]{comment})); + $in->ask_warn('', N("Option %s must be an integer number!", $printer->{ARGS}[$i]{comment})); return (1, $i); } unless (($printer->{ARGS}[$i]{type} ne 'float') || ($userinputs[$i] =~ /^[\-\+]?[0-9\.]+$/)) { - $in->ask_warn('', _("Option %s must be a number!", $printer->{ARGS}[$i]{comment})); + $in->ask_warn('', N("Option %s must be a number!", $printer->{ARGS}[$i]{comment})); return (1, $i); } unless (($userinputs[$i] >= $printer->{ARGS}[$i]{min}) && ($userinputs[$i] <= $printer->{ARGS}[$i]{max})) { - $in->ask_warn('', _("Option %s out of range!", $printer->{ARGS}[$i]{comment})); + $in->ask_warn('', N("Option %s out of range!", $printer->{ARGS}[$i]{comment})); return (1, $i); } } @@ -2134,7 +2128,7 @@ sub setasdefault { $in->set_help('setupAsDefault') if $::isInstall; if (($printer->{DEFAULT} eq '') || # We have no default printer, # so set the current one as default - ($in->ask_yesorno('', _("Do you want to set this printer (\"%s\")\nas the default printer?", $printer->{QUEUE}), 0))) { # Ask the user + ($in->ask_yesorno('', N("Do you want to set this printer (\"%s\")\nas the default printer?", $printer->{QUEUE}), 0))) { # Ask the user $printer->{DEFAULT} = $printer->{QUEUE}; printer::set_default_printer($printer); } @@ -2157,13 +2151,13 @@ sub print_testpages { my $oldascii = 0; my $oldres2 = 0; my $res1 = $in->ask_from_ - ({ title => _("Test pages"), - messages => _("Please select the test pages you want to print. + ({ title => N("Test pages"), + messages => N("Please select the test pages you want to print. Note: the photo test page can take a rather long time to get printed and on laser printers with too low memory it can even not come out. In most cases it is enough to print the standard test page."), cancel => ((!$printer->{NEW}) ? - _("Cancel") : ($::isWizard ? _("<- Previous") : - _("No test pages"))), - ok => ($::isWizard ? _("Next ->") : _("Print")), + N("Cancel") : ($::isWizard ? N("<- Previous") : + N("No test pages"))), + ok => ($::isWizard ? N("Next ->") : N("Print")), callbacks => { changed => sub { if ($oldres2 ne $res2) { @@ -2220,19 +2214,19 @@ Note: the photo test page can take a rather long time to get printed and on lase } }}, [ - { text => _("Standard test page"), type => 'bool', + { text => N("Standard test page"), type => 'bool', val => \$standard }, ($::expert ? - { text => _("Alternative test page (Letter)"), type => 'bool', + { text => N("Alternative test page (Letter)"), type => 'bool', val => \$altletter } : ()), ($::expert ? - { text => _("Alternative test page (A4)"), type => 'bool', + { text => N("Alternative test page (A4)"), type => 'bool', val => \$alta4 } : ()), - { text => _("Photo test page"), type => 'bool', val => \$photo }, - #{ text => _("Plain text test page"), type => 'bool', + { text => N("Photo test page"), type => 'bool', val => \$photo }, + #{ text => N("Plain text test page"), type => 'bool', # val => \$ascii } ($::isWizard ? - { text => _("Do not print any test page"), type => 'bool', + { text => N("Do not print any test page"), type => 'bool', val => \$res2 } : ()) ]); $res2 = 1 if (!($standard || $altletter || $alta4 || $photo || @@ -2240,8 +2234,8 @@ Note: the photo test page can take a rather long time to get printed and on lase if ($res1 && !$res2) { my @lpq_output; { - my $w = $in->wait_message(_("Printerdrake"), - _("Printing test page(s)...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Printing test page(s)...")); $upNetwork and do { &$upNetwork(); undef $upNetwork; sleep(1) }; my $stdtestpage = "/usr/share/printer-testpages/testprint.ps"; @@ -2266,18 +2260,18 @@ Note: the photo test page can take a rather long time to get printed and on lase } my $dialogtext; if (@lpq_output) { - $dialogtext = _("Test page(s) have been sent to the printer. + $dialogtext = N("Test page(s) have been sent to the printer. It may take some time before the printer starts. Printing status:\n%s\n\n", @lpq_output); } else { - $dialogtext = _("Test page(s) have been sent to the printer. + $dialogtext = N("Test page(s) have been sent to the printer. It may take some time before the printer starts.\n"); } if ($printer->{NEW} == 0) { $in->ask_warn('',$dialogtext); return 1; } else { - $in->ask_yesorno('',$dialogtext . _("Did it work properly?"), 1) + $in->ask_yesorno('',$dialogtext . N("Did it work properly?"), 1) and return 1; } } else { @@ -2297,9 +2291,9 @@ sub printer_help { my $photocard = ""; if ($printer->{configured}{$queue}) { if (($printer->{configured}{$queue}{queuedata}{model} eq - _("Unknown model")) || + N("Unknown model")) || ($printer->{configured}{$queue}{queuedata}{model} eq - _("Raw printer"))) { + N("Raw printer"))) { $raw = 1; } # Information about scanning with HP's multi-function devices @@ -2325,76 +2319,76 @@ sub printer_help { my $dialogtext; if ($spooler eq "cups") { $dialogtext = -_("To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily. +N("To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily. ", ($queue ne $default ? "lpr -P $queue" : "lpr")) . -_("These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application. +N("These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application. ") . (!$raw ? -_(" +N(" The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) . (!$cupsremote ? - _("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s + N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s ", $scanning, $photocard) . printer::help_output($printer, 'lpd') : $scanning . $photocard . - _("Here is a list of the available printing options for the current printer: + N("Here is a list of the available printing options for the current printer: ") . printer::help_output($printer, 'lpd')) : $scanning . $photocard); } elsif ($spooler eq "lprng") { $dialogtext = -_("To print a file from the command line (terminal window) use the command \"%s <file>\". +N("To print a file from the command line (terminal window) use the command \"%s <file>\". ", ($queue ne $default ? "lpr -P $queue" : "lpr")) . -_("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application. +N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application. ") . (!$raw ? -_(" +N(" The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -Z option=setting -Z switch" : "lpr -Z option=setting -Z switch")) . -_("To get a list of the options available for the current printer click on the \"Print option list\" button." . $scanning . $photocard) : $scanning . $photocard); +N("To get a list of the options available for the current printer click on the \"Print option list\" button." . $scanning . $photocard) : $scanning . $photocard); } elsif ($spooler eq "lpd") { $dialogtext = -_("To print a file from the command line (terminal window) use the command \"%s <file>\". +N("To print a file from the command line (terminal window) use the command \"%s <file>\". ", ($queue ne $default ? "lpr -P $queue" : "lpr")) . -_("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application. +N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application. ") . (!$raw ? -_(" +N(" The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) . -_("To get a list of the options available for the current printer click on the \"Print option list\" button." . $scanning . $photocard) : $scanning . $photocard); +N("To get a list of the options available for the current printer click on the \"Print option list\" button." . $scanning . $photocard) : $scanning . $photocard); } elsif ($spooler eq "pdq") { $dialogtext = -_("To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\". +N("To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\". ", ($queue ne $default ? "pdq -P $queue" : "pdq"), ($queue ne $default ? "lpr -P $queue" : "lpr")) . -_("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application. +N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application. ") . -_("You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs. +N("You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs. If you are using KDE as desktop environment you have a \"panic button\", an icon on the desktop, labeled with \"STOP Printer!\", which stops all print jobs immediately when you click it. This is for example useful for paper jams. ") . (!$raw ? -_(" +N(" The \"%s\" and \"%s\" commands also allow to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "pdq", "lpr", ($queue ne $default ? "pdq -P $queue -aoption=setting -oswitch" : "pdq -aoption=setting -oswitch")) . -_("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s +N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s ", $scanning, $photocard) . printer::help_output($printer, 'pdq') : $scanning . $photocard); } my $windowtitle = ($scanning ? ($photocard ? - _("Printing/Scanning/Photo Cards on \"%s\"", $queue) : - _("Printing/Scanning on \"%s\"", $queue)) : + N("Printing/Scanning/Photo Cards on \"%s\"", $queue) : + N("Printing/Scanning on \"%s\"", $queue)) : ($photocard ? - _("Printing/Photo Card Access on \"%s\"", $queue) : - _("Printing on the printer \"%s\"", $queue))); + N("Printing/Photo Card Access on \"%s\"", $queue) : + N("Printing on the printer \"%s\"", $queue))); if (!$raw && !$cupsremote) { my $choice; - while ($choice ne _("Close")) { + while ($choice ne N("Close")) { $choice = $in->ask_from_list_ ($windowtitle, $dialogtext, - [ _("Print option list"), _("Close") ], - _("Close")); - if ($choice ne _("Close")) { - my $w = $in->wait_message(_("Printerdrake"), - _("Printing test page(s)...")); + [ N("Print option list"), N("Close") ], + N("Close")); + if ($choice ne N("Close")) { + my $w = $in->wait_message(N("Printerdrake"), + N("Printing test page(s)...")); printer::print_optionlist($printer); } } @@ -2410,7 +2404,7 @@ sub scanner_help { if (($makemodel !~ /HP\s+PhotoSmart/i) && ($makemodel !~ /HP\s+LaserJet\s+2200/i)) { # Models with built-in scanner - return _("Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information. + return N("Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information. Do not use \"scannerdrake\" for this device!", $ptaldevice); @@ -2431,7 +2425,7 @@ sub photocard_help { ($makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i)) && ($makemodel !~ /HP\s+PhotoSmart\s+7150/i)) { # Models with built-in photo card drives - return _("Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists.", + return N("Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists.", $ptaldevice); } else { # Photo-card-drive-less models @@ -2452,8 +2446,8 @@ sub copy_queues_from { my $oldspoolerstr; my $noninteractive = 0; { - my $w = $in->wait_message(_("Printerdrake"), - _("Reading printer data...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Reading printer data...")); @oldqueues = printer::get_copiable_queues($oldspooler, $newspooler); @oldqueues = sort(@oldqueues); $newspoolerstr = $printer::shortspooler_inv{$newspooler}; @@ -2473,23 +2467,23 @@ sub copy_queues_from { } if ($noninteractive || $in->ask_from_ - ({ title => _("Transfer printer configuration"), - messages => _("You can copy the printer configuration which you have done for the spooler %s to %s, your current spooler. All the configuration data (printer name, description, location, connection type, and default option settings) is overtaken, but jobs will not be transferred. + ({ title => N("Transfer printer configuration"), + messages => N("You can copy the printer configuration which you have done for the spooler %s to %s, your current spooler. All the configuration data (printer name, description, location, connection type, and default option settings) is overtaken, but jobs will not be transferred. Not all queues can be transferred due to the following reasons: ", $oldspoolerstr, $newspoolerstr) . -($newspooler eq "cups" ? _("CUPS does not support printers on Novell servers or printers sending the data into a free-formed command. +($newspooler eq "cups" ? N("CUPS does not support printers on Novell servers or printers sending the data into a free-formed command. ") : - ($newspooler eq "pdq" ? _("PDQ only supports local printers, remote LPD printers, and Socket/TCP printers. + ($newspooler eq "pdq" ? N("PDQ only supports local printers, remote LPD printers, and Socket/TCP printers. ") : - _("LPD and LPRng do not support IPP printers. + N("LPD and LPRng do not support IPP printers. "))) . -_("In addition, queues not created with this program or \"foomatic-configure\" cannot be transferred.") . -($oldspooler eq "cups" ? _(" -Also printers configured with the PPD files provided by their manufacturers or with native CUPS drivers cannot be transferred.") : ()) . _(" +N("In addition, queues not created with this program or \"foomatic-configure\" cannot be transferred.") . +($oldspooler eq "cups" ? N(" +Also printers configured with the PPD files provided by their manufacturers or with native CUPS drivers cannot be transferred.") : ()) . N(" Mark the printers which you want to transfer and click \"Transfer\"."), - cancel => _("Do not transfer printers"), - ok => _("Transfer") + cancel => N("Do not transfer printers"), + ok => N("Transfer") }, \@queueentries )) { @@ -2501,21 +2495,21 @@ Mark the printers which you want to transfer and click if ((!$printer->{configured}{$newqueue}) || ($noninteractive) || ($in->ask_from_ - ({ title => _("Transfer printer configuration"), - messages => _("A printer named \"%s\" already exists under %s. + ({ title => N("Transfer printer configuration"), + messages => N("A printer named \"%s\" already exists under %s. Click \"Transfer\" to overwrite it. You can also type a new name or skip this printer.", $newqueue, $newspoolerstr), - ok => _("Transfer"), - cancel => _("Skip"), + ok => N("Transfer"), + cancel => N("Skip"), callbacks => { complete => sub { unless ($newqueue =~ /^\w+$/) { - $in->ask_warn('', _("Name of printer should contain only letters, numbers and the underscore")); + $in->ask_warn('', N("Name of printer should contain only letters, numbers and the underscore")); return (1,0); } if (($printer->{configured}{$newqueue}) && ($newqueue ne $oldqueue) && - (!$in->ask_yesorno('', _("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?", + (!$in->ask_yesorno('', N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?", $newqueue), 0))) { return (1,0); # Let the user correct the name @@ -2523,10 +2517,10 @@ You can also type a new name or skip this printer.", return 0; }} }, - [{label => _("New printer name"),val => \$newqueue}]))) { + [{label => N("New printer name"),val => \$newqueue}]))) { { - my $w = $in->wait_message(_("Printerdrake"), - _("Transferring %s...", $oldqueue)); + my $w = $in->wait_message(N("Printerdrake"), + N("Transferring %s...", $oldqueue)); printer::copy_foomatic_queue($printer, $oldqueue, $oldspooler, $newqueue) and $queuecopied = 1; @@ -2536,8 +2530,8 @@ You can also type a new name or skip this printer.", # printer if the user does not reject if (($noninteractive) || ($in->ask_yesorno - (_("Transfer printer configuration"), - _("You have transferred your former default printer (\"%s\"), Should it be also the default printer under the new printing system %s?", $oldqueue, $newspoolerstr), 1))) { + (N("Transfer printer configuration"), + N("You have transferred your former default printer (\"%s\"), Should it be also the default printer under the new printing system %s?", $oldqueue, $newspoolerstr), 1))) { $printer->{DEFAULT} = $newqueue; printer::set_default_printer($printer); } @@ -2546,8 +2540,8 @@ You can also type a new name or skip this printer.", } } if ($queuecopied) { - my $w = $in->wait_message(_("Printerdrake"), - _("Refreshing printer data...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Refreshing printer data...")); printer::read_configured_queues($printer); } } @@ -2555,8 +2549,8 @@ You can also type a new name or skip this printer.", sub start_network { my ($in, $upNetwork) = @_; - my $w = $in->wait_message(_("Configuration of a remote printer"), - _("Starting network...")); + my $w = $in->wait_message(N("Configuration of a remote printer"), + N("Starting network...")); if ($::isInstall) { return ($upNetwork and do { my $ret = &$upNetwork(); @@ -2591,13 +2585,13 @@ sub check_network { (!$dontconfigure)) { my $go_on = 0; while (!$go_on) { - my $choice = _("Configure the network now"); - if ($in->ask_from(_("Network functionality not configured"), - _("You are going to configure a remote printer. This needs working network access, but your network is not configured yet. If you go on without network configuration, you will not be able to use the printer which you are configuring now. How do you want to proceed?"), + my $choice = N("Configure the network now"); + if ($in->ask_from(N("Network functionality not configured"), + N("You are going to configure a remote printer. This needs working network access, but your network is not configured yet. If you go on without network configuration, you will not be able to use the printer which you are configuring now. How do you want to proceed?"), [ { val => \$choice, type => 'list', - list => [ _("Configure the network now"), - _("Go on without configuring the network") ]} ] )) { - if ($choice eq _("Configure the network now")){ + list => [ N("Configure the network now"), + N("Go on without configuring the network") ]} ] )) { + if ($choice eq N("Configure the network now")){ if ($::isInstall) { require network::netconnect; network::netconnect::main @@ -2630,10 +2624,10 @@ sub check_network { # The network is configured now, start it. if ((!start_network($in, $upNetwork)) && (!$dontconfigure)) { - $in->ask_warn(_("Configuration of a remote printer"), + $in->ask_warn(N("Configuration of a remote printer"), ($::isInstall ? -_("The network configuration done during the installation cannot be started now. Please check whether the network gets accessable after booting your system and correct the configuration using the Mandrake Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the Mandrake Control Center, section \"Hardware\"/\"Printer\"") : -_("The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again."))); +N("The network configuration done during the installation cannot be started now. Please check whether the network gets accessable after booting your system and correct the configuration using the Mandrake Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the Mandrake Control Center, section \"Hardware\"/\"Printer\"") : +N("The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again."))); return 0; } @@ -2642,8 +2636,8 @@ _("The network access was not running and could not be started. Please check you # The daemon is not really restarted but only SIGHUPped to not # interrupt print jobs. - my $w = $in->wait_message(_("Configuration of a remote printer"), - _("Restarting printing system...")); + my $w = $in->wait_message(N("Configuration of a remote printer"), + N("Restarting printing system...")); return printer::SIGHUP_daemon($printer->{SPOOLER}); @@ -2682,9 +2676,9 @@ sub security_check { # Tell user in which security mode he is and ask him whether he really # wants to activate the spooler in the given security mode. Stop the # operation of installing the spooler if he disagrees. - my $securitystr = ($security == 4 ? _("high") : _("paranoid")); - if ($in->ask_yesorno(_("Installing a printing system in the %s security level", $securitystr), - _("You are about to install the printing system %s on a system running in the %s security level. + my $securitystr = ($security == 4 ? N("high") : N("paranoid")); + if ($in->ask_yesorno(N("Installing a printing system in the %s security level", $securitystr), + N("You are about to install the printing system %s on a system running in the %s security level. This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessable by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level. @@ -2716,8 +2710,8 @@ sub start_spooler_on_boot { $in->set_help('startSpoolerOnBoot') if $::isInstall; if (!printer::service_starts_on_boot($service)) { - if ($in->ask_yesorno(_("Starting the printing system at boot time"), - _("The printing system (%s) will not be started automatically when the machine is booted. + if ($in->ask_yesorno(N("Starting the printing system at boot time"), + N("The printing system (%s) will not be started automatically when the machine is booted. It is possible that the automatic starting was turned off by changing to a higher security level, because the printing system is a potential point for attacks. @@ -2740,8 +2734,8 @@ sub install_spooler { } if ($printer->{SPOOLER} eq "cups") { { - my $w = $in->wait_message(_("Printerdrake"), - _("Checking installed software...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Checking installed software...")); if ((!$::testing) && (!printer::files_exist((qw(/usr/lib/cups/cgi-bin/printers.cgi /sbin/ifconfig @@ -2785,13 +2779,13 @@ sub install_spooler { start_spooler_on_boot($printer, $in, "cups"); } elsif ($printer->{SPOOLER} eq "lpd") { { - my $w = $in->wait_message(_("Printerdrake"), - _("Checking installed software...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Checking installed software...")); # "lpr" conflicts with "LPRng", remove "LPRng" if ((!$::testing) && (printer::files_exist((qw(/usr/lib/filters/lpf))))) { - my $w = $in->wait_message(_("Printerdrake"), - _("Removing LPRng...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Removing LPRng...")); $in->do_pkgs->remove_nodeps('LPRng'); } if ((!$::testing) && @@ -2824,13 +2818,13 @@ sub install_spooler { start_spooler_on_boot($printer, $in, "lpd"); } elsif ($printer->{SPOOLER} eq "lprng") { { - my $w = $in->wait_message(_("Printerdrake"), - _("Checking installed software...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Checking installed software...")); # "LPRng" conflicts with "lpr", remove "lpr" if ((!$::testing) && (printer::files_exist((qw(/usr/sbin/lpf))))) { - my $w = $in->wait_message(_("Printerdrake"), - _("Removing LPD...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Removing LPD...")); $in->do_pkgs->remove_nodeps('lpr'); } if ((!$::testing) && @@ -2866,8 +2860,8 @@ sub install_spooler { start_spooler_on_boot($printer, $in, "lpd"); } elsif ($printer->{SPOOLER} eq "pdq") { { - my $w = $in->wait_message(_("Printerdrake"), - _("Checking installed software...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Checking installed software...")); if ((!$::testing) && (!printer::files_exist((qw(/usr/bin/pdq /usr/X11R6/bin/xpdq))))) { @@ -2903,8 +2897,8 @@ sub setup_default_spooler { $printer->{SPOOLER} ||= 'cups'; my $oldspooler = $printer->{SPOOLER}; my $str_spooler = - $in->ask_from_list_(_("Select Printer Spooler"), - _("Which printing system (spooler) do you want to use?"), + $in->ask_from_list_(N("Select Printer Spooler"), + N("Which printing system (spooler) do you want to use?"), [ printer::spooler() ], $printer::spooler_inv{$printer->{SPOOLER}}, ) or return; @@ -2919,8 +2913,8 @@ sub setup_default_spooler { printer::removelocalprintersfromapplications($printer); # Get the queues of this spooler { - my $w = $in->wait_message(_("Printerdrake"), - _("Reading printer data...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Reading printer data...")); printer::read_configured_queues($printer); } # Copy queues from former spooler @@ -2928,8 +2922,8 @@ sub setup_default_spooler { # Re-read the printer database (CUPS has additional drivers, PDQ # has no raw queue) %printer::thedb = (); - #my $w = $in->wait_message(_("Printerdrake"), - # _("Reading printer database...")); + #my $w = $in->wait_message(N("Printerdrake"), + # N("Reading printer database...")); #printer::read_printer_db($printer->{SPOOLER}); } # Save spooler choice @@ -2939,8 +2933,8 @@ sub setup_default_spooler { sub configure_queue { my ($printer, $in) = @_; - my $w = $in->wait_message(_("Printerdrake"), - _("Configuring printer \"%s\"...", + my $w = $in->wait_message(N("Printerdrake"), + N("Configuring printer \"%s\"...", $printer->{currentqueue}{queue})); $printer->{complete} = 1; printer::configure_queue($printer); @@ -2953,8 +2947,8 @@ sub install_foomatic { (!printer::files_exist((qw(/usr/bin/foomatic-configure /usr/lib/perl5/vendor_perl/5.8.0/Foomatic/DB.pm) )))) { - my $w = $in->wait_message(_("Printerdrake"), - _("Installing Foomatic...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Installing Foomatic...")); $in->do_pkgs->install('foomatic'); } } @@ -2982,13 +2976,13 @@ sub main { # Default printer name, we do not use "lp" so that one can switch the # default printer under LPD without needing to rename another printer. # Under LPD the alias "lp" will be given to the default printer. - my $defaultprname = _("Printer"); + my $defaultprname = N("Printer"); # printerdrake does not work without foomatic, and for more convenience # we install some more stuff { - my $w = $in->wait_message(_("Printerdrake"), - _("Checking installed software...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Checking installed software...")); if ((!$::testing) && (!printer::files_exist((qw(/usr/bin/foomatic-configure /usr/lib/perl5/vendor_perl/5.8.0/Foomatic/DB.pm @@ -3024,7 +3018,7 @@ sub main { # Control variables for the main loop my ($menuchoice, $cursorpos, $queue, $continue, $newqueue, $editqueue, $expertswitch, $menushown) = ('', '::', $defaultprname, 1, 0, 0, 0, 0); # Cursor position in queue modification window - my $modify = _("Printer options"); + my $modify = N("Printer options"); while ($continue) { $newqueue = 0; # When the queue list is not shown, cancelling the printer type @@ -3033,8 +3027,8 @@ sub main { # Get the default printer if (defined($printer->{SPOOLER}) && ($printer->{SPOOLER} ne '') && ((!defined($printer->{DEFAULT})) || ($printer->{DEFAULT} eq ''))) { - my $w = $in->wait_message(_("Printerdrake"), - _("Preparing Printerdrake...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Preparing Printerdrake...")); $printer->{DEFAULT} = printer::get_default_printer($printer); if ($printer->{DEFAULT}) { # If a CUPS system has only remote printers and no default @@ -3051,8 +3045,8 @@ sub main { # Configure the current printer queues in applications { - my $w = $in->wait_message(_("Printerdrake"), - _("Configuring applications...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Configuring applications...")); printer::configureapplications($printer); } @@ -3065,14 +3059,14 @@ sub main { $editqueue = 0; } else { # Reset modification window cursor when one leaves the window - $modify = _("Printer options"); + $modify = N("Printer options"); if (!$ask_multiple_printer && %{$printer->{configured} || {}} == ()) { $in->set_help('doYouWantToPrint') if $::isInstall; $newqueue = 1; $menuchoice = $printer->{want} || - $in->ask_yesorno(_("Printer"), - _("Would you like to configure printing?"), + $in->ask_yesorno(N("Printer"), + N("Would you like to configure printing?"), 0) ? "\@addprinter" : "\@quit"; if ($menuchoice ne "\@quit") { $printer->{SPOOLER} ||= @@ -3084,7 +3078,7 @@ sub main { $printer->{SPOOLER} ||= setup_default_spooler ($printer, $in, $upNetwork) || return; # This entry and the check for this entry have to use # the same translation to work properly - my $spoolerentry = _("Printing system: "); + my $spoolerentry = N("Printing system: "); # If networking is configured, start it, but don't ask the # user to configure networking. We want to know whether we # have a local network, to suppress some buttons in the @@ -3116,7 +3110,7 @@ sub main { ($printer->{DEFAULT} ne "")) { if ($printer->{configured}{$printer->{DEFAULT}}) { $cursorpos = - $printer->{configured}{$printer->{DEFAULT}}{queuedata}{menuentry} . _(" (Default)"); + $printer->{configured}{$printer->{DEFAULT}}{queuedata}{menuentry} . N(" (Default)"); } elsif ($printer->{SPOOLER} eq "cups") { ($cursorpos) = grep { /!$printer->{DEFAULT}:[^!]*$/ } @@ -3127,7 +3121,7 @@ sub main { my @printerlist = ((sort((map { $printer->{configured}{$_}{queuedata}{menuentry} . ($_ eq $printer->{DEFAULT} ? - _(" (Default)") : (""))} + N(" (Default)") : (""))} keys(%{$printer->{configured} || {}})), ($printer->{SPOOLER} eq "cups" ? @@ -3140,12 +3134,12 @@ sub main { $menuchoice = $cursorpos; # Show the main dialog $in->ask_from_( - { title => _("Printerdrake"), + { title => N("Printerdrake"), messages => ($noprinters ? "" : (($printer->{SPOOLER} eq "cups") ? - _("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; to view information about it; or to make a printer on a remote CUPS server available for Star Office/OpenOffice.org/GIMP.") : - _("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it."))), + N("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; to view information about it; or to make a printer on a remote CUPS server available for Star Office/OpenOffice.org/GIMP.") : + N("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it."))), cancel => (""), ok => (""), }, @@ -3162,7 +3156,7 @@ sub main { $menuchoice = "\@addprinter"; 1; }, - val => _("Add a new printer") }, + val => N("Add a new printer") }, ((($printer->{SPOOLER} eq "cups") && ($havelocalnetworks_or_expert)) ? ({ clicked_may_quit => @@ -3172,7 +3166,7 @@ sub main { $menuchoice = "\@refresh"; 1; }, - val => _("Refresh printer list (to display all available remote CUPS printers)") }, + val => N("Refresh printer list (to display all available remote CUPS printers)") }, { clicked_may_quit => sub { # Save the cursor position @@ -3180,8 +3174,8 @@ sub main { $menuchoice = "\@cupsconfig"; 1; }, - val => ($::expert ? _("CUPS configuration") : - _("Specify CUPS server")) }) : ()), + val => ($::expert ? N("CUPS configuration") : + N("Specify CUPS server")) }) : ()), ($::expert ? { clicked_may_quit => sub { @@ -3190,17 +3184,17 @@ sub main { $menuchoice = "\@spooler"; 1; }, - val => _("Change the printing system") } : + val => N("Change the printing system") } : ()), (!$::isInstall ? { clicked_may_quit => sub { $menuchoice = "\@usermode"; 1 }, - val => ($::expert ? _("Normal Mode") : - _("Expert Mode")) } : ()), + val => ($::expert ? N("Normal Mode") : + N("Expert Mode")) } : ()), { clicked_may_quit => sub { $menuchoice = "\@quit"; 1 }, val => ($::isEmbedded || $::isInstall ? - _("Done") : _("Quit")) }, + N("Done") : N("Quit")) }, ] ); # Toggle expert mode and standard mode @@ -3213,14 +3207,14 @@ sub main { } # Read printer database for the new user mode %printer::thedb = (); - #my $w = $in->wait_message(_("Printerdrake"), - # _("Reading printer database...")); + #my $w = $in->wait_message(N("Printerdrake"), + # N("Reading printer database...")); #printer::read_printer_db($printer->{SPOOLER}); # Re-read printer queues to switch the tree # structure between expert/normal mode. my $w = $in->wait_message - (_("Printerdrake"), - _("Reading printer data...")); + (N("Printerdrake"), + N("Reading printer data...")); printer::read_configured_queues($printer); $cursorpos = "::"; next; @@ -3292,7 +3286,7 @@ sub main { $continue = 1; # Enter wizard mode $::Wizard_pix_up = "wiz_printerdrake.png"; - $::Wizard_title = _("Add a new printer"); + $::Wizard_title = N("Add a new printer"); $::isWizard = 1; # Wizard welcome screen $::Wizard_no_previous = 1; @@ -3353,14 +3347,14 @@ sub main { $cursorpos = $printer->{configured}{$printer->{QUEUE}}{queuedata}{menuentry} . ($printer->{QUEUE} eq $printer->{DEFAULT} ? - _(" (Default)") : ()); + N(" (Default)") : ()); my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork); if ($testpages == 1) { # User was content with test pages # Leave wizard mode with congratulations screen wizard_close($in, 1); $continue = ($::expert || !$::isInstall || $menushown || - $in->ask_yesorno('',_("Do you want to configure another printer?"))); + $in->ask_yesorno('',N("Do you want to configure another printer?"))); } elsif ($testpages == 2) { # User was not content with test pages # Leave wizard mode without congratulations @@ -3405,12 +3399,12 @@ sub main { $cursorpos = $printer->{configured}{$printer->{QUEUE}}{queuedata}{menuentry} . ($printer->{QUEUE} eq $printer->{DEFAULT} ? - _(" (Default)") : ()); + N(" (Default)") : ()); my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork); if ($testpages == 1) { # User was content with test pages $continue = ($::expert || !$::isInstall || $menushown || - $in->ask_yesorno('',_("Do you want to configure another printer?"))); + $in->ask_yesorno('',N("Do you want to configure another printer?"))); } elsif ($testpages == 2) { # User was not content with test pages $editqueue = 1; @@ -3431,7 +3425,7 @@ sub main { $printer->{configured}{$queue}{queuedata}{menuentry} =~ /!([^!]+)$/; $infoline = $1 . - ($queue eq $printer->{DEFAULT} ? _(" (Default)") : ()) . + ($queue eq $printer->{DEFAULT} ? N(" (Default)") : ()) . ($printer->{configured}{$queue}{queuedata}{desc} ? ", Descr.: $printer->{configured}{$queue}{queuedata}{desc}" : ()) . ($printer->{configured}{$queue}{queuedata}{loc} ? @@ -3445,38 +3439,38 @@ sub main { $infoline = $1; } if ($in->ask_from_ - ({ title => _("Modify printer configuration"), + ({ title => N("Modify printer configuration"), messages => - _("Printer %s + N("Printer %s What do you want to modify on this printer?", $infoline), - cancel => _("Close"), - ok => _("Do it!") + cancel => N("Close"), + ok => N("Do it!") }, [ { val => \$modify, format => \&translate, type => 'list', list => [ ($printer->{configured}{$queue} ? - (_("Printer connection type"), - _("Printer name, description, location"), + (N("Printer connection type"), + N("Printer name, description, location"), ($::expert ? - _("Printer manufacturer, model, driver") : - _("Printer manufacturer, model")), + N("Printer manufacturer, model, driver") : + N("Printer manufacturer, model")), (($printer->{configured}{$queue}{queuedata}{make} ne "") && (($printer->{configured}{$queue}{queuedata}{model} ne - _("Unknown model")) && + N("Unknown model")) && ($printer->{configured}{$queue}{queuedata}{model} ne - _("Raw printer"))) ? - _("Printer options") : ())) : ()), + N("Raw printer"))) ? + N("Printer options") : ())) : ()), (($queue ne $printer->{DEFAULT}) ? - _("Set this printer as the default") : ()), + N("Set this printer as the default") : ()), ($printer->{configured}{$queue} ? () : - (_("Add this printer to Star Office/OpenOffice.org/GIMP"), - _("Remove this printer from Star Office/OpenOffice.org/GIMP"))), - _("Print test pages"), - _("Know how to use this printer"), + (N("Add this printer to Star Office/OpenOffice.org/GIMP"), + N("Remove this printer from Star Office/OpenOffice.org/GIMP"))), + N("Print test pages"), + N("Know how to use this printer"), ($printer->{configured}{$queue} ? - _("Remove printer") : ()) ] } ] ) ) { + N("Remove printer") : ()) ] } ] ) ) { # Stay in the queue edit window until the user clicks "Close" # or deletes the queue $editqueue = 1; @@ -3511,18 +3505,18 @@ What do you want to modify on this printer?", } } # Do the chosen task - if ($modify eq _("Printer connection type")) { + if ($modify eq N("Printer connection type")) { choose_printer_type($printer, $in) && setup_printer_connection($printer, $in, $upNetwork) && configure_queue($printer, $in); - } elsif ($modify eq _("Printer name, description, location")) { + } elsif ($modify eq N("Printer name, description, location")) { choose_printer_name($printer, $in) && configure_queue($printer, $in); # Delete old queue when it was renamed if (lc($printer->{QUEUE}) ne lc($printer->{OLD_QUEUE})) { my $w = $in->wait_message - (_("Printerdrake"), - _("Removing old printer \"%s\"...", + (N("Printerdrake"), + N("Removing old printer \"%s\"...", $printer->{OLD_QUEUE})); printer::remove_queue($printer, $printer->{OLD_QUEUE}); # If the default printer was renamed, correct the @@ -3533,51 +3527,51 @@ What do you want to modify on this printer?", } $queue = $printer->{QUEUE}; } - } elsif (($modify eq _("Printer manufacturer, model, driver")) || - ($modify eq _("Printer manufacturer, model"))) { + } elsif (($modify eq N("Printer manufacturer, model, driver")) || + ($modify eq N("Printer manufacturer, model"))) { get_db_entry($printer, $in); choose_model($printer, $in) && get_printer_info($printer, $in) && setup_options($printer, $in) && configure_queue($printer, $in); - } elsif ($modify eq _("Printer options")) { + } elsif ($modify eq N("Printer options")) { get_printer_info($printer, $in) && setup_options($printer, $in) && configure_queue($printer, $in); - } elsif ($modify eq _("Set this printer as the default")) { + } elsif ($modify eq N("Set this printer as the default")) { $printer->{DEFAULT} = $queue; printer::set_default_printer($printer); - $in->ask_warn(_("Default printer"), - _("The printer \"%s\" is set as the default printer now.", $queue)); - } elsif ($modify eq _("Add this printer to Star Office/OpenOffice.org/GIMP")) { + $in->ask_warn(N("Default printer"), + N("The printer \"%s\" is set as the default printer now.", $queue)); + } elsif ($modify eq N("Add this printer to Star Office/OpenOffice.org/GIMP")) { if (printer::addcupsremotetoapplications ($printer, $queue)) { - $in->ask_warn(_("Adding printer to Star Office/OpenOffice.org/GIMP"), - _("The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP.", $queue)); + $in->ask_warn(N("Adding printer to Star Office/OpenOffice.org/GIMP"), + N("The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP.", $queue)); } else { - $in->ask_warn(_("Adding printer to Star Office/OpenOffice.org/GIMP"), - _("Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP.", $queue)); + $in->ask_warn(N("Adding printer to Star Office/OpenOffice.org/GIMP"), + N("Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP.", $queue)); } - } elsif ($modify eq _("Remove this printer from Star Office/OpenOffice.org/GIMP")) { + } elsif ($modify eq N("Remove this printer from Star Office/OpenOffice.org/GIMP")) { if (printer::removeprinterfromapplications ($printer, $queue)) { - $in->ask_warn(_("Removing printer from Star Office/OpenOffice.org/GIMP"), - _("The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/GIMP.", $queue)); + $in->ask_warn(N("Removing printer from Star Office/OpenOffice.org/GIMP"), + N("The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/GIMP.", $queue)); } else { - $in->ask_warn(_("Removing printer from Star Office/OpenOffice.org/GIMP"), - _("Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP.", $queue)); + $in->ask_warn(N("Removing printer from Star Office/OpenOffice.org/GIMP"), + N("Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP.", $queue)); } - } elsif ($modify eq _("Print test pages")) { + } elsif ($modify eq N("Print test pages")) { print_testpages($printer, $in, $upNetwork); - } elsif ($modify eq _("Know how to use this printer")) { + } elsif ($modify eq N("Know how to use this printer")) { printer_help($printer, $in); - } elsif ($modify eq _("Remove printer")) { + } elsif ($modify eq N("Remove printer")) { if ($in->ask_yesorno('', - _("Do you really want to remove the printer \"%s\"?", $queue), 1)) { + N("Do you really want to remove the printer \"%s\"?", $queue), 1)) { { my $w = $in->wait_message - (_("Printerdrake"), - _("Removing printer \"%s\"...", $queue)); + (N("Printerdrake"), + N("Removing printer \"%s\"...", $queue)); if (printer::remove_queue($printer, $queue)) { $editqueue = 0; # Define a new default printer if we have @@ -3606,9 +3600,9 @@ What do you want to modify on this printer?", $cursorpos = $printer->{configured}{$printer->{QUEUE}}{queuedata}{menuentry} . ($printer->{QUEUE} eq $printer->{DEFAULT} ? - _(" (Default)") : ()); + N(" (Default)") : ()); } else { - my $s1 = _(" (Default)"); + my $s1 = N(" (Default)"); my $s2 = $s1; $s2 =~ s/\(/\\\(/; $s2 =~ s/\)/\\\)/; @@ -3623,14 +3617,14 @@ What do you want to modify on this printer?", } $continue = ($editqueue || $::expert || !$::isInstall || $menushown || - $in->ask_yesorno('',_("Do you want to configure another printer?"))); + $in->ask_yesorno('',N("Do you want to configure another printer?"))); } # Configure the current printer queue in applications when main menu # will not be shown (During installation in "Recommended" mode) if ($::isInstall && !$::expert && !$menushown && !$continue) { - my $w = $in->wait_message(_("Printerdrake"), - _("Configuring applications...")); + my $w = $in->wait_message(N("Printerdrake"), + N("Configuring applications...")); printer::configureapplications($printer); } diff --git a/perl-install/proxy.pm b/perl-install/proxy.pm index b01a7b9bf..84ccbfa33 100644 --- a/perl-install/proxy.pm +++ b/perl-install/proxy.pm @@ -26,26 +26,26 @@ sub main { begin: $::isWizard = 1; $::Wizard_no_previous = 1; - $in->ask_okcancel(_("Proxy configuration"), - _("Welcome to the proxy configuration utility.\n\nHere, you'll be able to set up your http and ftp proxies\nwith or without login and password\n" + $in->ask_okcancel(N("Proxy configuration"), + N("Welcome to the proxy configuration utility.\n\nHere, you'll be able to set up your http and ftp proxies\nwith or without login and password\n" ), 1); # http proxy step_http_proxy: undef $::Wizard_no_previous; $proxy_cfg->{http_url} ||= "http://www.proxy.com/"; - $in->ask_from(_("Proxy configuration"), - _("Please fill in the http proxy informations\nLeave it blank if you don't want an http proxy"), - [ { label => _("URL"), val => \$proxy_cfg->{http_url} }, - { label => _("port"), val => \$proxy_cfg->{http_port} } + $in->ask_from(N("Proxy configuration"), + N("Please fill in the http proxy informations\nLeave it blank if you don't want an http proxy"), + [ { label => N("URL"), val => \$proxy_cfg->{http_url} }, + { label => N("port"), val => \$proxy_cfg->{http_port} } ], complete => sub { if ($proxy_cfg->{http_url} && $proxy_cfg->{http_url} !~ /^http:/) { - $in->ask_warn('', _("Url should begin with 'http:'")); + $in->ask_warn('', N("Url should begin with 'http:'")); return (1,0); } if ($proxy_cfg->{http_port} && $proxy_cfg->{http_port} !~ /^\d+$/) { - $in->ask_warn('', _("The port part should be numeric")); + $in->ask_warn('', N("The port part should be numeric")); return (1,1); } 0; @@ -55,18 +55,18 @@ sub main { # ftp proxy step_ftp_proxy: $proxy_cfg->{ftp_url} ||= "ftp://ftp.proxy.com/"; - $in->ask_from(_("Proxy configuration"), - _("Please fill in the ftp proxy informations\nLeave it blank if you don't want an ftp proxy"), - [ { label => _("URL"), val => \$proxy_cfg->{ftp_url} }, - { label => _("port"), val => \$proxy_cfg->{ftp_port} } + $in->ask_from(N("Proxy configuration"), + N("Please fill in the ftp proxy informations\nLeave it blank if you don't want an ftp proxy"), + [ { label => N("URL"), val => \$proxy_cfg->{ftp_url} }, + { label => N("port"), val => \$proxy_cfg->{ftp_port} } ], complete => sub { if ($proxy_cfg->{ftp_url} && $proxy_cfg->{ftp_url} !~ /^(ftp|http):/) { - $in->ask_warn('', _("Url should begin with 'ftp:' or 'http:'")); + $in->ask_warn('', N("Url should begin with 'ftp:' or 'http:'")); return (1,0); } if ($proxy_cfg->{ftp_port} && $proxy_cfg->{ftp_port} !~ /^\d+$/) { - $in->ask_warn('', _("The port part should be numeric")); + $in->ask_warn('', N("The port part should be numeric")); return (1,1); } 0; @@ -75,17 +75,17 @@ sub main { # proxy login/passwd step_login: - $in->ask_from(_("Proxy configuration"), - _("Please enter proxy login and password, if any.\nLeave it blank if you don't want login/passwd"), - [ { label => _("login"), val => \$proxy_cfg->{login} }, + $in->ask_from(N("Proxy configuration"), + N("Please enter proxy login and password, if any.\nLeave it blank if you don't want login/passwd"), + [ { label => N("login"), val => \$proxy_cfg->{login} }, { - label => _("password"), val => \$proxy_cfg->{passwd}, hidden => 1 }, + label => N("password"), val => \$proxy_cfg->{passwd}, hidden => 1 }, { - label => _("re-type password"), val => \$proxy_cfg->{passwd2}, hidden => 1 } + label => N("re-type password"), val => \$proxy_cfg->{passwd2}, hidden => 1 } ], complete => sub { if ($proxy_cfg->{passwd} ne $proxy_cfg->{passwd2}) { - $in->ask_warn('', _("The passwords don't match. Try again!")); + $in->ask_warn('', N("The passwords don't match. Try again!")); return(1,1); } 0; diff --git a/perl-install/raid.pm b/perl-install/raid.pm index 39c843ed9..229366675 100644 --- a/perl-install/raid.pm +++ b/perl-install/raid.pm @@ -32,7 +32,7 @@ sub new { sub add { my ($raids, $part, $nb) = @_; $nb = nb($nb); - $raids->[$nb]{isMounted} and die _("Can't add a partition to _formatted_ RAID md%d", $nb); + $raids->[$nb]{isMounted} and die N("Can't add a partition to _formatted_ RAID md%d", $nb); inactivate_and_dirty($raids->[$nb]); $part->{notFormatted} = 1; $part->{isFormatted} = 0; $part->{raid} = $nb; @@ -105,7 +105,7 @@ sub write { my ($raids, $file) = @_; local *F; local $\ = "\n"; - open F, ">$file" or die _("Can't write file %s", $file); + open F, ">$file" or die N("Can't write file %s", $file); foreach (grep { $_ } @$raids) { print F <<"EOF"; @@ -134,7 +134,7 @@ sub make { eval { modules::load(module($part)) }; &write($raids, "/etc/raidtab"); run_program::run("mkraid", "--really-force", $dev) or die - $::isStandalone ? _("mkraid failed (maybe raidtools are missing?)") : _("mkraid failed"); + $::isStandalone ? N("mkraid failed (maybe raidtools are missing?)") : N("mkraid failed"); } sub format_part { @@ -150,7 +150,7 @@ sub verify { my ($raids) = @_; $raids or return; foreach (grep { $_ } @$raids) { - @{$_->{disks}} >= ($_->{level} =~ /4|5/ ? 3 : 2) or die _("Not enough partitions for RAID level %d\n", $_->{level}); + @{$_->{disks}} >= ($_->{level} =~ /4|5/ ? 3 : 2) or die N("Not enough partitions for RAID level %d\n", $_->{level}); } } diff --git a/perl-install/security/main.pm b/perl-install/security/main.pm index ff3e7304f..edfe34bce 100644 --- a/perl-install/security/main.pm +++ b/perl-install/security/main.pm @@ -33,7 +33,7 @@ sub basic_seclevel_explanations { my $text = new Gtk::Text(undef, undef); $text->set_editable(0); $text->insert(undef, $text->style->black, undef, - _("Standard: This is the standard security recommended for a computer that will be used to connect + N("Standard: This is the standard security recommended for a computer that will be used to connect to the Internet as a client. High: There are already some restrictions, and more automatic checks are run every night. @@ -63,7 +63,7 @@ sub basic_seclevel_option { $$seclevel_entry->set_popdown_strings(@sec_levels); $$seclevel_entry->entry->set_text($current_level); - new Gtk::Label(_("Security Level:")), $$seclevel_entry; + new Gtk::Label(N("Security Level:")), $$seclevel_entry; } sub draksec_main { @@ -97,11 +97,11 @@ sub draksec_main { basic_seclevel_explanations($msec), create_packtable ({ col_spacings => 10, row_spacings => 5 }, [ basic_seclevel_option(\$seclevel_entry, $msec) ], - [ new Gtk::Label(_("Security Alerts:")), + [ new Gtk::Label(N("Security Alerts:")), my $secadmin_check = new Gtk::CheckButton ], - [ new Gtk::Label(_("Security Administrator:")), + [ new Gtk::Label(N("Security Administrator:")), my $secadmin_entry = new Gtk::Entry ] )), - new Gtk::Label(_("Basic"))); + new Gtk::Label(N("Basic"))); $secadmin_entry->set_text($msec->get_check_value("MAIL_USER")); $secadmin_check->set_active(1) if $msec->get_check_value("MAIL_WARN") eq "yes"; @@ -112,12 +112,12 @@ sub draksec_main { my @all_choices = (@yesno_choices, @alllocal_choices); my %options_values; - foreach ( [ 'network', _("Network Options") ], [ 'system', _("System Options") ] ) { + foreach ( [ 'network', N("Network Options") ], [ 'system', N("System Options") ] ) { my ($domain, $label) = @$_; my %values; $notebook->append_page(gtkshow(createScrolledWindow(gtkpack(new Gtk::VBox(0, 0), - new Gtk::Label(_("The following options can be set to customize your\nsystem security. If you need explanations, click on Help.\n")), + new Gtk::Label(N("The following options can be set to customize your\nsystem security. If you need explanations, click on Help.\n")), create_packtable({ col_spacings => 10, row_spacings => 5 }, map { my $i = $_; @@ -135,8 +135,8 @@ sub draksec_main { $values{$i} = new Gtk::Entry(); $values{$i}->set_text($msec->get_function_value($i)); } - [ new Gtk::Label($i._(" (default: %s)", $default)), $values{$i} ]; - # , gtksignal_connect(new Gtk::Button(_("Help")), 'clicked' => sub { show_msec_help($_) } ) ] + [ new Gtk::Label($i . N(" (default: %s)", $default)), $values{$i} ]; + # , gtksignal_connect(new Gtk::Button(N("Help")), 'clicked' => sub { show_msec_help($_) } ) ] } $msec->get_functions($domain))))), new Gtk::Label($label)); $options_values{$domain} = \%values; @@ -146,7 +146,7 @@ sub draksec_main { my %security_checks_value; $notebook->append_page(gtkshow(createScrolledWindow(gtkpack(new Gtk::VBox(0, 0), - new Gtk::Label(_("The following options can be set to customize your\nsystem security. If you need explanations, click on Help.\n")), + new Gtk::Label(N("The following options can be set to customize your\nsystem security. If you need explanations, click on Help.\n")), create_packtable({ col_spacings => 10, row_spacings => 5 }, map { my $i = $_; @@ -155,15 +155,15 @@ sub draksec_main { $security_checks_value{$i}->entry->set_editable(0); $security_checks_value{$i}->set_popdown_strings(qw(yes no default)); $security_checks_value{$i}->entry->set_text($msec->get_check_value($i)); - [ gtkshow(new Gtk::Label(_($i))), $security_checks_value{$i} ]; - # , gtksignal_connect(new Gtk::Button(_("Help")), 'clicked' => sub { show_msec_help($i) } ) ] + [ gtkshow(new Gtk::Label(translate($i))), $security_checks_value{$i} ]; + # , gtksignal_connect(new Gtk::Button(N("Help")), 'clicked' => sub { show_msec_help($i) } ) ] } } ($msec->get_default_checks))))), - new Gtk::Label(_("Periodic Checks"))); + new Gtk::Label(N("Periodic Checks"))); ####################### OK CANCEL BUTTONS ################################## - my $bok = gtksignal_connect(new Gtk::Button(_("Ok")), + my $bok = gtksignal_connect(new Gtk::Button(N("Ok")), 'clicked' => sub { my $seclevel_value = $seclevel_entry->entry->get_text(); my $secadmin_check_value = $secadmin_check->get_active(); @@ -173,13 +173,13 @@ sub draksec_main { standalone::explanations("Configuring msec"); if ($seclevel_value ne $msec->get_secure_level()) { - $w = wait_msg(_("Please wait, setting security level...")); + $w = wait_msg(N("Please wait, setting security level...")); standalone::explanations("Setting security level"); $msec->set_secure_level($seclevel_value); remove_wait_msg($w); } - $w = wait_msg(_("Please wait, setting security options...")); + $w = wait_msg(N("Please wait, setting security options...")); standalone::explanations("Setting security administrator option"); $msec->config_check('MAIL_WARN', $secadmin_check_value == 1 ? 'yes' : 'no'); @@ -212,7 +212,7 @@ sub draksec_main { my_gtk->exit(0); } ); - my $bcancel = gtksignal_connect(new Gtk::Button(_("Cancel")), + my $bcancel = gtksignal_connect(new Gtk::Button(N("Cancel")), 'clicked' => sub { my_gtk->exit(0) } ); gtkpack_($vbox, 1, gtkshow($notebook), diff --git a/perl-install/services.pm b/perl-install/services.pm index 02400a082..ee6ff2d5c 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -11,77 +11,77 @@ use run_program; sub description { my %services = ( -alsa => __("Launch the ALSA (Advanced Linux Sound Architecture) sound system"), -anacron => __("Anacron a periodic command scheduler."), -apmd => __("apmd is used for monitoring batery status and logging it via syslog. +alsa => N_("Launch the ALSA (Advanced Linux Sound Architecture) sound system"), +anacron => N_("Anacron a periodic command scheduler."), +apmd => N_("apmd is used for monitoring batery status and logging it via syslog. It can also be used for shutting down the machine when the battery is low."), -atd => __("Runs commands scheduled by the at command at the time specified when +atd => N_("Runs commands scheduled by the at command at the time specified when at was run, and runs batch commands when the load average is low enough."), -crond => __("cron is a standard UNIX program that runs user-specified programs +crond => N_("cron is a standard UNIX program that runs user-specified programs at periodic scheduled times. vixie cron adds a number of features to the basic UNIX cron, including better security and more powerful configuration options."), -gpm => __("GPM adds mouse support to text-based Linux applications such the +gpm => N_("GPM adds mouse support to text-based Linux applications such the Midnight Commander. It also allows mouse-based console cut-and-paste operations, and includes support for pop-up menus on the console."), -harddrake => __("HardDrake runs a hardware probe, and optionally configures +harddrake => N_("HardDrake runs a hardware probe, and optionally configures new/changed hardware."), -httpd => __("Apache is a World Wide Web server. It is used to serve HTML files and CGI."), -inet => __("The internet superserver daemon (commonly called inetd) starts a +httpd => N_("Apache is a World Wide Web server. It is used to serve HTML files and CGI."), +inet => N_("The internet superserver daemon (commonly called inetd) starts a variety of other internet services as needed. It is responsible for starting many services, including telnet, ftp, rsh, and rlogin. Disabling inetd disables all of the services it is responsible for."), -ipchains => __("Launch packet filtering for Linux kernel 2.2 series, to set +ipchains => N_("Launch packet filtering for Linux kernel 2.2 series, to set up a firewall to protect your machine from network attacks."), -keytable => __("This package loads the selected keyboard map as set in +keytable => N_("This package loads the selected keyboard map as set in /etc/sysconfig/keyboard. This can be selected using the kbdconfig utility. You should leave this enabled for most machines."), -kheader => __("Automatic regeneration of kernel header in /boot for +kheader => N_("Automatic regeneration of kernel header in /boot for /usr/include/linux/{autoconf,version}.h"), -kudzu => __("Automatic detection and configuration of hardware at boot."), -linuxconf => __("Linuxconf will sometimes arrange to perform various tasks +kudzu => N_("Automatic detection and configuration of hardware at boot."), +linuxconf => N_("Linuxconf will sometimes arrange to perform various tasks at boot-time to maintain the system configuration."), -lpd => __("lpd is the print daemon required for lpr to work properly. It is +lpd => N_("lpd is the print daemon required for lpr to work properly. It is basically a server that arbitrates print jobs to printer(s)."), -lvs => __("Linux Virtual Server, used to build a high-performance and highly +lvs => N_("Linux Virtual Server, used to build a high-performance and highly available server."), -named => __("named (BIND) is a Domain Name Server (DNS) that is used to resolve host names to IP addresses."), -netfs => __("Mounts and unmounts all Network File System (NFS), SMB (Lan +named => N_("named (BIND) is a Domain Name Server (DNS) that is used to resolve host names to IP addresses."), +netfs => N_("Mounts and unmounts all Network File System (NFS), SMB (Lan Manager/Windows), and NCP (NetWare) mount points."), -network => __("Activates/Deactivates all network interfaces configured to start +network => N_("Activates/Deactivates all network interfaces configured to start at boot time."), -nfs => __("NFS is a popular protocol for file sharing across TCP/IP networks. +nfs => N_("NFS is a popular protocol for file sharing across TCP/IP networks. This service provides NFS server functionality, which is configured via the /etc/exports file."), -nfslock => __("NFS is a popular protocol for file sharing across TCP/IP +nfslock => N_("NFS is a popular protocol for file sharing across TCP/IP networks. This service provides NFS file locking functionality."), -numlock => __("Automatically switch on numlock key locker under console +numlock => N_("Automatically switch on numlock key locker under console and XFree at boot."), -oki4daemon => __("Support the OKI 4w and compatible winprinters."), -pcmcia => __("PCMCIA support is usually to support things like ethernet and +oki4daemon => N_("Support the OKI 4w and compatible winprinters."), +pcmcia => N_("PCMCIA support is usually to support things like ethernet and modems in laptops. It won't get started unless configured so it is safe to have it installed on machines that don't need it."), -portmap => __("The portmapper manages RPC connections, which are used by +portmap => N_("The portmapper manages RPC connections, which are used by protocols such as NFS and NIS. The portmap server must be running on machines which act as servers for protocols which make use of the RPC mechanism."), -postfix => __("Postfix is a Mail Transport Agent, which is the program that moves mail from one machine to another."), -random => __("Saves and restores system entropy pool for higher quality random +postfix => N_("Postfix is a Mail Transport Agent, which is the program that moves mail from one machine to another."), +random => N_("Saves and restores system entropy pool for higher quality random number generation."), -rawdevices => __("Assign raw devices to block devices (such as hard drive +rawdevices => N_("Assign raw devices to block devices (such as hard drive partitions), for the use of applications such as Oracle"), -routed => __("The routed daemon allows for automatic IP router table updated via +routed => N_("The routed daemon allows for automatic IP router table updated via the RIP protocol. While RIP is widely used on small networks, more complex routing protocols are needed for complex networks."), -rstatd => __("The rstat protocol allows users on a network to retrieve +rstatd => N_("The rstat protocol allows users on a network to retrieve performance metrics for any machine on that network."), -rusersd => __("The rusers protocol allows users on a network to identify who is +rusersd => N_("The rusers protocol allows users on a network to identify who is logged in on other responding machines."), -rwhod => __("The rwho protocol lets remote users get a list of all of the users +rwhod => N_("The rwho protocol lets remote users get a list of all of the users logged into a machine running the rwho daemon (similiar to finger)."), -sound => __("Launch the sound system on your machine"), -syslog => __("Syslog is the facility by which many daemons use to log messages +sound => N_("Launch the sound system on your machine"), +syslog => N_("Syslog is the facility by which many daemons use to log messages to various system log files. It is a good idea to always run syslog."), -usb => __("Load the drivers for your usb devices."), -xfs => __("Starts the X Font Server (this is mandatory for XFree to run)."), +usb => N_("Load the drivers for your usb devices."), +xfs => N_("Starts the X Font Server (this is mandatory for XFree to run)."), ); my ($name, $prefix) = @_; my $s = $services{$name}; @@ -107,7 +107,7 @@ sub ask_install_simple { my ($in, $prefix) = @_; my ($l, $on_services) = services($prefix); $in->ask_many_from_list("drakxservices", - _("Choose which services should be automatically started at boot time"), + N("Choose which services should be automatically started at boot time"), { list => $l, help => sub { description($_[0], $prefix) }, @@ -119,26 +119,26 @@ sub ask_install_simple { sub ask_install { my ($in, $prefix) = @_; my %root_services = ( - _("Printing") => [ qw(cups cupslpd lpr lpd oki4daemon hpoj cups-lpd) ], - _("Internet") => [ qw(httpd boa tux roxen ftp pftp tftp proftpd wu-ftpd pure-ftpdipsec proftpd-xinetd + N("Printing") => [ qw(cups cupslpd lpr lpd oki4daemon hpoj cups-lpd) ], + N("Internet") => [ qw(httpd boa tux roxen ftp pftp tftp proftpd wu-ftpd pure-ftpdipsec proftpd-xinetd ipchains iptables ipvsadm isdn4linux ibod jabber jabber-icq adsl squid portsentry prelude nessusd junkbuster radvd cddbp ippl iptoip jail.init) ], - _("File sharing") => [ qw(nfs nfslock smb nettalk netfs mcserv autofs amd + N("File sharing") => [ qw(nfs nfslock smb nettalk netfs mcserv autofs amd venus.init auth2.init codasrv.init update.init swat) ], - _("System") => [ qw(usb usbd pcmcia irda xinetd inetd kudzu harddrake apmd sound network xfs + N("System") => [ qw(usb usbd pcmcia irda xinetd inetd kudzu harddrake apmd sound network xfs alsa functions halt kheader killall mandrake_everytime mandrake_firstime random rawdevices single keytable syslog crond medusa-init portmap acon anacron atd gpm psacct wine acpid numlock jserver sensors mosix bpowerd bpowerfail fcron powertweak.init ups syslog-ng cvs apcupsd) ], - _("Remote Administration") => [ qw(sshd telnetd telnet rsh rlogin rexec webmin cfd heartbeat ldirectord + N("Remote Administration") => [ qw(sshd telnetd telnet rsh rlogin rexec webmin cfd heartbeat ldirectord iplog mon vncserver netsaint olympusd drakxtools_http) ], -# _("Network Client") => [ qw(ypbind nscd arpwatch fetchmail dnrd_rc diald rsync) ], -# _("Network Server") => [ qw(named bootparamd ntpd xntpd chronyd postfix sendmail +# N("Network Client") => [ qw(ypbind nscd arpwatch fetchmail dnrd_rc diald rsync) ], +# N("Network Server") => [ qw(named bootparamd ntpd xntpd chronyd postfix sendmail # imap imaps ipop2 ipop3 pop3s routed yppasswdd ypserv ldap dhcpd dhcrelay # hylafax innd identd rstatd rusersd rwalld rwhod gated # kadmin kprop krb524 krb5kdc krb5server hldsld bayonne sockd dhsd gnu-pop3d # gdips pptpd.conf vrrpd crossfire bnetd pvmd ircd sympa finger ntalk talk) ], - _("Database Server") => [ qw(mysql postgresql) ], + N("Database Server") => [ qw(mysql postgresql) ], ); my %services_root; foreach my $root (keys %root_services) { @@ -149,12 +149,12 @@ sub ask_install { $services{$_} = 0 foreach @{$l || []}; $services{$_} = 1 foreach @{$on_services || []}; - $in->ask_browse_tree_info('drakxservices', _("Choose which services should be automatically started at boot time"), + $in->ask_browse_tree_info('drakxservices', N("Choose which services should be automatically started at boot time"), { node_state => sub { $services{$_[0]} ? 'selected' : 'unselected' }, build_tree => sub { my ($add_node, $flat) = @_; - $add_node->($_, !$flat && ($services_root{$_} || _("Other"))) + $add_node->($_, !$flat && ($services_root{$_} || N("Other"))) foreach sort keys %services; }, grep_unselected => sub { grep { !$services{$_} } @_ }, @@ -167,7 +167,7 @@ sub ask_install { } }, get_status => sub { - _("Services: %d activated for %d registered", + N("Services: %d activated for %d registered", scalar(grep { $_ } values %services), scalar(values %services)); }, @@ -183,7 +183,7 @@ sub ask_standalone_gtk { require my_gtk; my_gtk->import(qw(:helpers :wrappers)); - my $W = my_gtk->new(_("Services")); + my $W = my_gtk->new(N("Services")); my ($x, $y, $w_popup); my $nopop = sub { $w_popup and $w_popup->destroy }; my $display = sub { $nopop->(); $_[0] and gtkmove(gtkshow(gtkadd($w_popup = new Gtk::Window (-popup), @@ -195,7 +195,7 @@ sub ask_standalone_gtk { my $update_service = sub { my $started = -e "/var/lock/subsys/$_[0]"; my $action = $started ? "stop" : "start"; - $_[1]->set($started ? _("running") : _("stopped")); + $_[1]->set($started ? N("running") : N("stopped")); $started, $action; }; my $strip = sub { @@ -209,31 +209,31 @@ sub ask_standalone_gtk { }; my $b = new Gtk::EventBox(); $b->set_events(["pointer_motion_mask"]); - gtkadd($W->{window}, gtkadd($b, gtkpack_($W->create_box_with_title(_("Services and deamons")), + gtkadd($W->{window}, gtkadd($b, gtkpack_($W->create_box_with_title(N("Services and deamons")), 1, gtkset_usize(createScrolledWindow(create_packtable({ col_spacings => 10, row_spacings => 3 }, map { my $service = $_; my $infos = $strip->(description($_, $prefix)); - $infos ||= _("No additional information\nabout this service, sorry."); + $infos ||= N("No additional information\nabout this service, sorry."); my $l = new Gtk::Label(); my ($started, $action) = $update_service->($service, gtkset_justify($l, 0)); [ gtkpack__(new Gtk::HBox(0,0), $_), gtkpack__(new Gtk::HBox(0,0), $l), - gtkpack__(new Gtk::HBox(0,0), gtksignal_connect(new Gtk::Button(_("Info")), clicked => sub { $display->($infos) })), + gtkpack__(new Gtk::HBox(0,0), gtksignal_connect(new Gtk::Button(N("Info")), clicked => sub { $display->($infos) })), gtkpack__(new Gtk::HBox(0,0), gtkset_active(gtksignal_connect( - new Gtk::CheckButton(_("On boot")), + new Gtk::CheckButton(N("On boot")), clicked => sub { if ($_[0]->active) { push @$on_services, $service if !member($service, @$on_services); } else { @$on_services = grep { $_ ne $service } @$on_services; }}), member($service, @$on_services))), map { my $a = $_; - gtkpack__(new Gtk::HBox(0,0), gtksignal_connect(new Gtk::Button(_($a)), + gtkpack__(new Gtk::HBox(0,0), gtksignal_connect(new Gtk::Button(translate($a)), clicked => sub { my $c = "service $service " . (lc($a) eq "start" ? "restart" : lc($a)) . " 2>&1"; local $_ = `$c`; s/\033\[[^mG]*[mG]//g; ($started, $action) = $update_service->($service, $l); $display->($_); } - )) } (__("Start"), __("Stop")) + )) } (N_("Start"), N_("Stop")) ] } @$l)), 500, 400), diff --git a/perl-install/share/advertising/01-thanks.pl b/perl-install/share/advertising/01-thanks.pl index a1155f3fb..fdc228785 100644 --- a/perl-install/share/advertising/01-thanks.pl +++ b/perl-install/share/advertising/01-thanks.pl @@ -6,9 +6,9 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Thank you for choosing Mandrake Linux 9.0"), 0, 80, 400, 0, 1], - [ _("Welcome to the Open Source world"), 0, 110, 400, 0, 0], - [ _("The success of MandrakeSoft is based upon the principle of Free Software. Your new operating system is the result of collaborative work on the part of the worldwide Linux Community"), 0, 140, 400, 0, 0], + [ N("Thank you for choosing Mandrake Linux 9.0"), 0, 80, 400, 0, 1], + [ N("Welcome to the Open Source world"), 0, 110, 400, 0, 0], + [ N("The success of MandrakeSoft is based upon the principle of Free Software. Your new operating system is the result of collaborative work on the part of the worldwide Linux Community"), 0, 140, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height, $bold ], diff --git a/perl-install/share/advertising/02-community.pl b/perl-install/share/advertising/02-community.pl index 5e86c822c..921304660 100644 --- a/perl-install/share/advertising/02-community.pl +++ b/perl-install/share/advertising/02-community.pl @@ -6,9 +6,9 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Get involved in the Free Software world"), 0, 30, 400, 0, 1], - [ _("Want to know more about the Open Source community?"), 0, 90, 400, 20, 0], - [ _("To share your own knowledge and help build Linux tools, join the discussion forums you'll find on our \"Community\" webpages"), 0, 150, 400, 0, 0], + [ N("Get involved in the Free Software world"), 0, 30, 400, 0, 1], + [ N("Want to know more about the Open Source community?"), 0, 90, 400, 20, 0], + [ N("To share your own knowledge and help build Linux tools, join the discussion forums you'll find on our \"Community\" webpages"), 0, 150, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height, $bold ], diff --git a/perl-install/share/advertising/03-internet.pl b/perl-install/share/advertising/03-internet.pl index 2b3a9046b..7311696d2 100644 --- a/perl-install/share/advertising/03-internet.pl +++ b/perl-install/share/advertising/03-internet.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Get the most from the Internet"), 0, 0, 400, 20, 1], - [ _("Mandrake Linux 9.0 has selected the best software for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail"), 0, 30, 400, 60, 0], + [ N("Get the most from the Internet"), 0, 0, 400, 20, 1], + [ N("Mandrake Linux 9.0 has selected the best software for you. Surf the Web and view animations with Mozilla and Konqueror, or read your mail and handle your personal information with Evolution and Kmail"), 0, 30, 400, 60, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/04-multimedia.pl b/perl-install/share/advertising/04-multimedia.pl index 0791afe4f..ff59ffdd9 100644 --- a/perl-install/share/advertising/04-multimedia.pl +++ b/perl-install/share/advertising/04-multimedia.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Discover the most up-to-date graphical and multimedia tools!"), 0, 0, 400, 20, 1], - [ _("Push multimedia to its limits!"), 0, 40, 400, 20, 0], - [ _("Mandrake Linux 9.0 enables you to use the very latest software to play audio files, edit and handle your images or photos, and play videos"), 0, 60, 400, 20, 0], + [ N("Discover the most up-to-date graphical and multimedia tools!"), 0, 0, 400, 20, 1], + [ N("Push multimedia to its limits!"), 0, 40, 400, 20, 0], + [ N("Mandrake Linux 9.0 enables you to use the very latest software to play audio files, edit and handle your images or photos, and play videos"), 0, 60, 400, 20, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/05-games.pl b/perl-install/share/advertising/05-games.pl index dfb3a3f95..3b8646fd4 100644 --- a/perl-install/share/advertising/05-games.pl +++ b/perl-install/share/advertising/05-games.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Games"), 0, 0, 400, 20, 1], - [ _("Mandrake Linux 9.0 provides the best Open Source games - arcade, action, strategy, ..."), 0, 30, 400, 0, 0], + [ N("Games"), 0, 0, 400, 20, 1], + [ N("Mandrake Linux 9.0 provides the best Open Source games - arcade, action, strategy, ..."), 0, 30, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/06-mcc.pl b/perl-install/share/advertising/06-mcc.pl index a77e6b367..e2af9575b 100644 --- a/perl-install/share/advertising/06-mcc.pl +++ b/perl-install/share/advertising/06-mcc.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Mandrake Control Center"), 0, 0, 400, 20, 1], - [ _("Mandrake Linux 9.0 provides a powerful tool to fully customize and configure your machine"), 0, 40, 400, 60, 0], + [ N("Mandrake Control Center"), 0, 0, 400, 20, 1], + [ N("Mandrake Linux 9.0 provides a powerful tool to fully customize and configure your machine"), 0, 40, 400, 60, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/07-desktop.pl b/perl-install/share/advertising/07-desktop.pl index 57b3ce9e1..49bb96064 100644 --- a/perl-install/share/advertising/07-desktop.pl +++ b/perl-install/share/advertising/07-desktop.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("User interfaces"), 0, 0, 400, 0, 1], - [ _("Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully modified: KDE 3, Gnome 2, WindowMaker, ..."), 0, 40, 400, 0, 0], + [ N("User interfaces"), 0, 0, 400, 0, 1], + [ N("Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully modified: KDE 3, Gnome 2, WindowMaker, ..."), 0, 40, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/08-development.pl b/perl-install/share/advertising/08-development.pl index 357d0dad5..69f8c36b8 100644 --- a/perl-install/share/advertising/08-development.pl +++ b/perl-install/share/advertising/08-development.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Development simplified"), 0, 0, 400, 0, 1], - [ _("Mandrake Linux 9.0 is the ultimate development platform"), 0, 20, 400, 0, 0], - [ _("Use the full power of the GNU gcc 3 compiler as well as the best Open Source development environments"), 0, 50, 400, 0, 0], + [ N("Development simplified"), 0, 0, 400, 0, 1], + [ N("Mandrake Linux 9.0 is the ultimate development platform"), 0, 20, 400, 0, 0], + [ N("Use the full power of the GNU gcc 3 compiler as well as the best Open Source development environments"), 0, 50, 400, 0, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/09-server.pl b/perl-install/share/advertising/09-server.pl index 15d3634a3..7aaa1f394 100644 --- a/perl-install/share/advertising/09-server.pl +++ b/perl-install/share/advertising/09-server.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Turn your machine into a reliable server"), 0, 10, 400, 20, 1], - [ _("Transform your machine into a powerful Linux server with a few clicks of your mouse: Web server, mail, firewall, router, file and print server, ..."), 0, 50, 400, 60, 0], + [ N("Turn your machine into a reliable server"), 0, 10, 400, 20, 1], + [ N("Transform your machine into a powerful Linux server with a few clicks of your mouse: Web server, mail, firewall, router, file and print server, ..."), 0, 50, 400, 60, 0], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/10-mnf.pl b/perl-install/share/advertising/10-mnf.pl index e9ed01066..d2742254d 100644 --- a/perl-install/share/advertising/10-mnf.pl +++ b/perl-install/share/advertising/10-mnf.pl @@ -6,10 +6,10 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Optimize your security"), 0, 0, 400, 0, 1], - [ _("The MandrakeSecurity range includes the Multi Network Firewall product (M.N.F.)"), 0, 20, 400, 0, 0], - [ _("This firewall product includes network features that allow you to fulfill all your security needs"), 0, 40, 400, 80, 0], - [ _("This product is available on MandrakeStore website"), 0, 60, 400, 100, 0], + [ N("Optimize your security"), 0, 0, 400, 0, 1], + [ N("The MandrakeSecurity range includes the Multi Network Firewall product (M.N.F.)"), 0, 20, 400, 0, 0], + [ N("This firewall product includes network features that allow you to fulfill all your security needs"), 0, 40, 400, 80, 0], + [ N("This product is available on MandrakeStore website"), 0, 60, 400, 100, 0], # [ 'text', $x, $y, $area_width, $area_height, $bold ], diff --git a/perl-install/share/advertising/11-mdkstore.pl b/perl-install/share/advertising/11-mdkstore.pl index 72237f5f0..1a87fd45d 100644 --- a/perl-install/share/advertising/11-mdkstore.pl +++ b/perl-install/share/advertising/11-mdkstore.pl @@ -6,7 +6,7 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("The official MandrakeSoft store"), 0, 0, 400, 20, 1], - [ _("Our full range of Linux solutions, as well as special offers on products and other \"goodies,\" are available online on our e-store:"), 0, 40, 400, 50 ], + [ N("The official MandrakeSoft store"), 0, 0, 400, 20, 1], + [ N("Our full range of Linux solutions, as well as special offers on products and other \"goodies,\" are available online on our e-store:"), 0, 40, 400, 50 ], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/12-mdkstore.pl b/perl-install/share/advertising/12-mdkstore.pl index 3d2d634dc..adb7b1b99 100644 --- a/perl-install/share/advertising/12-mdkstore.pl +++ b/perl-install/share/advertising/12-mdkstore.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Strategic partners"), 0, 0, 400, 20, 1], - [ _("MandrakeSoft works alongside a selection of companies offering professional solutions compatible with Mandrake Linux. A list of these partners is available on the MandrakeStore"), 0, 30, 400, 50, 0 ], + [ N("Strategic partners"), 0, 0, 400, 20, 1], + [ N("MandrakeSoft works alongside a selection of companies offering professional solutions compatible with Mandrake Linux. A list of these partners is available on the MandrakeStore"), 0, 30, 400, 50, 0 ], [ "www.mandrakestore.com/license", 0, 70, 400, 80, 0 ], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/13-mdkcampus.pl b/perl-install/share/advertising/13-mdkcampus.pl index 482168cbd..6963415be 100644 --- a/perl-install/share/advertising/13-mdkcampus.pl +++ b/perl-install/share/advertising/13-mdkcampus.pl @@ -6,9 +6,9 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Discover MandrakeSoft's training catalogue Linux-Campus"), 0, 0, 400, 20, 1 ], - [ _("The training program has been created to respond to the needs of both end users and experts (Network and System administrators)"), 0, 40, 400, 20, 0 ], - [ _("Certify yourself on Linux"), 0, 80, 400, 40, 0 ], - [ _("Whether you choose to teach yourself online or via our network of training partners, the Linux-Campus catalogue prepares you for the acknowledged LPI certification program (worldwide professional technical certification)"), 0, 120, 400, 20, 0 ], + [ N("Discover MandrakeSoft's training catalogue Linux-Campus"), 0, 0, 400, 20, 1 ], + [ N("The training program has been created to respond to the needs of both end users and experts (Network and System administrators)"), 0, 40, 400, 20, 0 ], + [ N("Certify yourself on Linux"), 0, 80, 400, 40, 0 ], + [ N("Whether you choose to teach yourself online or via our network of training partners, the Linux-Campus catalogue prepares you for the acknowledged LPI certification program (worldwide professional technical certification)"), 0, 120, 400, 20, 0 ], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/14-mdkexpert.pl b/perl-install/share/advertising/14-mdkexpert.pl index 7db2347d5..28d23b827 100644 --- a/perl-install/share/advertising/14-mdkexpert.pl +++ b/perl-install/share/advertising/14-mdkexpert.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Become a MandrakeExpert"), 0, 0, 400, 20, 1], - [ _("Find the solutions of your problems via MandrakeSoft's online support platform"), 0, 30, 400, 0, 0 ], - [ _("Join the MandrakeSoft support teams and the Linux Community online to share your knowledge and help others by becoming a recognized Expert on the online technical support website:"), 0, 70, 400, 0, 0 ], + [ N("Become a MandrakeExpert"), 0, 0, 400, 20, 1], + [ N("Find the solutions of your problems via MandrakeSoft's online support platform"), 0, 30, 400, 0, 0 ], + [ N("Join the MandrakeSoft support teams and the Linux Community online to share your knowledge and help others by becoming a recognized Expert on the online technical support website:"), 0, 70, 400, 0, 0 ], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/15-mdkexpert-corporate.pl b/perl-install/share/advertising/15-mdkexpert-corporate.pl index c48cfc741..37e15e299 100644 --- a/perl-install/share/advertising/15-mdkexpert-corporate.pl +++ b/perl-install/share/advertising/15-mdkexpert-corporate.pl @@ -6,9 +6,9 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("MandrakeExpert Corporate"), 0, 0, 400, 20, 1], - [ _("An online platform to respond to company's specific support needs"), 0, 50, 400, 0, 0 ], - [ _("All incidents will be followed up by a single qualified MandrakeSoft technical expert."), 0, 100, 400, 0, 0 ], + [ N("MandrakeExpert Corporate"), 0, 0, 400, 20, 1], + [ N("An online platform to respond to company's specific support needs"), 0, 50, 400, 0, 0 ], + [ N("All incidents will be followed up by a single qualified MandrakeSoft technical expert."), 0, 100, 400, 0, 0 ], [ "corporate.mandrakeexpert.com", 0, 230, 400, 0, 1], # [ 'text', $x, $y, $area_width, $area_height ], ); diff --git a/perl-install/share/advertising/17-mdkclub.pl b/perl-install/share/advertising/17-mdkclub.pl index 03485568a..fe0beeed2 100755 --- a/perl-install/share/advertising/17-mdkclub.pl +++ b/perl-install/share/advertising/17-mdkclub.pl @@ -6,8 +6,8 @@ $icon = 0; $icon_dx = 0; $icon_dy = 0; @data = ( - [ _("Discover MandrakeClub and Mandrake Corporate Club"), 0, 0, 400, 20, 1 ], - [ _("MandrakeClub and Mandrake Corporate Club were created for business and private users of Mandrake Linux who would like to directly support their favorite Linux distribution while also receiving special privileges. If you enjoy our products, if your company benefits from our products to gain a competititve edge, if you want to support Mandrake Linux development, join MandrakeClub!"), 0, 60, 400, 20, 0 ], + [ N("Discover MandrakeClub and Mandrake Corporate Club"), 0, 0, 400, 20, 1 ], + [ N("MandrakeClub and Mandrake Corporate Club were created for business and private users of Mandrake Linux who would like to directly support their favorite Linux distribution while also receiving special privileges. If you enjoy our products, if your company benefits from our products to gain a competititve edge, if you want to support Mandrake Linux development, join MandrakeClub!"), 0, 60, 400, 20, 0 ], [ ("www.mandrakeclub.com"), 0, 220, 400, 40, 0 ], [ ("www.mandrakesoft.com/corporateclub"), 0, 240, 400, 40, 0 ], # [ 'text', $x, $y, $area_width, $area_height ], diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot index 75e3cf395..ae65d1286 100644 --- a/perl-install/share/po/DrakX.pot +++ b/perl-install/share/po/DrakX.pot @@ -1,18 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-10-24 11:09+0200\n" +"POT-Creation-Date: 2002-11-06 12:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" #: ../../Xconfig/card.pm_.c:16 msgid "256 kB" @@ -163,7 +164,7 @@ msgid "Test" msgstr "" #: ../../Xconfig/main.pm_.c:118 ../../diskdrake/dav.pm_.c:67 -#: ../../diskdrake/interactive.pm_.c:385 ../../diskdrake/removable.pm_.c:25 +#: ../../diskdrake/interactive.pm_.c:391 ../../diskdrake/removable.pm_.c:25 #: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:86 msgid "Options" msgstr "" @@ -171,8 +172,8 @@ msgstr "" #: ../../Xconfig/main.pm_.c:122 ../../Xconfig/resolution_and_depth.pm_.c:269 #: ../../install_gtk.pm_.c:79 ../../install_steps_gtk.pm_.c:275 #: ../../interactive.pm_.c:127 ../../interactive.pm_.c:142 -#: ../../interactive.pm_.c:354 ../../interactive/http.pm_.c:104 -#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197 +#: ../../interactive.pm_.c:345 ../../interactive/http.pm_.c:104 +#: ../../interactive/newt.pm_.c:194 ../../interactive/newt.pm_.c:196 #: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143 #: ../../interactive/stdio.pm_.c:144 ../../my_gtk.pm_.c:160 #: ../../my_gtk.pm_.c:288 ../../my_gtk.pm_.c:311 ../../security/main.pm_.c:166 @@ -275,8 +276,8 @@ msgstr "" #: ../../Xconfig/resolution_and_depth.pm_.c:269 ../../any.pm_.c:1020 #: ../../bootlook.pm_.c:344 ../../diskdrake/smbnfs_gtk.pm_.c:87 #: ../../install_steps_gtk.pm_.c:406 ../../install_steps_gtk.pm_.c:464 -#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:354 -#: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:195 +#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:345 +#: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:194 #: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143 #: ../../my_gtk.pm_.c:159 ../../my_gtk.pm_.c:163 ../../my_gtk.pm_.c:288 #: ../../network/netconnect.pm_.c:42 ../../printerdrake.pm_.c:2164 @@ -288,7 +289,7 @@ msgstr "" #: ../../standalone/drakbackup_.c:4181 ../../standalone/drakconnect_.c:115 #: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289 #: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679 -#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:971 +#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:966 #: ../../standalone/drakgw_.c:562 ../../standalone/logdrake_.c:225 #: ../../ugtk.pm_.c:296 msgid "Cancel" @@ -514,7 +515,7 @@ msgid "" msgstr "" #: ../../any.pm_.c:184 ../../any.pm_.c:766 -#: ../../diskdrake/interactive.pm_.c:1195 +#: ../../diskdrake/interactive.pm_.c:1201 #: ../../install_steps_interactive.pm_.c:1104 msgid "Please try again" msgstr "" @@ -564,8 +565,8 @@ msgid "" msgstr "" #: ../../any.pm_.c:258 ../../standalone/drakbackup_.c:1557 -#: ../../standalone/drakbackup_.c:1670 ../../standalone/drakfont_.c:1012 -#: ../../standalone/drakfont_.c:1055 +#: ../../standalone/drakbackup_.c:1670 ../../standalone/drakfont_.c:1007 +#: ../../standalone/drakfont_.c:1050 msgid "Add" msgstr "" @@ -1154,9 +1155,9 @@ msgstr "" #: ../../bootlook.pm_.c:200 ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232 #: ../../bootlook.pm_.c:242 ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258 #: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116 -#: ../../diskdrake/interactive.pm_.c:213 ../../diskdrake/interactive.pm_.c:344 -#: ../../diskdrake/interactive.pm_.c:359 ../../diskdrake/interactive.pm_.c:473 -#: ../../diskdrake/interactive.pm_.c:478 ../../diskdrake/smbnfs_gtk.pm_.c:45 +#: ../../diskdrake/interactive.pm_.c:214 ../../diskdrake/interactive.pm_.c:350 +#: ../../diskdrake/interactive.pm_.c:365 ../../diskdrake/interactive.pm_.c:479 +#: ../../diskdrake/interactive.pm_.c:484 ../../diskdrake/smbnfs_gtk.pm_.c:45 #: ../../fsedit.pm_.c:239 ../../install_steps.pm_.c:75 #: ../../install_steps_interactive.pm_.c:67 ../../interactive/http.pm_.c:119 #: ../../interactive/http.pm_.c:120 ../../standalone/draksplash_.c:34 @@ -1269,15 +1270,15 @@ msgstr "" msgid "Yes, I want autologin with this (user, desktop)" msgstr "" -#: ../../bootlook.pm_.c:343 ../../network/netconnect.pm_.c:106 +#: ../../bootlook.pm_.c:343 ../../network/netconnect.pm_.c:101 #: ../../standalone/drakTermServ_.c:237 ../../standalone/drakTermServ_.c:367 #: ../../standalone/drakTermServ_.c:484 ../../standalone/drakbackup_.c:4190 #: ../../standalone/drakbackup_.c:4961 ../../standalone/drakconnect_.c:108 #: ../../standalone/drakconnect_.c:140 ../../standalone/drakconnect_.c:296 #: ../../standalone/drakconnect_.c:435 ../../standalone/drakconnect_.c:521 #: ../../standalone/drakconnect_.c:564 ../../standalone/drakconnect_.c:667 -#: ../../standalone/drakfont_.c:613 ../../standalone/drakfont_.c:800 -#: ../../standalone/drakfont_.c:877 ../../standalone/drakfont_.c:964 +#: ../../standalone/drakfont_.c:610 ../../standalone/drakfont_.c:797 +#: ../../standalone/drakfont_.c:874 ../../standalone/drakfont_.c:959 #: ../../ugtk.pm_.c:289 msgid "OK" msgstr "" @@ -1391,12 +1392,12 @@ msgstr "" msgid "New" msgstr "" -#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:392 +#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:398 #: ../../diskdrake/smbnfs_gtk.pm_.c:81 msgid "Unmount" msgstr "" -#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:389 +#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:395 #: ../../diskdrake/smbnfs_gtk.pm_.c:82 msgid "Mount" msgstr "" @@ -1405,8 +1406,8 @@ msgstr "" msgid "Server" msgstr "" -#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:383 -#: ../../diskdrake/interactive.pm_.c:572 ../../diskdrake/interactive.pm_.c:599 +#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:389 +#: ../../diskdrake/interactive.pm_.c:578 ../../diskdrake/interactive.pm_.c:605 #: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/removable_gtk.pm_.c:15 #: ../../diskdrake/smbnfs_gtk.pm_.c:85 msgid "Mount point" @@ -1424,13 +1425,13 @@ msgstr "" msgid "Server: " msgstr "" -#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:444 -#: ../../diskdrake/interactive.pm_.c:1093 -#: ../../diskdrake/interactive.pm_.c:1168 +#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:450 +#: ../../diskdrake/interactive.pm_.c:1099 +#: ../../diskdrake/interactive.pm_.c:1174 msgid "Mount point: " msgstr "" -#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1174 +#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1180 #, c-format msgid "Options: %s" msgstr "" @@ -1439,9 +1440,9 @@ msgstr "" msgid "Please make a backup of your data first" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:938 -#: ../../diskdrake/interactive.pm_.c:947 -#: ../../diskdrake/interactive.pm_.c:1013 +#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:944 +#: ../../diskdrake/interactive.pm_.c:953 +#: ../../diskdrake/interactive.pm_.c:1019 msgid "Read carefully!" msgstr "" @@ -1505,7 +1506,7 @@ msgstr "" msgid "Swap" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1109 +#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1115 msgid "Empty" msgstr "" @@ -1519,12 +1520,12 @@ msgstr "" msgid "Filesystem types:" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:406 +#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:412 msgid "Create" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:384 -#: ../../diskdrake/interactive.pm_.c:535 ../../diskdrake/removable.pm_.c:26 +#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:390 +#: ../../diskdrake/interactive.pm_.c:541 ../../diskdrake/removable.pm_.c:26 #: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17 msgid "Type" msgstr "" @@ -1534,7 +1535,7 @@ msgstr "" msgid "Use ``%s'' instead" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:393 +#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:399 msgid "Delete" msgstr "" @@ -1542,356 +1543,356 @@ msgstr "" msgid "Use ``Unmount'' first" msgstr "" -#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:522 +#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:528 #, c-format msgid "" "After changing type of partition %s, all data on this partition will be lost" msgstr "" -#: ../../diskdrake/interactive.pm_.c:174 +#: ../../diskdrake/interactive.pm_.c:175 msgid "Choose a partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:174 +#: ../../diskdrake/interactive.pm_.c:175 msgid "Choose another partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:199 +#: ../../diskdrake/interactive.pm_.c:200 msgid "Exit" msgstr "" -#: ../../diskdrake/interactive.pm_.c:225 +#: ../../diskdrake/interactive.pm_.c:226 msgid "Toggle to expert mode" msgstr "" -#: ../../diskdrake/interactive.pm_.c:225 +#: ../../diskdrake/interactive.pm_.c:226 msgid "Toggle to normal mode" msgstr "" -#: ../../diskdrake/interactive.pm_.c:225 +#: ../../diskdrake/interactive.pm_.c:226 msgid "Undo" msgstr "" -#: ../../diskdrake/interactive.pm_.c:244 +#: ../../diskdrake/interactive.pm_.c:245 msgid "Continue anyway?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:249 +#: ../../diskdrake/interactive.pm_.c:250 msgid "Quit without saving" msgstr "" -#: ../../diskdrake/interactive.pm_.c:249 +#: ../../diskdrake/interactive.pm_.c:250 msgid "Quit without writing the partition table?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:254 +#: ../../diskdrake/interactive.pm_.c:255 msgid "Do you want to save /etc/fstab modifications" msgstr "" -#: ../../diskdrake/interactive.pm_.c:267 -msgid "Auto allocate" +#: ../../diskdrake/interactive.pm_.c:269 +msgid "Clear all" msgstr "" -#: ../../diskdrake/interactive.pm_.c:267 -msgid "Clear all" +#: ../../diskdrake/interactive.pm_.c:270 +msgid "Auto allocate" msgstr "" -#: ../../diskdrake/interactive.pm_.c:267 +#: ../../diskdrake/interactive.pm_.c:271 #: ../../install_steps_interactive.pm_.c:220 msgid "More" msgstr "" -#: ../../diskdrake/interactive.pm_.c:271 +#: ../../diskdrake/interactive.pm_.c:276 msgid "Hard drive information" msgstr "" -#: ../../diskdrake/interactive.pm_.c:302 +#: ../../diskdrake/interactive.pm_.c:308 msgid "All primary partitions are used" msgstr "" -#: ../../diskdrake/interactive.pm_.c:303 +#: ../../diskdrake/interactive.pm_.c:309 msgid "I can't add any more partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:304 +#: ../../diskdrake/interactive.pm_.c:310 msgid "" "To have more partitions, please delete one to be able to create an extended " "partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:314 +#: ../../diskdrake/interactive.pm_.c:320 msgid "Save partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:315 +#: ../../diskdrake/interactive.pm_.c:321 msgid "Restore partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:316 +#: ../../diskdrake/interactive.pm_.c:322 msgid "Rescue partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:318 +#: ../../diskdrake/interactive.pm_.c:324 msgid "Reload partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:323 +#: ../../diskdrake/interactive.pm_.c:329 msgid "Removable media automounting" msgstr "" -#: ../../diskdrake/interactive.pm_.c:332 ../../diskdrake/interactive.pm_.c:352 +#: ../../diskdrake/interactive.pm_.c:338 ../../diskdrake/interactive.pm_.c:358 msgid "Select file" msgstr "" -#: ../../diskdrake/interactive.pm_.c:339 +#: ../../diskdrake/interactive.pm_.c:345 msgid "" "The backup partition table has not the same size\n" "Still continue?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:353 ../../harddrake/sound.pm_.c:198 -#: ../../network/netconnect.pm_.c:88 +#: ../../diskdrake/interactive.pm_.c:359 ../../harddrake/sound.pm_.c:200 +#: ../../network/modem.pm_.c:72 msgid "Warning" msgstr "" -#: ../../diskdrake/interactive.pm_.c:354 +#: ../../diskdrake/interactive.pm_.c:360 msgid "" "Insert a floppy in drive\n" "All data on this floppy will be lost" msgstr "" -#: ../../diskdrake/interactive.pm_.c:365 +#: ../../diskdrake/interactive.pm_.c:371 msgid "Trying to rescue partition table" msgstr "" -#: ../../diskdrake/interactive.pm_.c:371 +#: ../../diskdrake/interactive.pm_.c:377 msgid "Detailed information" msgstr "" -#: ../../diskdrake/interactive.pm_.c:386 ../../diskdrake/interactive.pm_.c:666 +#: ../../diskdrake/interactive.pm_.c:392 ../../diskdrake/interactive.pm_.c:672 msgid "Resize" msgstr "" -#: ../../diskdrake/interactive.pm_.c:387 ../../diskdrake/interactive.pm_.c:719 +#: ../../diskdrake/interactive.pm_.c:393 ../../diskdrake/interactive.pm_.c:725 msgid "Move" msgstr "" -#: ../../diskdrake/interactive.pm_.c:388 +#: ../../diskdrake/interactive.pm_.c:394 msgid "Format" msgstr "" -#: ../../diskdrake/interactive.pm_.c:390 +#: ../../diskdrake/interactive.pm_.c:396 msgid "Add to RAID" msgstr "" -#: ../../diskdrake/interactive.pm_.c:391 +#: ../../diskdrake/interactive.pm_.c:397 msgid "Add to LVM" msgstr "" -#: ../../diskdrake/interactive.pm_.c:394 +#: ../../diskdrake/interactive.pm_.c:400 msgid "Remove from RAID" msgstr "" -#: ../../diskdrake/interactive.pm_.c:395 +#: ../../diskdrake/interactive.pm_.c:401 msgid "Remove from LVM" msgstr "" -#: ../../diskdrake/interactive.pm_.c:396 +#: ../../diskdrake/interactive.pm_.c:402 msgid "Modify RAID" msgstr "" -#: ../../diskdrake/interactive.pm_.c:397 +#: ../../diskdrake/interactive.pm_.c:403 msgid "Use for loopback" msgstr "" -#: ../../diskdrake/interactive.pm_.c:437 +#: ../../diskdrake/interactive.pm_.c:443 msgid "Create a new partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:440 +#: ../../diskdrake/interactive.pm_.c:446 msgid "Start sector: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:442 ../../diskdrake/interactive.pm_.c:819 +#: ../../diskdrake/interactive.pm_.c:448 ../../diskdrake/interactive.pm_.c:825 msgid "Size in MB: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:443 ../../diskdrake/interactive.pm_.c:820 +#: ../../diskdrake/interactive.pm_.c:449 ../../diskdrake/interactive.pm_.c:826 msgid "Filesystem type: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:448 +#: ../../diskdrake/interactive.pm_.c:454 msgid "Preference: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:473 +#: ../../diskdrake/interactive.pm_.c:479 msgid "" "You can't create a new partition\n" "(since you reached the maximal number of primary partitions).\n" "First remove a primary partition and create an extended partition." msgstr "" -#: ../../diskdrake/interactive.pm_.c:503 +#: ../../diskdrake/interactive.pm_.c:509 msgid "Remove the loopback file?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:533 +#: ../../diskdrake/interactive.pm_.c:539 msgid "Change partition type" msgstr "" -#: ../../diskdrake/interactive.pm_.c:534 ../../diskdrake/removable.pm_.c:48 +#: ../../diskdrake/interactive.pm_.c:540 ../../diskdrake/removable.pm_.c:48 msgid "Which filesystem do you want?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:540 +#: ../../diskdrake/interactive.pm_.c:546 msgid "Switching from ext2 to ext3" msgstr "" -#: ../../diskdrake/interactive.pm_.c:570 +#: ../../diskdrake/interactive.pm_.c:576 #, c-format msgid "Where do you want to mount loopback file %s?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:571 +#: ../../diskdrake/interactive.pm_.c:577 #, c-format msgid "Where do you want to mount device %s?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:577 +#: ../../diskdrake/interactive.pm_.c:583 msgid "" "Can't unset mount point as this partition is used for loop back.\n" "Remove the loopback first" msgstr "" -#: ../../diskdrake/interactive.pm_.c:598 +#: ../../diskdrake/interactive.pm_.c:604 #, c-format msgid "Where do you want to mount %s?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:622 +#: ../../diskdrake/interactive.pm_.c:628 msgid "Computing FAT filesystem bounds" msgstr "" -#: ../../diskdrake/interactive.pm_.c:622 ../../diskdrake/interactive.pm_.c:681 +#: ../../diskdrake/interactive.pm_.c:628 ../../diskdrake/interactive.pm_.c:687 #: ../../install_interactive.pm_.c:133 msgid "Resizing" msgstr "" -#: ../../diskdrake/interactive.pm_.c:654 +#: ../../diskdrake/interactive.pm_.c:660 msgid "This partition is not resizeable" msgstr "" -#: ../../diskdrake/interactive.pm_.c:659 +#: ../../diskdrake/interactive.pm_.c:665 msgid "All data on this partition should be backed-up" msgstr "" -#: ../../diskdrake/interactive.pm_.c:661 +#: ../../diskdrake/interactive.pm_.c:667 #, c-format msgid "After resizing partition %s, all data on this partition will be lost" msgstr "" -#: ../../diskdrake/interactive.pm_.c:666 +#: ../../diskdrake/interactive.pm_.c:672 msgid "Choose the new size" msgstr "" -#: ../../diskdrake/interactive.pm_.c:667 +#: ../../diskdrake/interactive.pm_.c:673 msgid "New size in MB: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:720 +#: ../../diskdrake/interactive.pm_.c:726 msgid "Which disk do you want to move it to?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:721 +#: ../../diskdrake/interactive.pm_.c:727 msgid "Sector" msgstr "" -#: ../../diskdrake/interactive.pm_.c:722 +#: ../../diskdrake/interactive.pm_.c:728 msgid "Which sector do you want to move it to?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:725 +#: ../../diskdrake/interactive.pm_.c:731 msgid "Moving" msgstr "" -#: ../../diskdrake/interactive.pm_.c:725 +#: ../../diskdrake/interactive.pm_.c:731 msgid "Moving partition..." msgstr "" -#: ../../diskdrake/interactive.pm_.c:742 +#: ../../diskdrake/interactive.pm_.c:748 msgid "Choose an existing RAID to add to" msgstr "" -#: ../../diskdrake/interactive.pm_.c:743 ../../diskdrake/interactive.pm_.c:760 +#: ../../diskdrake/interactive.pm_.c:749 ../../diskdrake/interactive.pm_.c:766 msgid "new" msgstr "" -#: ../../diskdrake/interactive.pm_.c:758 +#: ../../diskdrake/interactive.pm_.c:764 msgid "Choose an existing LVM to add to" msgstr "" -#: ../../diskdrake/interactive.pm_.c:763 +#: ../../diskdrake/interactive.pm_.c:769 msgid "LVM name?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:804 +#: ../../diskdrake/interactive.pm_.c:810 msgid "This partition can't be used for loopback" msgstr "" -#: ../../diskdrake/interactive.pm_.c:817 +#: ../../diskdrake/interactive.pm_.c:823 msgid "Loopback" msgstr "" -#: ../../diskdrake/interactive.pm_.c:818 +#: ../../diskdrake/interactive.pm_.c:824 msgid "Loopback file name: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:823 +#: ../../diskdrake/interactive.pm_.c:829 msgid "Give a file name" msgstr "" -#: ../../diskdrake/interactive.pm_.c:826 +#: ../../diskdrake/interactive.pm_.c:832 msgid "File already used by another loopback, choose another one" msgstr "" -#: ../../diskdrake/interactive.pm_.c:827 +#: ../../diskdrake/interactive.pm_.c:833 msgid "File already exists. Use it?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:850 +#: ../../diskdrake/interactive.pm_.c:856 msgid "Mount options" msgstr "" -#: ../../diskdrake/interactive.pm_.c:857 +#: ../../diskdrake/interactive.pm_.c:863 msgid "Various" msgstr "" -#: ../../diskdrake/interactive.pm_.c:921 ../../standalone/drakfloppy_.c:104 +#: ../../diskdrake/interactive.pm_.c:927 ../../standalone/drakfloppy_.c:104 msgid "device" msgstr "" -#: ../../diskdrake/interactive.pm_.c:922 +#: ../../diskdrake/interactive.pm_.c:928 msgid "level" msgstr "" -#: ../../diskdrake/interactive.pm_.c:923 +#: ../../diskdrake/interactive.pm_.c:929 msgid "chunk size" msgstr "" -#: ../../diskdrake/interactive.pm_.c:938 +#: ../../diskdrake/interactive.pm_.c:944 msgid "Be careful: this operation is dangerous." msgstr "" -#: ../../diskdrake/interactive.pm_.c:953 +#: ../../diskdrake/interactive.pm_.c:959 msgid "What type of partitioning?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:969 +#: ../../diskdrake/interactive.pm_.c:975 #, c-format msgid "The package %s is needed. Install it?" msgstr "" -#: ../../diskdrake/interactive.pm_.c:983 +#: ../../diskdrake/interactive.pm_.c:989 msgid "" "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > " "1024).\n" @@ -1899,7 +1900,7 @@ msgid "" "need /boot" msgstr "" -#: ../../diskdrake/interactive.pm_.c:987 +#: ../../diskdrake/interactive.pm_.c:993 msgid "" "The partition you've selected to add as root (/) is physically located " "beyond\n" @@ -1907,167 +1908,167 @@ msgid "" "If you plan to use the LILO boot manager, be careful to add a /boot partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:993 +#: ../../diskdrake/interactive.pm_.c:999 msgid "" "You've selected a software RAID partition as root (/).\n" "No bootloader is able to handle this without a /boot partition.\n" "So be careful to add a /boot partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1013 +#: ../../diskdrake/interactive.pm_.c:1019 #, c-format msgid "Partition table of drive %s is going to be written to disk!" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1017 +#: ../../diskdrake/interactive.pm_.c:1023 msgid "You'll need to reboot before the modification can take place" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1028 +#: ../../diskdrake/interactive.pm_.c:1034 #, c-format msgid "After formatting partition %s, all data on this partition will be lost" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1030 +#: ../../diskdrake/interactive.pm_.c:1036 msgid "Formatting" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1031 +#: ../../diskdrake/interactive.pm_.c:1037 #, c-format msgid "Formatting loopback file %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1032 +#: ../../diskdrake/interactive.pm_.c:1038 #: ../../install_steps_interactive.pm_.c:466 #, c-format msgid "Formatting partition %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1043 +#: ../../diskdrake/interactive.pm_.c:1049 msgid "Hide files" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1043 +#: ../../diskdrake/interactive.pm_.c:1049 msgid "Move files to the new partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1044 +#: ../../diskdrake/interactive.pm_.c:1050 #, c-format msgid "" "Directory %s already contains data\n" "(%s)" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1055 +#: ../../diskdrake/interactive.pm_.c:1061 msgid "Moving files to the new partition" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1059 +#: ../../diskdrake/interactive.pm_.c:1065 #, c-format msgid "Copying %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1063 +#: ../../diskdrake/interactive.pm_.c:1069 #, c-format msgid "Removing %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1073 +#: ../../diskdrake/interactive.pm_.c:1079 #, c-format msgid "partition %s is now known as %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1094 -#: ../../diskdrake/interactive.pm_.c:1153 +#: ../../diskdrake/interactive.pm_.c:1100 +#: ../../diskdrake/interactive.pm_.c:1159 msgid "Device: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:1095 +#: ../../diskdrake/interactive.pm_.c:1101 #, c-format msgid "DOS drive letter: %s (just a guess)\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1099 -#: ../../diskdrake/interactive.pm_.c:1107 -#: ../../diskdrake/interactive.pm_.c:1172 +#: ../../diskdrake/interactive.pm_.c:1105 +#: ../../diskdrake/interactive.pm_.c:1113 +#: ../../diskdrake/interactive.pm_.c:1178 msgid "Type: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:1103 +#: ../../diskdrake/interactive.pm_.c:1109 msgid "Name: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:1111 +#: ../../diskdrake/interactive.pm_.c:1117 #, c-format msgid "Start: sector %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1112 +#: ../../diskdrake/interactive.pm_.c:1118 #, c-format msgid "Size: %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1114 +#: ../../diskdrake/interactive.pm_.c:1120 #, c-format msgid ", %s sectors" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1116 +#: ../../diskdrake/interactive.pm_.c:1122 #, c-format msgid "Cylinder %d to %d\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1117 +#: ../../diskdrake/interactive.pm_.c:1123 msgid "Formatted\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1118 +#: ../../diskdrake/interactive.pm_.c:1124 msgid "Not formatted\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1119 +#: ../../diskdrake/interactive.pm_.c:1125 msgid "Mounted\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1120 +#: ../../diskdrake/interactive.pm_.c:1126 #, c-format msgid "RAID md%s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1122 +#: ../../diskdrake/interactive.pm_.c:1128 #, c-format msgid "" "Loopback file(s):\n" " %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1123 +#: ../../diskdrake/interactive.pm_.c:1129 msgid "" "Partition booted by default\n" " (for MS-DOS boot, not for lilo)\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1125 +#: ../../diskdrake/interactive.pm_.c:1131 #, c-format msgid "Level %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1126 +#: ../../diskdrake/interactive.pm_.c:1132 #, c-format msgid "Chunk size %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1127 +#: ../../diskdrake/interactive.pm_.c:1133 #, c-format msgid "RAID-disks %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1129 +#: ../../diskdrake/interactive.pm_.c:1135 #, c-format msgid "Loopback file name: %s" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1132 +#: ../../diskdrake/interactive.pm_.c:1138 msgid "" "\n" "Chances are, this partition is\n" @@ -2075,7 +2076,7 @@ msgid "" "probably leave it alone.\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1135 +#: ../../diskdrake/interactive.pm_.c:1141 msgid "" "\n" "This special Bootstrap\n" @@ -2083,61 +2084,61 @@ msgid "" "dual-booting your system.\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1154 +#: ../../diskdrake/interactive.pm_.c:1160 msgid "Read-only" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1155 +#: ../../diskdrake/interactive.pm_.c:1161 #, c-format msgid "Size: %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1156 +#: ../../diskdrake/interactive.pm_.c:1162 #, c-format msgid "Geometry: %s cylinders, %s heads, %s sectors\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1157 +#: ../../diskdrake/interactive.pm_.c:1163 msgid "Info: " msgstr "" -#: ../../diskdrake/interactive.pm_.c:1158 +#: ../../diskdrake/interactive.pm_.c:1164 #, c-format msgid "LVM-disks %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1159 +#: ../../diskdrake/interactive.pm_.c:1165 #, c-format msgid "Partition table type: %s\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1160 +#: ../../diskdrake/interactive.pm_.c:1166 #, c-format msgid "on channel %d id %d\n" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1190 +#: ../../diskdrake/interactive.pm_.c:1196 msgid "Filesystem encryption key" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1191 +#: ../../diskdrake/interactive.pm_.c:1197 msgid "Choose your filesystem encryption key" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1194 +#: ../../diskdrake/interactive.pm_.c:1200 #, c-format msgid "This encryption key is too simple (must be at least %d characters long)" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1195 +#: ../../diskdrake/interactive.pm_.c:1201 msgid "The encryption keys do not match" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1198 +#: ../../diskdrake/interactive.pm_.c:1204 msgid "Encryption key" msgstr "" -#: ../../diskdrake/interactive.pm_.c:1199 +#: ../../diskdrake/interactive.pm_.c:1205 msgid "Encryption key (again)" msgstr "" @@ -2183,23 +2184,23 @@ msgstr "" msgid "Search servers" msgstr "" -#: ../../fs.pm_.c:547 ../../fs.pm_.c:557 ../../fs.pm_.c:561 ../../fs.pm_.c:565 -#: ../../fs.pm_.c:569 ../../fs.pm_.c:573 +#: ../../fs.pm_.c:547 ../../fs.pm_.c:548 ../../fs.pm_.c:558 ../../fs.pm_.c:562 +#: ../../fs.pm_.c:566 ../../fs.pm_.c:570 ../../fs.pm_.c:574 #, c-format msgid "%s formatting of %s failed" msgstr "" -#: ../../fs.pm_.c:610 +#: ../../fs.pm_.c:611 #, c-format msgid "I don't know how to format %s in type %s" msgstr "" -#: ../../fs.pm_.c:684 ../../fs.pm_.c:727 +#: ../../fs.pm_.c:685 ../../fs.pm_.c:728 #, c-format msgid "mounting partition %s in directory %s failed" msgstr "" -#: ../../fs.pm_.c:742 ../../partition_table.pm_.c:598 +#: ../../fs.pm_.c:743 ../../partition_table.pm_.c:599 #, c-format msgid "error unmounting %s: %s" msgstr "" @@ -2281,29 +2282,29 @@ msgstr "" msgid "cpu number " msgstr "" -#: ../../harddrake/sound.pm_.c:166 +#: ../../harddrake/sound.pm_.c:168 msgid "No alternative driver" msgstr "" -#: ../../harddrake/sound.pm_.c:167 +#: ../../harddrake/sound.pm_.c:169 #, c-format msgid "" "There's no known OSS/ALSA alternative driver for your sound card (%s) which " "currently uses \"%s\"" msgstr "" -#: ../../harddrake/sound.pm_.c:169 +#: ../../harddrake/sound.pm_.c:171 msgid "Sound configuration" msgstr "" -#: ../../harddrake/sound.pm_.c:170 +#: ../../harddrake/sound.pm_.c:172 #, c-format msgid "" "Here you can select an alternative driver (either OSS or ALSA) for your " "sound card (%s)." msgstr "" -#: ../../harddrake/sound.pm_.c:172 +#: ../../harddrake/sound.pm_.c:174 #, c-format msgid "" "\n" @@ -2312,25 +2313,25 @@ msgid "" "\"%s\")" msgstr "" -#: ../../harddrake/sound.pm_.c:174 +#: ../../harddrake/sound.pm_.c:176 msgid "Driver:" msgstr "" -#: ../../harddrake/sound.pm_.c:179 ../../standalone/drakTermServ_.c:310 +#: ../../harddrake/sound.pm_.c:181 ../../standalone/drakTermServ_.c:310 #: ../../standalone/drakbackup_.c:3929 ../../standalone/drakbackup_.c:3962 #: ../../standalone/drakbackup_.c:3988 ../../standalone/drakbackup_.c:4015 #: ../../standalone/drakbackup_.c:4042 ../../standalone/drakbackup_.c:4081 #: ../../standalone/drakbackup_.c:4102 ../../standalone/drakbackup_.c:4129 #: ../../standalone/drakbackup_.c:4159 ../../standalone/drakbackup_.c:4185 -#: ../../standalone/drakbackup_.c:4210 ../../standalone/drakfont_.c:701 +#: ../../standalone/drakbackup_.c:4210 ../../standalone/drakfont_.c:698 msgid "Help" msgstr "" -#: ../../harddrake/sound.pm_.c:181 +#: ../../harddrake/sound.pm_.c:183 msgid "Switching between ALSA and OSS help" msgstr "" -#: ../../harddrake/sound.pm_.c:182 +#: ../../harddrake/sound.pm_.c:184 msgid "" "OSS (Open Sound System) was the first sound API. It's an OS independant " "sound API (it's available on most unices systems) but it's a very basic and " @@ -2349,7 +2350,7 @@ msgid "" "the ALSA library.\n" msgstr "" -#: ../../harddrake/sound.pm_.c:198 +#: ../../harddrake/sound.pm_.c:200 #, c-format msgid "" "The old \"%s\" driver is blacklisted.\n" @@ -2359,29 +2360,29 @@ msgid "" "The new \"%s\" driver'll only be used on next bootstrap." msgstr "" -#: ../../harddrake/sound.pm_.c:201 ../../standalone/drakconnect_.c:301 +#: ../../harddrake/sound.pm_.c:203 ../../standalone/drakconnect_.c:301 msgid "Please Wait... Applying the configuration" msgstr "" -#: ../../harddrake/sound.pm_.c:201 ../../harddrake/ui.pm_.c:153 -#: ../../interactive.pm_.c:391 +#: ../../harddrake/sound.pm_.c:203 ../../harddrake/ui.pm_.c:153 +#: ../../interactive.pm_.c:382 msgid "Please wait" msgstr "" -#: ../../harddrake/sound.pm_.c:206 +#: ../../harddrake/sound.pm_.c:208 msgid "No known driver" msgstr "" -#: ../../harddrake/sound.pm_.c:207 +#: ../../harddrake/sound.pm_.c:209 #, c-format msgid "There's no known driver for your sound card (%s)" msgstr "" -#: ../../harddrake/sound.pm_.c:210 +#: ../../harddrake/sound.pm_.c:212 msgid "Unkown driver" msgstr "" -#: ../../harddrake/sound.pm_.c:211 +#: ../../harddrake/sound.pm_.c:213 #, c-format msgid "" "The \"%s\" driver for your sound card is unlisted\n" @@ -3665,7 +3666,7 @@ msgid "" "defcfg=floppy''" msgstr "" -#: ../../install_any.pm_.c:920 ../../partition_table.pm_.c:767 +#: ../../install_any.pm_.c:920 ../../partition_table.pm_.c:768 #, c-format msgid "Error reading file %s" msgstr "" @@ -4920,20 +4921,20 @@ msgstr "" msgid "Choose a file" msgstr "" -#: ../../interactive.pm_.c:320 +#: ../../interactive.pm_.c:318 msgid "Advanced" msgstr "" -#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:104 +#: ../../interactive.pm_.c:319 ../../security/main.pm_.c:104 msgid "Basic" msgstr "" -#: ../../interactive/newt.pm_.c:195 ../../my_gtk.pm_.c:159 +#: ../../interactive/newt.pm_.c:194 ../../my_gtk.pm_.c:159 #: ../../printerdrake.pm_.c:2164 msgid "<- Previous" msgstr "" -#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197 +#: ../../interactive/newt.pm_.c:194 ../../interactive/newt.pm_.c:196 #: ../../standalone/drakbackup_.c:4111 ../../standalone/drakbackup_.c:4138 #: ../../standalone/drakbackup_.c:4168 ../../standalone/drakbackup_.c:4194 msgid "Next" @@ -5690,10 +5691,10 @@ msgid "Host name" msgstr "" #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44 -#: ../../network/netconnect.pm_.c:99 ../../network/netconnect.pm_.c:113 -#: ../../network/netconnect.pm_.c:168 ../../network/netconnect.pm_.c:183 -#: ../../network/netconnect.pm_.c:210 ../../network/netconnect.pm_.c:233 -#: ../../network/netconnect.pm_.c:241 +#: ../../network/netconnect.pm_.c:94 ../../network/netconnect.pm_.c:108 +#: ../../network/netconnect.pm_.c:163 ../../network/netconnect.pm_.c:178 +#: ../../network/netconnect.pm_.c:206 ../../network/netconnect.pm_.c:230 +#: ../../network/netconnect.pm_.c:238 msgid "Network Configuration Wizard" msgstr "" @@ -5864,6 +5865,30 @@ msgstr "" msgid "Second DNS Server (optional)" msgstr "" +#: ../../network/modem.pm_.c:72 +msgid "" +"Your modem isn't supported by the system.\n" +"Take a look at http://www.linmodems.org" +msgstr "" + +#: ../../network/modem.pm_.c:74 +#, c-format +msgid "" +"\"%s\" based winmodem detected, do you want to install needed software ?" +msgstr "" + +#: ../../network/modem.pm_.c:74 +msgid "Do nothing" +msgstr "" + +#: ../../network/modem.pm_.c:74 +msgid "Install rpm" +msgstr "" + +#: ../../network/modem.pm_.c:74 +msgid "Title" +msgstr "" + #: ../../network/netconnect.pm_.c:29 msgid "" "\n" @@ -5906,22 +5931,12 @@ msgstr "" msgid "Internet connection & configuration" msgstr "" -#: ../../network/netconnect.pm_.c:88 -#, c-format -msgid "" -"You have internal winmodem(s) :\n" -"\n" -"%s\n" -"\n" -" Go to http://www.linmodem.org for further information" -msgstr "" - -#: ../../network/netconnect.pm_.c:104 +#: ../../network/netconnect.pm_.c:99 #, c-format msgid "We are now going to configure the %s connection." msgstr "" -#: ../../network/netconnect.pm_.c:113 +#: ../../network/netconnect.pm_.c:108 #, c-format msgid "" "\n" @@ -5933,12 +5948,12 @@ msgid "" "Press OK to continue." msgstr "" -#: ../../network/netconnect.pm_.c:142 ../../network/netconnect.pm_.c:260 -#: ../../network/netconnect.pm_.c:280 ../../network/tools.pm_.c:63 +#: ../../network/netconnect.pm_.c:137 ../../network/netconnect.pm_.c:257 +#: ../../network/netconnect.pm_.c:277 ../../network/tools.pm_.c:63 msgid "Network Configuration" msgstr "" -#: ../../network/netconnect.pm_.c:143 +#: ../../network/netconnect.pm_.c:138 msgid "" "Because you are doing a network installation, your network is already " "configured.\n" @@ -5946,7 +5961,7 @@ msgid "" "Internet & Network connection.\n" msgstr "" -#: ../../network/netconnect.pm_.c:169 +#: ../../network/netconnect.pm_.c:164 msgid "" "Welcome to The Network Configuration Wizard.\n" "\n" @@ -5954,94 +5969,98 @@ msgid "" "If you don't want to use the auto detection, deselect the checkbox.\n" msgstr "" -#: ../../network/netconnect.pm_.c:175 +#: ../../network/netconnect.pm_.c:170 msgid "Choose the profile to configure" msgstr "" -#: ../../network/netconnect.pm_.c:176 +#: ../../network/netconnect.pm_.c:171 msgid "Use auto detection" msgstr "" -#: ../../network/netconnect.pm_.c:177 ../../printerdrake.pm_.c:3199 +#: ../../network/netconnect.pm_.c:172 ../../printerdrake.pm_.c:3199 #: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277 #: ../../standalone/drakfloppy_.c:146 msgid "Expert Mode" msgstr "" -#: ../../network/netconnect.pm_.c:183 ../../printerdrake.pm_.c:405 +#: ../../network/netconnect.pm_.c:178 ../../printerdrake.pm_.c:405 msgid "Detecting devices..." msgstr "" -#: ../../network/netconnect.pm_.c:194 ../../network/netconnect.pm_.c:203 +#: ../../network/netconnect.pm_.c:198 msgid "Normal modem connection" msgstr "" -#: ../../network/netconnect.pm_.c:194 ../../network/netconnect.pm_.c:203 +#: ../../network/netconnect.pm_.c:198 #, c-format msgid "detected on port %s" msgstr "" -#: ../../network/netconnect.pm_.c:195 ../../network/netconnect.pm_.c:204 +#: ../../network/netconnect.pm_.c:199 +msgid "Winmodem connection" +msgstr "" + +#: ../../network/netconnect.pm_.c:199 ../../network/netconnect.pm_.c:201 +msgid "detected" +msgstr "" + +#: ../../network/netconnect.pm_.c:200 msgid "ISDN connection" msgstr "" -#: ../../network/netconnect.pm_.c:195 ../../network/netconnect.pm_.c:204 +#: ../../network/netconnect.pm_.c:200 #, c-format msgid "detected %s" msgstr "" -#: ../../network/netconnect.pm_.c:196 ../../network/netconnect.pm_.c:205 +#: ../../network/netconnect.pm_.c:201 msgid "ADSL connection" msgstr "" -#: ../../network/netconnect.pm_.c:196 ../../network/netconnect.pm_.c:205 -msgid "detected" -msgstr "" - -#: ../../network/netconnect.pm_.c:197 ../../network/netconnect.pm_.c:206 +#: ../../network/netconnect.pm_.c:202 msgid "Cable connection" msgstr "" -#: ../../network/netconnect.pm_.c:197 ../../network/netconnect.pm_.c:206 +#: ../../network/netconnect.pm_.c:202 msgid "cable connection detected" msgstr "" -#: ../../network/netconnect.pm_.c:198 ../../network/netconnect.pm_.c:207 +#: ../../network/netconnect.pm_.c:203 msgid "LAN connection" msgstr "" -#: ../../network/netconnect.pm_.c:198 ../../network/netconnect.pm_.c:207 +#: ../../network/netconnect.pm_.c:203 msgid "ethernet card(s) detected" msgstr "" -#: ../../network/netconnect.pm_.c:210 +#: ../../network/netconnect.pm_.c:206 msgid "Choose the connection you want to configure" msgstr "" -#: ../../network/netconnect.pm_.c:234 +#: ../../network/netconnect.pm_.c:231 msgid "" "You have configured multiple ways to connect to the Internet.\n" "Choose the one you want to use.\n" "\n" msgstr "" -#: ../../network/netconnect.pm_.c:235 +#: ../../network/netconnect.pm_.c:232 msgid "Internet connection" msgstr "" -#: ../../network/netconnect.pm_.c:241 +#: ../../network/netconnect.pm_.c:238 msgid "Do you want to start the connection at boot?" msgstr "" -#: ../../network/netconnect.pm_.c:255 +#: ../../network/netconnect.pm_.c:252 msgid "Network configuration" msgstr "" -#: ../../network/netconnect.pm_.c:256 +#: ../../network/netconnect.pm_.c:253 msgid "The network needs to be restarted" msgstr "" -#: ../../network/netconnect.pm_.c:260 +#: ../../network/netconnect.pm_.c:257 #, c-format msgid "" "A problem occured while restarting the network: \n" @@ -6049,20 +6068,20 @@ msgid "" "%s" msgstr "" -#: ../../network/netconnect.pm_.c:270 +#: ../../network/netconnect.pm_.c:267 msgid "" "Congratulations, the network and Internet configuration is finished.\n" "The configuration will now be applied to your system.\n" "\n" msgstr "" -#: ../../network/netconnect.pm_.c:274 +#: ../../network/netconnect.pm_.c:271 msgid "" "After this is done, we recommend that you restart your X environment to " "avoid any hostname-related problems." msgstr "" -#: ../../network/netconnect.pm_.c:275 +#: ../../network/netconnect.pm_.c:272 msgid "" "Problems occured during configuration.\n" "Test your connection via net_monitor or mcc. If your connection doesn't " @@ -6286,31 +6305,31 @@ msgstr "" msgid "United Kingdom" msgstr "" -#: ../../partition_table.pm_.c:602 +#: ../../partition_table.pm_.c:603 msgid "mount failed: " msgstr "" -#: ../../partition_table.pm_.c:666 +#: ../../partition_table.pm_.c:667 msgid "Extended partition not supported on this platform" msgstr "" -#: ../../partition_table.pm_.c:684 +#: ../../partition_table.pm_.c:685 msgid "" "You have a hole in your partition table but I can't use it.\n" "The only solution is to move your primary partitions to have the hole next " "to the extended partitions." msgstr "" -#: ../../partition_table.pm_.c:774 +#: ../../partition_table.pm_.c:775 #, c-format msgid "Restoring from file %s failed: %s" msgstr "" -#: ../../partition_table.pm_.c:776 +#: ../../partition_table.pm_.c:777 msgid "Bad backup file" msgstr "" -#: ../../partition_table.pm_.c:798 +#: ../../partition_table.pm_.c:799 #, c-format msgid "Error writing to file %s" msgstr "" @@ -6370,7 +6389,7 @@ msgstr "" msgid "CUPS - Common Unix Printing System" msgstr "" -#: ../../printer.pm_.c:45 ../../printer.pm_.c:1182 +#: ../../printer.pm_.c:45 ../../printer.pm_.c:1186 msgid "CUPS" msgstr "" @@ -6410,99 +6429,99 @@ msgstr "" msgid "Pipe job into a command" msgstr "" -#: ../../printer.pm_.c:350 ../../printer.pm_.c:392 ../../printer.pm_.c:571 +#: ../../printer.pm_.c:354 ../../printer.pm_.c:396 ../../printer.pm_.c:575 msgid "Unknown Model" msgstr "" -#: ../../printer.pm_.c:792 ../../printer.pm_.c:983 ../../printer.pm_.c:1375 +#: ../../printer.pm_.c:796 ../../printer.pm_.c:987 ../../printer.pm_.c:1379 #: ../../printerdrake.pm_.c:2300 ../../printerdrake.pm_.c:3467 msgid "Unknown model" msgstr "" -#: ../../printer.pm_.c:820 +#: ../../printer.pm_.c:824 msgid "Local Printers" msgstr "" -#: ../../printer.pm_.c:822 ../../printer.pm_.c:1183 +#: ../../printer.pm_.c:826 ../../printer.pm_.c:1187 msgid "Remote Printers" msgstr "" -#: ../../printer.pm_.c:829 ../../printerdrake.pm_.c:420 +#: ../../printer.pm_.c:833 ../../printerdrake.pm_.c:420 #, c-format msgid " on parallel port \\/*%s" msgstr "" -#: ../../printer.pm_.c:832 ../../printerdrake.pm_.c:422 +#: ../../printer.pm_.c:836 ../../printerdrake.pm_.c:422 #, c-format msgid ", USB printer \\/*%s" msgstr "" -#: ../../printer.pm_.c:837 +#: ../../printer.pm_.c:841 #, c-format msgid ", multi-function device on parallel port \\/*%s" msgstr "" -#: ../../printer.pm_.c:840 +#: ../../printer.pm_.c:844 msgid ", multi-function device on USB" msgstr "" -#: ../../printer.pm_.c:842 +#: ../../printer.pm_.c:846 msgid ", multi-function device on HP JetDirect" msgstr "" -#: ../../printer.pm_.c:844 +#: ../../printer.pm_.c:848 msgid ", multi-function device" msgstr "" -#: ../../printer.pm_.c:847 +#: ../../printer.pm_.c:851 #, c-format msgid ", printing to %s" msgstr "" -#: ../../printer.pm_.c:849 +#: ../../printer.pm_.c:853 #, c-format msgid " on LPD server \"%s\", printer \"%s\"" msgstr "" -#: ../../printer.pm_.c:851 +#: ../../printer.pm_.c:855 #, c-format msgid ", TCP/IP host \"%s\", port %s" msgstr "" -#: ../../printer.pm_.c:855 +#: ../../printer.pm_.c:859 #, c-format msgid " on SMB/Windows server \"%s\", share \"%s\"" msgstr "" -#: ../../printer.pm_.c:859 +#: ../../printer.pm_.c:863 #, c-format msgid " on Novell server \"%s\", printer \"%s\"" msgstr "" -#: ../../printer.pm_.c:861 +#: ../../printer.pm_.c:865 #, c-format msgid ", using command %s" msgstr "" -#: ../../printer.pm_.c:980 ../../printerdrake.pm_.c:1696 +#: ../../printer.pm_.c:984 ../../printerdrake.pm_.c:1696 msgid "Raw printer (No driver)" msgstr "" -#: ../../printer.pm_.c:1152 +#: ../../printer.pm_.c:1156 #, c-format msgid "(on %s)" msgstr "" -#: ../../printer.pm_.c:1154 +#: ../../printer.pm_.c:1158 msgid "(on this machine)" msgstr "" -#: ../../printer.pm_.c:1179 +#: ../../printer.pm_.c:1183 #, c-format msgid "On CUPS server \"%s\"" msgstr "" -#: ../../printer.pm_.c:1185 ../../printerdrake.pm_.c:3119 +#: ../../printer.pm_.c:1189 ../../printerdrake.pm_.c:3119 #: ../../printerdrake.pm_.c:3130 ../../printerdrake.pm_.c:3356 #: ../../printerdrake.pm_.c:3408 ../../printerdrake.pm_.c:3434 #: ../../printerdrake.pm_.c:3609 ../../printerdrake.pm_.c:3611 @@ -7470,8 +7489,8 @@ msgstr "" #: ../../printerdrake.pm_.c:2394 ../../printerdrake.pm_.c:2395 #: ../../printerdrake.pm_.c:3453 ../../standalone/drakTermServ_.c:312 #: ../../standalone/drakbackup_.c:1559 ../../standalone/drakbackup_.c:4207 -#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:706 -#: ../../standalone/drakfont_.c:1015 +#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:703 +#: ../../standalone/drakfont_.c:1010 msgid "Close" msgstr "" @@ -9057,7 +9076,7 @@ msgid "Can't create catalog!" msgstr "" #: ../../standalone/drakbackup_.c:1516 ../../standalone/drakbackup_.c:1527 -#: ../../standalone/drakfont_.c:1005 +#: ../../standalone/drakfont_.c:1000 msgid "File Selection" msgstr "" @@ -9106,7 +9125,7 @@ msgstr "" msgid "Use Incremental Backups (do not replace old backups)" msgstr "" -#: ../../standalone/drakbackup_.c:1671 ../../standalone/drakfont_.c:1059 +#: ../../standalone/drakbackup_.c:1671 ../../standalone/drakfont_.c:1054 msgid "Remove Selected" msgstr "" @@ -10621,7 +10640,7 @@ msgstr "" msgid "xfs restart" msgstr "" -#: ../../standalone/drakfont_.c:543 ../../standalone/drakfont_.c:952 +#: ../../standalone/drakfont_.c:542 msgid "" "Before installing any fonts, be sure that you have the right to use and " "install them on your system.\n" @@ -10630,95 +10649,95 @@ msgid "" "may hang up your X Server." msgstr "" -#: ../../standalone/drakfont_.c:631 +#: ../../standalone/drakfont_.c:628 msgid "Fonts Importation" msgstr "" -#: ../../standalone/drakfont_.c:661 +#: ../../standalone/drakfont_.c:658 msgid "Get Windows Fonts" msgstr "" -#: ../../standalone/drakfont_.c:669 +#: ../../standalone/drakfont_.c:666 msgid "Uninstall Fonts" msgstr "" -#: ../../standalone/drakfont_.c:680 +#: ../../standalone/drakfont_.c:677 msgid "Advanced Options" msgstr "" -#: ../../standalone/drakfont_.c:688 +#: ../../standalone/drakfont_.c:685 msgid "Font List" msgstr "" -#: ../../standalone/drakfont_.c:910 +#: ../../standalone/drakfont_.c:906 msgid "Choose the applications that will support the fonts:" msgstr "" -#: ../../standalone/drakfont_.c:919 +#: ../../standalone/drakfont_.c:914 msgid "Ghostscript" msgstr "" -#: ../../standalone/drakfont_.c:926 +#: ../../standalone/drakfont_.c:921 msgid "StarOffice" msgstr "" -#: ../../standalone/drakfont_.c:933 +#: ../../standalone/drakfont_.c:928 msgid "Abiword" msgstr "" -#: ../../standalone/drakfont_.c:940 +#: ../../standalone/drakfont_.c:935 msgid "Generic Printers" msgstr "" -#: ../../standalone/drakfont_.c:1017 +#: ../../standalone/drakfont_.c:1012 msgid "Select the font file or directory and click on 'Add'" msgstr "" -#: ../../standalone/drakfont_.c:1064 +#: ../../standalone/drakfont_.c:1059 msgid "Install List" msgstr "" -#: ../../standalone/drakfont_.c:1107 +#: ../../standalone/drakfont_.c:1102 msgid "click here if you are sure." msgstr "" -#: ../../standalone/drakfont_.c:1114 +#: ../../standalone/drakfont_.c:1109 msgid "here if no." msgstr "" -#: ../../standalone/drakfont_.c:1175 +#: ../../standalone/drakfont_.c:1170 msgid "Unselected All" msgstr "" -#: ../../standalone/drakfont_.c:1179 +#: ../../standalone/drakfont_.c:1174 msgid "Selected All" msgstr "" -#: ../../standalone/drakfont_.c:1183 +#: ../../standalone/drakfont_.c:1178 msgid "Remove List" msgstr "" -#: ../../standalone/drakfont_.c:1205 ../../standalone/drakfont_.c:1238 +#: ../../standalone/drakfont_.c:1200 ../../standalone/drakfont_.c:1233 msgid "Initials tests" msgstr "" -#: ../../standalone/drakfont_.c:1208 +#: ../../standalone/drakfont_.c:1203 msgid "Copy fonts on your system" msgstr "" -#: ../../standalone/drakfont_.c:1212 +#: ../../standalone/drakfont_.c:1207 msgid "Install & convert Fonts" msgstr "" -#: ../../standalone/drakfont_.c:1216 +#: ../../standalone/drakfont_.c:1211 msgid "Post Install" msgstr "" -#: ../../standalone/drakfont_.c:1241 +#: ../../standalone/drakfont_.c:1236 msgid "Remove fonts on your system" msgstr "" -#: ../../standalone/drakfont_.c:1245 +#: ../../standalone/drakfont_.c:1240 msgid "Post Uninstall" msgstr "" @@ -11778,229 +11797,229 @@ msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*" msgstr "" #: ../../share/compssUsers:999 -msgid "Web/FTP" +msgid "Office Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Network Computer (client)" +msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "NFS server, SMB server, Proxy server, ssh server" +msgid "Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Office" +msgid "Game station" msgstr "" #: ../../share/compssUsers:999 -msgid "Gnome Workstation" +msgid "Amusement programs: arcade, boards, strategy, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "Tools for your Palm Pilot or your Visor" +msgid "Multimedia station" msgstr "" #: ../../share/compssUsers:999 -msgid "Workstation" +msgid "Sound and video playing/editing programs" msgstr "" #: ../../share/compssUsers:999 -msgid "Firewall/Router" +msgid "Internet station" msgstr "" #: ../../share/compssUsers:999 -msgid "Domain Name and Network Information Server" +msgid "Set of tools to read and send mail and news (pine, mutt, tin..) and to browse the Web" msgstr "" #: ../../share/compssUsers:999 -msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc" +msgid "Network Computer (client)" msgstr "" #: ../../share/compssUsers:999 -msgid "Audio-related tools: mp3 or midi players, mixers, etc" +msgid "Clients for different protocols including ssh" msgstr "" #: ../../share/compssUsers:999 -msgid "Linux Standard Base. Third party applications support" +msgid "Configuration" msgstr "" #: ../../share/compssUsers:999 -msgid "Books and Howto's on Linux and Free Software" +msgid "Tools to ease the configuration of your computer" msgstr "" #: ../../share/compssUsers:999 -msgid "KDE Workstation" +msgid "Scientific Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc" +msgid "Console Tools" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia - Video" +msgid "Editors, shells, file tools, terminals" msgstr "" #: ../../share/compssUsers:999 -msgid "Set of tools for mail, news, web, file transfer, and chat" +msgid "KDE Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Database" +msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools" msgstr "" #: ../../share/compssUsers:999 -msgid "PostgreSQL or MySQL database server" +msgid "Graphical Environment" msgstr "" #: ../../share/compssUsers:999 -msgid "Tools to ease the configuration of your computer" +msgid "Gnome Workstation" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia - Sound" +msgid "A graphical environment with user-friendly set of applications and desktop tools" msgstr "" #: ../../share/compssUsers:999 -msgid "Documentation" +msgid "Other Graphical Desktops" msgstr "" #: ../../share/compssUsers:999 -msgid "Console Tools" +msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "Postfix mail server, Inn news server" +msgid "Development" msgstr "" #: ../../share/compssUsers:999 -msgid "Internet station" +msgid "C and C++ development libraries, programs and include files" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia station" +msgid "Documentation" msgstr "" #: ../../share/compssUsers:999 -msgid "Configuration" +msgid "Books and Howto's on Linux and Free Software" msgstr "" #: ../../share/compssUsers:999 -msgid "More Graphical Desktops (Gnome, IceWM)" +msgid "LSB" msgstr "" #: ../../share/compssUsers:999 -msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools" +msgid "Linux Standard Base. Third party applications support" msgstr "" #: ../../share/compssUsers:999 -msgid "Graphical Environment" +msgid "Web/FTP" msgstr "" #: ../../share/compssUsers:999 -msgid "Development" +msgid "Apache, Pro-ftpd" msgstr "" #: ../../share/compssUsers:999 -msgid "Apache, Pro-ftpd" +msgid "Mail/Groupware/News" msgstr "" #: ../../share/compssUsers:999 -msgid "Tools to create and burn CD's" +msgid "Postfix mail server, Inn news server" msgstr "" #: ../../share/compssUsers:999 -msgid "Office Workstation" +msgid "Database" msgstr "" #: ../../share/compssUsers:999 -msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc" +msgid "PostgreSQL or MySQL database server" msgstr "" #: ../../share/compssUsers:999 -msgid "Graphics programs such as The Gimp" +msgid "Firewall/Router" msgstr "" #: ../../share/compssUsers:999 -msgid "DNS/NIS " +msgid "Internet gateway" msgstr "" #: ../../share/compssUsers:999 -msgid "C and C++ development libraries, programs and include files" +msgid "DNS/NIS " msgstr "" #: ../../share/compssUsers:999 -msgid "Network Computer server" +msgid "Domain Name and Network Information Server" msgstr "" #: ../../share/compssUsers:999 -msgid "Mail/Groupware/News" +msgid "Network Computer server" msgstr "" #: ../../share/compssUsers:999 -msgid "Game station" +msgid "NFS server, SMB server, Proxy server, ssh server" msgstr "" #: ../../share/compssUsers:999 -msgid "Video players and editors" +msgid "Office" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia - Graphics" +msgid "Set of tools for mail, news, web, file transfer, and chat" msgstr "" #: ../../share/compssUsers:999 -msgid "Amusement programs: arcade, boards, strategy, etc" +msgid "Multimedia - Graphics" msgstr "" #: ../../share/compssUsers:999 -msgid "Set of tools to read and send mail and news (pine, mutt, tin..) and to browse the Web" +msgid "Graphics programs such as The Gimp" msgstr "" #: ../../share/compssUsers:999 -msgid "Personal Finance" +msgid "Multimedia - Sound" msgstr "" #: ../../share/compssUsers:999 -msgid "A graphical environment with user-friendly set of applications and desktop tools" +msgid "Audio-related tools: mp3 or midi players, mixers, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "Clients for different protocols including ssh" +msgid "Multimedia - Video" msgstr "" #: ../../share/compssUsers:999 -msgid "LSB" +msgid "Video players and editors" msgstr "" #: ../../share/compssUsers:999 -msgid "Internet gateway" +msgid "Multimedia - CD Burning" msgstr "" #: ../../share/compssUsers:999 -msgid "Sound and video playing/editing programs" +msgid "Tools to create and burn CD's" msgstr "" #: ../../share/compssUsers:999 -msgid "Other Graphical Desktops" +msgid "More Graphical Desktops (Gnome, IceWM)" msgstr "" #: ../../share/compssUsers:999 -msgid "Editors, shells, file tools, terminals" +msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc" msgstr "" #: ../../share/compssUsers:999 -msgid "Programs to manage your finance, such as gnucash" +msgid "Personal Information Management" msgstr "" #: ../../share/compssUsers:999 -msgid "Personal Information Management" +msgid "Tools for your Palm Pilot or your Visor" msgstr "" #: ../../share/compssUsers:999 -msgid "Multimedia - CD Burning" +msgid "Personal Finance" msgstr "" #: ../../share/compssUsers:999 -msgid "Scientific Workstation" +msgid "Programs to manage your finance, such as gnucash" msgstr "" diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile index 4abfe680c..39c272022 100644 --- a/perl-install/share/po/Makefile +++ b/perl-install/share/po/Makefile @@ -40,7 +40,7 @@ $(POFILES): DrakX.pot DrakX.pot: $(PMSFILES) $(MAKE) $(PMSCFILES); - xgettext -F -n --add-comments='-PO' --keyword=_ --keyword=__ -o $@ $(PMSCFILES) + xgettext -F -n --add-comments='-PO' --keyword=N --keyword=N_ -o $@ $(PMSCFILES) rm $(PMSCFILES) perl i18n_compssUsers 2>/dev/null >> $@ diff --git a/perl-install/share/po/b_dump_strings.pm b/perl-install/share/po/b_dump_strings.pm index f29275ecd..791eb97aa 100644 --- a/perl-install/share/po/b_dump_strings.pm +++ b/perl-install/share/po/b_dump_strings.pm @@ -24,7 +24,7 @@ sub B::OP::debug { $s =~ s/"/\\"/g; if ($l->first->sv->NAME eq '_') { - print OUT qq($::pkg _("$s")\n); + print OUT qq($::pkg N("$s")\n); } } } diff --git a/perl-install/share/po/fake_c.pl b/perl-install/share/po/fake_c.pl index 21cf25b04..cd80801eb 100755 --- a/perl-install/share/po/fake_c.pl +++ b/perl-install/share/po/fake_c.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -lp -s|^(__?\()| $1|; # add a blank at the beginning (?!) +s|^(N_?\()| $1|; # add a blank at the beginning (?!) -s|_\(\[(.*),\s*(.*),\s*(.*)\]|ngettext($2,$3,$1)|; # special plural form handling +s|N\(\[(.*),\s*(.*),\s*(.*)\]|ngettext($2,$3,$1)|; # special plural form handling s,\Qs/#.*//,,; # ugly special case diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index b0db40100..a97267669 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -46,7 +46,7 @@ sub install { if ($o->{in}->isa('interactive::newt')) { $o->{in}->suspend; } else { - $wait = $o->{in}->wait_message('', _("Installing packages...")); + $wait = $o->{in}->wait_message('', N("Installing packages...")); } standalone::explanations("installed packages @l"); my $ret = system('urpmi', '--allow-medium-change', '--auto', '--best-output', @l) == 0; @@ -63,12 +63,12 @@ sub ensure_is_installed { my ($o, $pkg, $file, $auto) = @_; if (! -e $file) { - $o->{in}->ask_okcancel('', _("The package %s needs to be installed. Do you want to install it?", $pkg), 1) + $o->{in}->ask_okcancel('', N("The package %s needs to be installed. Do you want to install it?", $pkg), 1) or return if !$auto; $o->{in}->do_pkgs->install($pkg); } if (! -e $file) { - $o->{in}->ask_warn('', _("Mandatory package %s is missing", $pkg)); + $o->{in}->ask_warn('', N("Mandatory package %s is missing", $pkg)); return; } 1; diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 608c2e424..80f324fe0 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -25,6 +25,7 @@ use Xconfig::main; use Xconfig::xfree; use Xconfig::default; use interactive; +use modules; use common; use any; use c; @@ -145,11 +146,11 @@ sub ask_for_X_restart { my ($wm, $pid) = any::running_window_manager(); if (!$wm) { - $in->ask_warn('', _("Please log out and then use Ctrl-Alt-BackSpace")); + $in->ask_warn('', N("Please log out and then use Ctrl-Alt-BackSpace")); return; } - $in->ask_okcancel('', _("Please relog into %s to activate the changes", ucfirst (lc $wm)), 1) or return; + $in->ask_okcancel('', N("Please relog into %s to activate the changes", ucfirst (lc $wm)), 1) or return; fork and return; any::ask_window_manager_to_logout($wm); diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ index 9dd97f9f1..2d438757c 100755 --- a/perl-install/standalone/drakTermServ +++ b/perl-install/standalone/drakTermServ @@ -234,7 +234,7 @@ sub display_error { $error_box = gtkpack_(new Gtk::VBox(0,0), 1, new Gtk::Label($message), 0, gtkadd(gtkset_layout(new Gtk::HButtonBox, -spread), - gtksignal_connect(new Gtk::Button(_("OK")), clicked => + gtksignal_connect(new Gtk::Button(N("OK")), clicked => sub { ${$central_widget}->destroy(); create_fontsel() }), ), ) @@ -249,7 +249,7 @@ sub interactive_mode { $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(_("Mandrake Terminal Server Configuration")); + $window1->set_title(N("Mandrake Terminal Server Configuration")); $window1->set_border_width(5); my ($pix_user_map, $pix_user_mask) = gtkcreate_png("ic82-network-40"); my ($pix_u_map, $pix_u_mask) = gtkcreate_png("drakTS.620x57"); @@ -264,14 +264,14 @@ sub interactive_mode { ), 1, gtkpack_(new Gtk::HBox(0,2), 0, gtkadd(gtkset_layout(new Gtk::VButtonBox, -end), - gtksignal_connect(new Gtk::Button(_("Enable Server")), clicked => + gtksignal_connect(new Gtk::Button(N("Enable Server")), clicked => sub { ${$central_widget}->destroy(); $windows = 1; cursor_wait(); enable_ts(); cursor_norm(); }), - gtksignal_connect(new Gtk::Button(_("Disable Server")), clicked => + gtksignal_connect(new Gtk::Button(N("Disable Server")), clicked => sub { ${$central_widget}->destroy(); cursor_wait(); disable_ts(); @@ -279,14 +279,14 @@ sub interactive_mode { }), ), 0, gtkadd(gtkset_layout(new Gtk::VButtonBox, -end), - gtksignal_connect(new Gtk::Button(_("Start Server")), clicked => + gtksignal_connect(new Gtk::Button(N("Start Server")), clicked => sub { ${$central_widget}->destroy(); $windows = 0; cursor_wait(); start_ts(); cursor_norm(); }), - gtksignal_connect(new Gtk::Button(_("Stop Server")), clicked => + gtksignal_connect(new Gtk::Button(N("Stop Server")), clicked => sub { ${$central_widget}->destroy(); cursor_wait(); stop_ts(); @@ -294,22 +294,22 @@ sub interactive_mode { }), ), 0, gtkadd(gtkset_layout(new Gtk::VButtonBox, -end), - gtksignal_connect(new Gtk::Button(_("Etherboot Floppy/ISO")), clicked => + gtksignal_connect(new Gtk::Button(N("Etherboot Floppy/ISO")), clicked => sub { ${$central_widget}->destroy(); $windows = 1; make_boot() }), - gtksignal_connect(new Gtk::Button(_("Net Boot Images")), clicked => + gtksignal_connect(new Gtk::Button(N("Net Boot Images")), clicked => sub { ${$central_widget}->destroy(); make_nbi() }), ), 0, gtkadd(gtkset_layout(new Gtk::VButtonBox, -end), - gtksignal_connect(new Gtk::Button(_("Add/Del Users")), clicked => + gtksignal_connect(new Gtk::Button(N("Add/Del Users")), clicked => sub { ${$central_widget}->destroy(); $windows = 0; maintain_users() }), - gtksignal_connect(new Gtk::Button(_("Add/Del Clients")), clicked => + gtksignal_connect(new Gtk::Button(N("Add/Del Clients")), clicked => sub { ${$central_widget}->destroy(); maintain_clients()}), ), 1, new Gtk::HBox(0,2), 0, gtkadd(gtkset_layout(new Gtk::VButtonBox, -end), - gtksignal_connect(new Gtk::Button(_("Help")),clicked => + gtksignal_connect(new Gtk::Button(N("Help")),clicked => sub { ${$central_widget}->destroy(); help() }), - gtksignal_connect(new Gtk::Button(_("Close")), clicked => + gtksignal_connect(new Gtk::Button(N("Close")), clicked => sub { write_conf_file(); $::isEmbedded and kill 'USR1', $::CCPID; Gtk->main_quit() @@ -364,7 +364,7 @@ sub about { 0, new Gtk::VScrollbar($text->vadj), ), 0, gtkadd(gtkset_layout(new Gtk::HButtonBox, -spread), - gtksignal_connect(new Gtk::Button(_("OK")), clicked => + gtksignal_connect(new Gtk::Button(N("OK")), clicked => sub { ${$central_widget}->destroy(); create_fontsel() }), ), ) @@ -481,7 +481,7 @@ sub help { 0, new Gtk::VScrollbar($text->vadj), ), 0, gtkadd(gtkset_layout(new Gtk::HButtonBox, -spread), - gtksignal_connect(new Gtk::Button(_("OK")), clicked => + gtksignal_connect(new Gtk::Button(N("OK")), clicked => sub { ${$central_widget}->destroy() }), ), ) @@ -512,9 +512,9 @@ sub make_boot { createScrolledWindow($list_nics), gtkadd(new Gtk::VBox(1,10), new Gtk::HBox(0,20), - gtksignal_connect(new Gtk::Button(_("Boot Floppy")), clicked => + gtksignal_connect(new Gtk::Button(N("Boot Floppy")), clicked => sub { write_eb_image($nic, $rom_path, "floppy") }), - gtksignal_connect(new Gtk::Button(_("Boot ISO")), clicked => + gtksignal_connect(new Gtk::Button(N("Boot ISO")), clicked => sub { write_eb_image($nic, $rom_path, "iso") }), new Gtk::HBox(0,20), ), @@ -583,9 +583,9 @@ sub make_nbi { 0, gtkadd(new Gtk::HBox(0,10), createScrolledWindow($tree_kernels), gtkadd(new Gtk::VBox(1,10), - gtksignal_connect(new Gtk::Button(_("Build Whole Kernel -->")), clicked => + gtksignal_connect(new Gtk::Button(N("Build Whole Kernel -->")), clicked => sub { if ($kernel) { - $in->ask_warn('',_("This will take a few minutes.")); + $in->ask_warn('',N("This will take a few minutes.")); cursor_wait(); system("/usr/bin/mknbi-set -k /boot/$kernel"); $list_nbis->clear_items(); @@ -597,10 +597,10 @@ sub make_nbi { } cursor_norm(); } else { - $in->ask_warn('',_("No kernel selected!")) if !($kernel); + $in->ask_warn('',N("No kernel selected!")) if !($kernel); } }), - gtksignal_connect(new Gtk::Button(_("Build Single NIC -->")), clicked => + gtksignal_connect(new Gtk::Button(N("Build Single NIC -->")), clicked => sub { if ($nic) { system("/usr/bin/mknbi-set -k /boot/$kernel -r $nic"); $list_nbis->clear_items(); @@ -611,11 +611,11 @@ sub make_nbi { select => sub { $nbi = $t }))); } } else { - $in->ask_warn('',_("No nic selected!")); + $in->ask_warn('',N("No nic selected!")); } }), - gtksignal_connect(new Gtk::Button(_("Build All Kernels -->")), clicked => - sub { $in->ask_warn('',_("This will take a few minutes.")); + gtksignal_connect(new Gtk::Button(N("Build All Kernels -->")), clicked => + sub { $in->ask_warn('',N("This will take a few minutes.")); cursor_wait(); system("/usr/bin/mknbi-set"); $list_nbis->clear_items(); @@ -628,14 +628,14 @@ sub make_nbi { cursor_norm(); }), new Gtk::HBox(1,1), - gtksignal_connect(new Gtk::Button(_("<-- Delete")), clicked => + gtksignal_connect(new Gtk::Button(N("<-- Delete")), clicked => sub { my $nbi = "/var/lib/tftpboot/" . $nbi; my $result = unlink($nbi) || warn("Can't delete $nbi..."); if ($result eq 1) { $list_nbis->remove_items($list_nbis->selection); } }), - gtksignal_connect(new Gtk::Button(_("Delete All NBIs")), clicked => + gtksignal_connect(new Gtk::Button(N("Delete All NBIs")), clicked => sub { cursor_wait(); foreach (grep(/\.nbi/, all("/var/lib/tftpboot"))) { my $nbi = "/var/lib/tftpboot/" . $_; @@ -692,12 +692,12 @@ sub maintain_users { gtkpack($status_box, $user_box = gtkpack_(new Gtk::VBox(0,10), - 0, gtkadd(new Gtk::Label(_("!!! Indicates the password in the system database is different than\n the one in the Terminal Server database.\nDelete/re-add the user to the Terminal Server to enable login."))), + 0, gtkadd(new Gtk::Label(N("!!! Indicates the password in the system database is different than\n the one in the Terminal Server database.\nDelete/re-add the user to the Terminal Server to enable login."))), 0, gtkadd(new Gtk::HBox(0,20), createScrolledWindow($list_sys_users), gtkadd(new Gtk::VBox(1,10), new Gtk::HBox(0,10), - gtksignal_connect(new Gtk::Button(_("Add User -->")), clicked => + gtksignal_connect(new Gtk::Button(N("Add User -->")), clicked => sub { my $result = adduser(0, $sys_user); if ($result eq 0) { $list_ts_users->add(gtkshow(gtksignal_connect(new Gtk::ListItem($sys_user), @@ -705,7 +705,7 @@ sub maintain_users { $list_ts_users->show() }))); } }), - gtksignal_connect(new Gtk::Button(_("<-- Del User")), clicked => + gtksignal_connect(new Gtk::Button(N("<-- Del User")), clicked => sub { deluser(0, $ts_user); $list_ts_users->remove_items($list_ts_users->selection); }), @@ -744,7 +744,7 @@ sub maintain_clients { $c_detail->append($c_det_ip); $c_det_ip->show(); - my $c_det_type = new_with_label Gtk::TreeItem(_("type: %s", $clients{$key}{type})); + my $c_det_type = new_with_label Gtk::TreeItem(N("type: %s", $clients{$key}{type})); $c_detail->append($c_det_type); $c_det_type->show(); @@ -777,7 +777,7 @@ sub maintain_clients { $entry_nbi->set_popdown_strings(@images); $entry_nbi->set_value_in_list(1, 0); } else { - $in->ask_warn('',_("No net boot images created!")); + $in->ask_warn('',N("No net boot images created!")); make_nbi(); return 1; } @@ -797,12 +797,12 @@ sub maintain_clients { ), gtkadd(new Gtk::VBox(1,10), gtkadd(new Gtk::HBox(0,1), - gtksignal_connect($check_thin = new Gtk::CheckButton(_("Thin Client")), clicked => + gtksignal_connect($check_thin = new Gtk::CheckButton(N("Thin Client")), clicked => sub { invbool \$is_thin }), - $check_allow_thin = new Gtk::CheckButton(_("Allow Thin Clients")), + $check_allow_thin = new Gtk::CheckButton(N("Allow Thin Clients")), ), # new Gtk::HBox(1,1), - gtksignal_connect(new Gtk::Button(_("Add Client -->")), clicked => + gtksignal_connect(new Gtk::Button(N("Add Client -->")), clicked => sub { my $hostname = $entry_host->get_text(); my $mac = $entry_mac->get_text(); my $ip = $entry_ip->get_text(); @@ -845,7 +845,7 @@ sub maintain_clients { } } }), - gtksignal_connect(new Gtk::Button(_("<-- Edit Client")), clicked => + gtksignal_connect(new Gtk::Button(N("<-- Edit Client")), clicked => sub { $entry_host->set_text($client); $entry_mac->set_text($clients{$client}{hardware}); $entry_ip->set_text($clients{$client}{address}); @@ -861,13 +861,13 @@ sub maintain_clients { $tree_clients->remove_items($tree_clients->selection); } }), - gtksignal_connect(new Gtk::Button(_("Delete Client")), clicked => + gtksignal_connect(new Gtk::Button(N("Delete Client")), clicked => sub { my $result = delclient(0, $client); if ($result eq 0) { $tree_clients->remove_items($tree_clients->selection); } }), - gtksignal_connect(new Gtk::Button(_("dhcpd Config...")), clicked => + gtksignal_connect(new Gtk::Button(N("dhcpd Config...")), clicked => sub { ${$central_widget}->destroy(); dhcpd_config() }), # new Gtk::HBox(1,1), ), @@ -900,7 +900,7 @@ sub maintain_clients { standalone::explanations("Modified files /etc/inittab, /etc/X11/xdm/xdm-config, /usr/share/config/kdm/kdmrc, /etc/X11/gdm/gdm.conf"); update_hosts_allow("disable"); } - $in->ask_warn('',_("Need to restart the Display Manager for full changes to take effect. \n(service dm restart - at the console)")); + $in->ask_warn('',N("Need to restart the Display Manager for full changes to take effect. \n(service dm restart - at the console)")); } ); $central_widget = \$client_box; @@ -918,42 +918,42 @@ sub dhcpd_config { #- entry boxes for data entry my $box_subnet = new Gtk::HBox(0,0); - my $label_subnet = new Gtk::Label(_("Subnet:")); + my $label_subnet = new Gtk::Label(N("Subnet:")); $label_subnet->set_justify('right'); my $entry_subnet = new Gtk::Entry(20); $box_subnet->pack_end($entry_subnet, 0, 0, 10); $box_subnet->pack_end($label_subnet, 0, 0, 10); my $box_netmask = new Gtk::HBox(0,0); - my $label_netmask = new Gtk::Label(_("Netmask:")); + my $label_netmask = new Gtk::Label(N("Netmask:")); $label_netmask->set_justify('left'); my $entry_netmask = new Gtk::Entry(20); $box_netmask->pack_end($entry_netmask, 0, 0, 10); $box_netmask->pack_end($label_netmask, 0, 0, 10); my $box_routers = new Gtk::HBox(0,0); - my $label_routers = new Gtk::Label(_("Routers:")); + my $label_routers = new Gtk::Label(N("Routers:")); $label_routers->set_justify('left'); my $entry_routers = new Gtk::Entry(20); $box_routers->pack_end($entry_routers, 0, 0, 10); $box_routers->pack_end($label_routers, 0, 0, 10); my $box_subnet_mask = new Gtk::HBox(0,0); - my $label_subnet_mask = new Gtk::Label(_("Subnet Mask:")); + my $label_subnet_mask = new Gtk::Label(N("Subnet Mask:")); $label_subnet_mask->set_justify('left'); my $entry_subnet_mask = new Gtk::Entry(); $box_subnet_mask->pack_end($entry_subnet_mask, 0, 0, 10); $box_subnet_mask->pack_end($label_subnet_mask, 0, 0, 10); my $box_broadcast = new Gtk::HBox(0,0); - my $label_broadcast = new Gtk::Label(_("Broadcast Address:")); + my $label_broadcast = new Gtk::Label(N("Broadcast Address:")); $label_broadcast->set_justify('left'); my $entry_broadcast = new Gtk::Entry(20); $box_broadcast->pack_end($entry_broadcast, 0, 0, 10); $box_broadcast->pack_end($label_broadcast, 0, 0, 10); my $box_domain = new Gtk::HBox(0,0); - my $label_domain = new Gtk::Label(_("Domain Name:")); + my $label_domain = new Gtk::Label(N("Domain Name:")); $label_domain->set_justify('left'); my $entry_domain = new Gtk::Entry(20); $box_domain->pack_end($entry_domain, 0, 0, 10); @@ -961,7 +961,7 @@ sub dhcpd_config { my $box_name_servers = new Gtk::HBox(0,0); my $box_name_servers_entry = new Gtk::VBox(0,0); - my $label_name_servers = new Gtk::Label(_("Name Servers:")); + my $label_name_servers = new Gtk::Label(N("Name Servers:")); $label_name_servers->set_justify('left'); my $entry_name_server1 = new Gtk::Entry(); my $entry_name_server2 = new Gtk::Entry(); @@ -972,8 +972,8 @@ sub dhcpd_config { $box_name_servers->pack_end($box_name_servers_entry, 0, 0, 10); $box_name_servers->pack_end($label_name_servers, 0, 0, 10); - my $label_ip_range_start = new Gtk::Label(_("IP Range Start:")); - my $label_ip_range_end = new Gtk::Label(_("IP Range End:")); + my $label_ip_range_start = new Gtk::Label(N("IP Range Start:")); + my $label_ip_range_end = new Gtk::Label(N("IP Range End:")); my $entry_ip_range_start = new Gtk::Entry(15); my $entry_ip_range_end = new Gtk::Entry(15); @@ -1025,11 +1025,11 @@ sub dhcpd_config { gtkadd($box_name_servers), ), 0, gtkadd(new Gtk::VBox(0,0), - new Gtk::Label(_("dhcpd Server Configuration")."\n\n". - _("Most of these values were extracted\nfrom your running system.\nYou can modify as needed.")), + new Gtk::Label(N("dhcpd Server Configuration")."\n\n". + N("Most of these values were extracted\nfrom your running system.\nYou can modify as needed.")), new Gtk::HSeparator, gtkadd((new Gtk::HBox), - new Gtk::Label(_("Dynamic IP Address Pool:")), + new Gtk::Label(N("Dynamic IP Address Pool:")), ), gtkadd((new Gtk::HBox(0,0)), gtkadd((new Gtk::VBox), @@ -1042,7 +1042,7 @@ sub dhcpd_config { ), ), gtkadd(new Gtk::HBox), - gtksignal_connect(new Gtk::Button(_("Write Config")), clicked => + gtksignal_connect(new Gtk::Button(N("Write Config")), clicked => sub { write_dhcpd_config( $entry_subnet->get_text(), $entry_netmask->get_text(), @@ -1144,16 +1144,16 @@ sub write_eb_image { if ($type eq 'floppy') { my $in = interactive->vnew; if (-e "/dev/fd0") { - my $result = $in->ask_okcancel(_("Please insert floppy disk:")); + my $result = $in->ask_okcancel(N("Please insert floppy disk:")); return if !($result); $result = system("cat $rom_path/boot1a.bin $rom_path/lzrom/$nic > /dev/fd0") if $result; if ($result) { - $in->ask_warn('',_("Couldn't access the floppy!")) + $in->ask_warn('',N("Couldn't access the floppy!")) } else { - $in->ask_warn('',_("Floppy can be removed now")) + $in->ask_warn('',N("Floppy can be removed now")) } } else { - $in->ask_warn('',_("No floppy drive available!")); + $in->ask_warn('',N("No floppy drive available!")); } } else { mkdir_p("/tmp/eb"); @@ -1162,9 +1162,9 @@ sub write_eb_image { system("mkisofs -b eb.img -o /tmp/$nic.iso /tmp/eb"); rm_rf("/tmp/eb"); if (-e "/tmp/$nic.iso") { - $in->ask_warn('',_("Etherboot ISO image is %s", "/tmp/$nic.iso")) + $in->ask_warn('',N("Etherboot ISO image is %s", "/tmp/$nic.iso")) } else { - $in->ask_warn('',_("Something went wrong! - Is mkisofs installed?")) + $in->ask_warn('',N("Something went wrong! - Is mkisofs installed?")) } } } @@ -1183,7 +1183,7 @@ sub enable_ts { print("No /etc/dhcpd.conf built yet - use GUI to create!!\n"); return; } else { - $in->ask_warn('',_("Need to create /etc/dhcpd.conf first!")); + $in->ask_warn('',N("Need to create /etc/dhcpd.conf first!")); #$central_widget->destroy; dhcpd_config(); return; @@ -1489,7 +1489,7 @@ sub update_hosts_allow { if ($mode eq "enable") { my $has_all = `grep ALL /etc/hosts.allow`; if ($has_all) { - $in->ask_warn('',_("/etc/hosts.allow and /etc/hosts.deny already configured - not changed")); + $in->ask_warn('',N("/etc/hosts.allow and /etc/hosts.deny already configured - not changed")); return; } if (!$has_all) { diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index 66cba5e93..a1ce1cbd7 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -40,11 +40,11 @@ begin: $::isEmbedded and kill 'USR2', $::CCPID; my $imagefile = "/root/drakx/replay_install.img"; --f $imagefile or $in->ask_okcancel(_("Error!"), - _("I can't find needed image file `%s'.", $imagefile), 1), quit_global($in, 0); +-f $imagefile or $in->ask_okcancel(N("Error!"), + N("I can't find needed image file `%s'.", $imagefile), 1), quit_global($in, 0); -$::direct or $in->ask_okcancel(_("Auto Install Configurator"), -_("You are about to configure an Auto Install floppy. This feature is somewhat dangerous and must be used circumspectly. +$::direct or $in->ask_okcancel(N("Auto Install Configurator"), +N("You are about to configure an Auto Install floppy. This feature is somewhat dangerous and must be used circumspectly. With that feature, you will be able to replay the installation you've performed on this computer, being interactively prompted for some steps, in order to change their values. @@ -62,24 +62,24 @@ my $st = \%steps::installSteps; for (my $f = $st->{first}; $f; $f = $st->{$f}{next}) { next if member($f, @manual_steps); my $def_choice = 'replay'; - push @choices, { label => _($st->{$f}{text}), val => \$def_choice, list => [ _('replay'), _('manual') ] }; + push @choices, { label => translate($st->{$f}{text}), val => \$def_choice, list => [ N("replay"), N("manual") ] }; push @all_steps, [ $f, \$def_choice ]; } -$in->ask_from(_("Automatic Steps Configuration"), - _("Please choose for each step whether it will replay like your install, or it will be manual"), +$in->ask_from(N("Automatic Steps Configuration"), + N("Please choose for each step whether it will replay like your install, or it will be manual"), \@choices ) or quit_global($in, 0); -${$_->[1]} eq _('manual') and push @manual_steps, $_->[0] foreach @all_steps; +${$_->[1]} eq N("manual") and push @manual_steps, $_->[0] foreach @all_steps; my $mountdir = "/root/tmp/drakautoinst-mountdir"; -d $mountdir or mkdir $mountdir, 0755; my $floppy = detect_devices::floppy(); my $dev = devices::make($floppy); -$in->ask_okcancel('', _("Insert a blank floppy in drive %s", $floppy), 1) or quit_global($in, 0); +$in->ask_okcancel('', N("Insert a blank floppy in drive %s", $floppy), 1) or quit_global($in, 0); { - standalone::explanations(_("Creating auto install floppy")); - my $w = $in->wait_message('', _("Creating auto install floppy")); + standalone::explanations(N("Creating auto install floppy")); + my $w = $in->wait_message('', N("Creating auto install floppy")); commands::dd("if=$imagefile", "of=$dev", "bs=1440", "count=1024"); common::sync(); } @@ -127,7 +127,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { member($_, keys %struct_gui) and push @{$tree{$struct_gui{$_}}}, [$_ , $pixmap{$_}, h2widget($o->{$_}, "\$o->\{$_\}") ] foreach (keys %$o); - my $W = my_gtk->new(_('$o edition')); + my $W = my_gtk->new('$o edition'); my @box_to_hide; my $nb_pages=0; my $notebook = new Gtk::Notebook; @@ -141,7 +141,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { new Gtk::Pixmap(gtkcreate_png('mdk_logo'))), 1, new Gtk::VBox(0,0), ), - 0, _("\nWelcome.\n\nThe parameters of the auto-install are available in the sections on the left"), + 0, N("\nWelcome.\n\nThe parameters of the auto-install are available in the sections on the left"), 1, new Gtk::VBox(0,0), ), undef); $notebook->show_all; @@ -181,7 +181,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { gtksignal_connect(gtkadd($button, gtkpack__(new Gtk::VBox(0,3), $b, - _($_->[0]), + translate($_->[0]), ) ), released => sub { $button->get_active() or $button->set_active(1),return; @@ -199,15 +199,15 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { ), 0, new Gtk::HSeparator, 0, gtkadd(gtkset_border_width(gtkset_layout(new Gtk::HButtonBox, 'end'), 5), - gtksignal_connect(new Gtk::Button(_("Accept")), clicked => sub { Gtk->main_quit; }), - gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { $o = $o_old; Gtk->main_quit; quit_global($in, 0) }), + gtksignal_connect(new Gtk::Button(N("Accept")), clicked => sub { Gtk->main_quit; }), + gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { $o = $o_old; Gtk->main_quit; quit_global($in, 0) }), ) ) ); $_->hide foreach @box_to_hide; # $W->{window}->show_all; # gtkadd($W->{window}, -# gtkpack_($W->create_box_with_title(_("Edit variables")), +# gtkpack_($W->create_box_with_title(N("Edit variables")), # 1, my $notebook = create_notebook( map { $_, h2widget($o->{$_}, "\$o->\{$_\}") } keys %$o ), # 0, gtkpack(gtkset_border_width(new Gtk::HBox(0,0),5), $W->create_okcancel), # ), @@ -236,8 +236,8 @@ output($cfgfile, $str); fs::umount($mountdir); -$in->ask_okcancel(_("Congratulations!"), -_("The floppy has been successfully generated. +$in->ask_okcancel(N("Congratulations!"), +N("The floppy has been successfully generated. You may now replay your installation.")); quit_global($in, 0); @@ -275,7 +275,7 @@ sub h2widget { control_buttons(${$k}{$list_keys[0]}, sub { my ($vb, $widget_list2, $ref_local_k, $i) = @_; my @widget_list = @{$widget_list2}; - my $field = $in->ask_from_entry(_("Auto Install"), ("Enter the name of the new field you want to add")) or return undef; + my $field = $in->ask_from_entry(N("Auto Install"), ("Enter the name of the new field you want to add")) or return undef; $field eq '' and return undef; gtkpack__($vb, $widget_list[$i] = create_packtable({ col_spacings => 10, row_spacings => 3 }, @@ -345,14 +345,14 @@ sub control_buttons { my (%local_k) = %{$ref_local_k}; my ($button_add, $button_remove); 0, gtkadd(gtkset_border_width(gtkset_layout(new Gtk::HButtonBox, 'spread'), 5), - gtksignal_connect($button_add = new Gtk::Button(_("Add an item")), clicked => sub { + gtksignal_connect($button_add = new Gtk::Button(N("Add an item")), clicked => sub { $local_k{$_} = undef foreach keys %local_k; $i++; $local_gui->($vb, \@widget_list, \%local_k, $i) or $i--, return; $i>=0 and $button_remove->set_sensitive(1); } ), - gtksignal_connect($button_remove = new Gtk::Button(_("Remove the last item")), clicked => sub { + gtksignal_connect($button_remove = new Gtk::Button(N("Remove the last item")), clicked => sub { $i>=0 or return; $widget_list[$i]->destroy(); $i--; diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup index 38eb4cc64..a981852e4 100755 --- a/perl-install/standalone/drakbackup +++ b/perl-install/standalone/drakbackup @@ -611,7 +611,7 @@ sub read_cron_files { sub save_cron_files { if ($nonroot_user) { - show_warning("w", __("Cron not available yet as non-root")) if ($not_warned); + show_warning("w", N_("Cron not available yet as non-root")) if ($not_warned); $not_warned = 0; $backup_daemon = 0; return(1); @@ -717,9 +717,9 @@ sub write_password_file { sub show_warning { my ($mode, $warning) = @_; - $mode = __("WARNING") if ($mode eq "w"); - $mode = __("FATAL") if ($mode eq "f"); - $mode = __("INFO") if ($mode eq "i"); + $mode = N_("WARNING") if ($mode eq "w"); + $mode = N_("FATAL") if ($mode eq "f"); + $mode = N_("INFO") if ($mode eq "i"); if ($interactive) { $in->ask_warn('',translate("$mode").": ".translate("$warning")); } else { @@ -731,12 +731,12 @@ sub show_warning { sub complete_results { system_state(); $results .= "***********************************************************************\n\n"; - $daemon or $results .= _("\n DrakBackup Report \n\n"); - $daemon and $results .= _("\n DrakBackup Daemon Report\n\n\n"); + $daemon or $results .= N("\n DrakBackup Report \n\n"); + $daemon and $results .= N("\n DrakBackup Daemon Report\n\n\n"); $results .= "***********************************************************************\n\n"; $results .= $system_state; $results .= "\n\n***********************************************************************\n\n"; - $results .= _("\n DrakBackup Report Details\n\n\n"); + $results .= N("\n DrakBackup Report Details\n\n\n"); $results .= "***********************************************************************\n\n"; } @@ -757,7 +757,7 @@ sub ftp_client { $ftp->put($_); $interactive and progress($pbar, 0.5, $_); $interactive and $pbar->set_show_text($_); - $interactive and progress($pbar3, 1/@file_list_to_send_by_ftp, _("Total progess")); + $interactive and progress($pbar3, 1/@file_list_to_send_by_ftp, N("Total progess")); } $ftp->quit; return(0); @@ -812,7 +812,7 @@ sub do_expect { $exp_command = "ssh-copy-id -i $_ $login_user\@$host_name" if ($mode eq "sendkey"); if ((-e $backup_key) && ($mode eq "sendkey")) { - if ($in->ask_yesorno('', _("%s exists, delete?\n\nWarning: If you've already done this process you'll probably\n need to purge the entry from authorized_keys on the server.", $backup_key))) { + if ($in->ask_yesorno('', N("%s exists, delete?\n\nWarning: If you've already done this process you'll probably\n need to purge the entry from authorized_keys on the server.", $backup_key))) { unlink($backup_key); unlink($backup_key . '.pub'); } else { @@ -821,16 +821,16 @@ sub do_expect { } if (!(-e $backup_key) && ($mode eq "sendkey")) { - $in->ask_warn('',_("This may take a moment to generate the keys.")); + $in->ask_warn('',N("This may take a moment to generate the keys.")); cursor_wait(); #- not using a passphrase for the moment system("ssh-keygen -P '' -t dsa -f $backup_key"); cursor_norm(); } - my $exp = Expect->spawn($exp_command) or $in->ask_warn('',_("ERROR: Cannot spawn %s.", $exp_command)); + my $exp = Expect->spawn($exp_command) or $in->ask_warn('',N("ERROR: Cannot spawn %s.", $exp_command)); - $interactive and progress($pbar3, 1/@send_files, _("Total progess")); + $interactive and progress($pbar3, 1/@send_files, N("Total progess")); $interactive and $stext->set_text($_); #- run scp, look for some common errors and try to track successful progress for GUI @@ -845,17 +845,17 @@ sub do_expect { [ '-re', 'No such file or directory', sub { $bad_dir = 1; Expect::exp_continue() } ], # [ '-re', '%', sub { update_scp_progress(); Expect::exp_continue(); } ], [ eof => sub { - if (!$spawn_ok) { show_warning("f", _("No password prompt on %s at port %s", $host_name, $scp_port)) } - if ($bad_passwd) { show_warning("f", _("Bad password on %s", $host_name)) } - if ($no_perm) { show_warning("f", _("Permission denied transferring %s to %s", $_, $host_name)) } - if ($bad_dir) { show_warning("f", _("Can't find %s on %s", $host_path, $host_name)) } + if (!$spawn_ok) { show_warning("f", N("No password prompt on %s at port %s", $host_name, $scp_port)) } + if ($bad_passwd) { show_warning("f", N("Bad password on %s", $host_name)) } + if ($no_perm) { show_warning("f", N("Permission denied transferring %s to %s", $_, $host_name)) } + if ($bad_dir) { show_warning("f", N("Can't find %s on %s", $host_path, $host_name)) } } ], - [ timeout => sub { show_warning("f", _("%s not responding", $host_name)) } ], + [ timeout => sub { show_warning("f", N("%s not responding", $host_name)) } ], ); my $exit_stat = $exp->exitstatus; - $in->ask_warn('',_("Transfer successful\nYou may want to verify you can login to the server with:\n\nssh -i %s %s\@%s\n\nwithout being prompted for a password.", $backup_key, $login_user, $host_name)) if (($exit_stat eq 0) && ($mode eq "sendkey")); + $in->ask_warn('',N("Transfer successful\nYou may want to verify you can login to the server with:\n\nssh -i %s %s\@%s\n\nwithout being prompted for a password.", $backup_key, $login_user, $host_name)) if (($exit_stat eq 0) && ($mode eq "sendkey")); $log_buff .= "$_\n" if (($exit_stat eq 0) && ($mode eq "backup")); $exp->hard_close(); } @@ -885,7 +885,7 @@ sub ssh_client { close TMP; $log_buff .= "\n"; $interactive and progress($pbar, 0.5, "Done..."); - $interactive and progress($pbar3, 1/@file_list_to_send_by_ftp, _("Total progess")); + $interactive and progress($pbar3, 1/@file_list_to_send_by_ftp, N("Total progess")); } return(0); } @@ -899,11 +899,11 @@ sub webdav_client { my $command = "sitecopy -u drakbackup"; spawn_progress($command, "Running sitecopy..."); if ($log_buff =~ /Nothing to do - no changes found/) { - show_warning("w", __("WebDAV remote site already in sync!")); + show_warning("w", N_("WebDAV remote site already in sync!")); return(1); } if ($log_buff !~ /Update completed successfully/) { - show_warning("f", __("WebDAV transfer failed!")); + show_warning("f", N_("WebDAV transfer failed!")); return(1); } return(0); @@ -924,15 +924,15 @@ sub check_for_cd { my $command = "cdrecord dev=$cd_device -atip"; spawn_progress($command, "Check for media in drive"); if ($log_buff =~ /No disk/) { - show_warning("f", __("No CDR/DVDR in drive!")); + show_warning("f", N_("No CDR/DVDR in drive!")); return(1); } if ($log_buff !~ /ATIP info from disk/) { - show_warning("f", __("Does not appear to be recordable media!")); + show_warning("f", N_("Does not appear to be recordable media!")); return(1); } if (($log_buff =~ /Is not erasable/) && ($media_erase)) { - show_warning("f", __("Not erasable media!")); + show_warning("f", N_("Not erasable media!")); return(1); } @@ -971,7 +971,7 @@ sub write_on_cd { sub erase_cdrw { #- we can only hit this via interactive $interactive = 0; - $in->ask_warn('',_("This may take a moment to erase the media.")); + $in->ask_warn('',N("This may take a moment to erase the media.")); cursor_wait(); my $command = "cdrecord dev=$cd_device -blank=fast"; spawn_progress($command, "Erasing CDRW..."); @@ -984,7 +984,7 @@ sub spawn_progress { my $value; my $timer; - $interactive and progress($pbar3, 0, _($descr)); + $interactive and progress($pbar3, 0, translate($descr)); $interactive and $pbar3->set_activity_mode(1); $interactive and ($pbar3->set_value(0)); $interactive and ($timer = Gtk->timeout_add(2, \&progress_timeout)); @@ -1056,7 +1056,7 @@ sub build_cd { if (!check_for_cd()) { build_iso(); if ($log_buff =~ /Permission denied/) { - show_warning("f", __("Permission problem accessing CD.")); + show_warning("f", N_("Permission problem accessing CD.")); $media_problem = 1; return(1); } else { @@ -1083,7 +1083,7 @@ sub build_tape { $command = "mt -f $tape_device status"; spawn_progress($command, "Checking for tape"); if ($log_buff =~ /DR_OPEN/) { - show_warning("f", _("No tape in %s!", $tape_device)); + show_warning("f", N("No tape in %s!", $tape_device)); return(1); } @@ -1195,7 +1195,7 @@ sub build_backup_files { grep (/^backup\_base\_sys/, @dir_content) and $base_sys_exist = 1; if (($where_hd && !$daemon) || ($daemon)) { - $interactive and progress($pbar, 0.5, _("Backup system files...")); + $interactive and progress($pbar, 0.5, N("Backup system files...")); if ($backup_sys) { if ($backup_sys_versions) { #- 8/19/2002 - changed these greps to look at the list, rather than the tar file @@ -1244,8 +1244,8 @@ sub build_backup_files { } } - $interactive and progress($pbar, 0.5, _("Backup system files...")); - $interactive and progress($pbar3, 0.3, _("Hard Disk Backup files...")); + $interactive and progress($pbar, 0.5, N("Backup system files...")); + $interactive and progress($pbar3, 0.3, N("Hard Disk Backup files...")); if (@list_other) { system("cd $save_path && rm -f backup_other* "); @@ -1257,8 +1257,8 @@ sub build_backup_files { output_p($save_path . '/list_other', @list_other_); } - $interactive and progress($pbar1, 1, _("Backup User files...")); - $interactive and progress($pbar3, 0.3, _("Hard Disk Backup Progress...")); + $interactive and progress($pbar1, 1, N("Backup User files...")); + $interactive and progress($pbar3, 0.3, N("Hard Disk Backup Progress...")); if ($backup_user) { foreach (@user_list) { @@ -1311,13 +1311,13 @@ sub build_backup_files { } } } - $interactive and progress($pbar2, 1, _("Backup Other files...")); - $interactive and progress($pbar3, 0.4, _("Hard Disk Backup files...")); + $interactive and progress($pbar2, 1, N("Backup Other files...")); + $interactive and progress($pbar3, 0.4, N("Hard Disk Backup files...")); } my $filecount = @file_list_to_send_by_ftp; if (!$filecount) { - show_warning("w", __("No changes to backup!")); + show_warning("w", N_("No changes to backup!")); $interactive and cursor_norm(); $interactive and interactive_mode(); return(1); @@ -1333,17 +1333,17 @@ sub build_backup_files { build_cd() if ($daemon_media eq 'cd'); build_tape() if ($daemon_media eq 'tape'); - $results .= _("\nDrakbackup activities via %s:\n\n", $daemon_media) ; + $results .= N("\nDrakbackup activities via %s:\n\n", $daemon_media) ; $results .= $log_buff; } #- leave this one alone for now - works well #- integrate with other methods later if (($where_net && !$daemon && ($net_proto eq 'ftp')) || ($daemon && ($daemon_media eq 'ftp'))) { - $results .= _("file list sent by FTP: %s\n ", $_) foreach @file_list_to_send_by_ftp; + $results .= N("file list sent by FTP: %s\n ", $_) foreach @file_list_to_send_by_ftp; $interactive and build_backup_ftp_status(); if (ftp_client()) { - $results .= _("\n FTP connection problem: It was not possible to send your backup files by FTP.\n"); + $results .= N("\n FTP connection problem: It was not possible to send your backup files by FTP.\n"); $interactive and client_ftp_pb(); } } @@ -1356,17 +1356,17 @@ sub build_backup_files { ssh_client() if (($net_proto eq 'ssh') && !($use_expect)); do_expect("backup", "") if (($net_proto eq 'ssh') && ($use_expect)); webdav_client() if ($net_proto eq 'webdav'); - $results .= _("\nDrakbackup activities via %s:\n\n", $net_proto); + $results .= N("\nDrakbackup activities via %s:\n\n", $net_proto); } if ($where_cd) { build_cd(); - $results .= _("\nDrakbackup activities via CD:\n\n"); + $results .= N("\nDrakbackup activities via CD:\n\n"); } if ($where_tape) { build_tape(); - $results .= _("\nDrakbackup activities via tape:\n\n"); + $results .= N("\nDrakbackup activities via tape:\n\n"); } $results .= $log_buff; @@ -1375,7 +1375,7 @@ sub build_backup_files { if ($send_mail) { if (send_mail($results)) { $interactive and send_mail_pb(); - $interactive or print _(" Error during mail sending. \n"); + $interactive or print N(" Error during mail sending. \n"); } } @@ -1400,7 +1400,7 @@ sub build_backup_files { $catalog .= ":F" if ((!$backup_other_versions) && (@list_other)); $catalog .= "\n"; - open(CATALOG, ">> $cfg_dir/drakbackup_catalog") || show_warning("w", __("Can't create catalog!")); + open(CATALOG, ">> $cfg_dir/drakbackup_catalog") || show_warning("w", N_("Can't create catalog!")); print(CATALOG $catalog); close(CATALOG); } @@ -1513,7 +1513,7 @@ sub file_ok_sel { sub filedialog_where_hd { my $file_dialog; - $file_dialog = gtksignal_connect(new Gtk::FileSelection(_("File Selection")), destroy => sub { $file_dialog->destroy() } ); + $file_dialog = gtksignal_connect(new Gtk::FileSelection(N("File Selection")), destroy => sub { $file_dialog->destroy() } ); $file_dialog->ok_button->signal_connect(clicked => sub { $save_path_entry->set_text($file_dialog->get_filename()); $file_dialog->destroy() }); @@ -1524,7 +1524,7 @@ sub filedialog_where_hd { sub filedialog_restore_find_path { my $file_dialog; - $file_dialog = gtksignal_connect(new Gtk::FileSelection(_("File Selection")), destroy => sub { $file_dialog->destroy() } ); + $file_dialog = gtksignal_connect(new Gtk::FileSelection(N("File Selection")), destroy => sub { $file_dialog->destroy() } ); $file_dialog->ok_button->signal_connect(clicked => sub { $restore_find_path_entry->set_text($file_dialog->get_filename()); $file_dialog->destroy() }); @@ -1538,7 +1538,7 @@ sub filedialog_generic { my ($fileops, $prompt, $widget, $set_var) = @_; my $file_dialog; - $file_dialog = gtksignal_connect(new Gtk::FileSelection(_($prompt)), destroy => sub { $file_dialog->destroy() } ); + $file_dialog = gtksignal_connect(new Gtk::FileSelection(translate($prompt)), destroy => sub { $file_dialog->destroy() } ); $file_dialog->ok_button->signal_connect(clicked => sub { ${$set_var} = ($file_dialog->get_filename()); ${$widget}->set_text(${$set_var}); @@ -1552,12 +1552,12 @@ sub filedialog_generic { sub filedialog { my $file_dialog; - $file_dialog = gtksignal_connect(new Gtk::FileSelection(_("Select the files or directories and click on 'Add'")), destroy => sub { $file_dialog->destroy() } ); + $file_dialog = gtksignal_connect(new Gtk::FileSelection(N("Select the files or directories and click on 'Add'")), destroy => sub { $file_dialog->destroy() } ); $file_dialog->ok_button->signal_connect(clicked => \&file_ok_sel, $file_dialog); - $file_dialog->ok_button->child->set(_("Add")); + $file_dialog->ok_button->child->set(N("Add")); $file_dialog->cancel_button->signal_connect(clicked => sub { $file_dialog->destroy() }); - $file_dialog->cancel_button->child->set(_("Close")); -# $file_dialog->set_filename(_("Select the files or directories and click on 'Add'")); + $file_dialog->cancel_button->child->set(N("Close")); +# $file_dialog->set_filename(N("Select the files or directories and click on 'Add'")); $file_dialog->show(); } @@ -1596,12 +1596,12 @@ sub advanced_what_sys { gtkpack($advanced_box, $box_what_sys = gtkpack_(new Gtk::VBox(0, 15), - 1, _("\nPlease check all options that you need.\n"), - 1, _("These options can backup and restore all files in your /etc directory.\n"), - 0, my $check_what_sys = new Gtk::CheckButton(_("Backup your System files. (/etc directory)")), - 0, my $check_what_versions = new Gtk::CheckButton(_("Use incremental backup (do not replace old backups)")), - 0, my $check_what_critical = new Gtk::CheckButton(_("Do not include critical files (passwd, group, fstab)")), - 0, _("With this option you will be able to restore any version\n of your /etc directory."), + 1, N("\nPlease check all options that you need.\n"), + 1, N("These options can backup and restore all files in your /etc directory.\n"), + 0, my $check_what_sys = new Gtk::CheckButton(N("Backup your System files. (/etc directory)")), + 0, my $check_what_versions = new Gtk::CheckButton(N("Use incremental backup (do not replace old backups)")), + 0, my $check_what_critical = new Gtk::CheckButton(N("Do not include critical files (passwd, group, fstab)")), + 0, N("With this option you will be able to restore any version\n of your /etc directory."), 1, new Gtk::VBox(0, 15), ), ); @@ -1618,7 +1618,7 @@ sub advanced_what_user { all_user_list(); gtkpack($advanced_box, $box_what_user = gtkpack_(new Gtk::VBox(0, 15), - 0, _("Please check all users that you want to include in your backup."), + 0, N("Please check all users that you want to include in your backup."), 0, new Gtk::HSeparator, 1, createScrolledWindow( gtkpack__(new Gtk::VBox(0,0), @@ -1645,8 +1645,8 @@ sub advanced_what_user { $b } (@all_user_list) ), ), - 0, my $check_what_browser = new Gtk::CheckButton(_("Do not include the browser cache")), - 0, my $check_what_user_versions = new Gtk::CheckButton(_("Use Incremental Backups (do not replace old backups)")), + 0, my $check_what_browser = new Gtk::CheckButton(N("Do not include the browser cache")), + 0, my $check_what_user_versions = new Gtk::CheckButton(N("Use Incremental Backups (do not replace old backups)")), ), ); check_list([$check_what_browser, \$what_no_browser], [$check_what_user_versions, \$backup_user_versions]); @@ -1667,10 +1667,10 @@ sub advanced_what_other { 1, createScrolledWindow($list_other), ), 0, gtkadd(gtkset_layout(new Gtk::HButtonBox, -spread), - gtksignal_connect(new Gtk::Button(_("Add")), clicked => sub { filedialog() }), - gtksignal_connect(new Gtk::Button(_("Remove Selected")), clicked => \&list_remove, $list_other), + gtksignal_connect(new Gtk::Button(N("Add")), clicked => sub { filedialog() }), + gtksignal_connect(new Gtk::Button(N("Remove Selected")), clicked => \&list_remove, $list_other), ), - 0, gtkset_sensitive(my $check_what_other_versions = new Gtk::CheckButton(_("Use Incremental Backups (do not replace old backups)") ), 0), + 0, gtkset_sensitive(my $check_what_other_versions = new Gtk::CheckButton(N("Use Incremental Backups (do not replace old backups)") ), 0), ), ); check_list([$check_what_other_versions, \$backup_other_versions]); @@ -1701,12 +1701,12 @@ sub advanced_what_entire_sys{ ); $button_what_other->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_sys_map, $pix_sys_mask), - new Gtk::Label(_("Linux")), + new Gtk::Label(N("Linux")), new Gtk::HBox(0, 5) )); $button_what_all->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_user_map, $pix_user_mask), - new Gtk::Label(_("Windows (FAT32)")), + new Gtk::Label(N("Windows (FAT32)")), new Gtk::HBox(0, 5) )); fonction_env(\$box_what, \&advanced_what_entire_sys, \&advanced_what, ""); @@ -1740,22 +1740,22 @@ sub advanced_what{ ); $button_what_sys->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_sys_map, $pix_sys_mask), - new Gtk::Label(_("System")), + new Gtk::Label(N("System")), new Gtk::HBox(0, 5) )); $button_what_user->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_user_map, $pix_user_mask), - new Gtk::Label(_("Users")), + new Gtk::Label(N("Users")), new Gtk::HBox(0, 5) )); $button_what_other->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_other_map, $pix_other_mask), - new Gtk::Label(_("Other")), + new Gtk::Label(N("Other")), new Gtk::HBox(0, 5) )); # $button_what_all->add(gtkpack(new Gtk::HBox(0,10), # new Gtk::Pixmap($pix_sysp_map, $pix_sysp_mask), -# new Gtk::Label(_("An Entire System")), +# new Gtk::Label(N("An Entire System")), # new Gtk::HBox(0, 5) # )); @@ -1771,41 +1771,41 @@ sub advanced_where_net_types { $box_where_net = gtkpack_(new Gtk::VBox(0, 10), 0, new Gtk::HSeparator, 0, gtkpack_(new Gtk::HBox(0,10), - 0, my $check_where_use_net = new Gtk::CheckButton(_("Use network connection to backup") ), + 0, my $check_where_use_net = new Gtk::CheckButton(N("Use network connection to backup") ), 1, new Gtk::HBox(0,10), - 0, new Gtk::Label(_("Net Method:")), + 0, new Gtk::Label(N("Net Method:")), 0, gtkset_sensitive(my $entry_net_type = new Gtk::Combo(), $where_net), ), 0, gtkpack_(new Gtk::HBox(0,5), - 0, gtkset_sensitive(my $check_use_expect = new Gtk::CheckButton(_("Use Expect for SSH")), ($where_net && ($net_proto eq 'ssh'))), - 0, gtkset_sensitive(my $check_xfer_keys = new Gtk::CheckButton(_("Create/Transfer\nbackup keys for SSH")), ($where_net && ($net_proto eq 'ssh'))), - 0, gtkset_sensitive(my $button_xfer_keys = new Gtk::Button(_(" Transfer \nNow")), $xfer_keys), - 0, gtkset_sensitive(my $check_user_keys = new Gtk::CheckButton(_("Other (not drakbackup)\nkeys in place already")), ($where_net && ($net_proto eq 'ssh'))), + 0, gtkset_sensitive(my $check_use_expect = new Gtk::CheckButton(N("Use Expect for SSH")), ($where_net && ($net_proto eq 'ssh'))), + 0, gtkset_sensitive(my $check_xfer_keys = new Gtk::CheckButton(N("Create/Transfer\nbackup keys for SSH")), ($where_net && ($net_proto eq 'ssh'))), + 0, gtkset_sensitive(my $button_xfer_keys = new Gtk::Button(N(" Transfer \nNow")), $xfer_keys), + 0, gtkset_sensitive(my $check_user_keys = new Gtk::CheckButton(N("Other (not drakbackup)\nkeys in place already")), ($where_net && ($net_proto eq 'ssh'))), ), 0, new Gtk::HSeparator, 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter the host name or IP.")), $where_net), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter the host name or IP.")), $where_net), 1, new Gtk::HBox(0,10), 0, gtkset_sensitive(my $host_name_entry = new Gtk::Entry(), $where_net), ), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter the directory (or module) to\n put the backup on this host.")), $where_net), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter the directory (or module) to\n put the backup on this host.")), $where_net), 1, new Gtk::HBox(0,10), 0, gtkset_sensitive(my $host_path_entry = new Gtk::Entry(), $where_net), ), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter your login")), $where_net), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter your login")), $where_net), 1, new Gtk::HBox(0,10), 0, gtkset_sensitive(my $login_user_entry = new Gtk::Entry(), $where_net), ), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter your password")), $where_net), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter your password")), $where_net), 1, new Gtk::HBox(0,10), 0, gtkset_sensitive(my $passwd_user_entry = new Gtk::Entry(), $where_net), ), 0, gtkpack_(new Gtk::HBox(0,10), 1, new Gtk::HBox(0,10), - 0, gtkset_sensitive(my $check_remember_pass = new Gtk::CheckButton(_("Remember this password")), $where_net), + 0, gtkset_sensitive(my $check_remember_pass = new Gtk::CheckButton(N("Remember this password")), $where_net), ), ), ); @@ -1816,7 +1816,7 @@ sub advanced_where_net_types { if (($passwd_user ne '') && ($login_user ne '') && ($host_name ne '')) { do_expect("sendkey", $backup_key); } else { - $in->ask_warn('',_("Need hostname, username and password!")); + $in->ask_warn('',N("Need hostname, username and password!")); } }); $passwd_user_entry->set_visibility(0); @@ -1911,59 +1911,59 @@ sub advanced_where_cd { gtkpack($advanced_box, $box_where_cd = gtkpack_(new Gtk::VBox(0, 6), - 0, my $check_where_cd = new Gtk::CheckButton(_("Use CD/DVDROM to backup")), + 0, my $check_where_cd = new Gtk::CheckButton(N("Use CD/DVDROM to backup")), 0, new Gtk::HSeparator, 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please choose your CD/DVD device\n(Press Enter to propogate settings to other fields.\nThis field isn't necessary, only a tool to fill in the form.)")), $where_cd), + 0, gtkset_sensitive(new Gtk::Label(N("Please choose your CD/DVD device\n(Press Enter to propogate settings to other fields.\nThis field isn't necessary, only a tool to fill in the form.)")), $where_cd), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(gtkset_usize ($combo_where_cd_device, 200, 20), $where_cd), ), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please choose your CD/DVD media size (Mb)")), $where_cd), + 0, gtkset_sensitive(new Gtk::Label(N("Please choose your CD/DVD media size (Mb)")), $where_cd), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(gtkset_usize ($combo_where_cd_time, 200, 20), $where_cd), ), 0, new Gtk::VBox(0, 5), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please check for multisession CD")), $where_cd), + 0, gtkset_sensitive(new Gtk::Label(N("Please check for multisession CD")), $where_cd), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(my $check_multisession = new Gtk::CheckButton(), $where_cd), ), 0, new Gtk::VBox(0, 5), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please check if you are using CDRW media")), $where_cd), + 0, gtkset_sensitive(new Gtk::Label(N("Please check if you are using CDRW media")), $where_cd), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(my $check_cdrw = new Gtk::CheckButton(), $where_cd), ), 0, new Gtk::VBox(0, 5), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please check if you want to erase your RW media (1st Session)")), $cdrw && $where_cd), - 0, gtkset_sensitive(my $button_erase_now = new Gtk::Button(_(" Erase Now ")), $cdrw), + 0, gtkset_sensitive(new Gtk::Label(N("Please check if you want to erase your RW media (1st Session)")), $cdrw && $where_cd), + 0, gtkset_sensitive(my $button_erase_now = new Gtk::Button(N(" Erase Now ")), $cdrw), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(my $check_cdrw_erase = new Gtk::CheckButton(), $cdrw && $where_cd), ), 0, new Gtk::VBox(0, 5), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please check if you are using a DVDR device")), $where_cd), + 0, gtkset_sensitive(new Gtk::Label(N("Please check if you are using a DVDR device")), $where_cd), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(my $check_dvdr = new Gtk::CheckButton(), $where_cd), ), 0, new Gtk::VBox(0, 5), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please check if you are using a DVDRAM device")), $where_cd), + 0, gtkset_sensitive(new Gtk::Label(N("Please check if you are using a DVDRAM device")), $where_cd), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(my $check_dvdram = new Gtk::CheckButton(), $where_cd), ), # don't know what this is about - hold off for now (SB) # 0, new Gtk::VBox(0, 5), # 0, gtkpack_(new Gtk::HBox(0,10), -# 0, gtkset_sensitive(new Gtk::Label(_("Please check if you want to include\n install boot on your CD.")), $where_cd), +# 0, gtkset_sensitive(new Gtk::Label(N("Please check if you want to include\n install boot on your CD.")), $where_cd), # 1, new Gtk::VBox(0, 5), # 0, gtkset_sensitive(my $check_cd_with_install_boot = new Gtk::CheckButton(), $where_cd), # ), 0, new Gtk::VBox(0, 5), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter your CD Writer device name\n ex: 0,1,0")), $where_cd), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter your CD Writer device name\n ex: 0,1,0")), $where_cd), 1, new Gtk::VBox(0, 5), # 0, gtkset_usize (gtkset_sensitive($cd_device_entry = new Gtk::Entry(), $where_cd), 200, 20), 0, gtkset_sensitive(gtkset_usize ($combo_where_cdrecord_device, 200, 20), $where_cd), @@ -1996,7 +1996,7 @@ sub advanced_where_cd { if ($cd_device ne '') { erase_cdrw(); } else { - $in->ask_warn('',_("No CD device defined!")); + $in->ask_warn('',N("No CD device defined!")); } }); $combo_where_cdrecord_device->entry->set_text($cd_device); @@ -2044,34 +2044,34 @@ sub advanced_where_tape { gtkpack($advanced_box, $box_where_tape = gtkpack_(new Gtk::VBox(0, 6), 0, new Gtk::HSeparator, - 0, my $check_where_tape = new Gtk::CheckButton(_("Use tape to backup") ), + 0, my $check_where_tape = new Gtk::CheckButton(N("Use tape to backup") ), 0, new Gtk::HSeparator, 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter the device name to use for backup")), $where_tape), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter the device name to use for backup")), $where_tape), 1, new Gtk::VBox(0, 6), 0, gtkset_sensitive(gtkset_usize ($combo_where_tape_device, 200, 20), $where_tape), ), 0, new Gtk::VBox(0, 5), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please check if you want to use the non-rewinding device.")), $where_tape), + 0, gtkset_sensitive(new Gtk::Label(N("Please check if you want to use the non-rewinding device.")), $where_tape), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(my $check_tape_rewind = new Gtk::CheckButton(), $where_tape), ), 0, new Gtk::VBox(0, 5), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please check if you want to erase your tape before the backup.")), $where_tape), + 0, gtkset_sensitive(new Gtk::Label(N("Please check if you want to erase your tape before the backup.")), $where_tape), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(my $check_tape_erase = new Gtk::CheckButton(), $where_tape), ), 0, new Gtk::VBox(0, 5), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please check if you want to eject your tape after the backup.")), $where_tape), + 0, gtkset_sensitive(new Gtk::Label(N("Please check if you want to eject your tape after the backup.")), $where_tape), 1, new Gtk::VBox(0, 5), 0, gtkset_sensitive(my $check_tape_eject = new Gtk::CheckButton(), $where_tape), ), 0, new Gtk::VBox(0, 6), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter the maximum size\n allowed for Drakbackup")), $where_tape), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter the maximum size\n allowed for Drakbackup")), $where_tape), 1, new Gtk::VBox(0, 6), 0, gtkset_usize (gtkset_sensitive(my $spinner = new Gtk::SpinButton($adj, 0, 0), $where_tape), 200, 20), ), @@ -2133,10 +2133,10 @@ sub advanced_where_hd { gtkpack($advanced_box, $box_where_hd = gtkpack_(new Gtk::VBox(0, 6), 0, new Gtk::HSeparator, -# 0, my $check_where_hd = new Gtk::CheckButton( _("Use Hard Disk to backup") ), +# 0, my $check_where_hd = new Gtk::CheckButton( N("Use Hard Disk to backup") ), # 0, new Gtk::HSeparator, 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter the directory to save to:")), $where_hd), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter the directory to save to:")), $where_hd), 1, new Gtk::VBox(0, 6), 0, gtkset_usize (gtkset_sensitive($save_path_entry = new Gtk::Entry(), $where_hd), 152, 20), 0, gtkset_sensitive($button = gtksignal_connect(new Gtk::Button(), clicked => sub { @@ -2145,13 +2145,13 @@ sub advanced_where_hd { ), 0, new Gtk::VBox(0, 6), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter the maximum size\n allowed for Drakbackup")), $where_hd), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter the maximum size\n allowed for Drakbackup")), $where_hd), 1, new Gtk::VBox(0, 6), 0, gtkset_usize (gtkset_sensitive(my $spinner = new Gtk::SpinButton($adj, 0, 0), $where_hd), 200, 20), ), 0, gtkpack_(new Gtk::HBox(0,10), 1, new Gtk::VBox(0, 6), - 0, gtkset_sensitive(my $check_where_hd_quota = new Gtk::CheckButton(_("Use quota for backup files.")), $where_hd), + 0, gtkset_sensitive(my $check_where_hd_quota = new Gtk::CheckButton(N("Use quota for backup files.")), $where_hd), 0, new Gtk::VBox(0, 6), ), ), @@ -2217,22 +2217,22 @@ sub advanced_where{ ); $button_where_net->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_net_map, $pix_net_mask), - new Gtk::Label(_("Network")), + new Gtk::Label(N("Network")), new Gtk::HBox(0, 5) )); $button_where_cd->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_cd_map, $pix_cd_mask), - new Gtk::Label(_("CDROM / DVDROM")), + new Gtk::Label(N("CDROM / DVDROM")), new Gtk::HBox(0, 5) )); $button_where_hd->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_hd_map, $pix_hd_mask), - new Gtk::Label(_("HardDrive / NFS")), + new Gtk::Label(N("HardDrive / NFS")), new Gtk::HBox(0, 5) )); $button_where_tape->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_tape_map, $pix_tape_mask), - new Gtk::Label(_("Tape")), + new Gtk::Label(N("Tape")), new Gtk::HBox(0, 5) )); fonction_env(\$box_where, \&advanced_where, \&advanced_box, ""); @@ -2246,15 +2246,15 @@ sub advanced_when{ # $daemon_media = ''; my ($pix_time_map, $pix_time_mask) = gtkcreate_png("ic82-when-40"); my $combo_when_space = new Gtk::Combo(); - my %trans = (_("hourly") => 'hourly', - _("daily") => 'daily', - _("weekly") => 'weekly', - _("monthly") => 'monthly'); - my %trans2 = ('hourly' => _("hourly"), - 'daily' => _("daily"), - 'weekly' => _("weekly"), - 'monthly' => _("monthly")); - $combo_when_space->set_popdown_strings (_("hourly"),_("daily"),_("weekly"),_("monthly")); + my %trans = (N("hourly") => 'hourly', + N("daily") => 'daily', + N("weekly") => 'weekly', + N("monthly") => 'monthly'); + my %trans2 = ('hourly' => N("hourly"), + 'daily' => N("daily"), + 'weekly' => N("weekly"), + 'monthly' => N("monthly")); + $combo_when_space->set_popdown_strings (N("hourly"),N("daily"),N("weekly"),N("monthly")); #- drop down list of possible medias - default to config value my $entry_media_type = new Gtk::Combo(); @@ -2267,25 +2267,25 @@ sub advanced_when{ 0, gtkpack_(new Gtk::HBox(0,10), 1, new Gtk::HBox(0,10), 1, new Gtk::Pixmap($pix_time_map, $pix_time_mask), - 0, my $check_when_daemon = new Gtk::CheckButton(_("Use daemon") ), + 0, my $check_when_daemon = new Gtk::CheckButton(N("Use daemon") ), 1, new Gtk::HBox(0,10), ), 0, new Gtk::HSeparator, 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please choose the time \ninterval between each backup")), $backup_daemon), + 0, gtkset_sensitive(new Gtk::Label(N("Please choose the time \ninterval between each backup")), $backup_daemon), 1, new Gtk::HBox(0,10), 0, gtkset_sensitive($combo_when_space, $backup_daemon), ), 0, new Gtk::HBox(0,10), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please choose the\nmedia for backup.")), $backup_daemon), + 0, gtkset_sensitive(new Gtk::Label(N("Please choose the\nmedia for backup.")), $backup_daemon), 1, new Gtk::HBox(0,10), 0, gtkpack_(new Gtk::VBox(0,10), 0, gtkset_sensitive($entry_media_type, $backup_daemon), ), ), 0, new Gtk::HSeparator, - 1, gtkset_sensitive(new Gtk::Label(_("Please be sure that the cron daemon is included in your services. + 1, gtkset_sensitive(new Gtk::Label(N("Please be sure that the cron daemon is included in your services. \nNote that currently all 'net' medias also use the hard drive.")), $backup_daemon), ), ); @@ -2313,22 +2313,22 @@ sub advanced_options{ # 0, gtkpack_(new Gtk::HBox(0,10), # 1, new Gtk::VBox(0,10), # 1, new Gtk::Pixmap($pix_options_map, $pix_options_mask), -# 1, _("Please choose correct options to backup."), +# 1, N("Please choose correct options to backup."), # 1, new Gtk::VBox(0,10), # ), # 0, new Gtk::HSeparator, # 0, gtkpack_(new Gtk::VBox(0,10), -# 0, gtkset_sensitive(my $check_tar_bz2 = new Gtk::CheckButton( _("Use Tar and bzip2 (very slow) [Please be careful if you\n (un)select this option, as all your old backups will be deleted.]") ), 0), -# 0, gtkset_sensitive(my $check_backupignore = new Gtk::CheckButton( _("Use .backupignore files")), 0), +# 0, gtkset_sensitive(my $check_tar_bz2 = new Gtk::CheckButton( N("Use Tar and bzip2 (very slow) [Please be careful if you\n (un)select this option, as all your old backups will be deleted.]") ), 0), +# 0, gtkset_sensitive(my $check_backupignore = new Gtk::CheckButton( N("Use .backupignore files")), 0), 0, new Gtk::VBox(0,10), 0, gtkpack_(new Gtk::HBox(0,10), - 0, my $check_mail = new Gtk::CheckButton(_("Send mail report after each backup to:")), + 0, my $check_mail = new Gtk::CheckButton(N("Send mail report after each backup to:")), 1, new Gtk::HBox(0,10), 0, my $mail_entry = new Gtk::Entry(), ), # ), 0, gtkpack_(new Gtk::HBox(0,10), - 0, my $check_del_hd_files = new Gtk::CheckButton(_("Delete Hard Drive tar files after backup to other media.")), + 0, my $check_del_hd_files = new Gtk::CheckButton(N("Delete Hard Drive tar files after backup to other media.")), ), ), ); @@ -2367,22 +2367,22 @@ sub advanced_box{ ); $button_what->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_hd_map, $pix_hd_mask), - new Gtk::Label(_("What")), + new Gtk::Label(N("What")), new Gtk::HBox(0, 5) )); $button_where->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_net_map, $pix_net_mask), - new Gtk::Label(_("Where")), + new Gtk::Label(N("Where")), new Gtk::HBox(0, 5) )); $button_when->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_time_map, $pix_time_mask), - new Gtk::Label(_("When")), + new Gtk::Label(N("When")), new Gtk::HBox(0, 5) )); $button_options->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_options_map, $pix_options_mask), - new Gtk::Label(_("More Options")), + new Gtk::Label(N("More Options")), new Gtk::HBox(0, 5) )); fonction_env(\$box_adv, \&advanced_box, \&interactive_mode_box, ""); @@ -2401,7 +2401,7 @@ sub wizard_step3 { gtkpack($advanced_box, $box2 = gtkpack_(new Gtk::HBox(0, 15), 1, gtkpack_(new Gtk::VBox(0,10), - 0, _("Drakbackup Configuration"), + 0, N("Drakbackup Configuration"), 1, createScrolledWindow($text), ), ), @@ -2419,11 +2419,11 @@ sub wizard_step2 { 1, new Gtk::VBox(0, 5), 1, gtkpack_(new Gtk::VBox(0, 15), 1, new Gtk::VBox(0, 5), - 0, _("Please choose where you want to backup"), + 0, N("Please choose where you want to backup"), 0, gtkpack_(new Gtk::HBox(0, 15), - 0, my $check_wizard_hd = new Gtk::CheckButton(_("on Hard Drive")), + 0, my $check_wizard_hd = new Gtk::CheckButton(N("on Hard Drive")), 1, new Gtk::VBox(0, 5), - 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(_("Configure")), clicked => sub { + 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(N("Configure")), clicked => sub { ${$central_widget}->destroy(); to_ok(); advanced_where_hd(\&wizard_step2); @@ -2431,9 +2431,9 @@ sub wizard_step2 { }), $where_hd), ), 0, gtkpack_(new Gtk::HBox(0, 15), - 0, my $check_wizard_net = new Gtk::CheckButton(_("across Network")), + 0, my $check_wizard_net = new Gtk::CheckButton(N("across Network")), 1, new Gtk::VBox(0, 5), - 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(_("Configure")), clicked => sub { + 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(N("Configure")), clicked => sub { ${$central_widget}->destroy(); to_ok(); advanced_where_net_types(\&wizard_step2); @@ -2441,17 +2441,17 @@ sub wizard_step2 { }), $where_net), ), 0, gtkpack_(new Gtk::HBox(0, 15), - 0, my $check_wizard_cd = new Gtk::CheckButton(_("on CDROM")), + 0, my $check_wizard_cd = new Gtk::CheckButton(N("on CDROM")), 1, new Gtk::VBox(0, 5), - 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(_("Configure")), clicked => sub { + 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(N("Configure")), clicked => sub { ${$central_widget}->destroy(); advanced_where_cd(\&wizard_step2); }), $where_cd), ), 0, gtkpack_(new Gtk::HBox(0, 15), - 0, my $check_wizard_tape = new Gtk::CheckButton(_("on Tape Device")), + 0, my $check_wizard_tape = new Gtk::CheckButton(N("on Tape Device")), 1, new Gtk::VBox(0, 5), - 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(_("Configure")), clicked => sub { + 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(N("Configure")), clicked => sub { ${$central_widget}->destroy(); advanced_where_tape(\&wizard_step2); }), $where_tape), @@ -2492,12 +2492,12 @@ sub wizard { 1, new Gtk::VBox(0, 5), 1, gtkpack_(new Gtk::VBox(0, 15), 1, new Gtk::VBox(0, 5), - 0, _("Please choose what you want to backup"), - 0, my $check_wizard_sys = new Gtk::CheckButton(_("Backup system")), - 0, my $check_wizard_user = new Gtk::CheckButton(_("Backup Users")), + 0, N("Please choose what you want to backup"), + 0, my $check_wizard_sys = new Gtk::CheckButton(N("Backup system")), + 0, my $check_wizard_user = new Gtk::CheckButton(N("Backup Users")), 0, gtkpack_(new Gtk::HBox(0, 15), 1, new Gtk::VBox(0, 5), - 0, gtksignal_connect(new Gtk::Button(_("Select user manually")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Select user manually")), clicked => sub { ${$central_widget}->destroy(); advanced_what_user(\&wizard); }), @@ -2580,57 +2580,57 @@ sub system_state { $system_state = (); if ($cfg_file_exist) { - $system_state .= _("\nBackup Sources: \n"); - $backup_sys and $system_state .= _("\n- System Files:\n"); + $system_state .= N("\nBackup Sources: \n"); + $backup_sys and $system_state .= N("\n- System Files:\n"); $backup_sys and $system_state .= "\t\t$_\n" foreach @sys_files; - $backup_user and $system_state .= _("\n- User Files:\n"); + $backup_user and $system_state .= N("\n- User Files:\n"); $backup_user and $system_state .= "\t\t$_\n" foreach @user_list; - @list_other and $system_state .= _("\n- Other Files:\n"); + @list_other and $system_state .= N("\n- Other Files:\n"); @list_other and $system_state .= "\t\t$_\n" foreach @list_other; - $where_hd and $system_state .= _("\n- Save on Hard drive on path: %s\n", $save_path); + $where_hd and $system_state .= N("\n- Save on Hard drive on path: %s\n", $save_path); if (($del_hd_files) && (($where_cd) || ($where_tape) || ($where_net)) && ($daemon_media ne 'hd')) { - $system_state .= _("\n- Delete hard drive tar files after backup.\n"); + $system_state .= N("\n- Delete hard drive tar files after backup.\n"); } #- tape and CDRW share some features my $erase_media = 'NO'; $erase_media = 'YES' if (($media_erase) && ($where_cd || $where_tape)); - $where_cd and $system_state .= _("\n- Burn to CD"); - $where_cd and $cdrw and $system_state .= _("RW"); - $where_cd and $system_state .= _(" on device: %s", $cd_device); - $where_cd and $multi_session and $system_state .= _(" (multi-session)"); - $where_tape and $system_state .= _("\n- Save to Tape on device: %s", $tape_device); - (($where_cd || $where_tape) && $media_erase) and $system_state .= _("\t\tErase=%s", $erase_media); + $where_cd and $system_state .= N("\n- Burn to CD"); + $where_cd and $cdrw and $system_state .= N("RW"); + $where_cd and $system_state .= N(" on device: %s", $cd_device); + $where_cd and $multi_session and $system_state .= N(" (multi-session)"); + $where_tape and $system_state .= N("\n- Save to Tape on device: %s", $tape_device); + (($where_cd || $where_tape) && $media_erase) and $system_state .= N("\t\tErase=%s", $erase_media); ($where_cd || $where_tape) and $system_state .= "\n"; - $where_net and $system_state .= _("\n- Save via %s on host: %s\n", $net_proto, $host_name); - $where_net and $system_state .= _("\t\t user name: %s\n\t\t on path: %s \n", $login_user, $host_path); - $system_state .= _("\n- Options:\n"); - $backup_sys or $system_state .= _("\tDo not include System Files\n"); + $where_net and $system_state .= N("\n- Save via %s on host: %s\n", $net_proto, $host_name); + $where_net and $system_state .= N("\t\t user name: %s\n\t\t on path: %s \n", $login_user, $host_path); + $system_state .= N("\n- Options:\n"); + $backup_sys or $system_state .= N("\tDo not include System Files\n"); if ($comp_mode) { - $system_state .= _("\tBackups use tar and bzip2\n"); + $system_state .= N("\tBackups use tar and bzip2\n"); } else { - $system_state .= _("\tBackups use tar and gzip\n"); + $system_state .= N("\tBackups use tar and gzip\n"); } - $daemon_media and $system_state .= _("\n- Daemon (%s) include:\n", $when_space); - ($daemon_media eq 'hd') and $system_state .= _("\t-Hard drive.\n"); - ($daemon_media eq 'cd') and $system_state .= _("\t-CDROM.\n"); - ($daemon_media eq 'tape') and $system_state .= _("\t-Tape \n"); - ($daemon_media eq 'ftp') and $system_state .= _("\t-Network by FTP.\n"); - ($daemon_media eq 'ssh') and $system_state .= _("\t-Network by SSH.\n"); - ($daemon_media eq 'rsync') and $system_state .= _("\t-Network by rsync.\n"); - ($daemon_media eq 'webdav') and $system_state .= _("\t-Network by webdav.\n"); + $daemon_media and $system_state .= N("\n- Daemon (%s) include:\n", $when_space); + ($daemon_media eq 'hd') and $system_state .= N("\t-Hard drive.\n"); + ($daemon_media eq 'cd') and $system_state .= N("\t-CDROM.\n"); + ($daemon_media eq 'tape') and $system_state .= N("\t-Tape \n"); + ($daemon_media eq 'ftp') and $system_state .= N("\t-Network by FTP.\n"); + ($daemon_media eq 'ssh') and $system_state .= N("\t-Network by SSH.\n"); + ($daemon_media eq 'rsync') and $system_state .= N("\t-Network by rsync.\n"); + ($daemon_media eq 'webdav') and $system_state .= N("\t-Network by webdav.\n"); } else { - $system_state = _("No configuration, please click Wizard or Advanced.\n"); + $system_state = N("No configuration, please click Wizard or Advanced.\n"); } } sub restore_state { my @tmp = split(' ', $restore_step_sys_date); - $restore_state = _("List of data to restore:\n\n"); + $restore_state = N("List of data to restore:\n\n"); if ($restore_sys) { $restore_state .= "- Restore System Files.\n"; $restore_state .= " - from date: $tmp[0] $tmp[1]\n"; } @@ -2768,7 +2768,7 @@ sub show_backup_details { 0, new Gtk::VScrollbar($text->vadj), ), 0, gtkadd(gtkset_layout(new Gtk::HButtonBox, -spread), - gtksignal_connect(new Gtk::Button(_("Done")), clicked => sub { + gtksignal_connect(new Gtk::Button(N("Done")), clicked => sub { ${$central_widget}->destroy(); $function->() }), ), @@ -2797,9 +2797,9 @@ sub restore_aff_backup_problems { my $button_restore; my $text = new Gtk::Text(undef, undef); my ($pix_warn_map, $pix_warn_mask) = gtkcreate_png('warning'); - my $restore_pbs_state = _("List of data corrupted:\n\n"); + my $restore_pbs_state = N("List of data corrupted:\n\n"); $restore_pbs_state .= "\t\t$_\n" foreach @files_corrupted ; - $restore_pbs_state .= _("Please uncheck or remove it on next time."); + $restore_pbs_state .= N("Please uncheck or remove it on next time."); gtktext_insert($text, $restore_pbs_state); button_box_restore_main(); @@ -2809,7 +2809,7 @@ sub restore_aff_backup_problems { 1, gtkpack_(new Gtk::HBox(0, 15), 1, new Gtk::VBox(0, 5), 0, new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - 0, _("Backup files are corrupted"), + 0, N("Backup files are corrupted"), 1, new Gtk::VBox(0, 5), ), 0, new Gtk::VBox(0,10), @@ -2830,8 +2830,8 @@ sub restore_aff_result { gtkpack($advanced_box, $do_restore = gtkpack_(new Gtk::VBox(0,10), 1, new Gtk::VBox(0,10), - 0, _(" All of your selected data have been "), - 0, _(" Successfuly Restored on %s ", $restore_path), + 0, N(" All of your selected data have been "), + 0, N(" Successfuly Restored on %s ", $restore_path), 1, new Gtk::VBox(0,10), ), ); @@ -2949,7 +2949,7 @@ sub restore_do2 { gtkpack($advanced_box, $do_restore = gtkpack_(new Gtk::VBox(0,10), - 0, _(" Restore Configuration "), + 0, N(" Restore Configuration "), 1, createScrolledWindow($text), ), ); @@ -2967,7 +2967,7 @@ sub restore_step_other { $retore_step_other = gtkpack_(new Gtk::VBox(0,10), 1, new Gtk::VBox(0,10), 1, createScrolledWindow($text), - 0, my $check_restore_other_sure = new Gtk::CheckButton(_("OK to restore the other files.")), + 0, my $check_restore_other_sure = new Gtk::CheckButton(N("OK to restore the other files.")), 1, new Gtk::VBox(0,10), ), ); @@ -2984,7 +2984,7 @@ sub restore_step_user { gtkpack($advanced_box, $retore_step_user = gtkpack_(new Gtk::VBox(0,10), 0, new Gtk::VBox(0,10), - 0, _("User list to restore (only the most recent date per user is important)"), + 0, N("User list to restore (only the most recent date per user is important)"), 1, createScrolledWindow(gtkpack__(new Gtk::VBox(0,0), map { my $name; my $var2; @@ -3062,9 +3062,9 @@ sub restore_step_sys { gtkpack($advanced_box, $restore_step_sys = gtkpack_(new Gtk::VBox(0,10), 1, new Gtk::VBox(0,10), - 0, my $check_backup_before = new Gtk::CheckButton(_("Backup the system files before:")), + 0, my $check_backup_before = new Gtk::CheckButton(N("Backup the system files before:")), 0, gtkpack_(new Gtk::HBox(0,10), - 1, _("please choose the date to restore"), + 1, N("please choose the date to restore"), 0, $combo_restore_step_sys, 0, my $details = new Gtk::Button(" Details "), 0, new Gtk::HBox(0,10), @@ -3101,10 +3101,10 @@ sub restore_other_media_hd { gtkpack($advanced_box, $box_where_hd = gtkpack_(new Gtk::VBox(0, 6), 0, new Gtk::HSeparator, - 0, my $check_where_hd = new Gtk::CheckButton(_("Use Hard Disk to backup") ), + 0, my $check_where_hd = new Gtk::CheckButton(N("Use Hard Disk to backup") ), 0, new Gtk::HSeparator, 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter the directory to save:")), $where_hd), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter the directory to save:")), $where_hd), 1, new Gtk::VBox(0, 6), 0, gtkset_usize (gtkset_sensitive($save_path_entry = new Gtk::Entry(), $where_hd), 152, 20), 0, gtkset_sensitive($button = gtksignal_connect(new Gtk::Button(), clicked => sub { @@ -3112,13 +3112,13 @@ sub restore_other_media_hd { ), 0, new Gtk::VBox(0, 6), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter the maximum size\n allowed for Drakbackup")), $where_hd), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter the maximum size\n allowed for Drakbackup")), $where_hd), 1, new Gtk::VBox(0, 6), 0, gtkset_usize (gtkset_sensitive(my $spinner = new Gtk::SpinButton($adj, 0, 0), $where_hd), 200, 20), ), 0, gtkpack_(new Gtk::HBox(0,10), 1, new Gtk::VBox(0, 6), - 0, gtkset_sensitive(my $check_where_hd_quota = new Gtk::CheckButton(_("Use quota for backup files.")), $where_hd), + 0, gtkset_sensitive(my $check_where_hd_quota = new Gtk::CheckButton(N("Use quota for backup files.")), $where_hd), 0, new Gtk::VBox(0, 6), ), ), @@ -3147,14 +3147,14 @@ sub restore_find_net { 1, gtkpack_(new Gtk::VBox(0, 15), 1, new Gtk::VBox(0, 5), 1, new Gtk::VBox(0,10), - 1, gtksignal_connect(new Gtk::Button(_("FTP Connection")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("FTP Connection")), clicked => sub { $box_where_net->destroy(); if ($previous_function) { message_underdevel(); } else { } }), - 1, gtksignal_connect(new Gtk::Button(_("Secure Connection")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Secure Connection")), clicked => sub { $box_where_net->destroy(); if ($previous_function) { } else { @@ -3180,9 +3180,9 @@ sub restore_other_media { gtkpack($advanced_box, $box_find_restore = gtkpack_(new Gtk::VBox(0, 6), 0, new Gtk::HSeparator, - 0, my $check_other_media_hd = new Gtk::CheckButton(_("Restore from Hard Disk.") ), + 0, my $check_other_media_hd = new Gtk::CheckButton(N("Restore from Hard Disk.") ), 0, gtkpack_(new Gtk::HBox(0,10), - 0, gtkset_sensitive(new Gtk::Label(_("Please enter the directory where backups are stored")), $other_media_hd), + 0, gtkset_sensitive(new Gtk::Label(N("Please enter the directory where backups are stored")), $other_media_hd), 1, new Gtk::VBox(0, 6), 0, gtkset_usize (gtkset_sensitive($restore_find_path_entry = new Gtk::Entry(), $other_media_hd), 152, 20), 0, gtkset_sensitive($button = gtksignal_connect(new Gtk::Button(), clicked => sub { @@ -3191,7 +3191,7 @@ sub restore_other_media { ), 1, new Gtk::VBox(0, 6), # 0, new Gtk::HSeparator, -# 0, my $check_other_media_net = new Gtk::CheckButton( _("Restore from Network") ), +# 0, my $check_other_media_net = new Gtk::CheckButton( N("Restore from Network") ), # 0, new Gtk::VBox(0, 6), # 1, gtkpack(new Gtk::HBox(0,10), # new Gtk::VBox(0, 6), @@ -3250,24 +3250,24 @@ sub restore_step2 { 1, new Gtk::VBox(0,10), 1, new Gtk::VBox(0,10), 0, gtkpack_(new Gtk::HBox(0,10), - 0, my $check_restore_other_src = new Gtk::CheckButton(_("Select another media to restore from")), + 0, my $check_restore_other_src = new Gtk::CheckButton(N("Select another media to restore from")), 1, new Gtk::HBox(0,10), - 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(_("Other Media")), clicked => sub { + 0, gtkset_sensitive(gtksignal_connect(new Gtk::Button(N("Other Media")), clicked => sub { ${$central_widget}->destroy(); restore_other_media(); }), $restore_other_src), ), - 0, gtkset_sensitive(my $check_restore_sys = new Gtk::CheckButton(_("Restore system")), $sys_exist), - 0, gtkset_sensitive(my $check_restore_user = new Gtk::CheckButton(_("Restore Users")), $user_exist), - 0, gtkset_sensitive(my $check_restore_other = new Gtk::CheckButton(_("Restore Other")), $other_exist), + 0, gtkset_sensitive(my $check_restore_sys = new Gtk::CheckButton(N("Restore system")), $sys_exist), + 0, gtkset_sensitive(my $check_restore_user = new Gtk::CheckButton(N("Restore Users")), $user_exist), + 0, gtkset_sensitive(my $check_restore_other = new Gtk::CheckButton(N("Restore Other")), $other_exist), 0, gtkpack_(new Gtk::HBox(0,10), - 0, my $check_restore_other_path = new Gtk::CheckButton(_("select path to restore (instead of /)")), + 0, my $check_restore_other_path = new Gtk::CheckButton(N("select path to restore (instead of /)")), 1, new Gtk::HBox(0,10), 0, gtkset_sensitive(my $restore_path_entry = new Gtk::Entry(), $restore_other_path), ), - 0, gtkset_sensitive(my $check_backup_bef_restore = new Gtk::CheckButton(_("Do new backup before restore (only for incremental backups.)")), + 0, gtkset_sensitive(my $check_backup_bef_restore = new Gtk::CheckButton(N("Do new backup before restore (only for incremental backups.)")), $backup_sys_versions || $backup_user_versions), - 0, gtkset_sensitive(my $check_remove_user_dir = new Gtk::CheckButton(_("Remove user directories before restore.")), $user_exist), + 0, gtkset_sensitive(my $check_remove_user_dir = new Gtk::CheckButton(N("Remove user directories before restore.")), $user_exist), 1, new Gtk::VBox(0,10), ), ); @@ -3380,7 +3380,7 @@ sub catalog_restore { 1, createScrolledWindow($list_bu_files), ), 0, gtkpack_(new Gtk::HBox(1, 10), - 1, gtksignal_connect(new Gtk::Button(_("Restore Selected\nCatalog Entry")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Restore Selected\nCatalog Entry")), clicked => sub { if ($cat_entry ne '') { my $media_check = restore_catalog_entry($cat_entry, ()); if ($media_check) { @@ -3390,7 +3390,7 @@ sub catalog_restore { } } }), - 1, gtksignal_connect(new Gtk::Button(_("Restore Selected\nFiles")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Restore Selected\nFiles")), clicked => sub { my $files = @restore_files; #- grab the array before the widget clears it my @passed_files = @restore_files; @@ -3407,7 +3407,7 @@ sub catalog_restore { 0, new Gtk::Label("Restore To Path"), 0, $restore_path_entry = new Gtk::Entry(), ), - 1, gtksignal_connect(new Gtk::Button(_("Change\nRestore Path")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Change\nRestore Path")), clicked => sub { filedialog_generic(0, "Path To Restore To", \$restore_path_entry, \$restore_path); }), ), @@ -3473,7 +3473,7 @@ sub restore_catalog_entry { my @restore_tar_files = glob("$dev_path/*$backup_time*$tar_ext"); my $matches = @restore_tar_files; if ($matches eq 0) { - show_warning("f", _("Backup files not found at %s.", $dev_path)); + show_warning("f", N("Backup files not found at %s.", $dev_path)); return(0); } else { my $save_path_org = $save_path; @@ -3486,9 +3486,9 @@ sub restore_catalog_entry { if ($media eq 'CD') { #- we know the cdrecord device, and the label #- prompt the user for the right CD - $in->ask_okcancel(_("Restore From CD"),_("Insert the CD with volume label %s\n in the CD drive under mount point /mnt/cdrom", $vol_host) ,1) ? $vol_name = get_cd_volname() : return(0); + $in->ask_okcancel(N("Restore From CD"),N("Insert the CD with volume label %s\n in the CD drive under mount point /mnt/cdrom", $vol_host) ,1) ? $vol_name = get_cd_volname() : return(0); if ($vol_name ne $vol_host) { - show_warning("f", _("Not the correct CD label. Disk is labelled %s.", $vol_name)); + show_warning("f", N("Not the correct CD label. Disk is labelled %s.", $vol_name)); return(0); } else { $restore_result = restore_hd_or_cd($cat_entry, '/mnt/cdrom', @restore_files); @@ -3498,9 +3498,9 @@ sub restore_catalog_entry { if ($media eq 'Tape') { #- a little more complicated, we need to check if other backups #- were done on this tape, and try to find the offset to this one - $in->ask_okcancel(_("Restore From Tape"),_("Insert the tape with volume label %s\n in the tape drive device %s", $vol_host, $dev_path) ,1) ? $vol_name = get_tape_label($dev_path) : return(0); + $in->ask_okcancel(N("Restore From Tape"),N("Insert the tape with volume label %s\n in the tape drive device %s", $vol_host, $dev_path) ,1) ? $vol_name = get_tape_label($dev_path) : return(0); if ($vol_name ne $vol_host) { - show_warning("f", _("Not the correct tape label. Tape is labelled %s.", $vol_name)); + show_warning("f", N("Not the correct tape label. Tape is labelled %s.", $vol_name)); return(0); } else { $restore_result = restore_tape($cat_entry, $dev_path, @restore_files); @@ -3520,30 +3520,30 @@ sub restore_catalog_entry { #- rsync - uses a config file with username - rsync.user #- ftp needs all parameters entered - $in->ask_from(_("Restore Via Network"), _("Restore Via Network Protocol: %s", $media), - [ { label => _("Host Name"), val => \$vol_host }, - { label => _("Host Path or Module"), val => \$dev_path }, - { label => _("Username"), val => \$username }, - { label => _("Password"), val => \$userpass, hidden => 1 }, + $in->ask_from(N("Restore Via Network"), N("Restore Via Network Protocol: %s", $media), + [ { label => N("Host Name"), val => \$vol_host }, + { label => N("Host Path or Module"), val => \$dev_path }, + { label => N("Username"), val => \$username }, + { label => N("Password"), val => \$userpass, hidden => 1 }, ]) or goto return(0); if (($media eq 'ftp') || ($media eq 'rsync')) { if ($userpass eq '') { - show_warning("f", __("Password required")); + show_warning("f", N_("Password required")); return(0); } } if (($media eq 'ftp') || ($media eq 'rsync') || ($media eq 'ssh')) { if ($username eq '') { - show_warning("f", __("Username required")); + show_warning("f", N_("Username required")); return(0); } elsif ($vol_host eq '') { - show_warning("f", __("Hostname required")); + show_warning("f", N_("Hostname required")); return(0); } } if ($dev_path eq '') { - show_warning("f", __("Path or Module required")); + show_warning("f", N_("Path or Module required")); return(0); } @@ -3556,10 +3556,10 @@ sub restore_catalog_entry { system("rm -f $cfg_dir/restores/*"); if (!$restore_result) { - show_warning("i", __("Files Restored...")); + show_warning("i", N_("Files Restored...")); return(0); } else { - show_warning("f", __("Restore Failed...")); + show_warning("f", N_("Restore Failed...")); return(1); } @@ -3797,7 +3797,7 @@ sub restore_box { 1, gtkpack_(new Gtk::VBox(0,10), 1, new Gtk::VBox(0,10), 1, new Gtk::VBox(0,10), - 1, gtksignal_connect(new Gtk::Button(_("Restore all backups")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Restore all backups")), clicked => sub { $retore_box->destroy(); button_box_restore(); @user_list_to_restore2 = sort @user_backuped; @@ -3806,7 +3806,7 @@ sub restore_box { $restore_user = 1; restore_do() }), - 1, gtksignal_connect(new Gtk::Button(_("Custom Restore")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Custom Restore")), clicked => sub { $retore_box->destroy(); button_box_restore(); restore_step2(); @@ -3846,22 +3846,22 @@ sub restore_find_media_box { 1, gtkpack(new Gtk::HBox(0, 15), new Gtk::VBox(0, 5), new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - _($message), + translate($message), new Gtk::VBox(0, 5), ), 1, gtkpack(new Gtk::HBox(0, 15), new Gtk::VBox(0, 5), gtkpack(new Gtk::VBox(0, 10), - gtkset_sensitive(gtksignal_connect(new Gtk::Button(_("CD in place - continue.")), clicked => sub { + gtkset_sensitive(gtksignal_connect(new Gtk::Button(N("CD in place - continue.")), clicked => sub { $good_restore_path = 1; $box2->destroy(); interactive_mode_box("restore"); }), $mount_media), $new_path_entry = gtkset_sensitive(new Gtk::Entry(), $mount_media), - gtkset_sensitive(gtksignal_connect(new Gtk::Button(_("Browse to new restore repository.")), clicked => sub { + gtkset_sensitive(gtksignal_connect(new Gtk::Button(N("Browse to new restore repository.")), clicked => sub { filedialog_generic(0, "Directory To Restore From", \$new_path_entry, \$path_to_find_restore); }), $mount_media), - gtksignal_connect(new Gtk::Button(_("Restore From Catalog")), clicked => sub { + gtksignal_connect(new Gtk::Button(N("Restore From Catalog")), clicked => sub { $box2->destroy(); catalog_restore(); }), @@ -3889,7 +3889,7 @@ sub restore_status { [""], [""], [""], - [_("Restore Progress")], + [N("Restore Progress")], [""], [""], [$pbar3], @@ -3922,20 +3922,20 @@ sub button_box_adv { $button_box_tmp->destroy(); gtkpack($button_box, $button_box_tmp = gtkpack_(new Gtk::HButtonBox, - 0, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box(); }), - 0, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help); }), 1, new Gtk::HBox(0, 1), - 0, gtksignal_connect(new Gtk::Button(_("Previous")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Previous")), clicked => sub { ${$central_widget}->destroy(); $previous_widget->(); }), - 0, gtksignal_connect(new Gtk::Button(_("Save")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Save")), clicked => sub { ${$central_widget}->destroy(); if (!check_pkg_needs()) { save_conf_file(); @@ -3955,20 +3955,20 @@ sub button_box_restore_main { gtkpack($button_box, $button_box_tmp = gtkpack_(gtkpack_(new Gtk::HButtonBox, - 0, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box() }), - 0, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&$current_widget, $custom_help); }), 1, new Gtk::HBox(0, 1), - 0, gtksignal_connect(new Gtk::Button(_("Previous")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Previous")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box() }), - 0, gtksignal_connect(new Gtk::Button(_("Ok")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Ok")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box() }), ), @@ -3981,20 +3981,20 @@ sub button_box_backup_end { gtkpack($button_box, $button_box_tmp = gtkpack_(new Gtk::HButtonBox, - 0, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box() }), - 0, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help) }), 1, new Gtk::HBox(0, 1), - 0, gtksignal_connect(new Gtk::Button(_("Previous")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Previous")), clicked => sub { ${$central_widget}->destroy(); $previous_widget->() }), - 0, gtksignal_connect(new Gtk::Button(_("Build Backup")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Build Backup")), clicked => sub { ${$central_widget}->destroy(); build_backup_status(); build_backup_files(); @@ -4008,20 +4008,20 @@ sub button_box_wizard_end { gtkpack($button_box, $button_box_tmp = gtkpack_(new Gtk::HButtonBox, - 0, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box(); }), - 0, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help); }), 1, new Gtk::HBox(0, 1), - 0, gtksignal_connect(new Gtk::Button(_("Previous")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Previous")), clicked => sub { ${$central_widget}->destroy(); $previous_widget->(); }), - 0, gtksignal_connect(new Gtk::Button(_("Save")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Save")), clicked => sub { ${$central_widget}->destroy(); save_conf_file(); interactive_mode_box(); @@ -4035,20 +4035,20 @@ sub button_box_restore_end { gtkpack($button_box, $button_box_tmp = gtkpack_(new Gtk::HButtonBox, - 0, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box(); }), - 0, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help); }), 1, new Gtk::HBox(0, 1), - 0, gtksignal_connect(new Gtk::Button(_("Previous")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Previous")), clicked => sub { ${$central_widget}->destroy(); $previous_widget->(); }), - 0, gtksignal_connect(new Gtk::Button(_("Restore")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Restore")), clicked => sub { ${$central_widget}->destroy(); restore_backend(); }), @@ -4063,7 +4063,7 @@ sub button_box_build_backup_end { $button_box_tmp = gtkpack_(new Gtk::HButtonBox, 1, new Gtk::HBox(0, 5), 1, new Gtk::HBox(0, 5), - 0, gtksignal_connect(new Gtk::Button(_("Ok")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Ok")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box(); }), @@ -4078,11 +4078,11 @@ sub button_box_restore_pbs_end { $button_box_tmp = gtkpack_(new Gtk::HButtonBox, 1, new Gtk::HBox(0, 5), 1, new Gtk::HBox(0, 5), - 1, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help); }), - 0, gtksignal_connect(new Gtk::Button(_("Ok")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Ok")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box(); }), @@ -4095,20 +4095,20 @@ sub button_box_build_backup { gtkpack($button_box, $button_box_tmp = gtkpack_(new Gtk::HButtonBox, - 1, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box(); }), - 1, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help); }), 1, new Gtk::HBox(0, 0), - 0, gtksignal_connect(new Gtk::Button(_("Previous")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Previous")), clicked => sub { ${$central_widget}->destroy(); $previous_widget->(); }), - 1, gtksignal_connect(new Gtk::Button(_("Next")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Next")), clicked => sub { ${$central_widget}->destroy(); $next_widget->(); }), @@ -4122,20 +4122,20 @@ sub button_box_restore { gtkpack($button_box, $button_box_tmp = gtkpack_(new Gtk::HButtonBox, - 1, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box(); }), - 1, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help); }), 1, new Gtk::HBox(0, 0), - 0, gtksignal_connect(new Gtk::Button(_("Previous")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Previous")), clicked => sub { ${$central_widget}->destroy(); $previous_widget->(); }), - 1, gtksignal_connect(new Gtk::Button(_("Next")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Next")), clicked => sub { ${$central_widget}->destroy(); $next_widget->(); }), @@ -4152,20 +4152,20 @@ sub button_box_find_media { gtkpack($button_box, $button_box_tmp = gtkpack_(new Gtk::HButtonBox, - 1, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { $box2->destroy(); interactive_mode_box(); }), - 1, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { $box2->destroy(); adv_help(\&$current_widget,$custom_help); }), 1, new Gtk::HBox(0, 0), - 0, gtksignal_connect(new Gtk::Button(_("Previous")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Previous")), clicked => sub { $box2->destroy(); interactive_mode_box(); }), - 1, gtkset_sensitive(gtksignal_connect(new Gtk::Button(_("Next")), clicked => sub { + 1, gtkset_sensitive(gtksignal_connect(new Gtk::Button(N("Next")), clicked => sub { $box2->destroy(); interactive_mode_box("restore"); }), $mount_media), @@ -4178,20 +4178,20 @@ sub button_box_wizard { gtkpack($button_box, $button_box_tmp = gtkpack_(new Gtk::HButtonBox, - 1, gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { ${$central_widget}->destroy(); interactive_mode_box() }), - 1, gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&$current_widget,$custom_help) }), 1, new Gtk::HBox(0, 0), - 0, gtksignal_connect(new Gtk::Button($next_widget ? _("Previous") : _("OK")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button($next_widget ? N("Previous") : N("OK")), clicked => sub { ${$central_widget}->destroy(); $previous_widget ? $previous_widget->() : $next_widget->(); }), - if_($next_widget, 1, gtksignal_connect(new Gtk::Button(_("Next")), clicked => sub { + if_($next_widget, 1, gtksignal_connect(new Gtk::Button(N("Next")), clicked => sub { ${$central_widget}->destroy(); $next_widget ? $next_widget->() : $previous_widget->(); })), @@ -4204,10 +4204,10 @@ sub button_box_main { gtkpack($button_box, $button_box_tmp = gtkpack(gtkset_layout(new Gtk::HButtonBox, -start), - gtksignal_connect(new Gtk::Button(_("Close")), clicked => sub { + gtksignal_connect(new Gtk::Button(N("Close")), clicked => sub { Gtk->main_quit() }), - gtksignal_connect(new Gtk::Button(_("Help")), clicked => sub { + gtksignal_connect(new Gtk::Button(N("Help")), clicked => sub { ${$central_widget}->destroy(); adv_help(\&interactive_mode_box,$custom_help) }), @@ -4227,7 +4227,7 @@ sub send_mail_pb { 0, gtkpack_(new Gtk::HBox(0, 15), 0, new Gtk::VBox(0, 5), 0, new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - 0, _("Error during sendmail. + 0, N("Error during sendmail. Your report mail was not sent. Please configure sendmail"), ), @@ -4251,9 +4251,9 @@ sub install_rpm { my $box_what_user; gtkpack($advanced_box, $box_what_user = gtkpack_(new Gtk::VBox(0, 15), - 0, _("The following packages need to be installed:\n @list_of_rpm_to_install"), + 0, N("The following packages need to be installed:\n @list_of_rpm_to_install"), 0, new Gtk::HSeparator, - 0, gtksignal_connect(new Gtk::Button(_("Install")), clicked => sub { + 0, gtksignal_connect(new Gtk::Button(N("Install")), clicked => sub { system("/usr/sbin/urpmi --X @list_of_rpm_to_install"); ${$central_widget}->destroy(); $previous_widget->(); @@ -4274,7 +4274,7 @@ sub client_ftp_pb { 0, gtkpack_(new Gtk::HBox(0, 15), 0, new Gtk::VBox(0, 5), 0, new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - 0, _("Error during sending file via FTP. + 0, N("Error during sending file via FTP. Please correct your FTP configuration."), ), 0, new Gtk::VBox(0, 5), @@ -4297,7 +4297,7 @@ sub message_norestore_box { 1, gtkpack(new Gtk::HBox(0, 15), new Gtk::VBox(0, 5), new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - _("Please select data to restore..."), + N("Please select data to restore..."), new Gtk::VBox(0, 5), ), 1, new Gtk::VBox(0, 5), @@ -4318,7 +4318,7 @@ sub message_noselect_box { 1, gtkpack(new Gtk::HBox(0, 15), new Gtk::VBox(0, 5), new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - _("Please select media for backup..."), + N("Please select media for backup..."), new Gtk::VBox(0, 5), ), 1, new Gtk::VBox(0, 5), @@ -4340,7 +4340,7 @@ sub message_noselect_what_box { 1, gtkpack(new Gtk::HBox(0, 15), new Gtk::VBox(0, 5), new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - _("Please select data to backup..."), + N("Please select data to backup..."), new Gtk::VBox(0, 5), ), 1, new Gtk::VBox(0, 5), @@ -4362,7 +4362,7 @@ sub message_noconf_box { 1, gtkpack(new Gtk::HBox(0, 15), new Gtk::VBox(0, 5), new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - _("No configuration file found \nplease click Wizard or Advanced."), + N("No configuration file found \nplease click Wizard or Advanced."), new Gtk::VBox(0, 5), ), 1, new Gtk::VBox(0, 5), @@ -4383,7 +4383,7 @@ sub message_underdevel { 1, gtkpack(new Gtk::HBox(0, 15), new Gtk::VBox(0, 5), new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - _("Under Devel ... please wait."), + N("Under Devel ... please wait."), new Gtk::VBox(0, 5), ), 1, new Gtk::VBox(0, 5), @@ -4464,13 +4464,13 @@ sub build_backup_status { [""], [""], [""], - [_("Backup system files")], + [N("Backup system files")], [ $pbar, $pbar->{label} = new Gtk::Label(' ') ], - [_("Backup user files") ], + [N("Backup user files") ], [$pbar1,$pbar1->{label} = new Gtk::Label(' ') ], - [_("Backup other files")], + [N("Backup other files")], [ $pbar2, $pbar2->{label} = new Gtk::Label(' ') ], - [_("Total Progress")], + [N("Total Progress")], [$pbar3,$pbar3->{label} = new Gtk::Label(' ') ], ), $stext, @@ -4494,16 +4494,16 @@ sub build_backup_ftp_status { gtkpack($advanced_box, $table = gtkpack_(new Gtk::VBox(0, 15), - 1, _("files sending by FTP"), + 1, N("files sending by FTP"), 1, new Gtk::VBox(0, 15), 1, create_packtable ({ col_spacings => 10, row_spacings => 5 }, # [ $pbar->set_show_text( $show_text ); - [_("Sending files...")], + [N("Sending files...")], [""], [ $pbar->{label} = new Gtk::Label(' ') ], [ $pbar], [""], - [_("Total Progress")], + [N("Total Progress")], [ $pbar3->{label} = new Gtk::Label(' ') ], [$pbar3], ), @@ -4526,7 +4526,7 @@ sub build_backup_box_see_conf { gtkpack($advanced_box, $box2 = gtkpack_(new Gtk::HBox(0, 15), 1, gtkpack_(new Gtk::VBox(0,10), - 0, _("Drakbackup Configuration"), + 0, N("Drakbackup Configuration"), 1, createScrolledWindow($text), ), ), @@ -4584,12 +4584,12 @@ sub build_backup_box { $button_from_conf_file->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_hd_map, $pix_hd_mask), - new Gtk::Label(_("Backup Now from configuration file")), + new Gtk::Label(N("Backup Now from configuration file")), new Gtk::HBox(0, 5) )); $button_see_conf->add(gtkpack(new Gtk::HBox(0,10), new Gtk::Pixmap($pix_options_map, $pix_options_mask), - new Gtk::Label(_("View Backup Configuration.")), + new Gtk::Label(N("View Backup Configuration.")), new Gtk::HBox(0, 5) )); @@ -4610,17 +4610,17 @@ sub interactive_mode_box { 1, new Gtk::VBox(0, 5), 1, gtkpack_(new Gtk::VBox(0, 15), 1, new Gtk::VBox(0, 5), - 1, gtksignal_connect(new Gtk::Button(_("Wizard Configuration")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Wizard Configuration")), clicked => sub { ${$central_widget}->destroy(); read_conf_file(); wizard(); }), - 1, gtksignal_connect(new Gtk::Button(_("Advanced Configuration")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Advanced Configuration")), clicked => sub { button_box_adv(); ${$central_widget}->destroy(); advanced_box(); }), - 1, gtksignal_connect(new Gtk::Button(_("Backup Now")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Backup Now")), clicked => sub { ${$central_widget}->destroy(); if ($cfg_file_exist) { build_backup_box(); @@ -4628,7 +4628,7 @@ sub interactive_mode_box { message_noconf_box(); } }), - 1, gtksignal_connect(new Gtk::Button(_("Restore")), clicked => sub { + 1, gtksignal_connect(new Gtk::Button(N("Restore")), clicked => sub { ${$central_widget}->destroy(); restore_box(); }), @@ -4662,7 +4662,7 @@ sub interactive_mode { $window1 = $my_win->{window}; unless ($::isEmbedded) { $my_win->{rwindow}->set_position(1); - $my_win->{rwindow}->set_title(_("Drakbackup")); + $my_win->{rwindow}->set_title(N("Drakbackup")); } $my_win->{rwindow}->signal_connect (delete_event => sub { Gtk->exit(0) }); my ($pix_u_map, $pix_u_mask) = gtkcreate_png("drakbackup.540x57"); @@ -4713,7 +4713,7 @@ sub adv_help { my %custom_helps = ( "options" => - _("options description: + N("options description: In this step Drakbackup allow you to change: @@ -4743,7 +4743,7 @@ sub adv_help { "), "mail_pb" => - _(" + N(" Some errors during sendmail are caused by a bad configuration of postfix. To solve it you have to set myhostname or mydomain in /etc/postfix/main.cf @@ -4751,7 +4751,7 @@ sub adv_help { "), "what" => - _("options description: + N("options description: - Backup system files: @@ -4790,7 +4790,7 @@ sub adv_help { "), "restore" => - _("restore description: + N("restore description: Only the most recent date will be used, because with incremental backups it is necessary to restore one by one each older backup. @@ -4816,11 +4816,11 @@ Otherwise, you are able to select only one of these. "), "main" => - _(" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>") . + N(" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>") . "\n" . -_(" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\@mandrakesoft.com>") . +N(" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\@mandrakesoft.com>") . "\n\n" . -_(" This program is free software; you can redistribute it and/or modify +N(" This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. @@ -4834,7 +4834,7 @@ _(" This program is free software; you can redistribute it and/or modify along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.") . "\n\n _____________________\n" . -_("Description: +N("Description: Drakbackup is used to backup your system. During the configuration you can select: @@ -4872,7 +4872,7 @@ Restore Step: "), "ftp" => - _("options description: + N("options description: Please be careful when you are using ftp backup, because only backups that are already built are sent to the server. @@ -4881,7 +4881,7 @@ drive before sending it to the server. "), "restore_pbs" => - _(" + N(" Restore Backup Problems: During the restore step, Drakbackup will verify all your @@ -4893,11 +4893,11 @@ backup data files by hand. ") ); - my $default_help = _(" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>") . + my $default_help = N(" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\@epita.fr>") . "\n" . -_(" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\@mandrakesoft.com>") . +N(" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\@mandrakesoft.com>") . "\n\n" . -_(" This program is free software; you can redistribute it and/or modify +N(" This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. @@ -4911,7 +4911,7 @@ _(" This program is free software; you can redistribute it and/or modify along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.") . "\n\n _____________________\n" . -_("Description: +N("Description: Drakbackup is used to backup your system. During the configuration you can select @@ -4958,7 +4958,7 @@ Restore Step: 0, new Gtk::VScrollbar($text->vadj), ), 0, gtkadd(gtkset_layout(new Gtk::HButtonBox, -spread), - gtksignal_connect(new Gtk::Button(_("OK")), clicked => sub { + gtksignal_connect(new Gtk::Button(N("OK")), clicked => sub { ${$central_widget}->destroy(); $function->() }), ), ) diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index ade6207de..1aa1855e7 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -54,7 +54,7 @@ sub lilo_choice my $loader = arch() =~ /ppc/ ? "Yaboot" : "LILO"; if ($@) { $in->ask_warn('', - [ _("Installation of %s failed. The following error occured:", $loader), + [ N("Installation of %s failed. The following error occured:", $loader), grep { !/^Warning:/ } cat_("/tmp/.error") ]); unlink "/tmp/.error"; goto ask; 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 { 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); diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index d5ece3c48..d5d4e3e51 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -61,17 +61,17 @@ if ($::isEmbedded) { $in = 'interactive'->vnew('su', 'default'); local $_ = join '', @ARGV; -/-h/ and die _("usage: drakfloppy\n"); +/-h/ and die N("usage: drakfloppy\n"); $expert_mode = 0; # we have put here the list in order to do $list->clear() when we have to do -$fixed_font = Gtk::Gdk::Font->fontset_load(_("-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*")); -my @titles = ( _("Module name"), _("Size") ); +$fixed_font = Gtk::Gdk::Font->fontset_load(N("-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*")); +my @titles = ( N("Module name"), N("Size") ); my $list = new_with_titles Gtk::CList( @titles ); my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel; $window->signal_connect( 'delete_event', sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) }); -$window->set_title( _("drakfloppy") ); +$window->set_title( N("drakfloppy") ); $window->set_policy(1, 1, 1); $window->border_width (5); @@ -79,8 +79,8 @@ $window->border_width (5); # the menus are not shown # but they provides shiny shortcut like C-q my @menu_items = ( - { path => _("/_File"), type => '<Branch>' }, - { path => _("/File/_Quit"), accelerator => _("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) } }, + { path => N("/_File"), type => '<Branch>' }, + { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) } }, ); my $menubar = ugtk::create_factory_menu($window, @menu_items); @@ -88,7 +88,7 @@ my $menubar = ugtk::create_factory_menu($window, @menu_items); my $global_vbox = new Gtk::VBox(); -$::isEmbedded or $global_vbox->pack_start (new Gtk::Label(_("boot disk creation")), 0, 0, 0); +$::isEmbedded or $global_vbox->pack_start (new Gtk::Label(N("boot disk creation")), 0, 0, 0); ######## up part my $up_vbox = new Gtk::VBox (0, 0); @@ -96,12 +96,12 @@ my $up_vbox = new Gtk::VBox (0, 0); # device part my $dev_hbox = new Gtk::HBox (1, 0); my $device_combo = new Gtk::Combo(); -my $device_button = new Gtk::Button( _("default") ); +my $device_button = new Gtk::Button( N("default") ); $device_combo->set_popdown_strings( "/dev/fd0", "/dev/fd1", ); $device_button->signal_connect( 'clicked', sub { $device_combo->entry->set_text("/dev/fd0");}); -$dev_hbox->pack_start (new Gtk::Label( _("device") ), 0, 0, 0); +$dev_hbox->pack_start (new Gtk::Label( N("device") ), 0, 0, 0); $dev_hbox->pack_start ($device_combo, 0, 0, 0); $dev_hbox->pack_start ($device_button, 0, 0, 0); $up_vbox->pack_start ($dev_hbox, 0, 0, 0); @@ -109,10 +109,10 @@ $up_vbox->pack_start ($dev_hbox, 0, 0, 0); # kernel part my $ker_hbox = new Gtk::HBox (1, 0); my $kernel_combo = new Gtk::Combo(); -my $kernel_button = new Gtk::Button( _("default") ); +my $kernel_button = new Gtk::Button( N("default") ); $kernel_combo->disable_activate(); $kernel_combo->set_popdown_strings( do { - opendir YREP, "/lib/modules" or die _("DrakFloppy Error: %s", $!); + opendir YREP, "/lib/modules" or die N("DrakFloppy Error: %s", $!); my @files_modules = grep !/^\.\.?$/, readdir YREP; closedir YREP; @files_modules; @@ -123,27 +123,27 @@ $aaaa= `uname -r`; chomp ($aaaa); $kernel_button->signal_connect( 'clicked', sub { $kernel_combo->entry->set_text($aaaa); $list->clear(); }); -$ker_hbox->pack_start (new Gtk::Label( _("kernel version") ), 0, 0, 0); +$ker_hbox->pack_start (new Gtk::Label( N("kernel version") ), 0, 0, 0); $ker_hbox->pack_start ($kernel_combo, 0, 0, 0); $ker_hbox->pack_start ($kernel_button, 0, 0, 0); $up_vbox->pack_start ($ker_hbox, 0, 0, 5); # vbox part -my $up_frame = new Gtk::Frame( _("General") ); +my $up_frame = new Gtk::Frame( N("General") ); $up_frame->add($up_vbox); $global_vbox->pack_start ($up_frame, 1, 1, 0); ### expert mode -my $expert_main_frame = new Gtk::Frame( _("Expert Area") ); +my $expert_main_frame = new Gtk::Frame( N("Expert Area") ); my $expert_dedans = new Gtk::VBox( 0, 5 ); $expert_dedans->border_width (5); -my $expert_button_frame = new Gtk::Frame( _("mkinitrd optional arguments") ); -my $expert_mod_frame = new Gtk::Frame( _("Add a module") ); +my $expert_button_frame = new Gtk::Frame( N("mkinitrd optional arguments") ); +my $expert_mod_frame = new Gtk::Frame( N("Add a module") ); my $expert_pane = new Gtk::HPaned(); $expert_pane->set_handle_size( 10 ); $expert_pane->set_gutter_size( 8 ); -my $expert_button = new Gtk::Button( _("Expert Mode") ); +my $expert_button = new Gtk::Button( N("Expert Mode") ); $expert_button->signal_connect( "clicked", sub { if ($expert_mode) { $expert_mod_frame->hide(); @@ -158,10 +158,10 @@ $expert_button->signal_connect( "clicked", sub { my $expert_button_vbox = new Gtk::VBox(0, 5); my $expert_button_hbox = new Gtk::HBox(0, 5); my $expert_button_hbox2 = new Gtk::HBox(0, 5); -my $force_button = new Gtk::ToggleButton( _("force") ); -my $needed_button = new Gtk::ToggleButton( _("if needed") ); -my $scsi_button = new Gtk::ToggleButton( _("omit scsi modules") ); -my $raid_button = new Gtk::ToggleButton( _("omit raid modules") ); +my $force_button = new Gtk::ToggleButton( N("force") ); +my $needed_button = new Gtk::ToggleButton( N("if needed") ); +my $scsi_button = new Gtk::ToggleButton( N("omit scsi modules") ); +my $raid_button = new Gtk::ToggleButton( N("omit raid modules") ); $expert_button_hbox->pack_start( $force_button, 0, 0, 0 ); $expert_button_hbox->pack_start( $raid_button, 0, 0, 0 ); @@ -197,7 +197,7 @@ fill_tree ($kernel_combo->entry->get_text()); # Create a ScrolledWindow for the list my $list_scrolled_win = new Gtk::ScrolledWindow( undef, undef ); -my $rmmod_button = new Gtk::Button( _("Remove a module") ); +my $rmmod_button = new Gtk::Button( N("Remove a module") ); my $expert_inside_pane2 = new Gtk::VBox (0, 0); my $list_selected_row; @@ -219,7 +219,7 @@ $list->set_shadow_type( 'none' ); $list->show(); ### output -my $output_frame = new Gtk::Frame( _("Output") ); +my $output_frame = new Gtk::Frame( N("Output") ); my $output = new Gtk::Text( undef, undef ); my $vscrollbar = new Gtk::VScrollbar( $output->vadj ); my $output_hbox = new Gtk::HBox (0, 0); @@ -231,8 +231,8 @@ $output_frame->add ($output_hbox); $global_vbox->pack_start ($output_frame, 0, 0, 0); ### final buttons -my $build_button = new Gtk::Button( _("Build the disk") ); -my $cancel_button = new Gtk::Button( _("Cancel") ); +my $build_button = new Gtk::Button( N("Build the disk") ); +my $cancel_button = new Gtk::Button( N("Cancel") ); my $fin_hbox = new Gtk::HBox( 0, 0 ); $cancel_button->signal_connect( clicked=> sub {$::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0)}); $build_button->signal_connect('clicked', \&build_it); @@ -374,18 +374,18 @@ sub build_it { } $co .= " " . $kernel_combo->entry->get_text(); $co .= " 2>&1 |"; - create_dialog(_("Be sure a media is present for the device %s", $device_combo->entry->get_text()), 1) or return; + create_dialog(N("Be sure a media is present for the device %s", $device_combo->entry->get_text()), 1) or return; # we test if the media is present test: my $a = "dd count=1 if=/dev/null of=". $device_combo->entry->get_text() ." 2>&1"; my $b= `$a`; - if ($b =~ "dd") {create_dialog(_("There is no medium or it is write-protected for device %s.\nPlease insert one.", $device_combo->entry->get_text()), 1) ? goto test : return 0; } + if ($b =~ "dd") {create_dialog(N("There is no medium or it is write-protected for device %s.\nPlease insert one.", $device_combo->entry->get_text()), 1) ? goto test : return 0; } - open STATUS, $co or do { create_dialog(_("Unable to fork: %s", $!), 0); return; }; + open STATUS, $co or do { create_dialog(N("Unable to fork: %s", $!), 0); return; }; while (<STATUS>) { $output->insert( $fixed_font, undef, undef, $_ ); } - close STATUS or create_dialog(_("Unable to close properly mkbootdisk: \n %s \n %s", $!, $?), 0); + close STATUS or create_dialog(N("Unable to close properly mkbootdisk: \n %s \n %s", $!, $?), 0); return (0); } diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 8253fc10d..b0a5d07e8 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -229,9 +229,9 @@ sub chk_empty_xfs_path { sub search_installed_fonts { list_fontpath(); - $interactive and progress( $pbar, 0.1, _("Search installed fonts") ); + $interactive and progress( $pbar, 0.1, N("Search installed fonts") ); push @installed_fonts, all($_) foreach @installed_fonts_path; - $interactive and progress( $pbar, 0.1, _("Unselect fonts installed") ); + $interactive and progress( $pbar, 0.1, N("Unselect fonts installed") ); } sub search_installed_fonts_full_path { @@ -255,10 +255,10 @@ sub search_windows_font { foreach my $i ( @{ $_->[0] } ) { if ($interactive) { if ($nb_dir) { - progress( $pbar, 0.25 / $nb_dir, _("parse all fonts") ); + progress( $pbar, 0.25 / $nb_dir, N("parse all fonts") ); } else { - display_error( _("no fonts found") ); + display_error( N("no fonts found") ); return 0; } } @@ -267,13 +267,13 @@ sub search_windows_font { or push @font_list, "$win_dir/$_->[1]/fonts/$i"; } } - $interactive && $nb_dir and progress( $pbar, 1, _("done") ); + $interactive && $nb_dir and progress( $pbar, 1, N("done") ); } if ( !@font_list ) { print "[35mdrakfont:: could not find any font in /win*/fonts [0m\n"; $interactive and display_error( - _("could not find any font in your mounted partitions") ); + N("could not find any font in your mounted partitions") ); return 0; } 1; @@ -319,11 +319,11 @@ sub search_dir_font { } } $interactive - and progress( $pbar, 0.50 / @install, _("Reselect correct fonts") ); + and progress( $pbar, 0.50 / @install, N("Reselect correct fonts") ); } - $interactive and progress( $pbar, 1, _("done") ); + $interactive and progress( $pbar, 1, N("done") ); !@font_list && $interactive - and display_error( _("could not find any font.\n") ); + and display_error( N("could not find any font.\n") ); } sub search_dir_font_uninstall { @@ -347,7 +347,7 @@ sub search_dir_font_uninstall { sub search_dir_font_uninstall_gi { @font_list = @uninstall; - $interactive and progress( $pbar, 1, _("Search fonts in installed list") ); + $interactive and progress( $pbar, 1, N("Search fonts in installed list") ); } sub print_list { @@ -375,11 +375,11 @@ sub put_font_dir { foreach my $i (@font_list) { cp_af( $i, $drakfont_dir . "/tmp/tmp" ); $interactive - and progress( $pbar1, 1 / @font_list, _("Fonts copy") ); + and progress( $pbar1, 1 / @font_list, N("Fonts copy") ); } - $interactive and progress( $pbar1, 0.01, _("done") ); + $interactive and progress( $pbar1, 0.01, N("done") ); $interactive - and progress( $pbar2, 0.10, _("True Type fonts installation") ); + and progress( $pbar2, 0.10, N("True Type fonts installation") ); glob("$drakfont_dir/tmp/tmp/*.TTF") and system( 'cd ' . $drakfont_dir @@ -387,12 +387,12 @@ sub put_font_dir { ); system( 'cd ' . $drakfont_dir . '/tmp/tmp && cp *.ttf ../../ttf' ); $interactive - and progress( $pbar2, 0.20, _("please wait during ttmkfdir...") ); + and progress( $pbar2, 0.20, N("please wait during ttmkfdir...") ); # system ('cd '.$drakfont_dir.'/ttf && $ttmkfdir > fonts.dir' ); my $ttfdir = $drakfont_dir . "/ttf"; `$mkttfdir $ttfdir`; - $interactive and progress( $pbar2, 0.10, _("True Type install done") ); + $interactive and progress( $pbar2, 0.10, N("True Type install done") ); my $update_chkfontpath = "$chkfontpath -a $drakfont_dir/ttf"; if ( $so && $gs ) { @@ -401,13 +401,13 @@ sub put_font_dir { system("cd $drakfont_dir/tmp/tmp && $ttf2pt1 -b $fontname"); $interactive and - progress( $pbar2, 0.50 / @glob_drak, _("Fonts conversion") ); + progress( $pbar2, 0.50 / @glob_drak, N("Fonts conversion") ); } system( "cd $drakfont_dir/tmp/tmp && mv *.gsf *.pfb *.pfm *.afm ../Type1" ); system("cd $drakfont_dir/tmp/Type1 && $type1inst"); - $interactive and progress( $pbar2, 0.10, _("type1inst building") ); + $interactive and progress( $pbar2, 0.10, N("type1inst building") ); -e "$drakfont_dir/tmp/Type1/Fontmap" and system( "cd $drakfont_dir/tmp/Type1 && cat Fontmap >> `rpm -ql ghostscript | grep Fontmap.GS` " @@ -417,7 +417,7 @@ sub put_font_dir { ); system("cd $drakfont_dir/Type1 && $type1inst"); $interactive - and progress( $pbar2, 0.05, _("Ghostscript referencing") ); + and progress( $pbar2, 0.05, N("Ghostscript referencing") ); $update_chkfontpath .= "; $chkfontpath -a $drakfont_dir/Type1"; } @@ -427,11 +427,11 @@ sub put_font_dir { { system("cd $/drakfont_dir/tmp/tmp && $ttf2pt1 -b $fontname"); $interactive - and progress( $pbar2, 0.50 / @tmpl, _("Fonts conversion") ); + and progress( $pbar2, 0.50 / @tmpl, N("Fonts conversion") ); } system("cd $drakfont_dir/tmp/tmp && mv *.gsf *.pfb *.pfm ../Type1"); system("cd $drakfont_dir/tmp/Type1 && $type1inst"); - $interactive and progress( $pbar2, 0.1, _("type1inst building") ); + $interactive and progress( $pbar2, 0.1, N("type1inst building") ); system( "cd $drakfont_dir/tmp/Type1 && cat Fontmap >> `rpm -ql ghostscript | grep Fontmap.GS` " ); @@ -440,7 +440,7 @@ sub put_font_dir { ); system("cd $drakfont_dir/Type1 && $type1inst"); $interactive - and progress( $pbar2, 0.05, _("Ghostscript referencing") ); + and progress( $pbar2, 0.05, N("Ghostscript referencing") ); $update_chkfontpath .= "; $chkfontpath -a $drakfont_dir/Type1"; } @@ -450,34 +450,34 @@ sub put_font_dir { system("cd $drakfont_dir/tmp/tmp && $ttf2pt1 $fontname"); $interactive and - progress( $pbar2, 0.25 / @tmpl, _("ttf fonts conversion") ); + progress( $pbar2, 0.25 / @tmpl, N("ttf fonts conversion") ); } foreach my $fontname ( @tmpl = glob("$drakfont_dir/tmp/tmp/*.pfm") ) { system("cd $drakfont_dir/tmp/tmp && $pfm2afm $fontname"); $interactive and - progress( $pbar2, 0.25 / @tmpl, _("pfm fonts conversion") ); + progress( $pbar2, 0.25 / @tmpl, N("pfm fonts conversion") ); } system("cd $drakfont_dir/tmp/tmp && mv *.afm ../Type1"); system("cd $drakfont_dir/tmp/Type1 && mv *.afm ../../Type1 "); system("cd $drakfont_dir/Type1 && $type1inst"); - $interactive and progress( $pbar2, 0.14, _("type1inst building") ); + $interactive and progress( $pbar2, 0.14, N("type1inst building") ); $update_chkfontpath .= "; $chkfontpath -a $drakfont_dir/Type1"; } - $interactive and progress( $pbar2, 0.01, _("done") ); + $interactive and progress( $pbar2, 0.01, N("done") ); $interactive - and progress( $pbar3, 0.25, _("Suppress temporary Files") ); + and progress( $pbar3, 0.25, N("Suppress temporary Files") ); rm_rf("$drakfont_dir/tmp/"); print "\n\nretarting xfs......\n"; - $interactive and progress( $pbar3, 0.5, _("Restart XFS") ); + $interactive and progress( $pbar3, 0.5, N("Restart XFS") ); system($update_chkfontpath); # system ($restart_xfs); # system('kill -USR1 `/sbin/pidof xfs` 2&1>/dev/null'); system('/etc/rc.d/init.d/xfs restart'); - $interactive and progress( $pbar3, 0.30, _("done") ); + $interactive and progress( $pbar3, 0.30, N("done") ); } } @@ -504,7 +504,7 @@ sub remove_gs_fonts { sub remove_fonts { my @list_dir; -e $drakfont_dir . "/remove" || mkdir_p( $drakfont_dir . "/remove" ); - $interactive and progress( $pbar, 1, _("done") ); + $interactive and progress( $pbar, 1, N("done") ); foreach my $i (@font_list) { $_ = $i; if ( /.pfb$/ || /.gsf$/ || /.pfm$/ || /.pfa$/ ) { @@ -516,9 +516,9 @@ sub remove_fonts { $i =~ s/\/\w*\.\w*//gi; grep ( $i, (@list_dir) ) or push @list_dir, $i; $interactive - and progress( $pbar1, 1 / @font_list, _("Suppress Fonts Files") ); + and progress( $pbar1, 1 / @font_list, N("Suppress Fonts Files") ); } - $interactive and progress( $pbar1, 0.01, _("done") ); + $interactive and progress( $pbar1, 0.01, N("done") ); -e "/usr/share/ghostscript" and remove_gs_fonts(); foreach my $i (@list_dir) { if ( listlength all("$i") < 3 ) { @@ -530,19 +530,16 @@ sub remove_fonts { or print "PERL::system command failed during cd or type1inst\n"; } $interactive - and progress( $pbar2, 1 / @list_dir, _("Suppress Fonts Files") ); + and progress( $pbar2, 1 / @list_dir, N("Suppress Fonts Files") ); } - $interactive and progress( $pbar2, 0.01, _("xfs restart") ); + $interactive and progress( $pbar2, 0.01, N("xfs restart") ); system("/etc/rc.d/init.d/xfs restart"); -e "/usr/share/ghostscript" and rm_rf("$drakfont_dir/remove"); - $interactive and progress( $pbar2, 0.01, _("done") ); + $interactive and progress( $pbar2, 0.01, N("done") ); } sub license_msg { - print _( -"Before installing any fonts, be sure that you have the right to use and install them on your system.\n\n-You can install the fonts using the normal way. In rare cases, bogus fonts may hang up your X Server." - ) - . "\n"; + print N("Before installing any fonts, be sure that you have the right to use and install them on your system.\n\n-You can install the fonts using the normal way. In rare cases, bogus fonts may hang up your X Server.") . "\n"; } $list_all_font_path @@ -610,7 +607,7 @@ sub display_error { gtkadd( gtkset_layout( new Gtk::HButtonBox, -spread ), gtksignal_connect( - new Gtk::Button( _("OK") ), + new Gtk::Button( N("OK") ), clicked => sub { ${$central_widget}->destroy(); create_fontsel() } ), @@ -628,7 +625,7 @@ sub interactive_mode { $::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( _("Fonts Importation") ); + $window1->set_title( N("Fonts Importation") ); $window1->set_border_width(5); my ( $pix_user_map, $pix_user_mask ) = gtkcreate_png("ic-drakfont-48"); my ( $pix_u_map, $pix_u_mask ) = gtkcreate_png("drakfont.620x57"); @@ -658,7 +655,7 @@ sub interactive_mode { gtkadd( gtkset_layout( new Gtk::VButtonBox, -end ), gtksignal_connect( - new Gtk::Button( _("Get Windows Fonts") ), + new Gtk::Button( N("Get Windows Fonts") ), clicked => sub { ${$central_widget}->destroy(); $windows = 1; @@ -666,7 +663,7 @@ sub interactive_mode { } ), gtksignal_connect( - new Gtk::Button( _("Uninstall Fonts") ), + new Gtk::Button( N("Uninstall Fonts") ), clicked => sub { ${$central_widget}->destroy(); uninstall(); @@ -677,7 +674,7 @@ sub interactive_mode { gtkadd( gtkset_layout( new Gtk::VButtonBox, -end ), gtksignal_connect( - new Gtk::Button( _("Advanced Options") ), + new Gtk::Button( N("Advanced Options") ), clicked => sub { ${$central_widget}->destroy(); $windows = 0; @@ -685,7 +682,7 @@ sub interactive_mode { } ), gtksignal_connect( - new Gtk::Button( _("Font List") ), + new Gtk::Button( N("Font List") ), clicked => sub { ${$central_widget}->destroy(); create_fontsel(); @@ -698,12 +695,12 @@ sub interactive_mode { gtkadd( gtkset_layout( new Gtk::VButtonBox, -end ), gtksignal_connect( - new Gtk::Button( _("Help") ), + new Gtk::Button( N("Help") ), clicked => sub { ${$central_widget}->destroy(); help() } ), gtksignal_connect( - new Gtk::Button( _("Close") ), + new Gtk::Button( N("Close") ), clicked => sub { $::isEmbedded and kill 'USR1', $::CCPID; Gtk->main_quit(); @@ -718,11 +715,11 @@ sub interactive_mode { # 0, new Gtk::Pixmap($pix_user_map, $pix_user_mask), # 1, new Gtk::VBox(0,0), # 1, gtkadd(gtkset_layout(new Gtk::VButtonBox, -end), - # gtksignal_connect(new Gtk::Button(_("About")), clicked => sub { + # gtksignal_connect(new Gtk::Button(N("About")), clicked => sub { # ${$central_widget}->destroy(); about() }), - # gtksignal_connect(new Gtk::Button(_(" Help ")), clicked => sub { + # gtksignal_connect(new Gtk::Button(N(" Help ")), clicked => sub { # ${$central_widget}->destroy(); help() }), - # gtksignal_connect(new Gtk::Button(_("Close")), clicked => sub { + # gtksignal_connect(new Gtk::Button(N("Close")), clicked => sub { # $::isEmbedded and kill 'USR1', $::CCPID; # Gtk->main_quit() }), # ), @@ -797,7 +794,7 @@ sub about { gtkadd( gtkset_layout( new Gtk::HButtonBox, -spread ), gtksignal_connect( - new Gtk::Button( _("OK") ), + new Gtk::Button( N("OK") ), clicked => sub { ${$central_widget}->destroy(); create_fontsel() } ), @@ -874,7 +871,7 @@ Visual Interface: gtkadd( gtkset_layout( new Gtk::HButtonBox, -spread ), gtksignal_connect( - new Gtk::Button( _("OK") ), + new Gtk::Button( N("OK") ), clicked => sub { ${$central_widget}->destroy(); create_fontsel() } ), @@ -906,9 +903,7 @@ sub appli_choice { gtkpack( new Gtk::HBox( 0, 10 ), new Gtk::HBox( 0, 10 ), - _( -"Choose the applications that will support the fonts:" - ), + N("Choose the applications that will support the fonts:"), new Gtk::HBox( 0, 10 ), ), 0, @@ -916,28 +911,28 @@ sub appli_choice { 0, gtkpack_( new Gtk::HBox( 0, 10 ), 0, - _("Ghostscript"), 1, + N("Ghostscript"), 1, new Gtk::HBox( 0, 10 ), 0, my $check11 = new Gtk::CheckButton(), ), 0, gtkpack_( new Gtk::HBox( 0, 10 ), 0, - _("StarOffice"), 1, + N("StarOffice"), 1, new Gtk::HBox( 0, 10 ), 0, my $check22 = new Gtk::CheckButton(), ), 0, gtkpack_( new Gtk::HBox( 0, 10 ), 0, - _("Abiword"), 1, + N("Abiword"), 1, new Gtk::HBox( 0, 10 ), 0, my $check33 = new Gtk::CheckButton(), ), 0, gtkpack_( new Gtk::HBox( 0, 10 ), 0, - _("Generic Printers"), 1, + N("Generic Printers"), 1, new Gtk::HBox( 0, 10 ), 0, my $check44 = new Gtk::CheckButton(), ), @@ -948,9 +943,7 @@ sub appli_choice { 1, gtktext_insert( gtkset_editable( $text, 0 ), - _( -"Before installing any fonts, be sure that you have the right to use and install them on your system.\n\n-You can install the fonts using the normal way. In rare cases, bogus fonts may hang up your X Server." - ) + N("Before installing any fonts, be sure that you have the right to use and install them on your system.\n\n-You can install the fonts using the normal way. In rare cases, bogus fonts may hang up your X Server.") ), 0, new Gtk::VScrollbar( $text->vadj ), @@ -961,14 +954,14 @@ sub appli_choice { gtkadd( gtkset_layout( new Gtk::HButtonBox, -spread ), gtksignal_connect( - new Gtk::Button( _("OK") ), + new Gtk::Button( N("OK") ), clicked => sub { ${$central_widget}->destroy(); import_status(); } ), gtksignal_connect( - new Gtk::Button( _("Cancel") ), + new Gtk::Button( N("Cancel") ), clicked => sub { ${$central_widget}->destroy(); create_fontsel(); @@ -1002,19 +995,19 @@ sub font_choice { my $file_dialog; $file_dialog = gtksignal_connect( - new Gtk::FileSelection( _("File Selection") ), + new Gtk::FileSelection( N("File Selection") ), destroy => sub { $file_dialog->destroy(); } ); $file_dialog->ok_button->signal_connect( clicked => \&file_ok_sel, $file_dialog ); - $file_dialog->ok_button->child->set( _("Add") ); + $file_dialog->ok_button->child->set( N("Add") ); $file_dialog->cancel_button->signal_connect( clicked => sub { $file_dialog->destroy() } ); - $file_dialog->cancel_button->child->set( _("Close") ); + $file_dialog->cancel_button->child->set( N("Close") ); $file_dialog->set_filename( - _("Select the font file or directory and click on 'Add'") ); + N("Select the font file or directory and click on 'Add'") ); $file_dialog->show(); } @@ -1052,16 +1045,16 @@ sub advanced_install { gtkadd( gtkset_layout( new Gtk::HButtonBox, -spread ), gtksignal_connect( - new Gtk::Button( _("Add") ), + new Gtk::Button( N("Add") ), clicked => sub { font_choice() } ), gtksignal_connect( - new Gtk::Button( _("Remove Selected") ), + new Gtk::Button( N("Remove Selected") ), clicked => \&list_remove, $list ), gtksignal_connect( - new Gtk::Button( _("Install List") ), + new Gtk::Button( N("Install List") ), clicked => sub { ${$central_widget}->destroy(); appli_choice(); @@ -1104,14 +1097,14 @@ sub show_list_to_remove { gtkadd( gtkset_layout( new Gtk::HButtonBox, -spread ), gtksignal_connect( - new Gtk::Button( _("click here if you are sure.") ), + new Gtk::Button( N("click here if you are sure.") ), clicked => sub { ${$central_widget}->destroy(); import_status_uninstall(); } ), gtksignal_connect( - new Gtk::Button( _("here if no.") ), + new Gtk::Button( N("here if no.") ), clicked => sub { ${$central_widget}->destroy(); create_fontsel() } ), @@ -1172,15 +1165,15 @@ sub uninstall { gtkadd( gtkset_layout( new Gtk::HButtonBox, -spread ), gtksignal_connect( - new Gtk::Button( _("Unselected All") ), + new Gtk::Button( N("Unselected All") ), clicked => sub { $path_list->unselect_all(); } ), gtksignal_connect( - new Gtk::Button( _("Selected All") ), + new Gtk::Button( N("Selected All") ), clicked => sub { $path_list->select_all(); } ), gtksignal_connect( - new Gtk::Button( _("Remove List") ), + new Gtk::Button( N("Remove List") ), clicked => sub { list_to_remove() } ), ), @@ -1202,18 +1195,18 @@ sub import_status { { col_spacings => 10, row_spacings => 50 }, [ "", "" ], [ - _("Initials tests"), $pbar, $pbar->{label} = new Gtk::Label(' ') + N("Initials tests"), $pbar, $pbar->{label} = new Gtk::Label(' ') ], [ - _("Copy fonts on your system"), $pbar1, + N("Copy fonts on your system"), $pbar1, $pbar1->{label} = new Gtk::Label(' ') ], [ - _("Install & convert Fonts"), $pbar2, + N("Install & convert Fonts"), $pbar2, $pbar2->{label} = new Gtk::Label(' ') ], [ - _("Post Install"), $pbar3, $pbar3->{label} = new Gtk::Label(' ') + N("Post Install"), $pbar3, $pbar3->{label} = new Gtk::Label(' ') ], ), ); @@ -1235,14 +1228,14 @@ sub import_status_uninstall { [ "", "" ], [ "", "" ], [ - _("Initials tests"), $pbar, $pbar->{label} = new Gtk::Label(' ') + N("Initials tests"), $pbar, $pbar->{label} = new Gtk::Label(' ') ], [ - _("Remove fonts on your system"), $pbar1, + N("Remove fonts on your system"), $pbar1, $pbar1->{label} = new Gtk::Label(' ') ], [ - _("Post Uninstall"), $pbar2, + N("Post Uninstall"), $pbar2, $pbar2->{label} = new Gtk::Label(' ') ], ), diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index 6cd4ecc62..ee1b2d828 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -40,7 +40,7 @@ local $_ = join '', @ARGV; /-h/ and die "usage: drakgw [--version]\n"; /-version/ and die 'version: $Id$ '."\n"; $::Wizard_pix_up = "wiz_drakgw.png"; -$::Wizard_title = _("Internet Connection Sharing"); +$::Wizard_title = N("Internet Connection Sharing"); $::direct = /-direct/; @@ -113,7 +113,7 @@ sub fatal_quit ($) my ($kernel_version) = c::kernel_version() =~ /(...)/; log::l("[drakgw] kernel_version $kernel_version"); -$kernel_version eq '2.4' or fatal_quit(_("Sorry, we support only 2.4 kernels.")); +$kernel_version eq '2.4' or fatal_quit(N("Sorry, we support only 2.4 kernels.")); begin: @@ -124,15 +124,15 @@ if ($shorewall && $shorewall->{masquerade}) { $::Wizard_no_previous = 1; if (!$shorewall->{disabled}) { - my $r = $in->ask_from_list_(_("Internet Connection Sharing currently enabled"), -_("The setup of Internet connection sharing has already been done. + my $r = $in->ask_from_list_(N("Internet Connection Sharing currently enabled"), +N("The setup of Internet connection sharing has already been done. It's currently enabled. What would you like to do?"), - [ __("disable"), __("reconfigure"), __("dismiss") ]) or quit_global($in, 0); + [ N_("disable"), N_("reconfigure"), N_("dismiss") ]) or quit_global($in, 0); if ($r eq "disable") { { - my $wait_disabl = $in->wait_message('', _("Disabling servers...")); + my $wait_disabl = $in->wait_message('', N("Disabling servers...")); stop_daemons(); } foreach ($dhcpd_conf, $masq_file) { @@ -141,7 +141,7 @@ What would you like to do?"), sys("/etc/init.d/shorewall restart >/dev/null"); log::l("[drakgw] Disabled"); $::Wizard_finished = 1; - $in->ask_okcancel('', _("Internet connection sharing is now disabled.")); + $in->ask_okcancel('', N("Internet connection sharing is now disabled.")); quit_global($in, 0); } if ($r eq "dismiss") { @@ -150,24 +150,24 @@ What would you like to do?"), } else { - my $r = $in->ask_from_list_(_("Internet Connection Sharing currently disabled"), -_("The setup of Internet connection sharing has already been done. + my $r = $in->ask_from_list_(N("Internet Connection Sharing currently disabled"), +N("The setup of Internet connection sharing has already been done. It's currently disabled. What would you like to do?"), - [ __("enable"), __("reconfigure"), __("dismiss") ]); + [ N_("enable"), N_("reconfigure"), N_("dismiss") ]); if ($r eq "enable") { foreach ($dhcpd_conf, $masq_file) { rename($_, "$_.old") if -f $_; rename("$_.drakgwdisable", $_) or die "Could not find configuration. Please reconfigure."; } { - my $wait_enabl = $in->wait_message('', _("Enabling servers...")); + my $wait_enabl = $in->wait_message('', N("Enabling servers...")); start_daemons(); } log::l("[drakgw] Enabled"); $::Wizard_finished = 1; - $in->ask_okcancel('', _("Internet connection sharing is now enabled.")); + $in->ask_okcancel('', N("Internet connection sharing is now enabled.")); quit_global($in, 0); } if ($r eq "dismiss") { @@ -183,8 +183,8 @@ step_ask_confirm: $::Wizard_no_previous = 1; -$::direct or $in->ask_okcancel(_("Internet Connection Sharing"), -_("You are about to configure your computer to share its Internet connection. +$::direct or $in->ask_okcancel(N("Internet Connection Sharing"), +N("You are about to configure your computer to share its Internet connection. With that feature, other computers on your local network will be able to use this computer's Internet connection. Make sure you have configured your Network/Internet access using drakconnect before going any further. @@ -212,8 +212,8 @@ log::l("[drakgw] Available network cards: ", join(", ", @cards)); my $format = sub { $aliased_devices{$_[0]} ? - _("Interface %s (using module %s)", $_[0], $aliased_devices{$_[0]}) : - _("Interface %s", $_[0]); + N("Interface %s (using module %s)", $_[0], $aliased_devices{$_[0]}) : + N("Interface %s", $_[0]); }; #- setup the network interface we shall use @@ -221,15 +221,15 @@ my $format = sub { my $device; if (!@cards) { - $in->ask_warn(_("No network adapter on your system!"), - _("No ethernet network adapter has been detected on your system. Please run the hardware configuration tool.")); + $in->ask_warn(N("No network adapter on your system!"), + N("No ethernet network adapter has been detected on your system. Please run the hardware configuration tool.")); quit_global($in, 0); } elsif (@cards == 1) { $device = $cards[0]; - $in->ask_okcancel(_("Network interface"), -_("There is only one configured network adapter on your system: + $in->ask_okcancel(N("Network interface"), +N("There is only one configured network adapter on your system: %s @@ -237,8 +237,8 @@ I am about to setup your Local Area Network with that adapter.", $format->($devi } else { - $device = $in->ask_from_listf(_("Choose the network interface"), - _("Please choose what network adapter will be connected to your Local Area Network."), + $device = $in->ask_from_listf(N("Choose the network interface"), + N("Please choose what network adapter will be connected to your Local Area Network."), $format, \@cards, ) or goto step_ask_confirm; @@ -261,63 +261,63 @@ my $reconf_dhcp_server_intf = 1; if (grep(/$device/, @configured_devices)) { step_warning_already_conf: - my $auto = _('Yes'); - my $dhcp_details = _('Yes'); + my $auto = N("Yes"); + my $dhcp_details = N("Yes"); my $conf = network::read_interface_conf("/etc/sysconfig/network-scripts/ifcfg-$device"); - $in->ask_from(_("Network interface already configured"), - _("Warning, the network adapter (%s) is already configured. + $in->ask_from(N("Network interface already configured"), + N("Warning, the network adapter (%s) is already configured. Do you want an automatic re-configuration? You can do it manually but you need to know what you're doing.", $device), - [ { label => _("Automatic reconfiguration"), val => \$auto, list => [ _('Yes'), _('No (experts only)') ] }, - { val => _("Show current interface configuration"), clicked => - sub { $in->ask_warn(_('Current interface configuration'), - _("Current configuration of `%s': + [ { label => N("Automatic reconfiguration"), val => \$auto, list => [ N("Yes"), N("No (experts only)") ] }, + { val => N("Show current interface configuration"), clicked => + sub { $in->ask_warn(N("Current interface configuration"), + N("Current configuration of `%s': Network: %s IP address: %s IP attribution: %s Driver: %s", $device, $conf->{NETWORK}, $conf->{IPADDR}, $conf->{BOOTPROTO}, $aliased_devices{$device} || '(unknown)')) } } ]) or goto step_detectsetup; - if ($auto ne _('Yes')) { + if ($auto ne N("Yes")) { $reconf_dhcp_server_intf = 0; $server_ip = $conf->{IPADDR}; $nameserver_ip = $conf->{IPADDR}; $lan_address = $conf->{NETWORK}; $in->ask_from('', - _("I can keep your current configuration and assume you already set up a DHCP server; in that case please verify I correctly read the Network that you use for your local network; I will not reconfigure it and I will not touch your DHCP server configuration. + N("I can keep your current configuration and assume you already set up a DHCP server; in that case please verify I correctly read the Network that you use for your local network; I will not reconfigure it and I will not touch your DHCP server configuration. The default DNS entry is the Caching Nameserver configured on the firewall. You can replace that with your ISP DNS IP, for example. Else, I can reconfigure your interface and (re)configure a DHCP server for you. ", $device), - [ { label => _("Local Network adress"), val => \$lan_address, type => 'entry' }, - { label => _("Netmask"), val => \$netmask, type => 'entry' } ]) + [ { label => N("Local Network adress"), val => \$lan_address, type => 'entry' }, + { label => N("Netmask"), val => \$netmask, type => 'entry' } ]) or goto step_warning_already_conf; $in->ask_from('', - _("DHCP Server Configuration. + N("DHCP Server Configuration. Here you can select different options for the DHCP server configuration. If you don't know the meaning of an option, simply leave it as it is. ", $device), - [ { label => _("(This) DHCP Server IP"), val => \$server_ip, type => 'entry' }, - { label => _("The DNS Server IP"), val => \$nameserver_ip, type => 'entry' }, - { label => _("The internal domain name"), val => \$internal_domain_name, type => 'entry' }, - { label => _("The DHCP start range"), val => \$start_range, type => 'entry' }, - { label => _("The DHCP end range"), val => \$end_range, type => 'entry' }, - { label => _("The default lease (in seconds)"), val => \$default_lease, type => 'entry' }, - { label => _("The maximum lease (in seconds)"), val => \$max_lease, type => 'entry' }, - { label => _("Re-configure interface and DHCP server"), val => \$reconf_dhcp_server_intf, type => 'bool' } ]) + [ { label => N("(This) DHCP Server IP"), val => \$server_ip, type => 'entry' }, + { label => N("The DNS Server IP"), val => \$nameserver_ip, type => 'entry' }, + { label => N("The internal domain name"), val => \$internal_domain_name, type => 'entry' }, + { label => N("The DHCP start range"), val => \$start_range, type => 'entry' }, + { label => N("The DHCP end range"), val => \$end_range, type => 'entry' }, + { label => N("The default lease (in seconds)"), val => \$default_lease, type => 'entry' }, + { label => N("The maximum lease (in seconds)"), val => \$max_lease, type => 'entry' }, + { label => N("Re-configure interface and DHCP server"), val => \$reconf_dhcp_server_intf, type => 'bool' } ]) or goto step_warning_already_conf; } } if (!($lan_address =~ s/\.0$//)) { $in->ask_warn('', - _("The Local Network did not finish with `.0', bailing out.")); + N("The Local Network did not finish with `.0', bailing out.")); quit_global($in, 0); } standalone::explanations("Using LAN address <$lan_address>"); @@ -328,7 +328,7 @@ standalone::explanations("Using LAN address <$lan_address>"); foreach (grep { $_ ne $device } @configured_devices) { grep(/$lan_address/, cat_("/etc/sysconfig/network-scripts/ifcfg-$_")) and - ($in->ask_warn('', _("Potential LAN address conflict found in current config of %s!\n", $_)) or goto step_detectsetup); + ($in->ask_warn('', N("Potential LAN address conflict found in current config of %s!\n", $_)) or goto step_detectsetup); } @@ -338,8 +338,8 @@ network::shorewall::check_iptables($in) or goto step_detectsetup; #- ********************************** #- * 2nd step: configure -$wait_configuring = $in->wait_message(_("Configuring..."), - _("Configuring scripts, installing software, starting servers...")); +$wait_configuring = $in->wait_message(N("Configuring..."), + N("Configuring scripts, installing software, starting servers...")); #- setup the /etc/sysconfig/network-script/ script @@ -375,7 +375,7 @@ my @needed_to_install = grep { !-e $rpm2file{$_} } keys %rpm2file; if (grep { !-e $rpm2file{$_} } keys %rpm2file) { foreach (keys %rpm2file) { -e $rpm2file{$_} or $in->do_pkgs->install($_); - -e $rpm2file{$_} or fatal_quit(_("Problems installing package %s", $_)); + -e $rpm2file{$_} or fatal_quit(N("Problems installing package %s", $_)); } } @@ -507,8 +507,8 @@ undef $wait_configuring; $::Wizard_no_previous = 1; $::Wizard_finished = 1; -$in->ask_okcancel(_("Congratulations!"), -_("Everything has been configured. +$in->ask_okcancel(N("Congratulations!"), +N("Everything has been configured. You may now share Internet connection with other computers on your Local Area Network, using automatic network configuration (DHCP).")); @@ -527,21 +527,21 @@ sub pur_gtk_mode init Gtk; my $setup_state = $shorewall && $shorewall->{masquerade} ? ($shorewall->{disabled} ? - _("The setup has already been done, but it's currently disabled.") : - _("The setup has already been done, and it's currently enabled.")) : - _("No Internet Connection Sharing has ever been configured."); + N("The setup has already been done, but it's currently disabled.") : + N("The setup has already been done, and it's currently enabled.")) : + N("No Internet Connection Sharing has ever been configured."); 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(_("Internet connection sharing configuration")); + $window1->set_title(N("Internet connection sharing configuration")); $window1->border_width(10); my $vbox1 = new Gtk::VBox(0,0); $window1->add($vbox1); my $hbox1 = new Gtk::HBox(0,0); $vbox1->pack_start($hbox1,1,1,0); my $label1 = new Gtk::Label( -_("Welcome to the Internet Connection Sharing utility! +N("Welcome to the Internet Connection Sharing utility! %s @@ -553,13 +553,13 @@ Click on Configure to launch the setup wizard.", $setup_state)); my $bbox1 = new Gtk::HButtonBox; $vbox1->pack_start($bbox1,0,0,0); $bbox1->set_layout(-end); - my $button_conf = new Gtk::Button _("Configure"); + my $button_conf = new Gtk::Button N("Configure"); $button_conf->signal_connect(clicked => sub { system("/usr/sbin/drakgw --wizard"); kill('USR1', $::CCPID); }); $bbox1->add($button_conf); - my $button_cancel = new Gtk::Button _("Cancel"); + my $button_cancel = new Gtk::Button N("Cancel"); $button_cancel->signal_connect(clicked => sub { kill('USR1', $::CCPID); }); diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index 84135b75e..a94d9d6b0 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -12,7 +12,7 @@ use interactive; my $in = 'interactive'->vnew('su', 'default'); local $_ = join '', @ARGV; -/-h/ and die _("no help implemented yet.\n"); +/-h/ and die N("no help implemented yet.\n"); /-version/ and die 'version: $Id$'."\n"; @@ -39,31 +39,31 @@ my $W = $w->{window}; #my $W = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window ("toplevel"); $W->signal_connect(delete_event => sub { my_gtk->exit }); my $scroll = new Gtk::ScrolledWindow; -my $Perm_list = new_with_titles Gtk::CList((_("path"),_("user"),_("group"),_("permissions"))); +my $Perm_list = new_with_titles Gtk::CList((N("path"),N("user"),N("group"),N("permissions"))); my $vb = new Gtk::VBox(0,5); my $select_box= new Gtk::HBox(0,5); my $action_box= new Gtk::HBox(0,5); my $up_down_box=new Gtk::HBox(0,5); my $B_quit = new Gtk::Button('quit'); my $B_sav = new Gtk::Button('save'); -my $B_up = new Gtk::Button(_("Up")); -my $B_del = new Gtk::Button(_("delete")); -my $B_edit = new Gtk::Button(_("edit")); -my $B_down = new Gtk::Button(_("Down")); -my $B_add = new Gtk::Button(_("add a rule")); -my $label_perm= new Gtk::Label(_("select perm file to see/edit")); +my $B_up = new Gtk::Button(N("Up")); +my $B_del = new Gtk::Button(N("delete")); +my $B_edit = new Gtk::Button(N("edit")); +my $B_down = new Gtk::Button(N("Down")); +my $B_add = new Gtk::Button(N("add a rule")); +my $label_perm= new Gtk::Label(N("select perm file to see/edit")); my $combo_perm= new Gtk::Combo; my $tips = new Gtk::Tooltips; -my $pres = new Gtk::Label(_("Drakperm is used to see files to use in order to fix permissions, owners, and groups via msec.\nYou can also edit your own rules which will owerwrite the default rules.")); +my $pres = new Gtk::Label(N("Drakperm is used to see files to use in order to fix permissions, owners, and groups via msec.\nYou can also edit your own rules which will owerwrite the default rules.")); my $F = new Gtk::Frame; #- widgets settings $combo_perm->set_popdown_strings(sort(keys %perm)); -$tips->set_tip($B_add,_("Add a new rule at the end")); -$tips->set_tip($B_edit,_("Edit curent rule")); -$tips->set_tip($B_up,_("Up selected rule one level")); -$tips->set_tip($B_down,_("Down selected rule one level")); -$tips->set_tip($B_del,_("Delete selected rule")); +$tips->set_tip($B_add,N("Add a new rule at the end")); +$tips->set_tip($B_edit,N("Edit curent rule")); +$tips->set_tip($B_up,N("Up selected rule one level")); +$tips->set_tip($B_down,N("Down selected rule one level")); +$tips->set_tip($B_del,N("Delete selected rule")); #- signal management $W->signal_connect(delete_event => sub { my_gtk->exit }); @@ -234,25 +234,25 @@ sub row_setting_dialog{ my $dlg = new Gtk::Dialog(); my $ok = new Gtk::Button('ok'); my $cancel = new Gtk::Button('cancel'); - my $browse = new Gtk::Button(_("browse")); + my $browse = new Gtk::Button(N("browse")); my $users = new Gtk::Combo; my $groups = new Gtk::Combo; my $file = new Gtk::Entry; my $file_hbox=new Gtk::HBox(0,5); my $usr_hbox= new Gtk::HBox(0,5); my $usr_vbox= new Gtk::VBox(0,5); - my $usr_check=new Gtk::CheckButton(_("Current user")); + my $usr_check=new Gtk::CheckButton(N("Current user")); local @rights = ('user','group','other'); local @check = ( '' , 'read','write','execute'); my $hb_rights = new Gtk::HBox(0,15); my $vb_rights = new Gtk::VBox(0,15); - my $F_rights = new Gtk::Frame(_("Permissions")); - my $F_path = new Gtk::Frame(_("Path")); - my $F_usr = new Gtk::Frame(_("Property")); + my $F_rights = new Gtk::Frame(N("Permissions")); + my $F_path = new Gtk::Frame(N("Path")); + my $F_usr = new Gtk::Frame(N("Property")); my $vb_specials = new Gtk::VBox(0,5); - my $sticky = new Gtk::CheckButton(_("sticky-bit")); - my $suid = new Gtk::CheckButton(_("Set-UID")); - my $gid = new Gtk::CheckButton(_("Set-GID")); + my $sticky = new Gtk::CheckButton(N("sticky-bit")); + my $suid = new Gtk::CheckButton(N("Set-UID")); + my $gid = new Gtk::CheckButton(N("Set-GID")); local $rght = ${$CURENT{'data'}}[3]; local $s = (length($rght) == 4)?substr($rght,0,1):0 ; local $user = ($s)?substr($rght,1,1):substr($rght,0,1); @@ -307,15 +307,15 @@ sub row_setting_dialog{ $users->set_sensitive(0); } - $tips->set_tip($sticky,_("Used for directory:\n only owner of directory or file in this directory can delete it")); - $tips->set_tip($suid,_("Use owner id for execution")); - $tips->set_tip($gid,_("Use group id for execution")); - $tips->set_tip($usr_check,_("when checked, owner and group won't be changed")); + $tips->set_tip($sticky,N("Used for directory:\n only owner of directory or file in this directory can delete it")); + $tips->set_tip($suid,N("Use owner id for execution")); + $tips->set_tip($gid,N("Use group id for execution")); + $tips->set_tip($usr_check,N("when checked, owner and group won't be changed")); #- event management $cancel->signal_connect( clicked =>sub{ $dlg->destroy } ); $browse->signal_connect( clicked => sub { - my $file_dlg = new Gtk::FileSelection(_("Path selection")); + my $file_dlg = new Gtk::FileSelection(N("Path selection")); $file_dlg->set_modal(1); $file_dlg->show; $file_dlg->set_filename( $file->get_text ); @@ -361,9 +361,9 @@ sub row_setting_dialog{ $usr_vbox->add($usr_check); $usr_vbox->add($usr_hbox); - $usr_hbox->add(new Gtk::Label(_("user :"))); + $usr_hbox->add(new Gtk::Label(N("user :"))); $usr_hbox->add($users); - $usr_hbox->add(new Gtk::Label(_("group :"))); + $usr_hbox->add(new Gtk::Label(N("group :"))); $usr_hbox->add($groups); $F_path->add($file_hbox); diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound index 8af6154aa..b8b5c519c 100755 --- a/perl-install/standalone/draksound +++ b/perl-install/standalone/draksound @@ -44,15 +44,15 @@ if (@devices) { harddrake::sound::config($in, $_); } modules::probe_category('multimedia/sound'); } else { - $in->ask_warn(_("No Sound Card detected!"), - formatAlaTeX(_("No Sound Card has been detected on your machine. Please verify that a Linux-supported Sound Card is correctly plugged in. + $in->ask_warn(N("No Sound Card detected!"), + formatAlaTeX(N("No Sound Card has been detected on your machine. Please verify that a Linux-supported Sound Card is correctly plugged in. You can visit our hardware database at: http://www.linux-mandrake.com/en/hardware.php3"). -_("\n\n\nNote: if you've an ISA PnP sound card, you'll have to use the sndconfig program. Just type \"sndconfig\" in a console."))); +N("\n\n\nNote: if you've an ISA PnP sound card, you'll have to use the sndconfig program. Just type \"sndconfig\" in a console."))); } modules::write_conf; diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash index b748bfcdc..3618ab6d0 100755 --- a/perl-install/standalone/draksplash +++ b/perl-install/standalone/draksplash @@ -23,7 +23,7 @@ if ($::isEmbedded) { my $in = 'interactive'->vnew('su', 'default'); local $_ = join '', @ARGV; -/-h/ and die _("no help implemented yet.\n"); +/-h/ and die N("no help implemented yet.\n"); /-version/ and die 'version: $Id$'."\n"; my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window ("toplevel"); @@ -31,7 +31,7 @@ $window->signal_connect(delete_event => sub { $::isEmbedded ? kill(USR1, $::CCPI #- verification of package image magik if(!$in->do_pkgs->is_installed('ImageMagick')){ - $in->ask_okcancel(_("Error"),_("package 'ImageMagick' is required for correct working.\nClick \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit")) + $in->ask_okcancel(N("Error"),N("package 'ImageMagick' is required for correct working.\nClick \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit")) and $in->do_pkgs->install('ImageMagick') or $::isEmbedded ? kill(USR1, $::CCPID) : &CloseAppWindow ; } @@ -75,14 +75,14 @@ my %scale_size = ('tx'=> ($theme{'res'}{'w'} / $font_size{'w'}), 'ph'=> $theme{'res'}{'h'}, ); -my %first = ('frame'=>new Gtk::Frame(_("first step creation")), - 'widget'=>{ 'label'=> { 'res'=>_("final resolution"), - 'file'=>_("choose image file"), - 'name'=>_("Theme name") +my %first = ('frame'=>new Gtk::Frame(N("first step creation")), + 'widget'=>{ 'label'=> { 'res'=>N("final resolution"), + 'file'=>N("choose image file"), + 'name'=>N("Theme name") }, - 'button'=>{ #'boot_conf'=>_("Make bootsplash step 2"), - #'lilo_conf'=>_("Go to lilosplash configuration"), - 'file'=>_("Browse"), + 'button'=>{ #'boot_conf'=>N("Make bootsplash step 2"), + #'lilo_conf'=>N("Go to lilosplash configuration"), + 'file'=>N("Browse"), }, 'combo'=> {'res'=>['800x600', '1024x768', '1280x1024'], 'name'=>[ $theme{'name'} , &giv_exist_thm] @@ -96,16 +96,16 @@ my %first = ('frame'=>new Gtk::Frame(_("first step creation")), #'kill' ], ); -my %boot_conf_frame = ('frame' => new Gtk::Frame( _("Configure bootsplash picture") ), - 'widget'=> { 'label' => { 'tx'=> _("x coordinate of text box\nin number of character"), - 'ty'=> _("y coordinate of text box\nin number of character"), - 'tw'=> _("text width"), - 'th'=> _("text box height"), - 'px'=> _("the progress bar x coordinate\nof its upper left corner"), - 'py'=> _("the progress bar y coordinate\nof its upper left corner"), - 'pw'=> _("the width of the progress bar"), - 'ph'=> _("the heigth of the progress bar"), - 'pc'=> _("the color of the progress bar") +my %boot_conf_frame = ('frame' => new Gtk::Frame( N("Configure bootsplash picture") ), + 'widget'=> { 'label' => { 'tx'=> N("x coordinate of text box\nin number of character"), + 'ty'=> N("y coordinate of text box\nin number of character"), + 'tw'=> N("text width"), + 'th'=> N("text box height"), + 'px'=> N("the progress bar x coordinate\nof its upper left corner"), + 'py'=> N("the progress bar y coordinate\nof its upper left corner"), + 'pw'=> N("the width of the progress bar"), + 'ph'=> N("the heigth of the progress bar"), + 'pc'=> N("the color of the progress bar") }, #- must set scale values to true to get them created by mk_frame 'scale' => {'tx'=> 1, @@ -117,15 +117,15 @@ my %boot_conf_frame = ('frame' => new Gtk::Frame( _("Configure bootsplash pictur 'pw'=> 1, 'ph'=> 1, }, - 'button' => { #'annul'=> _("Go back"), - 'prev'=>_("Preview"), - 'kill'=>_("Quit"), - 'save'=>_("Save theme"), - 'pc'=> _("Choose color"), + 'button' => { #'annul'=> N("Go back"), + 'prev'=>N("Preview"), + 'kill'=>N("Quit"), + 'save'=>N("Save theme"), + 'pc'=> N("Choose color"), }, - 'check' => { 'logo' => _("Display logo on Console" ), - 'quiet'=> _("Make kernel message quiet by default"), + 'check' => { 'logo' => N("Display logo on Console" ), + 'quiet'=> N("Make kernel message quiet by default"), }, }, 'pos'=> [ 'tx 1' , @@ -159,17 +159,17 @@ $first{'widgets'}{'combo'}{'res'}->entry->signal_connect( changed => sub { ($theme{'res'}{'w'},$theme{'res'}{'h'}) = $theme{'res'}{'res'} =~ /([^x]+)x([^x]+)/; &set_scale_size; $boot_conf_frame{'frame'}->destroy ; - $boot_conf_frame{'frame'} = new Gtk::Frame(_("Configure bootsplash picture") ); + $boot_conf_frame{'frame'} = new Gtk::Frame(N("Configure bootsplash picture") ); &make_boot_frame; $first_vbox->add($boot_conf_frame{'frame'}); - member( $theme{'name'}, &giv_exist_thm) and &thm_in_this_res and &get_this_thm_res_conf or $in->ask_warn(_("Notice"),_("This theme haven't yet any bootsplash in %s !",$theme{'res'}{'res'})); + member( $theme{'name'}, &giv_exist_thm) and &thm_in_this_res and &get_this_thm_res_conf or $in->ask_warn(N("Notice"),N("This theme haven't yet any bootsplash in %s !",$theme{'res'}{'res'})); }); #- go to bootsplash configuration step 2 #$first{'widgets'}{'button'}{'boot_conf'}->signal_connect( clicked => sub{show_act(\%boot_conf_frame) } ); #- image file selection for new theme $first{'widgets'}{'button'}{'file'}->signal_connect( clicked =>sub{ my $file_dialog = new Gtk::FileSelection('choose image'); - $file_dialog->set_filename( ( $first{'widgets'}{'label'}{'file'}->get ne _("choose image file") )?$first{'widgets'}{'label'}{'file'}->get:'~/' ); + $file_dialog->set_filename( ( $first{'widgets'}{'label'}{'file'}->get ne N("choose image file") )?$first{'widgets'}{'label'}{'file'}->get:'~/' ); $file_dialog->cancel_button->signal_connect( clicked => sub{ $file_dialog->destroy} ); $file_dialog->ok_button->signal_connect( clicked => sub{ $first{'widgets'}{'label'}{'file'}->set_text($file_dialog->get_filename) ; $file_dialog->destroy ;}); $file_dialog->show; @@ -209,7 +209,7 @@ sub CloseAppWindow{ #- Desc => write config file for boot theme and copy image in the right location sub write_boot_thm{ - my $w = $in->wait_message('',_("saving Bootsplash theme...")); + my $w = $in->wait_message('',N("saving Bootsplash theme...")); &set_thm_values; my $logo = ($boot_conf_frame{'widgets'}{'check'}{'logo'}->get_active)?'yes':'no'; my $quiet = ($boot_conf_frame{'widgets'}{'check'}{'quiet'}->get_active)?'yes':'no'; @@ -326,7 +326,7 @@ sub which_res_exist{ and last; } - $is_ok == 1 or $in->ask_warn(_("Notice"),_("This theme haven't yet any bootsplash in %s !",$theme{'res'}{'res'})) and return 0; + $is_ok == 1 or $in->ask_warn(N("Notice"),N("This theme haven't yet any bootsplash in %s !",$theme{'res'}{'res'})) and return 0; return 1; } @@ -432,7 +432,7 @@ sub make_boot_frame{ &mk_frame(\$VB,\%boot_conf_frame); #- open a color choose box $boot_conf_frame{'widgets'}{'button'}{'pc'}->signal_connect( clicked => sub { - $color = new Gtk::ColorSelectionDialog(_("ProgressBar color selection")); + $color = new Gtk::ColorSelectionDialog(N("ProgressBar color selection")); $theme{'boot_conf'}{'pc'} =~ m/0x(.{2})(.{2})(.{2})/; my @rgb = map { hex($_)/255 } ($1 ,$2, $3); $color->colorsel->set_color(@rgb);#$theme{'boot_conf'}{'pc'}); @@ -453,7 +453,7 @@ sub make_boot_frame{ #- made a preview $boot_conf_frame{'widgets'}{'button'}{'prev'}->signal_connect( clicked => sub{ if(! -f $first{'widgets'}{'label'}{'file'}->get) { - $in->ask_warn(_("Notice"),_("You must choose an image file first!")); + $in->ask_warn(N("Notice"),N("You must choose an image file first!")); return 0; } #- calculation of the 2 angle of text box and progress bar @@ -462,7 +462,7 @@ sub make_boot_frame{ my $text_br = ($theme{'boot_conf'}{'tw'}*$font_size{'w'}+$theme{'boot_conf'}{'tx'}*$font_size{'w'}).','.($theme{'boot_conf'}{'th'}*$font_size{'h'}+$theme{'boot_conf'}{'ty'}*$font_size{'h'}); my $progress_tl = $theme{'boot_conf'}{'px'}.','.$theme{'boot_conf'}{'py'}; my $progress_br = ($theme{'boot_conf'}{'px'}+$theme{'boot_conf'}{'pw'}).','.($theme{'boot_conf'}{'py'}+$theme{'boot_conf'}{'ph'}); - my $w = $in->wait_message('', _("Generating preview ...")); + my $w = $in->wait_message('', N("Generating preview ...")); $x++; local $txt_tl_x = $theme{'boot_conf'}{'tx'}*$font_size{'w'}; local $txt_tl_y = $theme{'boot_conf'}{'ty'}*$font_size{'h'}; @@ -508,7 +508,7 @@ sub show_prev{ $prev_window or ($prev_window = new Gtk::Window('toplevel') and $prev_window->set_policy( 0, 1, 1 ) ); #-PO First %s is theme name, second %s (in parenthesis) is resolution - $prev_window->set_title(_("%s BootSplash (%s) preview",$theme{'name'},$theme{'res'}{'res'})); + $prev_window->set_title(N("%s BootSplash (%s) preview",$theme{'name'},$theme{'res'}{'res'})); $prev_pic = gtkcreate_png_pixbuf($file); $prev_pic->scale_simple($theme{'res'}{'w'},$theme{'res'}{'h'},0); $prev_pix = $prev_pic->render_pixmap_and_mask($prev_pic); diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index f3874a657..caeebcc59 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -41,12 +41,12 @@ sub scan4channels { # as we're just a, xawtv wraper # -x "/usr/bin/scantv" or $in->do_pkgs->install('xawtv'); # -x "/usr/bin/scantv" or { -#{ exec {'consolehelper'} $0, ("urpmi", "xawtv") or die _("consolehelper missing"); +#{ exec {'consolehelper'} $0, ("urpmi", "xawtv") or die N("consolehelper missing"); # }; if (! -x "/usr/bin/scantv") { # standalone::explanations("package xawtv isn't installed"); $in->ask_warn("XawTV isn't installed!", - formatAlaTeX(_("XawTV isn't installed! + formatAlaTeX(N("XawTV isn't installed! If you do have a TV card but DrakX has neither detected it (no bttv nor saa7134 @@ -63,14 +63,14 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); # my %freqtables = map {$i=$_;$i =~ s/ (.*)/-\1/;_($_) => $i} (...) # this table must be checked on each xawtv release: my %freqtables = - ("us-bcast" => _("USA (broadcast)"), "us-cable" => _("USA (cable)"), "us-cable-hrc" => _("USA (cable-hrc)"), "canada-cable" => _("Canada (cable)"), - "japan-bcast" => _("Japan (broadcast)"), "japan-cable" => _("Japan (cable)"), "china-bcast" => _("China (broadcast)"), - "europe-west" => _("West Europe"), "europe-east" => _("East Europe"), "italy" => _("Italy"), "ireland" => _("Ireland"), "france" => _("France [SECAM]"), - "newzealand" => _("Newzealand"), "australia" => _("Australia"), - "southafrica" => _("South Africa"), - "argentina" => _("Argentina"), - "australia-optus" => _("Australian Optus cable TV"), - -1 =>_("All") + ("us-bcast" => N("USA (broadcast)"), "us-cable" => N("USA (cable)"), "us-cable-hrc" => N("USA (cable-hrc)"), "canada-cable" => N("Canada (cable)"), + "japan-bcast" => N("Japan (broadcast)"), "japan-cable" => N("Japan (cable)"), "china-bcast" => N("China (broadcast)"), + "europe-west" => N("West Europe"), "europe-east" => N("East Europe"), "italy" => N("Italy"), "ireland" => N("Ireland"), "france" => N("France [SECAM]"), + "newzealand" => N("Newzealand"), "australia" => N("Australia"), + "southafrica" => N("South Africa"), + "argentina" => N("Argentina"), + "australia-optus" => N("Australian Optus cable TV"), + -1 =>N("All") ); # Info: HRC means "Harmonically Related Carrier" @@ -104,30 +104,30 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); log::l("[drakxtv] guess lang=>$_, norm=>$norm, area=>$ftable_id"); } - if ($in->ask_from("TVdrake", _("Please,\ntype in your tv norm and country"), + if ($in->ask_from("TVdrake", N("Please,\ntype in your tv norm and country"), [ - { label => _("TV norm:"), val => \$norm, list => ["NTSC", "NTSC-JP","PAL", "PAL-M", "PAL-N", "PAL-NC", "SECAM"], type => 'combo' }, - { label => _("Area:"), val => \$ftable_id, list => [keys %freqtables], format => sub { $freqtables{$_[0]} }, sort => 1}, + { label => N("TV norm:"), val => \$norm, list => ["NTSC", "NTSC-JP","PAL", "PAL-M", "PAL-N", "PAL-NC", "SECAM"], type => 'combo' }, + { label => N("Area:"), val => \$ftable_id, list => [keys %freqtables], format => sub { $freqtables{$_[0]} }, sort => 1}, ] )) - { my $wait = $in->wait_message(_('Please wait'), - _("Scanning for TV channels in progress ...")); + { my $wait = $in->wait_message(N("Please wait"), + N("Scanning for TV channels in progress ...")); # we provide scantv a bogus table (france) which will # will be ignored since "All" is selected (because of -a) $ftable_id = "france -a " if ($ftable_id eq -1); # Note that this'll be broken if/when we implement interactive::qt my $use_X = $in->isa('interactive::gtk') && -x "/usr/X11R6/bin/xvt"; my $home = $ENV{HOME}; - my $i = system ( (($use_X) ? - "xvt -T '"._("Scanning for TV channels")." ...' -e ":"") - . "scantv -n $norm -f $ftable_id -o $home/.xawtv".(($use_X)?"":" &>$home/tmp/scantv.log;")); + my $i = system(($use_X ? "xvt -T '" . N("Scanning for TV channels") . " ...' -e " : "") . + "scantv -n $norm -f $ftable_id -o $home/.xawtv". + ($use_X ? "" : " &>$home/tmp/scantv.log;")); if ($i) { - $in->ask_warn(_("There was an error while scanning for TV channels"), - _("XawTV isn't installed!")) } + $in->ask_warn(N("There was an error while scanning for TV channels"), + N("XawTV isn't installed!")) } else { standalone::explanations("created file $home/.xawtv"); - $in->ask_warn(_("Have a nice day!"), - _("Now, you can run xawtv (under X Window!) !\n")) if (! $use_X); + $in->ask_warn(N("Have a nice day!"), + N("Now, you can run xawtv (under X Window!) !\n")) if (! $use_X); }; }; @@ -150,8 +150,8 @@ if (@devices) { $in->exit(0); } } else { - $in->ask_warn(_("No TV Card detected!"), formatAlaTeX( - _("No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in. + $in->ask_warn(N("No TV Card detected!"), formatAlaTeX( + N("No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in. You can visit our hardware database at: diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 139b8c43c..850f840d2 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -5,7 +5,7 @@ use standalone; use harddrake::ui; if ("@ARGV" =~ /--help|-h/) { - print "Harddrake 2\n", $harddrake::ui::license, _("\nUsage: harddrake [-h|--help] [--test]\n"); + print "Harddrake 2\n", $harddrake::ui::license, N("\nUsage: harddrake [-h|--help] [--test]\n"); exit; } $::isStandalone=1; diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake index 759b2ad30..fd4559853 100755 --- a/perl-install/standalone/keyboarddrake +++ b/perl-install/standalone/keyboarddrake @@ -13,7 +13,7 @@ use c; local $_ = join '', @ARGV; -/-h/ and die _("usage: keyboarddrake [--expert] [keyboard]\n"); +/-h/ and die N("usage: keyboarddrake [--expert] [keyboard]\n"); $::expert = /-expert/; @@ -28,8 +28,8 @@ if (my ($kb) = grep { !/^-/ } @ARGV) { begin: $::isEmbedded and kill 'USR2', $::CCPID; choose: - $keyboard->{KEYBOARD} = $in->ask_from_listf(_("Keyboard"), - _("Please, choose your keyboard layout."), + $keyboard->{KEYBOARD} = $in->ask_from_listf(N("Keyboard"), + N("Please, choose your keyboard layout."), \&keyboard::KEYBOARD2text, [ keyboard::KEYBOARDs() ], $keyboard->{KEYBOARD}) or goto end; @@ -38,7 +38,7 @@ if (my ($kb) = grep { !/^-/ } @ARGV) { } if ($::expert) { - my $isNotDelete = !$in->ask_yesorno("BackSpace", _("Do you want the BackSpace to return Delete in console?"), 1); + my $isNotDelete = !$in->ask_yesorno("BackSpace", N("Do you want the BackSpace to return Delete in console?"), 1); $keyboard->{BACKSPACE} = $isNotDelete ? "BackSpace" : "Delete"; } diff --git a/perl-install/standalone/livedrake b/perl-install/standalone/livedrake index 9c2af4c03..be4f9894a 100755 --- a/perl-install/standalone/livedrake +++ b/perl-install/standalone/livedrake @@ -21,8 +21,8 @@ my $cd_mntpoint = "/mnt/cdrom"; while (! -x "$cd_mntpoint/Mandrake/mdkinst/usr/bin/perl-install/live_install") { ejectCdrom(); - $in->ask_okcancel(_("Change Cd-Rom"), -_("Please insert the Installation Cd-Rom in your drive and press Ok when done. + $in->ask_okcancel(N("Change Cd-Rom"), +N("Please insert the Installation Cd-Rom in your drive and press Ok when done. If you don't have it, press Cancel to avoid live upgrade."), 1) or $in->exit(0); run_program::run("mount", "/mnt/cdrom"); } @@ -32,7 +32,7 @@ if (-x "$cd_mntpoint/Mandrake/mdkinst/usr/bin/perl-install/live_install") { $::testing or exec "./live_install"; } -$in->ask_warn('', _("Unable to start live upgrade !!!\n")); +$in->ask_warn('', N("Unable to start live upgrade !!!\n")); $in->exit(1); sub ejectCdrom { diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake index 499fa6350..2d2d9ac83 100644 --- a/perl-install/standalone/localedrake +++ b/perl-install/standalone/localedrake @@ -30,7 +30,7 @@ if (defined $klang) { lang::write('', $lang, $>); if ($>) { if (my $wm = any::running_window_manager()) { - $in->ask_okcancel('', _("The change is done, but to be effective you must logout"), 1) + $in->ask_okcancel('', N("The change is done, but to be effective you must logout"), 1) && any::ask_window_manager_to_logout($wm); } } diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 070426045..2b43eb087 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -83,7 +83,7 @@ my $h = chomp_(`hostname -s`); my $window = $::isEmbedded ? new Gtk::Plug ($::XID) : new Gtk::Window -toplevel; $window->signal_connect(delete_event => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk->exit(0) }); -$window->set_title(_("logdrake")); +$window->set_title(N("logdrake")); $window->set_policy(1, 1, 1); $window->border_width (5) unless ($::isEmbedded); #$window->set_default_size(540,460); @@ -93,31 +93,31 @@ my (undef,undef,undef,$mday) = localtime(time); $cal->select_day($mday); my @months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec); my $cal_mode = 0; -my $cal_butt = gtksignal_connect(new Gtk::CheckButton(_("Show only for the selected day")), clicked =>sub{ $cal_mode =!$cal_mode; gtkset_sensitive($cal,$cal_mode) }); +my $cal_butt = gtksignal_connect(new Gtk::CheckButton(N("Show only for the selected day")), clicked =>sub{ $cal_mode =!$cal_mode; gtkset_sensitive($cal,$cal_mode) }); ### menus definition # the menus are not shown # but they provides shiny shortcut like C-q my @menu_items = ( - { path => _("/_File"), type => '<Branch>' }, - { path => _("/File/_New"), accelerator => _("<control>N"), callback => \&print_hello }, - { path => _("/File/_Open"), accelerator => _("<control>O"),callback => \&print_hello }, - { path => _("/File/_Save"), accelerator => _("<control>S"),callback => \&save }, - { path => _("/File/Save _As") }, - { path => _("/File/-"),type => '<Separator>' }, - { path => _("/File/_Quit"), accelerator => _("<control>Q"), callback => \&quit }, - { path => _("/_Options"), type => '<Branch>' }, - { path => _("/Options/Test") }, - { path => _("/_Help"),type => '<LastBranch>' }, - { path => _("/Help/_About...") } + { path => N("/_File"), type => '<Branch>' }, + { path => N("/File/_New"), accelerator => N("<control>N"), callback => \&print_hello }, + { path => N("/File/_Open"), accelerator => N("<control>O"),callback => \&print_hello }, + { path => N("/File/_Save"), accelerator => N("<control>S"),callback => \&save }, + { path => N("/File/Save _As") }, + { path => N("/File/-"),type => '<Separator>' }, + { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => \&quit }, + { path => N("/_Options"), type => '<Branch>' }, + { path => N("/Options/Test") }, + { path => N("/_Help"),type => '<LastBranch>' }, + { path => N("/Help/_About...") } ); my $menubar = ugtk::create_factory_menu($window, @menu_items); ######### menus end ########## font and colors -my $n = Gtk::Gdk::Font->fontset_load(_("-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*")); -my $b = Gtk::Gdk::Font->fontset_load(_("-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*")); +my $n = Gtk::Gdk::Font->fontset_load(N("-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*")); +my $b = Gtk::Gdk::Font->fontset_load(N("-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*")); #$black = "\033[30m"; #$red = "\033[31m"; @@ -170,36 +170,36 @@ my $col = $cyan; ######### font and colors end my %files = ( - "auth" => { file => "/var/log/auth.log", desc => _("Authentication") }, - "user" => { file => "/var/log/user.log", desc => _("User") }, - "messages" => { file => "/var/log/messages", desc => _("Messages") }, - "syslog" => { file => "/var/log/syslog", desc => _("Syslog") }, - "explanations" => { file => "/var/log/explanations", desc => _("Mandrake Tools Explanations") } + "auth" => { file => "/var/log/auth.log", desc => N("Authentication") }, + "user" => { file => "/var/log/user.log", desc => N("User") }, + "messages" => { file => "/var/log/messages", desc => N("Messages") }, + "syslog" => { file => "/var/log/syslog", desc => N("Syslog") }, + "explanations" => { file => "/var/log/explanations", desc => N("Mandrake Tools Explanations") } ); -my $yy = gtkset_sensitive(gtksignal_connect(new Gtk::Button(_("search")) , clicked => \&search),0); +my $yy = gtkset_sensitive(gtksignal_connect(new Gtk::Button(N("search")) , clicked => \&search),0); my $log_text = new Gtk::Text(undef, undef); my $refcount_search; #### far from window gtkadd($window, gtkpack_(new Gtk::VBox(0,0), - if_(!$::isExplain && !$::isEmbedded, 0, _("A tool to monitor your logs")), - if_(!$::isFile, 0, gtkadd(new Gtk::Frame(_("Settings")), + if_(!$::isExplain && !$::isEmbedded, 0, N("A tool to monitor your logs")), + if_(!$::isFile, 0, gtkadd(new Gtk::Frame(N("Settings")), gtkpack__(new Gtk::VBox(0,2), gtkpack__(new Gtk::VBox(0,2), - # _("Show lines"), + # N("Show lines"), gtkpack__(new Gtk::HBox(0,0), - " " . _("matching") . " ", $e_yes = new Gtk::Entry(), - " " . _("but not matching") . " ", $e_no = new Gtk::Entry() + " " . N("matching") . " ", $e_yes = new Gtk::Entry(), + " " . N("but not matching") . " ", $e_no = new Gtk::Entry() ) ), gtkpack_(new Gtk::HBox(0,0), - 1, gtkadd(gtkset_border_width(new Gtk::Frame(_("Choose file")),2), + 1, gtkadd(gtkset_border_width(new Gtk::Frame(N("Choose file")),2), gtkpack (gtkset_border_width(new Gtk::VBox(0,0),0), map { ${ "b_". $_ } = gtksignal_connect(new Gtk::CheckButton($files{ $_ }{desc}), clicked => sub{ $refcount_search++; gtkset_sensitive($yy,$refcount_search) }) } keys %files, ) ), - 0, gtkadd(gtkset_border_width(new Gtk::Frame(_("Calendar")),2), + 0, gtkadd(gtkset_border_width(new Gtk::Frame(N("Calendar")),2), gtkpack__(gtkset_border_width(new Gtk::VBox(0,0),5), $cal_butt, $cal ) @@ -209,11 +209,11 @@ gtkadd($window, ) ) ), - !$::isExplain ? (1, gtkadd(new Gtk::Frame(_("Content of the file")), + !$::isExplain ? (1, gtkadd(new Gtk::Frame(N("Content of the file")), createScrolledWindow($log_text) )) : (1, createScrolledWindow($log_text)), if_(!$::isExplain, 0, gtkadd (gtkset_border_width(gtkset_layout(new Gtk::HButtonBox,-end), 5), - if_(!$::isFile, gtksignal_connect(new Gtk::Button (_("Mail alert")), + if_(!$::isFile, gtksignal_connect(new Gtk::Button (N("Mail alert")), clicked => sub { eval { alert_config() }; if ($@ =~ /wizcancel/) { $::Wizard_no_previous = 1; @@ -221,8 +221,8 @@ gtkadd($window, $::WizardWindow->destroy if defined $::WizardWindow; undef $::WizardWindow; } })), - gtksignal_connect(new Gtk::Button (_("Save")), clicked => \&save), - gtksignal_connect(new Gtk::Button ($::isEmbedded ? _("Cancel") : _("Quit")), clicked => \&quit) + gtksignal_connect(new Gtk::Button (N("Save")), clicked => \&save), + gtksignal_connect(new Gtk::Button ($::isEmbedded ? N("Cancel") : N("Quit")), clicked => \&quit) ) ) ) @@ -265,7 +265,7 @@ sub parse_file { my $i = 0; gtkadd(my $win_pb = (gtkset_modal new Gtk::Window(), 1), gtkpack(new Gtk::VBox(5,0), - " " . _("please wait, parsing file: %s", $files{ $_ }{desc}) . " ", + " " . N("please wait, parsing file: %s", $files{ $_ }{desc}) . " ", my $pbar = new Gtk::ProgressBar() ) ); @@ -389,7 +389,7 @@ sub alert_config { $::isWizard = 1; $::Wizard_pix_up = "wiz_logdrake.png"; # FIXME - $::Wizard_title = _("Mail alert"); + $::Wizard_title = N("Mail alert"); my $cron = q(#!/usr/bin/perl # generated by logdrake @@ -406,30 +406,30 @@ my $initdir = "/etc/init.d"; begin: $::Wizard_finished = 0; $::Wizard_no_previous = 1; - $in->ask_okcancel(_("Mail alert configuration"), - _("Welcome to the mail configuration utility.\n\nHere, you'll be able to set up the alert system.\n"), + $in->ask_okcancel(N("Mail alert configuration"), + N("Welcome to the mail configuration utility.\n\nHere, you'll be able to set up the alert system.\n"), 1) or quit(); step_service: undef $::Wizard_no_previous; undef $::Wizard_finished; my $service = { - httpd => _("Apache World Wide Web Server"), - bind => _("Domain Name Resolver"), - ftp => _("Ftp Server"), - postfix => _("Postfix Mail Server"), - samba => _("Samba Server"), - sshd => _("SSH Server"), - webmin => _("Webmin Service"), - xinetd => _("Xinetd Service") + httpd => N("Apache World Wide Web Server"), + bind => N("Domain Name Resolver"), + ftp => N("Ftp Server"), + postfix => N("Postfix Mail Server"), + samba => N("Samba Server"), + sshd => N("SSH Server"), + webmin => N("Webmin Service"), + xinetd => N("Xinetd Service") }; my @installed_d = (); foreach $serv (keys %$service) { -e "$initdir/$serv" && push (@installed_d,$serv); } - $in->ask_from(_("service setting"), - _("You will receive an alert if one of the selected services is no more running"), + $in->ask_from(N("service setting"), + N("You will receive an alert if one of the selected services is no more running"), [ map { { label => "$_", val => \${ $_ }, type => "bool", text => "$service->{ $_ }" } } @installed_d ]) or goto begin; @@ -441,8 +441,8 @@ my $initdir = "/etc/init.d"; step_load: undef $::Wizard_finished; - $in->ask_from(_("load setting"), - _("You will receive an alert if the load is higher than this value"), + $in->ask_from(N("load setting"), + N("You will receive an alert if the load is higher than this value"), [ { label => "load ", val => \$load, type => 'range', min => 1, max => 50 }, ]) or goto step_service; @@ -455,8 +455,8 @@ $r .= "Load is huge: $load\n" if ($load >@ . "$load);\n\n"; step_output: # $::Wizard_no_previous = 1; $::Wizard_finished = 1; - $in->ask_from(_("alert configuration"), - _("Please enter your email address below "), + $in->ask_from(N("alert configuration"), + N("Please enter your email address below "), [ { label => "" }, { label => "Email", val => \$email}, @@ -495,6 +495,6 @@ print F $r; sub save { $::isWizard=0; - $yy = $in->ask_file(_("Save as.."),"/root") or return; + $yy = $in->ask_file(N("Save as.."),"/root") or return; output($yy,$log_text->get_chars(0,$log_text->get_length())); } diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index 06faca069..bf493e774 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -42,7 +42,7 @@ if (!$mouse || !$::auto) { 0; }); } - my $name = $in->ask_from_treelistf('mousedrake', _("Please, choose the type of your mouse."), '|', + my $name = $in->ask_from_treelistf('mousedrake', N("Please, choose the type of your mouse."), '|', sub { join '|', map { translate($_) } split '\|', $_[0] }, [ mouse::fullnames ], $mouse->{type} . '|' . $mouse->{name}); @@ -55,10 +55,10 @@ if (!$mouse || !$::auto) { modules::load(qw(hid mousedev usbmouse)); } - $mouse->{XEMU3} = 'yes' if $mouse->{nbuttons} < 3 && (!$::noauto || $in->ask_yesorno('', _("Emulate third button?"), 1)); + $mouse->{XEMU3} = 'yes' if $mouse->{nbuttons} < 3 && (!$::noauto || $in->ask_yesorno('', N("Emulate third button?"), 1)); - $mouse->{device} = $in->ask_from_listf(_("Mouse Port"), - _("Please choose on which serial port your mouse is connected to."), + $mouse->{device} = $in->ask_from_listf(N("Mouse Port"), + N("Please choose on which serial port your mouse is connected to."), \&mouse::serial_port2text, [ mouse::serial_ports ], $mouse->{device}, diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index c39f65198..07be76b68 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -65,7 +65,7 @@ my $in = 'interactive'->vnew('su', 'default'); 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 Monitoring")); +$window1->set_title(N("Network Monitoring")); $window1->set_policy(1, 1, 1); $window1->set_border_width(5); #$::isEmbedded or $window1->set_usize(580, 320); @@ -99,38 +99,38 @@ MDK::Common::Globals::init( gtkadd($window1, gtkpack_(new Gtk::VBox(0,5), - 0, _("Network Monitoring"), + 0, N("Network Monitoring"), 1, gtkpack_(new Gtk::HBox(0,5), 1, my $notebook = new Gtk::Notebook, 0, gtkpack_(new Gtk::VBox(0,5), - 0, gtkadd(gtkset_shadow_type(new Gtk::Frame(_("Settings")), 'etched_out'), + 0, gtkadd(gtkset_shadow_type(new Gtk::Frame(N("Settings")), 'etched_out'), gtkpack__(gtkset_border_width(new Gtk::VBox(0,5),5), gtkpack__(new Gtk::HBox(0,0), - _("Connection type: "), my $label_cnx_type = new Gtk::Label("")), + N("Connection type: "), my $label_cnx_type = new Gtk::Label("")), gtkpack__(new Gtk::HBox(0,0), - _("Profile "), $combo1) + N("Profile "), $combo1) ) ), - 1, gtkadd(gtkset_shadow_type(new Gtk::Frame(_("Statistics")), 'etched_out'), + 1, gtkadd(gtkset_shadow_type(new Gtk::Frame(N("Statistics")), 'etched_out'), gtkpack__(new Gtk::VBox(0,0), create_packtable({ col_spacings => 1, row_spacings => 1}, [ "", "instantaneous" , "average"], - [ _("Sending Speed:"), my $label_st = new Gtk::Label(""), my $label_sta=new Gtk::Label("na")], - [ _("Receiving Speed:"),my $label_sr= new Gtk::Label(""), my $label_sra=new Gtk::Label("na")], + [ N("Sending Speed:"), my $label_st = new Gtk::Label(""), my $label_sta=new Gtk::Label("na")], + [ N("Receiving Speed:"),my $label_sr= new Gtk::Label(""), my $label_sra=new Gtk::Label("na")], ), - gtkpack__(new Gtk::HBox(0,0), " "._("Connection Time: "), my $label_ct = new Gtk::Label("")), + gtkpack__(new Gtk::HBox(0,0), " " . N("Connection Time: "), my $label_ct = new Gtk::Label("")), ) ), 0, gtkpack_(new Gtk::HBox(0,5), 1, gtksignal_connect(my $button_connect = gtkset_sensitive(new Gtk::Button(), 0), clicked => \&connection), 0, new Gtk::VSeparator, 0, gtkpack(new Gtk::VBox(0,5), - gtksignal_connect(new Gtk::Button(_("Logs")), clicked => sub { + gtksignal_connect(new Gtk::Button(N("Logs")), clicked => sub { -e "/usr/sbin/logdrake" ? system('/usr/sbin/logdrake --file=/var/log/messages &') : system('/usr/X11R6/bin/xvt -e "tail -f /var/log/messages " &') }), - gtksignal_connect(my $button_close = new Gtk::Button(_("Close")), clicked => sub { Gtk->exit(0) }), + gtksignal_connect(my $button_close = new Gtk::Button(N("Close")), clicked => sub { Gtk->exit(0) }), ) ) ) @@ -157,9 +157,9 @@ my ($pix_d_map, $pix_d_mask) = gtkcreate_png("net_d.png"); my ($pix_u_map, $pix_u_mask) = gtkcreate_png("net_u.png"); $button_connect->add(gtkpack__(new Gtk::VBox(0,3), my $pix_c = new Gtk::Pixmap($pix_u_map, $pix_u_mask), - my $label_c = new Gtk::Label(_("Wait please")) + my $label_c = new Gtk::Label(N("Wait please")) )); -$statusbar->push(1, _("Wait please, testing your connection...")); +$statusbar->push(1, N("Wait please, testing your connection...")); $window1->show_all(); #$window1->set_policy (1, 1, 1); @@ -190,7 +190,7 @@ sub connection { $button_connect->set_sensitive(0); $button_close->set_sensitive(0); $statusbar->pop(1); - $statusbar->push(1, $wasconnected ? _("Disconnecting from Internet ") : _("Connecting to Internet ")); + $statusbar->push(1, $wasconnected ? N("Disconnecting from Internet ") : N("Connecting to Internet ")); if($wasconnected == 1) { $c_time = time(); $ct_tag = Gtk->timeout_add(1000, sub { @@ -203,7 +203,7 @@ sub connection { my $tag = Gtk->timeout_add(1000, sub { $statusbar->pop(1); - $statusbar->push(1, ($wasconnected == 1 ? _("Disconnecting from Internet ") : _("Connecting to Internet ")) + $statusbar->push(1, ($wasconnected == 1 ? N("Disconnecting from Internet ") : N("Connecting to Internet ")) . join('', map { "." } (1..$nb_point))); $nb_point++; if ($nb_point < 4) { return 1; } @@ -234,11 +234,11 @@ sub connection { $ret = 0; $statusbar->pop(1); $statusbar->push(1, $wasconnected ? ( $isconnected ? - _("Disconnection from Internet failed.") : - _("Disconnection from Internet complete.")) : + N("Disconnection from Internet failed.") : + N("Disconnection from Internet complete.")) : ( $isconnected ? - _("Connection complete.") : - _("Connection failed.\nVerify your configuration in the Mandrake Control Center.")) + N("Connection complete.") : + N("Connection failed.\nVerify your configuration in the Mandrake Control Center.")) ); my $delay = 1000; # keep the message displayed longer if there is a problem. @@ -342,14 +342,14 @@ sub change_color { my $doit; $window->signal_connect ( delete_event => sub { Gtk->main_quit() }); $window->set_position(1); - $window->set_title(_("Color configuration")); + $window->set_title(N("Color configuration")); $window->set_border_width(5); gtkadd(gtkset_modal($window,1), gtkpack_(new Gtk::VBox(0,5), 1, my $colorsel = new Gtk::ColorSelection, 0, gtkadd(gtkset_layout(new Gtk::HButtonBox, -end), - gtksignal_connect(new Gtk::Button(_("OK")), clicked => sub { $doit=1; Gtk->main_quit() }), - gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { Gtk->main_quit() }), + gtksignal_connect(new Gtk::Button(N("OK")), clicked => sub { $doit=1; Gtk->main_quit() }), + gtksignal_connect(new Gtk::Button(N("Cancel")), clicked => sub { Gtk->main_quit() }), ) ) ); @@ -395,31 +395,31 @@ sub update { $gct->set_foreground($colort); $_[0]->draw(undef); }), - _("sent: "), $monitor->{$intf}{labelt} = new Gtk::Label("0")), + N("sent: "), $monitor->{$intf}{labelt} = new Gtk::Label("0")), gtkpack__(gtkset_border_width(new Gtk::HBox(0,5), 5), gtksignal_connect(my $button_r = gtkset_relief(new Gtk::Button(), 'none'), clicked => sub { $colorr = change_color($colorr); $gcr->set_foreground($colorr); $_[0]->draw(undef); }), - _("received: "), $monitor->{$intf}{labelr} = new Gtk::Label("0")), + N("received: "), $monitor->{$intf}{labelr} = new Gtk::Label("0")), gtkpack__(gtkset_border_width(new Gtk::HBox(0,5), 5), gtksignal_connect(my $button_a = gtkset_relief(new Gtk::Button(), 'none'), clicked => sub { $colora = change_color($colora); $gca->set_foreground($colora); $_[0]->draw(undef); }), - _("average")) + N("average")) ), 0, gtkpack__(gtkset_border_width(new Gtk::VBox(0,0), 5), - gtkadd(gtkset_shadow_type(new Gtk::Frame(_("Local measure")), 'etched_out'), + gtkadd(gtkset_shadow_type(new Gtk::Frame(N("Local measure")), 'etched_out'), gtkpack__(gtkset_border_width(new Gtk::VBox(0,0), 5), gtkpack__(new Gtk::HBox(0,0), - _('sent: '), + N("sent: "), my $measure_t = new Gtk::Label("0") ), gtkpack__(new Gtk::HBox(0,0), - _('received: '), + N("received: "), my $measure_r = new Gtk::Label("0") ) ) @@ -444,8 +444,8 @@ sub update { my $received = $x >= 0 ? $monitor->{$intf}{stack_r}[$x] : 0; my $transmitted = $x >= 0 ? $monitor->{$intf}{stack_t}[$x] : 0; my $type; - $y * $scale / 150 < $transmitted and $type = _('transmitted'); - (150 - $y) * $scale / 150 < $received and $type = _('received'); + $y * $scale / 150 < $transmitted and $type = N("transmitted"); + (150 - $y) * $scale / 150 < $received and $type = N("received"); $measure_r->set(formatXiB($received)); $measure_t->set(formatXiB($transmitted)); }); @@ -467,13 +467,13 @@ sub update { if(($isconnected == 1) && !in_ifconfig($netcnx->{NET_INTERFACE})) { $isconnected=0; $statusbar->pop(1); - $statusbar->push(1, _("Warning, another internet connexion has been detected, maybe using your network")); + $statusbar->push(1, N("Warning, another internet connexion has been detected, maybe using your network")); } else { #- translators : $netcnx->{type} is the type of network connection (modem, adsl...) $statusbar->pop(1); - $statusbar->push(1, $isconnected == 1 ? _("Connected") : _("Not connected")); + $statusbar->push(1, $isconnected == 1 ? N("Connected") : N("Not connected")); } - $label_c->set($isconnected == 1 ? _("Disconnect %s", $netcnx->{type}) : _("Connect %s", $netcnx->{type})); + $label_c->set($isconnected == 1 ? N("Disconnect %s", $netcnx->{type}) : N("Connect %s", $netcnx->{type})); $isconnected == 1 ? $pix_c->set($pix_c_map, $pix_c_mask) : $pix_c->set($pix_d_map, $pix_d_mask); $button_connect->set_sensitive(1); } diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake index f31ca3e68..8be3a7907 100755 --- a/perl-install/standalone/printerdrake +++ b/perl-install/standalone/printerdrake @@ -54,7 +54,7 @@ exit 0 if !printerdrake::first_time_dialog($printer, $in, 1); # Check whether Foomatic is installed and install it if necessary printerdrake::install_foomatic($in); -my $w = $in->wait_message(_("Printerdrake"), _("Reading printer data ...")); +my $w = $in->wait_message(N("Printerdrake"), N("Reading printer data ...")); # Get what was installed before eval { $printer = printer::getinfo('') }; # Choose the spooler by command line options diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index 4ce8c5add..a1f94125e 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -38,7 +38,7 @@ for (@ARGV) { $in = 'interactive'->vnew('su', 'default'); $in->do_pkgs->install('sane-backends', 'xsane', if_($in->do_pkgs->is_installed('gimp'),'xsane-gimp')); if ($::Manual) { manual(); quit() } -my $wait = $in->wait_message(_("Test ports"), _("Detecting devices ...")); +my $wait = $in->wait_message(N("Test ports"), N("Detecting devices ...")); @f = scanner::detect(); $wait=undef; (@f) ? auto() : manual(); @@ -50,22 +50,22 @@ sub auto { my $name = $_->{val}{DESCRIPTION}; $name =~ s/\s$//; #some HP entry have a trailing space, i will correct usbtable asap if ($scanner::scannerDB->{$name}{flags}{unsupported}) { - $in->ask_warn('scannerdrake', _("The %s is not supported by this version of Mandrake Linux.", $name)); + $in->ask_warn('scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", $name)); return; } - $in->ask_yesorno('scannerdrake',_("%s found on %s, configure it?",$name,$_->{port}),1) or manual(); + $in->ask_yesorno('scannerdrake',N("%s found on %s, configure it?",$name,$_->{port}),1) or manual(); tryConfScanner($name, $_->{port}); } else { - $in->ask_yesorno('scannerdrake',_("%s is not in the scanner database, configure it manually?", $_->{val}{DESCRIPTION}),1) and manual(); + $in->ask_yesorno('scannerdrake',N("%s is not in the scanner database, configure it manually?", $_->{val}{DESCRIPTION}),1) and manual(); } } } sub manual { - my $s = $in->ask_from_treelist('scannerdrake', _("Select a scanner"), '|', [' None', keys %$scanner::scannerDB], '') or return; + my $s = $in->ask_from_treelist('scannerdrake', N("Select a scanner"), '|', [' None', keys %$scanner::scannerDB], '') or return; return if $s eq ' None'; if ($scanner::scannerDB->{$s}{flags}{unsupported}) { - $in->ask_warn('scannerdrake', _("The %s is not supported by this version of Mandrake Linux.", $s)); + $in->ask_warn('scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", $s)); return; } tryConfScanner($s); @@ -78,7 +78,7 @@ sub dynamic { my $name = $_->{val}{DESCRIPTION}; $name =~ s/\s$//; #some HP entry have a trailing space, i will correct usbtable asap if ($scanner::scannerDB->{$name}{flags}{unsupported}) { - $in->ask_warn('scannerdrake', _("The %s is not supported by this version of Mandrake Linux.", $name)); + $in->ask_warn('scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", $name)); return; } scanner::confScanner($name, $_->{port}) unless ($scanner::scannerDB->{$model}{flags}{unsupported}); @@ -90,34 +90,34 @@ sub tryConfScanner { # take care if interactive output is needed (unsupported, parallel..) my ($model, $port) = @_; if ($scanner::scannerDB->{$model}{flags}{unsupported}) { - $in->ask_warn('scannerdrake', _("This %s scanner is unsupported", $model)); + $in->ask_warn('scannerdrake', N("This %s scanner is unsupported", $model)); return; } # if ($scanner::scannerDB->{$model}{driver} =~ /Parport/) { - # $in->ask_warn('scannerdrake', _("This %s scanner uses parallel port, which is unsupported for the moment", $model)); + # $in->ask_warn('scannerdrake', N("This %s scanner uses parallel port, which is unsupported for the moment", $model)); # return; # } if ($scanner::scannerDB->{$model}{driver} =~ /SCSI/) { - #$in->ask_warn('scannerdrake', _("This %s scanner uses parallel port, which is unsupported for the moment", $model)); + #$in->ask_warn('scannerdrake', N("This %s scanner uses parallel port, which is unsupported for the moment", $model)); #return; } if ($scanner::scannerDB->{$model}{ask} =~ /DEVICE/) { $port = '/dev/sg0'; $in->ask_from('scannerdrake', - _("Scannerdrake was not able to detect your %s scanner.\nPlease select the device where your scanner is plugged", $model), + N("Scannerdrake was not able to detect your %s scanner.\nPlease select the device where your scanner is plugged", $model), [ - { label => _("choose device"), val => \$port, list => ['/dev/sg0', '/dev/sg1', '/dev/sg2', '/dev/sg3', '/dev/sg4' ], not_edit => 0, sort => 1 }, + { label => N("choose device"), val => \$port, list => ['/dev/sg0', '/dev/sg1', '/dev/sg2', '/dev/sg3', '/dev/sg4' ], not_edit => 0, sort => 1 }, ], ) or manual(); } if ($scanner::scannerDB->{$model}{server} =~ /printerdrake/) { - $in->ask_warn('scannerdrake', _("This %s scanner must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", $model)); + $in->ask_warn('scannerdrake', N("This %s scanner must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", $model)); return; } scanner::confScanner($model,$port); - $in->ask_warn(_("Congratulations!"), - _("Your %s scanner has been configured.\nYou may now scan documents using ``XSane'' from Multimedia/Graphics in the applications menu.", $model)); + $in->ask_warn(N("Congratulations!"), + N("Your %s scanner has been configured.\nYou may now scan documents using ``XSane'' from Multimedia/Graphics in the applications menu.", $model)); } diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 964a59592..84097e9a9 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -4,7 +4,7 @@ use lib qw(/usr/lib/libDrakX); use strict; use standalone; #- warning, standalone must be loaded very first, for 'explanations' -use MDK::Common; +use common; use interactive; use harddrake::data; use Storable qw(store retrieve); @@ -41,11 +41,11 @@ foreach (@harddrake::data::tree) { my $msg; my @was_removed = difference2([ keys %$oldconfig ], [ keys %ID ]); if (@was_removed) { - $msg .= _("Some devices in the \"%s\" hardware class were removed:\n", $item) . + $msg .= N("Some devices in the \"%s\" hardware class were removed:\n", $item) . "- ". harddrake::data::custom_id($oldconfig->{$_}, $item) ." was removed\n" foreach @was_removed . "\n"; } my @added = difference2([ keys %ID ], [ keys %$oldconfig ]); - $msg .= _("Some devices were added:\n", $item) if @added; + $msg .= N("Some devices were added:\n", $item) if @added; $msg .= "- ". harddrake::data::custom_id($ID{$_}, $item) ." was added\n" foreach (@added); @added || @was_removed or next; next unless (-x $configurator); @@ -61,7 +61,7 @@ foreach (@harddrake::data::tree) { if ($no) { require interactive; undef $wait; - $wait = $in->wait_message(_('Please wait'), _('Hardware probing in progress')); + $wait = $in->wait_message(N("Please wait"), N("Hardware probing in progress")); } elsif ($res) { if (my $pid = fork) { wait; diff --git a/perl-install/steps.pm b/perl-install/steps.pm index 162bc6d57..e5a24413b 100644 --- a/perl-install/steps.pm +++ b/perl-install/steps.pm @@ -11,28 +11,28 @@ use common; my @installStepsFields = qw(text redoable onError hidden needs icon); #entered reachable toBeDone next done; my @installSteps = ( - selectLanguage => [ __("Choose your language"), 1, 1, '', '', 'language' ], - selectInstallClass => [ __("Select installation class"), 1, 1, '', '', '' ], - setupSCSI => [ __("Hard drive detection"), 1, 0, '', '', 'harddrive' ], - selectMouse => [ __("Configure mouse"), 1, 1, '', "selectInstallClass", 'mouse' ], - selectKeyboard => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass", 'keyboard' ], - miscellaneous => [ __("Security"), 1, 1, '!$::expert', '', 'security' ], - doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass", 'partition' ], - formatPartitions => [ __("Format partitions"), 1, -1, '$o->{isUpgrade}', "doPartitionDisks", 'partition' ], - choosePackages => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", 'partition' ], - installPackages => [ __("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"], '' ], - setRootPassword => [ __("Set root password"), 1, 1, '', "installPackages", 'rootpasswd' ], - addUser => [ __("Add a user"), 1, 1, '', "installPackages", 'user' ], - configureNetwork => [ __("Configure networking"), 1, 1, '', "formatPartitions", 'network' ], - summary => [ __("Summary"), 1, 0, '', "installPackages", 'summary' ], - configureServices => [ __("Configure services"), 1, 1, '!$::expert', "installPackages", 'services' ], - setupBootloader => [ __("Install bootloader"), 1, 0, '', "installPackages", 'bootloader' ], + selectLanguage => [ N_("Choose your language"), 1, 1, '', '', 'language' ], + selectInstallClass => [ N_("Select installation class"), 1, 1, '', '', '' ], + setupSCSI => [ N_("Hard drive detection"), 1, 0, '', '', 'harddrive' ], + selectMouse => [ N_("Configure mouse"), 1, 1, '', "selectInstallClass", 'mouse' ], + selectKeyboard => [ N_("Choose your keyboard"), 1, 1, '', "selectInstallClass", 'keyboard' ], + miscellaneous => [ N_("Security"), 1, 1, '!$::expert', '', 'security' ], + doPartitionDisks => [ N_("Setup filesystems"), 1, 0, '', "selectInstallClass", 'partition' ], + formatPartitions => [ N_("Format partitions"), 1, -1, '$o->{isUpgrade}', "doPartitionDisks", 'partition' ], + choosePackages => [ N_("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions", 'partition' ], + installPackages => [ N_("Install system"), 1, -1, '', ["formatPartitions", "selectInstallClass"], '' ], + setRootPassword => [ N_("Set root password"), 1, 1, '', "installPackages", 'rootpasswd' ], + addUser => [ N_("Add a user"), 1, 1, '', "installPackages", 'user' ], + configureNetwork => [ N_("Configure networking"), 1, 1, '', "formatPartitions", 'network' ], + summary => [ N_("Summary"), 1, 0, '', "installPackages", 'summary' ], + configureServices => [ N_("Configure services"), 1, 1, '!$::expert', "installPackages", 'services' ], + setupBootloader => [ N_("Install bootloader"), 1, 0, '', "installPackages", 'bootloader' ], if_((arch() !~ /alpha/) && (arch() !~ /ppc/), - createBootdisk => [ __("Create a bootdisk"), 1, 0, '', "installPackages", 'bootdisk' ], + createBootdisk => [ N_("Create a bootdisk"), 1, 0, '', "installPackages", 'bootdisk' ], ), - configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"], 'X' ], - installUpdates => [ __("Install system updates"), 1, 1, '', ["installPackages", "configureNetwork", "summary"], '' ], - exitInstall => [ __("Exit install"), 0, 0, '!$::expert && !$::live', '', 'exit' ], + configureX => [ N_("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"], 'X' ], + installUpdates => [ N_("Install system updates"), 1, 1, '', ["installPackages", "configureNetwork", "summary"], '' ], + exitInstall => [ N_("Exit install"), 0, 0, '!$::expert && !$::live', '', 'exit' ], ); for (my $i = 0; $i < @installSteps; $i += 2) { my %h; @h{@installStepsFields} = @{ $installSteps[$i + 1] }; diff --git a/perl-install/ugtk.pm b/perl-install/ugtk.pm index 01613c9fb..feee63e83 100644 --- a/perl-install/ugtk.pm +++ b/perl-install/ugtk.pm @@ -282,18 +282,18 @@ sub create_dialog { my $ret = 0; my $dialog = new Gtk::Dialog; $dialog->signal_connect (delete_event => sub { Gtk->main_quit() }); - $dialog->set_title(_("logdrake")); + $dialog->set_title(N("logdrake")); $dialog->border_width(10); $dialog->vbox->pack_start(new Gtk::Label($label),1,1,0); - my $button = new Gtk::Button _("OK"); + my $button = new Gtk::Button N("OK"); $button->can_default(1); $button->signal_connect(clicked => sub { $ret = 1; $dialog->destroy(); Gtk->main_quit() }); $dialog->action_area->pack_start($button, 1, 1, 0); $button->grab_default; if ($c) { - my $button2 = new Gtk::Button _("Cancel"); + my $button2 = new Gtk::Button N("Cancel"); $button2->signal_connect(clicked => sub { $ret = 0; $dialog->destroy(); Gtk->main_quit() }); $button2->can_default(1); $dialog->action_area->pack_start($button2, 1, 1, 0); @@ -636,7 +636,7 @@ sub write_on_pixmap { my $draw = sub { my $style = new Gtk::Style; #- i18n : you can change the font. - $style->font(Gtk::Gdk::Font->fontset_load(_("-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"))); + $style->font(Gtk::Gdk::Font->fontset_load(N("-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"))); my $y_pos2 = $y_pos; foreach (@text) { $darea->window->draw_string($style->font, $gc, $x_pos, $y_pos2, $_); |