10 files changed, 17 insertions, 17 deletions

diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index bbed9541..49794cc7 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -86,7 +86,7 @@ main (int argc, char **argv)
         child_process = spopen (comm);
 
         if (child_process == NULL) {
-                printf (_("Unable to open pipe: %s"), comm);
+                printf (_("Could not open pipe: %s\n"), comm);
                 return STATE_UNKNOWN;
         }
 
@@ -145,7 +145,7 @@ main (int argc, char **argv)
                                 eol[0] = 0;
                         if (service[commands] && status_text
                                         && sscanf (status_text, "STATUS CODE: %d", &cresult) == 1) {
-                                fprintf (fp, _("[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n"),
+                                fprintf (fp, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n",
                                                                  (int) local_time, host_shortname, service[commands++], cresult,
                                                                  output);
                         }
@@ -232,13 +232,13 @@ process_arguments (int argc, char **argv)
                         break;
                 case 't':                                                                       /* timeout period */
                         if (!is_integer (optarg))
-                                usage2 (_("timeout interval must be an integer"), optarg);
+                                usage2 (_("Timeout interval must be a positive integer"), optarg);
                         else
                                 timeout_interval = atoi (optarg);
                         break;
                 case 'H':                                                                       /* host */
                         if (!is_host (optarg))
-                                usage2 (_("invalid host name"), optarg);
+                                usage2 (_("Invalid host name"), optarg);
                         hostname = optarg;
                         break;
                 case 'p': /* port number */
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 43a38fa0..39023f95 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -195,7 +195,7 @@ main (int argc, char **argv)
                 else
                         multi_address = TRUE;
 
-                printf ("%s %s: ", _("DNS"), _("OK"));
+                printf ("DNS %s: ", _("OK"));
                 printf (ngettext("%.3f second response time, ", "%.3f seconds response time, ", elapsed_time), elapsed_time);
                 printf (_("%s returns %s"), query_address, address);
                 printf ("|%s\n", fperfdata ("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
@@ -225,18 +225,18 @@ error_scan (char *input_buffer)
 
         /* DNS server is not running... */
         else if (strstr (input_buffer, "No response from server"))
-                die (STATE_CRITICAL, _("No response from name server %s\n"), dns_server);
+                die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
 
         /* Host name is valid, but server doesn't have records... */
         else if (strstr (input_buffer, "No records"))
-                die (STATE_CRITICAL, _("Name server %s has no records\n"), dns_server);
+                die (STATE_CRITICAL, _("DNS %s has no records\n"), dns_server);
 
         /* Connection was refused */
         else if (strstr (input_buffer, "Connection refused") ||
                  strstr (input_buffer, "Refused") ||
                  (strstr (input_buffer, "** server can't find") &&
                   strstr (input_buffer, ": REFUSED")))
-                die (STATE_CRITICAL, _("Connection to name server %s was refused\n"), dns_server);
+                die (STATE_CRITICAL, _("Connection to DNS %s was refused\n"), dns_server);
 
         /* Host or domain name does not exist */
         else if (strstr (input_buffer, "Non-existent") ||
@@ -250,7 +250,7 @@ error_scan (char *input_buffer)
 
         /* Internal server failure */
         else if (strstr (input_buffer, "Server failure"))
-                die (STATE_CRITICAL, _("Server failure for %s\n"), dns_server);
+                die (STATE_CRITICAL, _("DNS failure for %s\n"), dns_server);
 
         /* Request error or the DNS lookup timed out */
         else if (strstr (input_buffer, "Format error") ||
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 8d3f4c80..ec6bdf97 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -84,7 +84,7 @@ main (int argc, char **argv)
         textdomain (PACKAGE);
 
         if (process_arguments (argc, argv) != OK)
-                usage (_("Invalid command arguments supplied\n"));
+                usage (_("Incorrect arguments supplied\n"));
 
         /* removed ' 2>1' at end of command 10/27/1999 - EG */
         /* create the query string */
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index e1382644..15d50fea 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -58,7 +58,7 @@ main (int argc, char **argv)
         textdomain (PACKAGE);
 
         if (process_arguments (argc, argv) != OK)
-                usage (_("Invalid command arguments supplied\n"));
+                usage (_("Incorrect arguments supplied\n"));
 
         /* open the MRTG log file for reading */
         fp = fopen (log_file, "r");
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index d23b76d0..6b323426 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -64,7 +64,7 @@ main (int argc, char **argv)
         char outgoing_speed_rating[8];
 
         if (process_arguments (argc, argv) != OK)
-                usage (_("Invalid command arguments supplied\n"));
+                usage (_("Incorrect arguments supplied\n"));
 
         /* open the MRTG log file for reading */
         fp = fopen (log_file, "r");
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 2c90e6db..dba43c5f 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -54,7 +54,7 @@ main (int argc, char **argv)
         textdomain (PACKAGE);
 
         if (process_arguments (argc, argv) != OK)
-                usage (_("Invalid command arguments supplied\n"));
+                usage (_("Incorrect arguments supplied\n"));
 
         /* initialize mysql  */
         mysql_init (&mysql);
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 05e39d79..7cd17eea 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -66,7 +66,7 @@ main (int argc, char **argv)
         textdomain (PACKAGE);
 
         if (process_arguments (argc, argv) != OK)
-                usage (_("Invalid command arguments supplied\n"));
+                usage (_("Incorrect arguments supplied\n"));
 
         /* initialize alarm signal handling */
         signal (SIGALRM, socket_timeout_alarm_handler);
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index a43b993b..f6f347c4 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -90,7 +90,7 @@ main (int argc, char **argv)
         textdomain (PACKAGE);
 
         if (process_arguments (argc, argv) != OK)
-                usage (_("Invalid command arguments supplied\n"));
+                usage (_("Incorrect arguments supplied\n"));
 
         /* initialize the HELO command with the localhostname */
 #ifndef HOST_MAX_BYTES
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index ddf298a2..3016e1ad 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -90,7 +90,7 @@ main (int argc, char **argv)
         perf = strdup ("");
 
         if (process_arguments (argc, argv) != OK)
-                usage (_("Invalid command arguments supplied\n"));
+                usage (_("Incorrect arguments supplied\n"));
 
 #ifdef HAVE_PROC_MEMINFO
         fp = fopen (PROC_MEMINFO, "r");
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 0de6718b..1f8b3bd8 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -61,7 +61,7 @@ main (int argc, char **argv)
         textdomain (PACKAGE);
 
         if (process_arguments (argc, argv) != OK)
-                usage (_("Invalid command arguments supplied\n"));
+                usage (_("Incorrect arguments supplied\n"));
 
         /* initialize alarm signal handling */
         signal (SIGALRM, socket_timeout_alarm_handler);