diff options
| -rwxr-xr-x | _irpm | 2 | ||||
| -rw-r--r-- | urpm.pm | 8 | ||||
| -rw-r--r-- | urpme | 2 | ||||
| -rwxr-xr-x | urpmi | 2 |
4 files changed, 6 insertions, 8 deletions
@@ -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"); @@ -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). @@ -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"); @@ -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"); |