Minor changes in message wording

5 files changed, 7 insertions, 10 deletions

diff --git a/src/acl.c b/src/acl.c
index 412f3ac..a96eb77 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -749,7 +749,7 @@ pies_acl_install (pies_acl_t acl)
 
   if (!ret)
     {
-      logmsg (LOG_ERR, _("cannot install acl: %s"), strerror (errno));
+      logmsg (LOG_ERR, _("cannot install ACL: %s"), strerror (errno));
       exit (1);
     }
   
diff --git a/src/cmdline.opt b/src/cmdline.opt
index e425518..f43d147 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -88,7 +88,7 @@ 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, &current_syntax))
diff --git a/src/pies.c b/src/pies.c
index 9ca7827..4a9ac9e 100644
--- a/src/pies.c
+++ b/src/pies.c
@@ -932,10 +932,7 @@ _cb_runlevels (enum grecs_callback_command cmd,
 
 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),
@@ -1005,7 +1002,7 @@ struct grecs_keyword component_keywords[] = {
    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 },
diff --git a/src/piesctl.c b/src/piesctl.c
index ff205d5..f799ff4 100644
--- a/src/piesctl.c
+++ b/src/piesctl.c
@@ -226,7 +226,6 @@ 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);
@@ -507,7 +506,7 @@ shttp_connect (struct pies_url *url, struct grecs_sockaddr *source_addr)
   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;
     }
@@ -676,6 +675,7 @@ shttp_request_send (struct shttp_connection *conn, int method, char const *uri)
 			 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
@@ -563,7 +563,7 @@ conn_class_lookup (const char *tag,
       break;
 
     default:
-      logmsg (LOG_ERR, _("unexpected socket family: %d"),
+      logmsg (LOG_ERR, _("unexpected address family: %d"),
 	      probe->sa_storage.s.sa_family);
       break;
     }