diff options
author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-10-26 16:23:37 +0000 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2005-10-26 16:23:37 +0000 |
commit | 5a95dd19835e18285e4849fae21135d48f9c7839 (patch) | |
tree | 1578fc85d83391ea0b6ab4048fecb50b405293b4 | |
parent | a9b51d3cd5173c7c26796c3cac93aaaba7a60a34 (diff) | |
download | urpmi-5a95dd19835e18285e4849fae21135d48f9c7839.tar urpmi-5a95dd19835e18285e4849fae21135d48f9c7839.tar.gz urpmi-5a95dd19835e18285e4849fae21135d48f9c7839.tar.bz2 urpmi-5a95dd19835e18285e4849fae21135d48f9c7839.tar.xz urpmi-5a95dd19835e18285e4849fae21135d48f9c7839.zip |
Improve some installation error messages (in English) (bug #19060)
-rwxr-xr-x | gurpmi2 | 4 | ||||
-rwxr-xr-x | urpmi | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -72,7 +72,7 @@ $urpm->resolve_dependencies( my @ask_unselect = $urpm->unselected_packages($state); @ask_unselect ? ask_continue(N( - "Some package requested cannot be installed:\n%s\nContinue?", + "Some requested packages cannot be installed:\n%s\nContinue installation anyway?", join "\n", $urpm->translate_why_unselected($state, sort @ask_unselect) ), \&do_install) : do_install(); @@ -160,7 +160,7 @@ sub do_install { my @ask_remove = $urpm->removed_packages($state); @ask_remove ? ask_continue(N( - "The following packages have to be removed for others to be upgraded:\n%s\nContinue?", + "The following packages have to be removed for others to be upgraded:\n%s\nContinue installation anyway?", join "\n", $urpm->translate_why_removed($state, sort @ask_remove) ), \&do_install_2) : goto &do_install_2; @@ -402,7 +402,7 @@ that are older than the installed ones:\n%s", $list); my $noexpr = N("Nn"); my $yesexpr = N("Yy"); message_input( - $msg . N("\nContinue?") . N(" (Y/n) "), + $msg . N("\nContinue installation anyway?") . N(" (Y/n) "), $force && $yesexpr, boolean => 1, ) =~ /[$noexpr]/ @@ -413,14 +413,14 @@ that are older than the installed ones:\n%s", $list); my @ask_unselect = $urpm->unselected_packages($state); if (@ask_unselect) { my $list = join "\n", $urpm->translate_why_unselected($state, sort @ask_unselect); - my $msg = N("Some package requested cannot be installed:\n%s", $list); + my $msg = N("Some requested packages cannot be installed:\n%s", $list); if ($urpm->{options}{auto}) { message($msg); } else { my $noexpr = N("Nn"); my $yesexpr = N("Yy"); message_input( - $msg . N("\nContinue?") . N(" (Y/n) "), + $msg . N("\nContinue installation anyway?") . N(" (Y/n) "), $force && $yesexpr, boolean => 1, ) =~ /[$noexpr]/ |