Skip to content

Gettext issues #1663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alejandro-colomar wants to merge 3 commits into
base: master
Choose a base branch
from
+12 −12
Open

Gettext issues #1663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bca3e93
src/useradd.c: usage(): wfix
alejandro-colomar Jun 25, 2026
2ebe3e1
src/: usage(): tfix
alejandro-colomar Jun 25, 2026
019b6a1
src/: Simplify error strings
alejandro-colomar Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/groupmod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static void usage (int status)
(void) fputs (_(" -g, --gid GID change the group ID to GID\n"), usageout);
(void) fputs (_(" -h, --help display this help message and exit\n"), usageout);
(void) fputs (_(" -n, --new-name NEW_GROUP change the name to NEW_GROUP\n"), usageout);
(void) fputs (_(" -o, --non-unique allow to use a duplicate (non-unique) GID\n"), usageout);
(void) fputs (_(" -o, --non-unique allow using a duplicate (non-unique) GID\n"), usageout);
(void) fputs (_(" -p, --password PASSWORD change the password to this (encrypted)\n"
" PASSWORD\n"), usageout);
(void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout);
Expand Down
14 changes: 7 additions & 7 deletions src/useradd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ static void usage (int status)
(void) fputs (_(" -e, --expiredate EXPIRE_DATE expiration date of the new account\n"), usageout);
(void) fputs (_(" -f, --inactive INACTIVE password inactivity period of the new account\n"), usageout);
#ifdef ENABLE_SUBIDS
(void) fputs (_(" -F, --add-subids-for-system add entries to sub[ud]id even when adding a system user\n"), usageout);
(void) fputs (_(" -F, --add-subids-for-system add entries to sub[ug]id even when adding a system user\n"), usageout);
#endif
(void) fputs (_(" -g, --gid GROUP name or ID of the primary group of the new\n"
" account\n"), usageout);
Expand Down Expand Up @@ -2304,13 +2304,13 @@ static void create_home(const struct option_flags *flags)
}
if (chown(path, 0, 0) < 0) {
fprintf(stderr,
_("%s: warning: chown on `%s' failed: %m\n"),
Prog, path);
"%s: %s: chown(%s): %m\n",
Prog, _("warning"), path);
}
if (chmod(path, 0755) < 0) {
fprintf(stderr,
_("%s: warning: chmod on `%s' failed: %m\n"),
Prog, path);
"%s: %s: chmod(%s): %m\n",
Prog, _("warning"), path);
}
}
free(bhome);
Expand All @@ -2319,8 +2319,8 @@ static void create_home(const struct option_flags *flags)
mode = getdef_num("HOME_MODE",
0777 & ~getdef_num("UMASK", GETDEF_DEFAULT_UMASK));
if (chmod(prefix_user_home, mode)) {
fprintf(stderr, _("%s: warning: chown on '%s' failed: %m\n"),
Prog, path);
fprintf(stderr, "%s: %s: chown(%s): %m\n",
Prog, _("warning"), path);
}
home_added = true;
#ifdef WITH_AUDIT
Expand Down
2 changes: 1 addition & 1 deletion src/usermod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ usage (int status)
(void) fputs (_(" -V, --del-subuids FIRST-LAST remove range of subordinate uids\n"), usageout);
(void) fputs (_(" -w, --add-subgids FIRST-LAST add range of subordinate gids\n"), usageout);
(void) fputs (_(" -W, --del-subgids FIRST-LAST remove range of subordinate gids\n"), usageout);
(void) fputs (_(" -S, --add-subids add entries to sub[ud]id based on system defaults\n"), usageout);
(void) fputs (_(" -S, --add-subids add entries to sub[ug]id based on system defaults\n"), usageout);
#endif /* ENABLE_SUBIDS */
#ifdef WITH_SELINUX
(void) fputs (_(" -Z, --selinux-user SEUSER new SELinux user mapping for the user account\n"), usageout);
Expand Down
6 changes: 3 additions & 3 deletions src/vipw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,15 +314,15 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (bool))

status = system (buf);
if (-1 == status) {
fprintf(stderr, _("%s: %s: %s\n"), Prog, editor, strerrno());
fprintf(stderr, "%s: %s: %s\n", Prog, editor, strerrno());
exit (1);
} else if ( WIFEXITED (status)
&& (WEXITSTATUS (status) != 0)) {
fprintf (stderr, _("%s: %s returned with status %d\n"),
fprintf(stderr, "%s: %s: WEXITSTATUS(): %d\n",
Prog, editor, WEXITSTATUS (status));
exit (WEXITSTATUS (status));
} else if (WIFSIGNALED (status)) {
fprintf (stderr, _("%s: %s killed by signal %d\n"),
fprintf(stderr, "%s: %s: WTERMSIG(): %d\n",
Prog, editor, WTERMSIG (status));
exit (1);
} else {
Expand Down
Loading