diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 12 | ||||
| -rw-r--r-- | perl-install/any.pm | 4 | ||||
| -rw-r--r-- | perl-install/fs.pm | 2 | ||||
| -rw-r--r-- | perl-install/help.pm | 12 | ||||
| -rw-r--r-- | perl-install/install2.pm | 8 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 12 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 30 |
7 files changed, 41 insertions, 39 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 29c25ed49..088565b82 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -302,7 +302,7 @@ sub testFinalConfig($;$$) { $mesg = $mesg . "\n" . _("Warning: testing is dangerous on this graphic card"); $def = 0; } - $auto && $def or $in->ask_yesorno(_("Test configuration"), $mesg, $def) or return 1; + $auto && $def or $in->ask_yesorno(_("Test of the configuration"), $mesg, $def) or return 1; unlink "$prefix/tmp/.X9-lock"; @@ -341,7 +341,7 @@ sub testFinalConfig($;$$) { /^$/ and last; push @msg, $_; } - $in->ask_warn('', [ _("An error occurred:"), " ", @msg, _("\ntry changing some parameters") ]); + $in->ask_warn('', [ _("An error has occurred:"), " ", @msg, _("\ntry to change some parameters") ]); return 0; } } @@ -364,11 +364,11 @@ sub testFinalConfig($;$$) { my $text = Gtk::Label->new; my $time = 8; Gtk->timeout_add(1000, sub { - $text->set(_("(leaving in %d seconds)", $time)); + $text->set(_("Leaving in %d seconds", $time)); $time-- or Gtk->main_quit; }); - exit (interactive_gtk->new->ask_yesorno('', [ _("Is this correct?"), $text ], 0) ? 0 : 222); + exit (interactive_gtk->new->ask_yesorno('', [ _("Is this the correct setting?"), $text ], 0) ? 0 : 222); }; my $rc = close F; my $err = $?; @@ -376,7 +376,7 @@ sub testFinalConfig($;$$) { unlink "/tmp/.X11-unix/X9" if $prefix; kill 2, $pid; - $rc || $err == 222 << 8 or $in->ask_warn('', _("An error occurred, try changing some parameters")); + $rc || $err == 222 << 8 or $in->ask_warn('', _("An error has occurred, try to change some parameters")); $rc; } @@ -475,7 +475,7 @@ sub chooseResolutionsGtk($$;$) { }); } gtkadd($W->{window}, - gtkpack_($W->create_box_with_title(_("Choose resolution and color depth"), + gtkpack_($W->create_box_with_title(_("Choose the resolution and the color depth"), "(" . ($card->{type} ? _("Graphic card: %s", $card->{type}) : _("XFree86 server: %s", $card->{server})) . ")" diff --git a/perl-install/any.pm b/perl-install/any.pm index d66282fc7..3dc8f5b8b 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -111,7 +111,7 @@ 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"), __("Other OS (windows...)") ]) eq "Linux") { + if ($in->ask_from_list_('', _("Which type of entry do you want to add?"), [ __("Linux"), __("Other OS (windows...)") ]) eq "Linux") { $e = { type => 'image' }; $prefix = "linux"; } else { @@ -155,7 +155,7 @@ _("Default") => { val => \$default, type => 'bool' }, '', \@l, complete => sub { $e->{label} or $in->ask_warn('', _("Empty label not allowed")), return 1; - member($e->{label}, map { $_->{label} } grep { $_ != $e } @{$b->{entries}}) and $in->ask_warn('', _("This label is already in use")), return 1; + member($e->{label}, map { $_->{label} } grep { $_ != $e } @{$b->{entries}}) and $in->ask_warn('', _("This label is already used")), return 1; 0; })) { $b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default}; diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 87a49bdb9..36972a11b 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -126,7 +126,7 @@ sub real_format_part { my $check_blocks = grep { /^-c$/ } @options; swap::make($part->{device}, $check_blocks); } else { - die _("don't know how to format %s in type %s", $_->{device}, type2name($_->{type})); + die _("I don't know how to format %s in type %s", $_->{device}, type2name($_->{type})); } $part->{isFormatted} = 1; } diff --git a/perl-install/help.pm b/perl-install/help.pm index c61567de4..d9be3347b 100644 --- a/perl-install/help.pm +++ b/perl-install/help.pm @@ -83,7 +83,7 @@ computer is first turned on. Because the effects of this process are usually irreversible, partitioning can be intimidating and stressful to the unexperienced user. DiskDrake -simplifies the process so that it need not be. Consult the documentation +simplifies the process so that it must not be. Consult the documentation and take your time before proceeding. @@ -143,8 +143,8 @@ In case of a serial mouse, you will also have to tell DrakX which serial port it is connected to."), selectSerialPort => - __("Please select the correct port. For example, the COM1 port in MS Windows -is named ttyS0 in Linux."), + __("Please select the correct port. For example, the COM1 port under MS Windows +is named ttyS0 under Linux."), configureNetwork => __("This section is dedicated to configuring a local area @@ -196,8 +196,8 @@ configureNetworkISP => correct information can be obtained from your ISP."), configureNetworkProxy => - __("If you will use proxies, please configure them now. If you don't know if -you will use proxies, ask your network administrator or your ISP."), + __("If you will proxies, please configure them now. If you don't know if +you should use proxies, ask your network administrator or your ISP."), installCrypto => __("You can install cryptographic package if your internet connection has been @@ -386,7 +386,7 @@ system. - Precise RAM size if needed: In some cases, Linux is unable to -correctly detect all the installed RAM on some systems. If this is the +correctly detect all the installed RAM on some systems. If it is the case, specify the correct quantity. Note: a difference of 2 or 4 Mb is normal. diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 75a3f5fdb..152180a84 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -42,7 +42,7 @@ my (%installSteps, @orderedInstallSteps); my @installSteps = ( selectLanguage => [ __("Choose your language"), 1, 1, '' ], selectInstallClass => [ __("Select installation class"), 1, 1, '' ], - setupSCSI => [ __("Setup SCSI"), 1, 0, '' ], + setupSCSI => [ __("Hard drive detection"), 1, 0, '' ], selectMouse => [ __("Configure mouse"), 1, 1, 'beginner', "selectInstallClass" ], selectKeyboard => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass" ], miscellaneous => [ __("Miscellaneous"), 1, 1, 'beginner' ], @@ -145,7 +145,7 @@ $o = $::o = { #- security => 2, shells => [ map { "/bin/$_" } qw(bash tcsh zsh ash ksh) ], authentication => { md5 => 1, shadow => 1 }, - lang => 'fr_FR', + lang => 'en', isUpgrade => 0, toRemove => [], toSave => [], @@ -502,7 +502,7 @@ sub main { $::beginner = $::expert = $::g_auto_install = 0; - c::unlimit_core(); + c::unlimit_core() unless $::testing; my ($cfg, $patch); my %cmdline; map { @@ -651,6 +651,8 @@ sub main { eval { modules::load("af_packet") }; + lang::set($o->{lang}, $o->{langs}); + #-the main cycle my $clicked = 0; MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) { diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 772e5dbbe..16da76c52 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -151,7 +151,7 @@ sub selectInstallClass1 { my $w = my_gtk->new(''); my ($radio, $focused); gtkadd($w->{window}, - gtkpack($o->create_box_with_title(_("Which installation class do you want?")), + gtkpack($o->create_box_with_title(_("Please, choose one of the following classes of installation:")), (my @radios = map { $radio = new Gtk::RadioButton($_, $radio ? $radio : ()); $radio->set_active($_ eq $def); $radio } @$l), gtkadd(create_hbox(), @@ -309,7 +309,7 @@ sub chooseSizeToInstall { _("Now that you've selected desired groups, please choose how many packages you want, ranging from minimal to full installation of each selected groups.") . - ($o->{compssUsersChoice}{Individual} ? "\n" . _("You will be able to choose more precisely in next step") : ''), + ($o->{compssUsersChoice}{Individual} ? "\n" . _("You will be able to choose them more specificaly in the next step") : ''), create_packtable({ col_spacings => 10 }, [ _("Choose the size you want to install"), $spin, _("MB"), ], [ undef, new Gtk::HScrollbar($adj) ], @@ -397,8 +397,8 @@ sub choosePackagesTree { my %toolbar = my @toolbar = ( - ftout => [ _("Expand Tree") , sub { $tree->expand_recursive(undef) } ], - ftin => [ _("Collapse Tree") , sub { $tree->collapse_recursive(undef) } ], + ftout => [ _("Expand tree") , sub { $tree->expand_recursive(undef) } ], + ftin => [ _("Collapse tree") , sub { $tree->collapse_recursive(undef) } ], reload=> [ _("Toggle between flat and group sorted"), sub { $add_nodes->(!$flat) } ], ); $toolbar->set_button_relief("none"); @@ -443,7 +443,7 @@ sub choosePackagesTree { my $p = $packages->[0]{$curr} or return; pkgs::togglePackageSelection($packages, $p, my $l = {}); if (my @l = grep { $l->{$_} } keys %$l) { - @l > 1 && !$auto_deps and $o->ask_okcancel('', [ _("The following packages are going to be install/removed"), join(", ", sort @l) ], 1) || return; + @l > 1 && !$auto_deps and $o->ask_okcancel('', [ _("The following packages are going to be installed/removed"), join(", ", sort @l) ], 1) || return; pkgs::togglePackageSelection($packages, $p); foreach (@l) { my $p = $packages->[0]{$_}; @@ -546,7 +546,7 @@ sub installPackages { _("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.", pkgs::mediumDescr($packages, $medium)); +If you don't have it, press Cancel to avoid installation from this Cd-Rom.", pkgs::mediumDescr($packages, $medium)); #- if not using a cdrom medium, always abort. $method eq 'cdrom' && $o->ask_okcancel('', $msg); diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index aa8f6b5ad..e48cc7d52 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -54,7 +54,7 @@ sub selectLanguage($) { $o->{lang} = lang::text2lang($o->ask_from_list("Language", - _("Which language do you want?"), + _("Please, choose a language to use."), # the translation may be used for the help [ lang::list() ], lang::lang2text($o->{lang}))); @@ -69,7 +69,7 @@ sub selectKeyboard($) { my ($o) = @_; $o->{keyboard} = keyboard::text2keyboard($o->ask_from_list_(_("Keyboard"), - _("What is your keyboard layout?"), + _("Please, choose your keyboard layout."), [ keyboard::list() ], keyboard::keyboard2text($o->{keyboard}))); delete $o->{keyboard_unsafe}; @@ -115,8 +115,8 @@ sub selectInstallClass($@) { $::expert = $c{$_[0]} eq "expert" && $o->ask_from_list_('', _("Are you sure you are an expert? -Hey no kidding, you will be allowed powerfull but dangerous things here."), - [ _("Hurt me plenty"), _("Normal") ]) ne "Normal"; +Hey no kidding, you will be allowed to make powerfull but dangerous things here."), + [ _("Expert"), _("Normal") ]) ne "Normal"; }; $o->{isUpgrade} = $o->selectInstallClass1($verifInstallClass, @@ -132,7 +132,7 @@ Hey no kidding, you will be allowed powerfull but dangerous things here."), server => _("Server"), ); $o->{installClass} = ${{reverse %c}}{$o->ask_from_list(_("Install Class"), - _("Which usage do you want?"), + _("Which usage is your system used for ?"), [ values %c ], $c{$o->{installClass}})}; } install_steps::selectInstallClass($o); @@ -143,7 +143,7 @@ sub selectMouse { my ($o, $force) = @_; if ($o->{mouse}{unsafe} || $::expert || $force) { - my $name = $o->ask_from_list_('', _("What is the type of your mouse?"), [ mouse::names() ], $o->{mouse}{FULLNAME}); + my $name = $o->ask_from_list_('', _("Please, choose the type of your mouse."), [ mouse::names() ], $o->{mouse}{FULLNAME}); $o->{mouse} = mouse::name2mouse($name); } $o->{mouse}{XEMU3} = 'yes' if $o->{mouse}{nbuttons} < 3; #- if $o->{mouse}{nbuttons} < 3 && $o->ask_yesorno('', _("Emulate third button?"), 1); @@ -152,7 +152,7 @@ sub selectMouse { $o->set_help('selectSerialPort'); $o->{mouse}{device} = mouse::serial_ports_names2dev( $o->ask_from_list(_("Mouse Port"), - _("Which serial port is your mouse connected to?"), + _("Please choose on which serial port your mouse is connected to."), [ mouse::serial_ports_names() ])); } @@ -182,7 +182,7 @@ sub ask_mntpoint_s { } elsif ($::beginner) { my %l; $l{&$msg} = $_ foreach @fstab; my $e = $o->ask_from_list('', - _("Which partition do you want to use as your root partition"), + _("Please choose a partition to use as your root partition."), [ sort keys %l ]); (fsedit::get_root($fstab) || {})->{mntpoint} = ''; $l{$e}{mntpoint} = '/'; @@ -372,7 +372,7 @@ sub installPackages { sub afterInstallPackages($) { my ($o) = @_; - my $w = $o->wait_message('', _("Post install configuration")); + my $w = $o->wait_message('', _("Post-install configuration")); $o->SUPER::afterInstallPackages($o); } @@ -393,7 +393,7 @@ sub configureNetwork($) { } else { $_ = $::beginner ? "Do not" : ($o->ask_yesorno([ _("Network Configuration") ], - _("Do you want to configure Local LAN networking for your system?"), 0) ? "Local LAN" : "Do not"); + _("Do you want to configure a local network for your system?"), 0) ? "Local LAN" : "Do not"); } if (/^Do not/) { $o->{netc}{NETWORKING} = "false"; @@ -423,7 +423,7 @@ sub configureNetwork($) { #- added ppp configuration after ethernet one. if (!$::beginner && $o->ask_yesorno([ _("Modem Configuration") ], - _("Do you want to configure Dialup with modem networking for your system?"), 0)) { + _("Do you want to configure a dialup connection with modem for your system?"), 0)) { $o->pppConfig; } } @@ -493,7 +493,7 @@ sub pppConfig { $m->{device} ||= $o->set_help('selectSerialPort') && mouse::serial_ports_names2dev( - $o->ask_from_list('', _("Which serial port is your modem connected to?"), + $o->ask_from_list('', _("Please choose on which serial port your modem is connected to."), [ mouse::serial_ports_names ])); $o->set_help('configureNetworkISP'); @@ -539,7 +539,7 @@ and/or use these software. In addition customer and/or end user shall particularly be aware to not infringe the laws of his/their jurisdiction. Should customer and/or end user do not -respect the provision of these applicable laws, he/they will incur serious +respect the provision of these applicable laws, he/they will incure serious sanctions. In no event shall Mandrakesoft nor its manufacturers and/or suppliers be liable @@ -570,7 +570,7 @@ USA")) || return; map { $u->{packages}{pkgs::packageName($_)} = { pkg => $_, selected => 0 } } @packages; - $o->ask_many_from_list_ref('', _("Which packages do you want to install"), + $o->ask_many_from_list_ref('', _("Please choose the packages you want to install."), [ map { pkgs::packageHeaderFile($_) } @packages ], [ map { \$u->{packages}{pkgs::packageName($_)}{selected} } @packages ]) or return; @@ -1151,7 +1151,7 @@ sub setup_thiskind { my $msg = @l ? [ _("Found %s %s interfaces", join(", ", map { $_->[0] } @l), $type), _("Do you have another one?") ] : - _("Do you have any %s interface?", $type); + _("Do you have any %s interfaces?", $type); my $opt = [ __("Yes"), __("No") ]; push @$opt, __("See hardware info") if $::expert; |