diff options
| -rw-r--r-- | Rpmdrake/edit_urpm_sources.pm | 4 | ||||
| -rw-r--r-- | Rpmdrake/gui.pm | 4 | ||||
| -rw-r--r-- | Rpmdrake/init.pm | 2 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm index f8c1fa02..a7e83391 100644 --- a/Rpmdrake/edit_urpm_sources.pm +++ b/Rpmdrake/edit_urpm_sources.pm @@ -1188,8 +1188,8 @@ sub run() { my $err_msg = "urpmdb locked\n"; local $urpm->{fatal} = sub { interactive_msg('rpmdrake', - N("Packages database is locked. Please close other applications -working with packages database (do you have another media + N("The Package Database is locked. Please close other applications +working with the Package Database (do you have another media manager on another desktop, or are you currently installing packages as well?).")); die $err_msg; diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index d717461c..5c6c6e4c 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -841,7 +841,7 @@ sub toggle_nodes { ($count == 1 ? N("One package cannot be installed") : N("Some packages can't be installed")), ($count == 1 ? N("Sorry, the following package cannot be selected:\n\n%s", format_list(@reasons)) - : N("Sorry, the following packages can't be selected:\n\n%s", format_list(@reasons))), + : N("Sorry, the following packages cannot be selected:\n\n%s", format_list(@reasons))), scroll => 1, ); foreach (@cant) { @@ -912,7 +912,7 @@ sub do_action__real { my $size_added = sum(map { if_($_->flag_selected && !$_->flag_installed, $_->size) } @{$urpm->{depslist}}); if ($MODE eq 'install' && $size_free - $size_added/1024 < 50*1024) { interactive_msg(N("Too many packages are selected"), - N("Warning: it seems that you are attempting to add so much + N("Warning: it seems that you are attempting to add so many packages that your filesystem may run out of free diskspace, during or after package installation ; this is particularly dangerous and should be considered with care. diff --git a/Rpmdrake/init.pm b/Rpmdrake/init.pm index b901292e..c9a4262b 100644 --- a/Rpmdrake/init.pm +++ b/Rpmdrake/init.pm @@ -55,7 +55,7 @@ N(" --mode=MODE set mode (install (default), remove, update)"), N(" --justdb update the database, but do not modify the filesystem"), N(" --no-confirmation don't ask first confirmation question in update mode"), N(" --no-media-update don't update media at startup"), -N(" --no-verify-rpm don't verify packages signatures"), +N(" --no-verify-rpm don't verify package signatures"), if_($0 !~ /MageiaUpdate/, N(" --parallel=alias,host be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps")), N(" --rpm-root=path use another root for rpm installation"), N(" --urpmi-root use another root for urpmi db & rpm installation"), diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index dbfb4e1c..46a90e9c 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -729,7 +729,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( my $pkg = defined $id ? $urpm->{depslist}[$id] : undef; if ($subtype eq 'start') { if ($type eq 'trans') { - $gurpm->label(1 ? N("Preparing packages installation...") : N("Preparing package installation transaction...")); + $gurpm->label(1 ? N("Preparing package installation...") : N("Preparing package installation transaction...")); } elsif (defined $pkg) { $something_installed = 1; $gurpm->label(N("Installing package `%s' (%s/%s)...", $pkg->name, ++$transaction_progress_nb, scalar(@{$transaction->{upgrade}})) |