diff options
| -rw-r--r-- | src/acl.c | 2 | ||||
| -rw-r--r-- | src/cmdline.opt | 2 | ||||
| -rw-r--r-- | src/pies.c | 7 | ||||
| -rw-r--r-- | src/piesctl.c | 4 | ||||
| -rw-r--r-- | src/progman.c | 2 |
5 files changed, 7 insertions, 10 deletions
@@ -746,13 +746,13 @@ pies_acl_install (pies_acl_t acl) } ret = grecs_symtab_lookup_or_install (acl_table, acl, &install); if (!ret) { - logmsg (LOG_ERR, _("cannot install acl: %s"), strerror (errno)); + logmsg (LOG_ERR, _("cannot install ACL: %s"), strerror (errno)); exit (1); } if (!install) { grecs_error (&acl->locus, 0, diff --git a/src/cmdline.opt b/src/cmdline.opt index e425518..f43d147 100644 --- a/src/cmdline.opt +++ b/src/cmdline.opt @@ -85,13 +85,13 @@ END OPTION(stderr,,, [<log to stderr>]) BEGIN log_to_stderr_only = 1; END -OPTION(syntax,,[<{pies|inetd|meta1}>], +OPTION(syntax,,[<{pies|meta1|inetd|inittab}>], [<expect configuration files in the given syntax>]) BEGIN if (str_to_config_syntax (optarg, ¤t_syntax)) { logmsg (LOG_ERR, _("unknown syntax type: %s"), optarg); exit (EX_USAGE); @@ -929,16 +929,13 @@ _cb_runlevels (enum grecs_callback_command cmd, *p = toupper (*p); return 0; } struct grecs_keyword component_keywords[] = { {"mode", - /* TRANSLATORS: The words between '{' and '}' are keywords, do not - translate them. */ - N_ - ("mode: {exec | wait | accept | inetd | nostartaccept | pass-fd | pass}"), + N_("mode"), N_("Component execution mode."), grecs_type_string, GRECS_DFLT, NULL, offsetof (struct component, mode), _cb_mode, }, {"program", @@ -1002,13 +999,13 @@ struct grecs_keyword component_keywords[] = { N_("Maximum number of simultaneous connections per IP address (inetd only)."), grecs_type_size, GRECS_DFLT, NULL, offsetof (struct component, max_ip_connections), NULL }, {"max-ip-connections-message", NULL, - N_("Text to send back if max-ip-connections-message is reached (inetd only)."), + N_("Text to send back if max-ip-connections is reached (inetd only)."), grecs_type_string, GRECS_DFLT, NULL, offsetof (struct component, max_ip_connections_message), NULL }, {"max-rate", NULL, diff --git a/src/piesctl.c b/src/piesctl.c index ff205d5..f799ff4 100644 --- a/src/piesctl.c +++ b/src/piesctl.c @@ -223,13 +223,12 @@ parse_config () } static void config_help (void) { static char docstring[] = - /* TRANSLATORS: do not translate words between ` and ' */ N_("Configuration file structure for piesctl.\n" "For more information, use `info piesctl configuration'."); grecs_print_docstring (docstring, 0, stdout); grecs_print_statement_array (piesctl_keywords, 1, 0, stdout); } @@ -504,13 +503,13 @@ shttp_connect (struct pies_url *url, struct grecs_sockaddr *source_addr) return NULL; } fd = socket (addr.s.sa_family, SOCK_STREAM, 0); if (fd == -1) { - grecs_error (NULL, 0, _("%s: unable to create new socket: %s"), + grecs_error (NULL, 0, _("%s: unable to create socket: %s"), url->string, strerror(errno)); return NULL; } if ((flags = fcntl (fd, F_GETFD, 0)) == -1 || fcntl (fd, F_SETFD, flags | FD_CLOEXEC) == -1) @@ -673,12 +672,13 @@ shttp_request_send (struct shttp_connection *conn, int method, char const *uri) if (conn->req.content_length) { size_t s = fwrite (conn->req.content, 1, conn->req.content_length, conn->fp); if (s != conn->req.content_length) { + //FIXME: ngettext grecs_error (NULL, 0, _("wrote %lu of %lu bytes of content"), (unsigned long) s, conn->req.content_length); exit (EX_UNAVAILABLE); } } } diff --git a/src/progman.c b/src/progman.c index 81b97ff..0079149 100644 --- a/src/progman.c +++ b/src/progman.c @@ -560,13 +560,13 @@ conn_class_lookup (const char *tag, break; case AF_UNIX: break; default: - logmsg (LOG_ERR, _("unexpected socket family: %d"), + logmsg (LOG_ERR, _("unexpected address family: %d"), probe->sa_storage.s.sa_family); break; } probe->count = 0; if (!conn_tab) |