[PATCH 08/14] textual: give seven error messages the same form as two others
Benno Schulenberg <[email protected]>
| Newsgroups | org.kernel.vger.util-linux |
|---|---|
| Message-ID | <[email protected]> |
The form with the parentheses is easier for translators: it indicates that the preceding text is not a translatable word. Signed-off-by: Benno Schulenberg <[email protected]> --- login-utils/newgrp.c | 6 +++--- sys-utils/nsenter.c | 4 ++-- sys-utils/unshare.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/login-utils/newgrp.c b/login-utils/newgrp.c index b9b620ed7..ba3777b36 100644 --- a/login-utils/newgrp.c +++ b/login-utils/newgrp.c @@ -219,7 +219,7 @@ int main(int argc, char *argv[]) if (argc <= optind) { if (setgid(pw_entry->pw_gid) < 0) - err(EXIT_FAILURE, _("setgid failed")); + err(EXIT_FAILURE, _("setgid() failed")); } else { errno = 0; if (!(gr_entry = getgrnam(argv[optind++]))) { @@ -231,11 +231,11 @@ int main(int argc, char *argv[]) if (!allow_setgid(pw_entry, gr_entry)) errx(EXIT_FAILURE, _("permission denied")); if (setgid(gr_entry->gr_gid) < 0) - err(EXIT_FAILURE, _("setgid failed")); + err(EXIT_FAILURE, _("setgid() failed")); } if (setuid(getuid()) < 0) - err(EXIT_FAILURE, _("setuid failed")); + err(EXIT_FAILURE, _("setuid() failed")); fflush(NULL); shell = (pw_entry->pw_shell && *pw_entry->pw_shell ? diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c index 66ce4b324..214893d1a 100644 --- a/sys-utils/nsenter.c +++ b/sys-utils/nsenter.c @@ -836,9 +836,9 @@ int main(int argc, char *argv[]) if (force_gid && setgroups(0, NULL) != 0 && setgroups_nerrs) /* drop supplementary groups */ err(EXIT_FAILURE, _("setgroups failed")); if (force_gid && setgid(gid) < 0) /* change GID */ - err(EXIT_FAILURE, _("setgid failed")); + err(EXIT_FAILURE, _("setgid() failed")); if (force_uid && setuid(uid) < 0) /* change UID */ - err(EXIT_FAILURE, _("setuid failed")); + err(EXIT_FAILURE, _("setuid() failed")); } if (keepcaps && (namespaces & CLONE_NEWUSER)) diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c index 4d078e4d5..b6c2f8b45 100644 --- a/sys-utils/unshare.c +++ b/sys-utils/unshare.c @@ -1270,10 +1270,10 @@ int main(int argc, char *argv[]) if (setgroups(0, NULL) != 0) /* drop supplementary groups */ err(EXIT_FAILURE, _("setgroups failed")); if (setgid(gid) < 0) /* change GID */ - err(EXIT_FAILURE, _("setgid failed")); + err(EXIT_FAILURE, _("setgid() failed")); } if (force_uid && setuid(uid) < 0) /* change UID */ - err(EXIT_FAILURE, _("setuid failed")); + err(EXIT_FAILURE, _("setuid() failed")); if (keepcaps && (unshare_flags & CLONE_NEWUSER)) cap_permitted_to_ambient(); -- 2.48.1