various fixes for localization

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

41 files changed, 2768 insertions, 1550 deletions

diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index a44d5786..c6078965 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -81,9 +81,9 @@ main (int argc, char **argv)
 	if (verbose) {
 		printf ("%s\n", command_line);
 		if(expected_address != NULL) {
-			printf ("Looking for: '%s'\n", expected_address);
+			printf (_("Looking for: '%s'\n"), expected_address);
 		} else {
-			printf ("Looking for: '%s'\n", query_address);
+			printf (_("Looking for: '%s'\n"), query_address);
 		}
 	}
 
@@ -214,9 +214,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 669a1cd6..ab9f66f8 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -438,9 +438,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
@@ -488,7 +486,7 @@ print_path (const char *mypath)
 	if (mypath == NULL)
 		printf ("\n");
 	else
-		printf (" for %s\n", mypath);
+		printf (_(" for %s\n"), mypath);
 
 	return;
 }
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 20cb6dd8..e6483b9c 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -135,7 +135,7 @@ main (int argc, char **argv)
 				asprintf(&address, "%s,%s", address, temp_buffer);
 		}
 
-		else if (strstr (input_buffer, "Non-authoritative answer:")) {
+		else if (strstr (input_buffer, _("Non-authoritative answer:"))) {
 			non_authoritative = TRUE;
 		}
 
@@ -277,7 +277,6 @@ error_scan (char *input_buffer)
 }
 
 
-
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -313,9 +312,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?': /* args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h': /* help */
 			print_help ();
 			exit (STATE_OK);
@@ -386,7 +383,6 @@ process_arguments (int argc, char **argv)
 }
 
 
-
 int
 validate_arguments ()
 {
@@ -397,7 +393,6 @@ validate_arguments ()
 }
 
 
-
 void
 print_help (void)
 {
@@ -432,7 +427,6 @@ specified in /etc/resolv.conf will be used.\n\n"));
 }
 
 
-
 void
 print_usage (void)
 {
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 2dbbaec8..08926115 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -30,7 +30,6 @@ void print_help (void);
 void print_usage (void);
 
 
-
 int
 main (int argc, char **argv)
 {
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 7f05d4d5..5ffcd16e 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -242,9 +242,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* print short usage statement if args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
@@ -301,15 +299,13 @@ process_arguments (int argc, char **argv)
 		}
 	}
 
-
 	if (server_name == NULL)
-		usage (_("Hostname was not supplied\n\n"));
+		usage4 (_("Hostname was not supplied"));
 
 	return OK;
 }
 
 
-
 int
 get_threshold (char *arg, char *rv[2])
 {
@@ -351,7 +347,6 @@ get_threshold (char *arg, char *rv[2])
 }
 
 
-
 void
 print_help (void)
 {
@@ -395,7 +390,6 @@ percentage of packet loss to trigger an alarm state.\n"));
 }
 
 
-
 void
 print_usage (void)
 {
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 6699c71d..05b363af 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -123,15 +123,15 @@ main (int argc, char **argv)
 	}
 
 	if (strstr (ret[2], QSTAT_HOST_ERROR)) {
-		printf ("CRITICAL - Host not found\n");
+		printf (_("CRITICAL - Host not found\n"));
 		result = STATE_CRITICAL;
 	}
 	else if (strstr (ret[2], QSTAT_HOST_DOWN)) {
-		printf ("CRITICAL - Game server down or unavailable\n");
+		printf (_("CRITICAL - Game server down or unavailable\n"));
 		result = STATE_CRITICAL;
 	}
 	else if (strstr (ret[2], QSTAT_HOST_TIMEOUT)) {
-		printf ("CRITICAL - Game server timeout\n");
+		printf (_("CRITICAL - Game server timeout\n"));
 		result = STATE_CRITICAL;
 	}
 	else {
@@ -156,7 +156,6 @@ main (int argc, char **argv)
 }
 
 
-
 int
 process_arguments (int argc, char **argv)
 {
@@ -199,9 +198,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?': /* args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h': /* help */
 			print_help ();
 			exit (STATE_OK);
@@ -269,6 +266,7 @@ process_arguments (int argc, char **argv)
 	return validate_arguments ();
 }
 
+
 int
 validate_arguments (void)
 {
@@ -291,9 +289,6 @@ validate_arguments (void)
 }
 
 
-
-
-
 void
 print_help (void)
 {
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 53769565..dd49893b 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -286,7 +286,6 @@ main (int argc, char **argv)
 }
 
 
-
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -334,9 +333,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
@@ -361,7 +358,6 @@ process_arguments (int argc, char **argv)
 }
 
 
-
 int
 validate_arguments (void)
 {
@@ -369,7 +365,6 @@ validate_arguments (void)
 }
 
 
-
 void
 print_help (void)
 {
diff --git a/plugins/check_icmp.c b/plugins/check_icmp.c
index cbd68642..45716824 100644
--- a/plugins/check_icmp.c
+++ b/plugins/check_icmp.c
@@ -310,19 +310,19 @@ int main(int argc, char **argv)
 	
 	/* check if we are root */
 	if(geteuid()) {
-		printf("Root access needed (for raw sockets)\n");
+		printf(_("Root access needed (for raw sockets)\n"));
 		exit(STATE_UNKNOWN);
 	}
 
 	/* confirm that ICMP is available on this machine */
 	if((proto = getprotobyname("icmp")) == NULL)
-		crash("icmp: unknown protocol");
+		crash(_("icmp: unknown protocol"));
 
 	/* create raw socket for ICMP calls (ping) */
 	sock = socket(AF_INET, SOCK_RAW, proto->p_proto);
 
 	if(sock < 0)
-		crash("can't create raw socket");
+		crash(_("Can't create raw socket"));
 
 	/* drop privileges now that we have the socket */
 	if((uid = getuid())) {
@@ -334,7 +334,7 @@ int main(int argc, char **argv)
 	ident = getpid() & 0xFFFF;
 
 	if(!(host_base_ptr = malloc(sizeof(struct host_name_list)))) {
-		crash("Unable to allocate memory for host name list\n");
+		crash(_("Unable to allocate memory for host name list\n"));
 	}
 	host_ptr = host_base_ptr;
 
@@ -359,12 +359,12 @@ int main(int argc, char **argv)
 		switch (c) {
 			case 'H':
 				if(!(host_ptr->entry = malloc(strlen(optarg) + 1))) {
-					crash("Failed to allocate memory for hostname");
+					crash(_("Failed to allocate memory for hostname"));
 				}
 				memset(host_ptr->entry, 0, strlen(optarg) + 1);
 				host_ptr->entry = memcpy(host_ptr->entry, optarg, strlen(optarg));
 				if(!(host_ptr->next = malloc(sizeof(struct host_name_list))))
-					crash("Failed to allocate memory for hostname");
+					crash(_("Failed to allocate memory for hostname"));
 				host_ptr = host_ptr->next;
 				host_ptr->next = NULL;
 //				add_name(optarg);
@@ -375,35 +375,35 @@ int main(int argc, char **argv)
 				break;
 			case 'w':
 				if(get_threshold(optarg, &warn)) {
-					printf("Illegal threshold pair specified for -%c", c);
+					printf(_("Illegal threshold pair specified for -%c"), c);
 					print_usage();
 				}
 				break;
 
 			case 'c':
 				if(get_threshold(optarg, &crit)) {
-					printf("Illegal threshold pair specified for -%c", c);
+					printf(_("Illegal threshold pair specified for -%c"), c);
 					print_usage();
 				}
 				break;
 
 			case 't':
 				if(!(timeout = (u_int) strtoul(optarg, NULL, 0) * 100)) {
-					printf("option -%c requires integer argument\n", c);
+					printf(_("Option -%c requires integer argument\n"), c);
 					print_usage();
 				}
 				break;
 
 			case 'r':
 				if(!(retry = (u_int) strtoul(optarg, NULL, 0))) {
-					printf("option -%c requires integer argument\n", c);
+					printf(_("Option -%c requires integer argument\n"), c);
 					print_usage();
 				}
 				break;
 
 			case 'i':
 				if(!(interval = (u_int) strtoul(optarg, NULL, 0) * 100)) {
-					printf("option -%c requires positive non-zero integer argument\n", c);
+					printf(_("Option -%c requires positive non-zero integer argument\n"), c);
 					print_usage();
 				}
 				break;
@@ -411,14 +411,14 @@ int main(int argc, char **argv)
 			case 'p':
 			case 'n':
 				if(!(count = (u_int) strtoul(optarg, NULL, 0))) {
-					printf("option -%c requires positive non-zero integer argument\n", c);
+					printf(_("Option -%c requires positive non-zero integer argument\n"), c);
 					print_usage();
 				}
 				break;
 
 			case 'b':
 				if(!(ping_data_size = (u_int) strtoul(optarg, NULL, 0))) {
-					printf("option -%c requires integer argument\n", c);
+					printf(_("Option -%c requires integer argument\n"), c);
 					print_usage();
 				}
 				break;
@@ -467,7 +467,7 @@ int main(int argc, char **argv)
 				break;
 
 			default:
-				printf("option flag -%c specified, but not recognized\n", c);
+				printf(_("Option flag -%c specified, but not recognized\n"), c);
 				print_usage();
 				break;
 		}
@@ -494,30 +494,30 @@ int main(int argc, char **argv)
 	else if(timeout < warn.rta) timeout = warn.rta;
 
 	if((interval < MIN_INTERVAL * 100 || retry > MAX_RETRY) && getuid()) {
-		printf("%s: these options are too risky for mere mortals.\n", prog);
-		printf("%s: You need i >= %u and r < %u\n",
+		printf(_("%s: these options are too risky for mere mortals.\n"), prog);
+		printf(_("%s: You need i >= %u and r < %u\n"),
 				prog, MIN_INTERVAL, MAX_RETRY);
-		printf("Current settings; i = %d, r = %d\n",
+		printf(_("Current settings; i = %d, r = %d\n"),
 			   interval / 100, retry);
 		print_usage();
 	}
 
 	if((ping_data_size > MAX_PING_DATA) || (ping_data_size < MIN_PING_DATA)) {
-		printf("%s: data size %u not valid, must be between %u and %u\n",
+		printf(_("%s: data size %u not valid, must be between %u and %u\n"),
 				prog, ping_data_size, MIN_PING_DATA, MAX_PING_DATA);
 		print_usage();
 
 	}
 
 	if((backoff > MAX_BACKOFF_FACTOR) || (backoff < MIN_BACKOFF_FACTOR)) {
-		printf("%s: backoff factor %.1f not valid, must be between %.1f and %.1f\n",
+		printf(_("%s: backoff factor %.1f not valid, must be between %.1f and %.1f\n"),
 				prog, backoff, MIN_BACKOFF_FACTOR, MAX_BACKOFF_FACTOR);
 		print_usage();
 
 	}
 
 	if(count > MAX_COUNT) {
-		printf("%s: count %u not valid, must be less than %u\n",
+		printf(_("%s: count %u not valid, must be less than %u\n"),
 				prog, count, MAX_COUNT);
 		print_usage();
 	}
@@ -536,19 +536,19 @@ int main(int argc, char **argv)
 
 	/* generate requires command line parameters beyond the switches */
 	if(generate_flag && !*argv) {
-		printf("generate flag requires command line parameters beyond switches\n");
+		printf(_("Generate flag requires command line parameters beyond switches\n"));
 		print_usage();
 	}
 
 	if(*argv && !generate_flag) {
 		while(*argv) {
 			if(!(host_ptr->entry = malloc(strlen(*argv) + 1))) {
-				crash("Failed to allocate memory for hostname");
+				crash(_("Failed to allocate memory for hostname"));
 			}
 			memset(host_ptr->entry, 0, strlen(*argv) + 1);
 			host_ptr->entry = memcpy(host_ptr->entry, *argv, strlen(*argv));
 			if(!(host_ptr->next = malloc(sizeof(struct host_name_list))))
-				crash("Failed to allocate memory for hostname");
+				crash(_("Failed to allocate memory for hostname"));
 			host_ptr = host_ptr->next;
 			host_ptr->next = NULL;
 
@@ -565,13 +565,13 @@ int main(int argc, char **argv)
 	}
 
 	if(!num_hosts) {
-		printf("No hosts to work with!\n\n");
+		printf(_("No hosts to work with!\n\n"));
 		print_usage();
 	}
 
 	/* allocate array to hold outstanding ping requests */
 	table = (HOST_ENTRY **) malloc(sizeof(HOST_ENTRY *) * num_hosts);
-	if(!table) crash("Can't malloc array of hosts");
+	if(!table) crash(_("Can't malloc array of hosts"));
 
 	cursor = rrlist;
 
@@ -703,7 +703,7 @@ void finish()
 					   warn.pl, crit.pl);
 			}
 			else {
-				printf("%s is down (lost 100%%)", h->host);
+				printf(_("%s is down (lost 100%%)"), h->host);
 			}
 		}
 		else {
@@ -754,7 +754,7 @@ void finish()
 	}
 
 	if(num_noaddress) {
-		printf("No hostaddress specified.\n");
+		printf(_("No hostaddress specified.\n"));
 		print_usage();
 	}
 	else if(num_alive != num_hosts) {
@@ -765,10 +765,10 @@ void finish()
 
 	if(num_hosts > 1) {
 		if(num_alive == num_hosts) {
-			printf("OK - All %d hosts are alive\n", num_hosts);
+			printf(_("OK - All %d hosts are alive\n"), num_hosts);
 		}
 		else {
-			printf("CRITICAL - %d of %d hosts are alive\n", num_alive, num_hosts);
+			printf(_("CRITICAL - %d of %d hosts are alive\n"), num_alive, num_hosts);
 		}
 	}
 	exit(fin_stat);
@@ -784,7 +784,7 @@ void send_ping(int lsock, HOST_ENTRY *h)
 
 	buffer = (char *)malloc((size_t) ping_pkt_size);
 	if(!buffer)
-		crash("can't malloc ping packet");
+		crash(_("Can't malloc ping packet"));
 
 	memset(buffer, 0, ping_pkt_size * sizeof(char));
 	icp = (struct icmp *)buffer;
@@ -808,7 +808,7 @@ void send_ping(int lsock, HOST_ENTRY *h)
 
 	if(n < 0 || (unsigned int)n != ping_pkt_size) {
 		if(unreachable_flag) {
-			printf("%s error while sending ping: %s\n",
+			printf(_("%s error while sending ping: %s\n"),
 				   h->host, strerror(errno));
 		}			/* IF */
 
@@ -860,7 +860,7 @@ int wait_for_reply(int lsock)
 #endif /* defined(__alpha__) && __STDC__ */
 
 	if(result < hlen + ICMP_MINLEN) {
-		printf("received packet too short for ICMP (%d bytes from %s)\n", result,
+		printf(_("Received packet too short for ICMP (%d bytes from %s)\n"), result,
 			   inet_ntoa(response_addr.sin_addr));
 
 		return (1);				/* too short */
@@ -903,7 +903,7 @@ int wait_for_reply(int lsock)
 	/* note reply time in array, probably */
 	if((this_count >= 0) && ((unsigned int)this_count < trials)) {
 		if(h->resp_times[this_count] != RESP_WAITING) {
-			printf("%s : duplicate for [%d], %d bytes, %s ms",
+			printf(_("%s : duplicate for [%d], %d bytes, %s ms"),
 				   h->host, this_count, result, sprint_tm(this_reply));
 
 			if(response_addr.sin_addr.s_addr != h->saddr.sin_addr.s_addr)
@@ -913,7 +913,7 @@ int wait_for_reply(int lsock)
 	}						/* IF */
 	else {
 		/* count is out of bounds?? */
-		printf("%s : duplicate for [%d], %d bytes, %s ms\n",
+		printf(_("%s : duplicate for [%d], %d bytes, %s ms\n"),
 			   h->host, this_count, result, sprint_tm(this_reply));
 		}						/* ELSE */
 	
@@ -942,12 +942,12 @@ int handle_random_icmp(struct icmp *p, struct sockaddr_in *addr)
 			h = table[sent_icmp->icmp_seq];
 
 			if(p->icmp_code > ICMP_UNREACH_MAXTYPE) {
-				printf("ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s",
+				printf(_("ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s"),
 						inet_ntoa(addr->sin_addr), h->host);
 
 			}					/* IF */
 			else {
-				printf("ICMP Unreachable from %s for ICMP Echo sent to %s",
+				printf(_("ICMP Unreachable from %s for ICMP Echo sent to %s"),
 					   inet_ntoa(addr->sin_addr), h->host);
 
 			}					/* ELSE */
@@ -971,7 +971,7 @@ int handle_random_icmp(struct icmp *p, struct sockaddr_in *addr)
 		   (sent_icmp->icmp_seq < (n_short) num_hosts)) {
 			/* this is a response to a ping we sent */
 			h = table[sent_icmp->icmp_seq];
-			printf("ICMP Unreachable from %s for ICMP Echo sent to %s",
+			printf(_("ICMP Unreachable from %s for ICMP Echo sent to %s"),
 					inet_ntoa(addr->sin_addr), h->host);
 
 			if(inet_addr(h->host) == INADDR_NONE)
@@ -1056,7 +1056,7 @@ void add_name(char *name)
 		}						/* IF */
 
 		if(host_ent == NULL) {
-			printf("%s address not found\n", name);
+			printf(_("%s address not found\n"), name);
 			num_noaddress++;
 			return;
 		}						/* IF */
@@ -1064,7 +1064,7 @@ void add_name(char *name)
 
 	host_add = (struct in_addr *)*(host_ent->h_addr_list);
 	if(host_add == NULL) {
-		printf("%s has no address data\n", name);
+		printf(_("%s has no address data\n"), name);
 		num_noaddress++;
 		return;
 	}							/* IF */
@@ -1097,7 +1097,7 @@ char *na_cat(char *name, struct in_addr ipaddr)
 	nm = (char *)malloc(strlen(name) + strlen(as) + 4);
 
 	if(!nm)
-		crash("can't allocate some space for a string");
+		crash(_("Can't allocate some space for a string"));
 
 	strcpy(nm, name);
 	strcat(nm, " (");
@@ -1116,7 +1116,7 @@ void add_addr(char *name, char *host, struct in_addr ipaddr)
 	int *i;
 
 	if(!(p = (HOST_ENTRY *) malloc(sizeof(HOST_ENTRY)))) {
-		crash("can't allocate HOST_ENTRY");
+		crash(_("Can't allocate HOST_ENTRY"));
 	}
 
 	memset((char *)p, 0, sizeof(HOST_ENTRY));
@@ -1129,7 +1129,7 @@ void add_addr(char *name, char *host, struct in_addr ipaddr)
 
 	/* array for response time results */
 	if(!(i = (int *)malloc(trials * sizeof(int)))) {
-		crash("can't allocate resp_times array");
+		crash(_("Can't allocate resp_times array"));
 	}
 
 	for(n = 1; n < trials; n++)
@@ -1193,7 +1193,7 @@ char *cpystr(char *string)
 
 	if(string) {
 		dst = (char *)malloc(1 + strlen(string));
-		if(!dst) crash("malloc() failed!");
+		if(!dst) crash(_("malloc() failed!"));
 
 		strcpy(dst, string);
 		return dst;
@@ -1210,7 +1210,7 @@ void crash(char *msg)
 		if(errno)
 			printf("%s: %s : %s\n", prog, msg, strerror(errno));
 		if(h_errno)
-			printf("%s: %s : A network error occurred\n", prog, msg);
+			printf(_("%s: %s : A network error occurred\n"), prog, msg);
 	}
 	else printf("%s: %s\n", prog, msg);
 
@@ -1276,7 +1276,7 @@ void u_sleep(int u_sec)
 	FD_ZERO(&readset);
 	nfound = select(0, &readset, &writeset, NULL, &to);
 	if(nfound < 0)
-		crash("select() in u_sleep:");
+		crash(_("select() in u_sleep:"));
 
 	return;
 }								/* u_sleep() */
@@ -1306,14 +1306,14 @@ int recvfrom_wto(int lsock, char *buf, int len, struct sockaddr *saddr, int timo
 	FD_ZERO(&writeset);
 	FD_SET(lsock, &readset);
 	nfound = select(lsock + 1, &readset, &writeset, NULL, &to);
-	if(nfound < 0) crash("select() in recvfrom_wto");
+	if(nfound < 0) crash(_("select() in recvfrom_wto"));
 
 	if(nfound == 0) return -1;				/* timeout */
 
 	if(nfound) {
 		slen = sizeof(struct sockaddr);
 		n = recvfrom(sock, buf, len, 0, saddr, &slen);
-		if(n < 0) crash("recvfrom");
+		if(n < 0) crash(_("recvfrom"));
 		return(n);
 	}
 
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 644dc488..16cd1a87 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -206,9 +206,7 @@ main (int argc, char *argv[])
 			print_revision (progname, revision);
 			return STATE_OK;
 		default:
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 
 		if (optind < argc) {
@@ -488,7 +486,6 @@ smart_read_thresholds (int fd, thresholds_t * thresholds)
 }
 
 
-
 void
 print_help () 
 {
@@ -515,7 +512,6 @@ Usage: %s [DEVICE] [OPTION]\n\
 }
 
 
-
 void
 print_usage (void)
 {
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 582c9564..4f143280 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -134,11 +134,11 @@ main (int argc, char *argv[])
  			if (ldap_set_option (ld, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS)
  			{
  				/*ldap_perror(ld, "ldaps_option"); */
- 				printf ("Could not init TLS at port %i!\n", ld_port);
+ 				printf (_("Could not init TLS at port %i!\n"), ld_port);
 				return STATE_CRITICAL;
    		}
 #else
-			printf ("TLS not supported by the libraries!\n", ld_port);
+			printf (_("TLS not supported by the libraries!\n"), ld_port);
 			return STATE_CRITICAL;
 #endif /* LDAP_OPT_X_TLS */
 		} else {
@@ -157,11 +157,11 @@ main (int argc, char *argv[])
 			if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS)
 			{
 				/*ldap_perror(ld, "ldap_start_tls"); */
-				printf ("Could not init startTLS at port %i!\n", ld_port);
+				printf (_("Could not init startTLS at port %i!\n"), ld_port);
 				return STATE_CRITICAL;
 			}
 #else
-			printf ("startTLS not supported by the library, needs LDAPv3!\n");
+			printf (_("startTLS not supported by the library, needs LDAPv3!\n"));
 			return STATE_CRITICAL;
 #endif /* HAVE_LDAP_START_TLS_S */
 		}
@@ -312,9 +312,7 @@ process_arguments (int argc, char **argv)
 #endif
 			break;
 		default:
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
@@ -328,21 +326,20 @@ process_arguments (int argc, char **argv)
 	return validate_arguments ();
 }
 
+
 int
 validate_arguments ()
 {
 	if (ld_host==NULL || strlen(ld_host)==0)
-		usage (_("please specify the host name\n"));
+		usage4 (_("Please specify the host name\n"));
 
 	if (ld_base==NULL || strlen(ld_base)==0)
-		usage (_("please specify the LDAP base\n"));
+		usage4 (_("Please specify the LDAP base\n"));
 
 	return OK;
-
 }
 
 
-
 void
 print_help (void)
 {
@@ -392,7 +389,6 @@ print_help (void)
 }
 
 
-
 void
 print_usage (void)
 {
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 1b7865c7..7e1cc481 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -224,9 +224,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index bd37aeff..067429cf 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -233,9 +233,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 096b3bde..877072ce 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -260,9 +260,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
@@ -304,7 +302,6 @@ process_arguments (int argc, char **argv)
 }
 
 
-
 int
 validate_arguments (void)
 {
@@ -312,7 +309,6 @@ validate_arguments (void)
 }
 
 
-
 void
 print_help (void)
 {
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 1e7a82f9..735eaa2e 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -98,25 +98,25 @@ main (int argc, char **argv)
 		/* check the slave status */
 		if (mysql_query (&mysql, "show slave status") != 0) {
 			mysql_close (&mysql);
-			die (STATE_CRITICAL, "slave query error: %s\n", mysql_error (&mysql));
+			die (STATE_CRITICAL, _("slave query error: %s\n"), mysql_error (&mysql));
 		}
 
 		/* store the result */
 		if ( (res = mysql_store_result (&mysql)) == NULL) {
 			mysql_close (&mysql);
-			die (STATE_CRITICAL, "slave store_result error: %s\n", mysql_error (&mysql));
+			die (STATE_CRITICAL, _("slave store_result error: %s\n"), mysql_error (&mysql));
 		}
 
 		/* fetch the first row */
 		if ( (row = mysql_fetch_row (res)) == NULL) {
 			mysql_free_result (res);
 			mysql_close (&mysql);
-			die (STATE_CRITICAL, "slave fetch row error: %s\n", mysql_error (&mysql));
+			die (STATE_CRITICAL, _("slave fetch row error: %s\n"), mysql_error (&mysql));
 		}
 
 		if (mysql_field_count (&mysql) == 12) {
 			/* mysql 3.23.x */
-			snprintf (slaveresult, SLAVERESULTSIZE, "Slave running: %s", row[6]);
+			snprintf (slaveresult, SLAVERESULTSIZE, _("Slave running: %s"), row[6]);
 			if (strcmp (row[6], "Yes") != 0) {
 				mysql_free_result (res);
 				mysql_close (&mysql);
@@ -151,7 +151,6 @@ main (int argc, char **argv)
 }
 
 
-
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -212,9 +211,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
@@ -245,7 +242,6 @@ process_arguments (int argc, char **argv)
 }
 
 
-
 int
 validate_arguments (void)
 {
@@ -265,7 +261,6 @@ validate_arguments (void)
 }
 
 
-
 void
 print_help (void)
 {
@@ -304,7 +299,6 @@ a server listening on MySQL standard port %d will be checked\n"), MYSQL_PORT);
 }
 
 
-
 void
 print_usage (void)
 {
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 465b409d..0176983c 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -95,7 +95,7 @@ main (int argc, char **argv)
 	fclose (fp);
 
 	if (verbose >= 2)
-		printf("command: %s\n", PS_COMMAND);
+		printf(_("command: %s\n"), PS_COMMAND);
 
 	/* run the command to check for the Nagios process.. */
 	child_process = spopen (PS_COMMAND);
@@ -206,8 +206,7 @@ process_arguments (int argc, char **argv)
 			expire_minutes = atoi (argv[2]);
 		else
 			die (STATE_UNKNOWN,
-								 _("Expiration time must be an integer (seconds)\nType '%s -h' for additional help\n"),
-								 progname);
+								 _("Expiration time must be an integer (seconds)\n"));
 		process_string = argv[3];
 		return OK;
 	}
@@ -220,9 +219,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* print short usage statement if args not parsable */
-			printf (_("%s: Unknown argument: %c\n\n"), progname, optopt);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
@@ -240,8 +237,7 @@ process_arguments (int argc, char **argv)
 				expire_minutes = atoi (optarg);
 			else
 				die (STATE_UNKNOWN,
-				     _("Expiration time must be an integer (seconds)\nType '%s -h' for additional help\n"),
-				     progname);
+				     _("Expiration time must be an integer (seconds)\n"));
 			break;
 		case 'v':
 			verbose++;
@@ -252,12 +248,10 @@ process_arguments (int argc, char **argv)
 
 	if (status_log == NULL)
 		die (STATE_UNKNOWN,
-		     _("You must provide the status_log\nType '%s -h' for additional help\n"),
-		     progname);
+		     _("You must provide the status_log\n"));
 	else if (process_string == NULL)
 		die (STATE_UNKNOWN,
-							 _("You must provide a process string\nType '%s -h' for additional help\n"),
-							 progname);
+							 _("You must provide a process string\n"));
 
 	return OK;
 }
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index fa93fce7..cac826f5 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -423,7 +423,7 @@ int main(int argc, char **argv){
 
 	case CHECK_NONE:
 	default:
-		usage (_("Please specify a variable to check"));
+		usage4 (_("Please specify a variable to check"));
 		break;
 
 	}
@@ -487,14 +487,12 @@ int process_arguments(int argc, char **argv){
 		switch (c)
 			{
 			case '?': /* print short usage statement if args not parsable */
-				printf("%s: Unknown argument: %s\n\n",progname,optarg);
-				print_usage();
-				exit(STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 			case 'h': /* help */
 				print_help();
 				exit(STATE_OK);
 			case 'V': /* version */
-				print_revision(progname,"$Revision$");
+				print_revision(progname,revision);
 				exit(STATE_OK);
 			case 'H': /* hostname */
 				if (server_address)	free(server_address);
@@ -507,7 +505,7 @@ int process_arguments(int argc, char **argv){
 				if (is_intnonneg(optarg))
 					server_port=atoi(optarg);
 				else
-					die(STATE_UNKNOWN,_("Server port an integer (seconds)\nType '%s -h' for additional help\n"),progname);
+					die(STATE_UNKNOWN,_("Server port must be an integer\n"));
 				break;
 			case 'v':
 				if(strlen(optarg)<4)
@@ -573,7 +571,7 @@ void fetch_data (const char *address, int port, const char *sendb) {
 	result=process_tcp_request(address, port, sendb, recv_buffer,sizeof(recv_buffer));
 
 	if(result!=STATE_OK)
-		die (result, "could not fetch information from server\n");
+		die (result, _("could not fetch information from server\n"));
 		
 	if (!strncmp(recv_buffer,"ERROR",5))
 		die (STATE_UNKNOWN, "NSClient - %s\n",recv_buffer);
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 2d7e611d..601b25d3 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -760,9 +760,7 @@ int process_arguments(int argc, char **argv) {
 		switch (c)
 			{
 			case '?': /* print short usage statement if args not parsable */
-				printf ("%s: Unknown argument: %s\n\n", progname, optarg);
-				print_usage();
-				exit(STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 			case 'h': /* help */
 				print_help();
 				exit(STATE_OK);
@@ -779,7 +777,7 @@ int process_arguments(int argc, char **argv) {
 				if (is_intnonneg(optarg))
 					server_port=atoi(optarg);
 				else
-					die(STATE_UNKNOWN,_("Server port an integer (seconds)\nType '%s -h' for additional help\n"),progname);
+					die(STATE_UNKNOWN,_("Server port an integer\n"));
 				break;
 			case 'v':
 				if (strlen(optarg)<3)
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 9bf40d3c..a4abf2b9 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -272,17 +272,9 @@ main (int argc, char **argv)
 		die (STATE_UNKNOWN, _("Nothing to check!\n"));
 		break;
 	}
-
-	/* reset timeout */
-/* 	alarm (0); */
-
-/* 	printf (_("Reached end of program with no data returned\n")); */
-
-/* 	return result; */
 }
 
 
-
 /* process command-line arguments */
 int
 process_arguments (int argc, char **argv)
@@ -332,9 +324,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* print short usage statement if args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
@@ -349,8 +339,7 @@ process_arguments (int argc, char **argv)
 				server_port = atoi (optarg);
 			else
 				die (STATE_UNKNOWN,
-									 _("Server port an integer (seconds)\nType '%s -h' for additional help\n"),
-									 progname);
+									 _("Server port an integer\n"));
 			break;
 		case 'v':									/* variable */
 			if (strcmp (optarg, "LOAD") == 0) {
@@ -403,7 +392,6 @@ process_arguments (int argc, char **argv)
 }
 
 
-
 void
 print_help (void)
 {
@@ -459,7 +447,6 @@ Notes:\n\
 }
 
 
-
 void
 print_usage (void)
 {
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index b5b9ff81..d56ce9b0 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -209,9 +209,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':     /* usage */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':     /* help */
 			print_help ();
 			exit (STATE_OK);
@@ -232,7 +230,7 @@ process_arguments (int argc, char **argv)
 			break;
 		case 'w':     /* warning time threshold */
 			if (!is_nonnegative (optarg))
-				usage2 (_("Critical threshold must be a positive integer"), optarg);
+				usage2 (_("Warning threshold must be a positive integer"), optarg);
 			else
 				twarn = strtod (optarg, NULL);
 			break;
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 91764666..818bb668 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -194,9 +194,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':	/* usage */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':	/* help */
 			print_help ();
 			exit (STATE_OK);
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 1be93f46..0cd9153c 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -343,9 +343,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
@@ -368,7 +366,7 @@ process_arguments (int argc, char **argv)
 			else if (sscanf (optarg, "%d:", &cmin) == 1)
 				break;
 			else
-				usage (_("Critical Process Count must be an integer!\n\n"));
+				usage4 (_("Critical Process Count must be an integer!"));
 			break;							 
 		case 'w':									/* warning threshold */
 			if (is_integer (optarg))
@@ -380,7 +378,7 @@ process_arguments (int argc, char **argv)
 			else if (sscanf (optarg, "%d:", &wmin) == 1)
 				break;
 			else
-				usage (_("Warning Process Count must be an integer!\n\n"));
+				usage4 (_("Warning Process Count must be an integer!"));
 			break;
 		case 'p':									/* process id */
 			if (sscanf (optarg, "%d%[^0-9]", &ppid, tmp) == 1) {
@@ -388,7 +386,7 @@ process_arguments (int argc, char **argv)
 				options |= PPID;
 				break;
 			}
-			usage2 (_("%s: Parent Process ID must be an integer!\n\n"),  progname);
+			usage4 (_("Parent Process ID must be an integer!"));
 		case 's':									/* status */
 			if (statopts)
 				break;
@@ -403,13 +401,13 @@ process_arguments (int argc, char **argv)
 				pw = getpwuid ((uid_t) uid);
 				/*  check to be sure user exists */
 				if (pw == NULL)
-					usage2 (_("UID %s was not found\n"), optarg);
+					usage2 (_("UID %s was not found"), optarg);
 			}
 			else {
 				pw = getpwnam (optarg);
 				/*  check to be sure user exists */
 				if (pw == NULL)
-					usage2 (_("User name %s was not found\n"), optarg);
+					usage2 (_("User name %s was not found"), optarg);
 				/*  then get uid */
 				uid = pw->pw_uid;
 			}
@@ -443,14 +441,14 @@ process_arguments (int argc, char **argv)
 				options |= RSS;
 				break;
 			}
-			usage2 (_("%s: RSS must be an integer!\n\n"), progname);
+			usage4 (_("RSS must be an integer!"));
 		case 'z':					/* VSZ */
 			if (sscanf (optarg, "%d%[^0-9]", &vsz, tmp) == 1) {
 				asprintf (&fmt, _("%s%sVSZ >= %d"), (fmt ? fmt : ""), (options ? ", " : ""), vsz);
 				options |= VSZ;
 				break;
 			}
-			usage2 (_("%s: VSZ must be an integer!\n\n"), progname);
+			usage4 (_("VSZ must be an integer!"));
 		case 'P':					/* PCPU */
 			/* TODO: -P 1.5.5 is accepted */
 			if (sscanf (optarg, "%f%[^0-9.]", &pcpu, tmp) == 1) {
@@ -458,7 +456,7 @@ process_arguments (int argc, char **argv)
 				options |= PCPU;
 				break;
 			}
-			usage2 (_("%s: PCPU must be a float!\n\n"), progname);
+			usage4 (_("PCPU must be a float!"));
 		case 'm':
 			asprintf (&metric_name, "%s", optarg);
 			if ( strcmp(optarg, "PROCS") == 0) {
@@ -482,10 +480,7 @@ process_arguments (int argc, char **argv)
 				break;
 			}
 				
-			printf (_("%s: metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!\n\n"),
-				progname);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage4 (_("Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"));
 		case 'v':									/* command */
 			verbose++;
 			break;
@@ -588,8 +583,6 @@ check_thresholds (int value)
 }
 
 
-
-
 /* convert the elapsed time to seconds */
 int
 convert_to_seconds(char *etime) {
@@ -653,7 +646,6 @@ convert_to_seconds(char *etime) {
 }
 
 
-
 void
 print_help (void)
 {
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 9e104686..07ee4c7f 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -199,12 +199,12 @@ process_arguments (int argc, char **argv)
 		if (is_intpos (argv[5]))
 			retries = atoi (argv[5]);
 		else
-			usage (_("Number of retries must be a positive integer"));
+			usage4 (_("Number of retries must be a positive integer"));
 		server = argv[6];
 		if (is_intpos (argv[7]))
 			port = atoi (argv[7]);
 		else
-			usage (_("Port must be a positive integer"));
+			usage4 (_("Port must be a positive integer"));
 		expect = argv[8];
 		return OK;
 	}
@@ -218,9 +218,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* print short usage statement if args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (OK);
@@ -240,7 +238,7 @@ process_arguments (int argc, char **argv)
 			if (is_intnonneg (optarg))
 				port = atoi (optarg);
 			else
-				usage (_("Port must be a positive integer"));
+				usage4 (_("Port must be a positive integer"));
 			break;
 		case 'u':									/* username */
 			username = optarg;
@@ -261,7 +259,7 @@ process_arguments (int argc, char **argv)
 			if (is_intpos (optarg))
 				retries = atoi (optarg);
 			else
-				usage (_("Number of retries must be a positive integer"));
+				usage4 (_("Number of retries must be a positive integer"));
 			break;
 		case 't':									/* timeout */
 			if (is_intpos (optarg))
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 30424656..eb892c77 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -330,7 +330,7 @@ process_arguments (int argc, char **argv)
 				check_critical_time = TRUE;
 			}
 			else {
-				usage4 (_("Critical time must be a nonnegative integer"));
+				usage4 (_("Critical time must be a positive integer"));
 			}
 			break;
 		case 'v':									/* verbose */
@@ -341,7 +341,7 @@ process_arguments (int argc, char **argv)
 				socket_timeout = atoi (optarg);
 			}
 			else {
-				usage4 (_("Time interval must be a nonnegative integer"));
+				usage4 (_("Timeout interval must be a positive integer"));
 			}
 			break;
 		case 'V':									/* version */
@@ -351,9 +351,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* usage */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
@@ -368,7 +366,7 @@ process_arguments (int argc, char **argv)
 	}
 
 	if (server_address==NULL)
-		usage (_("You must provide a server to check\n"));
+		usage4 (_("You must provide a server to check"));
 
 	if (host_name==NULL)
 		host_name = strdup (server_address);
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index b6c60c24..55cf5da5 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -351,7 +351,7 @@ process_arguments (int argc, char **argv)
 				socket_timeout = atoi (optarg);
 			}
 			else {
-				usage4 (_("Time interval must be a positive integer"));
+				usage4 (_("Timeout interval must be a positive integer"));
 			}
 			break;
 		case '4':
@@ -371,9 +371,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index c1c4ea83..5f221218 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -251,7 +251,7 @@ main (int argc, char **argv)
 		    eval_method[i] & WARN_NE) {
 			p2 = strpbrk (p2, "0123456789");
 			if (p2 == NULL) 
-				die (STATE_UNKNOWN,"No valid data returned");
+				die (STATE_UNKNOWN,_("No valid data returned"));
 			response_value[i] = strtoul (p2, NULL, 10);
 			iresult = check_num (i);
 			asprintf (&show, "%lu", response_value[i]);
@@ -398,9 +398,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':	/* usage */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':	/* help */
 			print_help ();
 			exit (STATE_OK); 
@@ -795,7 +793,7 @@ thisarg (char *str)
 	str += strspn (str, " \t\r\n");	/* trim any leading whitespace */
 	if (strstr (str, "'") == str) {	/* handle SIMPLE quoted strings */
 		if (strlen (str) == 1 || !strstr (str + 1, "'"))
-			die (STATE_UNKNOWN, "Unbalanced quotes\n");
+			die (STATE_UNKNOWN, _("Unbalanced quotes\n"));
 	}
 	return str;
 }
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index e957c053..7b7bc8fd 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -110,9 +110,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'V':									/* version */
 			print_revision (progname, revision);
 			exit (STATE_OK);
@@ -135,7 +133,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 'r':									/* remote version */
@@ -151,11 +149,9 @@ process_arguments (int argc, char **argv)
 				port = atoi (optarg);
 			}
 			else {
-				printf ("Port number nust be a positive integer: %s\n", optarg);
-				usage ("");
+				usage2 (_("Port number must be a positive integer"), optarg);
 			}
 		}
-
 	}
 
 	c = optind;
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 6e2ab723..093845b4 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -239,7 +239,7 @@ main (int argc, char **argv)
 	/* and now, tally 'em up */
 	swapctl_res=swapctl(SC_LIST, tbl);
 	if(swapctl_res < 0){
-		perror("swapctl failed: ");
+		perror(_("swapctl failed: "));
 		result = STATE_WARNING;
 	}
 
@@ -278,7 +278,7 @@ main (int argc, char **argv)
 	/* and now, tally 'em up */
 	swapctl_res=swapctl(SWAP_STATS, ent, nswaps);
 	if(swapctl_res < 0){
-		perror("swapctl failed: ");
+		perror(_("swapctl failed: "));
 		result = STATE_WARNING;
 	}
 
@@ -388,7 +388,7 @@ process_arguments (int argc, char **argv)
 				break;
 			}
 			else {
-				usage (_("Warning threshold must be integer or percentage!\n"));
+				usage4 (_("Warning threshold must be integer or percentage!"));
 			}
 		case 'c':									/* critical size threshold */
 			if (is_intnonneg (optarg)) {
@@ -420,9 +420,7 @@ process_arguments (int argc, char **argv)
 			print_help ();
 			exit (STATE_OK);
 		case '?':									/* error */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index b922536e..fcd67786 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -259,13 +259,13 @@ main (int argc, char **argv)
 #ifdef HAVE_SSL
 	if (use_ssl && check_cert == TRUE) {
 	  if (connect_SSL () != OK)
-	    die (STATE_CRITICAL,"CRITICAL - Could not make SSL connection\n");
+	    die (STATE_CRITICAL,_("CRITICAL - Could not make SSL connection\n"));
 	  if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) {
 	    result = check_certificate (&server_cert);
 	    X509_free(server_cert);
 	  }
 	  else {
-	    printf("CRITICAL - Cannot retrieve server certificate.\n");
+	    printf(_("CRITICAL - Cannot retrieve server certificate.\n"));
 	    result = STATE_CRITICAL;
 	  }
 	  SSL_shutdown (ssl);
@@ -434,7 +434,7 @@ process_arguments (int argc, char **argv)
 	};
 
 	if (argc < 2)
-		usage ("No arguments found\n");
+		usage4 (_("No arguments found"));
 
 	/* backwards compatibility */
 	for (c = 1; c < argc; c++) {
@@ -462,14 +462,12 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':                 /* print short usage statement if args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':                 /* help */
 			print_help ();
 			exit (STATE_OK);
 		case 'V':                 /* version */
-			print_revision (progname, "$Revision$");
+			print_revision (progname, revision);
 			exit (STATE_OK);
 		case 'v':                 /* verbose mode */
 			verbose = TRUE;
@@ -575,7 +573,7 @@ process_arguments (int argc, char **argv)
                  case 'D': /* Check SSL cert validity - days 'til certificate expiration */
 #ifdef HAVE_SSL
 			if (!is_intnonneg (optarg))
-				usage2 ("invalid certificate expiration period", optarg);
+				usage2 (_("Invalid certificate expiration period"), optarg);
 			days_till_exp = atoi (optarg);
 			check_cert = TRUE;
 			use_ssl = TRUE;
@@ -583,14 +581,14 @@ process_arguments (int argc, char **argv)
 		case 'S':
 			use_ssl = TRUE;
 #else
-			die (STATE_UNKNOWN, "SSL support not available.  Install OpenSSL and recompile.");
+			die (STATE_UNKNOWN, _("SSL support not available.  Install OpenSSL and recompile."));
 #endif
 			break;
 		}
 	}
 
 	if (server_address == NULL)
-		usage (_("You must provide a server address\n"));
+		usage4 (_("You must provide a server address"));
 
 	return TRUE;
 }
@@ -669,7 +667,7 @@ check_certificate (X509 ** certificate)
   /* Generate tm structure to process timestamp */
   if (tm->type == V_ASN1_UTCTIME) {
     if (tm->length < 10) {
-      printf ("CRITICAL - Wrong time format in certificate.\n");
+      printf (_("CRITICAL - Wrong time format in certificate.\n"));
       return STATE_CRITICAL;
     }
     else {
@@ -681,7 +679,7 @@ check_certificate (X509 ** certificate)
   }
   else {
     if (tm->length < 12) {
-      printf ("CRITICAL - Wrong time format in certificate.\n");
+      printf (_("CRITICAL - Wrong time format in certificate.\n"));
       return STATE_CRITICAL;
     }
     else {
@@ -710,20 +708,20 @@ check_certificate (X509 ** certificate)
 	   stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
 
         if (days_left > 0 && days_left <= days_till_exp) {
-	  printf ("Certificate expires in %d day(s) (%s).\n", days_left, timestamp);
+	  printf (_("Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
 	  return STATE_WARNING;
         }
         if (days_left < 0) {
-	  printf ("Certificate expired on %s.\n", timestamp);
+	  printf (_("Certificate expired on %s.\n"), timestamp);
 	  return STATE_CRITICAL;
         }
 
         if (days_left == 0) {
-	  printf ("Certificate expires today (%s).\n", timestamp);
+	  printf (_("Certificate expires today (%s).\n"), timestamp);
 	  return STATE_WARNING;
         }
 
-        printf ("Certificate will expire on %s.\n", timestamp);
+        printf (_("Certificate will expire on %s.\n"), timestamp);
 
         return STATE_OK;
 }
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 63d7ee25..efca91bd 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -216,9 +216,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* print short usage statement if args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
diff --git a/plugins/check_udp.c b/plugins/check_udp.c
index b79f31f7..e7d5280c 100644
--- a/plugins/check_udp.c
+++ b/plugins/check_udp.c
@@ -67,7 +67,7 @@ main (int argc, char **argv)
 	time (&end_time);
 
 	if (result != STATE_OK) {
-		printf ("No response from host on port %d\n", server_port);
+		printf (_("No response from host on port %d\n"), server_port);
 		result = STATE_CRITICAL;
 	}
 
@@ -76,7 +76,7 @@ main (int argc, char **argv)
 		/* check to see if we got the response we wanted */
 		if (server_expect) {
 			if (!strstr (recv_buffer, server_expect)) {
-				printf ("Invalid response received from host on port %d\n",
+				printf (_("Invalid response received from host on port %d\n"),
 								server_port);
 				result = STATE_CRITICAL;
 			}
@@ -146,9 +146,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* print short usage statement if args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
@@ -254,8 +252,6 @@ STATE_CRITICAL, other errors return STATE_UNKNOWN.\n\n"));
 }
 
 
-
-
 /* Original Command line: 
    check_udp <host_address> [-p port] [-s send] [-e expect] \
    [-wt warn_time] [-ct crit_time] [-to to_sec] */
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index a4d76503..1cdf9e9e 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -133,48 +133,48 @@ main (int argc, char **argv)
 		}
 		else if ((status & (UPSSTATUS_OB | UPSSTATUS_LB)) ==
 						 (UPSSTATUS_OB | UPSSTATUS_LB)) {
-			asprintf (&ups_status, "On Battery, Low Battery");
+			asprintf (&ups_status, _("On Battery, Low Battery"));
 			result = STATE_CRITICAL;
 		}
 		else {
 			if (status & UPSSTATUS_OL) {
-				asprintf (&ups_status, "%s%s", ups_status, "Online");
+				asprintf (&ups_status, "%s%s", ups_status, _("Online"));
 			}
 			if (status & UPSSTATUS_OB) {
-				asprintf (&ups_status, "%s%s", ups_status, "On Battery");
+				asprintf (&ups_status, "%s%s", ups_status, _("On Battery"));
 				result = STATE_WARNING;
 			}
 			if (status & UPSSTATUS_LB) {
-				asprintf (&ups_status, "%s%s", ups_status, ", Low Battery");
+				asprintf (&ups_status, "%s%s", ups_status, _(", Low Battery"));
 				result = STATE_WARNING;
 			}
 			if (status & UPSSTATUS_CAL) {
-				asprintf (&ups_status, "%s%s", ups_status, ", Calibrating");
+				asprintf (&ups_status, "%s%s", ups_status, _(", Calibrating"));
 			}
 			if (status & UPSSTATUS_RB) {
-				asprintf (&ups_status, "%s%s", ups_status, ", Replace Battery");
+				asprintf (&ups_status, "%s%s", ups_status, _(", Replace Battery"));
 				result = STATE_WARNING;
 			}
 			if (status & UPSSTATUS_BYPASS) {
-				asprintf (&ups_status, "%s%s", ups_status, ", On Bypass");
+				asprintf (&ups_status, "%s%s", ups_status, _(", On Bypass"));
 			}
 			if (status & UPSSTATUS_OVER) {
-				asprintf (&ups_status, "%s%s", ups_status, ", Overload");
+				asprintf (&ups_status, "%s%s", ups_status, _(", Overload"));
 			}
 			if (status & UPSSTATUS_TRIM) {
-				asprintf (&ups_status, "%s%s", ups_status, ", Trimming");
+				asprintf (&ups_status, "%s%s", ups_status, _(", Trimming"));
 			}
 			if (status & UPSSTATUS_BOOST) {
-				asprintf (&ups_status, "%s%s", ups_status, ", Boosting");
+				asprintf (&ups_status, "%s%s", ups_status, _(", Boosting"));
 			}
 			if (status & UPSSTATUS_CHRG) {
-				asprintf (&ups_status, "%s%s", ups_status, ", Charging");
+				asprintf (&ups_status, "%s%s", ups_status, _(", Charging"));
 			}
 			if (status & UPSSTATUS_DISCHRG) {
-				asprintf (&ups_status, "%s%s", ups_status, ", Discharging");
+				asprintf (&ups_status, "%s%s", ups_status, _(", Discharging"));
 			}
 			if (status & UPSSTATUS_UNKOWN) {
-				asprintf (&ups_status, "%s%s", ups_status, ", Unknown");
+				asprintf (&ups_status, "%s%s", ups_status, _(", Unknown"));
 			}
 		}
 		asprintf (&message, "%sStatus=%s ", message, ups_status);
@@ -311,7 +311,7 @@ main (int argc, char **argv)
 	/* if the UPS does not support any options we are looking for, report an error */
 	if (supported_options == UPS_NONE) {
 		result = STATE_CRITICAL;
-		asprintf (&message, "UPS does not support any available options\n");
+		asprintf (&message, _("UPS does not support any available options\n"));
 	}
 
 	/* reset timeout */
@@ -335,7 +335,7 @@ determine_status (void)
 	res=get_ups_variable ("ups.status", recv_buffer, sizeof (recv_buffer));
 	if (res == NOSUCHVAR) return OK;
 	if (res != STATE_OK) {
-		printf ("Invalid response received from host\n");
+		printf (_("Invalid response received from host\n"));
 		return ERROR;
 	}
 
@@ -395,7 +395,7 @@ get_ups_variable (const char *varname, char *buf, size_t buflen)
 	if (process_tcp_request
 			(server_address, server_port, send_buffer, temp_buffer,
 			 sizeof (temp_buffer)) != STATE_OK) {
-		printf ("Invalid response received from host\n");
+		printf (_("Invalid response received from host\n"));
 		return ERROR;
 	}
 
@@ -403,7 +403,7 @@ get_ups_variable (const char *varname, char *buf, size_t buflen)
 	len = strlen(ptr);
 	if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0;
 	if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) {
-		printf ("CRITICAL - no such ups '%s' on that host\n", ups_name);
+		printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name);
 		return ERROR;
 	}
 
@@ -413,19 +413,19 @@ get_ups_variable (const char *varname, char *buf, size_t buflen)
 	}
 
 	if (strcmp (ptr, "ERR DATA-STALE") == 0) {
-		printf ("CRITICAL - UPS data is stale\n");
+		printf (_("CRITICAL - UPS data is stale\n"));
 		return ERROR;
 	}
 
 	if (strncmp (ptr, "ERR", 3) == 0) {
-		printf ("Unknown error: %s\n", ptr);
+		printf (_("Unknown error: %s\n"), ptr);
 		return ERROR;
 	}
 
 	ptr = temp_buffer + strlen (varname) + strlen (ups_name) + 6;
 	len = strlen(ptr);
 	if (len < 2 || ptr[0] != '"' || ptr[len-1] != '"') {
-		printf ("Error: unable to parse variable\n");
+		printf (_("Error: unable to parse variable\n"));
 		return ERROR;
 	}
 	strncpy (buf, ptr+1, len - 2);
@@ -481,9 +481,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'H':									/* hostname */
 			if (is_host (optarg)) {
 				server_address = optarg;
@@ -503,7 +501,7 @@ process_arguments (int argc, char **argv)
 				server_port = atoi (optarg);
 			}
 			else {
-				usage2 ("Port must be a positive integer", optarg);
+				usage2 (_("Port must be a positive integer"), optarg);
 			}
 			break;
 		case 'c':									/* critical time threshold */
@@ -512,7 +510,7 @@ process_arguments (int argc, char **argv)
 				check_crit = TRUE;
 			}
 			else {
-				usage2 ("Critical time must be a positive integer", optarg);
+				usage2 (_("Critical time must be a positive integer"), optarg);
 			}
 			break;
 		case 'w':									/* warning time threshold */
@@ -521,7 +519,7 @@ process_arguments (int argc, char **argv)
 				check_warn = TRUE;
 			}
 			else {
-				usage2 ("Warning time must be a positive integer", optarg);
+				usage2 (_("Warning time must be a positive integer"), optarg);
 			}
 			break;
 		case 'v':									/* variable */
@@ -534,14 +532,14 @@ process_arguments (int argc, char **argv)
 			else if (!strcmp (optarg, "LOADPCT"))
 				check_variable = UPS_LOADPCT;
 			else
-				usage2 ("Unrecognized UPS variable", optarg);
+				usage2 (_("Unrecognized UPS variable"), optarg);
 			break;
 		case 't':									/* timeout */
 			if (is_intnonneg (optarg)) {
 				socket_timeout = atoi (optarg);
 			}
 			else {
-				usage ("Time interval must be a positive integer\n");
+				usage4 (_("Timeout interval must be a positive integer"));
 			}
 			break;
 		case 'V':									/* version */
@@ -568,19 +566,17 @@ process_arguments (int argc, char **argv)
 }
 
 
-
 int
 validate_arguments (void)
 {
 	if (! ups_name) {
-		printf ("Error : no ups indicated\n");
+		printf (_("Error : no ups indicated\n"));
 		return ERROR;
 	}
 	return OK;
 }
 
 
-
 void
 print_help (void)
 {
@@ -641,7 +637,6 @@ http://www.networkupstools.org\n\n"));
 }
 
 
-
 void
 print_usage (void)
 {
diff --git a/plugins/check_users.c b/plugins/check_users.c
index d1b4f018..25d04ed0 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -140,9 +140,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':									/* print short usage statement if args not parsable */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		case 'h':									/* help */
 			print_help ();
 			exit (STATE_OK);
@@ -151,13 +149,13 @@ process_arguments (int argc, char **argv)
 			exit (STATE_OK);
 		case 'c':									/* critical */
 			if (!is_intnonneg (optarg))
-				usage (_("Critical threshold must be a positive integer\n"));
+				usage4 (_("Critical threshold must be a positive integer"));
 			else
 				cusers = atoi (optarg);
 			break;
 		case 'w':									/* warning */
 			if (!is_intnonneg (optarg))
-				usage (_("Warning threshold must be a positive integer\n"));
+				usage4 (_("Warning threshold must be a positive integer"));
 			else
 				wusers = atoi (optarg);
 			break;
@@ -167,14 +165,14 @@ process_arguments (int argc, char **argv)
 	c = optind;
 	if (wusers == -1 && argc > c) {
 		if (is_intnonneg (argv[c]) == FALSE)
-			usage (_("Warning threshold must be a positive integer\n"));
+			usage4 (_("Warning threshold must be a positive integer"));
 		else
 			wusers = atoi (argv[c++]);
 	}
 
 	if (cusers == -1 && argc > c) {
 		if (is_intnonneg (argv[c]) == FALSE)
-			usage (_("Warning threshold must be a positive integer\n"));
+			usage4 (_("Warning threshold must be a positive integer"));
 		else
 			cusers = atoi (argv[c]);
 	}
@@ -210,7 +208,6 @@ system and generates an error if the number exceeds the thresholds specified.\n"
 }
 
 
-
 void
 print_usage (void)
 {
diff --git a/plugins/negate.c b/plugins/negate.c
index e35ddb9e..d08c3a30 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -174,9 +174,7 @@ process_arguments (int argc, char **argv)
 
 		switch (c) {
 		case '?':     /* help */
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 			break;
 		case 'h':     /* help */
 			print_help ();
diff --git a/plugins/netutils.c b/plugins/netutils.c
index 6702b13f..1231c1ef 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -45,9 +45,9 @@ void
 socket_timeout_alarm_handler (int sig)
 {
 	if (sig == SIGALRM)
-		printf ("CRITICAL - Socket timeout after %d seconds\n", socket_timeout);
+		printf (_("CRITICAL - Socket timeout after %d seconds\n"), socket_timeout);
 	else
-		printf ("CRITICAL - Abnormal timeout after %d seconds\n", socket_timeout);
+		printf (_("CRITICAL - Abnormal timeout after %d seconds\n"), socket_timeout);
 
 	exit (STATE_CRITICAL);
 }
@@ -106,7 +106,7 @@ process_tcp_request2 (const char *server_address, int server_port,
 
 	send_result = send (sd, send_buffer, strlen (send_buffer), 0);
 	if (send_result<0 || (size_t)send_result!=strlen(send_buffer)) {
-		printf ("Send failed\n");
+		printf (_("Send failed\n"));
 		result = STATE_WARNING;
 	}
 
@@ -123,7 +123,7 @@ process_tcp_request2 (const char *server_address, int server_port,
 		if (!FD_ISSET (sd, &readfds)) {	/* it hasn't */
 			if (!recv_length) {
 				strcpy (recv_buffer, "");
-				printf ("No data was received from host!\n");
+				printf (_("No data was received from host!\n"));
 				result = STATE_WARNING;
 			}
 			else {										/* this one failed, but previous ones worked */
@@ -239,7 +239,7 @@ my_connect (const char *host_name, int port, int *sd, int proto)
 			              SOCK_DGRAM : SOCK_STREAM, res->ai_protocol);
 
 			if (*sd < 0) {
-				printf ("Socket creation failed\n");
+				printf (_("Socket creation failed\n"));
 				freeaddrinfo (res);
 				return STATE_UNKNOWN;
 			}
@@ -315,7 +315,7 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int
 
 	send_result = send (sd, send_buffer, strlen (send_buffer), 0);
 	if (send_result<0 || (size_t)send_result!=strlen(send_buffer)) {
-		printf ("Send failed\n");
+		printf (_("Send failed\n"));
 		result = STATE_WARNING;
 	}
 
@@ -330,7 +330,7 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int
 	/* make sure some data has arrived */
 	if (!FD_ISSET (sd, &readfds)) {
 		strcpy (recv_buffer, "");
-		printf ("No data was received from host!\n");
+		printf (_("No data was received from host!\n"));
 		result = STATE_WARNING;
 	}
 
@@ -339,7 +339,7 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int
 		if (recv_result == -1) {
 			strcpy (recv_buffer, "");
 			if (proto != IPPROTO_TCP)
-				printf ("Receive failed\n");
+				printf (_("Receive failed\n"));
 			result = STATE_WARNING;
 		}
 		else
diff --git a/plugins/popen.c b/plugins/popen.c
index 94ad583f..04eb3881 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -114,7 +114,7 @@ spopen (const char *cmdstring)
 	argv = malloc (sizeof(char*)*argc);
 	
 	if (argv == NULL) {
-		printf ("Could not malloc argv array in popen()\n");
+		printf (_("Could not malloc argv array in popen()\n"));
 		return NULL;
 	}
 
@@ -124,7 +124,7 @@ spopen (const char *cmdstring)
 		str += strspn (str, " \t\r\n");	/* trim any leading whitespace */
 
 		if (i >= argc - 2) {
-			printf ("CRITICAL - You need more args!!!\n");
+			printf (_("CRITICAL - You need more args!!!\n"));
 			return (NULL);
 		}
 
@@ -239,17 +239,19 @@ static int openmax = 0;
 #define	OPEN_MAX_GUESS	256			/* if OPEN_MAX is indeterminate */
 				/* no guarantee this is adequate */
 
+
 void
 popen_timeout_alarm_handler (int signo)
 {
 	if (signo == SIGALRM) {
 		kill (childpid[fileno (child_process)], SIGKILL);
-		printf ("CRITICAL - Plugin timed out after %d seconds\n",
+		printf (_("CRITICAL - Plugin timed out after %d seconds\n"),
 						timeout_interval);
 		exit (STATE_CRITICAL);
 	}
 }
 
+
 int
 open_max (void)
 {
@@ -259,14 +261,13 @@ open_max (void)
 			if (errno == 0)
 				openmax = OPEN_MAX_GUESS;	/* it's indeterminate */
 			else
-				err_sys ("sysconf error for _SC_OPEN_MAX");
+				err_sys (_("sysconf error for _SC_OPEN_MAX"));
 		}
 	}
 	return (openmax);
 }
 
 
-
 /* Fatal error related to a system call.
  * Print a message and die. */
 
@@ -309,4 +310,3 @@ rtrim (char *str, const char *tok)
 	}
 	return str;
 }
-
diff --git a/plugins/popen.h b/plugins/popen.h
index b7585792..1f4e413a 100644
--- a/plugins/popen.h
+++ b/plugins/popen.h
@@ -1,3 +1,9 @@
+/******************************************************************************
+ *
+ * $Id$
+ *
+ ******************************************************************************/
+
 FILE *spopen (const char *);
 int spclose (FILE *);
 RETSIGTYPE popen_timeout_alarm_handler (int);
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 3564e469..96bbdc00 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -71,9 +71,7 @@ main (int argc, char **argv)
 			break;
 		case '?':
 		default:
-			printf (_("%s: Unknown argument: %s\n\n"), progname, optarg);
-			print_usage ();
-			exit (STATE_UNKNOWN);
+			usage2 (_("Unknown argument"), optarg);
 		}
 	}
 
diff --git a/plugins/utils.c b/plugins/utils.c
index b2948e65..b9a19d3f 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -53,7 +53,7 @@ max_state (int a, int b)
 
 void usage (const char *msg)
 {
-	printf ("%s", msg);
+	printf ("%s\n", msg);
 	print_usage ();
 	exit (STATE_UNKNOWN);
 }
@@ -133,7 +133,7 @@ void
 timeout_alarm_handler (int signo)
 {
 	if (signo == SIGALRM) {
-		printf ("CRITICAL - Plugin timed out after %d seconds\n",
+		printf (_("CRITICAL - Plugin timed out after %d seconds\n"),
 						timeout_interval);
 		exit (STATE_CRITICAL);
 	}
@@ -430,7 +430,7 @@ strpcpy (char *dest, const char *src, const char *str)
 	if (dest == NULL || strlen (dest) < len)
 		dest = realloc (dest, len + 1);
 	if (dest == NULL)
-		die (STATE_UNKNOWN, "failed realloc in strpcpy\n");
+		die (STATE_UNKNOWN, _("failed realloc in strpcpy\n"));
 
 	strncpy (dest, src, len);
 	dest[len] = '\0';
@@ -472,7 +472,7 @@ strpcat (char *dest, const char *src, const char *str)
 
 	dest = realloc (dest, len + l2 + 1);
 	if (dest == NULL)
-		die (STATE_UNKNOWN, "failed malloc in strscat\n");
+		die (STATE_UNKNOWN, _("failed malloc in strscat\n"));
 
 	strncpy (dest + len, src, l2);
 	dest[len + l2] = '\0';
diff --git a/po/de.po b/po/de.po
index 95cd0aac..392092fa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nagiosplug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-25 16:26+0100\n"
+"POT-Creation-Date: 2004-12-26 00:06+0100\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: English <en@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms:  nplurals=2; plural=(n > 1);X-Generator: KBabel 1.3.1\n"
 
 #: plugins/check_by_ssh.c:72 plugins/check_dhcp.c:251 plugins/check_dig.c:72
-#: plugins/check_disk.c:167 plugins/check_dns.c:75 plugins/check_dummy.c:44
+#: plugins/check_disk.c:167 plugins/check_dns.c:75 plugins/check_dummy.c:43
 #: plugins/check_fping.c:73 plugins/check_game.c:69 plugins/check_hpjd.c:89
 #: plugins/check_http.c:149 plugins/check_ldap.c:92 plugins/check_load.c:78
 #: plugins/check_mrtgtraf.c:66 plugins/check_mysql.c:63
@@ -43,7 +43,7 @@ msgstr "Konnte SIGALRM nicht erhalten"
 #: plugins/check_fping.c:87 plugins/check_game.c:86 plugins/check_hpjd.c:114
 #: plugins/check_nagios.c:103 plugins/check_procs.c:137
 #: plugins/check_snmp.c:172 plugins/check_swap.c:151 plugins/check_users.c:59
-#: plugins/negate.c:97 plugins/urlize.c:90
+#: plugins/negate.c:97 plugins/urlize.c:88
 #, c-format
 msgid "Could not open pipe: %s\n"
 msgstr "Pipe: %s konnte nicht geöffnet werden\n"
@@ -52,7 +52,7 @@ msgstr "Pipe: %s konnte nicht geöffnet werden\n"
 #: plugins/check_fping.c:93 plugins/check_hpjd.c:120 plugins/check_load.c:115
 #: plugins/check_nagios.c:109 plugins/check_procs.c:143
 #: plugins/check_snmp.c:178 plugins/check_swap.c:157 plugins/check_users.c:65
-#: plugins/negate.c:102 plugins/urlize.c:96
+#: plugins/negate.c:102 plugins/urlize.c:94
 #, c-format
 msgid "Could not open stderr for %s\n"
 msgstr "Konnte stderr nicht öffnen für: %s\n"
@@ -62,41 +62,55 @@ msgstr "Konnte stderr nicht öffnen für: %s\n"
 msgid "SSH WARNING: could not open %s\n"
 msgstr "SSH WARNING: Konnte %s nicht öffnen\n"
 
-#: plugins/check_by_ssh.c:216 plugins/check_http.c:254
+#: plugins/check_by_ssh.c:216 plugins/check_dig.c:217 plugins/check_disk.c:441
+#: plugins/check_dns.c:315 plugins/check_fping.c:245 plugins/check_game.c:201
+#: plugins/check_hpjd.c:336 plugins/check_http.c:254 plugins/check_ldap.c:315
+#: plugins/check_load.c:227 plugins/check_mrtg.c:236
+#: plugins/check_mrtgtraf.c:263 plugins/check_mysql.c:214
+#: plugins/check_nagios.c:222 plugins/check_nt.c:490
+#: plugins/check_nwstat.c:763 plugins/check_overcr.c:327
+#: plugins/check_pgsql.c:212 plugins/check_ping.c:197
+#: plugins/check_procs.c:346 plugins/check_radius.c:221
+#: plugins/check_real.c:354 plugins/check_smtp.c:374 plugins/check_snmp.c:401
+#: plugins/check_ssh.c:113 plugins/check_swap.c:423 plugins/check_tcp.c:465
+#: plugins/check_time.c:219 plugins/check_udp.c:149 plugins/check_ups.c:484
+#: plugins/check_users.c:143 plugins/check_ide_smart.c:209
+#: plugins/negate.c:177 plugins/urlize.c:74
 #, fuzzy
 msgid "Unknown argument"
 msgstr ""
 "%s: Unbekanntes Argument: %s\n"
 "\n"
 
-#: plugins/check_by_ssh.c:228 plugins/check_dig.c:266 plugins/check_disk.c:308
-#: plugins/check_http.c:266 plugins/check_ldap.c:268 plugins/check_pgsql.c:223
-#: plugins/check_procs.c:357 plugins/check_radius.c:198
-#: plugins/check_radius.c:270 plugins/check_snmp.c:447 plugins/check_ssh.c:127
-#: plugins/check_tcp.c:519 plugins/check_time.c:292 plugins/check_udp.c:182
-#: plugins/negate.c:190
+#: plugins/check_by_ssh.c:228 plugins/check_dig.c:264 plugins/check_disk.c:308
+#: plugins/check_http.c:266 plugins/check_ldap.c:268 plugins/check_pgsql.c:221
+#: plugins/check_procs.c:355 plugins/check_radius.c:198
+#: plugins/check_radius.c:268 plugins/check_real.c:344
+#: plugins/check_smtp.c:354 plugins/check_snmp.c:445 plugins/check_ssh.c:125
+#: plugins/check_tcp.c:517 plugins/check_time.c:290 plugins/check_udp.c:180
+#: plugins/check_ups.c:542 plugins/negate.c:188
 msgid "Timeout interval must be a positive integer"
 msgstr "Timeout interval muss ein positiver Integer sein"
 
 #: plugins/check_by_ssh.c:234 plugins/check_by_ssh.c:293
-#: plugins/check_dig.c:231 plugins/check_dig.c:288 plugins/check_dns.c:340
-#: plugins/check_dns.c:349 plugins/check_fping.c:259 plugins/check_hpjd.c:324
-#: plugins/check_hpjd.c:349 plugins/check_mysql.c:190
-#: plugins/check_mysql.c:230 plugins/check_pgsql.c:241
-#: plugins/check_ping.c:270 plugins/check_ping.c:393
-#: plugins/check_radius.c:235 plugins/check_real.c:302
-#: plugins/check_real.c:366 plugins/check_smtp.c:292 plugins/check_smtp.c:386
-#: plugins/check_ssh.c:146 plugins/check_tcp.c:489 plugins/check_time.c:230
-#: plugins/check_time.c:305 plugins/check_udp.c:163 plugins/check_udp.c:204
-#: plugins/check_ups.c:492 plugins/check_ups.c:561
+#: plugins/check_dig.c:229 plugins/check_dig.c:286 plugins/check_dns.c:337
+#: plugins/check_dns.c:346 plugins/check_fping.c:257 plugins/check_hpjd.c:323
+#: plugins/check_hpjd.c:346 plugins/check_mysql.c:189
+#: plugins/check_mysql.c:227 plugins/check_pgsql.c:239
+#: plugins/check_ping.c:268 plugins/check_ping.c:391
+#: plugins/check_radius.c:233 plugins/check_real.c:302
+#: plugins/check_real.c:364 plugins/check_smtp.c:292 plugins/check_smtp.c:384
+#: plugins/check_ssh.c:144 plugins/check_tcp.c:487 plugins/check_time.c:228
+#: plugins/check_time.c:303 plugins/check_udp.c:161 plugins/check_udp.c:202
+#: plugins/check_ups.c:490 plugins/check_ups.c:559
 msgid "Invalid hostname/address"
 msgstr "Ungültige(r) Hostname/Adresse"
 
-#: plugins/check_by_ssh.c:239 plugins/check_dig.c:239
-#: plugins/check_pgsql.c:247 plugins/check_radius.c:207
-#: plugins/check_radius.c:243 plugins/check_real.c:315
-#: plugins/check_smtp.c:299 plugins/check_tcp.c:525 plugins/check_time.c:286
-#: plugins/check_udp.c:188
+#: plugins/check_by_ssh.c:239 plugins/check_dig.c:237
+#: plugins/check_pgsql.c:245 plugins/check_radius.c:207
+#: plugins/check_radius.c:241 plugins/check_real.c:315
+#: plugins/check_smtp.c:299 plugins/check_tcp.c:523 plugins/check_time.c:284
+#: plugins/check_udp.c:186 plugins/check_ups.c:504
 msgid "Port must be a positive integer"
 msgstr "Port muss ein positiver Integer sein"
 
@@ -491,6 +505,11 @@ msgid ""
 "   Print version information\n"
 msgstr ""
 
+#: plugins/check_dig.c:84 plugins/check_dig.c:86
+#, c-format
+msgid "Looking for: '%s'\n"
+msgstr ""
+
 #: plugins/check_dig.c:130
 msgid "Server not found in ANSWER SECTION"
 msgstr "Server nicht gefunden in ANSWER SECTION"
@@ -513,34 +532,15 @@ msgstr "nicht existierender Host/Domain"
 msgid "%.3f seconds response time (%s)"
 msgstr "%.3f Sekunden Antwortzeit (%s)"
 
-#: plugins/check_dig.c:217 plugins/check_disk.c:441 plugins/check_dns.c:316
-#: plugins/check_fping.c:245 plugins/check_game.c:202 plugins/check_hpjd.c:337
-#: plugins/check_ldap.c:315 plugins/check_load.c:227 plugins/check_mrtg.c:236
-#: plugins/check_mrtgtraf.c:263 plugins/check_mysql.c:215
-#: plugins/check_overcr.c:335 plugins/check_pgsql.c:212
-#: plugins/check_ping.c:197 plugins/check_procs.c:346
-#: plugins/check_radius.c:221 plugins/check_real.c:354
-#: plugins/check_smtp.c:374 plugins/check_snmp.c:401 plugins/check_ssh.c:113
-#: plugins/check_swap.c:423 plugins/check_tcp.c:465 plugins/check_time.c:219
-#: plugins/check_udp.c:149 plugins/check_ups.c:484 plugins/check_users.c:143
-#: plugins/check_ide_smart.c:209 plugins/negate.c:177 plugins/urlize.c:74
-#, c-format
-msgid ""
-"%s: Unknown argument: %s\n"
-"\n"
-msgstr ""
-"%s: Unbekanntes Argument: %s\n"
-"\n"
-
-#: plugins/check_dig.c:250
+#: plugins/check_dig.c:248
 msgid "Warning interval must be a positive integer"
 msgstr "Warning interval muss ein positiver Integer sein"
 
-#: plugins/check_dig.c:258
+#: plugins/check_dig.c:256
 msgid "Critical interval must be a positive integer"
 msgstr "Critical interval muss ein positiver Integer sein"
 
-#: plugins/check_dig.c:321
+#: plugins/check_dig.c:319
 #, c-format
 msgid ""
 "Test the DNS service on the specified host using dig\n"
@@ -549,7 +549,7 @@ msgstr ""
 "Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
 "\n"
 
-#: plugins/check_dig.c:329
+#: plugins/check_dig.c:327
 #, c-format
 msgid ""
 " -l, --lookup=STRING\n"
@@ -558,7 +558,7 @@ msgstr ""
 " -l, --lookup=STRING\n"
 "   zu prüfender Hostname\n"
 
-#: plugins/check_dig.c:333
+#: plugins/check_dig.c:331
 #, c-format
 msgid ""
 " -T, --record_type=STRING\n"
@@ -567,7 +567,7 @@ msgstr ""
 " -T, --record_type=STRING\n"
 "   abzufragender Datensatztyp (Default: A)\n"
 
-#: plugins/check_dig.c:337
+#: plugins/check_dig.c:335
 #, c-format
 msgid ""
 " -a, --expected_address=STRING\n"
@@ -591,7 +591,7 @@ msgstr ""
 msgid "%s [%s not found]"
 msgstr "%s [%s nicht gefunden]"
 
-#: plugins/check_disk.c:325
+#: plugins/check_disk.c:325 plugins/check_swap.c:391
 msgid "Warning threshold must be integer or percentage!"
 msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein"
 
@@ -609,12 +609,17 @@ msgstr "unbekannter unit type: %s\n"
 msgid "failed allocating storage for '%s'\n"
 msgstr "konnte keinen Speicher für '%s' reservieren\n"
 
-#: plugins/check_disk.c:502
+#: plugins/check_disk.c:489
+#, c-format
+msgid " for %s\n"
+msgstr ""
+
+#: plugins/check_disk.c:500
 #, c-format
 msgid "INPUT ERROR: No thresholds specified"
 msgstr "FEHLER: Kein Schwellwert angegeben"
 
-#: plugins/check_disk.c:508
+#: plugins/check_disk.c:506
 #, c-format
 msgid ""
 "INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be "
@@ -623,7 +628,7 @@ msgstr ""
 "INPUT ERROR: C_DFP (%f) sollte kleiner sein als W_DFP (%.1f) und beide "
 "sollten zwischen 0 und 100 Prozent liegen"
 
-#: plugins/check_disk.c:515
+#: plugins/check_disk.c:513
 #, c-format
 msgid ""
 "INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be "
@@ -632,7 +637,7 @@ msgstr ""
 "INPUT ERROR: C_DF (%lu) sollte kleiner sein als W_DF (%lu) und beide sollten "
 "größer als 0 sein"
 
-#: plugins/check_disk.c:579
+#: plugins/check_disk.c:577
 #, c-format
 msgid ""
 "This plugin checks the amount of used disk space on a mounted file system\n"
@@ -645,7 +650,7 @@ msgstr ""
 "unterschritten wird.\n"
 "\n"
 
-#: plugins/check_disk.c:587
+#: plugins/check_disk.c:585
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -670,7 +675,7 @@ msgstr ""
 " -C, --clear\n"
 "    Schwellwerte löschen\n"
 
-#: plugins/check_disk.c:599
+#: plugins/check_disk.c:597
 #, c-format
 msgid ""
 " -u, --units=STRING\n"
@@ -681,7 +686,7 @@ msgid ""
 "    Same as '--units MB'\n"
 msgstr ""
 
-#: plugins/check_disk.c:607
+#: plugins/check_disk.c:605
 #, c-format
 msgid ""
 " -l, --local\n"
@@ -698,7 +703,7 @@ msgid ""
 "    Display only devices/mountpoints with errors\n"
 msgstr ""
 
-#: plugins/check_disk.c:627
+#: plugins/check_disk.c:625
 msgid ""
 "Examples:\n"
 " check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n"
@@ -717,6 +722,10 @@ msgstr "Warnung Plugin Fehler"
 msgid "DNS CRITICAL - '%s' returned empty host name string\n"
 msgstr "DNS CRITICAL - '%s'  hat einen leeren Hostnamen zurückgegeben\n"
 
+#: plugins/check_dns.c:138
+msgid "Non-authoritative answer:"
+msgstr ""
+
 #: plugins/check_dns.c:171
 msgid "nslookup returned error status"
 msgstr "nslookup hat einen Fehler zurückgegeben"
@@ -736,7 +745,7 @@ msgstr "Erwartet: %s aber: %s erhalten"
 msgid "server %s is not authoritative for %s"
 msgstr "Server %s ist nicht authoritativ  für %s"
 
-#: plugins/check_dns.c:202 plugins/check_dummy.c:60 plugins/check_http.c:930
+#: plugins/check_dns.c:202 plugins/check_dummy.c:59 plugins/check_http.c:930
 #: plugins/check_http.c:1183 plugins/check_procs.c:279
 #, c-format
 msgid "OK"
@@ -808,13 +817,13 @@ msgstr "Netzwerk nicht erreichbar\n"
 msgid "DNS failure for %s\n"
 msgstr "DNS Fehler für %s\n"
 
-#: plugins/check_dns.c:333 plugins/check_dns.c:343 plugins/check_dns.c:352
-#: plugins/check_dns.c:357 plugins/check_dns.c:370 plugins/check_dns.c:381
-#: plugins/check_game.c:219 plugins/check_game.c:227
+#: plugins/check_dns.c:330 plugins/check_dns.c:340 plugins/check_dns.c:349
+#: plugins/check_dns.c:354 plugins/check_dns.c:367 plugins/check_dns.c:378
+#: plugins/check_game.c:216 plugins/check_game.c:224
 msgid "Input buffer overflow\n"
 msgstr "Eingabe-Pufferüberlauf\n"
 
-#: plugins/check_dns.c:377
+#: plugins/check_dns.c:374
 #, c-format
 msgid ""
 "Invalid hostname/address: %s\n"
@@ -823,7 +832,7 @@ msgstr ""
 "Ungültige(r) Name/Adresse: %s\n"
 "\n"
 
-#: plugins/check_dns.c:409
+#: plugins/check_dns.c:404
 #, c-format
 msgid ""
 "This plugin uses the nslookup program to obtain the IP address\n"
@@ -838,7 +847,7 @@ msgstr ""
 "/etc/resolv.conf genutzt.\n"
 "\n"
 
-#: plugins/check_dns.c:419
+#: plugins/check_dns.c:414
 #, c-format
 msgid ""
 "-H, --hostname=HOST\n"
@@ -851,31 +860,31 @@ msgid ""
 "   Optionally expect the DNS server to be authoritative for the lookup\n"
 msgstr ""
 
-#: plugins/check_dummy.c:54
+#: plugins/check_dummy.c:53
 msgid "Arguments to check_dummy must be an integer"
 msgstr "Argument für check_dummy muss ein Integer sein"
 
-#: plugins/check_dummy.c:63 plugins/check_http.c:932 plugins/check_procs.c:281
+#: plugins/check_dummy.c:62 plugins/check_http.c:932 plugins/check_procs.c:281
 #, c-format
 msgid "WARNING"
 msgstr "WARNING"
 
-#: plugins/check_dummy.c:66 plugins/check_http.c:934 plugins/check_procs.c:286
+#: plugins/check_dummy.c:65 plugins/check_http.c:934 plugins/check_procs.c:286
 #, c-format
 msgid "CRITICAL"
 msgstr "CRITICAL"
 
-#: plugins/check_dummy.c:69 plugins/check_http.c:928
+#: plugins/check_dummy.c:68 plugins/check_http.c:928
 #, c-format
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: plugins/check_dummy.c:72
+#: plugins/check_dummy.c:71
 #, c-format
 msgid "Status %d is not a supported error state\n"
 msgstr "Status %d ist kein bekannter Fehlerstatus\n"
 
-#: plugins/check_dummy.c:94
+#: plugins/check_dummy.c:93
 #, c-format
 msgid ""
 "This plugin will simply return the state corresponding to the numeric value\n"
@@ -908,33 +917,29 @@ msgstr "FPING %s - %s (verloren=%.0f%%, rta=%f ms)|%s %s\n"
 msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
 msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n"
 
-#: plugins/check_fping.c:293
+#: plugins/check_fping.c:291
 msgid "Packet size must be a positive integer"
 msgstr "Packet size muss ein positiver Integer sein"
 
-#: plugins/check_fping.c:299
+#: plugins/check_fping.c:297
 msgid "Packet count must be a positive integer"
 msgstr "Packet count muss ein positiver Integer sein"
 
-#: plugins/check_fping.c:306
-msgid ""
-"Hostname was not supplied\n"
-"\n"
+#: plugins/check_fping.c:303 plugins/check_time.c:307 plugins/check_udp.c:207
+msgid "Hostname was not supplied"
 msgstr ""
-"Kein Hostname angegeben\n"
-"\n"
 
-#: plugins/check_fping.c:327
+#: plugins/check_fping.c:323
 #, c-format
 msgid "%s: Only one threshold may be packet loss (%s)\n"
 msgstr "%s: Nur ein Wert darf für packet loss angegeben werden (%s)\n"
 
-#: plugins/check_fping.c:331
+#: plugins/check_fping.c:327
 #, c-format
 msgid "%s: Only one threshold must be packet loss (%s)\n"
 msgstr "%s: Nur ein Wert darf für packet loss angegeben werden (%s)\n"
 
-#: plugins/check_fping.c:364
+#: plugins/check_fping.c:359
 #, c-format
 msgid ""
 "This plugin will use the /bin/fping command to ping the specified host\n"
@@ -943,7 +948,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_fping.c:373
+#: plugins/check_fping.c:368
 #, c-format
 msgid ""
 " -H, --hostname=HOST\n"
@@ -959,7 +964,7 @@ msgid ""
 "    Number of ICMP packets to send (default: %d)\n"
 msgstr ""
 
-#: plugins/check_fping.c:389
+#: plugins/check_fping.c:384
 #, c-format
 msgid ""
 "\n"
@@ -973,12 +978,27 @@ msgstr ""
 msgid "CRITICAL - Host type parameter incorrect!\n"
 msgstr "CRITICAL - Host type parameter unkorrekt!\n"
 
-#: plugins/check_game.c:305
+#: plugins/check_game.c:126
+#, fuzzy, c-format
+msgid "CRITICAL - Host not found\n"
+msgstr "CRITICAL - Text nicht gefunden%s|%s %s\n"
+
+#: plugins/check_game.c:130
+#, fuzzy, c-format
+msgid "CRITICAL - Game server down or unavailable\n"
+msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
+
+#: plugins/check_game.c:134
+#, fuzzy, c-format
+msgid "CRITICAL - Game server timeout\n"
+msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
+
+#: plugins/check_game.c:300
 #, c-format
 msgid "This plugin tests game server connections with the specified host."
 msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
 
-#: plugins/check_game.c:311
+#: plugins/check_game.c:306
 #, c-format
 msgid ""
 "<game>        = Game type that is recognised by qstat (without the leading "
@@ -990,7 +1010,7 @@ msgid ""
 " [ping_field]  = Field number in raw qstat output that contains ping time\n"
 msgstr ""
 
-#: plugins/check_game.c:321
+#: plugins/check_game.c:316
 #, c-format
 msgid ""
 "\n"
@@ -1052,7 +1072,7 @@ msgstr "Papierfehler"
 msgid "Printer ok - (%s)\n"
 msgstr "Printer ok - (%s)\n"
 
-#: plugins/check_hpjd.c:381
+#: plugins/check_hpjd.c:376
 #, c-format
 msgid ""
 "This plugin tests the STATUS of an HP printer with a JetDirect card.\n"
@@ -1064,7 +1084,7 @@ msgstr ""
 "Net-snmp muss auf dem ausführenden Computer installiert sein.\n"
 "\n"
 
-#: plugins/check_hpjd.c:389
+#: plugins/check_hpjd.c:384
 #, c-format
 msgid ""
 " -C, --community=STRING\n"
@@ -1075,7 +1095,7 @@ msgstr ""
 msgid "HTTP CRITICAL - Could not make SSL connection\n"
 msgstr "HTTP CRITICAL - Konnte keine SSL Verbindung herstellen\n"
 
-#: plugins/check_http.c:177 plugins/check_http.c:739
+#: plugins/check_http.c:177 plugins/check_http.c:739 plugins/check_tcp.c:268
 #, c-format
 msgid "CRITICAL - Cannot retrieve server certificate.\n"
 msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
@@ -1093,7 +1113,7 @@ msgstr "Warning threshold  Integer sein"
 msgid "Invalid option - SSL is not available"
 msgstr "Ungültige Option - SSL ist nicht verfügbar\n"
 
-#: plugins/check_http.c:309
+#: plugins/check_http.c:309 plugins/check_tcp.c:576
 msgid "Invalid certificate expiration period"
 msgstr "Ungültiger Zertifikatsablauftermin"
 
@@ -1115,7 +1135,8 @@ msgstr ""
 msgid "Could Not Compile Regular Expression: %s"
 msgstr ""
 
-#: plugins/check_http.c:404 plugins/check_smtp.c:364 plugins/check_tcp.c:484
+#: plugins/check_http.c:404 plugins/check_smtp.c:364 plugins/check_ssh.c:136
+#: plugins/check_tcp.c:482
 msgid "IPv6 support not available"
 msgstr "IPv6 Unterstützung nicht vorhanden"
 
@@ -1293,12 +1314,13 @@ msgstr "Fehlgeschlagen"
 msgid "CRITICAL -  Cannot create SSL context.\n"
 msgstr "CRITICAL -  Konnte SSL Kontext nicht erzeugen.\n"
 
-#: plugins/check_http.c:1214 plugins/check_tcp.c:642
+#: plugins/check_http.c:1214 plugins/check_tcp.c:640
 #, c-format
 msgid "CRITICAL - Cannot initiate SSL handshake.\n"
 msgstr "CRITICAL - Konnte SSL Handshake nicht starten.\n"
 
-#: plugins/check_http.c:1244 plugins/check_http.c:1256
+#: plugins/check_http.c:1244 plugins/check_http.c:1256 plugins/check_tcp.c:670
+#: plugins/check_tcp.c:682
 #, c-format
 msgid "CRITICAL - Wrong time format in certificate.\n"
 msgstr ""
@@ -1462,6 +1484,192 @@ msgid ""
 "the certificate is expired.\n"
 msgstr ""
 
+#: plugins/check_icmp.c:313
+#, c-format
+msgid "Root access needed (for raw sockets)\n"
+msgstr ""
+
+#: plugins/check_icmp.c:319
+msgid "icmp: unknown protocol"
+msgstr ""
+
+#: plugins/check_icmp.c:325
+msgid "Can't create raw socket"
+msgstr ""
+
+#: plugins/check_icmp.c:337
+msgid "Unable to allocate memory for host name list\n"
+msgstr ""
+
+#: plugins/check_icmp.c:362 plugins/check_icmp.c:367 plugins/check_icmp.c:546
+#: plugins/check_icmp.c:551
+#, fuzzy
+msgid "Failed to allocate memory for hostname"
+msgstr "konnte keinen Speicher für '%s' reservieren\n"
+
+#: plugins/check_icmp.c:378 plugins/check_icmp.c:385
+#, c-format
+msgid "Illegal threshold pair specified for -%c"
+msgstr ""
+
+#: plugins/check_icmp.c:392 plugins/check_icmp.c:399 plugins/check_icmp.c:421
+#, c-format
+msgid "Option -%c requires integer argument\n"
+msgstr ""
+
+#: plugins/check_icmp.c:406 plugins/check_icmp.c:414
+#, c-format
+msgid "Option -%c requires positive non-zero integer argument\n"
+msgstr ""
+
+#: plugins/check_icmp.c:470
+#, c-format
+msgid "Option flag -%c specified, but not recognized\n"
+msgstr ""
+
+#: plugins/check_icmp.c:497
+#, c-format
+msgid "%s: these options are too risky for mere mortals.\n"
+msgstr ""
+
+#: plugins/check_icmp.c:498
+#, c-format
+msgid "%s: You need i >= %u and r < %u\n"
+msgstr ""
+
+#: plugins/check_icmp.c:500
+#, c-format
+msgid "Current settings; i = %d, r = %d\n"
+msgstr ""
+
+#: plugins/check_icmp.c:506
+#, c-format
+msgid "%s: data size %u not valid, must be between %u and %u\n"
+msgstr ""
+
+#: plugins/check_icmp.c:513
+#, c-format
+msgid "%s: backoff factor %.1f not valid, must be between %.1f and %.1f\n"
+msgstr ""
+
+#: plugins/check_icmp.c:520
+#, c-format
+msgid "%s: count %u not valid, must be less than %u\n"
+msgstr ""
+
+#: plugins/check_icmp.c:539
+#, c-format
+msgid "Generate flag requires command line parameters beyond switches\n"
+msgstr ""
+
+#: plugins/check_icmp.c:568
+#, c-format
+msgid ""
+"No hosts to work with!\n"
+"\n"
+msgstr ""
+
+#: plugins/check_icmp.c:574
+msgid "Can't malloc array of hosts"
+msgstr ""
+
+#: plugins/check_icmp.c:706
+#, c-format
+msgid "%s is down (lost 100%%)"
+msgstr ""
+
+#: plugins/check_icmp.c:757
+#, c-format
+msgid "No hostaddress specified.\n"
+msgstr ""
+
+#: plugins/check_icmp.c:768
+#, c-format
+msgid "OK - All %d hosts are alive\n"
+msgstr ""
+
+#: plugins/check_icmp.c:771
+#, fuzzy, c-format
+msgid "CRITICAL - %d of %d hosts are alive\n"
+msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
+
+#: plugins/check_icmp.c:787
+msgid "Can't malloc ping packet"
+msgstr ""
+
+#: plugins/check_icmp.c:811
+#, c-format
+msgid "%s error while sending ping: %s\n"
+msgstr ""
+
+#: plugins/check_icmp.c:863
+#, c-format
+msgid "Received packet too short for ICMP (%d bytes from %s)\n"
+msgstr ""
+
+#: plugins/check_icmp.c:906
+#, c-format
+msgid "%s : duplicate for [%d], %d bytes, %s ms"
+msgstr ""
+
+#: plugins/check_icmp.c:916
+#, c-format
+msgid "%s : duplicate for [%d], %d bytes, %s ms\n"
+msgstr ""
+
+#: plugins/check_icmp.c:945
+#, c-format
+msgid "ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s"
+msgstr ""
+
+#: plugins/check_icmp.c:950 plugins/check_icmp.c:974
+#, c-format
+msgid "ICMP Unreachable from %s for ICMP Echo sent to %s"
+msgstr ""
+
+#: plugins/check_icmp.c:1059
+#, fuzzy, c-format
+msgid "%s address not found\n"
+msgstr "%s [%s nicht gefunden]"
+
+#: plugins/check_icmp.c:1067
+#, fuzzy, c-format
+msgid "%s has no address data\n"
+msgstr "Nameserver %s hat keine Datensätze\n"
+
+#: plugins/check_icmp.c:1100
+msgid "Can't allocate some space for a string"
+msgstr ""
+
+#: plugins/check_icmp.c:1119
+msgid "Can't allocate HOST_ENTRY"
+msgstr ""
+
+#: plugins/check_icmp.c:1132
+msgid "Can't allocate resp_times array"
+msgstr ""
+
+#: plugins/check_icmp.c:1196
+msgid "malloc() failed!"
+msgstr ""
+
+#: plugins/check_icmp.c:1213
+#, c-format
+msgid "%s: %s : A network error occurred\n"
+msgstr ""
+
+#: plugins/check_icmp.c:1279
+msgid "select() in u_sleep:"
+msgstr ""
+
+#: plugins/check_icmp.c:1309
+msgid "select() in recvfrom_wto"
+msgstr ""
+
+#: plugins/check_icmp.c:1316
+msgid "recvfrom"
+msgstr ""
+
 #: plugins/check_icmp.c:1371
 #, c-format
 msgid ""
@@ -1503,6 +1711,26 @@ msgstr ""
 msgid "Could not set protocol version %d\n"
 msgstr ""
 
+#: plugins/check_ldap.c:137
+#, fuzzy, c-format
+msgid "Could not init TLS at port %i!\n"
+msgstr "Konnte stderr nicht öffnen für: %s\n"
+
+#: plugins/check_ldap.c:141
+#, c-format
+msgid "TLS not supported by the libraries!\n"
+msgstr ""
+
+#: plugins/check_ldap.c:160
+#, fuzzy, c-format
+msgid "Could not init startTLS at port %i!\n"
+msgstr "Konnte stderr nicht öffnen für: %s\n"
+
+#: plugins/check_ldap.c:164
+#, c-format
+msgid "startTLS not supported by the library, needs LDAPv3!\n"
+msgstr ""
+
 #: plugins/check_ldap.c:174
 #, c-format
 msgid "Could not bind to the ldap-server\n"
@@ -1518,19 +1746,19 @@ msgstr ""
 msgid "LDAP %s - %.3f seconds response time|%s\n"
 msgstr ""
 
-#: plugins/check_ldap.c:311 plugins/check_ping.c:221 plugins/check_ssh.c:138
+#: plugins/check_ldap.c:311 plugins/check_ping.c:219
 msgid "IPv6 support not available\n"
 msgstr ""
 
-#: plugins/check_ldap.c:335
-msgid "please specify the host name\n"
+#: plugins/check_ldap.c:334
+msgid "Please specify the host name\n"
 msgstr ""
 
-#: plugins/check_ldap.c:338
-msgid "please specify the LDAP base\n"
+#: plugins/check_ldap.c:337
+msgid "Please specify the LDAP base\n"
 msgstr ""
 
-#: plugins/check_ldap.c:365
+#: plugins/check_ldap.c:362
 #, c-format
 msgid ""
 " -a [--attr]\n"
@@ -1543,7 +1771,7 @@ msgid ""
 "    ldap password (if required)\n"
 msgstr ""
 
-#: plugins/check_ldap.c:376
+#: plugins/check_ldap.c:373
 #, c-format
 msgid ""
 " -2 [--ver2]\n"
@@ -1586,56 +1814,56 @@ msgstr ""
 msgid "Critical threshold must be float or float triplet!\n"
 msgstr ""
 
-#: plugins/check_load.c:273
+#: plugins/check_load.c:271
 msgid "Warning threshold for 1-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:275
+#: plugins/check_load.c:273
 msgid "Warning threshold for 5-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:277
+#: plugins/check_load.c:275
 msgid "Warning threshold for 15-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:279
+#: plugins/check_load.c:277
 msgid "Critical threshold for 1-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:281
+#: plugins/check_load.c:279
 msgid "Critical threshold for 5-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:283
+#: plugins/check_load.c:281
 msgid "Critical threshold for 15-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:285
+#: plugins/check_load.c:283
 msgid ""
 "Parameter inconsistency: 1-minute \"warning load\" greater than \"critical "
 "load\".\n"
 msgstr ""
 
-#: plugins/check_load.c:287
+#: plugins/check_load.c:285
 msgid ""
 "Parameter inconsistency: 5-minute \"warning load\" greater than \"critical "
 "load\".\n"
 msgstr ""
 
-#: plugins/check_load.c:289
+#: plugins/check_load.c:287
 msgid ""
 "Parameter inconsistency: 15-minute \"warning load\" greater than \"critical "
 "load\".\n"
 msgstr ""
 
-#: plugins/check_load.c:303
+#: plugins/check_load.c:301
 #, c-format
 msgid ""
 "This plugin tests the current system load average.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_load.c:309
+#: plugins/check_load.c:307
 #, c-format
 msgid ""
 " -w, --warning=WLOAD1,WLOAD5,WLOAD15\n"
@@ -1679,22 +1907,22 @@ msgstr ""
 msgid "Invalid variable number"
 msgstr ""
 
-#: plugins/check_mrtg.c:252
+#: plugins/check_mrtg.c:250
 #, c-format
 msgid ""
 "%s is not a valid expiration time\n"
 "Use '%s -h' for additional help\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:269
+#: plugins/check_mrtg.c:267
 msgid "Invalid variable number\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:296
+#: plugins/check_mrtg.c:294
 msgid "You must supply the variable number"
 msgstr ""
 
-#: plugins/check_mrtg.c:317
+#: plugins/check_mrtg.c:315
 #, c-format
 msgid ""
 "This plugin will check either the average or maximum value of one of the\n"
@@ -1702,7 +1930,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:325
+#: plugins/check_mrtg.c:323
 #, c-format
 msgid ""
 " -F, --logfile=FILE\n"
@@ -1719,7 +1947,7 @@ msgid ""
 "   Threshold value for data to result in CRITICAL status\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:339
+#: plugins/check_mrtg.c:337
 #, c-format
 msgid ""
 " -l, --label=STRING\n"
@@ -1729,7 +1957,7 @@ msgid ""
 "   \"Bytes Per Second\", \"%% Utilization\")\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:346
+#: plugins/check_mrtg.c:344
 #, c-format
 msgid ""
 "If the value exceeds the <vwl> threshold, a WARNING status is returned.  If\n"
@@ -1739,7 +1967,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:352
+#: plugins/check_mrtg.c:350
 #, c-format
 msgid ""
 "This plugin is useful for monitoring MRTG data that does not correspond to\n"
@@ -1752,7 +1980,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:359
+#: plugins/check_mrtg.c:357
 #, c-format
 msgid ""
 "Notes:\n"
@@ -1783,7 +2011,7 @@ msgstr ""
 msgid "Traffic %s - %s\n"
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:324
+#: plugins/check_mrtgtraf.c:320
 #, c-format
 msgid ""
 "\n"
@@ -1796,7 +2024,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:336
+#: plugins/check_mrtgtraf.c:332
 #, c-format
 msgid ""
 " -F, --filename=STRING\n"
@@ -1811,7 +2039,7 @@ msgid ""
 "   Critical threshold pair \"<incoming>,<outgoing>\"\n"
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:348
+#: plugins/check_mrtgtraf.c:344
 #, c-format
 msgid ""
 "Notes:\n"
@@ -1824,12 +2052,32 @@ msgid ""
 "  for future enhancements of this plugin.\n"
 msgstr ""
 
-#: plugins/check_mysql.c:279
+#: plugins/check_mysql.c:101
+#, c-format
+msgid "slave query error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:107
+#, c-format
+msgid "slave store_result error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:114
+#, c-format
+msgid "slave fetch row error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:119
+#, c-format
+msgid "Slave running: %s"
+msgstr ""
+
+#: plugins/check_mysql.c:274
 #, c-format
 msgid "This program tests connections to a mysql server\n"
 msgstr ""
 
-#: plugins/check_mysql.c:287
+#: plugins/check_mysql.c:282
 #, c-format
 msgid ""
 " -d, --database=STRING\n"
@@ -1844,7 +2092,7 @@ msgid ""
 "   Check if the slave thread is running properly.\n"
 msgstr ""
 
-#: plugins/check_mysql.c:299
+#: plugins/check_mysql.c:294
 #, c-format
 msgid ""
 "\n"
@@ -1857,6 +2105,11 @@ msgstr ""
 msgid "CRITICAL - Cannot open status log for reading!\n"
 msgstr ""
 
+#: plugins/check_nagios.c:98
+#, c-format
+msgid "command: %s\n"
+msgstr ""
+
 #: plugins/check_nagios.c:140
 #, c-format
 msgid "Found process: %s %s\n"
@@ -1872,35 +2125,22 @@ msgstr ""
 msgid "Nagios %s: located %d process%s, status log updated %d second%s ago\n"
 msgstr ""
 
-#: plugins/check_nagios.c:209 plugins/check_nagios.c:243
-#, c-format
-msgid ""
-"Expiration time must be an integer (seconds)\n"
-"Type '%s -h' for additional help\n"
-msgstr ""
-
-#: plugins/check_nagios.c:223
-#, c-format
-msgid ""
-"%s: Unknown argument: %c\n"
-"\n"
-msgstr ""
+#: plugins/check_nagios.c:209 plugins/check_nagios.c:240
+#, fuzzy
+msgid "Expiration time must be an integer (seconds)\n"
+msgstr "skip lines muss ein Integer sein"
 
-#: plugins/check_nagios.c:255
-#, c-format
-msgid ""
-"You must provide the status_log\n"
-"Type '%s -h' for additional help\n"
-msgstr ""
+#: plugins/check_nagios.c:251
+#, fuzzy
+msgid "You must provide the status_log\n"
+msgstr "%s: Hostname muss angegeben werden\n"
 
-#: plugins/check_nagios.c:259
-#, c-format
-msgid ""
-"You must provide a process string\n"
-"Type '%s -h' for additional help\n"
-msgstr ""
+#: plugins/check_nagios.c:254
+#, fuzzy
+msgid "You must provide a process string\n"
+msgstr "%s: Hostname muss angegeben werden\n"
 
-#: plugins/check_nagios.c:274
+#: plugins/check_nagios.c:268
 #, c-format
 msgid ""
 "This plugin checks the status of the Nagios process on the local\n"
@@ -1911,7 +2151,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_nagios.c:284
+#: plugins/check_nagios.c:278
 #, c-format
 msgid ""
 " -F, --filename=FILE\n"
@@ -1922,7 +2162,7 @@ msgid ""
 "   Substring to search for in process arguments\n"
 msgstr ""
 
-#: plugins/check_nagios.c:292
+#: plugins/check_nagios.c:286
 #, c-format
 msgid ""
 "Example:\n"
@@ -2019,19 +2259,20 @@ msgstr ""
 msgid "Please specify a variable to check"
 msgstr ""
 
-#: plugins/check_nt.c:510 plugins/check_nwstat.c:782
-#: plugins/check_overcr.c:352
-#, c-format
-msgid ""
-"Server port an integer (seconds)\n"
-"Type '%s -h' for additional help\n"
-msgstr ""
+#: plugins/check_nt.c:508
+#, fuzzy
+msgid "Server port must be an integer\n"
+msgstr "skip lines muss ein Integer sein"
 
-#: plugins/check_nt.c:563
+#: plugins/check_nt.c:561
 msgid "None"
 msgstr ""
 
-#: plugins/check_nt.c:620
+#: plugins/check_nt.c:574
+msgid "could not fetch information from server\n"
+msgstr ""
+
+#: plugins/check_nt.c:618
 #, c-format
 msgid ""
 "This plugin collects data from the NSClient service running on a\n"
@@ -2039,7 +2280,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_nt.c:625
+#: plugins/check_nt.c:623
 #, c-format
 msgid ""
 "\n"
@@ -2062,21 +2303,21 @@ msgid ""
 "  Print version information\n"
 msgstr ""
 
-#: plugins/check_nt.c:643
+#: plugins/check_nt.c:641
 #, c-format
 msgid ""
 "-v, --variable=STRING\n"
 "  Variable to check.  Valid variables are:\n"
 msgstr ""
 
-#: plugins/check_nt.c:646
+#: plugins/check_nt.c:644
 #, c-format
 msgid ""
 "   CLIENTVERSION = Get the NSClient version\n"
 "     If -l <version> is specified, will return warning if versions differ.\n"
 msgstr ""
 
-#: plugins/check_nt.c:649
+#: plugins/check_nt.c:647
 #, c-format
 msgid ""
 "   CPULOAD = Average CPU load on last x minutes.\n"
@@ -2088,14 +2329,14 @@ msgid ""
 "     ie: -l 60,90,95,120,90,95\n"
 msgstr ""
 
-#: plugins/check_nt.c:656
+#: plugins/check_nt.c:654
 #, c-format
 msgid ""
 "   UPTIME = Get the uptime of the machine.\n"
 "     No specific parameters. No warning or critical threshold\n"
 msgstr ""
 
-#: plugins/check_nt.c:659
+#: plugins/check_nt.c:657
 #, c-format
 msgid ""
 "   USEDDISKSPACE = Size and percentage of disk use.\n"
@@ -2103,14 +2344,14 @@ msgid ""
 "     Warning and critical thresholds can be specified with -w and -c.\n"
 msgstr ""
 
-#: plugins/check_nt.c:663
+#: plugins/check_nt.c:661
 #, c-format
 msgid ""
 "   MEMUSE = Memory use.\n"
 "     Warning and critical thresholds can be specified with -w and -c.\n"
 msgstr ""
 
-#: plugins/check_nt.c:666
+#: plugins/check_nt.c:664
 #, c-format
 msgid ""
 "   SERVICESTATE = Check the state of one or several services.\n"
@@ -2120,14 +2361,14 @@ msgid ""
 "\t\t in the returned string.\n"
 msgstr ""
 
-#: plugins/check_nt.c:672
+#: plugins/check_nt.c:670
 #, c-format
 msgid ""
 "   PROCSTATE = Check if one or several process are running.\n"
 "     Same syntax as SERVICESTATE.\n"
 msgstr ""
 
-#: plugins/check_nt.c:675
+#: plugins/check_nt.c:673
 #, c-format
 msgid ""
 "   COUNTER = Check any performance counter of Windows NT/2000.\n"
@@ -2141,7 +2382,7 @@ msgid ""
 "       \"%%.f %%%% paging file used.\"\n"
 msgstr ""
 
-#: plugins/check_nt.c:685
+#: plugins/check_nt.c:683
 #, c-format
 msgid ""
 "Notes:\n"
@@ -2328,7 +2569,12 @@ msgstr ""
 msgid "Nothing to check!\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:910
+#: plugins/check_nwstat.c:780 plugins/check_overcr.c:342
+#, fuzzy
+msgid "Server port an integer\n"
+msgstr "skip lines muss ein Integer sein"
+
+#: plugins/check_nwstat.c:908
 #, c-format
 msgid ""
 "This plugin attempts to contact the MRTGEXT NLM running on a\n"
@@ -2336,7 +2582,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:920
+#: plugins/check_nwstat.c:918
 #, c-format
 msgid ""
 " -v, --variable=STRING\n"
@@ -2349,7 +2595,7 @@ msgid ""
 "      UPTIME    = server uptime\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:930
+#: plugins/check_nwstat.c:928
 #, c-format
 msgid ""
 "      LTCH      = percent long term cache hits\n"
@@ -2359,7 +2605,7 @@ msgid ""
 "      TCB       = dirty cache buffers as a percentage of the original\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:937
+#: plugins/check_nwstat.c:935
 #, c-format
 msgid ""
 "      OFILES    = number of open files\n"
@@ -2371,7 +2617,7 @@ msgid ""
 "      VKNP<vol> = KB of not yet purgeable space on volume <vol>\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:946
+#: plugins/check_nwstat.c:944
 #, c-format
 msgid ""
 "      LRUM      = LRU sitting time in minutes\n"
@@ -2384,7 +2630,7 @@ msgid ""
 "      SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:956
+#: plugins/check_nwstat.c:954
 #, c-format
 msgid ""
 "      TSYNC     = timesync status \n"
@@ -2394,7 +2640,7 @@ msgid ""
 "                  (e.g. \"NLM:TSANDS.NLM\")\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:963
+#: plugins/check_nwstat.c:961
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -2405,7 +2651,7 @@ msgid ""
 "    Include server version string in results\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:973
+#: plugins/check_nwstat.c:971
 #, c-format
 msgid ""
 "\n"
@@ -2471,7 +2717,7 @@ msgstr ""
 msgid "Uptime %s - Up %d days %d hours %d minutes"
 msgstr ""
 
-#: plugins/check_overcr.c:418
+#: plugins/check_overcr.c:406
 #, c-format
 msgid ""
 "This plugin attempts to contact the Over-CR collector daemon running on the\n"
@@ -2479,7 +2725,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_overcr.c:428
+#: plugins/check_overcr.c:416
 #, c-format
 msgid ""
 "-v, --variable=STRING\n"
@@ -2493,7 +2739,7 @@ msgid ""
 "     UPTIME        = system uptime in seconds\n"
 msgstr ""
 
-#: plugins/check_overcr.c:439
+#: plugins/check_overcr.c:427
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -2502,7 +2748,7 @@ msgid ""
 "   Threshold which will result in a critical status\n"
 msgstr ""
 
-#: plugins/check_overcr.c:447
+#: plugins/check_overcr.c:435
 #, c-format
 msgid ""
 "Notes:\n"
@@ -2511,7 +2757,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_overcr.c:452
+#: plugins/check_overcr.c:440
 #, c-format
 msgid ""
 " - This plugin requres that Eric Molitors' Over-CR collector daemon be\n"
@@ -2531,27 +2777,33 @@ msgstr ""
 msgid " %s - database %s (%d sec.)|%s\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:229 plugins/check_pgsql.c:235 plugins/check_tcp.c:494
-#: plugins/check_time.c:267 plugins/check_time.c:279 plugins/check_udp.c:168
+#: plugins/check_pgsql.c:227 plugins/check_tcp.c:492 plugins/check_time.c:265
+#: plugins/check_time.c:277 plugins/check_udp.c:166 plugins/check_users.c:152
 msgid "Critical threshold must be a positive integer"
 msgstr "Critical threshold muss ein positiver Integer sein"
 
-#: plugins/check_pgsql.c:253
+#: plugins/check_pgsql.c:233 plugins/check_tcp.c:502 plugins/check_time.c:246
+#: plugins/check_time.c:270 plugins/check_udp.c:173 plugins/check_users.c:158
+#: plugins/check_users.c:168 plugins/check_users.c:175
+msgid "Warning threshold must be a positive integer"
+msgstr "Warning threshold muss ein positiver Integer sein"
+
+#: plugins/check_pgsql.c:251
 msgid "Database name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:259
+#: plugins/check_pgsql.c:257
 msgid "User name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:396
+#: plugins/check_pgsql.c:394
 #, c-format
 msgid ""
 "Test whether a PostgreSQL Database is accepting connections.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:406
+#: plugins/check_pgsql.c:404
 #, c-format
 msgid ""
 "  -d, --database=STRING\n"
@@ -2562,7 +2814,7 @@ msgid ""
 "    Password (BIG SECURITY ISSUE)\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:420
+#: plugins/check_pgsql.c:418
 #, c-format
 msgid ""
 "\n"
@@ -2575,7 +2827,7 @@ msgid ""
 "PostgreSQL DBMS.\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:427
+#: plugins/check_pgsql.c:425
 #, c-format
 msgid ""
 "\n"
@@ -2584,7 +2836,7 @@ msgid ""
 "connections (start the postmaster with the -i option).\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:431
+#: plugins/check_pgsql.c:429
 #, c-format
 msgid ""
 "\n"
@@ -2608,114 +2860,114 @@ msgstr ""
 msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"
 msgstr ""
 
-#: plugins/check_ping.c:232
+#: plugins/check_ping.c:230
 msgid "Could not realloc() addresses\n"
 msgstr ""
 
-#: plugins/check_ping.c:247 plugins/check_ping.c:327
+#: plugins/check_ping.c:245 plugins/check_ping.c:325
 #, c-format
 msgid "<max_packets> (%s) must be a non-negative number\n"
 msgstr ""
 
-#: plugins/check_ping.c:281
+#: plugins/check_ping.c:279
 #, c-format
 msgid "<wpl> (%s) must be an integer percentage\n"
 msgstr ""
 
-#: plugins/check_ping.c:292
+#: plugins/check_ping.c:290
 #, c-format
 msgid "<cpl> (%s) must be an integer percentage\n"
 msgstr ""
 
-#: plugins/check_ping.c:303
+#: plugins/check_ping.c:301
 #, c-format
 msgid "<wrta> (%s) must be a non-negative number\n"
 msgstr ""
 
-#: plugins/check_ping.c:314
+#: plugins/check_ping.c:312
 #, c-format
 msgid "<crta> (%s) must be a non-negative number\n"
 msgstr ""
 
-#: plugins/check_ping.c:347
+#: plugins/check_ping.c:345
 #, c-format
 msgid ""
 "%s: Warning threshold must be integer or percentage!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:360
+#: plugins/check_ping.c:358
 #, c-format
 msgid "<wrta> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:364
+#: plugins/check_ping.c:362
 #, c-format
 msgid "<crta> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:368
+#: plugins/check_ping.c:366
 #, c-format
 msgid "<wpl> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:372
+#: plugins/check_ping.c:370
 #, c-format
 msgid "<cpl> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:376
+#: plugins/check_ping.c:374
 #, c-format
 msgid "<wrta> (%f) cannot be larger than <crta> (%f)\n"
 msgstr ""
 
-#: plugins/check_ping.c:380
+#: plugins/check_ping.c:378
 #, c-format
 msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
 msgstr ""
 
-#: plugins/check_ping.c:408
+#: plugins/check_ping.c:406
 #, c-format
 msgid "Cannot open pipe: %s"
 msgstr ""
 
-#: plugins/check_ping.c:412
+#: plugins/check_ping.c:410
 #, c-format
 msgid "Cannot open stderr for %s\n"
 msgstr ""
 
-#: plugins/check_ping.c:467
+#: plugins/check_ping.c:465
 #, c-format
 msgid "CRITICAL - Network unreachable (%s)"
 msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
 
-#: plugins/check_ping.c:469
+#: plugins/check_ping.c:467
 #, c-format
 msgid "CRITICAL - Host Unreachable (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:471
+#: plugins/check_ping.c:469
 #, c-format
 msgid "CRITICAL - Host not found (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:473
+#: plugins/check_ping.c:471
 #, c-format
 msgid "CRITICAL - Time to live exceeded (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:480
+#: plugins/check_ping.c:478
 msgid "Unable to realloc warn_text"
 msgstr ""
 
-#: plugins/check_ping.c:497
+#: plugins/check_ping.c:495
 #, c-format
 msgid ""
 "Use ping to check connection statistics for a remote host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:505
+#: plugins/check_ping.c:503
 #, c-format
 msgid ""
 "-H, --hostname=HOST\n"
@@ -2730,7 +2982,7 @@ msgid ""
 "   show HTML in the plugin output (obsoleted by urlize)\n"
 msgstr ""
 
-#: plugins/check_ping.c:520
+#: plugins/check_ping.c:518
 #, c-format
 msgid ""
 "THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel\n"
@@ -2739,7 +2991,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:525
+#: plugins/check_ping.c:523
 #, c-format
 msgid ""
 "This plugin uses the ping command to probe the specified host for packet "
@@ -2804,109 +3056,95 @@ msgstr[1] ""
 msgid " with %s"
 msgstr ""
 
-#: plugins/check_procs.c:371
-msgid ""
-"Critical Process Count must be an integer!\n"
-"\n"
-msgstr ""
+#: plugins/check_procs.c:369
+#, fuzzy
+msgid "Critical Process Count must be an integer!"
+msgstr "Critical threshold muss ein Integer sein"
 
-#: plugins/check_procs.c:383
-msgid ""
-"Warning Process Count must be an integer!\n"
-"\n"
-msgstr ""
+#: plugins/check_procs.c:381
+#, fuzzy
+msgid "Warning Process Count must be an integer!"
+msgstr "Warning threshold  Integer sein"
 
-#: plugins/check_procs.c:391
-#, c-format
-msgid ""
-"%s: Parent Process ID must be an integer!\n"
-"\n"
-msgstr ""
+#: plugins/check_procs.c:389
+#, fuzzy
+msgid "Parent Process ID must be an integer!"
+msgstr "Argument für check_dummy muss ein Integer sein"
 
-#: plugins/check_procs.c:397 plugins/check_procs.c:502
+#: plugins/check_procs.c:395 plugins/check_procs.c:497
 #, c-format
 msgid "%s%sSTATE = %s"
 msgstr ""
 
-#: plugins/check_procs.c:406
-#, c-format
-msgid "UID %s was not found\n"
-msgstr ""
+#: plugins/check_procs.c:404
+#, fuzzy, c-format
+msgid "UID %s was not found"
+msgstr "%s [%s nicht gefunden]"
 
-#: plugins/check_procs.c:412
-#, c-format
-msgid "User name %s was not found\n"
-msgstr ""
+#: plugins/check_procs.c:410
+#, fuzzy, c-format
+msgid "User name %s was not found"
+msgstr "%s [%s nicht gefunden]"
 
-#: plugins/check_procs.c:417
+#: plugins/check_procs.c:415
 #, c-format
 msgid "%s%sUID = %d (%s)"
 msgstr ""
 
-#: plugins/check_procs.c:427
+#: plugins/check_procs.c:425
 #, c-format
 msgid "%s%scommand name '%s'"
 msgstr ""
 
-#: plugins/check_procs.c:437
+#: plugins/check_procs.c:435
 #, c-format
 msgid "%s%sargs '%s'"
 msgstr ""
 
-#: plugins/check_procs.c:442
+#: plugins/check_procs.c:440
 #, c-format
 msgid "%s%sRSS >= %d"
 msgstr ""
 
-#: plugins/check_procs.c:446
-#, c-format
-msgid ""
-"%s: RSS must be an integer!\n"
-"\n"
-msgstr ""
+#: plugins/check_procs.c:444
+#, fuzzy
+msgid "RSS must be an integer!"
+msgstr "skip lines muss ein Integer sein"
 
-#: plugins/check_procs.c:449
+#: plugins/check_procs.c:447
 #, c-format
 msgid "%s%sVSZ >= %d"
 msgstr ""
 
-#: plugins/check_procs.c:453
-#, c-format
-msgid ""
-"%s: VSZ must be an integer!\n"
-"\n"
-msgstr ""
+#: plugins/check_procs.c:451
+#, fuzzy
+msgid "VSZ must be an integer!"
+msgstr "skip lines muss ein Integer sein"
 
-#: plugins/check_procs.c:457
+#: plugins/check_procs.c:455
 #, c-format
 msgid "%s%sPCPU >= %.2f"
 msgstr ""
 
-#: plugins/check_procs.c:461
-#, c-format
-msgid ""
-"%s: PCPU must be a float!\n"
-"\n"
+#: plugins/check_procs.c:459
+msgid "PCPU must be a float!"
 msgstr ""
 
-#: plugins/check_procs.c:485
-#, c-format
-msgid ""
-"%s: metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!\n"
-"\n"
+#: plugins/check_procs.c:483
+msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
 msgstr ""
 
-#: plugins/check_procs.c:521
+#: plugins/check_procs.c:516
 #, c-format
 msgid "wmax (%d) cannot be greater than cmax (%d)\n"
 msgstr ""
 
-#: plugins/check_procs.c:525
+#: plugins/check_procs.c:520
 #, c-format
 msgid "wmin (%d) cannot be less than cmin (%d)\n"
 msgstr ""
 
-#: plugins/check_procs.c:665
+#: plugins/check_procs.c:657
 #, c-format
 msgid ""
 "Checks all processes and generates WARNING or CRITICAL states if the "
@@ -2918,7 +3156,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:672
+#: plugins/check_procs.c:664
 #, c-format
 msgid ""
 "\n"
@@ -2929,7 +3167,7 @@ msgid ""
 "   Generate critical state if metric is outside this range\n"
 msgstr ""
 
-#: plugins/check_procs.c:679
+#: plugins/check_procs.c:671
 #, c-format
 msgid ""
 "\n"
@@ -2942,19 +3180,19 @@ msgid ""
 "   CPU     - percentage cpu\n"
 msgstr ""
 
-#: plugins/check_procs.c:689
+#: plugins/check_procs.c:681
 #, c-format
 msgid "   ELAPSED - time elapsed in seconds\n"
 msgstr ""
 
-#: plugins/check_procs.c:694
+#: plugins/check_procs.c:686
 #, c-format
 msgid ""
 " -v, --verbose\n"
 "   Extra information. Up to 3 verbosity levels\n"
 msgstr ""
 
-#: plugins/check_procs.c:698
+#: plugins/check_procs.c:690
 #, c-format
 msgid ""
 "\n"
@@ -2971,7 +3209,7 @@ msgid ""
 "   Only scan for processes with rss higher than indicated.\n"
 msgstr ""
 
-#: plugins/check_procs.c:711
+#: plugins/check_procs.c:703
 #, c-format
 msgid ""
 " -P, --pcpu=PCPU\n"
@@ -2984,7 +3222,7 @@ msgid ""
 "   Only scan for exact matches of COMMAND (without path).\n"
 msgstr ""
 
-#: plugins/check_procs.c:721
+#: plugins/check_procs.c:713
 #, c-format
 msgid ""
 "\n"
@@ -2994,7 +3232,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:726
+#: plugins/check_procs.c:718
 #, c-format
 msgid ""
 "This plugin checks the number of currently running processes and\n"
@@ -3005,7 +3243,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:733
+#: plugins/check_procs.c:725
 #, c-format
 msgid ""
 "Examples:\n"
@@ -3048,18 +3286,18 @@ msgstr ""
 msgid "Auth OK"
 msgstr ""
 
-#: plugins/check_radius.c:202 plugins/check_radius.c:264
+#: plugins/check_radius.c:202 plugins/check_radius.c:262
 msgid "Number of retries must be a positive integer"
 msgstr ""
 
-#: plugins/check_radius.c:290
+#: plugins/check_radius.c:288
 #, c-format
 msgid ""
 "Tests to see if a radius server is accepting connections.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_radius.c:298
+#: plugins/check_radius.c:296
 #, c-format
 msgid ""
 " -u, --username=STRING\n"
@@ -3076,7 +3314,7 @@ msgid ""
 "    Number of times to retry a failed connection\n"
 msgstr ""
 
-#: plugins/check_radius.c:314
+#: plugins/check_radius.c:312
 #, c-format
 msgid ""
 "\n"
@@ -3088,7 +3326,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_radius.c:321
+#: plugins/check_radius.c:319
 #, c-format
 msgid ""
 "The password option presents a substantial security issue because the\n"
@@ -3129,30 +3367,27 @@ msgstr ""
 msgid "REAL %s - %d second response time\n"
 msgstr ""
 
-#: plugins/check_real.c:324 plugins/check_smtp.c:343
+#: plugins/check_real.c:324 plugins/check_smtp.c:343 plugins/check_ups.c:522
 msgid "Warning time must be a positive integer"
 msgstr "Warnung time muss ein positiver Integer sein"
 
-#: plugins/check_real.c:333
-msgid "Critical time must be a nonnegative integer"
+#: plugins/check_real.c:333 plugins/check_smtp.c:334 plugins/check_ups.c:513
+msgid "Critical time must be a positive integer"
 msgstr "Critical time muss ein positiver Integer sein"
 
-#: plugins/check_real.c:344
-msgid "Time interval must be a nonnegative integer"
-msgstr "Time interval muss ein positiver Integer sein"
-
-#: plugins/check_real.c:371
-msgid "You must provide a server to check\n"
-msgstr ""
+#: plugins/check_real.c:369
+#, fuzzy
+msgid "You must provide a server to check"
+msgstr "%s: Hostname muss angegeben werden\n"
 
-#: plugins/check_real.c:403
+#: plugins/check_real.c:401
 #, c-format
 msgid ""
 "This plugin tests the REAL service on the specified host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_real.c:411
+#: plugins/check_real.c:409
 #, c-format
 msgid ""
 " -u, --url=STRING\n"
@@ -3161,7 +3396,7 @@ msgid ""
 "   String to expect in first line of server response (default: %s)\n"
 msgstr ""
 
-#: plugins/check_real.c:424
+#: plugins/check_real.c:422
 #, c-format
 msgid ""
 "This plugin will attempt to open an RTSP connection with the host.\n"
@@ -3186,7 +3421,7 @@ msgstr ""
 msgid "Invalid SMTP response received from host on port %d\n"
 msgstr ""
 
-#: plugins/check_smtp.c:182 plugins/check_snmp.c:510
+#: plugins/check_smtp.c:182 plugins/check_snmp.c:508
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr ""
@@ -3206,27 +3441,19 @@ msgstr ""
 msgid "SMTP %s - %.3f sec. response time%s%s|%s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:313 plugins/check_smtp.c:323 plugins/check_snmp.c:566
+#: plugins/check_smtp.c:313 plugins/check_smtp.c:323 plugins/check_snmp.c:564
 #, c-format
 msgid "Could not realloc() units [%d]\n"
 msgstr ""
 
-#: plugins/check_smtp.c:334
-msgid "Critical time must be a positive integer"
-msgstr "Critical time muss ein positiver Integer sein"
-
-#: plugins/check_smtp.c:354
-msgid "Time interval must be a positive integer"
-msgstr "Time interval muss ein positiver Integer sein"
-
-#: plugins/check_smtp.c:426
+#: plugins/check_smtp.c:424
 #, c-format
 msgid ""
 "This plugin will attempt to open an SMTP connection with the host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_smtp.c:436
+#: plugins/check_smtp.c:434
 #, c-format
 msgid ""
 " -e, --expect=STRING\n"
@@ -3241,7 +3468,7 @@ msgid ""
 "   FROM-address to include in MAIL command, required by Exchange 2000\n"
 msgstr ""
 
-#: plugins/check_smtp.c:455
+#: plugins/check_smtp.c:453
 #, c-format
 msgid ""
 "\n"
@@ -3251,7 +3478,11 @@ msgid ""
 "STATE_WARNING return values.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:284 plugins/check_snmp.c:516
+#: plugins/check_snmp.c:254
+msgid "No valid data returned"
+msgstr ""
+
+#: plugins/check_snmp.c:284 plugins/check_snmp.c:514
 #, c-format
 msgid "%s UNKNOWN: call for regex which was not a compiled option"
 msgstr ""
@@ -3263,54 +3494,58 @@ msgid ""
 "CMD: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:455
+#: plugins/check_snmp.c:453
 #, c-format
 msgid "Invalid critical threshold: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:466
+#: plugins/check_snmp.c:464
 #, c-format
 msgid "Invalid warning threshold: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:536
+#: plugins/check_snmp.c:534
 #, c-format
 msgid "Could not realloc() labels[%d]"
 msgstr ""
 
-#: plugins/check_snmp.c:548
+#: plugins/check_snmp.c:546
 msgid "Could not realloc() labels\n"
 msgstr ""
 
-#: plugins/check_snmp.c:578
+#: plugins/check_snmp.c:576
 msgid "Could not realloc() units\n"
 msgstr ""
 
-#: plugins/check_snmp.c:651
+#: plugins/check_snmp.c:649
 #, c-format
 msgid ""
 "Missing secname (%s) or authpassword (%s) ! \n"
 ")"
 msgstr ""
 
-#: plugins/check_snmp.c:659
+#: plugins/check_snmp.c:657
 #, c-format
 msgid "Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n"
 msgstr ""
 
-#: plugins/check_snmp.c:668
+#: plugins/check_snmp.c:666
 #, c-format
 msgid "Invalid SNMP version: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:847
+#: plugins/check_snmp.c:796
+msgid "Unbalanced quotes\n"
+msgstr ""
+
+#: plugins/check_snmp.c:845
 #, c-format
 msgid ""
 "Check status of remote machines and obtain sustem information via SNMP\n"
 "\n"
 msgstr ""
 
-#: plugins/check_snmp.c:857
+#: plugins/check_snmp.c:855
 #, c-format
 msgid ""
 " -P, --protocol=[1|3]\n"
@@ -3321,7 +3556,7 @@ msgid ""
 "    SNMPv3 auth proto\n"
 msgstr ""
 
-#: plugins/check_snmp.c:866
+#: plugins/check_snmp.c:864
 #, c-format
 msgid ""
 " -C, --community=STRING\n"
@@ -3335,7 +3570,7 @@ msgid ""
 "    SNMPv3 crypt passwd (DES)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:876
 #, c-format
 msgid ""
 " -o, --oid=OID(s)\n"
@@ -3348,7 +3583,7 @@ msgid ""
 "    to be the data that should be used in the evaluation.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:888
+#: plugins/check_snmp.c:886
 #, c-format
 msgid ""
 " -w, --warning=INTEGER_RANGE(s)\n"
@@ -3357,7 +3592,7 @@ msgid ""
 "    Range(s) which will not result in a CRITICAL status\n"
 msgstr ""
 
-#: plugins/check_snmp.c:895
+#: plugins/check_snmp.c:893
 #, c-format
 msgid ""
 " -s, --string=STRING\n"
@@ -3372,7 +3607,7 @@ msgid ""
 "    Prefix label for output from plugin (default -s 'SNMP')\n"
 msgstr ""
 
-#: plugins/check_snmp.c:906
+#: plugins/check_snmp.c:904
 #, c-format
 msgid ""
 " -u, --units=STRING\n"
@@ -3381,7 +3616,7 @@ msgid ""
 "    Separates output on multiple OID requests\n"
 msgstr ""
 
-#: plugins/check_snmp.c:916
+#: plugins/check_snmp.c:914
 #, c-format
 msgid ""
 "\n"
@@ -3392,7 +3627,7 @@ msgid ""
 "  http://net-snmp.sourceforge.net before you can use this plugin.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:921
+#: plugins/check_snmp.c:919
 #, c-format
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
@@ -3400,7 +3635,7 @@ msgid ""
 "  internal spaces must be quoted) [max 8 OIDs]\n"
 msgstr ""
 
-#: plugins/check_snmp.c:925
+#: plugins/check_snmp.c:923
 #, c-format
 msgid ""
 "- Ranges are inclusive and are indicated with colons. When specified as\n"
@@ -3410,7 +3645,7 @@ msgid ""
 "  returned if the result is outside the specified range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:931
+#: plugins/check_snmp.c:929
 #, c-format
 msgid ""
 "- If specified in the order 'max:min' a non-OK state will be returned if "
@@ -3418,7 +3653,7 @@ msgid ""
 "  result is within the (inclusive) range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:935
+#: plugins/check_snmp.c:933
 #, c-format
 msgid ""
 "- Upper or lower bounds may be omitted to skip checking the respective "
@@ -3432,29 +3667,34 @@ msgid ""
 "  returned from the SNMP query is an unsigned integer.\n"
 msgstr ""
 
-#: plugins/check_ssh.c:221
+#: plugins/check_ssh.c:152
+#, fuzzy
+msgid "Port number must be a positive integer"
+msgstr "Port muss ein positiver Integer sein"
+
+#: plugins/check_ssh.c:217
 #, c-format
 msgid "Server answer: %s"
 msgstr ""
 
-#: plugins/check_ssh.c:239
+#: plugins/check_ssh.c:235
 #, c-format
 msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"
 msgstr ""
 
-#: plugins/check_ssh.c:245
+#: plugins/check_ssh.c:241
 #, c-format
 msgid "SSH OK - %s (protocol %s)\n"
 msgstr ""
 
-#: plugins/check_ssh.c:264
+#: plugins/check_ssh.c:260
 #, c-format
 msgid ""
 "Try to connect to an SSH server at specified server and port\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ssh.c:276
+#: plugins/check_ssh.c:272
 #, c-format
 msgid ""
 " -r, --remote-version=STRING\n"
@@ -3482,35 +3722,35 @@ msgstr ""
 msgid "total=%llu, free=%llu\n"
 msgstr ""
 
+#: plugins/check_swap.c:242 plugins/check_swap.c:281
+msgid "swapctl failed: "
+msgstr ""
+
 #: plugins/check_swap.c:314
 #, c-format
 msgid " %d%% free (%llu MB out of %llu MB)"
 msgstr ""
 
-#: plugins/check_swap.c:391
-msgid "Warning threshold must be integer or percentage!\n"
-msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein!\n"
-
 #: plugins/check_swap.c:408
 msgid "Critical threshold must be integer or percentage!\n"
 msgstr "Critical threshold muss ein Integer oder ein Prozentwert sein!\n"
 
-#: plugins/check_swap.c:464
+#: plugins/check_swap.c:462
 msgid "Warning percentage should be more than critical percentage\n"
 msgstr ""
 
-#: plugins/check_swap.c:468
+#: plugins/check_swap.c:466
 msgid "Warning free space should be more than critical free space\n"
 msgstr ""
 
-#: plugins/check_swap.c:482
+#: plugins/check_swap.c:480
 #, c-format
 msgid ""
 "Check swap space on local machine.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_swap.c:488
+#: plugins/check_swap.c:486
 #, c-format
 msgid ""
 "\n"
@@ -3530,7 +3770,7 @@ msgid ""
 "    Verbose output. Up to 3 levels\n"
 msgstr ""
 
-#: plugins/check_swap.c:502
+#: plugins/check_swap.c:500
 #, c-format
 msgid ""
 "\n"
@@ -3539,7 +3779,7 @@ msgid ""
 "real memory\n"
 msgstr ""
 
-#: plugins/check_swap.c:506
+#: plugins/check_swap.c:504
 #, c-format
 msgid ""
 "\n"
@@ -3550,6 +3790,11 @@ msgstr ""
 msgid "CRITICAL - Generic check_tcp called with unknown service\n"
 msgstr ""
 
+#: plugins/check_tcp.c:262
+#, fuzzy
+msgid "CRITICAL - Could not make SSL connection\n"
+msgstr "HTTP CRITICAL - Konnte keine SSL Verbindung herstellen\n"
+
 #: plugins/check_tcp.c:335
 #, fuzzy, c-format
 msgid "Unexpected response from host: %s\n"
@@ -3560,49 +3805,73 @@ msgstr "Keine Antwort vom Host \n"
 msgid "%s %s%s - %.3f second response time on port %d"
 msgstr ""
 
-#: plugins/check_tcp.c:504 plugins/check_time.c:248 plugins/check_time.c:272
-#: plugins/check_udp.c:175
-msgid "Warning threshold must be a positive integer"
-msgstr "Warning threshold muss ein positiver Integer sein"
+#: plugins/check_tcp.c:437
+msgid "No arguments found"
+msgstr ""
 
-#: plugins/check_tcp.c:543
+#: plugins/check_tcp.c:541
 msgid "Maxbytes must be a positive integer"
 msgstr "Maxbytes muss ein positiver Integer sein"
 
-#: plugins/check_tcp.c:557
+#: plugins/check_tcp.c:555
 msgid "Refuse must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:567
+#: plugins/check_tcp.c:565
 msgid "Mismatch must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:573
+#: plugins/check_tcp.c:571
 msgid "Delay must be a positive integer"
 msgstr "Delay muss ein positiver Integer sein"
 
-#: plugins/check_tcp.c:593
-msgid "You must provide a server address\n"
+#: plugins/check_tcp.c:584
+msgid "SSL support not available.  Install OpenSSL and recompile."
 msgstr ""
 
-#: plugins/check_tcp.c:613
+#: plugins/check_tcp.c:591
+#, fuzzy
+msgid "You must provide a server address"
+msgstr "%s: Hostname muss angegeben werden\n"
+
+#: plugins/check_tcp.c:611
 #, c-format
 msgid "CRITICAL - Cannot create SSL context.\n"
 msgstr ""
 
-#: plugins/check_tcp.c:636
+#: plugins/check_tcp.c:634
 #, c-format
 msgid "CRITICAL - Cannot make  SSL connection "
 msgstr ""
 
-#: plugins/check_tcp.c:763
+#: plugins/check_tcp.c:711
+#, c-format
+msgid "Certificate expires in %d day(s) (%s).\n"
+msgstr ""
+
+#: plugins/check_tcp.c:715
+#, fuzzy, c-format
+msgid "Certificate expired on %s.\n"
+msgstr "Clientzertifikat benötigt\n"
+
+#: plugins/check_tcp.c:720
+#, fuzzy, c-format
+msgid "Certificate expires today (%s).\n"
+msgstr "Clientzertifikat benötigt\n"
+
+#: plugins/check_tcp.c:724
+#, c-format
+msgid "Certificate will expire on %s.\n"
+msgstr ""
+
+#: plugins/check_tcp.c:761
 #, c-format
 msgid ""
 "This plugin tests %s connections with the specified host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_tcp.c:774
+#: plugins/check_tcp.c:772
 #, c-format
 msgid ""
 " -s, --send=STRING\n"
@@ -3613,7 +3882,7 @@ msgid ""
 "    String to send server to initiate a clean close of the connection\n"
 msgstr ""
 
-#: plugins/check_tcp.c:782
+#: plugins/check_tcp.c:780
 #, c-format
 msgid ""
 " -r, --refuse=ok|warn|crit\n"
@@ -3629,7 +3898,7 @@ msgid ""
 "    Seconds to wait between sending string and polling for response\n"
 msgstr ""
 
-#: plugins/check_tcp.c:795
+#: plugins/check_tcp.c:793
 #, c-format
 msgid ""
 " -D, --certificate=INTEGER\n"
@@ -3663,26 +3932,22 @@ msgstr ""
 msgid "TIME %s - %lu second time difference|%s %s\n"
 msgstr ""
 
-#: plugins/check_time.c:244
+#: plugins/check_time.c:242
 msgid "Warning thresholds must be a positive integer"
 msgstr "Warning thresholds muss ein positiver Integer sein"
 
-#: plugins/check_time.c:263
+#: plugins/check_time.c:261
 msgid "Critical thresholds must be a positive integer"
 msgstr "Critical thresholds muss ein positiver Integer sein"
 
-#: plugins/check_time.c:309 plugins/check_udp.c:209
-msgid "Hostname was not supplied"
-msgstr ""
-
-#: plugins/check_time.c:329
+#: plugins/check_time.c:327
 #, c-format
 msgid ""
 "This plugin will check the time on the specified host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_time.c:337
+#: plugins/check_time.c:335
 #, c-format
 msgid ""
 " -u, --udp\n"
@@ -3697,6 +3962,16 @@ msgid ""
 "    Response time (sec.) necessary to result in critical status\n"
 msgstr ""
 
+#: plugins/check_udp.c:70
+#, fuzzy, c-format
+msgid "No response from host on port %d\n"
+msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n"
+
+#: plugins/check_udp.c:79
+#, fuzzy, c-format
+msgid "Invalid response received from host on port %d\n"
+msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n"
+
 #: plugins/check_udp.c:95
 #, c-format
 msgid "Connection %s on port %d - %d second response time\n"
@@ -3710,14 +3985,14 @@ msgstr ""
 msgid "problem"
 msgstr ""
 
-#: plugins/check_udp.c:227
+#: plugins/check_udp.c:225
 #, c-format
 msgid ""
 "\tThis plugin tests an UDP connection with the specified host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_udp.c:236
+#: plugins/check_udp.c:234
 #, c-format
 msgid ""
 " -e, --expect=STRING <optional>\n"
@@ -3726,7 +4001,7 @@ msgid ""
 "    String to send to the server when initiating the connection\n"
 msgstr ""
 
-#: plugins/check_udp.c:248
+#: plugins/check_udp.c:246
 #, c-format
 msgid ""
 "This plugin will attempt to connect to the specified port on the host.\n"
@@ -3735,7 +4010,98 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:597
+#: plugins/check_ups.c:136
+msgid "On Battery, Low Battery"
+msgstr ""
+
+#: plugins/check_ups.c:141
+msgid "Online"
+msgstr ""
+
+#: plugins/check_ups.c:144
+msgid "On Battery"
+msgstr ""
+
+#: plugins/check_ups.c:148
+msgid ", Low Battery"
+msgstr ""
+
+#: plugins/check_ups.c:152
+msgid ", Calibrating"
+msgstr ""
+
+#: plugins/check_ups.c:155
+msgid ", Replace Battery"
+msgstr ""
+
+#: plugins/check_ups.c:159
+msgid ", On Bypass"
+msgstr ""
+
+#: plugins/check_ups.c:162
+msgid ", Overload"
+msgstr ""
+
+#: plugins/check_ups.c:165
+msgid ", Trimming"
+msgstr ""
+
+#: plugins/check_ups.c:168
+msgid ", Boosting"
+msgstr ""
+
+#: plugins/check_ups.c:171
+msgid ", Charging"
+msgstr ""
+
+#: plugins/check_ups.c:174
+msgid ", Discharging"
+msgstr ""
+
+#: plugins/check_ups.c:177
+msgid ", Unknown"
+msgstr ""
+
+#: plugins/check_ups.c:314
+#, fuzzy
+msgid "UPS does not support any available options\n"
+msgstr "IPv6 Unterstützung nicht vorhanden"
+
+#: plugins/check_ups.c:338 plugins/check_ups.c:398
+#, fuzzy, c-format
+msgid "Invalid response received from host\n"
+msgstr "Ungültige HTTP Antwort von Host empfangen\n"
+
+#: plugins/check_ups.c:406
+#, c-format
+msgid "CRITICAL - no such ups '%s' on that host\n"
+msgstr ""
+
+#: plugins/check_ups.c:416
+#, fuzzy, c-format
+msgid "CRITICAL - UPS data is stale\n"
+msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
+
+#: plugins/check_ups.c:421
+#, fuzzy, c-format
+msgid "Unknown error: %s\n"
+msgstr "Papierfehler"
+
+#: plugins/check_ups.c:428
+#, c-format
+msgid "Error: unable to parse variable\n"
+msgstr ""
+
+#: plugins/check_ups.c:535
+msgid "Unrecognized UPS variable"
+msgstr ""
+
+#: plugins/check_ups.c:573
+#, c-format
+msgid "Error : no ups indicated\n"
+msgstr ""
+
+#: plugins/check_ups.c:593
 #, c-format
 msgid ""
 "This plugin tests the UPS service on the specified host.\n"
@@ -3744,21 +4110,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:607
+#: plugins/check_ups.c:603
 #, c-format
 msgid ""
 " -u, --ups=STRING\n"
 "    Name of UPS\n"
 msgstr ""
 
-#: plugins/check_ups.c:611
+#: plugins/check_ups.c:607
 #, c-format
 msgid ""
 " -T, --temperature\n"
 "    Output of temperatures in Celsius\n"
 msgstr ""
 
-#: plugins/check_ups.c:621
+#: plugins/check_ups.c:617
 #, c-format
 msgid ""
 "This plugin attempts to determine the status of a UPS (Uninterruptible "
@@ -3772,7 +4138,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:628
+#: plugins/check_ups.c:624
 #, c-format
 msgid ""
 "You may also specify a variable to check [such as temperature, utility "
@@ -3785,7 +4151,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:634
+#: plugins/check_ups.c:630
 #, c-format
 msgid ""
 "Notes:\n"
@@ -3807,16 +4173,7 @@ msgstr ""
 msgid "USERS %s - %d users currently logged in |%s\n"
 msgstr ""
 
-#: plugins/check_users.c:154
-msgid "Critical threshold must be a positive integer\n"
-msgstr "Critical threshold muss ein positiver Integer sein\n"
-
-#: plugins/check_users.c:160 plugins/check_users.c:170
-#: plugins/check_users.c:177
-msgid "Warning threshold must be a positive integer\n"
-msgstr "Warning threshold muss ein positiver Integer sein\n"
-
-#: plugins/check_users.c:195
+#: plugins/check_users.c:193
 #, c-format
 msgid ""
 "This plugin checks the number of users currently logged in on the local\n"
@@ -3824,7 +4181,7 @@ msgid ""
 "specified.\n"
 msgstr ""
 
-#: plugins/check_users.c:203
+#: plugins/check_users.c:201
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -3833,79 +4190,79 @@ msgid ""
 "    Set CRITICAL status if more than INTEGER users are logged in\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:227
+#: plugins/check_ide_smart.c:225
 #, c-format
 msgid "CRITICAL - Couldn't open device: %s\n"
 msgstr "CRITICAL - Device konnte nicht geöffnet werden: %s\n"
 
-#: plugins/check_ide_smart.c:232
+#: plugins/check_ide_smart.c:230
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:294
+#: plugins/check_ide_smart.c:292
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:363
+#: plugins/check_ide_smart.c:361
 #, c-format
 msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:370
+#: plugins/check_ide_smart.c:368
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:377
+#: plugins/check_ide_smart.c:375
 #, c-format
 msgid "OK - Operational (%d/%d tests passed)\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:380
+#: plugins/check_ide_smart.c:378
 #, c-format
 msgid "ERROR - Status '%d' uknown. %d/%d tests passed\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:413
+#: plugins/check_ide_smart.c:411
 #, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:419
+#: plugins/check_ide_smart.c:417
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:425
+#: plugins/check_ide_smart.c:423
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:464
+#: plugins/check_ide_smart.c:462
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:483
+#: plugins/check_ide_smart.c:481
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr ""
 
-#: plugins/negate.c:244
+#: plugins/negate.c:242
 #, c-format
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).\n"
 "\n"
 msgstr ""
 
-#: plugins/negate.c:253
+#: plugins/negate.c:251
 #, c-format
 msgid "     [keep timeout than the plugin timeout to retain CRITICAL status]\n"
 msgstr ""
 
-#: plugins/negate.c:256
+#: plugins/negate.c:254
 #, c-format
 msgid ""
 "  negate \"/usr/local/nagios/libexec/check_ping -H host\"\n"
@@ -3914,7 +4271,7 @@ msgid ""
 "    Use single quotes if you need to retain spaces\n"
 msgstr ""
 
-#: plugins/negate.c:262
+#: plugins/negate.c:260
 #, c-format
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert "
@@ -3926,14 +4283,63 @@ msgid ""
 "Otherwise, the output state of the wrapped plugin is unchanged.\n"
 msgstr ""
 
-#: plugins/urlize.c:108
+#: plugins/netutils.c:48
+#, fuzzy, c-format
+msgid "CRITICAL - Socket timeout after %d seconds\n"
+msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
+
+#: plugins/netutils.c:50
+#, fuzzy, c-format
+msgid "CRITICAL - Abnormal timeout after %d seconds\n"
+msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
+
+#: plugins/netutils.c:109 plugins/netutils.c:318
+#, c-format
+msgid "Send failed\n"
+msgstr ""
+
+#: plugins/netutils.c:126 plugins/netutils.c:333
+#, fuzzy, c-format
+msgid "No data was received from host!\n"
+msgstr "Keine Daten empfangen %s\n"
+
+#: plugins/netutils.c:242
+#, c-format
+msgid "Socket creation failed\n"
+msgstr ""
+
+#: plugins/netutils.c:342
+#, c-format
+msgid "Receive failed\n"
+msgstr ""
+
+#: plugins/popen.c:117
+#, fuzzy, c-format
+msgid "Could not malloc argv array in popen()\n"
+msgstr "Konnte addr nicht zuweisen\n"
+
+#: plugins/popen.c:127
+#, fuzzy, c-format
+msgid "CRITICAL - You need more args!!!\n"
+msgstr "CRITICAL - Fehler: %s\n"
+
+#: plugins/popen.c:248 plugins/utils.c:136
+#, fuzzy, c-format
+msgid "CRITICAL - Plugin timed out after %d seconds\n"
+msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
+
+#: plugins/popen.c:264
+msgid "sysconf error for _SC_OPEN_MAX"
+msgstr ""
+
+#: plugins/urlize.c:106
 #, c-format
 msgid ""
 "%s UNKNOWN - No data received from host\n"
 "CMD: %s</A>\n"
 msgstr ""
 
-#: plugins/urlize.c:135
+#: plugins/urlize.c:133
 #, c-format
 msgid ""
 "\n"
@@ -3944,7 +4350,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/urlize.c:143
+#: plugins/urlize.c:141
 #, c-format
 msgid ""
 "\n"
@@ -3962,6 +4368,48 @@ msgid ""
 "    urlize http://example.com/ \"check_http -H example.com -r 'two words'\"\n"
 msgstr ""
 
+#: plugins/utils.c:433
+#, fuzzy
+msgid "failed realloc in strpcpy\n"
+msgstr "konnte keinen Speicher für '%s' reservieren\n"
+
+#: plugins/utils.c:475
+#, fuzzy
+msgid "failed malloc in strscat\n"
+msgstr "konnte keinen Speicher für '%s' reservieren\n"
+
+#~ msgid ""
+#~ "Hostname was not supplied\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Kein Hostname angegeben\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "%s: Unknown argument: %s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s: Unbekanntes Argument: %s\n"
+#~ "\n"
+
+#~ msgid "Critical time must be a nonnegative integer"
+#~ msgstr "Critical time muss ein positiver Integer sein"
+
+#~ msgid "Time interval must be a nonnegative integer"
+#~ msgstr "Time interval muss ein positiver Integer sein"
+
+#~ msgid "Time interval must be a positive integer"
+#~ msgstr "Time interval muss ein positiver Integer sein"
+
+#~ msgid "Warning threshold must be integer or percentage!\n"
+#~ msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein!\n"
+
+#~ msgid "Critical threshold must be a positive integer\n"
+#~ msgstr "Critical threshold muss ein positiver Integer sein\n"
+
+#~ msgid "Warning threshold must be a positive integer\n"
+#~ msgstr "Warning threshold muss ein positiver Integer sein\n"
+
 #~ msgid "check_http: invalid option - SSL is not available\n"
 #~ msgstr "check_http: ungültige Option - SSL ist nicht verfügbar\n"
 
diff --git a/po/fr.po b/po/fr.po
index 69b81bb8..47f7bc1e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-25 16:26+0100\n"
+"POT-Creation-Date: 2004-12-26 00:06+0100\n"
 "PO-Revision-Date: 2004-12-20 21:03+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team: Français <benoit.mortier@opensides.be>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 
 #: plugins/check_by_ssh.c:72 plugins/check_dhcp.c:251 plugins/check_dig.c:72
-#: plugins/check_disk.c:167 plugins/check_dns.c:75 plugins/check_dummy.c:44
+#: plugins/check_disk.c:167 plugins/check_dns.c:75 plugins/check_dummy.c:43
 #: plugins/check_fping.c:73 plugins/check_game.c:69 plugins/check_hpjd.c:89
 #: plugins/check_http.c:149 plugins/check_ldap.c:92 plugins/check_load.c:78
 #: plugins/check_mrtgtraf.c:66 plugins/check_mysql.c:63
@@ -44,7 +44,7 @@ msgstr "impossible d'obtenir le signal SIGALRM"
 #: plugins/check_fping.c:87 plugins/check_game.c:86 plugins/check_hpjd.c:114
 #: plugins/check_nagios.c:103 plugins/check_procs.c:137
 #: plugins/check_snmp.c:172 plugins/check_swap.c:151 plugins/check_users.c:59
-#: plugins/negate.c:97 plugins/urlize.c:90
+#: plugins/negate.c:97 plugins/urlize.c:88
 #, c-format
 msgid "Could not open pipe: %s\n"
 msgstr "Impossible d'ouvrir le pipe: %s\n"
@@ -53,7 +53,7 @@ msgstr "Impossible d'ouvrir le pipe: %s\n"
 #: plugins/check_fping.c:93 plugins/check_hpjd.c:120 plugins/check_load.c:115
 #: plugins/check_nagios.c:109 plugins/check_procs.c:143
 #: plugins/check_snmp.c:178 plugins/check_swap.c:157 plugins/check_users.c:65
-#: plugins/negate.c:102 plugins/urlize.c:96
+#: plugins/negate.c:102 plugins/urlize.c:94
 #, c-format
 msgid "Could not open stderr for %s\n"
 msgstr "Impossible d'ouvrir stderr pour %s\n"
@@ -63,41 +63,55 @@ msgstr "Impossible d'ouvrir stderr pour %s\n"
 msgid "SSH WARNING: could not open %s\n"
 msgstr "SSH ALERTE: impossible d'ouvrir %s\n"
 
-#: plugins/check_by_ssh.c:216 plugins/check_http.c:254
+#: plugins/check_by_ssh.c:216 plugins/check_dig.c:217 plugins/check_disk.c:441
+#: plugins/check_dns.c:315 plugins/check_fping.c:245 plugins/check_game.c:201
+#: plugins/check_hpjd.c:336 plugins/check_http.c:254 plugins/check_ldap.c:315
+#: plugins/check_load.c:227 plugins/check_mrtg.c:236
+#: plugins/check_mrtgtraf.c:263 plugins/check_mysql.c:214
+#: plugins/check_nagios.c:222 plugins/check_nt.c:490
+#: plugins/check_nwstat.c:763 plugins/check_overcr.c:327
+#: plugins/check_pgsql.c:212 plugins/check_ping.c:197
+#: plugins/check_procs.c:346 plugins/check_radius.c:221
+#: plugins/check_real.c:354 plugins/check_smtp.c:374 plugins/check_snmp.c:401
+#: plugins/check_ssh.c:113 plugins/check_swap.c:423 plugins/check_tcp.c:465
+#: plugins/check_time.c:219 plugins/check_udp.c:149 plugins/check_ups.c:484
+#: plugins/check_users.c:143 plugins/check_ide_smart.c:209
+#: plugins/negate.c:177 plugins/urlize.c:74
 #, fuzzy
 msgid "Unknown argument"
 msgstr ""
 "%s: Argument inconnu: %c\n"
 "\n"
 
-#: plugins/check_by_ssh.c:228 plugins/check_dig.c:266 plugins/check_disk.c:308
-#: plugins/check_http.c:266 plugins/check_ldap.c:268 plugins/check_pgsql.c:223
-#: plugins/check_procs.c:357 plugins/check_radius.c:198
-#: plugins/check_radius.c:270 plugins/check_snmp.c:447 plugins/check_ssh.c:127
-#: plugins/check_tcp.c:519 plugins/check_time.c:292 plugins/check_udp.c:182
-#: plugins/negate.c:190
+#: plugins/check_by_ssh.c:228 plugins/check_dig.c:264 plugins/check_disk.c:308
+#: plugins/check_http.c:266 plugins/check_ldap.c:268 plugins/check_pgsql.c:221
+#: plugins/check_procs.c:355 plugins/check_radius.c:198
+#: plugins/check_radius.c:268 plugins/check_real.c:344
+#: plugins/check_smtp.c:354 plugins/check_snmp.c:445 plugins/check_ssh.c:125
+#: plugins/check_tcp.c:517 plugins/check_time.c:290 plugins/check_udp.c:180
+#: plugins/check_ups.c:542 plugins/negate.c:188
 msgid "Timeout interval must be a positive integer"
 msgstr "L'intervalle de temps doit être un entier positif"
 
 #: plugins/check_by_ssh.c:234 plugins/check_by_ssh.c:293
-#: plugins/check_dig.c:231 plugins/check_dig.c:288 plugins/check_dns.c:340
-#: plugins/check_dns.c:349 plugins/check_fping.c:259 plugins/check_hpjd.c:324
-#: plugins/check_hpjd.c:349 plugins/check_mysql.c:190
-#: plugins/check_mysql.c:230 plugins/check_pgsql.c:241
-#: plugins/check_ping.c:270 plugins/check_ping.c:393
-#: plugins/check_radius.c:235 plugins/check_real.c:302
-#: plugins/check_real.c:366 plugins/check_smtp.c:292 plugins/check_smtp.c:386
-#: plugins/check_ssh.c:146 plugins/check_tcp.c:489 plugins/check_time.c:230
-#: plugins/check_time.c:305 plugins/check_udp.c:163 plugins/check_udp.c:204
-#: plugins/check_ups.c:492 plugins/check_ups.c:561
+#: plugins/check_dig.c:229 plugins/check_dig.c:286 plugins/check_dns.c:337
+#: plugins/check_dns.c:346 plugins/check_fping.c:257 plugins/check_hpjd.c:323
+#: plugins/check_hpjd.c:346 plugins/check_mysql.c:189
+#: plugins/check_mysql.c:227 plugins/check_pgsql.c:239
+#: plugins/check_ping.c:268 plugins/check_ping.c:391
+#: plugins/check_radius.c:233 plugins/check_real.c:302
+#: plugins/check_real.c:364 plugins/check_smtp.c:292 plugins/check_smtp.c:384
+#: plugins/check_ssh.c:144 plugins/check_tcp.c:487 plugins/check_time.c:228
+#: plugins/check_time.c:303 plugins/check_udp.c:161 plugins/check_udp.c:202
+#: plugins/check_ups.c:490 plugins/check_ups.c:559
 msgid "Invalid hostname/address"
 msgstr "Adresse/Nom invalide"
 
-#: plugins/check_by_ssh.c:239 plugins/check_dig.c:239
-#: plugins/check_pgsql.c:247 plugins/check_radius.c:207
-#: plugins/check_radius.c:243 plugins/check_real.c:315
-#: plugins/check_smtp.c:299 plugins/check_tcp.c:525 plugins/check_time.c:286
-#: plugins/check_udp.c:188
+#: plugins/check_by_ssh.c:239 plugins/check_dig.c:237
+#: plugins/check_pgsql.c:245 plugins/check_radius.c:207
+#: plugins/check_radius.c:241 plugins/check_real.c:315
+#: plugins/check_smtp.c:299 plugins/check_tcp.c:523 plugins/check_time.c:284
+#: plugins/check_udp.c:186 plugins/check_ups.c:504
 msgid "Port must be a positive integer"
 msgstr "Le numéro du port doit être un entier positif"
 
@@ -509,6 +523,11 @@ msgid ""
 "   Print version information\n"
 msgstr ""
 
+#: plugins/check_dig.c:84 plugins/check_dig.c:86
+#, c-format
+msgid "Looking for: '%s'\n"
+msgstr ""
+
 #: plugins/check_dig.c:130
 msgid "Server not found in ANSWER SECTION"
 msgstr "Le serveur n'a pas été trouvé dans l'ANSWER SECTION"
@@ -531,34 +550,15 @@ msgstr " Probablement un hôte/domaine inexistant"
 msgid "%.3f seconds response time (%s)"
 msgstr "%.3f secondes de temps de réponse (%s)"
 
-#: plugins/check_dig.c:217 plugins/check_disk.c:441 plugins/check_dns.c:316
-#: plugins/check_fping.c:245 plugins/check_game.c:202 plugins/check_hpjd.c:337
-#: plugins/check_ldap.c:315 plugins/check_load.c:227 plugins/check_mrtg.c:236
-#: plugins/check_mrtgtraf.c:263 plugins/check_mysql.c:215
-#: plugins/check_overcr.c:335 plugins/check_pgsql.c:212
-#: plugins/check_ping.c:197 plugins/check_procs.c:346
-#: plugins/check_radius.c:221 plugins/check_real.c:354
-#: plugins/check_smtp.c:374 plugins/check_snmp.c:401 plugins/check_ssh.c:113
-#: plugins/check_swap.c:423 plugins/check_tcp.c:465 plugins/check_time.c:219
-#: plugins/check_udp.c:149 plugins/check_ups.c:484 plugins/check_users.c:143
-#: plugins/check_ide_smart.c:209 plugins/negate.c:177 plugins/urlize.c:74
-#, c-format
-msgid ""
-"%s: Unknown argument: %s\n"
-"\n"
-msgstr ""
-"%s: Argument inconnu: %s\n"
-"\n"
-
-#: plugins/check_dig.c:250
+#: plugins/check_dig.c:248
 msgid "Warning interval must be a positive integer"
 msgstr "Attention l'intervalle doit être un entier positif"
 
-#: plugins/check_dig.c:258
+#: plugins/check_dig.c:256
 msgid "Critical interval must be a positive integer"
 msgstr "Critique l'intervalle doit être un entier positif"
 
-#: plugins/check_dig.c:321
+#: plugins/check_dig.c:319
 #, c-format
 msgid ""
 "Test the DNS service on the specified host using dig\n"
@@ -567,7 +567,7 @@ msgstr ""
 "Teste le service DNS sur l'hôte spécifié en utilisant dig\n"
 "\n"
 
-#: plugins/check_dig.c:329
+#: plugins/check_dig.c:327
 #, c-format
 msgid ""
 " -l, --lookup=STRING\n"
@@ -576,7 +576,7 @@ msgstr ""
 " -l, --lookup=STRING\n"
 "   nom de machine à vérifier\n"
 
-#: plugins/check_dig.c:333
+#: plugins/check_dig.c:331
 #, c-format
 msgid ""
 " -T, --record_type=STRING\n"
@@ -585,7 +585,7 @@ msgstr ""
 " -T, --record_type=STRING\n"
 "   type d'enregistrement à vérifier (défaut: A)\n"
 
-#: plugins/check_dig.c:337
+#: plugins/check_dig.c:335
 #, c-format
 msgid ""
 " -a, --expected_address=STRING\n"
@@ -612,7 +612,7 @@ msgstr ""
 msgid "%s [%s not found]"
 msgstr "%s [%s non trouvé]"
 
-#: plugins/check_disk.c:325
+#: plugins/check_disk.c:325 plugins/check_swap.c:391
 msgid "Warning threshold must be integer or percentage!"
 msgstr "Le seuil d'alerte doit être un entier positif!"
 
@@ -630,12 +630,17 @@ msgstr "unité de type %s inconnue\n"
 msgid "failed allocating storage for '%s'\n"
 msgstr "Impossible d'allouer de l'espace pour '%s'\n"
 
-#: plugins/check_disk.c:502
+#: plugins/check_disk.c:489
+#, fuzzy, c-format
+msgid " for %s\n"
+msgstr "Format: %s\n"
+
+#: plugins/check_disk.c:500
 #, c-format
 msgid "INPUT ERROR: No thresholds specified"
 msgstr "INPUT ERROR: Pas de seuil spécifié"
 
-#: plugins/check_disk.c:508
+#: plugins/check_disk.c:506
 #, c-format
 msgid ""
 "INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be "
@@ -644,7 +649,7 @@ msgstr ""
 "INPUT ERROR: C_DFP (%f) doit être plus petit que W_DFP (%.1f) et les deux "
 "doivent être entre 0 et 100 pourcent"
 
-#: plugins/check_disk.c:515
+#: plugins/check_disk.c:513
 #, c-format
 msgid ""
 "INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be "
@@ -653,7 +658,7 @@ msgstr ""
 "INPUT ERROR: C_DF (%lu) doit être plus petit que W_DF (%lu) et les deux "
 "doivent être plus grands que zéro"
 
-#: plugins/check_disk.c:579
+#: plugins/check_disk.c:577
 #, c-format
 msgid ""
 "This plugin checks the amount of used disk space on a mounted file system\n"
@@ -666,7 +671,7 @@ msgstr ""
 "valeurs fournies.\n"
 "\n"
 
-#: plugins/check_disk.c:587
+#: plugins/check_disk.c:585
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -695,7 +700,7 @@ msgstr ""
 " -C, --clear\n"
 "    Remet à zéro\n"
 
-#: plugins/check_disk.c:599
+#: plugins/check_disk.c:597
 #, c-format
 msgid ""
 " -u, --units=STRING\n"
@@ -712,7 +717,7 @@ msgstr ""
 " -m, --megabytes\n"
 "    Identique à '--units MB'\n"
 
-#: plugins/check_disk.c:607
+#: plugins/check_disk.c:605
 #, c-format
 msgid ""
 " -l, --local\n"
@@ -742,7 +747,7 @@ msgstr ""
 " -e, --errors-only\n"
 "    Affiche seulement les périphériques/points de montage avec des erreurs\n"
 
-#: plugins/check_disk.c:627
+#: plugins/check_disk.c:625
 msgid ""
 "Examples:\n"
 " check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n"
@@ -761,6 +766,10 @@ msgstr "Alerte erreur de plugin"
 msgid "DNS CRITICAL - '%s' returned empty host name string\n"
 msgstr "DNS CRITIQUE - '%s' à retourné un nom d'hôte vide\n"
 
+#: plugins/check_dns.c:138
+msgid "Non-authoritative answer:"
+msgstr ""
+
 #: plugins/check_dns.c:171
 msgid "nslookup returned error status"
 msgstr "nslookup à retourné une erreur"
@@ -780,7 +789,7 @@ msgstr "j'attendais %s mais j'ai reçu %s"
 msgid "server %s is not authoritative for %s"
 msgstr "Le serveur %s est autoritaire pour %s"
 
-#: plugins/check_dns.c:202 plugins/check_dummy.c:60 plugins/check_http.c:930
+#: plugins/check_dns.c:202 plugins/check_dummy.c:59 plugins/check_http.c:930
 #: plugins/check_http.c:1183 plugins/check_procs.c:279
 #, c-format
 msgid "OK"
@@ -852,13 +861,13 @@ msgstr "Le réseau est injoignable\n"
 msgid "DNS failure for %s\n"
 msgstr "DNS à échoué pour %s\n"
 
-#: plugins/check_dns.c:333 plugins/check_dns.c:343 plugins/check_dns.c:352
-#: plugins/check_dns.c:357 plugins/check_dns.c:370 plugins/check_dns.c:381
-#: plugins/check_game.c:219 plugins/check_game.c:227
+#: plugins/check_dns.c:330 plugins/check_dns.c:340 plugins/check_dns.c:349
+#: plugins/check_dns.c:354 plugins/check_dns.c:367 plugins/check_dns.c:378
+#: plugins/check_game.c:216 plugins/check_game.c:224
 msgid "Input buffer overflow\n"
 msgstr "Le tampon d'entrée a débordé\n"
 
-#: plugins/check_dns.c:377
+#: plugins/check_dns.c:374
 #, c-format
 msgid ""
 "Invalid hostname/address: %s\n"
@@ -867,7 +876,7 @@ msgstr ""
 "Adresse/Nom invalide: %s\n"
 "\n"
 
-#: plugins/check_dns.c:409
+#: plugins/check_dns.c:404
 #, c-format
 msgid ""
 "This plugin uses the nslookup program to obtain the IP address\n"
@@ -882,7 +891,7 @@ msgstr ""
 "dans /etc/resolv.conf sera utilisé.\n"
 "\n"
 
-#: plugins/check_dns.c:419
+#: plugins/check_dns.c:414
 #, c-format
 msgid ""
 "-H, --hostname=HOST\n"
@@ -903,31 +912,31 @@ msgstr ""
 "-A, --expect-authority\n"
 "   Serveur DNS qui doit normalement être autoritatif pour la recherche\n"
 
-#: plugins/check_dummy.c:54
+#: plugins/check_dummy.c:53
 msgid "Arguments to check_dummy must be an integer"
 msgstr "Les arguments pour check_dummy doivent être des entiers"
 
-#: plugins/check_dummy.c:63 plugins/check_http.c:932 plugins/check_procs.c:281
+#: plugins/check_dummy.c:62 plugins/check_http.c:932 plugins/check_procs.c:281
 #, c-format
 msgid "WARNING"
 msgstr "ALERTE"
 
-#: plugins/check_dummy.c:66 plugins/check_http.c:934 plugins/check_procs.c:286
+#: plugins/check_dummy.c:65 plugins/check_http.c:934 plugins/check_procs.c:286
 #, c-format
 msgid "CRITICAL"
 msgstr "CRITIQUE"
 
-#: plugins/check_dummy.c:69 plugins/check_http.c:928
+#: plugins/check_dummy.c:68 plugins/check_http.c:928
 #, c-format
 msgid "UNKNOWN"
 msgstr "INCONNU"
 
-#: plugins/check_dummy.c:72
+#: plugins/check_dummy.c:71
 #, c-format
 msgid "Status %d is not a supported error state\n"
 msgstr "L'état %d n'est pas un état supporté\n"
 
-#: plugins/check_dummy.c:94
+#: plugins/check_dummy.c:93
 #, c-format
 msgid ""
 "This plugin will simply return the state corresponding to the numeric value\n"
@@ -963,35 +972,31 @@ msgstr "FPING %s - %s (perte=%.0f%%, rta=%f ms)|%s %s\n"
 msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
 msgstr "FPING %s - %s (perte=%.0f%% )|%s\n"
 
-#: plugins/check_fping.c:293
+#: plugins/check_fping.c:291
 msgid "Packet size must be a positive integer"
 msgstr "La taille du paquet doit être un entier positif"
 
-#: plugins/check_fping.c:299
+#: plugins/check_fping.c:297
 msgid "Packet count must be a positive integer"
 msgstr "Le nombre de paquets doit être un entier positif"
 
-#: plugins/check_fping.c:306
-msgid ""
-"Hostname was not supplied\n"
-"\n"
-msgstr ""
-"Le nom de l'hôte n'a pas été fourni\n"
-"\n"
+#: plugins/check_fping.c:303 plugins/check_time.c:307 plugins/check_udp.c:207
+msgid "Hostname was not supplied"
+msgstr "Le nom de l'hôte n'a pas été spécifié"
 
-#: plugins/check_fping.c:327
+#: plugins/check_fping.c:323
 #, c-format
 msgid "%s: Only one threshold may be packet loss (%s)\n"
 msgstr ""
 "%s: Seulement un seuil peut être utilisé pour les pertes de paquets (%s)\n"
 
-#: plugins/check_fping.c:331
+#: plugins/check_fping.c:327
 #, c-format
 msgid "%s: Only one threshold must be packet loss (%s)\n"
 msgstr ""
 "%s: Seulement un seuil doit être utilisé pour les pertes de paquets (%s)\n"
 
-#: plugins/check_fping.c:364
+#: plugins/check_fping.c:359
 #, c-format
 msgid ""
 "This plugin will use the /bin/fping command to ping the specified host\n"
@@ -1005,7 +1010,7 @@ msgstr ""
 "fping.\n"
 "\n"
 
-#: plugins/check_fping.c:373
+#: plugins/check_fping.c:368
 #, c-format
 msgid ""
 " -H, --hostname=HOST\n"
@@ -1033,7 +1038,7 @@ msgstr ""
 " -n, --number=INTEGER\n"
 "    Nombre de paquets ICMP à envoyer (défaut: %d)\n"
 
-#: plugins/check_fping.c:389
+#: plugins/check_fping.c:384
 #, c-format
 msgid ""
 "\n"
@@ -1051,12 +1056,27 @@ msgstr ""
 msgid "CRITICAL - Host type parameter incorrect!\n"
 msgstr "CRITIQUE - Argument de type hôte incorrect!\n"
 
-#: plugins/check_game.c:305
+#: plugins/check_game.c:126
+#, fuzzy, c-format
+msgid "CRITICAL - Host not found\n"
+msgstr "CRITIQUE - Hôte non trouvé (%s)"
+
+#: plugins/check_game.c:130
+#, fuzzy, c-format
+msgid "CRITICAL - Game server down or unavailable\n"
+msgstr "CRITIQUE - Date du serveur \"%100s\" illisible"
+
+#: plugins/check_game.c:134
+#, fuzzy, c-format
+msgid "CRITICAL - Game server timeout\n"
+msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n"
+
+#: plugins/check_game.c:300
 #, c-format
 msgid "This plugin tests game server connections with the specified host."
 msgstr "Le plugin teste la connection au serveur de jeux avec l'hôte spécifié."
 
-#: plugins/check_game.c:311
+#: plugins/check_game.c:306
 #, c-format
 msgid ""
 "<game>        = Game type that is recognised by qstat (without the leading "
@@ -1075,7 +1095,7 @@ msgstr ""
 " [map_field]   = Numéro du champ qui contient le nom de la carte\n"
 " [ping_field]  = Numéro du champ qui contient le temp de ping\n"
 
-#: plugins/check_game.c:321
+#: plugins/check_game.c:316
 #, c-format
 msgid ""
 "\n"
@@ -1144,7 +1164,7 @@ msgstr "Erreur de papier inconnue"
 msgid "Printer ok - (%s)\n"
 msgstr "Imprimante ok - (%s)\n"
 
-#: plugins/check_hpjd.c:381
+#: plugins/check_hpjd.c:376
 #, c-format
 msgid ""
 "This plugin tests the STATUS of an HP printer with a JetDirect card.\n"
@@ -1155,7 +1175,7 @@ msgstr ""
 "Net snmp doit être installé sur l'ordinateur qui execute le plugin.\n"
 "\n"
 
-#: plugins/check_hpjd.c:389
+#: plugins/check_hpjd.c:384
 #, c-format
 msgid ""
 " -C, --community=STRING\n"
@@ -1168,7 +1188,7 @@ msgstr ""
 msgid "HTTP CRITICAL - Could not make SSL connection\n"
 msgstr "HTTP CRITIQUE - Impossible d'établir une connection SSL\n"
 
-#: plugins/check_http.c:177 plugins/check_http.c:739
+#: plugins/check_http.c:177 plugins/check_http.c:739 plugins/check_tcp.c:268
 #, c-format
 msgid "CRITICAL - Cannot retrieve server certificate.\n"
 msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n"
@@ -1186,7 +1206,7 @@ msgstr "Le seuil d'alerte doit être un entier positif"
 msgid "Invalid option - SSL is not available"
 msgstr "Option invalide - SSL n'est pas disponible\n"
 
-#: plugins/check_http.c:309
+#: plugins/check_http.c:309 plugins/check_tcp.c:576
 msgid "Invalid certificate expiration period"
 msgstr "Période d'expiration du certificat invalide"
 
@@ -1208,7 +1228,8 @@ msgstr "Demande d'utilisation d'un regex qui n'est pas prévu dans le programme"
 msgid "Could Not Compile Regular Expression: %s"
 msgstr "Impossible de compiler l'expression régulière: %s"
 
-#: plugins/check_http.c:404 plugins/check_smtp.c:364 plugins/check_tcp.c:484
+#: plugins/check_http.c:404 plugins/check_smtp.c:364 plugins/check_ssh.c:136
+#: plugins/check_tcp.c:482
 msgid "IPv6 support not available"
 msgstr "Support IPv6 non disponible"
 
@@ -1387,12 +1408,13 @@ msgstr "Échoué"
 msgid "CRITICAL -  Cannot create SSL context.\n"
 msgstr "CRITIQUE -  Impossible de créer le contexte SSL.\n"
 
-#: plugins/check_http.c:1214 plugins/check_tcp.c:642
+#: plugins/check_http.c:1214 plugins/check_tcp.c:640
 #, c-format
 msgid "CRITICAL - Cannot initiate SSL handshake.\n"
 msgstr "CRITIQUE - Impossible d'initialiser la négociation SSL.\n"
 
-#: plugins/check_http.c:1244 plugins/check_http.c:1256
+#: plugins/check_http.c:1244 plugins/check_http.c:1256 plugins/check_tcp.c:670
+#: plugins/check_tcp.c:682
 #, c-format
 msgid "CRITICAL - Wrong time format in certificate.\n"
 msgstr "CRITIQUE - Format de date incorrect dans le certificat.\n"
@@ -1606,6 +1628,193 @@ msgstr ""
 "un état STATE_WARNING est renvoyé. un état STATE_CRITICAL est renvoyé quand "
 "le certificat est expiré.\n"
 
+#: plugins/check_icmp.c:313
+#, c-format
+msgid "Root access needed (for raw sockets)\n"
+msgstr ""
+
+#: plugins/check_icmp.c:319
+msgid "icmp: unknown protocol"
+msgstr ""
+
+#: plugins/check_icmp.c:325
+msgid "Can't create raw socket"
+msgstr ""
+
+#: plugins/check_icmp.c:337
+msgid "Unable to allocate memory for host name list\n"
+msgstr ""
+
+#: plugins/check_icmp.c:362 plugins/check_icmp.c:367 plugins/check_icmp.c:546
+#: plugins/check_icmp.c:551
+#, fuzzy
+msgid "Failed to allocate memory for hostname"
+msgstr "Impossible d'allouer de l'espace pour '%s'\n"
+
+#: plugins/check_icmp.c:378 plugins/check_icmp.c:385
+#, c-format
+msgid "Illegal threshold pair specified for -%c"
+msgstr ""
+
+#: plugins/check_icmp.c:392 plugins/check_icmp.c:399 plugins/check_icmp.c:421
+#, c-format
+msgid "Option -%c requires integer argument\n"
+msgstr ""
+
+#: plugins/check_icmp.c:406 plugins/check_icmp.c:414
+#, c-format
+msgid "Option -%c requires positive non-zero integer argument\n"
+msgstr ""
+
+#: plugins/check_icmp.c:470
+#, c-format
+msgid "Option flag -%c specified, but not recognized\n"
+msgstr ""
+
+#: plugins/check_icmp.c:497
+#, c-format
+msgid "%s: these options are too risky for mere mortals.\n"
+msgstr ""
+
+#: plugins/check_icmp.c:498
+#, c-format
+msgid "%s: You need i >= %u and r < %u\n"
+msgstr ""
+
+#: plugins/check_icmp.c:500
+#, c-format
+msgid "Current settings; i = %d, r = %d\n"
+msgstr ""
+
+#: plugins/check_icmp.c:506
+#, c-format
+msgid "%s: data size %u not valid, must be between %u and %u\n"
+msgstr ""
+
+#: plugins/check_icmp.c:513
+#, c-format
+msgid "%s: backoff factor %.1f not valid, must be between %.1f and %.1f\n"
+msgstr ""
+
+#: plugins/check_icmp.c:520
+#, c-format
+msgid "%s: count %u not valid, must be less than %u\n"
+msgstr ""
+
+#: plugins/check_icmp.c:539
+#, c-format
+msgid "Generate flag requires command line parameters beyond switches\n"
+msgstr ""
+
+#: plugins/check_icmp.c:568
+#, c-format
+msgid ""
+"No hosts to work with!\n"
+"\n"
+msgstr ""
+
+#: plugins/check_icmp.c:574
+msgid "Can't malloc array of hosts"
+msgstr ""
+
+#: plugins/check_icmp.c:706
+#, c-format
+msgid "%s is down (lost 100%%)"
+msgstr ""
+
+#: plugins/check_icmp.c:757
+#, fuzzy, c-format
+msgid "No hostaddress specified.\n"
+msgstr "Pas de compteur spécifié"
+
+#: plugins/check_icmp.c:768
+#, c-format
+msgid "OK - All %d hosts are alive\n"
+msgstr ""
+
+#: plugins/check_icmp.c:771
+#, fuzzy, c-format
+msgid "CRITICAL - %d of %d hosts are alive\n"
+msgstr "CRITIQUE - Date du serveur \"%100s\" illisible"
+
+#: plugins/check_icmp.c:787
+msgid "Can't malloc ping packet"
+msgstr ""
+
+#: plugins/check_icmp.c:811
+#, c-format
+msgid "%s error while sending ping: %s\n"
+msgstr ""
+
+#: plugins/check_icmp.c:863
+#, c-format
+msgid "Received packet too short for ICMP (%d bytes from %s)\n"
+msgstr ""
+
+#: plugins/check_icmp.c:906
+#, c-format
+msgid "%s : duplicate for [%d], %d bytes, %s ms"
+msgstr ""
+
+#: plugins/check_icmp.c:916
+#, c-format
+msgid "%s : duplicate for [%d], %d bytes, %s ms\n"
+msgstr ""
+
+#: plugins/check_icmp.c:945
+#, c-format
+msgid "ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s"
+msgstr ""
+
+#: plugins/check_icmp.c:950 plugins/check_icmp.c:974
+#, c-format
+msgid "ICMP Unreachable from %s for ICMP Echo sent to %s"
+msgstr ""
+
+#: plugins/check_icmp.c:1059
+#, fuzzy, c-format
+msgid "%s address not found\n"
+msgstr "%s [%s non trouvé]"
+
+#: plugins/check_icmp.c:1067
+#, fuzzy, c-format
+msgid "%s has no address data\n"
+msgstr "Le DNS %s n'a pas d'enregistrements\n"
+
+#: plugins/check_icmp.c:1100
+msgid "Can't allocate some space for a string"
+msgstr ""
+
+#: plugins/check_icmp.c:1119
+msgid "Can't allocate HOST_ENTRY"
+msgstr ""
+
+#: plugins/check_icmp.c:1132
+msgid "Can't allocate resp_times array"
+msgstr ""
+
+#: plugins/check_icmp.c:1196
+#, fuzzy
+msgid "malloc() failed!"
+msgstr "La réception à échoué\n"
+
+#: plugins/check_icmp.c:1213
+#, c-format
+msgid "%s: %s : A network error occurred\n"
+msgstr ""
+
+#: plugins/check_icmp.c:1279
+msgid "select() in u_sleep:"
+msgstr ""
+
+#: plugins/check_icmp.c:1309
+msgid "select() in recvfrom_wto"
+msgstr ""
+
+#: plugins/check_icmp.c:1316
+msgid "recvfrom"
+msgstr ""
+
 #: plugins/check_icmp.c:1371
 #, fuzzy, c-format
 msgid ""
@@ -1649,6 +1858,26 @@ msgstr "Impossible de se connecter au serveur port %i\n"
 msgid "Could not set protocol version %d\n"
 msgstr "Impossible d'utiliser le protocole version %d\n"
 
+#: plugins/check_ldap.c:137
+#, fuzzy, c-format
+msgid "Could not init TLS at port %i!\n"
+msgstr "Impossible de se connecter au serveur port %i\n"
+
+#: plugins/check_ldap.c:141
+#, c-format
+msgid "TLS not supported by the libraries!\n"
+msgstr ""
+
+#: plugins/check_ldap.c:160
+#, fuzzy, c-format
+msgid "Could not init startTLS at port %i!\n"
+msgstr "Impossible de se connecter au serveur port %i\n"
+
+#: plugins/check_ldap.c:164
+#, c-format
+msgid "startTLS not supported by the library, needs LDAPv3!\n"
+msgstr ""
+
 #: plugins/check_ldap.c:174
 #, c-format
 msgid "Could not bind to the ldap-server\n"
@@ -1664,19 +1893,21 @@ msgstr "Impossible de chercher/trouver les objectclasses dans %s\n"
 msgid "LDAP %s - %.3f seconds response time|%s\n"
 msgstr "LDAP %s - %.3f secondes de temps de réponse|%s\n"
 
-#: plugins/check_ldap.c:311 plugins/check_ping.c:221 plugins/check_ssh.c:138
+#: plugins/check_ldap.c:311 plugins/check_ping.c:219
 msgid "IPv6 support not available\n"
 msgstr "Support IPv6 non disponible\n"
 
-#: plugins/check_ldap.c:335
-msgid "please specify the host name\n"
+#: plugins/check_ldap.c:334
+#, fuzzy
+msgid "Please specify the host name\n"
 msgstr "Veuillez spécifier le nom de l'hôte\n"
 
-#: plugins/check_ldap.c:338
-msgid "please specify the LDAP base\n"
+#: plugins/check_ldap.c:337
+#, fuzzy
+msgid "Please specify the LDAP base\n"
 msgstr "Veuillez spécifier la base LDAP\n"
 
-#: plugins/check_ldap.c:365
+#: plugins/check_ldap.c:362
 #, c-format
 msgid ""
 " -a [--attr]\n"
@@ -1697,7 +1928,7 @@ msgstr ""
 " -P [--pass]\n"
 "    mot de passe ldap (si nécessaire)\n"
 
-#: plugins/check_ldap.c:376
+#: plugins/check_ldap.c:373
 #, c-format
 msgid ""
 " -2 [--ver2]\n"
@@ -1745,38 +1976,38 @@ msgstr "Le seuil d'alerte doit être un nombre à virgule flottante!\n"
 msgid "Critical threshold must be float or float triplet!\n"
 msgstr "Le seuil critique doit être un nombre à virgule flottante!\n"
 
-#: plugins/check_load.c:273
+#: plugins/check_load.c:271
 msgid "Warning threshold for 1-minute load average is not specified\n"
 msgstr ""
 "Le seuil d'alerte pour la charge système après 1 minute n'est pas spécifié\n"
 
-#: plugins/check_load.c:275
+#: plugins/check_load.c:273
 msgid "Warning threshold for 5-minute load average is not specified\n"
 msgstr ""
 "Le seuil d'alerte pour la charge système après 5 minutes n'est pas spécifié\n"
 
-#: plugins/check_load.c:277
+#: plugins/check_load.c:275
 msgid "Warning threshold for 15-minute load average is not specified\n"
 msgstr ""
 "Le seuil d'alerte pour la charge système après 15 minutes n'est pas "
 "spécifié\n"
 
-#: plugins/check_load.c:279
+#: plugins/check_load.c:277
 msgid "Critical threshold for 1-minute load average is not specified\n"
 msgstr ""
 "Le seuil critique pour la charge système après 1 minute n'est pas spécifié\n"
 
-#: plugins/check_load.c:281
+#: plugins/check_load.c:279
 msgid "Critical threshold for 5-minute load average is not specified\n"
 msgstr ""
 "Le seuil critique pour la charge système après 5 minutes n'est pas spécifié\n"
 
-#: plugins/check_load.c:283
+#: plugins/check_load.c:281
 msgid "Critical threshold for 15-minute load average is not specified\n"
 msgstr ""
 "Le seuil critique pour la charge système après 15 minute n'est pas spécifié\n"
 
-#: plugins/check_load.c:285
+#: plugins/check_load.c:283
 msgid ""
 "Parameter inconsistency: 1-minute \"warning load\" greater than \"critical "
 "load\".\n"
@@ -1784,7 +2015,7 @@ msgstr ""
 "Arguments Incorrects: 1-minute \"warning load\" est plus grand que "
 "\"critical load\".\n"
 
-#: plugins/check_load.c:287
+#: plugins/check_load.c:285
 msgid ""
 "Parameter inconsistency: 5-minute \"warning load\" greater than \"critical "
 "load\".\n"
@@ -1792,7 +2023,7 @@ msgstr ""
 "Arguments Incorrects: 5-minute \"warning load\" est plus grand que "
 "\"critical load\".\n"
 
-#: plugins/check_load.c:289
+#: plugins/check_load.c:287
 msgid ""
 "Parameter inconsistency: 15-minute \"warning load\" greater than \"critical "
 "load\".\n"
@@ -1800,7 +2031,7 @@ msgstr ""
 "Arguments Incorrects: 15-minute \"warning load\" est plus grand que "
 "\"critical load\".\n"
 
-#: plugins/check_load.c:303
+#: plugins/check_load.c:301
 #, c-format
 msgid ""
 "This plugin tests the current system load average.\n"
@@ -1809,7 +2040,7 @@ msgstr ""
 "Ce plugin teste la charge système actuelle.\n"
 "\n"
 
-#: plugins/check_load.c:309
+#: plugins/check_load.c:307
 #, c-format
 msgid ""
 " -w, --warning=WLOAD1,WLOAD5,WLOAD15\n"
@@ -1861,7 +2092,7 @@ msgstr "Max"
 msgid "Invalid variable number"
 msgstr "Numéro de la variable invalide"
 
-#: plugins/check_mrtg.c:252
+#: plugins/check_mrtg.c:250
 #, c-format
 msgid ""
 "%s is not a valid expiration time\n"
@@ -1870,15 +2101,15 @@ msgstr ""
 "%s n'est pas un temps d'expiration valide\n"
 "Utilisez '%s -h' pour de l'aide supplémentaire\n"
 
-#: plugins/check_mrtg.c:269
+#: plugins/check_mrtg.c:267
 msgid "Invalid variable number\n"
 msgstr "Numéro de la variable invalide\n"
 
-#: plugins/check_mrtg.c:296
+#: plugins/check_mrtg.c:294
 msgid "You must supply the variable number"
 msgstr "Vous devez fournir le numéro de la variable"
 
-#: plugins/check_mrtg.c:317
+#: plugins/check_mrtg.c:315
 #, c-format
 msgid ""
 "This plugin will check either the average or maximum value of one of the\n"
@@ -1889,7 +2120,7 @@ msgstr ""
 "écrites dans un fichier de log MRTG.\n"
 "\n"
 
-#: plugins/check_mrtg.c:325
+#: plugins/check_mrtg.c:323
 #, c-format
 msgid ""
 " -F, --logfile=FILE\n"
@@ -1919,7 +2150,7 @@ msgstr ""
 " -c, --critical=INTEGER\n"
 "   Valeur d'intervalle qui doit déclencher un seuil CRITIQUE\n"
 
-#: plugins/check_mrtg.c:339
+#: plugins/check_mrtg.c:337
 #, c-format
 msgid ""
 " -l, --label=STRING\n"
@@ -1935,7 +2166,7 @@ msgstr ""
 "   Label optionnel pour les données (Exemple: Paquets/Sec, Erreurs/Sec, \n"
 "   \"Bytes Par Secondes\", \"%% Utilisation\")\n"
 
-#: plugins/check_mrtg.c:346
+#: plugins/check_mrtg.c:344
 #, c-format
 msgid ""
 "If the value exceeds the <vwl> threshold, a WARNING status is returned.  If\n"
@@ -1952,7 +2183,7 @@ msgstr ""
 " un status ALERTE est renvoyé and un message d'alerte est affiché.\n"
 "\n"
 
-#: plugins/check_mrtg.c:352
+#: plugins/check_mrtg.c:350
 #, c-format
 msgid ""
 "This plugin is useful for monitoring MRTG data that does not correspond to\n"
@@ -1965,7 +2196,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:359
+#: plugins/check_mrtg.c:357
 #, c-format
 msgid ""
 "Notes:\n"
@@ -1996,7 +2227,7 @@ msgstr "%s. Entrée = %0.1f %s, %s. Sortie = %0.1f %s|%s %s\n"
 msgid "Traffic %s - %s\n"
 msgstr "Trafic %s - %s\n"
 
-#: plugins/check_mrtgtraf.c:324
+#: plugins/check_mrtgtraf.c:320
 #, c-format
 msgid ""
 "\n"
@@ -2009,7 +2240,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:336
+#: plugins/check_mrtgtraf.c:332
 #, c-format
 msgid ""
 " -F, --filename=STRING\n"
@@ -2034,7 +2265,7 @@ msgstr ""
 " -c, --critical\n"
 "   Seuil Critique \"<incoming>,<outgoing>\"\n"
 
-#: plugins/check_mrtgtraf.c:348
+#: plugins/check_mrtgtraf.c:344
 #, c-format
 msgid ""
 "Notes:\n"
@@ -2047,12 +2278,32 @@ msgid ""
 "  for future enhancements of this plugin.\n"
 msgstr ""
 
-#: plugins/check_mysql.c:279
+#: plugins/check_mysql.c:101
+#, fuzzy, c-format
+msgid "slave query error: %s\n"
+msgstr "Erreur d'exécution: %s\n"
+
+#: plugins/check_mysql.c:107
+#, c-format
+msgid "slave store_result error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:114
+#, c-format
+msgid "slave fetch row error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:119
+#, c-format
+msgid "Slave running: %s"
+msgstr ""
+
+#: plugins/check_mysql.c:274
 #, c-format
 msgid "This program tests connections to a mysql server\n"
 msgstr "Ce plugin teste une connection vers un serveur mysql\n"
 
-#: plugins/check_mysql.c:287
+#: plugins/check_mysql.c:282
 #, c-format
 msgid ""
 " -d, --database=STRING\n"
@@ -2078,7 +2329,7 @@ msgstr ""
 " -S, --check-slave\n"
 "   Vérifier si le processus esclave fonctionne correctement.\n"
 
-#: plugins/check_mysql.c:299
+#: plugins/check_mysql.c:294
 #, c-format
 msgid ""
 "\n"
@@ -2094,6 +2345,11 @@ msgstr ""
 msgid "CRITICAL - Cannot open status log for reading!\n"
 msgstr "CRITIQUE - Impossible d'ouvrir le status log en lecture!\n"
 
+#: plugins/check_nagios.c:98
+#, fuzzy, c-format
+msgid "command: %s\n"
+msgstr "Commande: %s\n"
+
 #: plugins/check_nagios.c:140
 #, c-format
 msgid "Found process: %s %s\n"
@@ -2111,43 +2367,24 @@ msgstr ""
 "Nagios %s: à trouvé %d processus%s, status log mis à jour %d secondes%s "
 "auparavant\n"
 
-#: plugins/check_nagios.c:209 plugins/check_nagios.c:243
-#, c-format
-msgid ""
-"Expiration time must be an integer (seconds)\n"
-"Type '%s -h' for additional help\n"
+#: plugins/check_nagios.c:209 plugins/check_nagios.c:240
+#, fuzzy
+msgid "Expiration time must be an integer (seconds)\n"
 msgstr ""
 "Le délai d'expiration doit être un entier (en secondes)\n"
 "Tapez '%s -h' pour de l'aide additionelle\n"
 
-#: plugins/check_nagios.c:223
-#, c-format
-msgid ""
-"%s: Unknown argument: %c\n"
-"\n"
-msgstr ""
-"%s: Argument inconnu: %c\n"
-"\n"
-
-#: plugins/check_nagios.c:255
-#, c-format
-msgid ""
-"You must provide the status_log\n"
-"Type '%s -h' for additional help\n"
-msgstr ""
-"Vous devez fournir le fichier status_log\n"
-"Tapez '%s -h' pour de l'aide additionelle\n"
+#: plugins/check_nagios.c:251
+#, fuzzy
+msgid "You must provide the status_log\n"
+msgstr "%s: Vous devez fournir un nom d'hôte\n"
 
-#: plugins/check_nagios.c:259
-#, c-format
-msgid ""
-"You must provide a process string\n"
-"Type '%s -h' for additional help\n"
-msgstr ""
-"Vous devez fournir le nom du processus\n"
-"Tapez '%s -h' pour de l'aide additionelle\n"
+#: plugins/check_nagios.c:254
+#, fuzzy
+msgid "You must provide a process string\n"
+msgstr "%s: Vous devez fournir un nom d'hôte\n"
 
-#: plugins/check_nagios.c:274
+#: plugins/check_nagios.c:268
 #, fuzzy, c-format
 msgid ""
 "This plugin checks the status of the Nagios process on the local\n"
@@ -2165,7 +2402,7 @@ msgstr ""
 "l'option <process_string>.\n"
 "\n"
 
-#: plugins/check_nagios.c:284
+#: plugins/check_nagios.c:278
 #, fuzzy, c-format
 msgid ""
 " -F, --filename=FILE\n"
@@ -2183,7 +2420,7 @@ msgstr ""
 "-C, --command=STRING\n"
 "   Commande à chercher dans la table des processus\n"
 
-#: plugins/check_nagios.c:292
+#: plugins/check_nagios.c:286
 #, fuzzy, c-format
 msgid ""
 "Example:\n"
@@ -2286,21 +2523,22 @@ msgstr "Pas de compteur spécifié"
 msgid "Please specify a variable to check"
 msgstr "Veuillez préciser une variable a vérifier"
 
-#: plugins/check_nt.c:510 plugins/check_nwstat.c:782
-#: plugins/check_overcr.c:352
-#, c-format
-msgid ""
-"Server port an integer (seconds)\n"
-"Type '%s -h' for additional help\n"
+#: plugins/check_nt.c:508
+#, fuzzy
+msgid "Server port must be an integer\n"
 msgstr ""
 "Le port du server doit être un entier (secondes)\n"
 "Tapez '%s -h' pour de l'aide additionelle\n"
 
-#: plugins/check_nt.c:563
+#: plugins/check_nt.c:561
 msgid "None"
 msgstr "Aucun"
 
-#: plugins/check_nt.c:620
+#: plugins/check_nt.c:574
+msgid "could not fetch information from server\n"
+msgstr ""
+
+#: plugins/check_nt.c:618
 #, c-format
 msgid ""
 "This plugin collects data from the NSClient service running on a\n"
@@ -2311,7 +2549,7 @@ msgstr ""
 "Windows NT/2000/XP server.\n"
 "\n"
 
-#: plugins/check_nt.c:625
+#: plugins/check_nt.c:623
 #, c-format
 msgid ""
 "\n"
@@ -2334,7 +2572,7 @@ msgid ""
 "  Print version information\n"
 msgstr ""
 
-#: plugins/check_nt.c:643
+#: plugins/check_nt.c:641
 #, c-format
 msgid ""
 "-v, --variable=STRING\n"
@@ -2343,7 +2581,7 @@ msgstr ""
 "-v, --variable=STRING\n"
 "  Variable à vérifier.  Les variables valides sont:\n"
 
-#: plugins/check_nt.c:646
+#: plugins/check_nt.c:644
 #, c-format
 msgid ""
 "   CLIENTVERSION = Get the NSClient version\n"
@@ -2352,7 +2590,7 @@ msgstr ""
 "   CLIENTVERSION = Obtenir la version de NSClient\n"
 "     si l'argument -l <version> est spécifié, une alerte sera renvoyée.\n"
 
-#: plugins/check_nt.c:649
+#: plugins/check_nt.c:647
 #, c-format
 msgid ""
 "   CPULOAD = Average CPU load on last x minutes.\n"
@@ -2364,7 +2602,7 @@ msgid ""
 "     ie: -l 60,90,95,120,90,95\n"
 msgstr ""
 
-#: plugins/check_nt.c:656
+#: plugins/check_nt.c:654
 #, c-format
 msgid ""
 "   UPTIME = Get the uptime of the machine.\n"
@@ -2373,7 +2611,7 @@ msgstr ""
 "   UPTIME = Obtenir la durée de bon fonctionnement de la machine.\n"
 "     Pas d'argument spécifique. Pas de seuil d'alerte ou critique\n"
 
-#: plugins/check_nt.c:659
+#: plugins/check_nt.c:657
 #, c-format
 msgid ""
 "   USEDDISKSPACE = Size and percentage of disk use.\n"
@@ -2381,7 +2619,7 @@ msgid ""
 "     Warning and critical thresholds can be specified with -w and -c.\n"
 msgstr ""
 
-#: plugins/check_nt.c:663
+#: plugins/check_nt.c:661
 #, c-format
 msgid ""
 "   MEMUSE = Memory use.\n"
@@ -2390,7 +2628,7 @@ msgstr ""
 "   MEMUSE = Utilisation mémoire.\n"
 "     Les seuil d'alerte et critiques peuvent être spécifiés avec -w et -c.\n"
 
-#: plugins/check_nt.c:666
+#: plugins/check_nt.c:664
 #, c-format
 msgid ""
 "   SERVICESTATE = Check the state of one or several services.\n"
@@ -2400,7 +2638,7 @@ msgid ""
 "\t\t in the returned string.\n"
 msgstr ""
 
-#: plugins/check_nt.c:672
+#: plugins/check_nt.c:670
 #, c-format
 msgid ""
 "   PROCSTATE = Check if one or several process are running.\n"
@@ -2409,7 +2647,7 @@ msgstr ""
 "   PROCSTATE = Vérifie si un ou plusieurs processus sont démarrés.\n"
 "     même syntaxe que SERVICESTATE.\n"
 
-#: plugins/check_nt.c:675
+#: plugins/check_nt.c:673
 #, c-format
 msgid ""
 "   COUNTER = Check any performance counter of Windows NT/2000.\n"
@@ -2423,7 +2661,7 @@ msgid ""
 "       \"%%.f %%%% paging file used.\"\n"
 msgstr ""
 
-#: plugins/check_nt.c:685
+#: plugins/check_nt.c:683
 #, c-format
 msgid ""
 "Notes:\n"
@@ -2615,7 +2853,14 @@ msgstr "Le Module %s n'est pas chargé"
 msgid "Nothing to check!\n"
 msgstr "Rien à vérifier!\n"
 
-#: plugins/check_nwstat.c:910
+#: plugins/check_nwstat.c:780 plugins/check_overcr.c:342
+#, fuzzy
+msgid "Server port an integer\n"
+msgstr ""
+"Le port du server doit être un entier (secondes)\n"
+"Tapez '%s -h' pour de l'aide additionelle\n"
+
+#: plugins/check_nwstat.c:908
 #, c-format
 msgid ""
 "This plugin attempts to contact the MRTGEXT NLM running on a\n"
@@ -2626,7 +2871,7 @@ msgstr ""
 "un serveur Novell pour récupèrer l'information système demandée.\n"
 "\n"
 
-#: plugins/check_nwstat.c:920
+#: plugins/check_nwstat.c:918
 #, fuzzy, c-format
 msgid ""
 " -v, --variable=STRING\n"
@@ -2647,7 +2892,7 @@ msgstr ""
 "      ABENDS    = number of abended threads (NW 5.x only)\n"
 "      UPTIME    = server uptime\n"
 
-#: plugins/check_nwstat.c:930
+#: plugins/check_nwstat.c:928
 #, fuzzy, c-format
 msgid ""
 "      LTCH      = percent long term cache hits\n"
@@ -2662,7 +2907,7 @@ msgstr ""
 "      DCB       = buffers cache sales en pourcentage du total\n"
 "      TCB       = buffers cache sales en pourcentage de l'original\n"
 
-#: plugins/check_nwstat.c:937
+#: plugins/check_nwstat.c:935
 #, c-format
 msgid ""
 "      OFILES    = number of open files\n"
@@ -2681,7 +2926,7 @@ msgstr ""
 "      VPNP<vol> = pourcentage de place non libérable sur le volume <vol>\n"
 "      VKNP<vol> = KB de place non libérable sur le volume <vol>\n"
 
-#: plugins/check_nwstat.c:946
+#: plugins/check_nwstat.c:944
 #, c-format
 msgid ""
 "      LRUM      = LRU sitting time in minutes\n"
@@ -2694,7 +2939,7 @@ msgid ""
 "      SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:956
+#: plugins/check_nwstat.c:954
 #, c-format
 msgid ""
 "      TSYNC     = timesync status \n"
@@ -2704,7 +2949,7 @@ msgid ""
 "                  (e.g. \"NLM:TSANDS.NLM\")\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:963
+#: plugins/check_nwstat.c:961
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -2715,7 +2960,7 @@ msgid ""
 "    Include server version string in results\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:973
+#: plugins/check_nwstat.c:971
 #, c-format
 msgid ""
 "\n"
@@ -2782,7 +3027,7 @@ msgstr "Processus %s - %d instances%s de %s demarrées"
 msgid "Uptime %s - Up %d days %d hours %d minutes"
 msgstr "Temps de fonctionnement %s - Up %d jours %d heures %d minutes"
 
-#: plugins/check_overcr.c:418
+#: plugins/check_overcr.c:406
 #, c-format
 msgid ""
 "This plugin attempts to contact the Over-CR collector daemon running on the\n"
@@ -2793,7 +3038,7 @@ msgstr ""
 "distant afin de récupèrer les informations système demandées.\n"
 "\n"
 
-#: plugins/check_overcr.c:428
+#: plugins/check_overcr.c:416
 #, c-format
 msgid ""
 "-v, --variable=STRING\n"
@@ -2807,7 +3052,7 @@ msgid ""
 "     UPTIME        = system uptime in seconds\n"
 msgstr ""
 
-#: plugins/check_overcr.c:439
+#: plugins/check_overcr.c:427
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -2816,7 +3061,7 @@ msgid ""
 "   Threshold which will result in a critical status\n"
 msgstr ""
 
-#: plugins/check_overcr.c:447
+#: plugins/check_overcr.c:435
 #, c-format
 msgid ""
 "Notes:\n"
@@ -2830,7 +3075,7 @@ msgstr ""
 " grand que le seuil d'alerte SAUF pour l'option uptime\n"
 "\n"
 
-#: plugins/check_overcr.c:452
+#: plugins/check_overcr.c:440
 #, c-format
 msgid ""
 " - This plugin requres that Eric Molitors' Over-CR collector daemon be\n"
@@ -2855,20 +3100,26 @@ msgstr "CRITIQUE - pas de connection à '%s' (%s).\n"
 msgid " %s - database %s (%d sec.)|%s\n"
 msgstr " %s - base de données %s (%d sec.)|%s\n"
 
-#: plugins/check_pgsql.c:229 plugins/check_pgsql.c:235 plugins/check_tcp.c:494
-#: plugins/check_time.c:267 plugins/check_time.c:279 plugins/check_udp.c:168
+#: plugins/check_pgsql.c:227 plugins/check_tcp.c:492 plugins/check_time.c:265
+#: plugins/check_time.c:277 plugins/check_udp.c:166 plugins/check_users.c:152
 msgid "Critical threshold must be a positive integer"
 msgstr "Le seuil critique doit être un entier positif"
 
-#: plugins/check_pgsql.c:253
+#: plugins/check_pgsql.c:233 plugins/check_tcp.c:502 plugins/check_time.c:246
+#: plugins/check_time.c:270 plugins/check_udp.c:173 plugins/check_users.c:158
+#: plugins/check_users.c:168 plugins/check_users.c:175
+msgid "Warning threshold must be a positive integer"
+msgstr "Attention l'intervalle doit être un entier positif"
+
+#: plugins/check_pgsql.c:251
 msgid "Database name is not valid"
 msgstr "Le nom de la base de données est invalide"
 
-#: plugins/check_pgsql.c:259
+#: plugins/check_pgsql.c:257
 msgid "User name is not valid"
 msgstr "Le nom de l'utilisateur est invalide"
 
-#: plugins/check_pgsql.c:396
+#: plugins/check_pgsql.c:394
 #, c-format
 msgid ""
 "Test whether a PostgreSQL Database is accepting connections.\n"
@@ -2877,7 +3128,7 @@ msgstr ""
 "Teste si une base de données Postgresql accepte les connections.\n"
 "\n"
 
-#: plugins/check_pgsql.c:406
+#: plugins/check_pgsql.c:404
 #, c-format
 msgid ""
 "  -d, --database=STRING\n"
@@ -2894,7 +3145,7 @@ msgstr ""
 "  -p, --password = STRING\n"
 "    mot de passe (GROS PROBLEME DE SECURITE)\n"
 
-#: plugins/check_pgsql.c:420
+#: plugins/check_pgsql.c:418
 #, c-format
 msgid ""
 "\n"
@@ -2907,7 +3158,7 @@ msgid ""
 "PostgreSQL DBMS.\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:427
+#: plugins/check_pgsql.c:425
 #, c-format
 msgid ""
 "\n"
@@ -2921,7 +3172,7 @@ msgstr ""
 "accepte \n"
 "les connections TCP/IP (démarrez le postmaster avec l'option -i).\n"
 
-#: plugins/check_pgsql.c:431
+#: plugins/check_pgsql.c:429
 #, c-format
 msgid ""
 "\n"
@@ -2945,107 +3196,107 @@ msgstr "PING %s - %sPaquets perdus = %d%%"
 msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"
 msgstr "PING %s - %sPaquets perdus = %d%%, RTA = %2.2f ms"
 
-#: plugins/check_ping.c:232
+#: plugins/check_ping.c:230
 msgid "Could not realloc() addresses\n"
 msgstr "Impossible de réallouer les adresses\n"
 
-#: plugins/check_ping.c:247 plugins/check_ping.c:327
+#: plugins/check_ping.c:245 plugins/check_ping.c:325
 #, c-format
 msgid "<max_packets> (%s) must be a non-negative number\n"
 msgstr "<max_packets> (%s) doit être un nombre positif\n"
 
-#: plugins/check_ping.c:281
+#: plugins/check_ping.c:279
 #, c-format
 msgid "<wpl> (%s) must be an integer percentage\n"
 msgstr "<wpl> (%s) doit être un pourcentage entier\n"
 
-#: plugins/check_ping.c:292
+#: plugins/check_ping.c:290
 #, c-format
 msgid "<cpl> (%s) must be an integer percentage\n"
 msgstr "<cpl> (%s) doit être un pourcentage entier\n"
 
-#: plugins/check_ping.c:303
+#: plugins/check_ping.c:301
 #, c-format
 msgid "<wrta> (%s) must be a non-negative number\n"
 msgstr "<wrta> (%s) doit être un entier positif\n"
 
-#: plugins/check_ping.c:314
+#: plugins/check_ping.c:312
 #, c-format
 msgid "<crta> (%s) must be a non-negative number\n"
 msgstr "<crta> (%s) doit être un entier positif\n"
 
-#: plugins/check_ping.c:347
+#: plugins/check_ping.c:345
 #, c-format
 msgid ""
 "%s: Warning threshold must be integer or percentage!\n"
 "\n"
 msgstr "%s: Le seuil d'alerte doit être un entier ou un pourcentage!\n"
 
-#: plugins/check_ping.c:360
+#: plugins/check_ping.c:358
 #, c-format
 msgid "<wrta> was not set\n"
 msgstr "<wrta> n'a pas été indiqué\n"
 
-#: plugins/check_ping.c:364
+#: plugins/check_ping.c:362
 #, c-format
 msgid "<crta> was not set\n"
 msgstr "<crta> n'a pas été indiqué\n"
 
-#: plugins/check_ping.c:368
+#: plugins/check_ping.c:366
 #, c-format
 msgid "<wpl> was not set\n"
 msgstr " <wpl> n'a pas été indiqué\n"
 
-#: plugins/check_ping.c:372
+#: plugins/check_ping.c:370
 #, c-format
 msgid "<cpl> was not set\n"
 msgstr "<cpl> n'a pas été indiqué\n"
 
-#: plugins/check_ping.c:376
+#: plugins/check_ping.c:374
 #, c-format
 msgid "<wrta> (%f) cannot be larger than <crta> (%f)\n"
 msgstr "<wrta> (%f) ne peut pas être plus large que <crta> (%f)\n"
 
-#: plugins/check_ping.c:380
+#: plugins/check_ping.c:378
 #, c-format
 msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
 msgstr "<wpl> (%d) ne peut pas être plus large que <cpl> (%d)\n"
 
-#: plugins/check_ping.c:408
+#: plugins/check_ping.c:406
 #, c-format
 msgid "Cannot open pipe: %s"
 msgstr ""
 
-#: plugins/check_ping.c:412
+#: plugins/check_ping.c:410
 #, c-format
 msgid "Cannot open stderr for %s\n"
 msgstr "Impossible d'ouvrir stderr pour %s\n"
 
-#: plugins/check_ping.c:467
+#: plugins/check_ping.c:465
 #, c-format
 msgid "CRITICAL - Network unreachable (%s)"
 msgstr "CRITIQUE - Le réseau est injoignable (%s)"
 
-#: plugins/check_ping.c:469
+#: plugins/check_ping.c:467
 #, c-format
 msgid "CRITICAL - Host Unreachable (%s)"
 msgstr "CRITIQUE - Hôte injoignable (%s)"
 
-#: plugins/check_ping.c:471
+#: plugins/check_ping.c:469
 #, c-format
 msgid "CRITICAL - Host not found (%s)"
 msgstr "CRITIQUE - Hôte non trouvé (%s)"
 
-#: plugins/check_ping.c:473
+#: plugins/check_ping.c:471
 #, c-format
 msgid "CRITICAL - Time to live exceeded (%s)"
 msgstr "CRITIQUE - La durée de vie du paquet est dépassée (%s)"
 
-#: plugins/check_ping.c:480
+#: plugins/check_ping.c:478
 msgid "Unable to realloc warn_text"
 msgstr "Impossible de réallouer le texte d'avertissement"
 
-#: plugins/check_ping.c:497
+#: plugins/check_ping.c:495
 #, c-format
 msgid ""
 "Use ping to check connection statistics for a remote host.\n"
@@ -3055,7 +3306,7 @@ msgstr ""
 "distant.\n"
 "\n"
 
-#: plugins/check_ping.c:505
+#: plugins/check_ping.c:503
 #, c-format
 msgid ""
 "-H, --hostname=HOST\n"
@@ -3070,7 +3321,7 @@ msgid ""
 "   show HTML in the plugin output (obsoleted by urlize)\n"
 msgstr ""
 
-#: plugins/check_ping.c:520
+#: plugins/check_ping.c:518
 #, c-format
 msgid ""
 "THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel\n"
@@ -3079,7 +3330,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:525
+#: plugins/check_ping.c:523
 #, c-format
 msgid ""
 "This plugin uses the ping command to probe the specified host for packet "
@@ -3144,123 +3395,111 @@ msgstr[1] "%d processus"
 msgid " with %s"
 msgstr "avec %s"
 
-#: plugins/check_procs.c:371
-msgid ""
-"Critical Process Count must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:369
+#, fuzzy
+msgid "Critical Process Count must be an integer!"
 msgstr ""
 "Critique Le total des processus doit être un entier!\n"
 "\n"
 
-#: plugins/check_procs.c:383
-msgid ""
-"Warning Process Count must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:381
+#, fuzzy
+msgid "Warning Process Count must be an integer!"
 msgstr ""
 "Alerte Le total des processus doit être un entier!\n"
 "\n"
 
-#: plugins/check_procs.c:391
-#, c-format
-msgid ""
-"%s: Parent Process ID must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:389
+#, fuzzy
+msgid "Parent Process ID must be an integer!"
 msgstr ""
 "%s: L'id du processus parent doit être un entier!\n"
 "\n"
 
-#: plugins/check_procs.c:397 plugins/check_procs.c:502
+#: plugins/check_procs.c:395 plugins/check_procs.c:497
 #, c-format
 msgid "%s%sSTATE = %s"
 msgstr "%s%sETAT = %s"
 
-#: plugins/check_procs.c:406
-#, c-format
-msgid "UID %s was not found\n"
+#: plugins/check_procs.c:404
+#, fuzzy, c-format
+msgid "UID %s was not found"
 msgstr "UID %s n'a pas été trouvé\n"
 
-#: plugins/check_procs.c:412
-#, c-format
-msgid "User name %s was not found\n"
+#: plugins/check_procs.c:410
+#, fuzzy, c-format
+msgid "User name %s was not found"
 msgstr "L'utilisateur %s n'a pas été trouvé\n"
 
-#: plugins/check_procs.c:417
+#: plugins/check_procs.c:415
 #, c-format
 msgid "%s%sUID = %d (%s)"
 msgstr "%s%sUID = %d (%s)"
 
-#: plugins/check_procs.c:427
+#: plugins/check_procs.c:425
 #, c-format
 msgid "%s%scommand name '%s'"
 msgstr "%s%snom de la commande '%s'"
 
-#: plugins/check_procs.c:437
+#: plugins/check_procs.c:435
 #, c-format
 msgid "%s%sargs '%s'"
 msgstr "%s%sarguments '%s'"
 
-#: plugins/check_procs.c:442
+#: plugins/check_procs.c:440
 #, c-format
 msgid "%s%sRSS >= %d"
 msgstr ""
 
-#: plugins/check_procs.c:446
-#, c-format
-msgid ""
-"%s: RSS must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:444
+#, fuzzy
+msgid "RSS must be an integer!"
 msgstr ""
 "%s: RSS doit être un entier!\n"
 "\n"
 
-#: plugins/check_procs.c:449
+#: plugins/check_procs.c:447
 #, c-format
 msgid "%s%sVSZ >= %d"
 msgstr ""
 
-#: plugins/check_procs.c:453
-#, c-format
-msgid ""
-"%s: VSZ must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:451
+#, fuzzy
+msgid "VSZ must be an integer!"
 msgstr ""
 "%s: VSZ doit être un entier!\n"
 "\n"
 
-#: plugins/check_procs.c:457
+#: plugins/check_procs.c:455
 #, c-format
 msgid "%s%sPCPU >= %.2f"
 msgstr ""
 
-#: plugins/check_procs.c:461
-#, c-format
-msgid ""
-"%s: PCPU must be a float!\n"
-"\n"
+#: plugins/check_procs.c:459
+#, fuzzy
+msgid "PCPU must be a float!"
 msgstr ""
 "%s: PCPU doit être un nombre en virgule flottante!\n"
 "\n"
 
-#: plugins/check_procs.c:485
-#, fuzzy, c-format
-msgid ""
-"%s: metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!\n"
-"\n"
+#: plugins/check_procs.c:483
+#, fuzzy
+msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
 msgstr ""
 "%s: metric doivent être un de PROCS, VSZ, RSS, CPU, ELAPSED!\n"
 "\n"
 
-#: plugins/check_procs.c:521
+#: plugins/check_procs.c:516
 #, c-format
 msgid "wmax (%d) cannot be greater than cmax (%d)\n"
 msgstr "wmax (%d) ne peut pas être plus grand que cmax (%d)\n"
 
-#: plugins/check_procs.c:525
+#: plugins/check_procs.c:520
 #, c-format
 msgid "wmin (%d) cannot be less than cmin (%d)\n"
 msgstr "wmin (%d) ne peut pas être plus petit que cmin (%d)\n"
 
-#: plugins/check_procs.c:665
+#: plugins/check_procs.c:657
 #, c-format
 msgid ""
 "Checks all processes and generates WARNING or CRITICAL states if the "
@@ -3278,7 +3517,7 @@ msgstr ""
 "nombres de processus. Des filtres de recherches peuvent être utilisés pour \n"
 "limiter la recherche.\n"
 
-#: plugins/check_procs.c:672
+#: plugins/check_procs.c:664
 #, c-format
 msgid ""
 "\n"
@@ -3289,7 +3528,7 @@ msgid ""
 "   Generate critical state if metric is outside this range\n"
 msgstr ""
 
-#: plugins/check_procs.c:679
+#: plugins/check_procs.c:671
 #, c-format
 msgid ""
 "\n"
@@ -3302,12 +3541,12 @@ msgid ""
 "   CPU     - percentage cpu\n"
 msgstr ""
 
-#: plugins/check_procs.c:689
+#: plugins/check_procs.c:681
 #, c-format
 msgid "   ELAPSED - time elapsed in seconds\n"
 msgstr "   ELAPSED - temps écoulé en secondes\n"
 
-#: plugins/check_procs.c:694
+#: plugins/check_procs.c:686
 #, c-format
 msgid ""
 " -v, --verbose\n"
@@ -3316,7 +3555,7 @@ msgstr ""
 " -v, --verbose\n"
 "   Extra information. Jusqu'a 3 niveaux de verbosité\n"
 
-#: plugins/check_procs.c:698
+#: plugins/check_procs.c:690
 #, c-format
 msgid ""
 "\n"
@@ -3333,7 +3572,7 @@ msgid ""
 "   Only scan for processes with rss higher than indicated.\n"
 msgstr ""
 
-#: plugins/check_procs.c:711
+#: plugins/check_procs.c:703
 #, c-format
 msgid ""
 " -P, --pcpu=PCPU\n"
@@ -3346,7 +3585,7 @@ msgid ""
 "   Only scan for exact matches of COMMAND (without path).\n"
 msgstr ""
 
-#: plugins/check_procs.c:721
+#: plugins/check_procs.c:713
 #, c-format
 msgid ""
 "\n"
@@ -3356,7 +3595,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:726
+#: plugins/check_procs.c:718
 #, c-format
 msgid ""
 "This plugin checks the number of currently running processes and\n"
@@ -3367,7 +3606,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:733
+#: plugins/check_procs.c:725
 #, c-format
 msgid ""
 "Examples:\n"
@@ -3425,11 +3664,11 @@ msgstr "L'authentification à échoué"
 msgid "Auth OK"
 msgstr "L'authentification à réussi"
 
-#: plugins/check_radius.c:202 plugins/check_radius.c:264
+#: plugins/check_radius.c:202 plugins/check_radius.c:262
 msgid "Number of retries must be a positive integer"
 msgstr "Le nombre d'essai doit être un entier positif"
 
-#: plugins/check_radius.c:290
+#: plugins/check_radius.c:288
 #, c-format
 msgid ""
 "Tests to see if a radius server is accepting connections.\n"
@@ -3438,7 +3677,7 @@ msgstr ""
 "Teste si un serveur radius accepte les connections.\n"
 "\n"
 
-#: plugins/check_radius.c:298
+#: plugins/check_radius.c:296
 #, c-format
 msgid ""
 " -u, --username=STRING\n"
@@ -3455,7 +3694,7 @@ msgid ""
 "    Number of times to retry a failed connection\n"
 msgstr ""
 
-#: plugins/check_radius.c:314
+#: plugins/check_radius.c:312
 #, c-format
 msgid ""
 "\n"
@@ -3476,7 +3715,7 @@ msgstr ""
 "radius.\n"
 "\n"
 
-#: plugins/check_radius.c:321
+#: plugins/check_radius.c:319
 #, c-format
 msgid ""
 "The password option presents a substantial security issue because the\n"
@@ -3517,24 +3756,20 @@ msgstr "Pas de données reçues de l'hôte\n"
 msgid "REAL %s - %d second response time\n"
 msgstr "REAL %s - %d secondes de temps de réponse\n"
 
-#: plugins/check_real.c:324 plugins/check_smtp.c:343
+#: plugins/check_real.c:324 plugins/check_smtp.c:343 plugins/check_ups.c:522
 msgid "Warning time must be a positive integer"
 msgstr "Le temps d'alerte doit être un entier positif"
 
-#: plugins/check_real.c:333
-#, fuzzy
-msgid "Critical time must be a nonnegative integer"
-msgstr "Le temps critique doit être un entier positif"
-
-#: plugins/check_real.c:344
-msgid "Time interval must be a nonnegative integer"
-msgstr "L'intervalle de temps doit être un entier positif"
+#: plugins/check_real.c:333 plugins/check_smtp.c:334 plugins/check_ups.c:513
+msgid "Critical time must be a positive integer"
+msgstr "Critique le temps doit être un entier positif"
 
-#: plugins/check_real.c:371
-msgid "You must provide a server to check\n"
+#: plugins/check_real.c:369
+#, fuzzy
+msgid "You must provide a server to check"
 msgstr "Vous devez fournir un serveur à vérifier\n"
 
-#: plugins/check_real.c:403
+#: plugins/check_real.c:401
 #, c-format
 msgid ""
 "This plugin tests the REAL service on the specified host.\n"
@@ -3543,7 +3778,7 @@ msgstr ""
 "Ce plugin teste le service REAL sur l'hôte spécifié.\n"
 "\n"
 
-#: plugins/check_real.c:411
+#: plugins/check_real.c:409
 #, c-format
 msgid ""
 " -u, --url=STRING\n"
@@ -3557,7 +3792,7 @@ msgstr ""
 "   Texte attendu dans la première ligne de réponse venant du server (défaut: "
 "%s)\n"
 
-#: plugins/check_real.c:424
+#: plugins/check_real.c:422
 #, c-format
 msgid ""
 "This plugin will attempt to open an RTSP connection with the host.\n"
@@ -3582,7 +3817,7 @@ msgstr "Réponse SMTP invalide reçue de l'hôte\n"
 msgid "Invalid SMTP response received from host on port %d\n"
 msgstr "Réponse SMTP invalide reçue de l'hôte sur le port %d\n"
 
-#: plugins/check_smtp.c:182 plugins/check_snmp.c:510
+#: plugins/check_smtp.c:182 plugins/check_snmp.c:508
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr "Impossible de compiler l'expression régulière"
@@ -3602,20 +3837,12 @@ msgstr "Erreur d'exécution: %s\n"
 msgid "SMTP %s - %.3f sec. response time%s%s|%s\n"
 msgstr "SMTP %s - %.3f sec. de temps de réponse%s%s|%s\n"
 
-#: plugins/check_smtp.c:313 plugins/check_smtp.c:323 plugins/check_snmp.c:566
+#: plugins/check_smtp.c:313 plugins/check_smtp.c:323 plugins/check_snmp.c:564
 #, c-format
 msgid "Could not realloc() units [%d]\n"
 msgstr "Impossible de réallouer des unités [%d]\n"
 
-#: plugins/check_smtp.c:334
-msgid "Critical time must be a positive integer"
-msgstr "Critique le temps doit être un entier positif"
-
-#: plugins/check_smtp.c:354
-msgid "Time interval must be a positive integer"
-msgstr "L'intervalle de temps doit être un entier positif"
-
-#: plugins/check_smtp.c:426
+#: plugins/check_smtp.c:424
 #, c-format
 msgid ""
 "This plugin will attempt to open an SMTP connection with the host.\n"
@@ -3624,7 +3851,7 @@ msgstr ""
 "Ce plugin va essayer d'ouvrir un connection SMTP avec l'hôte.\n"
 "\n"
 
-#: plugins/check_smtp.c:436
+#: plugins/check_smtp.c:434
 #, c-format
 msgid ""
 " -e, --expect=STRING\n"
@@ -3639,7 +3866,7 @@ msgid ""
 "   FROM-address to include in MAIL command, required by Exchange 2000\n"
 msgstr ""
 
-#: plugins/check_smtp.c:455
+#: plugins/check_smtp.c:453
 #, c-format
 msgid ""
 "\n"
@@ -3649,7 +3876,11 @@ msgid ""
 "STATE_WARNING return values.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:284 plugins/check_snmp.c:516
+#: plugins/check_snmp.c:254
+msgid "No valid data returned"
+msgstr ""
+
+#: plugins/check_snmp.c:284 plugins/check_snmp.c:514
 #, c-format
 msgid "%s UNKNOWN: call for regex which was not a compiled option"
 msgstr ""
@@ -3661,30 +3892,30 @@ msgid ""
 "CMD: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:455
+#: plugins/check_snmp.c:453
 #, c-format
 msgid "Invalid critical threshold: %s\n"
 msgstr "Seuil critique invalide: %s\n"
 
-#: plugins/check_snmp.c:466
+#: plugins/check_snmp.c:464
 #, c-format
 msgid "Invalid warning threshold: %s\n"
 msgstr "Seuil d'alerte invalide: %s\n"
 
-#: plugins/check_snmp.c:536
+#: plugins/check_snmp.c:534
 #, c-format
 msgid "Could not realloc() labels[%d]"
 msgstr ""
 
-#: plugins/check_snmp.c:548
+#: plugins/check_snmp.c:546
 msgid "Could not realloc() labels\n"
 msgstr ""
 
-#: plugins/check_snmp.c:578
+#: plugins/check_snmp.c:576
 msgid "Could not realloc() units\n"
 msgstr "Impossible de réallouer des unités\n"
 
-#: plugins/check_snmp.c:651
+#: plugins/check_snmp.c:649
 #, fuzzy, c-format
 msgid ""
 "Missing secname (%s) or authpassword (%s) ! \n"
@@ -3693,17 +3924,21 @@ msgstr ""
 "Manque secname (%s) ou mot de passe (%s) ! \n"
 ")"
 
-#: plugins/check_snmp.c:659
+#: plugins/check_snmp.c:657
 #, c-format
 msgid "Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n"
 msgstr ""
 
-#: plugins/check_snmp.c:668
+#: plugins/check_snmp.c:666
 #, c-format
 msgid "Invalid SNMP version: %s\n"
 msgstr "Version de SNMP invalide: %s\n"
 
-#: plugins/check_snmp.c:847
+#: plugins/check_snmp.c:796
+msgid "Unbalanced quotes\n"
+msgstr ""
+
+#: plugins/check_snmp.c:845
 #, c-format
 msgid ""
 "Check status of remote machines and obtain sustem information via SNMP\n"
@@ -3713,7 +3948,7 @@ msgstr ""
 "SNMP\n"
 "\n"
 
-#: plugins/check_snmp.c:857
+#: plugins/check_snmp.c:855
 #, c-format
 msgid ""
 " -P, --protocol=[1|3]\n"
@@ -3730,7 +3965,7 @@ msgstr ""
 " -a, --authproto=[MD5|SHA]\n"
 "    Protocole d'authenfication SNMPv3\n"
 
-#: plugins/check_snmp.c:866
+#: plugins/check_snmp.c:864
 #, c-format
 msgid ""
 " -C, --community=STRING\n"
@@ -3744,7 +3979,7 @@ msgid ""
 "    SNMPv3 crypt passwd (DES)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:876
 #, c-format
 msgid ""
 " -o, --oid=OID(s)\n"
@@ -3757,7 +3992,7 @@ msgid ""
 "    to be the data that should be used in the evaluation.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:888
+#: plugins/check_snmp.c:886
 #, c-format
 msgid ""
 " -w, --warning=INTEGER_RANGE(s)\n"
@@ -3766,7 +4001,7 @@ msgid ""
 "    Range(s) which will not result in a CRITICAL status\n"
 msgstr ""
 
-#: plugins/check_snmp.c:895
+#: plugins/check_snmp.c:893
 #, c-format
 msgid ""
 " -s, --string=STRING\n"
@@ -3781,7 +4016,7 @@ msgid ""
 "    Prefix label for output from plugin (default -s 'SNMP')\n"
 msgstr ""
 
-#: plugins/check_snmp.c:906
+#: plugins/check_snmp.c:904
 #, c-format
 msgid ""
 " -u, --units=STRING\n"
@@ -3790,7 +4025,7 @@ msgid ""
 "    Separates output on multiple OID requests\n"
 msgstr ""
 
-#: plugins/check_snmp.c:916
+#: plugins/check_snmp.c:914
 #, c-format
 msgid ""
 "\n"
@@ -3806,7 +4041,7 @@ msgstr ""
 "Si vous n'avez pas ce logiciel installé, vous devez le télécharger depuis \n"
 "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin.\n"
 
-#: plugins/check_snmp.c:921
+#: plugins/check_snmp.c:919
 #, c-format
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
@@ -3814,7 +4049,7 @@ msgid ""
 "  internal spaces must be quoted) [max 8 OIDs]\n"
 msgstr ""
 
-#: plugins/check_snmp.c:925
+#: plugins/check_snmp.c:923
 #, c-format
 msgid ""
 "- Ranges are inclusive and are indicated with colons. When specified as\n"
@@ -3824,7 +4059,7 @@ msgid ""
 "  returned if the result is outside the specified range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:931
+#: plugins/check_snmp.c:929
 #, c-format
 msgid ""
 "- If specified in the order 'max:min' a non-OK state will be returned if "
@@ -3832,7 +4067,7 @@ msgid ""
 "  result is within the (inclusive) range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:935
+#: plugins/check_snmp.c:933
 #, c-format
 msgid ""
 "- Upper or lower bounds may be omitted to skip checking the respective "
@@ -3846,22 +4081,27 @@ msgid ""
 "  returned from the SNMP query is an unsigned integer.\n"
 msgstr ""
 
-#: plugins/check_ssh.c:221
+#: plugins/check_ssh.c:152
+#, fuzzy
+msgid "Port number must be a positive integer"
+msgstr "Le numéro du port doit être un entier positif"
+
+#: plugins/check_ssh.c:217
 #, c-format
 msgid "Server answer: %s"
 msgstr "Réponse du serveur: %s"
 
-#: plugins/check_ssh.c:239
+#: plugins/check_ssh.c:235
 #, c-format
 msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"
 msgstr "SSH ALERTE - %s (protocole %s) différence de version, attendu'%s'\n"
 
-#: plugins/check_ssh.c:245
+#: plugins/check_ssh.c:241
 #, c-format
 msgid "SSH OK - %s (protocol %s)\n"
 msgstr "SSH OK - %s (protocole %s)\n"
 
-#: plugins/check_ssh.c:264
+#: plugins/check_ssh.c:260
 #, c-format
 msgid ""
 "Try to connect to an SSH server at specified server and port\n"
@@ -3870,7 +4110,7 @@ msgstr ""
 "Essaye de se connecter à un serveur SSH précisé à un port précis\n"
 "\n"
 
-#: plugins/check_ssh.c:276
+#: plugins/check_ssh.c:272
 #, c-format
 msgid ""
 " -r, --remote-version=STRING\n"
@@ -3901,28 +4141,28 @@ msgstr "total=%d, utilisé=%d, libre=%d\n"
 msgid "total=%llu, free=%llu\n"
 msgstr "total=%llu, libre=%llu\n"
 
+#: plugins/check_swap.c:242 plugins/check_swap.c:281
+msgid "swapctl failed: "
+msgstr ""
+
 #: plugins/check_swap.c:314
 #, c-format
 msgid " %d%% free (%llu MB out of %llu MB)"
 msgstr " %d%% libre (%llu MB sur un total de %llu MB)"
 
-#: plugins/check_swap.c:391
-msgid "Warning threshold must be integer or percentage!\n"
-msgstr ""
-
 #: plugins/check_swap.c:408
 msgid "Critical threshold must be integer or percentage!\n"
 msgstr ""
 
-#: plugins/check_swap.c:464
+#: plugins/check_swap.c:462
 msgid "Warning percentage should be more than critical percentage\n"
 msgstr ""
 
-#: plugins/check_swap.c:468
+#: plugins/check_swap.c:466
 msgid "Warning free space should be more than critical free space\n"
 msgstr ""
 
-#: plugins/check_swap.c:482
+#: plugins/check_swap.c:480
 #, fuzzy, c-format
 msgid ""
 "Check swap space on local machine.\n"
@@ -3931,7 +4171,7 @@ msgstr ""
 "Vérifie l'espace swap sur la machine locale\n"
 "\n"
 
-#: plugins/check_swap.c:488
+#: plugins/check_swap.c:486
 #, c-format
 msgid ""
 "\n"
@@ -3951,7 +4191,7 @@ msgid ""
 "    Verbose output. Up to 3 levels\n"
 msgstr ""
 
-#: plugins/check_swap.c:502
+#: plugins/check_swap.c:500
 #, c-format
 msgid ""
 "\n"
@@ -3966,7 +4206,7 @@ msgstr ""
 "mémoire\n"
 " vive\n"
 
-#: plugins/check_swap.c:506
+#: plugins/check_swap.c:504
 #, c-format
 msgid ""
 "\n"
@@ -3980,6 +4220,11 @@ msgstr ""
 msgid "CRITICAL - Generic check_tcp called with unknown service\n"
 msgstr "CRITIQUE -check_tcp utilisé avec un service inconnu\n"
 
+#: plugins/check_tcp.c:262
+#, fuzzy
+msgid "CRITICAL - Could not make SSL connection\n"
+msgstr "HTTP CRITIQUE - Impossible d'établir une connection SSL\n"
+
 #: plugins/check_tcp.c:335
 #, c-format
 msgid "Unexpected response from host: %s\n"
@@ -3990,43 +4235,67 @@ msgstr "Réponse invalide de l'hôte: %s\n"
 msgid "%s %s%s - %.3f second response time on port %d"
 msgstr "%s %s%s - %.3f secondes de temps de réponse sur le port %d"
 
-#: plugins/check_tcp.c:504 plugins/check_time.c:248 plugins/check_time.c:272
-#: plugins/check_udp.c:175
-msgid "Warning threshold must be a positive integer"
-msgstr "Attention l'intervalle doit être un entier positif"
+#: plugins/check_tcp.c:437
+msgid "No arguments found"
+msgstr ""
 
-#: plugins/check_tcp.c:543
+#: plugins/check_tcp.c:541
 msgid "Maxbytes must be a positive integer"
 msgstr "Maxbytes doit être un entier positif"
 
-#: plugins/check_tcp.c:557
+#: plugins/check_tcp.c:555
 msgid "Refuse must be one of ok, warn, crit"
 msgstr "Refuse doit être parmis ok, warn, crit"
 
-#: plugins/check_tcp.c:567
+#: plugins/check_tcp.c:565
 #, fuzzy
 msgid "Mismatch must be one of ok, warn, crit"
 msgstr "Mismatch doit être parmis ok, warn, crit"
 
-#: plugins/check_tcp.c:573
+#: plugins/check_tcp.c:571
 msgid "Delay must be a positive integer"
 msgstr "Le delai doit être un entier positif"
 
-#: plugins/check_tcp.c:593
-msgid "You must provide a server address\n"
+#: plugins/check_tcp.c:584
+msgid "SSL support not available.  Install OpenSSL and recompile."
+msgstr ""
+
+#: plugins/check_tcp.c:591
+#, fuzzy
+msgid "You must provide a server address"
 msgstr "Vous devez fournir une adresse serveur\n"
 
-#: plugins/check_tcp.c:613
+#: plugins/check_tcp.c:611
 #, c-format
 msgid "CRITICAL - Cannot create SSL context.\n"
 msgstr "CRITIQUE - Impossible de créer le contexte SSL.\n"
 
-#: plugins/check_tcp.c:636
+#: plugins/check_tcp.c:634
 #, c-format
 msgid "CRITICAL - Cannot make  SSL connection "
 msgstr "CRITIQUE - Impossible d'établir une connection SSL"
 
-#: plugins/check_tcp.c:763
+#: plugins/check_tcp.c:711
+#, fuzzy, c-format
+msgid "Certificate expires in %d day(s) (%s).\n"
+msgstr "ALERTE - Le certificat expire dans %d jour(s) (%s).\n"
+
+#: plugins/check_tcp.c:715
+#, fuzzy, c-format
+msgid "Certificate expired on %s.\n"
+msgstr "CRITIQUE - Le certificat à expiré le %s.\n"
+
+#: plugins/check_tcp.c:720
+#, fuzzy, c-format
+msgid "Certificate expires today (%s).\n"
+msgstr "ALERTE - Le certificat expires aujourd'hui (%s).\n"
+
+#: plugins/check_tcp.c:724
+#, fuzzy, c-format
+msgid "Certificate will expire on %s.\n"
+msgstr "OK - Le certificat expirera le %s.\n"
+
+#: plugins/check_tcp.c:761
 #, c-format
 msgid ""
 "This plugin tests %s connections with the specified host.\n"
@@ -4035,7 +4304,7 @@ msgstr ""
 "Le plugin teste %s connections avec l'hôte spécifié\n"
 "\n"
 
-#: plugins/check_tcp.c:774
+#: plugins/check_tcp.c:772
 #, c-format
 msgid ""
 " -s, --send=STRING\n"
@@ -4046,7 +4315,7 @@ msgid ""
 "    String to send server to initiate a clean close of the connection\n"
 msgstr ""
 
-#: plugins/check_tcp.c:782
+#: plugins/check_tcp.c:780
 #, c-format
 msgid ""
 " -r, --refuse=ok|warn|crit\n"
@@ -4062,7 +4331,7 @@ msgid ""
 "    Seconds to wait between sending string and polling for response\n"
 msgstr ""
 
-#: plugins/check_tcp.c:795
+#: plugins/check_tcp.c:793
 #, c-format
 msgid ""
 " -D, --certificate=INTEGER\n"
@@ -4102,19 +4371,15 @@ msgstr "TIME %s - %d secondes de temps de réponse|%s\n"
 msgid "TIME %s - %lu second time difference|%s %s\n"
 msgstr "TIME %s - %lu secondes de différence|%s %s\n"
 
-#: plugins/check_time.c:244
+#: plugins/check_time.c:242
 msgid "Warning thresholds must be a positive integer"
 msgstr "Alerte les seuils doivent être un entier positif"
 
-#: plugins/check_time.c:263
+#: plugins/check_time.c:261
 msgid "Critical thresholds must be a positive integer"
 msgstr "Critique les seuils doivent être un entier positif"
 
-#: plugins/check_time.c:309 plugins/check_udp.c:209
-msgid "Hostname was not supplied"
-msgstr "Le nom de l'hôte n'a pas été spécifié"
-
-#: plugins/check_time.c:329
+#: plugins/check_time.c:327
 #, c-format
 msgid ""
 "This plugin will check the time on the specified host.\n"
@@ -4123,7 +4388,7 @@ msgstr ""
 "Ce plugin va vérifier l'heure sur l'hôte spécifié.\n"
 "\n"
 
-#: plugins/check_time.c:337
+#: plugins/check_time.c:335
 #, c-format
 msgid ""
 " -u, --udp\n"
@@ -4138,6 +4403,16 @@ msgid ""
 "    Response time (sec.) necessary to result in critical status\n"
 msgstr ""
 
+#: plugins/check_udp.c:70
+#, fuzzy, c-format
+msgid "No response from host on port %d\n"
+msgstr "Réponse SMTP invalide reçue de l'hôte sur le port %d\n"
+
+#: plugins/check_udp.c:79
+#, fuzzy, c-format
+msgid "Invalid response received from host on port %d\n"
+msgstr "Réponse HTTP invalide reçue de l'hôte sur le port %d\n"
+
 #: plugins/check_udp.c:95
 #, c-format
 msgid "Connection %s on port %d - %d second response time\n"
@@ -4151,7 +4426,7 @@ msgstr "accepté"
 msgid "problem"
 msgstr "problème"
 
-#: plugins/check_udp.c:227
+#: plugins/check_udp.c:225
 #, c-format
 msgid ""
 "\tThis plugin tests an UDP connection with the specified host.\n"
@@ -4160,7 +4435,7 @@ msgstr ""
 "Ce plugin teste un connection UDP avec l'hôte spécifié.\n"
 "\n"
 
-#: plugins/check_udp.c:236
+#: plugins/check_udp.c:234
 #, c-format
 msgid ""
 " -e, --expect=STRING <optional>\n"
@@ -4169,7 +4444,7 @@ msgid ""
 "    String to send to the server when initiating the connection\n"
 msgstr ""
 
-#: plugins/check_udp.c:248
+#: plugins/check_udp.c:246
 #, c-format
 msgid ""
 "This plugin will attempt to connect to the specified port on the host.\n"
@@ -4178,7 +4453,98 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:597
+#: plugins/check_ups.c:136
+msgid "On Battery, Low Battery"
+msgstr ""
+
+#: plugins/check_ups.c:141
+msgid "Online"
+msgstr ""
+
+#: plugins/check_ups.c:144
+msgid "On Battery"
+msgstr ""
+
+#: plugins/check_ups.c:148
+msgid ", Low Battery"
+msgstr ""
+
+#: plugins/check_ups.c:152
+msgid ", Calibrating"
+msgstr ""
+
+#: plugins/check_ups.c:155
+msgid ", Replace Battery"
+msgstr ""
+
+#: plugins/check_ups.c:159
+msgid ", On Bypass"
+msgstr ""
+
+#: plugins/check_ups.c:162
+msgid ", Overload"
+msgstr ""
+
+#: plugins/check_ups.c:165
+msgid ", Trimming"
+msgstr ""
+
+#: plugins/check_ups.c:168
+msgid ", Boosting"
+msgstr ""
+
+#: plugins/check_ups.c:171
+msgid ", Charging"
+msgstr ""
+
+#: plugins/check_ups.c:174
+msgid ", Discharging"
+msgstr ""
+
+#: plugins/check_ups.c:177
+msgid ", Unknown"
+msgstr ""
+
+#: plugins/check_ups.c:314
+#, fuzzy
+msgid "UPS does not support any available options\n"
+msgstr "Support IPv6 non disponible\n"
+
+#: plugins/check_ups.c:338 plugins/check_ups.c:398
+#, fuzzy, c-format
+msgid "Invalid response received from host\n"
+msgstr "Réponse SMTP invalide reçue de l'hôte\n"
+
+#: plugins/check_ups.c:406
+#, fuzzy, c-format
+msgid "CRITICAL - no such ups '%s' on that host\n"
+msgstr "CRITIQUE: Le volume '%s' n'existe pas!"
+
+#: plugins/check_ups.c:416
+#, fuzzy, c-format
+msgid "CRITICAL - UPS data is stale\n"
+msgstr "CRITIQUE - Date du serveur \"%100s\" illisible"
+
+#: plugins/check_ups.c:421
+#, fuzzy, c-format
+msgid "Unknown error: %s\n"
+msgstr "Erreur de papier inconnue"
+
+#: plugins/check_ups.c:428
+#, c-format
+msgid "Error: unable to parse variable\n"
+msgstr ""
+
+#: plugins/check_ups.c:535
+msgid "Unrecognized UPS variable"
+msgstr ""
+
+#: plugins/check_ups.c:573
+#, c-format
+msgid "Error : no ups indicated\n"
+msgstr ""
+
+#: plugins/check_ups.c:593
 #, c-format
 msgid ""
 "This plugin tests the UPS service on the specified host.\n"
@@ -4192,7 +4558,7 @@ msgstr ""
 "l'hôte pour que ce plugin fonctionne.\n"
 "\n"
 
-#: plugins/check_ups.c:607
+#: plugins/check_ups.c:603
 #, c-format
 msgid ""
 " -u, --ups=STRING\n"
@@ -4201,7 +4567,7 @@ msgstr ""
 " -u, --ups=STRING\n"
 "    Nom de l'UPS\n"
 
-#: plugins/check_ups.c:611
+#: plugins/check_ups.c:607
 #, c-format
 msgid ""
 " -T, --temperature\n"
@@ -4210,7 +4576,7 @@ msgstr ""
 " -T, --temperature\n"
 "    Affichage des températures en Celsius\n"
 
-#: plugins/check_ups.c:621
+#: plugins/check_ups.c:617
 #, c-format
 msgid ""
 "This plugin attempts to determine the status of a UPS (Uninterruptible "
@@ -4224,7 +4590,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:628
+#: plugins/check_ups.c:624
 #, c-format
 msgid ""
 "You may also specify a variable to check [such as temperature, utility "
@@ -4237,7 +4603,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:634
+#: plugins/check_ups.c:630
 #, c-format
 msgid ""
 "Notes:\n"
@@ -4259,16 +4625,7 @@ msgstr "# utilisateurs=%d"
 msgid "USERS %s - %d users currently logged in |%s\n"
 msgstr "UTILISATEURS %s - %d utilisateurs actuellement connectés sur |%s\n"
 
-#: plugins/check_users.c:154
-msgid "Critical threshold must be a positive integer\n"
-msgstr "Critique le seuil doit être un entier positif\n"
-
-#: plugins/check_users.c:160 plugins/check_users.c:170
-#: plugins/check_users.c:177
-msgid "Warning threshold must be a positive integer\n"
-msgstr "Alerte le seuil doit être un entier positif\n"
-
-#: plugins/check_users.c:195
+#: plugins/check_users.c:193
 #, c-format
 msgid ""
 "This plugin checks the number of users currently logged in on the local\n"
@@ -4279,7 +4636,7 @@ msgstr ""
 "sytème\n"
 "local et génère une erreur si le nombre excède le seuil spécifié.\n"
 
-#: plugins/check_users.c:203
+#: plugins/check_users.c:201
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -4288,70 +4645,70 @@ msgid ""
 "    Set CRITICAL status if more than INTEGER users are logged in\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:227
+#: plugins/check_ide_smart.c:225
 #, c-format
 msgid "CRITICAL - Couldn't open device: %s\n"
 msgstr "Critique - Impossible d'ouvrir le périphérique: %s\n"
 
-#: plugins/check_ide_smart.c:232
+#: plugins/check_ide_smart.c:230
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr "CRITIQUE - SMART_CMD_ENABLE\n"
 
-#: plugins/check_ide_smart.c:294
+#: plugins/check_ide_smart.c:292
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr "CRITIQUE - SMART_READ_VALUES: %s\n"
 
-#: plugins/check_ide_smart.c:363
+#: plugins/check_ide_smart.c:361
 #, c-format
 msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
 msgstr ""
 "CRITIQUE - %d État de pré-panne %c Détecté! %d/%d les tests on échoués.\n"
 
-#: plugins/check_ide_smart.c:370
+#: plugins/check_ide_smart.c:368
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 "ALERTE -  %d État de pré-panne %s Détecté! %d/%d les tests on échoués.\n"
 
-#: plugins/check_ide_smart.c:377
+#: plugins/check_ide_smart.c:375
 #, c-format
 msgid "OK - Operational (%d/%d tests passed)\n"
 msgstr "OK - En fonctionnement (%d/%d les tests on été réussi)\n"
 
-#: plugins/check_ide_smart.c:380
+#: plugins/check_ide_smart.c:378
 #, c-format
 msgid "ERROR - Status '%d' uknown. %d/%d tests passed\n"
 msgstr "ERREUR - État '%d' inconnu. %d/%d les tests on réussi\n"
 
-#: plugins/check_ide_smart.c:413
+#: plugins/check_ide_smart.c:411
 #, fuzzy, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 "Etat Hors Ligne=%d {%s}, Hors Ligne Auto=%s, OffLineTimeout=%d minutes\n"
 
-#: plugins/check_ide_smart.c:419
+#: plugins/check_ide_smart.c:417
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:425
+#: plugins/check_ide_smart.c:423
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr "Revision Smart=%d, Somme de contrôle=%d, Capacité Smart=%d {%s %s}\n"
 
-#: plugins/check_ide_smart.c:464
+#: plugins/check_ide_smart.c:462
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr "CRITIQUE - %s: %s\n"
 
-#: plugins/check_ide_smart.c:483
+#: plugins/check_ide_smart.c:481
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr "CRITIQUE - SMART_READ_THRESHOLDS: %s\n"
 
-#: plugins/negate.c:244
+#: plugins/negate.c:242
 #, c-format
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).\n"
@@ -4360,12 +4717,12 @@ msgstr ""
 "Inverse le status d'un plugin (retourne OK pour CRITIQUE, et vice-versa).\n"
 "\n"
 
-#: plugins/negate.c:253
+#: plugins/negate.c:251
 #, c-format
 msgid "     [keep timeout than the plugin timeout to retain CRITICAL status]\n"
 msgstr ""
 
-#: plugins/negate.c:256
+#: plugins/negate.c:254
 #, c-format
 msgid ""
 "  negate \"/usr/local/nagios/libexec/check_ping -H host\"\n"
@@ -4374,7 +4731,7 @@ msgid ""
 "    Use single quotes if you need to retain spaces\n"
 msgstr ""
 
-#: plugins/negate.c:262
+#: plugins/negate.c:260
 #, c-format
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert "
@@ -4386,7 +4743,56 @@ msgid ""
 "Otherwise, the output state of the wrapped plugin is unchanged.\n"
 msgstr ""
 
-#: plugins/urlize.c:108
+#: plugins/netutils.c:48
+#, fuzzy, c-format
+msgid "CRITICAL - Socket timeout after %d seconds\n"
+msgstr "CRITIQUE - La date du document est %d secondes dans le futur\n"
+
+#: plugins/netutils.c:50
+#, fuzzy, c-format
+msgid "CRITICAL - Abnormal timeout after %d seconds\n"
+msgstr "CRITIQUE - La date du document est %d secondes dans le futur\n"
+
+#: plugins/netutils.c:109 plugins/netutils.c:318
+#, fuzzy, c-format
+msgid "Send failed\n"
+msgstr "La réception à échoué\n"
+
+#: plugins/netutils.c:126 plugins/netutils.c:333
+#, fuzzy, c-format
+msgid "No data was received from host!\n"
+msgstr "Pas de données reçues de l'hôte\n"
+
+#: plugins/netutils.c:242
+#, c-format
+msgid "Socket creation failed\n"
+msgstr ""
+
+#: plugins/netutils.c:342
+#, fuzzy, c-format
+msgid "Receive failed\n"
+msgstr "La réception à échoué\n"
+
+#: plugins/popen.c:117
+#, fuzzy, c-format
+msgid "Could not malloc argv array in popen()\n"
+msgstr "Impossible d'allouer une adresse\n"
+
+#: plugins/popen.c:127
+#, fuzzy, c-format
+msgid "CRITICAL - You need more args!!!\n"
+msgstr "CRITIQUE - Erreur d'exécution: %s\n"
+
+#: plugins/popen.c:248 plugins/utils.c:136
+#, fuzzy, c-format
+msgid "CRITICAL - Plugin timed out after %d seconds\n"
+msgstr "CRITIQUE - La date du document est %d secondes dans le futur\n"
+
+#: plugins/popen.c:264
+msgid "sysconf error for _SC_OPEN_MAX"
+msgstr ""
+
+#: plugins/urlize.c:106
 #, c-format
 msgid ""
 "%s UNKNOWN - No data received from host\n"
@@ -4395,7 +4801,7 @@ msgstr ""
 "%s INCONNU - Pas de données reçues de l'hôte\n"
 "CMD: %s</A>\n"
 
-#: plugins/urlize.c:135
+#: plugins/urlize.c:133
 #, c-format
 msgid ""
 "\n"
@@ -4406,7 +4812,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/urlize.c:143
+#: plugins/urlize.c:141
 #, c-format
 msgid ""
 "\n"
@@ -4424,5 +4830,79 @@ msgid ""
 "    urlize http://example.com/ \"check_http -H example.com -r 'two words'\"\n"
 msgstr ""
 
+#: plugins/utils.c:433
+#, fuzzy
+msgid "failed realloc in strpcpy\n"
+msgstr "Impossible d'allouer de l'espace pour '%s'\n"
+
+#: plugins/utils.c:475
+#, fuzzy
+msgid "failed malloc in strscat\n"
+msgstr "Impossible d'allouer de l'espace pour '%s'\n"
+
+#~ msgid ""
+#~ "Expiration time must be an integer (seconds)\n"
+#~ "Type '%s -h' for additional help\n"
+#~ msgstr ""
+#~ "Le délai d'expiration doit être un entier (en secondes)\n"
+#~ "Tapez '%s -h' pour de l'aide additionelle\n"
+
+#, fuzzy
+#~ msgid "Server port an integer (seconds)\n"
+#~ msgstr ""
+#~ "Le port du server doit être un entier (secondes)\n"
+#~ "Tapez '%s -h' pour de l'aide additionelle\n"
+
+#~ msgid ""
+#~ "Hostname was not supplied\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Le nom de l'hôte n'a pas été fourni\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "%s: Unknown argument: %s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s: Argument inconnu: %s\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "%s: Unknown argument: %c\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s: Argument inconnu: %c\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "You must provide the status_log\n"
+#~ "Type '%s -h' for additional help\n"
+#~ msgstr ""
+#~ "Vous devez fournir le fichier status_log\n"
+#~ "Tapez '%s -h' pour de l'aide additionelle\n"
+
+#~ msgid ""
+#~ "You must provide a process string\n"
+#~ "Type '%s -h' for additional help\n"
+#~ msgstr ""
+#~ "Vous devez fournir le nom du processus\n"
+#~ "Tapez '%s -h' pour de l'aide additionelle\n"
+
+#, fuzzy
+#~ msgid "Critical time must be a nonnegative integer"
+#~ msgstr "Le temps critique doit être un entier positif"
+
+#~ msgid "Time interval must be a nonnegative integer"
+#~ msgstr "L'intervalle de temps doit être un entier positif"
+
+#~ msgid "Time interval must be a positive integer"
+#~ msgstr "L'intervalle de temps doit être un entier positif"
+
+#~ msgid "Critical threshold must be a positive integer\n"
+#~ msgstr "Critique le seuil doit être un entier positif\n"
+
+#~ msgid "Warning threshold must be a positive integer\n"
+#~ msgstr "Alerte le seuil doit être un entier positif\n"
+
 #~ msgid "check_http: invalid option - SSL is not available\n"
 #~ msgstr "check_http: option invalide - SSL n'est pas disponible\n"
diff --git a/po/nagios-plugins.pot b/po/nagios-plugins.pot
index f9d0d57c..04b97a32 100644
--- a/po/nagios-plugins.pot
+++ b/po/nagios-plugins.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-25 16:26+0100\n"
+"POT-Creation-Date: 2004-12-26 00:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: plugins/check_by_ssh.c:72 plugins/check_dhcp.c:251 plugins/check_dig.c:72
-#: plugins/check_disk.c:167 plugins/check_dns.c:75 plugins/check_dummy.c:44
+#: plugins/check_disk.c:167 plugins/check_dns.c:75 plugins/check_dummy.c:43
 #: plugins/check_fping.c:73 plugins/check_game.c:69 plugins/check_hpjd.c:89
 #: plugins/check_http.c:149 plugins/check_ldap.c:92 plugins/check_load.c:78
 #: plugins/check_mrtgtraf.c:66 plugins/check_mysql.c:63
@@ -42,7 +42,7 @@ msgstr ""
 #: plugins/check_fping.c:87 plugins/check_game.c:86 plugins/check_hpjd.c:114
 #: plugins/check_nagios.c:103 plugins/check_procs.c:137
 #: plugins/check_snmp.c:172 plugins/check_swap.c:151 plugins/check_users.c:59
-#: plugins/negate.c:97 plugins/urlize.c:90
+#: plugins/negate.c:97 plugins/urlize.c:88
 #, c-format
 msgid "Could not open pipe: %s\n"
 msgstr ""
@@ -51,7 +51,7 @@ msgstr ""
 #: plugins/check_fping.c:93 plugins/check_hpjd.c:120 plugins/check_load.c:115
 #: plugins/check_nagios.c:109 plugins/check_procs.c:143
 #: plugins/check_snmp.c:178 plugins/check_swap.c:157 plugins/check_users.c:65
-#: plugins/negate.c:102 plugins/urlize.c:96
+#: plugins/negate.c:102 plugins/urlize.c:94
 #, c-format
 msgid "Could not open stderr for %s\n"
 msgstr ""
@@ -61,38 +61,52 @@ msgstr ""
 msgid "SSH WARNING: could not open %s\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:216 plugins/check_http.c:254
+#: plugins/check_by_ssh.c:216 plugins/check_dig.c:217 plugins/check_disk.c:441
+#: plugins/check_dns.c:315 plugins/check_fping.c:245 plugins/check_game.c:201
+#: plugins/check_hpjd.c:336 plugins/check_http.c:254 plugins/check_ldap.c:315
+#: plugins/check_load.c:227 plugins/check_mrtg.c:236
+#: plugins/check_mrtgtraf.c:263 plugins/check_mysql.c:214
+#: plugins/check_nagios.c:222 plugins/check_nt.c:490
+#: plugins/check_nwstat.c:763 plugins/check_overcr.c:327
+#: plugins/check_pgsql.c:212 plugins/check_ping.c:197
+#: plugins/check_procs.c:346 plugins/check_radius.c:221
+#: plugins/check_real.c:354 plugins/check_smtp.c:374 plugins/check_snmp.c:401
+#: plugins/check_ssh.c:113 plugins/check_swap.c:423 plugins/check_tcp.c:465
+#: plugins/check_time.c:219 plugins/check_udp.c:149 plugins/check_ups.c:484
+#: plugins/check_users.c:143 plugins/check_ide_smart.c:209
+#: plugins/negate.c:177 plugins/urlize.c:74
 msgid "Unknown argument"
 msgstr ""
 
-#: plugins/check_by_ssh.c:228 plugins/check_dig.c:266 plugins/check_disk.c:308
-#: plugins/check_http.c:266 plugins/check_ldap.c:268 plugins/check_pgsql.c:223
-#: plugins/check_procs.c:357 plugins/check_radius.c:198
-#: plugins/check_radius.c:270 plugins/check_snmp.c:447 plugins/check_ssh.c:127
-#: plugins/check_tcp.c:519 plugins/check_time.c:292 plugins/check_udp.c:182
-#: plugins/negate.c:190
+#: plugins/check_by_ssh.c:228 plugins/check_dig.c:264 plugins/check_disk.c:308
+#: plugins/check_http.c:266 plugins/check_ldap.c:268 plugins/check_pgsql.c:221
+#: plugins/check_procs.c:355 plugins/check_radius.c:198
+#: plugins/check_radius.c:268 plugins/check_real.c:344
+#: plugins/check_smtp.c:354 plugins/check_snmp.c:445 plugins/check_ssh.c:125
+#: plugins/check_tcp.c:517 plugins/check_time.c:290 plugins/check_udp.c:180
+#: plugins/check_ups.c:542 plugins/negate.c:188
 msgid "Timeout interval must be a positive integer"
 msgstr ""
 
 #: plugins/check_by_ssh.c:234 plugins/check_by_ssh.c:293
-#: plugins/check_dig.c:231 plugins/check_dig.c:288 plugins/check_dns.c:340
-#: plugins/check_dns.c:349 plugins/check_fping.c:259 plugins/check_hpjd.c:324
-#: plugins/check_hpjd.c:349 plugins/check_mysql.c:190
-#: plugins/check_mysql.c:230 plugins/check_pgsql.c:241
-#: plugins/check_ping.c:270 plugins/check_ping.c:393
-#: plugins/check_radius.c:235 plugins/check_real.c:302
-#: plugins/check_real.c:366 plugins/check_smtp.c:292 plugins/check_smtp.c:386
-#: plugins/check_ssh.c:146 plugins/check_tcp.c:489 plugins/check_time.c:230
-#: plugins/check_time.c:305 plugins/check_udp.c:163 plugins/check_udp.c:204
-#: plugins/check_ups.c:492 plugins/check_ups.c:561
+#: plugins/check_dig.c:229 plugins/check_dig.c:286 plugins/check_dns.c:337
+#: plugins/check_dns.c:346 plugins/check_fping.c:257 plugins/check_hpjd.c:323
+#: plugins/check_hpjd.c:346 plugins/check_mysql.c:189
+#: plugins/check_mysql.c:227 plugins/check_pgsql.c:239
+#: plugins/check_ping.c:268 plugins/check_ping.c:391
+#: plugins/check_radius.c:233 plugins/check_real.c:302
+#: plugins/check_real.c:364 plugins/check_smtp.c:292 plugins/check_smtp.c:384
+#: plugins/check_ssh.c:144 plugins/check_tcp.c:487 plugins/check_time.c:228
+#: plugins/check_time.c:303 plugins/check_udp.c:161 plugins/check_udp.c:202
+#: plugins/check_ups.c:490 plugins/check_ups.c:559
 msgid "Invalid hostname/address"
 msgstr ""
 
-#: plugins/check_by_ssh.c:239 plugins/check_dig.c:239
-#: plugins/check_pgsql.c:247 plugins/check_radius.c:207
-#: plugins/check_radius.c:243 plugins/check_real.c:315
-#: plugins/check_smtp.c:299 plugins/check_tcp.c:525 plugins/check_time.c:286
-#: plugins/check_udp.c:188
+#: plugins/check_by_ssh.c:239 plugins/check_dig.c:237
+#: plugins/check_pgsql.c:245 plugins/check_radius.c:207
+#: plugins/check_radius.c:241 plugins/check_real.c:315
+#: plugins/check_smtp.c:299 plugins/check_tcp.c:523 plugins/check_time.c:284
+#: plugins/check_udp.c:186 plugins/check_ups.c:504
 msgid "Port must be a positive integer"
 msgstr ""
 
@@ -461,6 +475,11 @@ msgid ""
 "   Print version information\n"
 msgstr ""
 
+#: plugins/check_dig.c:84 plugins/check_dig.c:86
+#, c-format
+msgid "Looking for: '%s'\n"
+msgstr ""
+
 #: plugins/check_dig.c:130
 msgid "Server not found in ANSWER SECTION"
 msgstr ""
@@ -483,53 +502,36 @@ msgstr ""
 msgid "%.3f seconds response time (%s)"
 msgstr ""
 
-#: plugins/check_dig.c:217 plugins/check_disk.c:441 plugins/check_dns.c:316
-#: plugins/check_fping.c:245 plugins/check_game.c:202 plugins/check_hpjd.c:337
-#: plugins/check_ldap.c:315 plugins/check_load.c:227 plugins/check_mrtg.c:236
-#: plugins/check_mrtgtraf.c:263 plugins/check_mysql.c:215
-#: plugins/check_overcr.c:335 plugins/check_pgsql.c:212
-#: plugins/check_ping.c:197 plugins/check_procs.c:346
-#: plugins/check_radius.c:221 plugins/check_real.c:354
-#: plugins/check_smtp.c:374 plugins/check_snmp.c:401 plugins/check_ssh.c:113
-#: plugins/check_swap.c:423 plugins/check_tcp.c:465 plugins/check_time.c:219
-#: plugins/check_udp.c:149 plugins/check_ups.c:484 plugins/check_users.c:143
-#: plugins/check_ide_smart.c:209 plugins/negate.c:177 plugins/urlize.c:74
-#, c-format
-msgid ""
-"%s: Unknown argument: %s\n"
-"\n"
-msgstr ""
-
-#: plugins/check_dig.c:250
+#: plugins/check_dig.c:248
 msgid "Warning interval must be a positive integer"
 msgstr ""
 
-#: plugins/check_dig.c:258
+#: plugins/check_dig.c:256
 msgid "Critical interval must be a positive integer"
 msgstr ""
 
-#: plugins/check_dig.c:321
+#: plugins/check_dig.c:319
 #, c-format
 msgid ""
 "Test the DNS service on the specified host using dig\n"
 "\n"
 msgstr ""
 
-#: plugins/check_dig.c:329
+#: plugins/check_dig.c:327
 #, c-format
 msgid ""
 " -l, --lookup=STRING\n"
 "   machine name to lookup\n"
 msgstr ""
 
-#: plugins/check_dig.c:333
+#: plugins/check_dig.c:331
 #, c-format
 msgid ""
 " -T, --record_type=STRING\n"
 "   record type to lookup (default: A)\n"
 msgstr ""
 
-#: plugins/check_dig.c:337
+#: plugins/check_dig.c:335
 #, c-format
 msgid ""
 " -a, --expected_address=STRING\n"
@@ -550,7 +552,7 @@ msgstr ""
 msgid "%s [%s not found]"
 msgstr ""
 
-#: plugins/check_disk.c:325
+#: plugins/check_disk.c:325 plugins/check_swap.c:391
 msgid "Warning threshold must be integer or percentage!"
 msgstr ""
 
@@ -568,26 +570,31 @@ msgstr ""
 msgid "failed allocating storage for '%s'\n"
 msgstr ""
 
-#: plugins/check_disk.c:502
+#: plugins/check_disk.c:489
+#, c-format
+msgid " for %s\n"
+msgstr ""
+
+#: plugins/check_disk.c:500
 #, c-format
 msgid "INPUT ERROR: No thresholds specified"
 msgstr ""
 
-#: plugins/check_disk.c:508
+#: plugins/check_disk.c:506
 #, c-format
 msgid ""
 "INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be "
 "between zero and 100 percent, inclusive"
 msgstr ""
 
-#: plugins/check_disk.c:515
+#: plugins/check_disk.c:513
 #, c-format
 msgid ""
 "INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be "
 "greater than zero"
 msgstr ""
 
-#: plugins/check_disk.c:579
+#: plugins/check_disk.c:577
 #, c-format
 msgid ""
 "This plugin checks the amount of used disk space on a mounted file system\n"
@@ -596,7 +603,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_disk.c:587
+#: plugins/check_disk.c:585
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -611,7 +618,7 @@ msgid ""
 "    Clear thresholds\n"
 msgstr ""
 
-#: plugins/check_disk.c:599
+#: plugins/check_disk.c:597
 #, c-format
 msgid ""
 " -u, --units=STRING\n"
@@ -622,7 +629,7 @@ msgid ""
 "    Same as '--units MB'\n"
 msgstr ""
 
-#: plugins/check_disk.c:607
+#: plugins/check_disk.c:605
 #, c-format
 msgid ""
 " -l, --local\n"
@@ -639,7 +646,7 @@ msgid ""
 "    Display only devices/mountpoints with errors\n"
 msgstr ""
 
-#: plugins/check_disk.c:627
+#: plugins/check_disk.c:625
 msgid ""
 "Examples:\n"
 " check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n"
@@ -655,6 +662,10 @@ msgstr ""
 msgid "DNS CRITICAL - '%s' returned empty host name string\n"
 msgstr ""
 
+#: plugins/check_dns.c:138
+msgid "Non-authoritative answer:"
+msgstr ""
+
 #: plugins/check_dns.c:171
 msgid "nslookup returned error status"
 msgstr ""
@@ -674,7 +685,7 @@ msgstr ""
 msgid "server %s is not authoritative for %s"
 msgstr ""
 
-#: plugins/check_dns.c:202 plugins/check_dummy.c:60 plugins/check_http.c:930
+#: plugins/check_dns.c:202 plugins/check_dummy.c:59 plugins/check_http.c:930
 #: plugins/check_http.c:1183 plugins/check_procs.c:279
 #, c-format
 msgid "OK"
@@ -746,20 +757,20 @@ msgstr ""
 msgid "DNS failure for %s\n"
 msgstr ""
 
-#: plugins/check_dns.c:333 plugins/check_dns.c:343 plugins/check_dns.c:352
-#: plugins/check_dns.c:357 plugins/check_dns.c:370 plugins/check_dns.c:381
-#: plugins/check_game.c:219 plugins/check_game.c:227
+#: plugins/check_dns.c:330 plugins/check_dns.c:340 plugins/check_dns.c:349
+#: plugins/check_dns.c:354 plugins/check_dns.c:367 plugins/check_dns.c:378
+#: plugins/check_game.c:216 plugins/check_game.c:224
 msgid "Input buffer overflow\n"
 msgstr ""
 
-#: plugins/check_dns.c:377
+#: plugins/check_dns.c:374
 #, c-format
 msgid ""
 "Invalid hostname/address: %s\n"
 "\n"
 msgstr ""
 
-#: plugins/check_dns.c:409
+#: plugins/check_dns.c:404
 #, c-format
 msgid ""
 "This plugin uses the nslookup program to obtain the IP address\n"
@@ -769,7 +780,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_dns.c:419
+#: plugins/check_dns.c:414
 #, c-format
 msgid ""
 "-H, --hostname=HOST\n"
@@ -782,31 +793,31 @@ msgid ""
 "   Optionally expect the DNS server to be authoritative for the lookup\n"
 msgstr ""
 
-#: plugins/check_dummy.c:54
+#: plugins/check_dummy.c:53
 msgid "Arguments to check_dummy must be an integer"
 msgstr ""
 
-#: plugins/check_dummy.c:63 plugins/check_http.c:932 plugins/check_procs.c:281
+#: plugins/check_dummy.c:62 plugins/check_http.c:932 plugins/check_procs.c:281
 #, c-format
 msgid "WARNING"
 msgstr ""
 
-#: plugins/check_dummy.c:66 plugins/check_http.c:934 plugins/check_procs.c:286
+#: plugins/check_dummy.c:65 plugins/check_http.c:934 plugins/check_procs.c:286
 #, c-format
 msgid "CRITICAL"
 msgstr ""
 
-#: plugins/check_dummy.c:69 plugins/check_http.c:928
+#: plugins/check_dummy.c:68 plugins/check_http.c:928
 #, c-format
 msgid "UNKNOWN"
 msgstr ""
 
-#: plugins/check_dummy.c:72
+#: plugins/check_dummy.c:71
 #, c-format
 msgid "Status %d is not a supported error state\n"
 msgstr ""
 
-#: plugins/check_dummy.c:94
+#: plugins/check_dummy.c:93
 #, c-format
 msgid ""
 "This plugin will simply return the state corresponding to the numeric value\n"
@@ -839,31 +850,29 @@ msgstr ""
 msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
 msgstr ""
 
-#: plugins/check_fping.c:293
+#: plugins/check_fping.c:291
 msgid "Packet size must be a positive integer"
 msgstr ""
 
-#: plugins/check_fping.c:299
+#: plugins/check_fping.c:297
 msgid "Packet count must be a positive integer"
 msgstr ""
 
-#: plugins/check_fping.c:306
-msgid ""
-"Hostname was not supplied\n"
-"\n"
+#: plugins/check_fping.c:303 plugins/check_time.c:307 plugins/check_udp.c:207
+msgid "Hostname was not supplied"
 msgstr ""
 
-#: plugins/check_fping.c:327
+#: plugins/check_fping.c:323
 #, c-format
 msgid "%s: Only one threshold may be packet loss (%s)\n"
 msgstr ""
 
-#: plugins/check_fping.c:331
+#: plugins/check_fping.c:327
 #, c-format
 msgid "%s: Only one threshold must be packet loss (%s)\n"
 msgstr ""
 
-#: plugins/check_fping.c:364
+#: plugins/check_fping.c:359
 #, c-format
 msgid ""
 "This plugin will use the /bin/fping command to ping the specified host\n"
@@ -872,7 +881,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_fping.c:373
+#: plugins/check_fping.c:368
 #, c-format
 msgid ""
 " -H, --hostname=HOST\n"
@@ -888,7 +897,7 @@ msgid ""
 "    Number of ICMP packets to send (default: %d)\n"
 msgstr ""
 
-#: plugins/check_fping.c:389
+#: plugins/check_fping.c:384
 #, c-format
 msgid ""
 "\n"
@@ -902,12 +911,27 @@ msgstr ""
 msgid "CRITICAL - Host type parameter incorrect!\n"
 msgstr ""
 
-#: plugins/check_game.c:305
+#: plugins/check_game.c:126
+#, c-format
+msgid "CRITICAL - Host not found\n"
+msgstr ""
+
+#: plugins/check_game.c:130
+#, c-format
+msgid "CRITICAL - Game server down or unavailable\n"
+msgstr ""
+
+#: plugins/check_game.c:134
+#, c-format
+msgid "CRITICAL - Game server timeout\n"
+msgstr ""
+
+#: plugins/check_game.c:300
 #, c-format
 msgid "This plugin tests game server connections with the specified host."
 msgstr ""
 
-#: plugins/check_game.c:311
+#: plugins/check_game.c:306
 #, c-format
 msgid ""
 "<game>        = Game type that is recognised by qstat (without the leading "
@@ -919,7 +943,7 @@ msgid ""
 " [ping_field]  = Field number in raw qstat output that contains ping time\n"
 msgstr ""
 
-#: plugins/check_game.c:321
+#: plugins/check_game.c:316
 #, c-format
 msgid ""
 "\n"
@@ -981,7 +1005,7 @@ msgstr ""
 msgid "Printer ok - (%s)\n"
 msgstr ""
 
-#: plugins/check_hpjd.c:381
+#: plugins/check_hpjd.c:376
 #, c-format
 msgid ""
 "This plugin tests the STATUS of an HP printer with a JetDirect card.\n"
@@ -989,7 +1013,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_hpjd.c:389
+#: plugins/check_hpjd.c:384
 #, c-format
 msgid ""
 " -C, --community=STRING\n"
@@ -1000,7 +1024,7 @@ msgstr ""
 msgid "HTTP CRITICAL - Could not make SSL connection\n"
 msgstr ""
 
-#: plugins/check_http.c:177 plugins/check_http.c:739
+#: plugins/check_http.c:177 plugins/check_http.c:739 plugins/check_tcp.c:268
 #, c-format
 msgid "CRITICAL - Cannot retrieve server certificate.\n"
 msgstr ""
@@ -1017,7 +1041,7 @@ msgstr ""
 msgid "Invalid option - SSL is not available"
 msgstr ""
 
-#: plugins/check_http.c:309
+#: plugins/check_http.c:309 plugins/check_tcp.c:576
 msgid "Invalid certificate expiration period"
 msgstr ""
 
@@ -1039,7 +1063,8 @@ msgstr ""
 msgid "Could Not Compile Regular Expression: %s"
 msgstr ""
 
-#: plugins/check_http.c:404 plugins/check_smtp.c:364 plugins/check_tcp.c:484
+#: plugins/check_http.c:404 plugins/check_smtp.c:364 plugins/check_ssh.c:136
+#: plugins/check_tcp.c:482
 msgid "IPv6 support not available"
 msgstr ""
 
@@ -1217,12 +1242,13 @@ msgstr ""
 msgid "CRITICAL -  Cannot create SSL context.\n"
 msgstr ""
 
-#: plugins/check_http.c:1214 plugins/check_tcp.c:642
+#: plugins/check_http.c:1214 plugins/check_tcp.c:640
 #, c-format
 msgid "CRITICAL - Cannot initiate SSL handshake.\n"
 msgstr ""
 
-#: plugins/check_http.c:1244 plugins/check_http.c:1256
+#: plugins/check_http.c:1244 plugins/check_http.c:1256 plugins/check_tcp.c:670
+#: plugins/check_tcp.c:682
 #, c-format
 msgid "CRITICAL - Wrong time format in certificate.\n"
 msgstr ""
@@ -1386,6 +1412,191 @@ msgid ""
 "the certificate is expired.\n"
 msgstr ""
 
+#: plugins/check_icmp.c:313
+#, c-format
+msgid "Root access needed (for raw sockets)\n"
+msgstr ""
+
+#: plugins/check_icmp.c:319
+msgid "icmp: unknown protocol"
+msgstr ""
+
+#: plugins/check_icmp.c:325
+msgid "Can't create raw socket"
+msgstr ""
+
+#: plugins/check_icmp.c:337
+msgid "Unable to allocate memory for host name list\n"
+msgstr ""
+
+#: plugins/check_icmp.c:362 plugins/check_icmp.c:367 plugins/check_icmp.c:546
+#: plugins/check_icmp.c:551
+msgid "Failed to allocate memory for hostname"
+msgstr ""
+
+#: plugins/check_icmp.c:378 plugins/check_icmp.c:385
+#, c-format
+msgid "Illegal threshold pair specified for -%c"
+msgstr ""
+
+#: plugins/check_icmp.c:392 plugins/check_icmp.c:399 plugins/check_icmp.c:421
+#, c-format
+msgid "Option -%c requires integer argument\n"
+msgstr ""
+
+#: plugins/check_icmp.c:406 plugins/check_icmp.c:414
+#, c-format
+msgid "Option -%c requires positive non-zero integer argument\n"
+msgstr ""
+
+#: plugins/check_icmp.c:470
+#, c-format
+msgid "Option flag -%c specified, but not recognized\n"
+msgstr ""
+
+#: plugins/check_icmp.c:497
+#, c-format
+msgid "%s: these options are too risky for mere mortals.\n"
+msgstr ""
+
+#: plugins/check_icmp.c:498
+#, c-format
+msgid "%s: You need i >= %u and r < %u\n"
+msgstr ""
+
+#: plugins/check_icmp.c:500
+#, c-format
+msgid "Current settings; i = %d, r = %d\n"
+msgstr ""
+
+#: plugins/check_icmp.c:506
+#, c-format
+msgid "%s: data size %u not valid, must be between %u and %u\n"
+msgstr ""
+
+#: plugins/check_icmp.c:513
+#, c-format
+msgid "%s: backoff factor %.1f not valid, must be between %.1f and %.1f\n"
+msgstr ""
+
+#: plugins/check_icmp.c:520
+#, c-format
+msgid "%s: count %u not valid, must be less than %u\n"
+msgstr ""
+
+#: plugins/check_icmp.c:539
+#, c-format
+msgid "Generate flag requires command line parameters beyond switches\n"
+msgstr ""
+
+#: plugins/check_icmp.c:568
+#, c-format
+msgid ""
+"No hosts to work with!\n"
+"\n"
+msgstr ""
+
+#: plugins/check_icmp.c:574
+msgid "Can't malloc array of hosts"
+msgstr ""
+
+#: plugins/check_icmp.c:706
+#, c-format
+msgid "%s is down (lost 100%%)"
+msgstr ""
+
+#: plugins/check_icmp.c:757
+#, c-format
+msgid "No hostaddress specified.\n"
+msgstr ""
+
+#: plugins/check_icmp.c:768
+#, c-format
+msgid "OK - All %d hosts are alive\n"
+msgstr ""
+
+#: plugins/check_icmp.c:771
+#, c-format
+msgid "CRITICAL - %d of %d hosts are alive\n"
+msgstr ""
+
+#: plugins/check_icmp.c:787
+msgid "Can't malloc ping packet"
+msgstr ""
+
+#: plugins/check_icmp.c:811
+#, c-format
+msgid "%s error while sending ping: %s\n"
+msgstr ""
+
+#: plugins/check_icmp.c:863
+#, c-format
+msgid "Received packet too short for ICMP (%d bytes from %s)\n"
+msgstr ""
+
+#: plugins/check_icmp.c:906
+#, c-format
+msgid "%s : duplicate for [%d], %d bytes, %s ms"
+msgstr ""
+
+#: plugins/check_icmp.c:916
+#, c-format
+msgid "%s : duplicate for [%d], %d bytes, %s ms\n"
+msgstr ""
+
+#: plugins/check_icmp.c:945
+#, c-format
+msgid "ICMP Unreachable (Invalid Code) from %s for ICMP Echo sent to %s"
+msgstr ""
+
+#: plugins/check_icmp.c:950 plugins/check_icmp.c:974
+#, c-format
+msgid "ICMP Unreachable from %s for ICMP Echo sent to %s"
+msgstr ""
+
+#: plugins/check_icmp.c:1059
+#, c-format
+msgid "%s address not found\n"
+msgstr ""
+
+#: plugins/check_icmp.c:1067
+#, c-format
+msgid "%s has no address data\n"
+msgstr ""
+
+#: plugins/check_icmp.c:1100
+msgid "Can't allocate some space for a string"
+msgstr ""
+
+#: plugins/check_icmp.c:1119
+msgid "Can't allocate HOST_ENTRY"
+msgstr ""
+
+#: plugins/check_icmp.c:1132
+msgid "Can't allocate resp_times array"
+msgstr ""
+
+#: plugins/check_icmp.c:1196
+msgid "malloc() failed!"
+msgstr ""
+
+#: plugins/check_icmp.c:1213
+#, c-format
+msgid "%s: %s : A network error occurred\n"
+msgstr ""
+
+#: plugins/check_icmp.c:1279
+msgid "select() in u_sleep:"
+msgstr ""
+
+#: plugins/check_icmp.c:1309
+msgid "select() in recvfrom_wto"
+msgstr ""
+
+#: plugins/check_icmp.c:1316
+msgid "recvfrom"
+msgstr ""
+
 #: plugins/check_icmp.c:1371
 #, c-format
 msgid ""
@@ -1427,6 +1638,26 @@ msgstr ""
 msgid "Could not set protocol version %d\n"
 msgstr ""
 
+#: plugins/check_ldap.c:137
+#, c-format
+msgid "Could not init TLS at port %i!\n"
+msgstr ""
+
+#: plugins/check_ldap.c:141
+#, c-format
+msgid "TLS not supported by the libraries!\n"
+msgstr ""
+
+#: plugins/check_ldap.c:160
+#, c-format
+msgid "Could not init startTLS at port %i!\n"
+msgstr ""
+
+#: plugins/check_ldap.c:164
+#, c-format
+msgid "startTLS not supported by the library, needs LDAPv3!\n"
+msgstr ""
+
 #: plugins/check_ldap.c:174
 #, c-format
 msgid "Could not bind to the ldap-server\n"
@@ -1442,19 +1673,19 @@ msgstr ""
 msgid "LDAP %s - %.3f seconds response time|%s\n"
 msgstr ""
 
-#: plugins/check_ldap.c:311 plugins/check_ping.c:221 plugins/check_ssh.c:138
+#: plugins/check_ldap.c:311 plugins/check_ping.c:219
 msgid "IPv6 support not available\n"
 msgstr ""
 
-#: plugins/check_ldap.c:335
-msgid "please specify the host name\n"
+#: plugins/check_ldap.c:334
+msgid "Please specify the host name\n"
 msgstr ""
 
-#: plugins/check_ldap.c:338
-msgid "please specify the LDAP base\n"
+#: plugins/check_ldap.c:337
+msgid "Please specify the LDAP base\n"
 msgstr ""
 
-#: plugins/check_ldap.c:365
+#: plugins/check_ldap.c:362
 #, c-format
 msgid ""
 " -a [--attr]\n"
@@ -1467,7 +1698,7 @@ msgid ""
 "    ldap password (if required)\n"
 msgstr ""
 
-#: plugins/check_ldap.c:376
+#: plugins/check_ldap.c:373
 #, c-format
 msgid ""
 " -2 [--ver2]\n"
@@ -1510,56 +1741,56 @@ msgstr ""
 msgid "Critical threshold must be float or float triplet!\n"
 msgstr ""
 
-#: plugins/check_load.c:273
+#: plugins/check_load.c:271
 msgid "Warning threshold for 1-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:275
+#: plugins/check_load.c:273
 msgid "Warning threshold for 5-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:277
+#: plugins/check_load.c:275
 msgid "Warning threshold for 15-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:279
+#: plugins/check_load.c:277
 msgid "Critical threshold for 1-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:281
+#: plugins/check_load.c:279
 msgid "Critical threshold for 5-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:283
+#: plugins/check_load.c:281
 msgid "Critical threshold for 15-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:285
+#: plugins/check_load.c:283
 msgid ""
 "Parameter inconsistency: 1-minute \"warning load\" greater than \"critical "
 "load\".\n"
 msgstr ""
 
-#: plugins/check_load.c:287
+#: plugins/check_load.c:285
 msgid ""
 "Parameter inconsistency: 5-minute \"warning load\" greater than \"critical "
 "load\".\n"
 msgstr ""
 
-#: plugins/check_load.c:289
+#: plugins/check_load.c:287
 msgid ""
 "Parameter inconsistency: 15-minute \"warning load\" greater than \"critical "
 "load\".\n"
 msgstr ""
 
-#: plugins/check_load.c:303
+#: plugins/check_load.c:301
 #, c-format
 msgid ""
 "This plugin tests the current system load average.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_load.c:309
+#: plugins/check_load.c:307
 #, c-format
 msgid ""
 " -w, --warning=WLOAD1,WLOAD5,WLOAD15\n"
@@ -1603,22 +1834,22 @@ msgstr ""
 msgid "Invalid variable number"
 msgstr ""
 
-#: plugins/check_mrtg.c:252
+#: plugins/check_mrtg.c:250
 #, c-format
 msgid ""
 "%s is not a valid expiration time\n"
 "Use '%s -h' for additional help\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:269
+#: plugins/check_mrtg.c:267
 msgid "Invalid variable number\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:296
+#: plugins/check_mrtg.c:294
 msgid "You must supply the variable number"
 msgstr ""
 
-#: plugins/check_mrtg.c:317
+#: plugins/check_mrtg.c:315
 #, c-format
 msgid ""
 "This plugin will check either the average or maximum value of one of the\n"
@@ -1626,7 +1857,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:325
+#: plugins/check_mrtg.c:323
 #, c-format
 msgid ""
 " -F, --logfile=FILE\n"
@@ -1643,7 +1874,7 @@ msgid ""
 "   Threshold value for data to result in CRITICAL status\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:339
+#: plugins/check_mrtg.c:337
 #, c-format
 msgid ""
 " -l, --label=STRING\n"
@@ -1653,7 +1884,7 @@ msgid ""
 "   \"Bytes Per Second\", \"%% Utilization\")\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:346
+#: plugins/check_mrtg.c:344
 #, c-format
 msgid ""
 "If the value exceeds the <vwl> threshold, a WARNING status is returned.  If\n"
@@ -1663,7 +1894,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:352
+#: plugins/check_mrtg.c:350
 #, c-format
 msgid ""
 "This plugin is useful for monitoring MRTG data that does not correspond to\n"
@@ -1676,7 +1907,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:359
+#: plugins/check_mrtg.c:357
 #, c-format
 msgid ""
 "Notes:\n"
@@ -1707,7 +1938,7 @@ msgstr ""
 msgid "Traffic %s - %s\n"
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:324
+#: plugins/check_mrtgtraf.c:320
 #, c-format
 msgid ""
 "\n"
@@ -1720,7 +1951,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:336
+#: plugins/check_mrtgtraf.c:332
 #, c-format
 msgid ""
 " -F, --filename=STRING\n"
@@ -1735,7 +1966,7 @@ msgid ""
 "   Critical threshold pair \"<incoming>,<outgoing>\"\n"
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:348
+#: plugins/check_mrtgtraf.c:344
 #, c-format
 msgid ""
 "Notes:\n"
@@ -1748,12 +1979,32 @@ msgid ""
 "  for future enhancements of this plugin.\n"
 msgstr ""
 
-#: plugins/check_mysql.c:279
+#: plugins/check_mysql.c:101
+#, c-format
+msgid "slave query error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:107
+#, c-format
+msgid "slave store_result error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:114
+#, c-format
+msgid "slave fetch row error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:119
+#, c-format
+msgid "Slave running: %s"
+msgstr ""
+
+#: plugins/check_mysql.c:274
 #, c-format
 msgid "This program tests connections to a mysql server\n"
 msgstr ""
 
-#: plugins/check_mysql.c:287
+#: plugins/check_mysql.c:282
 #, c-format
 msgid ""
 " -d, --database=STRING\n"
@@ -1768,7 +2019,7 @@ msgid ""
 "   Check if the slave thread is running properly.\n"
 msgstr ""
 
-#: plugins/check_mysql.c:299
+#: plugins/check_mysql.c:294
 #, c-format
 msgid ""
 "\n"
@@ -1781,6 +2032,11 @@ msgstr ""
 msgid "CRITICAL - Cannot open status log for reading!\n"
 msgstr ""
 
+#: plugins/check_nagios.c:98
+#, c-format
+msgid "command: %s\n"
+msgstr ""
+
 #: plugins/check_nagios.c:140
 #, c-format
 msgid "Found process: %s %s\n"
@@ -1796,35 +2052,19 @@ msgstr ""
 msgid "Nagios %s: located %d process%s, status log updated %d second%s ago\n"
 msgstr ""
 
-#: plugins/check_nagios.c:209 plugins/check_nagios.c:243
-#, c-format
-msgid ""
-"Expiration time must be an integer (seconds)\n"
-"Type '%s -h' for additional help\n"
+#: plugins/check_nagios.c:209 plugins/check_nagios.c:240
+msgid "Expiration time must be an integer (seconds)\n"
 msgstr ""
 
-#: plugins/check_nagios.c:223
-#, c-format
-msgid ""
-"%s: Unknown argument: %c\n"
-"\n"
+#: plugins/check_nagios.c:251
+msgid "You must provide the status_log\n"
 msgstr ""
 
-#: plugins/check_nagios.c:255
-#, c-format
-msgid ""
-"You must provide the status_log\n"
-"Type '%s -h' for additional help\n"
-msgstr ""
-
-#: plugins/check_nagios.c:259
-#, c-format
-msgid ""
-"You must provide a process string\n"
-"Type '%s -h' for additional help\n"
+#: plugins/check_nagios.c:254
+msgid "You must provide a process string\n"
 msgstr ""
 
-#: plugins/check_nagios.c:274
+#: plugins/check_nagios.c:268
 #, c-format
 msgid ""
 "This plugin checks the status of the Nagios process on the local\n"
@@ -1835,7 +2075,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_nagios.c:284
+#: plugins/check_nagios.c:278
 #, c-format
 msgid ""
 " -F, --filename=FILE\n"
@@ -1846,7 +2086,7 @@ msgid ""
 "   Substring to search for in process arguments\n"
 msgstr ""
 
-#: plugins/check_nagios.c:292
+#: plugins/check_nagios.c:286
 #, c-format
 msgid ""
 "Example:\n"
@@ -1943,19 +2183,19 @@ msgstr ""
 msgid "Please specify a variable to check"
 msgstr ""
 
-#: plugins/check_nt.c:510 plugins/check_nwstat.c:782
-#: plugins/check_overcr.c:352
-#, c-format
-msgid ""
-"Server port an integer (seconds)\n"
-"Type '%s -h' for additional help\n"
+#: plugins/check_nt.c:508
+msgid "Server port must be an integer\n"
 msgstr ""
 
-#: plugins/check_nt.c:563
+#: plugins/check_nt.c:561
 msgid "None"
 msgstr ""
 
-#: plugins/check_nt.c:620
+#: plugins/check_nt.c:574
+msgid "could not fetch information from server\n"
+msgstr ""
+
+#: plugins/check_nt.c:618
 #, c-format
 msgid ""
 "This plugin collects data from the NSClient service running on a\n"
@@ -1963,7 +2203,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_nt.c:625
+#: plugins/check_nt.c:623
 #, c-format
 msgid ""
 "\n"
@@ -1986,21 +2226,21 @@ msgid ""
 "  Print version information\n"
 msgstr ""
 
-#: plugins/check_nt.c:643
+#: plugins/check_nt.c:641
 #, c-format
 msgid ""
 "-v, --variable=STRING\n"
 "  Variable to check.  Valid variables are:\n"
 msgstr ""
 
-#: plugins/check_nt.c:646
+#: plugins/check_nt.c:644
 #, c-format
 msgid ""
 "   CLIENTVERSION = Get the NSClient version\n"
 "     If -l <version> is specified, will return warning if versions differ.\n"
 msgstr ""
 
-#: plugins/check_nt.c:649
+#: plugins/check_nt.c:647
 #, c-format
 msgid ""
 "   CPULOAD = Average CPU load on last x minutes.\n"
@@ -2012,14 +2252,14 @@ msgid ""
 "     ie: -l 60,90,95,120,90,95\n"
 msgstr ""
 
-#: plugins/check_nt.c:656
+#: plugins/check_nt.c:654
 #, c-format
 msgid ""
 "   UPTIME = Get the uptime of the machine.\n"
 "     No specific parameters. No warning or critical threshold\n"
 msgstr ""
 
-#: plugins/check_nt.c:659
+#: plugins/check_nt.c:657
 #, c-format
 msgid ""
 "   USEDDISKSPACE = Size and percentage of disk use.\n"
@@ -2027,14 +2267,14 @@ msgid ""
 "     Warning and critical thresholds can be specified with -w and -c.\n"
 msgstr ""
 
-#: plugins/check_nt.c:663
+#: plugins/check_nt.c:661
 #, c-format
 msgid ""
 "   MEMUSE = Memory use.\n"
 "     Warning and critical thresholds can be specified with -w and -c.\n"
 msgstr ""
 
-#: plugins/check_nt.c:666
+#: plugins/check_nt.c:664
 #, c-format
 msgid ""
 "   SERVICESTATE = Check the state of one or several services.\n"
@@ -2044,14 +2284,14 @@ msgid ""
 "\t\t in the returned string.\n"
 msgstr ""
 
-#: plugins/check_nt.c:672
+#: plugins/check_nt.c:670
 #, c-format
 msgid ""
 "   PROCSTATE = Check if one or several process are running.\n"
 "     Same syntax as SERVICESTATE.\n"
 msgstr ""
 
-#: plugins/check_nt.c:675
+#: plugins/check_nt.c:673
 #, c-format
 msgid ""
 "   COUNTER = Check any performance counter of Windows NT/2000.\n"
@@ -2065,7 +2305,7 @@ msgid ""
 "       \"%%.f %%%% paging file used.\"\n"
 msgstr ""
 
-#: plugins/check_nt.c:685
+#: plugins/check_nt.c:683
 #, c-format
 msgid ""
 "Notes:\n"
@@ -2252,7 +2492,11 @@ msgstr ""
 msgid "Nothing to check!\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:910
+#: plugins/check_nwstat.c:780 plugins/check_overcr.c:342
+msgid "Server port an integer\n"
+msgstr ""
+
+#: plugins/check_nwstat.c:908
 #, c-format
 msgid ""
 "This plugin attempts to contact the MRTGEXT NLM running on a\n"
@@ -2260,7 +2504,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:920
+#: plugins/check_nwstat.c:918
 #, c-format
 msgid ""
 " -v, --variable=STRING\n"
@@ -2273,7 +2517,7 @@ msgid ""
 "      UPTIME    = server uptime\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:930
+#: plugins/check_nwstat.c:928
 #, c-format
 msgid ""
 "      LTCH      = percent long term cache hits\n"
@@ -2283,7 +2527,7 @@ msgid ""
 "      TCB       = dirty cache buffers as a percentage of the original\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:937
+#: plugins/check_nwstat.c:935
 #, c-format
 msgid ""
 "      OFILES    = number of open files\n"
@@ -2295,7 +2539,7 @@ msgid ""
 "      VKNP<vol> = KB of not yet purgeable space on volume <vol>\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:946
+#: plugins/check_nwstat.c:944
 #, c-format
 msgid ""
 "      LRUM      = LRU sitting time in minutes\n"
@@ -2308,7 +2552,7 @@ msgid ""
 "      SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:956
+#: plugins/check_nwstat.c:954
 #, c-format
 msgid ""
 "      TSYNC     = timesync status \n"
@@ -2318,7 +2562,7 @@ msgid ""
 "                  (e.g. \"NLM:TSANDS.NLM\")\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:963
+#: plugins/check_nwstat.c:961
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -2329,7 +2573,7 @@ msgid ""
 "    Include server version string in results\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:973
+#: plugins/check_nwstat.c:971
 #, c-format
 msgid ""
 "\n"
@@ -2395,7 +2639,7 @@ msgstr ""
 msgid "Uptime %s - Up %d days %d hours %d minutes"
 msgstr ""
 
-#: plugins/check_overcr.c:418
+#: plugins/check_overcr.c:406
 #, c-format
 msgid ""
 "This plugin attempts to contact the Over-CR collector daemon running on the\n"
@@ -2403,7 +2647,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_overcr.c:428
+#: plugins/check_overcr.c:416
 #, c-format
 msgid ""
 "-v, --variable=STRING\n"
@@ -2417,7 +2661,7 @@ msgid ""
 "     UPTIME        = system uptime in seconds\n"
 msgstr ""
 
-#: plugins/check_overcr.c:439
+#: plugins/check_overcr.c:427
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -2426,7 +2670,7 @@ msgid ""
 "   Threshold which will result in a critical status\n"
 msgstr ""
 
-#: plugins/check_overcr.c:447
+#: plugins/check_overcr.c:435
 #, c-format
 msgid ""
 "Notes:\n"
@@ -2435,7 +2679,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_overcr.c:452
+#: plugins/check_overcr.c:440
 #, c-format
 msgid ""
 " - This plugin requres that Eric Molitors' Over-CR collector daemon be\n"
@@ -2455,27 +2699,33 @@ msgstr ""
 msgid " %s - database %s (%d sec.)|%s\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:229 plugins/check_pgsql.c:235 plugins/check_tcp.c:494
-#: plugins/check_time.c:267 plugins/check_time.c:279 plugins/check_udp.c:168
+#: plugins/check_pgsql.c:227 plugins/check_tcp.c:492 plugins/check_time.c:265
+#: plugins/check_time.c:277 plugins/check_udp.c:166 plugins/check_users.c:152
 msgid "Critical threshold must be a positive integer"
 msgstr ""
 
-#: plugins/check_pgsql.c:253
+#: plugins/check_pgsql.c:233 plugins/check_tcp.c:502 plugins/check_time.c:246
+#: plugins/check_time.c:270 plugins/check_udp.c:173 plugins/check_users.c:158
+#: plugins/check_users.c:168 plugins/check_users.c:175
+msgid "Warning threshold must be a positive integer"
+msgstr ""
+
+#: plugins/check_pgsql.c:251
 msgid "Database name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:259
+#: plugins/check_pgsql.c:257
 msgid "User name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:396
+#: plugins/check_pgsql.c:394
 #, c-format
 msgid ""
 "Test whether a PostgreSQL Database is accepting connections.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:406
+#: plugins/check_pgsql.c:404
 #, c-format
 msgid ""
 "  -d, --database=STRING\n"
@@ -2486,7 +2736,7 @@ msgid ""
 "    Password (BIG SECURITY ISSUE)\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:420
+#: plugins/check_pgsql.c:418
 #, c-format
 msgid ""
 "\n"
@@ -2499,7 +2749,7 @@ msgid ""
 "PostgreSQL DBMS.\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:427
+#: plugins/check_pgsql.c:425
 #, c-format
 msgid ""
 "\n"
@@ -2508,7 +2758,7 @@ msgid ""
 "connections (start the postmaster with the -i option).\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:431
+#: plugins/check_pgsql.c:429
 #, c-format
 msgid ""
 "\n"
@@ -2532,114 +2782,114 @@ msgstr ""
 msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"
 msgstr ""
 
-#: plugins/check_ping.c:232
+#: plugins/check_ping.c:230
 msgid "Could not realloc() addresses\n"
 msgstr ""
 
-#: plugins/check_ping.c:247 plugins/check_ping.c:327
+#: plugins/check_ping.c:245 plugins/check_ping.c:325
 #, c-format
 msgid "<max_packets> (%s) must be a non-negative number\n"
 msgstr ""
 
-#: plugins/check_ping.c:281
+#: plugins/check_ping.c:279
 #, c-format
 msgid "<wpl> (%s) must be an integer percentage\n"
 msgstr ""
 
-#: plugins/check_ping.c:292
+#: plugins/check_ping.c:290
 #, c-format
 msgid "<cpl> (%s) must be an integer percentage\n"
 msgstr ""
 
-#: plugins/check_ping.c:303
+#: plugins/check_ping.c:301
 #, c-format
 msgid "<wrta> (%s) must be a non-negative number\n"
 msgstr ""
 
-#: plugins/check_ping.c:314
+#: plugins/check_ping.c:312
 #, c-format
 msgid "<crta> (%s) must be a non-negative number\n"
 msgstr ""
 
-#: plugins/check_ping.c:347
+#: plugins/check_ping.c:345
 #, c-format
 msgid ""
 "%s: Warning threshold must be integer or percentage!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:360
+#: plugins/check_ping.c:358
 #, c-format
 msgid "<wrta> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:364
+#: plugins/check_ping.c:362
 #, c-format
 msgid "<crta> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:368
+#: plugins/check_ping.c:366
 #, c-format
 msgid "<wpl> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:372
+#: plugins/check_ping.c:370
 #, c-format
 msgid "<cpl> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:376
+#: plugins/check_ping.c:374
 #, c-format
 msgid "<wrta> (%f) cannot be larger than <crta> (%f)\n"
 msgstr ""
 
-#: plugins/check_ping.c:380
+#: plugins/check_ping.c:378
 #, c-format
 msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
 msgstr ""
 
-#: plugins/check_ping.c:408
+#: plugins/check_ping.c:406
 #, c-format
 msgid "Cannot open pipe: %s"
 msgstr ""
 
-#: plugins/check_ping.c:412
+#: plugins/check_ping.c:410
 #, c-format
 msgid "Cannot open stderr for %s\n"
 msgstr ""
 
-#: plugins/check_ping.c:467
+#: plugins/check_ping.c:465
 #, c-format
 msgid "CRITICAL - Network unreachable (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:469
+#: plugins/check_ping.c:467
 #, c-format
 msgid "CRITICAL - Host Unreachable (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:471
+#: plugins/check_ping.c:469
 #, c-format
 msgid "CRITICAL - Host not found (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:473
+#: plugins/check_ping.c:471
 #, c-format
 msgid "CRITICAL - Time to live exceeded (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:480
+#: plugins/check_ping.c:478
 msgid "Unable to realloc warn_text"
 msgstr ""
 
-#: plugins/check_ping.c:497
+#: plugins/check_ping.c:495
 #, c-format
 msgid ""
 "Use ping to check connection statistics for a remote host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:505
+#: plugins/check_ping.c:503
 #, c-format
 msgid ""
 "-H, --hostname=HOST\n"
@@ -2654,7 +2904,7 @@ msgid ""
 "   show HTML in the plugin output (obsoleted by urlize)\n"
 msgstr ""
 
-#: plugins/check_ping.c:520
+#: plugins/check_ping.c:518
 #, c-format
 msgid ""
 "THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel\n"
@@ -2663,7 +2913,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:525
+#: plugins/check_ping.c:523
 #, c-format
 msgid ""
 "This plugin uses the ping command to probe the specified host for packet "
@@ -2728,109 +2978,90 @@ msgstr[1] ""
 msgid " with %s"
 msgstr ""
 
-#: plugins/check_procs.c:371
-msgid ""
-"Critical Process Count must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:369
+msgid "Critical Process Count must be an integer!"
 msgstr ""
 
-#: plugins/check_procs.c:383
-msgid ""
-"Warning Process Count must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:381
+msgid "Warning Process Count must be an integer!"
 msgstr ""
 
-#: plugins/check_procs.c:391
-#, c-format
-msgid ""
-"%s: Parent Process ID must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:389
+msgid "Parent Process ID must be an integer!"
 msgstr ""
 
-#: plugins/check_procs.c:397 plugins/check_procs.c:502
+#: plugins/check_procs.c:395 plugins/check_procs.c:497
 #, c-format
 msgid "%s%sSTATE = %s"
 msgstr ""
 
-#: plugins/check_procs.c:406
+#: plugins/check_procs.c:404
 #, c-format
-msgid "UID %s was not found\n"
+msgid "UID %s was not found"
 msgstr ""
 
-#: plugins/check_procs.c:412
+#: plugins/check_procs.c:410
 #, c-format
-msgid "User name %s was not found\n"
+msgid "User name %s was not found"
 msgstr ""
 
-#: plugins/check_procs.c:417
+#: plugins/check_procs.c:415
 #, c-format
 msgid "%s%sUID = %d (%s)"
 msgstr ""
 
-#: plugins/check_procs.c:427
+#: plugins/check_procs.c:425
 #, c-format
 msgid "%s%scommand name '%s'"
 msgstr ""
 
-#: plugins/check_procs.c:437
+#: plugins/check_procs.c:435
 #, c-format
 msgid "%s%sargs '%s'"
 msgstr ""
 
-#: plugins/check_procs.c:442
+#: plugins/check_procs.c:440
 #, c-format
 msgid "%s%sRSS >= %d"
 msgstr ""
 
-#: plugins/check_procs.c:446
-#, c-format
-msgid ""
-"%s: RSS must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:444
+msgid "RSS must be an integer!"
 msgstr ""
 
-#: plugins/check_procs.c:449
+#: plugins/check_procs.c:447
 #, c-format
 msgid "%s%sVSZ >= %d"
 msgstr ""
 
-#: plugins/check_procs.c:453
-#, c-format
-msgid ""
-"%s: VSZ must be an integer!\n"
-"\n"
+#: plugins/check_procs.c:451
+msgid "VSZ must be an integer!"
 msgstr ""
 
-#: plugins/check_procs.c:457
+#: plugins/check_procs.c:455
 #, c-format
 msgid "%s%sPCPU >= %.2f"
 msgstr ""
 
-#: plugins/check_procs.c:461
-#, c-format
-msgid ""
-"%s: PCPU must be a float!\n"
-"\n"
+#: plugins/check_procs.c:459
+msgid "PCPU must be a float!"
 msgstr ""
 
-#: plugins/check_procs.c:485
-#, c-format
-msgid ""
-"%s: metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!\n"
-"\n"
+#: plugins/check_procs.c:483
+msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
 msgstr ""
 
-#: plugins/check_procs.c:521
+#: plugins/check_procs.c:516
 #, c-format
 msgid "wmax (%d) cannot be greater than cmax (%d)\n"
 msgstr ""
 
-#: plugins/check_procs.c:525
+#: plugins/check_procs.c:520
 #, c-format
 msgid "wmin (%d) cannot be less than cmin (%d)\n"
 msgstr ""
 
-#: plugins/check_procs.c:665
+#: plugins/check_procs.c:657
 #, c-format
 msgid ""
 "Checks all processes and generates WARNING or CRITICAL states if the "
@@ -2842,7 +3073,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:672
+#: plugins/check_procs.c:664
 #, c-format
 msgid ""
 "\n"
@@ -2853,7 +3084,7 @@ msgid ""
 "   Generate critical state if metric is outside this range\n"
 msgstr ""
 
-#: plugins/check_procs.c:679
+#: plugins/check_procs.c:671
 #, c-format
 msgid ""
 "\n"
@@ -2866,19 +3097,19 @@ msgid ""
 "   CPU     - percentage cpu\n"
 msgstr ""
 
-#: plugins/check_procs.c:689
+#: plugins/check_procs.c:681
 #, c-format
 msgid "   ELAPSED - time elapsed in seconds\n"
 msgstr ""
 
-#: plugins/check_procs.c:694
+#: plugins/check_procs.c:686
 #, c-format
 msgid ""
 " -v, --verbose\n"
 "   Extra information. Up to 3 verbosity levels\n"
 msgstr ""
 
-#: plugins/check_procs.c:698
+#: plugins/check_procs.c:690
 #, c-format
 msgid ""
 "\n"
@@ -2895,7 +3126,7 @@ msgid ""
 "   Only scan for processes with rss higher than indicated.\n"
 msgstr ""
 
-#: plugins/check_procs.c:711
+#: plugins/check_procs.c:703
 #, c-format
 msgid ""
 " -P, --pcpu=PCPU\n"
@@ -2908,7 +3139,7 @@ msgid ""
 "   Only scan for exact matches of COMMAND (without path).\n"
 msgstr ""
 
-#: plugins/check_procs.c:721
+#: plugins/check_procs.c:713
 #, c-format
 msgid ""
 "\n"
@@ -2918,7 +3149,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:726
+#: plugins/check_procs.c:718
 #, c-format
 msgid ""
 "This plugin checks the number of currently running processes and\n"
@@ -2929,7 +3160,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:733
+#: plugins/check_procs.c:725
 #, c-format
 msgid ""
 "Examples:\n"
@@ -2972,18 +3203,18 @@ msgstr ""
 msgid "Auth OK"
 msgstr ""
 
-#: plugins/check_radius.c:202 plugins/check_radius.c:264
+#: plugins/check_radius.c:202 plugins/check_radius.c:262
 msgid "Number of retries must be a positive integer"
 msgstr ""
 
-#: plugins/check_radius.c:290
+#: plugins/check_radius.c:288
 #, c-format
 msgid ""
 "Tests to see if a radius server is accepting connections.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_radius.c:298
+#: plugins/check_radius.c:296
 #, c-format
 msgid ""
 " -u, --username=STRING\n"
@@ -3000,7 +3231,7 @@ msgid ""
 "    Number of times to retry a failed connection\n"
 msgstr ""
 
-#: plugins/check_radius.c:314
+#: plugins/check_radius.c:312
 #, c-format
 msgid ""
 "\n"
@@ -3012,7 +3243,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_radius.c:321
+#: plugins/check_radius.c:319
 #, c-format
 msgid ""
 "The password option presents a substantial security issue because the\n"
@@ -3053,30 +3284,26 @@ msgstr ""
 msgid "REAL %s - %d second response time\n"
 msgstr ""
 
-#: plugins/check_real.c:324 plugins/check_smtp.c:343
+#: plugins/check_real.c:324 plugins/check_smtp.c:343 plugins/check_ups.c:522
 msgid "Warning time must be a positive integer"
 msgstr ""
 
-#: plugins/check_real.c:333
-msgid "Critical time must be a nonnegative integer"
-msgstr ""
-
-#: plugins/check_real.c:344
-msgid "Time interval must be a nonnegative integer"
+#: plugins/check_real.c:333 plugins/check_smtp.c:334 plugins/check_ups.c:513
+msgid "Critical time must be a positive integer"
 msgstr ""
 
-#: plugins/check_real.c:371
-msgid "You must provide a server to check\n"
+#: plugins/check_real.c:369
+msgid "You must provide a server to check"
 msgstr ""
 
-#: plugins/check_real.c:403
+#: plugins/check_real.c:401
 #, c-format
 msgid ""
 "This plugin tests the REAL service on the specified host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_real.c:411
+#: plugins/check_real.c:409
 #, c-format
 msgid ""
 " -u, --url=STRING\n"
@@ -3085,7 +3312,7 @@ msgid ""
 "   String to expect in first line of server response (default: %s)\n"
 msgstr ""
 
-#: plugins/check_real.c:424
+#: plugins/check_real.c:422
 #, c-format
 msgid ""
 "This plugin will attempt to open an RTSP connection with the host.\n"
@@ -3110,7 +3337,7 @@ msgstr ""
 msgid "Invalid SMTP response received from host on port %d\n"
 msgstr ""
 
-#: plugins/check_smtp.c:182 plugins/check_snmp.c:510
+#: plugins/check_smtp.c:182 plugins/check_snmp.c:508
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr ""
@@ -3130,27 +3357,19 @@ msgstr ""
 msgid "SMTP %s - %.3f sec. response time%s%s|%s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:313 plugins/check_smtp.c:323 plugins/check_snmp.c:566
+#: plugins/check_smtp.c:313 plugins/check_smtp.c:323 plugins/check_snmp.c:564
 #, c-format
 msgid "Could not realloc() units [%d]\n"
 msgstr ""
 
-#: plugins/check_smtp.c:334
-msgid "Critical time must be a positive integer"
-msgstr ""
-
-#: plugins/check_smtp.c:354
-msgid "Time interval must be a positive integer"
-msgstr ""
-
-#: plugins/check_smtp.c:426
+#: plugins/check_smtp.c:424
 #, c-format
 msgid ""
 "This plugin will attempt to open an SMTP connection with the host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_smtp.c:436
+#: plugins/check_smtp.c:434
 #, c-format
 msgid ""
 " -e, --expect=STRING\n"
@@ -3165,7 +3384,7 @@ msgid ""
 "   FROM-address to include in MAIL command, required by Exchange 2000\n"
 msgstr ""
 
-#: plugins/check_smtp.c:455
+#: plugins/check_smtp.c:453
 #, c-format
 msgid ""
 "\n"
@@ -3175,7 +3394,11 @@ msgid ""
 "STATE_WARNING return values.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:284 plugins/check_snmp.c:516
+#: plugins/check_snmp.c:254
+msgid "No valid data returned"
+msgstr ""
+
+#: plugins/check_snmp.c:284 plugins/check_snmp.c:514
 #, c-format
 msgid "%s UNKNOWN: call for regex which was not a compiled option"
 msgstr ""
@@ -3187,54 +3410,58 @@ msgid ""
 "CMD: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:455
+#: plugins/check_snmp.c:453
 #, c-format
 msgid "Invalid critical threshold: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:466
+#: plugins/check_snmp.c:464
 #, c-format
 msgid "Invalid warning threshold: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:536
+#: plugins/check_snmp.c:534
 #, c-format
 msgid "Could not realloc() labels[%d]"
 msgstr ""
 
-#: plugins/check_snmp.c:548
+#: plugins/check_snmp.c:546
 msgid "Could not realloc() labels\n"
 msgstr ""
 
-#: plugins/check_snmp.c:578
+#: plugins/check_snmp.c:576
 msgid "Could not realloc() units\n"
 msgstr ""
 
-#: plugins/check_snmp.c:651
+#: plugins/check_snmp.c:649
 #, c-format
 msgid ""
 "Missing secname (%s) or authpassword (%s) ! \n"
 ")"
 msgstr ""
 
-#: plugins/check_snmp.c:659
+#: plugins/check_snmp.c:657
 #, c-format
 msgid "Missing secname (%s), authpassword (%s), or privpasswd (%s)! \n"
 msgstr ""
 
-#: plugins/check_snmp.c:668
+#: plugins/check_snmp.c:666
 #, c-format
 msgid "Invalid SNMP version: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:847
+#: plugins/check_snmp.c:796
+msgid "Unbalanced quotes\n"
+msgstr ""
+
+#: plugins/check_snmp.c:845
 #, c-format
 msgid ""
 "Check status of remote machines and obtain sustem information via SNMP\n"
 "\n"
 msgstr ""
 
-#: plugins/check_snmp.c:857
+#: plugins/check_snmp.c:855
 #, c-format
 msgid ""
 " -P, --protocol=[1|3]\n"
@@ -3245,7 +3472,7 @@ msgid ""
 "    SNMPv3 auth proto\n"
 msgstr ""
 
-#: plugins/check_snmp.c:866
+#: plugins/check_snmp.c:864
 #, c-format
 msgid ""
 " -C, --community=STRING\n"
@@ -3259,7 +3486,7 @@ msgid ""
 "    SNMPv3 crypt passwd (DES)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:876
 #, c-format
 msgid ""
 " -o, --oid=OID(s)\n"
@@ -3272,7 +3499,7 @@ msgid ""
 "    to be the data that should be used in the evaluation.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:888
+#: plugins/check_snmp.c:886
 #, c-format
 msgid ""
 " -w, --warning=INTEGER_RANGE(s)\n"
@@ -3281,7 +3508,7 @@ msgid ""
 "    Range(s) which will not result in a CRITICAL status\n"
 msgstr ""
 
-#: plugins/check_snmp.c:895
+#: plugins/check_snmp.c:893
 #, c-format
 msgid ""
 " -s, --string=STRING\n"
@@ -3296,7 +3523,7 @@ msgid ""
 "    Prefix label for output from plugin (default -s 'SNMP')\n"
 msgstr ""
 
-#: plugins/check_snmp.c:906
+#: plugins/check_snmp.c:904
 #, c-format
 msgid ""
 " -u, --units=STRING\n"
@@ -3305,7 +3532,7 @@ msgid ""
 "    Separates output on multiple OID requests\n"
 msgstr ""
 
-#: plugins/check_snmp.c:916
+#: plugins/check_snmp.c:914
 #, c-format
 msgid ""
 "\n"
@@ -3316,7 +3543,7 @@ msgid ""
 "  http://net-snmp.sourceforge.net before you can use this plugin.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:921
+#: plugins/check_snmp.c:919
 #, c-format
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
@@ -3324,7 +3551,7 @@ msgid ""
 "  internal spaces must be quoted) [max 8 OIDs]\n"
 msgstr ""
 
-#: plugins/check_snmp.c:925
+#: plugins/check_snmp.c:923
 #, c-format
 msgid ""
 "- Ranges are inclusive and are indicated with colons. When specified as\n"
@@ -3334,7 +3561,7 @@ msgid ""
 "  returned if the result is outside the specified range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:931
+#: plugins/check_snmp.c:929
 #, c-format
 msgid ""
 "- If specified in the order 'max:min' a non-OK state will be returned if "
@@ -3342,7 +3569,7 @@ msgid ""
 "  result is within the (inclusive) range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:935
+#: plugins/check_snmp.c:933
 #, c-format
 msgid ""
 "- Upper or lower bounds may be omitted to skip checking the respective "
@@ -3356,29 +3583,33 @@ msgid ""
 "  returned from the SNMP query is an unsigned integer.\n"
 msgstr ""
 
-#: plugins/check_ssh.c:221
+#: plugins/check_ssh.c:152
+msgid "Port number must be a positive integer"
+msgstr ""
+
+#: plugins/check_ssh.c:217
 #, c-format
 msgid "Server answer: %s"
 msgstr ""
 
-#: plugins/check_ssh.c:239
+#: plugins/check_ssh.c:235
 #, c-format
 msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"
 msgstr ""
 
-#: plugins/check_ssh.c:245
+#: plugins/check_ssh.c:241
 #, c-format
 msgid "SSH OK - %s (protocol %s)\n"
 msgstr ""
 
-#: plugins/check_ssh.c:264
+#: plugins/check_ssh.c:260
 #, c-format
 msgid ""
 "Try to connect to an SSH server at specified server and port\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ssh.c:276
+#: plugins/check_ssh.c:272
 #, c-format
 msgid ""
 " -r, --remote-version=STRING\n"
@@ -3406,35 +3637,35 @@ msgstr ""
 msgid "total=%llu, free=%llu\n"
 msgstr ""
 
+#: plugins/check_swap.c:242 plugins/check_swap.c:281
+msgid "swapctl failed: "
+msgstr ""
+
 #: plugins/check_swap.c:314
 #, c-format
 msgid " %d%% free (%llu MB out of %llu MB)"
 msgstr ""
 
-#: plugins/check_swap.c:391
-msgid "Warning threshold must be integer or percentage!\n"
-msgstr ""
-
 #: plugins/check_swap.c:408
 msgid "Critical threshold must be integer or percentage!\n"
 msgstr ""
 
-#: plugins/check_swap.c:464
+#: plugins/check_swap.c:462
 msgid "Warning percentage should be more than critical percentage\n"
 msgstr ""
 
-#: plugins/check_swap.c:468
+#: plugins/check_swap.c:466
 msgid "Warning free space should be more than critical free space\n"
 msgstr ""
 
-#: plugins/check_swap.c:482
+#: plugins/check_swap.c:480
 #, c-format
 msgid ""
 "Check swap space on local machine.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_swap.c:488
+#: plugins/check_swap.c:486
 #, c-format
 msgid ""
 "\n"
@@ -3454,7 +3685,7 @@ msgid ""
 "    Verbose output. Up to 3 levels\n"
 msgstr ""
 
-#: plugins/check_swap.c:502
+#: plugins/check_swap.c:500
 #, c-format
 msgid ""
 "\n"
@@ -3463,7 +3694,7 @@ msgid ""
 "real memory\n"
 msgstr ""
 
-#: plugins/check_swap.c:506
+#: plugins/check_swap.c:504
 #, c-format
 msgid ""
 "\n"
@@ -3474,6 +3705,10 @@ msgstr ""
 msgid "CRITICAL - Generic check_tcp called with unknown service\n"
 msgstr ""
 
+#: plugins/check_tcp.c:262
+msgid "CRITICAL - Could not make SSL connection\n"
+msgstr ""
+
 #: plugins/check_tcp.c:335
 #, c-format
 msgid "Unexpected response from host: %s\n"
@@ -3484,49 +3719,72 @@ msgstr ""
 msgid "%s %s%s - %.3f second response time on port %d"
 msgstr ""
 
-#: plugins/check_tcp.c:504 plugins/check_time.c:248 plugins/check_time.c:272
-#: plugins/check_udp.c:175
-msgid "Warning threshold must be a positive integer"
+#: plugins/check_tcp.c:437
+msgid "No arguments found"
 msgstr ""
 
-#: plugins/check_tcp.c:543
+#: plugins/check_tcp.c:541
 msgid "Maxbytes must be a positive integer"
 msgstr ""
 
-#: plugins/check_tcp.c:557
+#: plugins/check_tcp.c:555
 msgid "Refuse must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:567
+#: plugins/check_tcp.c:565
 msgid "Mismatch must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:573
+#: plugins/check_tcp.c:571
 msgid "Delay must be a positive integer"
 msgstr ""
 
-#: plugins/check_tcp.c:593
-msgid "You must provide a server address\n"
+#: plugins/check_tcp.c:584
+msgid "SSL support not available.  Install OpenSSL and recompile."
 msgstr ""
 
-#: plugins/check_tcp.c:613
+#: plugins/check_tcp.c:591
+msgid "You must provide a server address"
+msgstr ""
+
+#: plugins/check_tcp.c:611
 #, c-format
 msgid "CRITICAL - Cannot create SSL context.\n"
 msgstr ""
 
-#: plugins/check_tcp.c:636
+#: plugins/check_tcp.c:634
 #, c-format
 msgid "CRITICAL - Cannot make  SSL connection "
 msgstr ""
 
-#: plugins/check_tcp.c:763
+#: plugins/check_tcp.c:711
+#, c-format
+msgid "Certificate expires in %d day(s) (%s).\n"
+msgstr ""
+
+#: plugins/check_tcp.c:715
+#, c-format
+msgid "Certificate expired on %s.\n"
+msgstr ""
+
+#: plugins/check_tcp.c:720
+#, c-format
+msgid "Certificate expires today (%s).\n"
+msgstr ""
+
+#: plugins/check_tcp.c:724
+#, c-format
+msgid "Certificate will expire on %s.\n"
+msgstr ""
+
+#: plugins/check_tcp.c:761
 #, c-format
 msgid ""
 "This plugin tests %s connections with the specified host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_tcp.c:774
+#: plugins/check_tcp.c:772
 #, c-format
 msgid ""
 " -s, --send=STRING\n"
@@ -3537,7 +3795,7 @@ msgid ""
 "    String to send server to initiate a clean close of the connection\n"
 msgstr ""
 
-#: plugins/check_tcp.c:782
+#: plugins/check_tcp.c:780
 #, c-format
 msgid ""
 " -r, --refuse=ok|warn|crit\n"
@@ -3553,7 +3811,7 @@ msgid ""
 "    Seconds to wait between sending string and polling for response\n"
 msgstr ""
 
-#: plugins/check_tcp.c:795
+#: plugins/check_tcp.c:793
 #, c-format
 msgid ""
 " -D, --certificate=INTEGER\n"
@@ -3587,26 +3845,22 @@ msgstr ""
 msgid "TIME %s - %lu second time difference|%s %s\n"
 msgstr ""
 
-#: plugins/check_time.c:244
+#: plugins/check_time.c:242
 msgid "Warning thresholds must be a positive integer"
 msgstr ""
 
-#: plugins/check_time.c:263
+#: plugins/check_time.c:261
 msgid "Critical thresholds must be a positive integer"
 msgstr ""
 
-#: plugins/check_time.c:309 plugins/check_udp.c:209
-msgid "Hostname was not supplied"
-msgstr ""
-
-#: plugins/check_time.c:329
+#: plugins/check_time.c:327
 #, c-format
 msgid ""
 "This plugin will check the time on the specified host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_time.c:337
+#: plugins/check_time.c:335
 #, c-format
 msgid ""
 " -u, --udp\n"
@@ -3621,6 +3875,16 @@ msgid ""
 "    Response time (sec.) necessary to result in critical status\n"
 msgstr ""
 
+#: plugins/check_udp.c:70
+#, c-format
+msgid "No response from host on port %d\n"
+msgstr ""
+
+#: plugins/check_udp.c:79
+#, c-format
+msgid "Invalid response received from host on port %d\n"
+msgstr ""
+
 #: plugins/check_udp.c:95
 #, c-format
 msgid "Connection %s on port %d - %d second response time\n"
@@ -3634,14 +3898,14 @@ msgstr ""
 msgid "problem"
 msgstr ""
 
-#: plugins/check_udp.c:227
+#: plugins/check_udp.c:225
 #, c-format
 msgid ""
 "\tThis plugin tests an UDP connection with the specified host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_udp.c:236
+#: plugins/check_udp.c:234
 #, c-format
 msgid ""
 " -e, --expect=STRING <optional>\n"
@@ -3650,7 +3914,7 @@ msgid ""
 "    String to send to the server when initiating the connection\n"
 msgstr ""
 
-#: plugins/check_udp.c:248
+#: plugins/check_udp.c:246
 #, c-format
 msgid ""
 "This plugin will attempt to connect to the specified port on the host.\n"
@@ -3659,7 +3923,97 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:597
+#: plugins/check_ups.c:136
+msgid "On Battery, Low Battery"
+msgstr ""
+
+#: plugins/check_ups.c:141
+msgid "Online"
+msgstr ""
+
+#: plugins/check_ups.c:144
+msgid "On Battery"
+msgstr ""
+
+#: plugins/check_ups.c:148
+msgid ", Low Battery"
+msgstr ""
+
+#: plugins/check_ups.c:152
+msgid ", Calibrating"
+msgstr ""
+
+#: plugins/check_ups.c:155
+msgid ", Replace Battery"
+msgstr ""
+
+#: plugins/check_ups.c:159
+msgid ", On Bypass"
+msgstr ""
+
+#: plugins/check_ups.c:162
+msgid ", Overload"
+msgstr ""
+
+#: plugins/check_ups.c:165
+msgid ", Trimming"
+msgstr ""
+
+#: plugins/check_ups.c:168
+msgid ", Boosting"
+msgstr ""
+
+#: plugins/check_ups.c:171
+msgid ", Charging"
+msgstr ""
+
+#: plugins/check_ups.c:174
+msgid ", Discharging"
+msgstr ""
+
+#: plugins/check_ups.c:177
+msgid ", Unknown"
+msgstr ""
+
+#: plugins/check_ups.c:314
+msgid "UPS does not support any available options\n"
+msgstr ""
+
+#: plugins/check_ups.c:338 plugins/check_ups.c:398
+#, c-format
+msgid "Invalid response received from host\n"
+msgstr ""
+
+#: plugins/check_ups.c:406
+#, c-format
+msgid "CRITICAL - no such ups '%s' on that host\n"
+msgstr ""
+
+#: plugins/check_ups.c:416
+#, c-format
+msgid "CRITICAL - UPS data is stale\n"
+msgstr ""
+
+#: plugins/check_ups.c:421
+#, c-format
+msgid "Unknown error: %s\n"
+msgstr ""
+
+#: plugins/check_ups.c:428
+#, c-format
+msgid "Error: unable to parse variable\n"
+msgstr ""
+
+#: plugins/check_ups.c:535
+msgid "Unrecognized UPS variable"
+msgstr ""
+
+#: plugins/check_ups.c:573
+#, c-format
+msgid "Error : no ups indicated\n"
+msgstr ""
+
+#: plugins/check_ups.c:593
 #, c-format
 msgid ""
 "This plugin tests the UPS service on the specified host.\n"
@@ -3668,21 +4022,21 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:607
+#: plugins/check_ups.c:603
 #, c-format
 msgid ""
 " -u, --ups=STRING\n"
 "    Name of UPS\n"
 msgstr ""
 
-#: plugins/check_ups.c:611
+#: plugins/check_ups.c:607
 #, c-format
 msgid ""
 " -T, --temperature\n"
 "    Output of temperatures in Celsius\n"
 msgstr ""
 
-#: plugins/check_ups.c:621
+#: plugins/check_ups.c:617
 #, c-format
 msgid ""
 "This plugin attempts to determine the status of a UPS (Uninterruptible "
@@ -3696,7 +4050,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:628
+#: plugins/check_ups.c:624
 #, c-format
 msgid ""
 "You may also specify a variable to check [such as temperature, utility "
@@ -3709,7 +4063,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:634
+#: plugins/check_ups.c:630
 #, c-format
 msgid ""
 "Notes:\n"
@@ -3731,16 +4085,7 @@ msgstr ""
 msgid "USERS %s - %d users currently logged in |%s\n"
 msgstr ""
 
-#: plugins/check_users.c:154
-msgid "Critical threshold must be a positive integer\n"
-msgstr ""
-
-#: plugins/check_users.c:160 plugins/check_users.c:170
-#: plugins/check_users.c:177
-msgid "Warning threshold must be a positive integer\n"
-msgstr ""
-
-#: plugins/check_users.c:195
+#: plugins/check_users.c:193
 #, c-format
 msgid ""
 "This plugin checks the number of users currently logged in on the local\n"
@@ -3748,7 +4093,7 @@ msgid ""
 "specified.\n"
 msgstr ""
 
-#: plugins/check_users.c:203
+#: plugins/check_users.c:201
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -3757,79 +4102,79 @@ msgid ""
 "    Set CRITICAL status if more than INTEGER users are logged in\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:227
+#: plugins/check_ide_smart.c:225
 #, c-format
 msgid "CRITICAL - Couldn't open device: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:232
+#: plugins/check_ide_smart.c:230
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:294
+#: plugins/check_ide_smart.c:292
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:363
+#: plugins/check_ide_smart.c:361
 #, c-format
 msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:370
+#: plugins/check_ide_smart.c:368
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:377
+#: plugins/check_ide_smart.c:375
 #, c-format
 msgid "OK - Operational (%d/%d tests passed)\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:380
+#: plugins/check_ide_smart.c:378
 #, c-format
 msgid "ERROR - Status '%d' uknown. %d/%d tests passed\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:413
+#: plugins/check_ide_smart.c:411
 #, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:419
+#: plugins/check_ide_smart.c:417
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:425
+#: plugins/check_ide_smart.c:423
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:464
+#: plugins/check_ide_smart.c:462
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:483
+#: plugins/check_ide_smart.c:481
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr ""
 
-#: plugins/negate.c:244
+#: plugins/negate.c:242
 #, c-format
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).\n"
 "\n"
 msgstr ""
 
-#: plugins/negate.c:253
+#: plugins/negate.c:251
 #, c-format
 msgid "     [keep timeout than the plugin timeout to retain CRITICAL status]\n"
 msgstr ""
 
-#: plugins/negate.c:256
+#: plugins/negate.c:254
 #, c-format
 msgid ""
 "  negate \"/usr/local/nagios/libexec/check_ping -H host\"\n"
@@ -3838,7 +4183,7 @@ msgid ""
 "    Use single quotes if you need to retain spaces\n"
 msgstr ""
 
-#: plugins/negate.c:262
+#: plugins/negate.c:260
 #, c-format
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert "
@@ -3850,14 +4195,63 @@ msgid ""
 "Otherwise, the output state of the wrapped plugin is unchanged.\n"
 msgstr ""
 
-#: plugins/urlize.c:108
+#: plugins/netutils.c:48
+#, c-format
+msgid "CRITICAL - Socket timeout after %d seconds\n"
+msgstr ""
+
+#: plugins/netutils.c:50
+#, c-format
+msgid "CRITICAL - Abnormal timeout after %d seconds\n"
+msgstr ""
+
+#: plugins/netutils.c:109 plugins/netutils.c:318
+#, c-format
+msgid "Send failed\n"
+msgstr ""
+
+#: plugins/netutils.c:126 plugins/netutils.c:333
+#, c-format
+msgid "No data was received from host!\n"
+msgstr ""
+
+#: plugins/netutils.c:242
+#, c-format
+msgid "Socket creation failed\n"
+msgstr ""
+
+#: plugins/netutils.c:342
+#, c-format
+msgid "Receive failed\n"
+msgstr ""
+
+#: plugins/popen.c:117
+#, c-format
+msgid "Could not malloc argv array in popen()\n"
+msgstr ""
+
+#: plugins/popen.c:127
+#, c-format
+msgid "CRITICAL - You need more args!!!\n"
+msgstr ""
+
+#: plugins/popen.c:248 plugins/utils.c:136
+#, c-format
+msgid "CRITICAL - Plugin timed out after %d seconds\n"
+msgstr ""
+
+#: plugins/popen.c:264
+msgid "sysconf error for _SC_OPEN_MAX"
+msgstr ""
+
+#: plugins/urlize.c:106
 #, c-format
 msgid ""
 "%s UNKNOWN - No data received from host\n"
 "CMD: %s</A>\n"
 msgstr ""
 
-#: plugins/urlize.c:135
+#: plugins/urlize.c:133
 #, c-format
 msgid ""
 "\n"
@@ -3868,7 +4262,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/urlize.c:143
+#: plugins/urlize.c:141
 #, c-format
 msgid ""
 "\n"
@@ -3885,3 +4279,11 @@ msgid ""
 "\n"
 "    urlize http://example.com/ \"check_http -H example.com -r 'two words'\"\n"
 msgstr ""
+
+#: plugins/utils.c:433
+msgid "failed realloc in strpcpy\n"
+msgstr ""
+
+#: plugins/utils.c:475
+msgid "failed malloc in strscat\n"
+msgstr ""