summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-04-02 08:21:02 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-04-02 08:21:02 +0000
commit97829dbcfd251e7033b0d064208641927de00419 (patch)
tree3c6b5859d7030267fc59b24a55e8d5d854af58ac
parent32e3ee45ad96c0804f6002463cd2fc1e4681e3b0 (diff)
downloadurpmi-97829dbcfd251e7033b0d064208641927de00419.tar
urpmi-97829dbcfd251e7033b0d064208641927de00419.tar.gz
urpmi-97829dbcfd251e7033b0d064208641927de00419.tar.bz2
urpmi-97829dbcfd251e7033b0d064208641927de00419.tar.xz
urpmi-97829dbcfd251e7033b0d064208641927de00419.zip
String fixes from John Rye
-rw-r--r--urpm/main_loop.pm4
-rw-r--r--urpm/orphans.pm4
2 files changed, 4 insertions, 4 deletions
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index db4066ab..470567b5 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -118,7 +118,7 @@ foreach my $set (@{$state->{transaction} || []}) {
if (@missing) {
push @msgs, N("Installation failed, some files are missing:\n%s",
join("\n", map { " $_->[0]" } @missing))
- . "\n" . N("You may want to update your urpmi database.");
+ . "\n" . N("You may need to update your urpmi database.");
}
if (@bad) {
push @msgs, N("Installation failed, bad rpms:\n%s",
@@ -130,7 +130,7 @@ foreach my $set (@{$state->{transaction} || []}) {
} else {
$go_on = $callbacks->{ask_yes_or_no}->(
N("Installation failed"),
- join("\n\n", @msgs, N("Try to go on anyway?")));
+ join("\n\n", @msgs, N("Try to continue anyway?")));
}
if (!$go_on) {
if (@missing) {
diff --git a/urpm/orphans.pm b/urpm/orphans.pm
index 8cef8a59..87985128 100644
--- a/urpm/orphans.pm
+++ b/urpm/orphans.pm
@@ -359,8 +359,8 @@ sub get_now_orphans_msg {
my $orphans = get_orphans($urpm);
my @orphans = map { scalar $_->fullname } @$orphans or return '';
- P("The following package is now orphan, if you wish to remove it, you can use \"urpme --auto-orphans\".",
- "The following packages are now orphans, if you wish to remove them, you can use \"urpme --auto-orphans\".", scalar(@orphans))
+ P("The following package is now orphaned, if you wish to remove it, you can use \"urpme --auto-orphans\".",
+ "The following packages are now orphaned, if you wish to remove them, you can use \"urpme --auto-orphans\".", scalar(@orphans))
. "\n" . add_leading_spaces(join("\n", sort @orphans) . "\n");
}