textual: fix some typos and inconsistencies in various messages

Fixing plain typos, miswordings, inconsistent periods, some missing
angular brackets, and a proper pluralization (even when it involves
a constant, because for some languages the precise value matters).

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 109489a1e8d8d33590d5473b3f9a2d3b10a432c9..5a42ab189db7d2223b72202faa60943c894999d1 100644 (file)
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -1806,9 +1806,9 @@ static int main_menu_action(struct cfdisk *cf, int key)
                ref = 1;
 
                if (t && fdisk_set_partition_type(cf->cxt, n, t) == 0)
-                       info = _("Changed type of the partition %zu.");
+                       info = _("Changed type of partition %zu.");
                else
-                       info = _("Type of the partition %zu is unchanged.");
+                       info = _("The type of partition %zu is unchanged.");
                break;
        }
        case 's': /* fix order */
@@ -1830,7 +1830,7 @@ static int main_menu_action(struct cfdisk *cf, int key)
                rc = ui_get_string(cf,
                          _("Are you sure you want to write the partition "
                            "table to disk? "),
-                         _("Type \"yes\" or \"no\" or press ESC to left dialog."),
+                         _("Type \"yes\" or \"no\", or press ESC to leave this dialog."),
                          buf, sizeof(buf));
 
                ref = 1;

diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index d6bb7373996236181429721402ec45296e9d8191..8d57dbb17c1c7a66be360ddf0a6ceeb9affb866e 100644 (file)
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -958,7 +958,7 @@ int main(int argc, char **argv)
 
                } else if (fdisk_is_disklabel(cxt, GPT) && fdisk_gpt_is_hybrid(cxt))
                        fdisk_warnx(cxt, _(
-                                 "The hybrid GPT detected. You have to sync "
+                                 "A hybrid GPT was detected. You have to sync "
                                  "the hybrid MBR manually (expert command 'M')."));
 
                while (1)

diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 6adfa3334d2809f04eed6f48d75c16892c066da2..0a1c6f27becf3c46a11d0684a735c26a62cd4196 100644 (file)
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -105,7 +105,7 @@ static void __attribute__((__noreturn__)) usage(int status)
 
        fputs(USAGE_HEADER, stream);
        fprintf(stream,
-               _(" %s [options] file\n"), program_invocation_short_name);
+               _(" %s [options] <file>\n"), program_invocation_short_name);
        fputs(USAGE_OPTIONS, stream);
        fputs(_(" -a                       for compatibility only, ignored\n"), stream);
        fputs(_(" -v, --verbose            be more verbose\n"), stream);

diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
index df0fc135fd230bcdbb9fc81770cb38589352951e..0a03338f70e128f3e48f93d2119d32e0fda71954 100644 (file)
--- a/libfdisk/src/bsd.c
+++ b/libfdisk/src/bsd.c
@@ -797,7 +797,7 @@ int fdisk_bsd_link_partition(struct fdisk_context *cxt)
        struct bsd_disklabel *d = self_disklabel(cxt);
 
        if (!cxt->parent || !fdisk_is_disklabel(cxt->parent, DOS)) {
-               fdisk_warnx(cxt, _("BSD label is not nested within a DOS partition"));
+               fdisk_warnx(cxt, _("BSD label is not nested within a DOS partition."));
                return -EINVAL;
        }
 

diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index db8651f46b7714ab7dbb93d14ced9816a3e36708..1b5ffb43ab46ad8c48a09ee575b04244ba7c3f73 100644 (file)
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -514,7 +514,7 @@ static int gpt_mknew_header(struct fdisk_context *cxt,
        header->size      = cpu_to_le32(sizeof(struct gpt_header));
 
        /*
-        * 128 partitions is the default. It can go behond this, however,
+        * 128 partitions are the default. It can go beyond that, but
         * we're creating a de facto header here, so no funny business.
         */
        header->npartition_entries     = cpu_to_le32(GPT_NPARTITIONS);
@@ -958,7 +958,7 @@ static uint32_t partition_start_after_end(struct gpt_header *header, struct gpt_
 }
 
 /*
- * Check if partition e1 overlaps with partition e2
+ * Check if partition e1 overlaps with partition e2.
  */
 static inline int partition_overlap(struct gpt_entry *e1, struct gpt_entry *e2)
 {
@@ -971,7 +971,7 @@ static inline int partition_overlap(struct gpt_entry *e1, struct gpt_entry *e2)
 }
 
 /*
- * Find any paritions that overlap.
+ * Find any partitions that overlap.
  */
 static uint32_t partition_check_overlaps(struct gpt_header *header, struct gpt_entry *e)
 {

diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
index cf1354132a2f15707677be7d45a81f512041cf5b..b191176d2610fe7d3a8d0955872b593d29d936d6 100644 (file)
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -140,7 +140,7 @@ int fdisk_sgi_create_info(struct fdisk_context *cxt)
        sgilabel->volume[0].num_bytes = cpu_to_be32(sizeof(struct sgi_info));
        strncpy((char *) sgilabel->volume[0].name, "sgilabel", 8);
 
-       fdisk_info(cxt, _("SGI info created on second sector"));
+       fdisk_info(cxt, _("SGI info created on second sector."));
        return 0;
 }
 

diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 5aa491d32d5db9f8f05138c9323c252b74dd1c40..ca10fbfdbbe769f7cee68d41379f071466c9c755 100644 (file)
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -80,7 +80,7 @@ static int save_new_data(struct finfo *pinfo);
 static void __attribute__((__noreturn__)) usage(FILE *fp)
 {
        fputs(USAGE_HEADER, fp);
-       fprintf(fp, _(" %s [options] [username]\n"), program_invocation_short_name);
+       fprintf(fp, _(" %s [options] [<username>]\n"), program_invocation_short_name);
        fputs(USAGE_OPTIONS, fp);
        fputs(_(" -f, --full-name <full-name>  real name\n"), fp);
        fputs(_(" -o, --office <office>        office number\n"), fp);

diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index e14efe0887ecbbd09fef64430b087155cfd6ef9e..76c3d2115a10387347d09cce27c0f57559991dcd 100644 (file)
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -69,7 +69,7 @@ static int get_shell_list(char *shell);
 static void __attribute__((__noreturn__)) usage (FILE *fp)
 {
        fputs(USAGE_HEADER, fp);
-       fprintf(fp, _(" %s [options] [username]\n"), program_invocation_short_name);
+       fprintf(fp, _(" %s [options] [<username>]\n"), program_invocation_short_name);
        fputs(USAGE_OPTIONS, fp);
        fputs(_(" -s, --shell <shell>  specify login shell\n"), fp);
        fputs(_(" -l, --list-shells    print list of shells and exit\n"), fp);
@@ -112,7 +112,7 @@ int main(int argc, char **argv)
 
 #ifndef HAVE_LIBUSER
        if (!(is_local(pw->pw_name)))
-               errx(EXIT_FAILURE, _("can only change local entries."));
+               errx(EXIT_FAILURE, _("can only change local entries"));
 #endif
 
 #ifdef HAVE_LIBSELINUX

diff --git a/login-utils/last.c b/login-utils/last.c
index f0c2b8c8723fb53272b3a385cff4707f8c026935..f7a2576f4484940a6d809d7c508d45ce517df9bb 100644 (file)
--- a/login-utils/last.c
+++ b/login-utils/last.c
@@ -564,11 +564,11 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
        fputs(_(" -R, --nohostname     don't display the hostname field\n"), out);
        fputs(_(" -s, --since <time>   display the lines since the specified time\n"), out);
        fputs(_(" -t, --until <time>   display the lines until the specified time\n"), out);
-       fputs(_(" -p, --present <time> display who where present at the specified time\n"), out);
+       fputs(_(" -p, --present <time> display who were present at the specified time\n"), out);
        fputs(_(" -w, --fullnames      display full user and domain names\n"), out);
        fputs(_(" -x, --system         display system shutdown entries and run level changes\n"), out);
-       fputs(_("     --time-format <format>  show time stamp using format:\n"), out);
-       fputs(_("                               [notime|short|full|iso]\n"), out);
+       fputs(_("     --time-format <format>  show timestamps in the specified <format>:\n"
+               "                               notime|short|full|iso\n"), out);
 
        fputs(USAGE_SEPARATOR, out);
        fputs(USAGE_HELP, out);

diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index ece582b45786b877b596dc7fce526f465d0e4222..ae1d54596e5fc5459df7e9042f2e675f16fba472 100644 (file)
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -1187,7 +1187,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
        fputs(_(" -a, --acc-expiration     display info about passwords expiration\n"), out);
        fputs(_(" -c, --colon-separate     display data in a format similar to /etc/passwd\n"), out);
        fputs(_(" -e, --export             display in an export-able output format\n"), out);
-       fputs(_(" -f, --failed             display data about the last users' failed logins\n"), out);
+       fputs(_(" -f, --failed             display data about the users' last failed logins\n"), out);
        fputs(_(" -G, --groups-info        display information about groups\n"), out);
        fputs(_(" -g, --groups=<groups>    display users belonging to a group in <groups>\n"), out);
        fputs(_(" -L, --last               show info about the users' last login sessions\n"), out);

diff --git a/login-utils/su-common.c b/login-utils/su-common.c
index 2766a6033dfcd62f8a06a28e2b7226f48d31a8e6..db728262143dc78cc014eda33107cc047b7415fc 100644 (file)
--- a/login-utils/su-common.c
+++ b/login-utils/su-common.c
@@ -857,7 +857,7 @@ su_main (int argc, char **argv, int mode)
     }
 
   if (simulate_login && !change_environment) {
-    warnx(_("ignore --preserve-environment, it's mutually exclusive to --login."));
+    warnx(_("ignoring --preserve-environment, it's mutually exclusive with --login"));
     change_environment = true;
   }
 
@@ -869,10 +869,10 @@ su_main (int argc, char **argv, int mode)
       if (shell || fast_startup || command || simulate_login) {
         errx(EXIT_FAILURE,
           _("options --{shell,fast,command,session-command,login} and "
-            "--user are mutually exclusive."));
+            "--user are mutually exclusive"));
       }
       if (optind == argc)
-        errx(EXIT_FAILURE, _("COMMAND not specified."));
+        errx(EXIT_FAILURE, _("no command was specified"));
 
       break;
     }

diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 2f894273be510f383e0afa4e43286ef9cf563372..f8cb7dd47aa9876b3aaf8b8861e61c10beb8a052 100644 (file)
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -509,7 +509,7 @@ int main(int argc, char **argv)
 
                        if (!found) {
                                nerrs++, ct++;
-                               warnx(_("cannot find process \"%s\"."), ctl.arg);
+                               warnx(_("cannot find process \"%s\""), ctl.arg);
                        }
                }
        }

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index a862e5523b6b1d59b68b1a1bd8a837d0e14b6805..0bf5e536a49c0e8c0fa89b8ff80393b1a576fe0d 100644 (file)
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -130,7 +130,7 @@ static int pencode(char *s)
                *s = '\0';
                fac = decode(save, facilitynames);
                if (fac < 0)
-                       errx(EXIT_FAILURE, _("unknown facility name: %s."), save);
+                       errx(EXIT_FAILURE, _("unknown facility name: %s"), save);
                *s++ = '.';
        }
        else {
@@ -139,7 +139,7 @@ static int pencode(char *s)
        }
        lev = decode(s, prioritynames);
        if (lev < 0)
-               errx(EXIT_FAILURE, _("unknown priority name: %s."), save);
+               errx(EXIT_FAILURE, _("unknown priority name: %s"), save);
        return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
 }
 

diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index 7b60dd825eb61fc167f89c931f277e0e3b98581a..a46ea0c47ea64ccd0721c1a2d1b4578f99adecec 100644 (file)
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -174,7 +174,7 @@ int main(int argc, char **argv)
        }
 
        if (ctl.maxsz && ctl.nfiles == 0)
-               warnx(_("--max-size ignored when used without --file."));
+               warnx(_("--max-size ignored when used without --file"));
 
        randomness_from_files(&ctl);
        free(ctl.files);
@@ -182,8 +182,9 @@ int main(int argc, char **argv)
        random_get_bytes(&buf, RAND_BYTES);
        MD5Update(&ctl.ctx, buf, RAND_BYTES);
        if (ctl.verbose)
-               fprintf(stderr, _("Got %d bytes from %s\n"), RAND_BYTES,
-                               random_tell_source());
+               fprintf(stderr, P_("Got %zu byte from %s\n",
+                                  "Got %zu bytes from %s\n", RAND_BYTES),
+                               RAND_BYTES, random_tell_source());
 
        MD5Final(digest, &ctl.ctx);
        for (i = 0; i < MD5LENGTH; i++)

diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index 1152ea76420887ce88f3c9968d6733a4f8eedcb9..cac0e6c711151b244f1e3d942136a04c287fd62f 100644 (file)
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -426,7 +426,7 @@ static void usage(int rc)
 
        fputs(_("\nUsage:\n"), out);
        fprintf(out,
-             _(" %s [options] pathname [pathname ...]\n"), p);
+             _(" %s [options] <pathname>...\n"), p);
 
        fputs(_("\nOptions:\n"), out);
        fputs(_(" -h, --help          displays this help text\n"

diff --git a/misc-utils/rename.c b/misc-utils/rename.c
index 9064bc3f3aa0fbf20dbe483c1cb0db490d8a40ed..1bb23cd6326c1378bdbadccd1574d02abae51186 100644 (file)
--- a/misc-utils/rename.c
+++ b/misc-utils/rename.c
@@ -114,11 +114,11 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 {
        fputs(USAGE_HEADER, out);
        fprintf(out,
-             _(" %s [options] expression replacement file...\n"),
+             _(" %s [options] <expression> <replacement> <file>...\n"),
                program_invocation_short_name);
        fputs(USAGE_OPTIONS, out);
        fputs(_(" -v, --verbose    explain what is being done\n"), out);
-       fputs(_(" -s, --symlink    act on symlink target\n"), out);
+       fputs(_(" -s, --symlink    act on the target of symlinks\n"), out);
        fputs(USAGE_SEPARATOR, out);
        fputs(USAGE_HELP, out);
        fputs(USAGE_VERSION, out);

diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 62730328cfd59194327810bfabce1b66a5aeb8c8..a422c473b70531471b8f2f2e684541873c1807cb 100644 (file)
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -165,7 +165,7 @@ static const char *srcdirs[] = {
 static void __attribute__((__noreturn__)) usage(FILE *out)
 {
        fputs(USAGE_HEADER, out);
-       fprintf(out, _(" %s [options] file\n"), program_invocation_short_name);
+       fprintf(out, _(" %s [options] <file>\n"), program_invocation_short_name);
 
        fputs(USAGE_OPTIONS, out);
        fputs(_(" -b         search only for binaries\n"), out);

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index ad7caa59758f7db25329d855ce32819bd5ddf6db..58a643e54f5bfdec36783bf27cf42e19e37347e7 100644 (file)
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -408,8 +408,8 @@ do_wipe(struct wipe_desc *wp, const char *devname, int flags)
                if (!(flags & WP_FL_FORCE)
                    && wp->is_parttable
                    && !blkid_probe_is_wholedisk(pr)) {
-                       warnx(_("%s: ignore nested \"%s\" partition "
-                               "table on non-whole disk device."), devname, wp->type);
+                       warnx(_("%s: ignoring nested \"%s\" partition table "
+                               "on non-whole disk device"), devname, wp->type);
                        need_force = 1;
                        continue;
                }