Standardising translation texts

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@929 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index bbed9541c39b2b5dbd0c21b84874bb9ab52e59cd..49794cc7c0552eeba1f565bee60dbffa7720cef9 100644 (file)
--- 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 43a38fa0c71ea39787a3311b02ba6f1ca4d07e66..39023f950b45e8db31d9c6b41a5925417d1d7b4e 100644 (file)
--- 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 8d3f4c80fd9afd278c8dbde68f6e40c3a55d7ee8..ec6bdf97820e68bbb24b116972de2f2aae944542 100644 (file)
--- 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 e13826446553254a56e17ed6a3746ed4867d5080..15d50feac2f98ea187344752695cf245c6d99ae7 100644 (file)
--- 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 d23b76d08ddcad1919687cdfefac56c0bf1ec535..6b323426ebee83c3eee22e7678ee33da5cd3eeb6 100644 (file)
--- 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 2c90e6db9f8ddece8204fadb13fcaa4d211fb4ec..dba43c5f4ddada1d187c98bbc8802e91ca0b4f5a 100644 (file)
--- 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 05e39d794eb55a0f7c58ad7b43c8dd0053545e6c..7cd17eea34c7f962ef22cdbcbadc190dc8f7c228 100644 (file)
--- 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 a43b993be87b171cac6e03d925abf4bafc724b1b..f6f347c40c83740d4995bf89410647226460db04 100644 (file)
--- 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 ddf298a2a0b4e1271e3406c5388b03bfe6d1993b..3016e1ad5c63fbd441a09527e47c1dd23a67779b 100644 (file)
--- 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 0de6718bb05a57a5522d0e07e32fbf48b1a6c559..1f8b3bd870fada9df4116ec21dcb05f0f1698369 100644 (file)
--- 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);