aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrpmdrake6
-rw-r--r--rpmdrake.pm14
2 files changed, 10 insertions, 10 deletions
diff --git a/rpmdrake b/rpmdrake
index 52807afa..12f6bf48 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -1194,7 +1194,7 @@ Is it ok to continue?",
[ N("/_Help") . N("/_About..."), undef, sub {
my $license = formatAlaTeX(translate($::license));
$license =~ s/\n/\n\n/sg; # nicer formatting
- my $w = gtknew('AboutDialog', name => N("Rpmdrake"),
+ my $w = gtknew('AboutDialog', name => N("About Rpmdrake"),
version => '2007',
copyright => N("Copyright (C) %s by Mandriva", '2002-2006'),
license => $license, wrap_license => 1,
@@ -1326,7 +1326,7 @@ sub get_pkgs {
unless ($options{'no-media-update'}) {
if (@update_medias > 0) {
if (!$opts->{skip_updating_mu}) {
- $options{'no-confirmation'} or interactive_msg_with_banner(N("Rpmdrake"),
+ $options{'no-confirmation'} or interactive_msg_with_banner(N("Confirmation"),
N("I need to contact the mirror to get latest update packages.
Please check that your network is currently running.
@@ -1729,7 +1729,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
);
if (@invalid_sources) {
interactive_msg_(
- N("Rpmdrake"),
+ N("Warning"),
N("The following packages have bad signatures:\n\n%s\n\nDo you want to continue installation?",
join("\n", sort @invalid_sources)), yesno => 1, if_(@invalid_sources > 10, scroll => 1),
) or goto return_with_error;
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 0ee80d42..69b7644b 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -302,7 +302,7 @@ sub fatal_msg {
sub wait_msg {
my ($msg, %options) = @_;
gtkflush();
- my $mainw = ugtk2->new('Rpmdrake', grab => 1, if_(exists $options{transient}, transient => $options{transient}));
+ my $mainw = ugtk2->new(N("Please wait"), grab => 1, if_(exists $options{transient}, transient => $options{transient}));
$mainw->{real_window}->set_position($options{transient} ? 'center_on_parent' : 'center_always');
my $label = ref($msg) =~ /^Gtk/ ? $msg : Gtk2::WrappedLabel->new($msg);
my $banner = $options{banner} ? getbanner() : undef;
@@ -564,7 +564,7 @@ the case when the architecture of your processor is not supported
by Mandriva Linux Official Updates.")), %options
), return '';
- my $w = ugtk2->new('rpmdrake', grab => 1);
+ my $w = ugtk2->new(N("Mirror choice"), grab => 1);
$w->{rwindow}->set_position($options{transient} ? 'center_on_parent' : 'center_always');
my $tree_model = Gtk2::TreeStore->new("Glib::String");
my $tree = Gtk2::TreeView->new_with_model($tree_model);
@@ -725,7 +725,7 @@ sub update_sources_check {
update_sources($urpm, %$options, noclean => 1, medialist => \@media);
fatal_error:
if (@error_msgs) {
- interactive_msg('rpmdrake', sprintf(translate($error_msg), join("\n", @error_msgs)), scroll => 1);
+ interactive_msg(N("Error"), sprintf(translate($error_msg), join("\n", @error_msgs)), scroll => 1);
return 0;
}
return 1;
@@ -738,7 +738,7 @@ sub update_sources_interactive {
my @buttons;
my @media = grep { ! $_->{ignore} } @{$urpm->{media}};
unless (@media) {
- interactive_msg('rpmdrake', N("No active medium found. You must enable some media to be able to update them."));
+ interactive_msg(N("Warning"), N("No active medium found. You must enable some media to be able to update them."));
return 0;
}
gtkadd(
@@ -806,7 +806,7 @@ sub add_medium_and_check {
}
if (@error_msgs) {
interactive_msg(
- 'rpmdrake',
+ N("Error"),
N("Unable to add medium, errors reported:\n\n%s",
join("\n", @error_msgs)),
scroll => 1,
@@ -830,7 +830,7 @@ sub add_medium_and_check {
if (any { exists $newnames{$_->{name}} } @{$urpm->{media}}) {
return 1;
} else {
- interactive_msg('rpmdrake', N("Unable to create medium."));
+ interactive_msg(N("Error"), N("Unable to create medium."));
return 0;
}
@@ -847,7 +847,7 @@ sub check_update_media_version {
foreach (@_) {
if ($_->{name} =~ /(\d+\.\d+).*\bftp\du\b/ && $1 ne $mdk_version) {
interactive_msg(
- 'rpmdrake',
+ N("Warning"),
$branded
? N("Your medium `%s', used for updates, does not match the version of %s you're running (%s).
It will be disabled.",