clean out some frenglish (from mageia)

7 files changed, 15 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index b04b00e7..9c9000d1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 5.26.10
+
+- fix various typos
+
 Version 5.26.9 -  5 May 2011, by J. Victor Martins
 
 - Fix list of matching packages when warning for packages not in list (bug
diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm
index 82f52547..71f37ba6 100644
--- a/Rpmdrake/edit_urpm_sources.pm
+++ b/Rpmdrake/edit_urpm_sources.pm
@@ -1189,7 +1189,7 @@ sub run() {
         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
+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 c3b02948..afeebb47 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -173,8 +173,8 @@ sub get_string_from_keywords {
     } elsif (member('updates', @media_types)) {
         return join("\n",
                     (member('official', @media_types) ?
-                       N("This is an offical update which is supported by Mandriva.")
-                       : (N("This is an unoffical update."), $unsupported))
+                       N("This is an official update which is supported by Mandriva.")
+                       : (N("This is an unofficial update."), $unsupported))
                     ,
                     $s);
     } else {
@@ -240,7 +240,7 @@ sub get_new_deps {
                               $urpm->disable_selected(open_rpm_db(), $state, @requested);
                               my @nodes_with_deps = map { urpm_name($_) } @requested;
                               my @deps = sort { $a cmp $b } difference2(\@nodes_with_deps, [ urpm_name($upkg) ]);
-                              @deps = N("No non installed dependancy.") if !@deps;
+                              @deps = N("No non installed dependency.") if !@deps;
                               gtktext_insert($deps_textview, join("\n", @deps));
                           });
             }
@@ -359,7 +359,7 @@ sub node_state {
     my $pkg = $pkgs->{$name};
     my $urpm_obj = $pkg->{pkg};
     if (!$urpm_obj) {
-        my ($short_name) = split_fullname($name);
+        my ($short_name) = $name;
         state $warned;
         if (!$warned) {
             $warned = 1;
@@ -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 5a0ea01a..96ce81c8 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 !~ /MandrivaUpdate/, 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 1fcc3e7f..9b2b109f 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -735,7 +735,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}}))
diff --git a/rpmdrake b/rpmdrake
index 5b5570d1..4e20f303 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -533,7 +533,7 @@ sub run_treeview_dialog {
             N("/_Options") . N("/_Select dependencies without asking");
     my $clean_cache_string = 
             N("/_Options") . "/" . 
-            N("Clear download cache after successfull install");
+            N("Clear download cache after successful install");
     my $updates_string = N("/_Options") . N("/_Compute updates on startup");
     my $NVR_string = N("/_Options") . "/" . N("Search in _full package names");
     my $regexp_search_string = N("/_Options") . "/" . N("Use _regular expressions in searches");
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 6dcc1edc..0b4e8052 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -166,7 +166,7 @@ our $configfile = "$ENV{HOME}/.rpmdrake";
 # Configuration File Options
 #
 
-# clear download cache after succesfull installation of packages
+# clear download cache after succesful installation of packages
 our $clean_cache;
 
 # automatic select dependencies without user intervention