textual: remove some inconsistent periods from error messages

While doing so, also improve translatability and some wordings.

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

diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 8d76d91f9b9df175e0344b9eb6500f3a5bdc99ee..0e4e729d37bb8b24cc3738bc7dfdf04484337d6e 100644 (file)
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -1144,10 +1144,10 @@ partitions_ok(int fd, struct disk_desc *z) {
     /* Have at least 4 partitions been defined? */
     if (partno < 4) {
        if (!partno)
-           errx(EXIT_FAILURE, _("no partition table present."));
+           errx(EXIT_FAILURE, _("no partition table present"));
        else
-           errx(EXIT_FAILURE, P_("strange, only %d partition defined.",
-               "strange, only %d partitions defined.", partno), partno);
+           errx(EXIT_FAILURE, P_("strange, only %d partition defined",
+               "strange, only %d partitions defined", partno), partno);
        return 0;
     }
 

diff --git a/include/optutils.h b/include/optutils.h
index 9177860bbfb8d6abeb3d68e950ef44f95cba5bbb..fd5dde39b41770db237e8c3e8d6566e8cacf9a58 100644 (file)
--- a/include/optutils.h
+++ b/include/optutils.h
@@ -78,7 +78,8 @@ static inline void err_exclusive_options(
                        else if (status[e] != c) {
                                size_t ct = 0;
 
-                               fprintf(stderr, _("%s: options "),
+                               fprintf(stderr, _("%s: these options are"
+                                                 "mutually exclusive:"),
                                                program_invocation_short_name);
 
                                for (op = excl[e];
@@ -86,11 +87,10 @@ static inline void err_exclusive_options(
                                     op++, ct++) {
                                        const char *n = option_to_longopt(*op, opts);
                                        if (n)
-                                               fprintf(stderr, "--%s ", n);
+                                               fprintf(stderr, " --%s", n);
                                        else
-                                               fprintf(stderr, "-%c ", *op);
+                                               fprintf(stderr, " -%c", *op);
                                }
-                               fprintf(stderr, _("are mutually exclusive."));
                                fputc('\n', stderr);
                                exit(OPTUTILS_EXIT_CODE);
                        }

diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index ae1d54596e5fc5459df7e9042f2e675f16fba472..91831831a8732f248d9ae894ee9f142cb6a5b4c7 100644 (file)
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -285,7 +285,7 @@ static inline size_t err_columns_index(size_t arysz, size_t idx)
 {
        if (idx >= arysz)
                errx(EXIT_FAILURE, _("too many columns specified, "
-                                    "the limit is %zu columns."),
+                                    "the limit is %zu columns"),
                                arysz - 1);
        return idx;
 }

diff --git a/login-utils/sulogin.c b/login-utils/sulogin.c
index d14e527f9ecd85b3fa3f8e6dad934e694dbdb3f5..f0e88a411dbd76390cb15df38c4d79aa9e7ede8c 100644 (file)
--- a/login-utils/sulogin.c
+++ b/login-utils/sulogin.c
@@ -895,7 +895,7 @@ int main(int argc, char **argv)
        }
 
        if (geteuid() != 0)
-               errx(EXIT_FAILURE, _("only root can run this program."));
+               errx(EXIT_FAILURE, _("only superuser can run this program"));
 
        mask_signal(SIGQUIT, SIG_IGN, &saved_sigquit);
        mask_signal(SIGTSTP, SIG_IGN, &saved_sigtstp);
@@ -945,7 +945,7 @@ int main(int argc, char **argv)
         * Get the root password.
         */
        if ((pwd = getrootpwent(opt_e)) == NULL) {
-               warnx(_("cannot open password database."));
+               warnx(_("cannot open password database"));
                sleep(2);
                return EXIT_FAILURE;
        }

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index f7d9ca873ad14aea83ceeea30ff11aad589d3d50..75099d94dbc70e2f2409a76fe9a007e02ea5e2e3 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -156,7 +156,7 @@ static inline size_t err_columns_index(size_t arysz, size_t idx)
 {
        if (idx >= arysz)
                errx(EXIT_FAILURE, _("too many columns specified, "
-                                    "the limit is %zu columns."),
+                                    "the limit is %zu columns"),
                                arysz - 1);
        return idx;
 }

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 7b10df86a907506f5745df9afede0351bd3ee9fd..4836b8f6e6ccb4a646b6bf593f1efc09bec53104 100644 (file)
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -438,7 +438,7 @@ static void logger_open(struct logger_ctl *ctl)
 
        if (ctl->syslogfp == syslog_rfc5424 || ctl->syslogfp == syslog_rfc3164)
                errx(EXIT_FAILURE, _("--server or --socket are required to "
-                                    "log by --rfc5424 or --rfc3164."));
+                                    "log by --rfc5424 or --rfc3164"));
 
        openlog(ctl->tag ? ctl->tag : xgetlogin(), ctl->logflags, 0);
        ctl->syslogfp = syslog_local;

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 9a41afaabcfd0ea801704a1894ac57d9dbed79ed..dc1cf69d0f268feb1f54134fd874d1203cfb0d04 100644 (file)
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -206,7 +206,7 @@ static inline size_t err_columns_index(size_t arysz, size_t idx)
 {
        if (idx >= arysz)
                errx(EXIT_FAILURE, _("too many columns specified, "
-                                    "the limit is %zu columns."),
+                                    "the limit is %zu columns"),
                                arysz - 1);
        return idx;
 }
@@ -1708,7 +1708,7 @@ int main(int argc, char *argv[])
                excludes[nexcludes++] = 1;      /* default: ignore RAM disks */
 
        if (lsblk->sort_id >= 0 && column_id_to_number(lsblk->sort_id) < 0)
-               errx(EXIT_FAILURE, _("the sort column has to be between output columns."));
+               errx(EXIT_FAILURE, _("the sort column has to be among the output columns"));
 
        mnt_init_debug(0);
        scols_init_debug(0);

diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c
index c619f64ccec2dfa957abdf114ef27bf1de58824e..0e06524b8c5837a63230dc047233c657c50c1d7c 100644 (file)
--- a/sys-utils/fallocate.c
+++ b/sys-utils/fallocate.c
@@ -340,7 +340,7 @@ int main(int argc, char **argv)
        }
 
        if (optind == argc)
-               errx(EXIT_FAILURE, _("no filename specified."));
+               errx(EXIT_FAILURE, _("no filename specified"));
 
        filename = argv[optind++];
 

diff --git a/sys-utils/fstrim.c b/sys-utils/fstrim.c
index 7634a5337e897716ae8c8433d7cd621d35e0b0ba..481a4cb0c24f4ebb9ae94a3cec02e05572f14630 100644 (file)
--- a/sys-utils/fstrim.c
+++ b/sys-utils/fstrim.c
@@ -315,7 +315,7 @@ int main(int argc, char **argv)
        else {
                rc = fstrim_filesystem(path, &range, verbose);
                if (rc == 1) {
-                       warnx(_("%s: discard operation not supported."), path);
+                       warnx(_("%s: the discard operation is not supported"), path);
                        rc = EXIT_FAILURE;
                }
        }

diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 5d32cc1a270642c9080dd49378bb9281029a45a6..3c30a5fef8f094be90536bace71c35a961b41a4e 100644 (file)
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -2478,6 +2478,6 @@ static void reload_agettys(void)
                    AGETTY_RELOAD_FILENAME);
 #else
        /* very unusual */
-       errx(EXIT_FAILURE, _("--reload unssupported on your system."));
+       errx(EXIT_FAILURE, _("--reload is unsupported on your system"));
 #endif
 }

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index ec9fecbec21c866fab75858da9085aea7d8821a3..50b593eb6e428ac0191b4d8df970e382307d2525 100644 (file)
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -194,7 +194,7 @@ int main(int argc, char **argv)
                argv += parse_args(argc, argv, hex);
        } else
                errx(EXIT_FAILURE, _("calling hexdump as od has been deprecated "
-                                    "in favour to GNU coreutils od."));
+                                    "in favor of GNU coreutils od"));
 
        /* figure out the data block size */
        hex->blocksize = 0;