8 files changed, 13 insertions, 14 deletions

diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index d5bd3de4..d9fe26e5 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -73,7 +73,7 @@ main (int argc, char **argv)
 
         /* Set signal handling and alarm timeout */
         if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
-                usage4 (_("     Cannot catch SIGALRM"));
+                usage4 (_("Cannot catch SIGALRM"));
         }
         alarm (timeout_interval);
 
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 211c16c0..32bf2c48 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -318,7 +318,7 @@ print_help (void)
         printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
         printf (COPYRIGHT, copyright, email);
 
-        printf (_("Test the DNS service on the specified host using dig\n\n"));
+        printf (_("Test the DNS service on the specified host using dig\n"));
 
         print_usage ();
 
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 93bff453..f6cf5073 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -346,7 +346,7 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'p': /* Server port */
                         if (!is_intnonneg (optarg))
-                                usage2 (_("invalid port number"), optarg);
+                                usage2 (_("Invalid port number"), optarg);
                         else {
                                 server_port = atoi (optarg);
                                 specify_port = TRUE;
@@ -377,7 +377,7 @@ process_arguments (int argc, char **argv)
                 case 'l': /* linespan */
                 case 'r': /* linespan */
                 case 'R': /* linespan */
-                        usage (_("check_http: call for regex which was not a compiled option\n"));
+                        usage4 (_("Call for regex which was not a compiled option"));
                         break;
 #else
                 case 'l': /* linespan */
@@ -403,7 +403,7 @@ process_arguments (int argc, char **argv)
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage (_("IPv6 support not available\n"));
+                        usage4 (_("IPv6 support not available"));
 #endif
                         break;
                 case 'v': /* verbose */
@@ -446,7 +446,7 @@ process_arguments (int argc, char **argv)
 
         if (server_address == NULL) {
                 if (host_name == NULL)
-                        usage (_("check_http: you must specify a server address or host name\n"));
+                        usage4 (_("You must specify a server address or host name"));
                 else
                         server_address = strdup (host_name);
         }
@@ -1049,11 +1049,11 @@ redir (char *pos, char *status_line)
 
         addr = malloc (MAX_IPV4_HOSTLENGTH + 1);
         if (addr == NULL)
-                die (STATE_UNKNOWN, _("could not allocate addr\n"));
+                die (STATE_UNKNOWN, _("Could not allocate addr\n"));
         
         url = malloc (strcspn (pos, "\r\n"));
         if (url == NULL)
-                die (STATE_UNKNOWN, _("could not allocate url\n"));
+                die (STATE_UNKNOWN, _("Could not allocate url\n"));
 
         while (pos) {
 
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 41b7c870..9c89ef9e 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -643,7 +643,7 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 else if (check_warning_value==TRUE && dirty_cache_buffers <= warning_value)
                         result=STATE_WARNING;
-                asprintf (&output_message,_("dirty cache buffers = %lu%% of the total"),dirty_cache_buffers);
+                asprintf (&output_message,_("Dirty cache buffers = %lu%% of the total"),dirty_cache_buffers);
 
                 /* check % total cache buffers as a percentage of the original*/
         } else if (vars_to_check==TCB) {
@@ -658,7 +658,7 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 else if (check_warning_value==TRUE && total_cache_buffers <= warning_value)
                         result=STATE_WARNING;
-                asprintf (&output_message,_("total cache buffers = %lu%% of the original"),total_cache_buffers);
+                asprintf (&output_message,_("Total cache buffers = %lu%% of the original"),total_cache_buffers);
                 
         } else if (vars_to_check==DSVER) {
                 asprintf (&send_buffer,"S13\r\n");
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index a8e84e23..826a1057 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -256,7 +256,7 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'l':     /* login name */
                         if (!is_pg_logname (optarg))
-                                usage2 (_("user name is not valid"), optarg);
+                                usage2 (_("User name is not valid"), optarg);
                         else
                                 pguser = optarg;
                         break;
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index e3f5398b..132453d2 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -475,7 +475,7 @@ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr)
                         warn_text = strdup (_(WARN_DUPLICATES));
                 else if (! strstr (warn_text, _(WARN_DUPLICATES)) &&
                          asprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)
-                        die (STATE_UNKNOWN, _("unable to realloc warn_text"));
+                        die (STATE_UNKNOWN, _("Unable to realloc warn_text"));
                 return (STATE_WARNING);
         }
 
diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index 0cb732f9..5adf23c4 100644
--- a/plugins/check_udp.c
+++ b/plugins/check_udp.c
@@ -206,7 +206,7 @@ process_arguments (int argc, char **argv)
         }
 
         if (server_address == NULL)
-                usage (_("Host name was not supplied\n"));
+                usage4 (_("Hostname was not supplied"));
 
         if (server_send == NULL)
                 server_send = strdup("");
diff --git a/po/.cvsignore b/po/.cvsignore
index 4183dde5..68b874df 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -6,6 +6,5 @@ en@boldquot.header
 en@quot.header
 fr.gmo
 insert-header.sin
-nagios-plugins.pot
 quot.sed
 remove-potcdate.sin