From 5a95dd19835e18285e4849fae21135d48f9c7839 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Wed, 26 Oct 2005 16:23:37 +0000
Subject: Improve some installation error messages (in English) (bug #19060)

---
 gurpmi2 | 4 ++--
 urpmi   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gurpmi2 b/gurpmi2
index 045c6705..b10fdfab 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -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;
diff --git a/urpmi b/urpmi
index 5efc3a73..f557db56 100755
--- a/urpmi
+++ b/urpmi
@@ -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]/
-- 
cgit v1.2.1