summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2003-01-21 08:09:01 +0000
committerPablo Saratxaga <pablo@mandriva.com>2003-01-21 08:09:01 +0000
commitca192729278dcab2579371db5dc716746277fa24 (patch)
tree63de147760c3426591cb3c7bc105a942f4699a7e /perl-install
parente9c64c704260364a2eac2e806ad308b19a2410d1 (diff)
downloaddrakx-backup-do-not-use-ca192729278dcab2579371db5dc716746277fa24.tar
drakx-backup-do-not-use-ca192729278dcab2579371db5dc716746277fa24.tar.gz
drakx-backup-do-not-use-ca192729278dcab2579371db5dc716746277fa24.tar.bz2
drakx-backup-do-not-use-ca192729278dcab2579371db5dc716746277fa24.tar.xz
drakx-backup-do-not-use-ca192729278dcab2579371db5dc716746277fa24.zip
English proofreading by Stew Benedicts
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Xconfig/monitor.pm2
-rw-r--r--perl-install/diskdrake/interactive.pm8
-rw-r--r--perl-install/harddrake/sound.pm2
-rw-r--r--perl-install/harddrake/v4l.pm2
-rw-r--r--perl-install/modules/interactive.pm4
-rw-r--r--perl-install/network/drakfirewall.pm2
-rw-r--r--perl-install/network/ethernet.pm4
-rw-r--r--perl-install/network/isdn.pm4
-rw-r--r--perl-install/network/netconnect.pm4
9 files changed, 16 insertions, 16 deletions
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index 429b65f50..c46e5e25a 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -107,7 +107,7 @@ sub choose {
$monitor->{VendorName} = "Plug'n Play";
} else {
delete $monitor->{VendorName};
- $in->ask_warn('', N("Plug'n Play probing failed. Please choose a precise monitor"));
+ $in->ask_warn('', N("Plug'n Play probing failed. Please select the correct monitor"));
goto ask_monitor;
}
} elsif ($merged_name eq 'Custom') {
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 04215eb07..57a17bd19 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -579,7 +579,7 @@ sub Mount_point {
};
$in->ask_from(
'',
- isLoopback($part) ? N("Where do you want to mount loopback file %s?", $part->{loopback_file}) :
+ isLoopback($part) ? N("Where do you want to mount the 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), '' ],
@@ -832,7 +832,7 @@ sub Loopback {
$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('', N("File already used by another loopback, choose another one")), return 1, 0;
+ $size == -1 and $in->ask_warn('', N("File is 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);
@@ -1002,7 +1002,7 @@ If you plan to use the LILO boot manager, be careful to add a /boot partition"))
$in->ask_warn('',
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"));
+Please be sure to add a /boot partition"));
undef $_;
} elsif ($_) {
$in->ask_warn('', formatError($_));
@@ -1139,7 +1139,7 @@ sub format_part_info {
$info .= N("Loopback file name: %s", $part->{loopback_file});
}
if (isApple($part)) {
- $info .= N("\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 .= N("\nThis special Bootstrap\npartition is for\ndual-booting your system.\n");
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index adde8778d..be662b4ed 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -210,7 +210,7 @@ To use alsa, one can either use:
return if $new_driver eq $driver;
log::explanations("switching audio driver from '$driver' to '$new_driver'\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
+It has been reported to oops 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(N("Please wait"), N("Please Wait... Applying the configuration"));
do_switch($driver, $new_driver);
diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm
index e7763471c..df7c9ccc4 100644
--- a/perl-install/harddrake/v4l.pm
+++ b/perl-install/harddrake/v4l.pm
@@ -222,7 +222,7 @@ sub config {
my ($in, $driver) = @_;
my %conf = (gbuffers => 4, card => $default, tuner => -1, radio => 0, pll => -1);
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"),
+If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed."),
[
{ 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 => '|' },
diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm
index c89ad7276..f8da8b561 100644
--- a/perl-install/modules/interactive.pm
+++ b/perl-install/modules/interactive.pm
@@ -87,7 +87,7 @@ sub load_module__ask_options {
if (@parameters) {
$in->ask_from('',
- 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),
+ N("You may now provide 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 ];
@@ -117,7 +117,7 @@ sub load_category__prompt {
my @parameters = modules::parameters::parameters($module);
if (@parameters && $in->ask_from_list_('',
formatAlaTeX(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
+properly, although it normally works fine without them. 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)), [ N_("Autoprobe"), N_("Specify options") ], 'Autoprobe') ne 'Autoprobe') {
diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm
index 084a656fd..ad2c6205e 100644
--- a/perl-install/network/drakfirewall.pm
+++ b/perl-install/network/drakfirewall.pm
@@ -128,7 +128,7 @@ sub get_conf {
$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
+For a powerful and dedicated firewall solution, please look to the
specialized MandrakeSecurity Firewall distribution."), 1) or return;
$in->ask_okcancel('', N("drakfirewall configurator
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 22bb7b9ec..ca468125d 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -29,7 +29,7 @@ sub configure_cable {
);
if (my $f = $in->ask_from_listf(N("Connect to the Internet"),
N("Which dhcp client do you want to use?
-Default is dhcp-client"),
+Default is dhcp-client."),
sub { $_[0]{description} },
\@m)) {
$f->{c} == 3 and $netcnx->{dhcp_client} = "dhcpcd" and $in->do_pkgs->install(qw(dhcpcd));
@@ -84,7 +84,7 @@ I cannot set up this connection type.")) and return;
@all_cards == 1 and $interface = $all_cards[0][0];
while (!$interface) {
$interface = $in->ask_from_list(N("Choose the network interface"),
- N("Please choose which network adapter you want to use to connect to Internet"),
+ N("Please choose which network adapter you want to use to connect to Internet."),
[ map { $_->[0] . ($_->[1] ? " (using module $_->[1])" : "") } @all_cards ]
) or return;
}
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 2577fa46b..43b7bf32c 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -234,7 +234,7 @@ sub isdn_ask_info {
sub isdn_ask_protocol {
my @toto = (
- { description => $::expert ? N("Europe protocol (EDSS1)") : N("Europe protocol"),
+ { description => $::expert ? N("European protocol (EDSS1)") : N("Europe protocol"),
protokol => 2 },
{ 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 }
@@ -275,7 +275,7 @@ If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your card.
isdn_ask_step_2:
$e = $in->ask_from_listf(N("ISDN Configuration"),
- N("Which is your ISDN card?"),
+ N("Which of the following 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);
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index b02c5b05e..328c9437b 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -25,10 +25,10 @@ sub intro {
read_net_conf($prefix, $netcnx, $netc);
if (!$::isWizard) {
if (connected()) {
- $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."));
+ $text = N("You are currently connected to the Internet.") . (-e $disconnect_file ? N("\nYou can disconnect or reconfigure your connection.") : N("\nYou can reconfigure your connection."));
$connected = 1;
} else {
- $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."));
+ $text = N("You are not currently connected to the Internet.") . (-e $connect_file ? N("\nYou can connect to the Internet or reconfigure your connection.") : N("\nYou can reconfigure your connection."));
$connected = 0;
}
my @l = (