textual: fix some typos and inconsistencies in usage and error messages

Reported-by: Petr Pisar <petr.pisar@atlas.cz>
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
(cherry picked from commit eeeb3dc9e662c8cf0383fb109bc5e7d2e2fa7a98)

diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c
index c6958a464f4e4d1108a46fdfc6b5fbf76e914361..d13d3d72072a4dc4918e08a69d8e103bfa91608b 100644 (file)
--- a/login-utils/lslogins.c
+++ b/login-utils/lslogins.c
@@ -1527,7 +1527,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("     --notruncate         don't truncate output\n"), out);
        fputs(_(" -o, --output[=<list>]    define the columns to output\n"), out);
        fputs(_("     --output-all         output all columns\n"), out);
-       fputs(_(" -p, --pwd                display information related to login by password.\n"), out);
+       fputs(_(" -p, --pwd                display information related to login by password\n"), out);
        fputs(_(" -r, --raw                display in raw mode\n"), out);
        fputs(_(" -s, --system-accs        display system accounts\n"), out);
        fputs(_("     --time-format=<type> display dates in short, full or iso format\n"), out);

diff --git a/lsfd-cmd/lsfd.c b/lsfd-cmd/lsfd.c
index 09503d0ab74979449f8e255b3c0684527cb89ae2..cf52c4aae76c77663d7e18ad630d94aca2ad7adb 100644 (file)
--- a/lsfd-cmd/lsfd.c
+++ b/lsfd-cmd/lsfd.c
@@ -430,7 +430,7 @@ static const struct colinfo infos[] = {
                                   N_("user of the process") },
        [COL_XMODE]            = { "XMODE",
                                   0,   SCOLS_FL_RIGHT, SCOLS_JSON_STRING,
-                                  N_("extended version of MDOE (rwxD[Ll]m)") },
+                                  N_("extended version of MODE (rwxD[Ll]m)") },
 };
 
 static const int default_columns[] = {

diff --git a/misc-utils/lastlog2.c b/misc-utils/lastlog2.c
index 4029f5e48edb1ed11ec5cac73f31a864ece416ac..2b8365b402c001f0daa94c1361326e6e0f516474 100644 (file)
--- a/misc-utils/lastlog2.c
+++ b/misc-utils/lastlog2.c
@@ -114,7 +114,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -i, --import FILE       Import data from old lastlog file\n"), output);
        fputs(_(" -r, --rename NEWNAME    Rename existing user to NEWNAME (requires -u)\n"), output);
        fputs(_(" -s, --service           Display PAM service\n"), output);
-       fputs(_(" -S, --set               ySet lastlog record to current time (requires -u)\n"), output);
+       fputs(_(" -S, --set               Set lastlog record to current time (requires -u)\n"), output);
        fputs(_(" -t, --time DAYS         Print only lastlog records more recent than DAYS\n"), output);
        fputs(_(" -u, --user LOGIN        Print lastlog record of the specified LOGIN\n"), output);
 

diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c
index 05784788cd3ba3287310619539c82fff91fa82b4..175ee3d2ac1f2ecb45b32f6bfb33b2eb9904b407 100644 (file)
--- a/misc-utils/lslocks.c
+++ b/misc-utils/lslocks.c
@@ -89,7 +89,7 @@ static struct colinfo infos[] = {
        [COL_END]  = { "END",    10, SCOLS_FL_RIGHT, N_("ending offset of the lock")},
        [COL_PATH] = { "PATH",    0, SCOLS_FL_TRUNC, N_("path of the locked file")},
        [COL_BLOCKER] = { "BLOCKER", 0, SCOLS_FL_RIGHT, N_("PID of the process blocking the lock") },
-       [COL_HOLDERS] = { "HOLDERS", 0, SCOLS_FL_WRAP, N_("HOLDERS of the lock") },
+       [COL_HOLDERS] = { "HOLDERS", 0, SCOLS_FL_WRAP, N_("holders of the lock") },
 };
 
 static int columns[ARRAY_SIZE(infos) * 2];

diff --git a/misc-utils/waitpid.c b/misc-utils/waitpid.c
index 0a4e03d16714136e895be9f40ee712046b5fddbd..4d77e1df44ee44809308c6679265184ef6176ae0 100644 (file)
--- a/misc-utils/waitpid.c
+++ b/misc-utils/waitpid.c
@@ -236,7 +236,7 @@ int main(int argc, char **argv)
 
        if (count && count > n_pids)
                errx(EXIT_FAILURE,
-                    _("can't want for %zu of %zu PIDs"), count, n_pids);
+                    _("can't wait for %zu of %zu PIDs"), count, n_pids);
 
        pid_t *pids = parse_pids(argc - pid_idx, argv + pid_idx);
 

diff --git a/sys-utils/irqtop.c b/sys-utils/irqtop.c
index 660e8131681c8c1cc7d9b4f5390c783f4c0628ef..877e2b83600e3f82d68f83e042d9f463e7fa2e5b 100644 (file)
--- a/sys-utils/irqtop.c
+++ b/sys-utils/irqtop.c
@@ -177,7 +177,7 @@ static int event_loop(struct irqtop_ctl *ctl, struct irq_output *out)
        efd = epoll_create1(0);
 
        if ((tfd = timerfd_create(CLOCK_MONOTONIC, 0)) < 0)
-               err(EXIT_FAILURE, _("cannot not create timerfd"));
+               err(EXIT_FAILURE, _("cannot create timerfd"));
        if (timerfd_settime(tfd, 0, &ctl->timer, NULL) != 0)
                err(EXIT_FAILURE, _("cannot set timerfd"));
 
@@ -197,7 +197,7 @@ static int event_loop(struct irqtop_ctl *ctl, struct irq_output *out)
        sigaddset(&sigmask, SIGQUIT);
 
        if ((sfd = signalfd(-1, &sigmask, SFD_CLOEXEC)) < 0)
-               err(EXIT_FAILURE, _("cannot not create signalfd"));
+               err(EXIT_FAILURE, _("cannot create signalfd"));
 
        ev.events = EPOLLIN;
        ev.data.fd = sfd;

diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c
index 890fa242727f7f727ae5cc9bed48ddd203cd5fd8..4b05431012d1e6e28d2a355567d4c0925c4bffeb 100644 (file)
--- a/sys-utils/setpriv.c
+++ b/sys-utils/setpriv.c
@@ -135,7 +135,7 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" --bounding-set <caps>       set capability bounding set\n"), out);
        fputs(_(" --ruid <uid|user>           set real uid\n"), out);
        fputs(_(" --euid <uid|user>           set effective uid\n"), out);
-       fputs(_(" --rgid <gid|user>           set real gid\n"), out);
+       fputs(_(" --rgid <gid|group>          set real gid\n"), out);
        fputs(_(" --egid <gid|group>          set effective gid\n"), out);
        fputs(_(" --reuid <uid|user>          set real and effective uid\n"), out);
        fputs(_(" --regid <gid|group>         set real and effective gid\n"), out);

diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index 6d461b6f1f8e4871927ba1bb52d28c80f084e276..e8049c4d86c13f163253526d9d6bda0f2019874c 100644 (file)
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -2464,12 +2464,12 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_(" -H, --host <hostname>      specify login host\n"), out);
        fputs(_(" -i, --noissue              do not display issue file\n"), out);
        fputs(_(" -I, --init-string <string> set init string\n"), out);
-       fputs(_(" -J  --noclear              do not clear the screen before prompt\n"), out);
+       fputs(_(" -J, --noclear              do not clear the screen before prompt\n"), out);
        fputs(_(" -l, --login-program <file> specify login program\n"), out);
        fputs(_(" -L, --local-line[=<mode>]  control the local line flag\n"), out);
        fputs(_(" -m, --extract-baud         extract baud rate during connect\n"), out);
        fputs(_(" -n, --skip-login           do not prompt for login\n"), out);
-       fputs(_(" -N  --nonewline            do not print a newline before issue\n"), out);
+       fputs(_(" -N, --nonewline            do not print a newline before issue\n"), out);
        fputs(_(" -o, --login-options <opts> options that are passed to login\n"), out);
        fputs(_(" -p, --login-pause          wait for any key before the login\n"), out);
        fputs(_(" -r, --chroot <dir>         change root to the directory\n"), out);