[Nagiosplug-checkins] nagiosplug/plugins check_hpjd.c,1.18,1.19 check_mrtg.c,1.12,1.13 check_mrtgtraf.c,1.12,1.13 check_mysql.c,1.13,1.14 check_real.c,1.12,1.13 check_smtp.c,1.27,1.28 check_swap.c,1.31,1.32 check_time.c,1.12,1.13 check_dns.c,1.27,1.28 check_by_ssh.c,1.20,1.21

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2816

Modified Files:
	check_hpjd.c check_mrtg.c check_mrtgtraf.c check_mysql.c 
	check_real.c check_smtp.c check_swap.c check_time.c 
	check_dns.c check_by_ssh.c 
Log Message:
Standardising translation texts


Index: check_mrtg.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtg.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- check_mrtg.c	12 Nov 2003 05:48:09 -0000	1.12
+++ check_mrtg.c	23 Nov 2004 23:53:15 -0000	1.13
@@ -58,7 +58,7 @@
 	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");

Index: check_time.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_time.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- check_time.c	19 Nov 2003 06:24:08 -0000	1.12
+++ check_time.c	23 Nov 2004 23:53:17 -0000	1.13
@@ -61,7 +61,7 @@
 	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);

Index: check_smtp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_smtp.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- check_smtp.c	19 Nov 2004 02:39:25 -0000	1.27
+++ check_smtp.c	23 Nov 2004 23:53:16 -0000	1.28
@@ -90,7 +90,7 @@
 	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

Index: check_hpjd.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_hpjd.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- check_hpjd.c	24 Nov 2003 14:53:46 -0000	1.18
+++ check_hpjd.c	23 Nov 2004 23:53:13 -0000	1.19
@@ -84,7 +84,7 @@
 	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 */

Index: check_real.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_real.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- check_real.c	22 Aug 2003 06:22:38 -0000	1.12
+++ check_real.c	23 Nov 2004 23:53:16 -0000	1.13
@@ -66,7 +66,7 @@
 	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);

Index: check_mysql.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mysql.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- check_mysql.c	21 Nov 2004 05:24:57 -0000	1.13
+++ check_mysql.c	23 Nov 2004 23:53:16 -0000	1.14
@@ -54,7 +54,7 @@
 	textdomain (PACKAGE);
 
 	if (process_arguments (argc, argv) != OK)
-		usage (_("Invalid command arguments supplied\n"));
+		usage (_("Incorrect arguments supplied\n"));
 
 	/* initialize mysql  */
 	mysql_init (&mysql);

Index: check_mrtgtraf.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_mrtgtraf.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- check_mrtgtraf.c	14 Mar 2004 04:09:19 -0000	1.12
+++ check_mrtgtraf.c	23 Nov 2004 23:53:15 -0000	1.13
@@ -64,7 +64,7 @@
 	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");

Index: check_by_ssh.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_by_ssh.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- check_by_ssh.c	2 Apr 2004 19:37:03 -0000	1.20
+++ check_by_ssh.c	23 Nov 2004 23:53:17 -0000	1.21
@@ -86,7 +86,7 @@
 	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 @@
 				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 @@
 			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 */

Index: check_dns.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_dns.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- check_dns.c	4 Mar 2004 05:08:43 -0000	1.27
+++ check_dns.c	23 Nov 2004 23:53:17 -0000	1.28
@@ -195,7 +195,7 @@
 		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 @@
 
 	/* 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 @@
 
 	/* 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") ||

Index: check_swap.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_swap.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- check_swap.c	23 Aug 2004 21:18:12 -0000	1.31
+++ check_swap.c	23 Nov 2004 23:53:16 -0000	1.32
@@ -90,7 +90,7 @@
 	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");