summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-09-05 09:02:37 +0000
committerFrancois Pons <fpons@mandriva.com>2002-09-05 09:02:37 +0000
commit1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d (patch)
treef17a2ed169d0bb7b6acf4ecf722e28a5ec798d67
parent9b3e9b763ac55efc1f9227ccaa7aa5b176c49353 (diff)
downloadurpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.tar
urpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.tar.gz
urpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.tar.bz2
urpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.tar.xz
urpmi-1e90c21c9d7b6c5f2fb42077a239240ae17d4d2d.zip
Is it okay => Is this okay.
-rwxr-xr-x_irpm2
-rw-r--r--urpm.pm8
-rw-r--r--urpme2
-rwxr-xr-xurpmi2
4 files changed, 6 insertions, 8 deletions
diff --git a/_irpm b/_irpm
index 8bb615c2..b66301ee 100755
--- a/_irpm
+++ b/_irpm
@@ -30,7 +30,7 @@ $SIG{ALRM} = sub { $pid and kill 9, $pid; not_found(); };
alarm $timeout;
if (!$automatic) {
- $interactive_mesg = _("Automatic installation of packages...\nYou requested installation of package %s\n",$rpm) . _("Is it OK?");
+ $interactive_mesg = _("Automatic installation of packages...\nYou requested installation of package %s\n",$rpm) . _("Is this OK?");
if ($X) {
my $ok = _("Ok");
my $cancel = _("Cancel");
diff --git a/urpm.pm b/urpm.pm
index 57483054..877ca689 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -886,11 +886,9 @@ sub update_media {
#- the directory given does not exist and may be accessible
#- by mounting some other. try to figure out these directory and
#- mount everything necessary.
- if ($options{force} < 2 && ($options{probe_with_hdlist} || $medium->{with_hdlist})) {
- $urpm->try_mounting($with_hdlist_dir) or $urpm->{log}(_("unable to access medium \"%s\"", $medium->{name})), next;
- } else {
- $urpm->try_mounting($dir) or $urpm->{log}(_("unable to access medium \"%s\"", $medium->{name})), next;
- }
+ $urpm->try_mounting($options{force} < 2 && ($options{probe_with_hdlist} || $medium->{with_hdlist}) ?
+ $with_hdlist_dir : $dir) or
+ $urpm->{error}(_("unable to access medium \"%s\"", $medium->{name})), next;
#- try to probe for possible with_hdlist parameter, unless
#- it is already defined (and valid).
diff --git a/urpme b/urpme
index 9bd8adde..3b7a916b 100644
--- a/urpme
+++ b/urpme
@@ -29,7 +29,7 @@ use urpm;
import urpm _;
my ($auto, $matches, $maymatch, @l, @m, @toremove, %base);
-my $askok = _("Is it OK?");
+my $askok = _("Is this OK?");
my $askrm = _("Remove them all?");
# Translator: Add here the keys which might be pressed in the "No"-case.
my $noexpr = _("Nn");
diff --git a/urpmi b/urpmi
index 0d33b188..5a75b53b 100755
--- a/urpmi
+++ b/urpmi
@@ -422,7 +422,7 @@ if (@root_only) {
exit 1;
} elsif (!$auto && $ask_user) {
my $msg = _("To satisfy dependencies, the following packages are going to be installed (%d MB)", toMb($sum));
- my $msg2 = _("Is it OK?");
+ my $msg2 = _("Is this OK?");
my $p = join "\n", @to_install;
if ($X) {
my $ok = _("Ok");