diff options
| -rw-r--r-- | perl-install/any.pm | 8 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/bootlook.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 8 | ||||
| -rw-r--r-- | perl-install/services.pm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/mousedrake | 2 |
7 files changed, 15 insertions, 15 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 6d5ceefe1..9b806019d 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -197,7 +197,7 @@ sub setupBootloader__general { { 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 => N("Enable multi profiles"), val => \$profiles, type => 'bool', advanced => 1 }, + { label => N("Enable multiple profiles"), val => \$profiles, type => 'bool', advanced => 1 }, ), ], complete => sub { @@ -340,7 +340,7 @@ if_(arch() !~ /sparc|ppc|ia64/, $in->ask_from__add_modify_remove('', N("Here are the entries on your boot menu so far. -You can add some more or change the existing ones."), [ { +You can create additional entries or change the existing ones."), [ { format => sub { my ($e) = @_; ref $e ? @@ -461,7 +461,7 @@ sub ask_users { $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); + member($u->{name}, 'root', map { $_->{name} } @$users) and $in->ask_warn('', N("This user name has already been added")), return (1,0); return 0; }; my $ret = $in->ask_from_( @@ -700,7 +700,7 @@ Allowing this will permit users to simply click on \"Share\" in konqueror and na -e '/usr/bin/userdrake' ? (ok => N("Launch userdrake"), cancel => N("Cancel")) : (cancel => ''), messages => N("The per-user sharing uses the group \"fileshare\". -You can use userdrake to add a user in this group.") +You can use userdrake to add a user to this group.") }, [])) { if (!fork()) { exec "userdrake" or c::_exit(0) } } diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index af9f548a5..d057dfcf2 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -452,7 +452,7 @@ sub suggest { #-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit) N_("Welcome to %s the operating system chooser! -Choose an operating system in the list above or +Choose an operating system from the list above or wait %d seconds for default boot. "); diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm index 4ead2206d..9953879e1 100644 --- a/perl-install/bootlook.pm +++ b/perl-install/bootlook.pm @@ -272,7 +272,7 @@ Click on Configure to launch the setup wizard.", $lilogrub), gtkpack__(new Gtk2::VBox(0,5), N("Themes"), $combo{thms}, - N("\nSelect theme for\nlilo and bootsplash,\nyou can choose\nthem separatly"), + N("\nSelect the theme for\nlilo and bootsplash,\nyou can choose\nthem separately"), $logo_thm), gtkpack__(new Gtk2::VBox(0,5), N("Lilo screen"), diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 335724414..52516eef1 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -424,8 +424,8 @@ formatAlaTeX(N("You have selected the following server(s): %s These servers are activated by default. They don't have any known security -issues, but some new could be found. In that case, you must make sure to upgrade -as soon as possible. +issues, but some new ones could be found. In that case, you must make sure +to upgrade as soon as possible. Do you really want to install these servers? diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index f2aa28d6d..538c39d6f 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -162,14 +162,14 @@ sub selectMouse { my $prev = $o->{mouse}{type} . '|' . $o->{mouse}{name}; $o->{mouse} = mouse::fullname2mouse( - $o->ask_from_treelist_('', N("Please choose the type of your mouse."), + $o->ask_from_treelist_('', N("Please choose your type of 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(N("Mouse Port"), - N("Please choose on which serial port your mouse is connected to."), + N("Please choose which serial port your mouse is connected to."), \&mouse::serial_port2text, [ mouse::serial_ports() ]) or return; } @@ -722,7 +722,7 @@ sub installUpdates { is_empty_hash_ref($u) and $o->ask_yesorno('', formatAlaTeX( N("You now have the opportunity to download updated packages. These packages -have been released after the distribution was released. They may +have been updated after the distribution was released. They may contain security or bug fixes. To download these packages, you will need to have a working Internet @@ -1072,7 +1072,7 @@ sub setupBootloader { if (arch() =~ /ppc/) { my $machtype = detect_devices::get_mac_generation(); if ($machtype !~ /NewWorld/) { - $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")); + $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 or some other means to boot your machine")); log::l("OldWorld or Unknown Machine - no yaboot setup"); return; } diff --git a/perl-install/services.pm b/perl-install/services.pm index c4a2399e3..f8c6a4aaa 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -17,8 +17,8 @@ use run_program; sub description { my %services = ( 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. +anacron => N_("Anacron is a periodic command scheduler."), +apmd => N_("apmd is used for monitoring battery status and logging it via syslog. It can also be used for shutting down the machine when the battery is low."), 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."), diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index beb02fd5f..5b1ad7889 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -50,7 +50,7 @@ if (!$mouse || !$::auto) { $mouse->{XEMU3} = 'yes' if $mouse->{nbuttons} < 3 && (!$::noauto || $in->ask_yesorno('', N("Emulate third button?"), 1)); $mouse->{device} = $in->ask_from_listf(N("Mouse Port"), - N("Please choose on which serial port your mouse is connected to."), + N("Please choose which serial port your mouse is connected to."), \&mouse::serial_port2text, [ mouse::serial_ports ], $mouse->{device}, |