[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

A few fixes for program messages



Hi,

while working on the German dpkg translation I noticed a typo in
src/filesdb.c and three examples of clumsy/slightly incorrect English in
scripts/update-alternatives.pl.  Not being a native speaker nor terribly
familiar with update-alternatives myself, I may of course be wrong, so I
leave this to your judgment:

--8<---------------cut here---------------start------------->8---
diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index 37cbd7b..0ea96f2 100755
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -159,7 +159,7 @@ if ($action eq "install") {
           $file) unless $file =~ m|^/|;
     error(_g("alternative path %s doesn't exist."), $file)
         unless -e $file;
-    error(_g("alternative name (%s) must not contain '/' and spaces."), $name)
+    error(_g("alternative name (%s) must not contain '/' or spaces."), $name)
         if $name =~ m|[/\s]|;
     foreach my $slave ($inst_alt->slaves()) {
         $link = $inst_alt->slave_link($slave);
@@ -218,7 +218,7 @@ if ($action eq 'all') {
                 }
             }
         } else {
-            pr($prefix . _g("Skip unknown alternative %s."), $alt_name);
+            pr($prefix . _g("Skipping unknown alternative %s."), $alt_name);
         }
     }
     exit 0;
@@ -1028,7 +1028,7 @@ sub prepare_install {
                 main::warning(_g("not replacing %s with a link."), $link);
             }
         } else {
-            main::warning(_g("skip creation of %s because associated file " .
+            main::warning(_g("skipping creation of %s because associated file " .
                              "%s (of link group %s) doesn't exist."),
                           $slink, $spath, $self->name())
                 if $fileset->has_slave($slave);
diff --git a/src/filesdb.c b/src/filesdb.c
index 5a67369..a6b328c 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -451,7 +451,7 @@ void ensure_statoverrides(void) {
 
     fnn= findnamenode(thisline, 0);
     if (fnn->statoverride)
-      ohshit(_("multiple statusoverides present for file '%.250s'"), thisline);
+      ohshit(_("multiple statusoverrides present for file '%.250s'"), thisline);
     fnn->statoverride=fso;
     /* Moving on.. */
     thisline=nextline;
--8<---------------cut here---------------end--------------->8---

Unless "statusoverrides" is a /terminus technicus/ of its own (I don't
think it is), it should probably be changed further to
"status overrides".

Cheers,
       Sven


Reply to: