From ea90af2ba1f5550f5731f741e509d7aafb777eec Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Wed, 27 Nov 2013 00:00:34 +0100
Subject: [PATCH] Imported Upstream version 1.4.16+git20130911

---
 THANKS                    |   8 +-
 lib/tests/test_disk.c     |   2 +-
 lib/utils_base.c          |   3 +
 pkg/solaris/pkginfo       |   4 +-
 plugins/check_http.c      |  24 ++---
 plugins/check_ide_smart.c |  10 +-
 plugins/check_procs.c     |   2 +-
 plugins/check_tcp.c       |   2 +
 plugins/negate.c          |   3 +
 plugins/netutils.c        |   5 +-
 plugins/netutils.h        |  12 +--
 plugins/runcmd.h          |  12 +--
 plugins/sslutils.c        |   3 +-
 plugins/utils.c           |   7 +-
 plugins/utils.h           |  11 +-
 po/de.gmo                 | Bin 7836 -> 7836 bytes
 po/de.po                  | 218 +++++++++++++++++++-------------------
 po/fr.gmo                 | Bin 95571 -> 95571 bytes
 po/fr.po                  | 218 +++++++++++++++++++-------------------
 po/nagios-plugins.pot     | 218 +++++++++++++++++++-------------------
 20 files changed, 379 insertions(+), 383 deletions(-)

diff --git a/THANKS b/THANKS
index 405e4eb..baca202 100644
--- a/THANKS
+++ b/THANKS
@@ -2,15 +2,15 @@ This software is brought to you by the Nagios Plugins Development Team. However,
 there have been many contributors to this project. Everyone below has helped in 
 raising bug reports, creating patches or contributing new plugins.
 
-Randy O'Meara
 dag rob?le
-Diego Elio Pettenò
+Randy O'Meara
 fabiodds
+Diego Elio Pettenò
 Oskar Ahner
 Lance Albertson
 David Alden
-Paul Allen
 Rodger Allen
+Paul Allen
 Patrick Allen
 Felipe Gustavo de Almeida
 Michael Almond
@@ -164,8 +164,8 @@ Guenther Mair
 Pawel Malachowski
 Michael Markstaller
 John Marquart
-Ernst-Dieter Martin
 Jason Martin
+Ernst-Dieter Martin
 Christopher Maser
 Mathieu Masseboeuf
 Alexander Matey
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
index 58eb8f1..f6477ac 100644
--- a/lib/tests/test_disk.c
+++ b/lib/tests/test_disk.c
@@ -34,7 +34,7 @@ main (int argc, char **argv)
 	struct name_list *dummy_mountlist = NULL;
 	struct name_list *temp_name;
 	struct parameter_list *paths = NULL;
-	struct parameter_list *p, *prev, *last;
+	struct parameter_list *p, *prev = NULL, *last = NULL;
 
 	struct mount_entry *dummy_mount_list;
 	struct mount_entry *me;
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 8685e6f..54463e9 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -27,6 +27,7 @@
 #include "common.h"
 #include <stdarg.h>
 #include "utils_base.h"
+#include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 
@@ -34,6 +35,8 @@
 
 nagios_plugin *this_nagios_plugin=NULL;
 
+int _np_state_read_file(FILE *);
+
 void np_init( char *plugin_name, int argc, char **argv ) {
 	if (this_nagios_plugin==NULL) {
 		this_nagios_plugin = calloc(1, sizeof(nagios_plugin));
diff --git a/pkg/solaris/pkginfo b/pkg/solaris/pkginfo
index 2773cb9..41bd5e7 100644
--- a/pkg/solaris/pkginfo
+++ b/pkg/solaris/pkginfo
@@ -2,11 +2,11 @@ PKG="NGOSplugin"
 NAME="nagios-plugins"
 DESC="Nagios network monitoring plugins"
 ARCH="unknown"
-VERSION="1.4.16,REV=2013.09.10.13.46"
+VERSION="1.4.16,REV=2013.09.10.23.12"
 CATEGORY="application"
 VENDOR="Nagios Plugin Development Team"
 EMAIL="nagiosplug-devel@lists.sourceforge.net"
-PSTAMP="nag20130910134636"
+PSTAMP="nag20130910231216"
 BASEDIR="/"
 CLASSES="none"
 
diff --git a/plugins/check_http.c b/plugins/check_http.c
index c44bb3a..ecd832f 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -855,18 +855,18 @@ check_http (void)
   char *full_page_new;
   char *buf;
   char *pos;
-  long microsec;
-  double elapsed_time;
-  long microsec_connect;
-  double elapsed_time_connect;
-  long microsec_ssl;
-  double elapsed_time_ssl;
-  long microsec_firstbyte;
-  double elapsed_time_firstbyte;
-  long microsec_headers;
-  double elapsed_time_headers;
-  long microsec_transfer;
-  double elapsed_time_transfer;
+  long microsec = 0L;
+  double elapsed_time = 0.0;
+  long microsec_connect = 0L;
+  double elapsed_time_connect = 0.0;
+  long microsec_ssl = 0L;
+  double elapsed_time_ssl = 0.0;
+  long microsec_firstbyte = 0L;
+  double elapsed_time_firstbyte = 0.0;
+  long microsec_headers = 0L;
+  double elapsed_time_headers = 0.0;
+  long microsec_transfer = 0L;
+  double elapsed_time_transfer = 0.0;
   int page_len = 0;
   int result = STATE_OK;
 
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index ee6bf7b..0a8009a 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -164,8 +164,14 @@ enum SmartCommand
 		SMART_CMD_AUTO_OFFLINE 
 	};
 
-void print_values (values_t * p, thresholds_t * t);
-int smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error); 
+char *get_offline_text (int);
+int smart_read_values (int, values_t *);
+int values_not_passed (values_t *, thresholds_t *);
+int nagios (values_t *, thresholds_t *);
+void print_value (value_t *, threshold_t *);
+void print_values (values_t *, thresholds_t *);
+int smart_cmd_simple (int, enum SmartCommand, __u8, char);
+int smart_read_thresholds (int, thresholds_t *);
 
 int
 main (int argc, char *argv[]) 
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index d09bd8b..d20b027 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -150,7 +150,7 @@ main (int argc, char **argv)
 	int crit = 0; /* number of processes in crit state */
 	int i = 0, j = 0;
 	int result = STATE_UNKNOWN;
-	int ret;
+	int ret = 0;
 	output chld_out, chld_err;
 
 	setlocale (LC_ALL, "");
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index b024821..9e62638 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -32,6 +32,8 @@ char *progname;
 const char *copyright = "1999-2008";
 const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
+#include <ctype.h>
+
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
diff --git a/plugins/negate.c b/plugins/negate.c
index 493988e..ef7d4e0 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -35,6 +35,8 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 #define DEFAULT_TIMEOUT 11
 
+#include <ctype.h>
+
 #include "common.h"
 #include "utils.h"
 #include "utils_cmd.h"
@@ -43,6 +45,7 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 static const char **process_arguments (int, char **);
 int validate_arguments (char **);
+int translate_state (char *);
 void print_help (void);
 void print_usage (void);
 int subst_text = FALSE;
diff --git a/plugins/netutils.c b/plugins/netutils.c
index 1d6100a..9f18723 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -27,11 +27,12 @@
 * 
 *****************************************************************************/
 
-#define LOCAL_TIMEOUT_ALARM_HANDLER
-
 #include "common.h"
 #include "netutils.h"
 
+unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
+unsigned int socket_timeout_state = STATE_CRITICAL;
+
 int econn_refuse_state = STATE_CRITICAL;
 int was_refused = FALSE;
 #if USE_IPV6
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 5a495c9..347509e 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -81,20 +81,14 @@ void host_or_die(const char *str);
 #  define is_hostname(addr) resolve_host_or_addr(addr, AF_INET)
 #endif
 
-#ifdef LOCAL_TIMEOUT_ALARM_HANDLER
 extern unsigned int socket_timeout;
-extern int socket_timeout_state;
-RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
-#else
-unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
-unsigned int socket_timeout_state = STATE_CRITICAL;
-extern RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
-#endif
-
+extern unsigned int socket_timeout_state;
 extern int econn_refuse_state;
 extern int was_refused;
 extern int address_family;
 
+RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
+
 /* SSL-Related functionality */
 #ifdef HAVE_SSL
 /* maybe this could be merged with the above np_net_connect, via some flags */
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index 5957562..fe66067 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -25,17 +25,7 @@
 #define NAGIOSPLUG_RUNCMD_H
 
 #include "common.h"
-
-/** types **/
-struct output {
-	char *buf;     /* output buffer */
-	size_t buflen; /* output buffer content length */
-	char **line;   /* array of lines (points to buf) */
-	size_t *lens;  /* string lengths */
-	size_t lines;  /* lines of output */
-};
-
-typedef struct output output;
+#include "utils_cmd.h" /* for the "output" type */
 
 /** prototypes **/
 int np_runcmd(const char *, output *, output *, int);
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 818f799..2ec9190 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -27,7 +27,6 @@
 *****************************************************************************/
 
 #define MAX_CN_LENGTH 256
-#define LOCAL_TIMEOUT_ALARM_HANDLER
 #include "common.h"
 #include "netutils.h"
 
@@ -49,7 +48,7 @@ int np_net_ssl_init_with_hostname_and_version(int sd, char *host_name, int versi
 }
 
 int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int version, char *cert, char *privkey) {
-	const SSL_METHOD *method = NULL;
+	SSL_METHOD *method = NULL;
 
 	switch (version) {
 	case 0: /* Deafult to auto negotiation */
diff --git a/plugins/utils.c b/plugins/utils.c
index 8827e31..b57d5e1 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -22,8 +22,6 @@
 * 
 *****************************************************************************/
 
-#define LOCAL_TIMEOUT_ALARM_HANDLER
-
 #include "common.h"
 #include "utils.h"
 #include "utils_base.h"
@@ -38,6 +36,11 @@ extern const char *progname;
 #define STRLEN 64
 #define TXTBLK 128
 
+unsigned int timeout_state = STATE_CRITICAL;
+unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
+
+time_t start_time, end_time;
+
 /* **************************************************************************
  * max_state(STATE_x, STATE_y)
  * compares STATE_x to  STATE_y and returns result based on the following
diff --git a/plugins/utils.h b/plugins/utils.h
index 822be94..657d4bf 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -31,17 +31,12 @@ void print_revision (const char *, const char *);
 
 /* Handle timeouts */
 
-#ifdef LOCAL_TIMEOUT_ALARM_HANDLER
 extern unsigned int timeout_state;
 extern unsigned int timeout_interval;
-RETSIGTYPE timeout_alarm_handler (int);
-#else
-unsigned int timeout_state = STATE_CRITICAL;
-unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
-extern RETSIGTYPE timeout_alarm_handler (int);
-#endif
 
-time_t start_time, end_time;
+RETSIGTYPE timeout_alarm_handler (int);
+
+extern time_t start_time, end_time;
 
 /* Test input types */
 
diff --git a/po/de.gmo b/po/de.gmo
index 9ed942dd0598d4199e548937e644dcf34aab6fa6..d30ab6e8aef94494ba14a2e07b992d787a9ef66b 100644
GIT binary patch
delta 18
acmbPZJI8jzH$he-V=F`B&A$Z~@&Eutj|ScV

delta 18
acmbPZJI8jzH$hfIV=EJj&A$Z~@&EutxCZ3_

diff --git a/po/de.po b/po/de.po
index 4a50a6e..474ba96 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nagiosplug\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-10 13:48+0200\n"
+"POT-Creation-Date: 2013-09-10 23:13+0200\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: English <en@li.org>\n"
@@ -30,14 +30,14 @@ msgstr ""
 #: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:171
 #: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144
 #: plugins/check_snmp.c:239 plugins/check_ssh.c:73 plugins/check_swap.c:110
-#: plugins/check_tcp.c:210 plugins/check_time.c:78 plugins/check_ups.c:122
-#: plugins/check_users.c:77 plugins/negate.c:211 plugins-root/check_dhcp.c:270
+#: plugins/check_tcp.c:212 plugins/check_time.c:78 plugins/check_ups.c:122
+#: plugins/check_users.c:77 plugins/negate.c:214 plugins-root/check_dhcp.c:270
 msgid "Could not parse arguments"
 msgstr "Argumente konnten nicht ausgewertet werden"
 
 #: plugins/check_by_ssh.c:90 plugins/check_dig.c:82 plugins/check_dns.c:95
 #: plugins/check_nagios.c:95 plugins/check_pgsql.c:178 plugins/check_ping.c:99
-#: plugins/check_procs.c:186 plugins/negate.c:76
+#: plugins/check_procs.c:186 plugins/negate.c:79
 msgid "Cannot catch SIGALRM"
 msgstr "Konnte SIGALRM nicht erhalten"
 
@@ -65,14 +65,14 @@ msgstr ""
 #: plugins/check_http.c:278 plugins/check_ldap.c:293 plugins/check_pgsql.c:311
 #: plugins/check_procs.c:429 plugins/check_radius.c:308
 #: plugins/check_real.c:356 plugins/check_smtp.c:581 plugins/check_snmp.c:726
-#: plugins/check_ssh.c:138 plugins/check_tcp.c:487 plugins/check_time.c:302
-#: plugins/check_ups.c:556 plugins/negate.c:161
+#: plugins/check_ssh.c:138 plugins/check_tcp.c:489 plugins/check_time.c:302
+#: plugins/check_ups.c:556 plugins/negate.c:164
 msgid "Timeout interval must be a positive integer"
 msgstr "Timeout interval muss ein positiver Integer sein"
 
 #: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:341
 #: plugins/check_radius.c:272 plugins/check_real.c:327
-#: plugins/check_smtp.c:506 plugins/check_tcp.c:493 plugins/check_time.c:296
+#: plugins/check_smtp.c:506 plugins/check_tcp.c:495 plugins/check_time.c:296
 #: plugins/check_ups.c:518
 msgid "Port must be a positive integer"
 msgstr "Port muss ein positiver Integer sein"
@@ -228,7 +228,7 @@ msgstr ""
 #: plugins/check_dig.c:355 plugins/check_disk.c:924 plugins/check_http.c:1560
 #: plugins/check_nagios.c:312 plugins/check_ntp.c:869
 #: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:633
-#: plugins/check_procs.c:755 plugins/negate.c:268 plugins/urlize.c:180
+#: plugins/check_procs.c:755 plugins/negate.c:271 plugins/urlize.c:180
 msgid "Examples:"
 msgstr ""
 
@@ -244,9 +244,9 @@ msgstr ""
 #: plugins/check_ping.c:603 plugins/check_procs.c:773
 #: plugins/check_radius.c:385 plugins/check_real.c:451
 #: plugins/check_smtp.c:843 plugins/check_snmp.c:1197 plugins/check_ssh.c:309
-#: plugins/check_swap.c:558 plugins/check_tcp.c:666 plugins/check_time.c:371
+#: plugins/check_swap.c:558 plugins/check_tcp.c:668 plugins/check_time.c:371
 #: plugins/check_ups.c:660 plugins/check_users.c:240
-#: plugins/check_ide_smart.c:634 plugins/negate.c:292 plugins/urlize.c:197
+#: plugins/check_ide_smart.c:640 plugins/negate.c:295 plugins/urlize.c:197
 #: plugins-root/check_dhcp.c:1417 plugins-root/check_icmp.c:1354
 msgid "Usage:"
 msgstr ""
@@ -298,7 +298,7 @@ msgstr ""
 #: plugins/check_nt.c:758 plugins/check_ntp.c:865 plugins/check_ntp_peer.c:696
 #: plugins/check_ntp_time.c:626 plugins/check_nwstat.c:1670
 #: plugins/check_overcr.c:456 plugins/check_snmp.c:1168
-#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
+#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:277
 #: plugins-root/check_icmp.c:1329
 msgid "Notes:"
 msgstr ""
@@ -1153,8 +1153,8 @@ msgid "file does not exist or is not readable"
 msgstr ""
 
 #: plugins/check_http.c:310 plugins/check_http.c:315 plugins/check_http.c:321
-#: plugins/check_smtp.c:600 plugins/check_tcp.c:558 plugins/check_tcp.c:562
-#: plugins/check_tcp.c:568
+#: plugins/check_smtp.c:600 plugins/check_tcp.c:560 plugins/check_tcp.c:564
+#: plugins/check_tcp.c:570
 msgid "Invalid certificate expiration period"
 msgstr "Ungültiger Zertifikatsablauftermin"
 
@@ -1164,7 +1164,7 @@ msgid ""
 "(SSLv3)"
 msgstr ""
 
-#: plugins/check_http.c:354 plugins/check_tcp.c:581
+#: plugins/check_http.c:354 plugins/check_tcp.c:583
 #, fuzzy
 msgid "Invalid option - SSL is not available"
 msgstr "Ungültige Option - SSL ist nicht verfügbar\n"
@@ -1189,7 +1189,7 @@ msgstr ""
 
 #: plugins/check_http.c:464 plugins/check_ntp.c:722
 #: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:512
-#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:459
+#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:461
 msgid "IPv6 support not available"
 msgstr "IPv6 Unterstützung nicht vorhanden"
 
@@ -4246,7 +4246,7 @@ msgstr "Ung
 msgid "Invalid REAL response received from host on port %d\n"
 msgstr ""
 
-#: plugins/check_real.c:184 plugins/check_tcp.c:287
+#: plugins/check_real.c:184 plugins/check_tcp.c:289
 #, c-format
 msgid "No data received from host\n"
 msgstr ""
@@ -4493,7 +4493,7 @@ msgstr ""
 msgid "FQDN used for HELO"
 msgstr ""
 
-#: plugins/check_smtp.c:809 plugins/check_tcp.c:647
+#: plugins/check_smtp.c:809 plugins/check_tcp.c:649
 msgid "Minimum number of days a certificate has to be valid."
 msgstr ""
 
@@ -4946,108 +4946,108 @@ msgstr ""
 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."
 msgstr ""
 
-#: plugins/check_tcp.c:198
+#: plugins/check_tcp.c:200
 msgid "CRITICAL - Generic check_tcp called with unknown service\n"
 msgstr ""
 
-#: plugins/check_tcp.c:222
+#: plugins/check_tcp.c:224
 msgid "With UDP checks, a send/expect string must be specified."
 msgstr ""
 
-#: plugins/check_tcp.c:414
+#: plugins/check_tcp.c:416
 msgid "No arguments found"
 msgstr ""
 
-#: plugins/check_tcp.c:516
+#: plugins/check_tcp.c:518
 msgid "Maxbytes must be a positive integer"
 msgstr "Maxbytes muss ein positiver Integer sein"
 
-#: plugins/check_tcp.c:534
+#: plugins/check_tcp.c:536
 msgid "Refuse must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:544
+#: plugins/check_tcp.c:546
 msgid "Mismatch must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:550
+#: plugins/check_tcp.c:552
 msgid "Delay must be a positive integer"
 msgstr "Delay muss ein positiver Integer sein"
 
-#: plugins/check_tcp.c:595
+#: plugins/check_tcp.c:597
 #, fuzzy
 msgid "You must provide a server address"
 msgstr "%s: Hostname muss angegeben werden\n"
 
-#: plugins/check_tcp.c:597
+#: plugins/check_tcp.c:599
 #, fuzzy
 msgid "Invalid hostname, address or socket"
 msgstr "Ungültige(r) Hostname/Adresse"
 
-#: plugins/check_tcp.c:611
+#: plugins/check_tcp.c:613
 #, fuzzy, c-format
 msgid ""
 "This plugin tests %s connections with the specified host (or unix socket).\n"
 "\n"
 msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
 
-#: plugins/check_tcp.c:624
+#: plugins/check_tcp.c:626
 msgid ""
 "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or "
 "quit option"
 msgstr ""
 
-#: plugins/check_tcp.c:625
+#: plugins/check_tcp.c:627
 msgid "Default: nothing added to send, \\r\\n added to end of quit"
 msgstr ""
 
-#: plugins/check_tcp.c:627
+#: plugins/check_tcp.c:629
 msgid "String to send to the server"
 msgstr ""
 
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:631
 msgid "String to expect in server response"
 msgstr ""
 
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:631
 msgid "(may be repeated)"
 msgstr ""
 
-#: plugins/check_tcp.c:631
+#: plugins/check_tcp.c:633
 msgid "All expect strings need to occur in server response. Default is any"
 msgstr ""
 
-#: plugins/check_tcp.c:633
+#: plugins/check_tcp.c:635
 msgid "String to send server to initiate a clean close of the connection"
 msgstr ""
 
-#: plugins/check_tcp.c:635
+#: plugins/check_tcp.c:637
 msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
 msgstr ""
 
-#: plugins/check_tcp.c:637
+#: plugins/check_tcp.c:639
 msgid ""
 "Accept expected string mismatches with states ok, warn, crit (default: warn)"
 msgstr ""
 
-#: plugins/check_tcp.c:639
+#: plugins/check_tcp.c:641
 #, fuzzy
 msgid "Hide output from TCP socket"
 msgstr "Konnte TCP socket nicht öffnen\n"
 
-#: plugins/check_tcp.c:641
+#: plugins/check_tcp.c:643
 msgid "Close connection once more than this number of bytes are received"
 msgstr ""
 
-#: plugins/check_tcp.c:643
+#: plugins/check_tcp.c:645
 msgid "Seconds to wait between sending string and polling for response"
 msgstr ""
 
-#: plugins/check_tcp.c:648
+#: plugins/check_tcp.c:650
 msgid "1st is #days for warning, 2nd is critical (if not specified - 0)."
 msgstr ""
 
-#: plugins/check_tcp.c:650
+#: plugins/check_tcp.c:652
 msgid "Use SSL for the connection."
 msgstr ""
 
@@ -5320,252 +5320,252 @@ msgstr ""
 msgid "Set CRITICAL status if more than INTEGER users are logged in"
 msgstr ""
 
-#: plugins/check_ide_smart.c:250
+#: plugins/check_ide_smart.c:256
 #, fuzzy, c-format
 msgid "CRITICAL - Couldn't open device %s: %s\n"
 msgstr "CRITICAL - Device konnte nicht geöffnet werden: %s\n"
 
-#: plugins/check_ide_smart.c:255
+#: plugins/check_ide_smart.c:261
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:317 plugins/check_ide_smart.c:344
+#: plugins/check_ide_smart.c:323 plugins/check_ide_smart.c:350
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:415
+#: plugins/check_ide_smart.c:421
 #, c-format
 msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:423
+#: plugins/check_ide_smart.c:429
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:431
+#: plugins/check_ide_smart.c:437
 #, c-format
 msgid "OK - Operational (%d/%d tests passed)\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:435
+#: plugins/check_ide_smart.c:441
 #, c-format
 msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:468
+#: plugins/check_ide_smart.c:474
 #, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:474
+#: plugins/check_ide_smart.c:480
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:480
+#: plugins/check_ide_smart.c:486
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:502 plugins/check_ide_smart.c:526
+#: plugins/check_ide_smart.c:508 plugins/check_ide_smart.c:532
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:547 plugins/check_ide_smart.c:574
+#: plugins/check_ide_smart.c:553 plugins/check_ide_smart.c:580
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:593
+#: plugins/check_ide_smart.c:599
 #, c-format
 msgid ""
 "This plugin checks a local hard drive with the (Linux specific) SMART "
 "interface [http://smartlinux.sourceforge.net/smart/index.php]."
 msgstr ""
 
-#: plugins/check_ide_smart.c:603
+#: plugins/check_ide_smart.c:609
 msgid "Select device DEVICE"
 msgstr ""
 
-#: plugins/check_ide_smart.c:604
+#: plugins/check_ide_smart.c:610
 msgid ""
 "Note: if the device is selected with this option, _no_ other options are "
 "accepted"
 msgstr ""
 
-#: plugins/check_ide_smart.c:606
+#: plugins/check_ide_smart.c:612
 msgid "Perform immediately offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:608
+#: plugins/check_ide_smart.c:614
 msgid "Returns the number of failed tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:610
+#: plugins/check_ide_smart.c:616
 msgid "Turn on automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:612
+#: plugins/check_ide_smart.c:618
 msgid "Turn off automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:614
+#: plugins/check_ide_smart.c:620
 msgid "Output suitable for Nagios"
 msgstr ""
 
-#: plugins/negate.c:96
+#: plugins/negate.c:99
 #, fuzzy
 msgid "No data returned from command\n"
 msgstr "Keine Daten empfangen %s\n"
 
-#: plugins/negate.c:167
+#: plugins/negate.c:170
 msgid ""
 "Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
 "or integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:171
+#: plugins/negate.c:174
 msgid ""
 "Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer "
 "(0-3)."
 msgstr ""
 
-#: plugins/negate.c:177
+#: plugins/negate.c:180
 msgid ""
 "Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:182
+#: plugins/negate.c:185
 msgid ""
 "Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:187
+#: plugins/negate.c:190
 msgid ""
 "Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:214
+#: plugins/negate.c:217
 msgid "Require path to command"
 msgstr ""
 
-#: plugins/negate.c:243
+#: plugins/negate.c:246
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL and vice-versa)."
 msgstr ""
 
-#: plugins/negate.c:244
+#: plugins/negate.c:247
 msgid "Additional switches can be used to control which state becomes what."
 msgstr ""
 
-#: plugins/negate.c:253
+#: plugins/negate.c:256
 msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status."
 msgstr ""
 
-#: plugins/negate.c:255
+#: plugins/negate.c:258
 msgid "Custom result on Negate timeouts; see below for STATUS definition\n"
 msgstr ""
 
-#: plugins/negate.c:261
+#: plugins/negate.c:264
 #, c-format
 msgid ""
 "    STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n"
 msgstr ""
 
-#: plugins/negate.c:262
+#: plugins/negate.c:265
 #, c-format
 msgid ""
 "    quotes. Numeric values are accepted. If nothing is specified, permutes\n"
 msgstr ""
 
-#: plugins/negate.c:263
+#: plugins/negate.c:266
 #, c-format
 msgid "    OK and CRITICAL.\n"
 msgstr ""
 
-#: plugins/negate.c:265
+#: plugins/negate.c:268
 #, c-format
 msgid ""
 "    Substitute output text as well. Will only substitute text in CAPITALS\n"
 msgstr ""
 
-#: plugins/negate.c:270
+#: plugins/negate.c:273
 msgid "Run check_ping and invert result. Must use full path to plugin"
 msgstr ""
 
-#: plugins/negate.c:272
+#: plugins/negate.c:275
 msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"
 msgstr ""
 
-#: plugins/negate.c:275
+#: plugins/negate.c:278
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert it."
 msgstr ""
 
-#: plugins/negate.c:276
+#: plugins/negate.c:279
 msgid "The full path of the plugin must be provided."
 msgstr ""
 
-#: plugins/negate.c:277
+#: plugins/negate.c:280
 msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL."
 msgstr ""
 
-#: plugins/negate.c:278
+#: plugins/negate.c:281
 msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK."
 msgstr ""
 
-#: plugins/negate.c:279
+#: plugins/negate.c:282
 msgid "Otherwise, the output state of the wrapped plugin is unchanged."
 msgstr ""
 
-#: plugins/negate.c:281
+#: plugins/negate.c:284
 msgid ""
 "Using timeout-result, it is possible to override the timeout behaviour or a"
 msgstr ""
 
-#: plugins/negate.c:282
+#: plugins/negate.c:285
 msgid "plugin by setting the negate timeout a bit lower."
 msgstr ""
 
-#: plugins/netutils.c:48
+#: plugins/netutils.c:49
 #, fuzzy, c-format
 msgid "%s - Socket timeout after %d seconds\n"
 msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
 
-#: plugins/netutils.c:50
+#: plugins/netutils.c:51
 #, fuzzy, c-format
 msgid "%s - Abnormal timeout after %d seconds\n"
 msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
 
-#: plugins/netutils.c:78 plugins/netutils.c:280
+#: plugins/netutils.c:79 plugins/netutils.c:281
 msgid "Send failed"
 msgstr ""
 
-#: plugins/netutils.c:95 plugins/netutils.c:295
+#: plugins/netutils.c:96 plugins/netutils.c:296
 #, fuzzy
 msgid "No data was received from host!"
 msgstr "Keine Daten empfangen %s\n"
 
-#: plugins/netutils.c:203 plugins/netutils.c:239
+#: plugins/netutils.c:204 plugins/netutils.c:240
 msgid "Socket creation failed"
 msgstr ""
 
-#: plugins/netutils.c:232
+#: plugins/netutils.c:233
 msgid "Supplied path too long unix domain socket"
 msgstr ""
 
-#: plugins/netutils.c:304
+#: plugins/netutils.c:305
 msgid "Receive failed"
 msgstr ""
 
-#: plugins/netutils.c:330 plugins-root/check_dhcp.c:1337
+#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1337
 #, fuzzy, c-format
 msgid "Invalid hostname/address - %s"
 msgstr ""
@@ -5652,34 +5652,34 @@ msgstr ""
 msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\""
 msgstr ""
 
-#: plugins/utils.c:171
+#: plugins/utils.c:174
 #, fuzzy, c-format
 msgid "%s - Plugin timed out after %d seconds\n"
 msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
 
-#: plugins/utils.c:466
+#: plugins/utils.c:469
 #, fuzzy
 msgid "failed realloc in strpcpy\n"
 msgstr "konnte keinen Speicher für '%s' reservieren\n"
 
-#: plugins/utils.c:508
+#: plugins/utils.c:511
 #, fuzzy
 msgid "failed malloc in strscat\n"
 msgstr "konnte keinen Speicher für '%s' reservieren\n"
 
-#: plugins/utils.c:528
+#: plugins/utils.c:531
 #, fuzzy
 msgid "failed malloc in xvasprintf\n"
 msgstr "konnte keinen Speicher für '%s' reservieren\n"
 
-#: plugins/utils.h:142
+#: plugins/utils.h:137
 #, c-format
 msgid ""
 "       %s (-h | --help) for detailed help\n"
 "       %s (-V | --version) for version information\n"
 msgstr ""
 
-#: plugins/utils.h:146
+#: plugins/utils.h:141
 msgid ""
 "\n"
 "Options:\n"
@@ -5689,7 +5689,7 @@ msgid ""
 "    Print version information\n"
 msgstr ""
 
-#: plugins/utils.h:153
+#: plugins/utils.h:148
 #, c-format
 msgid ""
 " -H, --hostname=ADDRESS\n"
@@ -5698,7 +5698,7 @@ msgid ""
 "    Port number (default: %s)\n"
 msgstr ""
 
-#: plugins/utils.h:159
+#: plugins/utils.h:154
 msgid ""
 " -4, --use-ipv4\n"
 "    Use IPv4 connection\n"
@@ -5706,13 +5706,13 @@ msgid ""
 "    Use IPv6 connection\n"
 msgstr ""
 
-#: plugins/utils.h:165
+#: plugins/utils.h:160
 msgid ""
 " -v, --verbose\n"
 "    Show details for command-line debugging (Nagios may truncate output)\n"
 msgstr ""
 
-#: plugins/utils.h:169
+#: plugins/utils.h:164
 msgid ""
 " -w, --warning=DOUBLE\n"
 "    Response time to result in warning status (seconds)\n"
@@ -5720,7 +5720,7 @@ msgid ""
 "    Response time to result in critical status (seconds)\n"
 msgstr ""
 
-#: plugins/utils.h:175
+#: plugins/utils.h:170
 msgid ""
 " -w, --warning=RANGE\n"
 "    Warning range (format: start:end). Alert if outside this range\n"
@@ -5728,21 +5728,21 @@ msgid ""
 "    Critical range\n"
 msgstr ""
 
-#: plugins/utils.h:181
+#: plugins/utils.h:176
 #, c-format
 msgid ""
 " -t, --timeout=INTEGER\n"
 "    Seconds before connection times out (default: %d)\n"
 msgstr ""
 
-#: plugins/utils.h:186
+#: plugins/utils.h:181
 msgid ""
 " --extra-opts=[section][@file]\n"
 "    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
 "    for usage and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:194
+#: plugins/utils.h:189
 msgid ""
 " See:\n"
 " http://nagiosplug.sourceforge.net/developer-guidelines."
@@ -5750,7 +5750,7 @@ msgid ""
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:199
+#: plugins/utils.h:194
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -5759,7 +5759,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/utils.h:204
+#: plugins/utils.h:199
 msgid ""
 "\n"
 "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index 04b9e1405a0d6802e05d18cc3db1dacb9fa5f889..9ebdff58d0bdfc8f165f35d7cdd748ea1c044da0 100644
GIT binary patch
delta 20
ccmccoiuLj<)(zLrvKkp%85(cCeYRpb0C0#3S^xk5

delta 20
ccmccoiuLj<)(zLrvKks&nOJPTeYRpb0C2GiVE_OC

diff --git a/po/fr.po b/po/fr.po
index 81fda9e..b5ecf53 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-10 13:48+0200\n"
+"POT-Creation-Date: 2013-09-10 23:13+0200\n"
 "PO-Revision-Date: 2010-04-21 23:38-0400\n"
 "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
 "Language-Team: Nagios Plugin Development Mailing List <nagiosplug-"
@@ -33,14 +33,14 @@ msgstr ""
 #: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:171
 #: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144
 #: plugins/check_snmp.c:239 plugins/check_ssh.c:73 plugins/check_swap.c:110
-#: plugins/check_tcp.c:210 plugins/check_time.c:78 plugins/check_ups.c:122
-#: plugins/check_users.c:77 plugins/negate.c:211 plugins-root/check_dhcp.c:270
+#: plugins/check_tcp.c:212 plugins/check_time.c:78 plugins/check_ups.c:122
+#: plugins/check_users.c:77 plugins/negate.c:214 plugins-root/check_dhcp.c:270
 msgid "Could not parse arguments"
 msgstr "Impossible de décomposer les arguments"
 
 #: plugins/check_by_ssh.c:90 plugins/check_dig.c:82 plugins/check_dns.c:95
 #: plugins/check_nagios.c:95 plugins/check_pgsql.c:178 plugins/check_ping.c:99
-#: plugins/check_procs.c:186 plugins/negate.c:76
+#: plugins/check_procs.c:186 plugins/negate.c:79
 msgid "Cannot catch SIGALRM"
 msgstr "Impossible d'obtenir le signal SIGALRM"
 
@@ -68,14 +68,14 @@ msgstr "%s: Erreur d'analyse du résultat\n"
 #: plugins/check_http.c:278 plugins/check_ldap.c:293 plugins/check_pgsql.c:311
 #: plugins/check_procs.c:429 plugins/check_radius.c:308
 #: plugins/check_real.c:356 plugins/check_smtp.c:581 plugins/check_snmp.c:726
-#: plugins/check_ssh.c:138 plugins/check_tcp.c:487 plugins/check_time.c:302
-#: plugins/check_ups.c:556 plugins/negate.c:161
+#: plugins/check_ssh.c:138 plugins/check_tcp.c:489 plugins/check_time.c:302
+#: plugins/check_ups.c:556 plugins/negate.c:164
 msgid "Timeout interval must be a positive integer"
 msgstr "Le délai d'attente doit être un entier positif"
 
 #: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:341
 #: plugins/check_radius.c:272 plugins/check_real.c:327
-#: plugins/check_smtp.c:506 plugins/check_tcp.c:493 plugins/check_time.c:296
+#: plugins/check_smtp.c:506 plugins/check_tcp.c:495 plugins/check_time.c:296
 #: plugins/check_ups.c:518
 msgid "Port must be a positive integer"
 msgstr "Le numéro du port doit être un entier positif"
@@ -231,7 +231,7 @@ msgstr ""
 #: plugins/check_dig.c:355 plugins/check_disk.c:924 plugins/check_http.c:1560
 #: plugins/check_nagios.c:312 plugins/check_ntp.c:869
 #: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:633
-#: plugins/check_procs.c:755 plugins/negate.c:268 plugins/urlize.c:180
+#: plugins/check_procs.c:755 plugins/negate.c:271 plugins/urlize.c:180
 msgid "Examples:"
 msgstr "Exemples:"
 
@@ -247,9 +247,9 @@ msgstr "Exemples:"
 #: plugins/check_ping.c:603 plugins/check_procs.c:773
 #: plugins/check_radius.c:385 plugins/check_real.c:451
 #: plugins/check_smtp.c:843 plugins/check_snmp.c:1197 plugins/check_ssh.c:309
-#: plugins/check_swap.c:558 plugins/check_tcp.c:666 plugins/check_time.c:371
+#: plugins/check_swap.c:558 plugins/check_tcp.c:668 plugins/check_time.c:371
 #: plugins/check_ups.c:660 plugins/check_users.c:240
-#: plugins/check_ide_smart.c:634 plugins/negate.c:292 plugins/urlize.c:197
+#: plugins/check_ide_smart.c:640 plugins/negate.c:295 plugins/urlize.c:197
 #: plugins-root/check_dhcp.c:1417 plugins-root/check_icmp.c:1354
 msgid "Usage:"
 msgstr "Utilisation:"
@@ -301,7 +301,7 @@ msgstr "virgules"
 #: plugins/check_nt.c:758 plugins/check_ntp.c:865 plugins/check_ntp_peer.c:696
 #: plugins/check_ntp_time.c:626 plugins/check_nwstat.c:1670
 #: plugins/check_overcr.c:456 plugins/check_snmp.c:1168
-#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
+#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:277
 #: plugins-root/check_icmp.c:1329
 msgid "Notes:"
 msgstr "Notes:"
@@ -1188,8 +1188,8 @@ msgid "file does not exist or is not readable"
 msgstr ""
 
 #: plugins/check_http.c:310 plugins/check_http.c:315 plugins/check_http.c:321
-#: plugins/check_smtp.c:600 plugins/check_tcp.c:558 plugins/check_tcp.c:562
-#: plugins/check_tcp.c:568
+#: plugins/check_smtp.c:600 plugins/check_tcp.c:560 plugins/check_tcp.c:564
+#: plugins/check_tcp.c:570
 msgid "Invalid certificate expiration period"
 msgstr "Période d'expiration du certificat invalide"
 
@@ -1199,7 +1199,7 @@ msgid ""
 "(SSLv3)"
 msgstr ""
 
-#: plugins/check_http.c:354 plugins/check_tcp.c:581
+#: plugins/check_http.c:354 plugins/check_tcp.c:583
 msgid "Invalid option - SSL is not available"
 msgstr "Option invalide - SSL n'est pas disponible"
 
@@ -1223,7 +1223,7 @@ msgstr "Impossible de compiler l'expression rationnelle: %s"
 
 #: plugins/check_http.c:464 plugins/check_ntp.c:722
 #: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:512
-#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:459
+#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:461
 msgid "IPv6 support not available"
 msgstr "Support IPv6 non disponible"
 
@@ -4320,7 +4320,7 @@ msgstr "Réponses REAL invalide reçue de l'hôte"
 msgid "Invalid REAL response received from host on port %d\n"
 msgstr "Réponses REAL invalide reçue de l'hôte sur le port %d\n"
 
-#: plugins/check_real.c:184 plugins/check_tcp.c:287
+#: plugins/check_real.c:184 plugins/check_tcp.c:289
 #, c-format
 msgid "No data received from host\n"
 msgstr "Pas de données reçues de l'hôte\n"
@@ -4560,7 +4560,7 @@ msgstr ""
 msgid "FQDN used for HELO"
 msgstr ""
 
-#: plugins/check_smtp.c:809 plugins/check_tcp.c:647
+#: plugins/check_smtp.c:809 plugins/check_tcp.c:649
 msgid "Minimum number of days a certificate has to be valid."
 msgstr "Nombre de jours minimum pour que le certificat soit valide."
 
@@ -5025,46 +5025,46 @@ msgstr ""
 "Sur AIX, si -a est spécifié, le plugin utilise lsps -a, sinon il utilise "
 "lsps -s."
 
-#: plugins/check_tcp.c:198
+#: plugins/check_tcp.c:200
 msgid "CRITICAL - Generic check_tcp called with unknown service\n"
 msgstr ""
 "CRITIQUE -check_tcp version générique utilisé avec un service inconnu\n"
 
-#: plugins/check_tcp.c:222
+#: plugins/check_tcp.c:224
 msgid "With UDP checks, a send/expect string must be specified."
 msgstr ""
 "Avec la surveillance UDP, une chaîne d'envoi et un chaîne de réponse doit "
 "être spécifiée."
 
-#: plugins/check_tcp.c:414
+#: plugins/check_tcp.c:416
 msgid "No arguments found"
 msgstr "Pas de paramètres"
 
-#: plugins/check_tcp.c:516
+#: plugins/check_tcp.c:518
 msgid "Maxbytes must be a positive integer"
 msgstr "Maxbytes doit être un entier positif"
 
-#: plugins/check_tcp.c:534
+#: plugins/check_tcp.c:536
 msgid "Refuse must be one of ok, warn, crit"
 msgstr "Refuse doit être parmis ok, warn, crit"
 
-#: plugins/check_tcp.c:544
+#: plugins/check_tcp.c:546
 msgid "Mismatch must be one of ok, warn, crit"
 msgstr "Mismatch doit être parmis ok, warn, crit"
 
-#: plugins/check_tcp.c:550
+#: plugins/check_tcp.c:552
 msgid "Delay must be a positive integer"
 msgstr "Delay doit être un entier positif"
 
-#: plugins/check_tcp.c:595
+#: plugins/check_tcp.c:597
 msgid "You must provide a server address"
 msgstr "Vous devez fournir une adresse serveur"
 
-#: plugins/check_tcp.c:597
+#: plugins/check_tcp.c:599
 msgid "Invalid hostname, address or socket"
 msgstr "Adresse/Nom/Socket invalide"
 
-#: plugins/check_tcp.c:611
+#: plugins/check_tcp.c:613
 #, c-format
 msgid ""
 "This plugin tests %s connections with the specified host (or unix socket).\n"
@@ -5073,7 +5073,7 @@ msgstr ""
 "Ce plugin teste %s connections avec l'hôte spécifié (ou socket unix).\n"
 "\n"
 
-#: plugins/check_tcp.c:624
+#: plugins/check_tcp.c:626
 msgid ""
 "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or "
 "quit option"
@@ -5081,59 +5081,59 @@ msgstr ""
 "Permet d'utiliser \\n, \\r, \\t ou \\ dans la chaîne de caractères send ou "
 "quit. Doit être placé avant ces dernières."
 
-#: plugins/check_tcp.c:625
+#: plugins/check_tcp.c:627
 msgid "Default: nothing added to send, \\r\\n added to end of quit"
 msgstr ""
 "Par défaut: Rien n'est ajouté à send, \\r\\n est ajouté à la fin de quit"
 
-#: plugins/check_tcp.c:627
+#: plugins/check_tcp.c:629
 msgid "String to send to the server"
 msgstr "Chaîne de caractères à envoyer au serveur"
 
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:631
 msgid "String to expect in server response"
 msgstr "Chaîne de caractères à attendre en réponse"
 
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:631
 msgid "(may be repeated)"
 msgstr "(peut être utilisé plusieurs fois)"
 
-#: plugins/check_tcp.c:631
+#: plugins/check_tcp.c:633
 msgid "All expect strings need to occur in server response. Default is any"
 msgstr ""
 "Toutes les chaînes attendus (expect) doivent être repérés dans la réponse. "
 "Par défaut, n'importe laquelle suffit."
 
-#: plugins/check_tcp.c:633
+#: plugins/check_tcp.c:635
 msgid "String to send server to initiate a clean close of the connection"
 msgstr "Chaîne de caractères à envoyer pour fermer gracieusement la connection"
 
-#: plugins/check_tcp.c:635
+#: plugins/check_tcp.c:637
 msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
 msgstr ""
 
-#: plugins/check_tcp.c:637
+#: plugins/check_tcp.c:639
 msgid ""
 "Accept expected string mismatches with states ok, warn, crit (default: warn)"
 msgstr ""
 
-#: plugins/check_tcp.c:639
+#: plugins/check_tcp.c:641
 msgid "Hide output from TCP socket"
 msgstr "Cacher la réponse provenant du socket TCP"
 
-#: plugins/check_tcp.c:641
+#: plugins/check_tcp.c:643
 msgid "Close connection once more than this number of bytes are received"
 msgstr ""
 
-#: plugins/check_tcp.c:643
+#: plugins/check_tcp.c:645
 msgid "Seconds to wait between sending string and polling for response"
 msgstr ""
 
-#: plugins/check_tcp.c:648
+#: plugins/check_tcp.c:650
 msgid "1st is #days for warning, 2nd is critical (if not specified - 0)."
 msgstr ""
 
-#: plugins/check_tcp.c:650
+#: plugins/check_tcp.c:652
 msgid "Use SSL for the connection."
 msgstr ""
 
@@ -5402,71 +5402,71 @@ msgstr ""
 "Sortir avec un résultat CRITIQUE si plus de INTEGER utilisateurs sont "
 "connectés"
 
-#: plugins/check_ide_smart.c:250
+#: plugins/check_ide_smart.c:256
 #, c-format
 msgid "CRITICAL - Couldn't open device %s: %s\n"
 msgstr "Critique - Impossible d'ouvrir le périphérique %s: %s\n"
 
-#: plugins/check_ide_smart.c:255
+#: plugins/check_ide_smart.c:261
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr "CRITIQUE - SMART_CMD_ENABLE\n"
 
-#: plugins/check_ide_smart.c:317 plugins/check_ide_smart.c:344
+#: plugins/check_ide_smart.c:323 plugins/check_ide_smart.c:350
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr "CRITIQUE - SMART_READ_VALUES: %s\n"
 
-#: plugins/check_ide_smart.c:415
+#: plugins/check_ide_smart.c:421
 #, 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:423
+#: plugins/check_ide_smart.c:429
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 "AVERTISSEMENT -  %d État de pré-panne %s Détecté! %d/%d les tests on "
 "échoués.\n"
 
-#: plugins/check_ide_smart.c:431
+#: plugins/check_ide_smart.c:437
 #, 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:435
+#: plugins/check_ide_smart.c:441
 #, c-format
 msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n"
 msgstr "ERREUR - État '%d' inconnu. %d/%d les tests on réussi\n"
 
-#: plugins/check_ide_smart.c:468
+#: plugins/check_ide_smart.c:474
 #, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 "Etat Hors Ligne=%d {%s}, Hors Ligne Auto=%s, Temps avant arrêt=%d minutes\n"
 
-#: plugins/check_ide_smart.c:474
+#: plugins/check_ide_smart.c:480
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr "Capacité Hors Ligne=%d {%s %s %s}\n"
 
-#: plugins/check_ide_smart.c:480
+#: plugins/check_ide_smart.c:486
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr "Révision Smart=%d, Somme de contrôle=%d, Capacité Smart=%d {%s %s}\n"
 
-#: plugins/check_ide_smart.c:502 plugins/check_ide_smart.c:526
+#: plugins/check_ide_smart.c:508 plugins/check_ide_smart.c:532
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr "CRITIQUE - %s: %s\n"
 
-#: plugins/check_ide_smart.c:547 plugins/check_ide_smart.c:574
+#: plugins/check_ide_smart.c:553 plugins/check_ide_smart.c:580
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr "CRITIQUE - SMART_READ_THRESHOLDS: %s\n"
 
-#: plugins/check_ide_smart.c:593
+#: plugins/check_ide_smart.c:599
 #, c-format
 msgid ""
 "This plugin checks a local hard drive with the (Linux specific) SMART "
@@ -5475,41 +5475,41 @@ msgstr ""
 "Ce plugin vérifie un disque dur local à l'aide de l'interface SMART (pour "
 "Linux) [http://smartlinux.sourceforge.net/smart/index.php]."
 
-#: plugins/check_ide_smart.c:603
+#: plugins/check_ide_smart.c:609
 msgid "Select device DEVICE"
 msgstr ""
 
-#: plugins/check_ide_smart.c:604
+#: plugins/check_ide_smart.c:610
 msgid ""
 "Note: if the device is selected with this option, _no_ other options are "
 "accepted"
 msgstr ""
 
-#: plugins/check_ide_smart.c:606
+#: plugins/check_ide_smart.c:612
 msgid "Perform immediately offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:608
+#: plugins/check_ide_smart.c:614
 msgid "Returns the number of failed tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:610
+#: plugins/check_ide_smart.c:616
 msgid "Turn on automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:612
+#: plugins/check_ide_smart.c:618
 msgid "Turn off automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:614
+#: plugins/check_ide_smart.c:620
 msgid "Output suitable for Nagios"
 msgstr ""
 
-#: plugins/negate.c:96
+#: plugins/negate.c:99
 msgid "No data returned from command\n"
 msgstr "Pas de données reçues de la commande\n"
 
-#: plugins/negate.c:167
+#: plugins/negate.c:170
 msgid ""
 "Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
 "or integer (0-3)."
@@ -5517,7 +5517,7 @@ msgstr ""
 "Le résultat de temps dépassé doit être un nom d'état valide (OK, WARNING, "
 "CRITICAL, UNKNOWN) ou un nombre entier (0-3)."
 
-#: plugins/negate.c:171
+#: plugins/negate.c:174
 msgid ""
 "Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer "
 "(0-3)."
@@ -5525,7 +5525,7 @@ msgstr ""
 "Ok doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou un "
 "nombre entier (0-3)."
 
-#: plugins/negate.c:177
+#: plugins/negate.c:180
 msgid ""
 "Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
@@ -5533,7 +5533,7 @@ msgstr ""
 "Warning doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou "
 "un nombre entier (0-3)."
 
-#: plugins/negate.c:182
+#: plugins/negate.c:185
 msgid ""
 "Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
@@ -5541,7 +5541,7 @@ msgstr ""
 "Critical doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou "
 "un nombre entier (0-3)."
 
-#: plugins/negate.c:187
+#: plugins/negate.c:190
 msgid ""
 "Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
@@ -5549,33 +5549,33 @@ msgstr ""
 "Unknown doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou "
 "un nombre entier (0-3)."
 
-#: plugins/negate.c:214
+#: plugins/negate.c:217
 msgid "Require path to command"
 msgstr "Chemin vers la commande requis"
 
-#: plugins/negate.c:243
+#: plugins/negate.c:246
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL and vice-versa)."
 msgstr ""
 "Inverse le statut d'un plugin (retourne OK pour CRITIQUE et vice-versa)."
 
-#: plugins/negate.c:244
+#: plugins/negate.c:247
 msgid "Additional switches can be used to control which state becomes what."
 msgstr ""
 "Des options additionnelles peuvent être utilisées pour contrôler quel état "
 "devient quoi."
 
-#: plugins/negate.c:253
+#: plugins/negate.c:256
 msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status."
 msgstr ""
 "Utilisez un délai de réponse plus long que celui du plugin afin de conserver "
 "les résultats CRITIQUE"
 
-#: plugins/negate.c:255
+#: plugins/negate.c:258
 msgid "Custom result on Negate timeouts; see below for STATUS definition\n"
 msgstr ""
 
-#: plugins/negate.c:261
+#: plugins/negate.c:264
 #, c-format
 msgid ""
 "    STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n"
@@ -5583,97 +5583,97 @@ msgstr ""
 "    STATUS peut être 'OK', 'WARNING', 'CRITICAL' ou 'UNKNOWN' sans les "
 "simple\n"
 
-#: plugins/negate.c:262
+#: plugins/negate.c:265
 #, c-format
 msgid ""
 "    quotes. Numeric values are accepted. If nothing is specified, permutes\n"
 msgstr "    quotes. Les valeurs numériques sont acceptées. Si rien n'est\n"
 
-#: plugins/negate.c:263
+#: plugins/negate.c:266
 #, c-format
 msgid "    OK and CRITICAL.\n"
 msgstr "    spécifié, inverse OK et CRITIQUE.\n"
 
-#: plugins/negate.c:265
+#: plugins/negate.c:268
 #, c-format
 msgid ""
 "    Substitute output text as well. Will only substitute text in CAPITALS\n"
 msgstr ""
 
-#: plugins/negate.c:270
+#: plugins/negate.c:273
 msgid "Run check_ping and invert result. Must use full path to plugin"
 msgstr ""
 "Execute check_ping et inverse le résultat. Le chemin complet du plug-in doit "
 "être spécifié"
 
-#: plugins/negate.c:272
+#: plugins/negate.c:275
 msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"
 msgstr ""
 "Ceci retournera OK au lieu de AVERTISSEMENT et INCONNU au lieu de CRITIQUE"
 
-#: plugins/negate.c:275
+#: plugins/negate.c:278
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert it."
 msgstr ""
 "Ce plugin est un adaptateur qui prends l'état d'un autre plug-in et "
 "l'inverse."
 
-#: plugins/negate.c:276
+#: plugins/negate.c:279
 msgid "The full path of the plugin must be provided."
 msgstr "Le chemin complet du plugin doit être spécifié."
 
-#: plugins/negate.c:277
+#: plugins/negate.c:280
 msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL."
 msgstr "Si le plugin executé retourne OK, l'adaptateur retournera CRITIQUE."
 
-#: plugins/negate.c:278
+#: plugins/negate.c:281
 msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK."
 msgstr "Si le plugin executé retourne CRITIQUE, l'adaptateur retournera OK."
 
-#: plugins/negate.c:279
+#: plugins/negate.c:282
 msgid "Otherwise, the output state of the wrapped plugin is unchanged."
 msgstr "Autrement, l'état du plugin executé reste inchangé."
 
-#: plugins/negate.c:281
+#: plugins/negate.c:284
 msgid ""
 "Using timeout-result, it is possible to override the timeout behaviour or a"
 msgstr ""
 
-#: plugins/negate.c:282
+#: plugins/negate.c:285
 msgid "plugin by setting the negate timeout a bit lower."
 msgstr ""
 
-#: plugins/netutils.c:48
+#: plugins/netutils.c:49
 #, c-format
 msgid "%s - Socket timeout after %d seconds\n"
 msgstr "%s - Le socket n'a pas répondu dans les %d secondes\n"
 
-#: plugins/netutils.c:50
+#: plugins/netutils.c:51
 #, c-format
 msgid "%s - Abnormal timeout after %d seconds\n"
 msgstr "%s - Dépassement anormal du temps de réponse après %d secondes\n"
 
-#: plugins/netutils.c:78 plugins/netutils.c:280
+#: plugins/netutils.c:79 plugins/netutils.c:281
 msgid "Send failed"
 msgstr "L'envoi à échoué"
 
-#: plugins/netutils.c:95 plugins/netutils.c:295
+#: plugins/netutils.c:96 plugins/netutils.c:296
 msgid "No data was received from host!"
 msgstr "Pas de données reçues de l'hôte!"
 
-#: plugins/netutils.c:203 plugins/netutils.c:239
+#: plugins/netutils.c:204 plugins/netutils.c:240
 msgid "Socket creation failed"
 msgstr "La création du socket à échoué "
 
-#: plugins/netutils.c:232
+#: plugins/netutils.c:233
 msgid "Supplied path too long unix domain socket"
 msgstr "Le chemin fourni est trop long pour un socket unix"
 
-#: plugins/netutils.c:304
+#: plugins/netutils.c:305
 msgid "Receive failed"
 msgstr "La réception à échoué"
 
-#: plugins/netutils.c:330 plugins-root/check_dhcp.c:1337
+#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1337
 #, c-format
 msgid "Invalid hostname/address - %s"
 msgstr "Adresse/Nom invalide - %s"
@@ -5759,25 +5759,25 @@ msgstr ""
 msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\""
 msgstr ""
 
-#: plugins/utils.c:171
+#: plugins/utils.c:174
 #, c-format
 msgid "%s - Plugin timed out after %d seconds\n"
 msgstr "%s - Le plugin n'as pas répondu dans les %d secondes\n"
 
-#: plugins/utils.c:466
+#: plugins/utils.c:469
 msgid "failed realloc in strpcpy\n"
 msgstr "La fonction realloc à échoué dans strpcpy\n"
 
-#: plugins/utils.c:508
+#: plugins/utils.c:511
 msgid "failed malloc in strscat\n"
 msgstr "La fonction malloc à échoué dans strscat\n"
 
-#: plugins/utils.c:528
+#: plugins/utils.c:531
 #, fuzzy
 msgid "failed malloc in xvasprintf\n"
 msgstr "La fonction malloc à échoué dans strscat\n"
 
-#: plugins/utils.h:142
+#: plugins/utils.h:137
 #, c-format
 msgid ""
 "       %s (-h | --help) for detailed help\n"
@@ -5786,7 +5786,7 @@ msgstr ""
 "       %s (-h | --help) pour l'aide détaillée\n"
 "       %s (-V | --version) pour les informations relative à la version\n"
 
-#: plugins/utils.h:146
+#: plugins/utils.h:141
 msgid ""
 "\n"
 "Options:\n"
@@ -5802,7 +5802,7 @@ msgstr ""
 " -V, --version\n"
 "    Afficher les informations relative à la version\n"
 
-#: plugins/utils.h:153
+#: plugins/utils.h:148
 #, c-format
 msgid ""
 " -H, --hostname=ADDRESS\n"
@@ -5815,7 +5815,7 @@ msgstr ""
 " -%c, --port=INTEGER\n"
 "    Numéro de port (défaut: %s)\n"
 
-#: plugins/utils.h:159
+#: plugins/utils.h:154
 msgid ""
 " -4, --use-ipv4\n"
 "    Use IPv4 connection\n"
@@ -5827,7 +5827,7 @@ msgstr ""
 " -6, --use-ipv6\n"
 "    Utiliser une connection IPv6\n"
 
-#: plugins/utils.h:165
+#: plugins/utils.h:160
 msgid ""
 " -v, --verbose\n"
 "    Show details for command-line debugging (Nagios may truncate output)\n"
@@ -5836,7 +5836,7 @@ msgstr ""
 "    Affiche les informations de déboguage en ligne de commande (Nagios peut "
 "tronquer la sortie)\n"
 
-#: plugins/utils.h:169
+#: plugins/utils.h:164
 msgid ""
 " -w, --warning=DOUBLE\n"
 "    Response time to result in warning status (seconds)\n"
@@ -5848,7 +5848,7 @@ msgstr ""
 " -c, --critical=DOUBLE\n"
 "    Temps de réponse résultant en un état critique (secondes)\n"
 
-#: plugins/utils.h:175
+#: plugins/utils.h:170
 msgid ""
 " -w, --warning=RANGE\n"
 "    Warning range (format: start:end). Alert if outside this range\n"
@@ -5861,7 +5861,7 @@ msgstr ""
 " -c, --critical=RANGE\n"
 "    Seuil critique\n"
 
-#: plugins/utils.h:181
+#: plugins/utils.h:176
 #, c-format
 msgid ""
 " -t, --timeout=INTEGER\n"
@@ -5870,7 +5870,7 @@ msgstr ""
 " -t, --timeout=INTEGER\n"
 "    Délais de connection en secondes (défaut: %d)\n"
 
-#: plugins/utils.h:186
+#: plugins/utils.h:181
 msgid ""
 " --extra-opts=[section][@file]\n"
 "    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
@@ -5881,7 +5881,7 @@ msgstr ""
 "opts\n"
 "    pour les instructions et examples.\n"
 
-#: plugins/utils.h:194
+#: plugins/utils.h:189
 msgid ""
 " See:\n"
 " http://nagiosplug.sourceforge.net/developer-guidelines."
@@ -5893,7 +5893,7 @@ msgstr ""
 "html#THRESHOLDFORMAT\n"
 " pour le format et examples des seuils (THRESHOLD).\n"
 
-#: plugins/utils.h:199
+#: plugins/utils.h:194
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -5909,7 +5909,7 @@ msgstr ""
 "améliorations, envoyez un email à nagiosplug-devel@lists.sourceforge.net\n"
 "\n"
 
-#: plugins/utils.h:204
+#: plugins/utils.h:199
 msgid ""
 "\n"
 "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
diff --git a/po/nagios-plugins.pot b/po/nagios-plugins.pot
index ca4416c..a296ed8 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: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-09-10 13:48+0200\n"
+"POT-Creation-Date: 2013-09-10 23:13+0200\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"
@@ -29,14 +29,14 @@ msgstr ""
 #: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:171
 #: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144
 #: plugins/check_snmp.c:239 plugins/check_ssh.c:73 plugins/check_swap.c:110
-#: plugins/check_tcp.c:210 plugins/check_time.c:78 plugins/check_ups.c:122
-#: plugins/check_users.c:77 plugins/negate.c:211 plugins-root/check_dhcp.c:270
+#: plugins/check_tcp.c:212 plugins/check_time.c:78 plugins/check_ups.c:122
+#: plugins/check_users.c:77 plugins/negate.c:214 plugins-root/check_dhcp.c:270
 msgid "Could not parse arguments"
 msgstr ""
 
 #: plugins/check_by_ssh.c:90 plugins/check_dig.c:82 plugins/check_dns.c:95
 #: plugins/check_nagios.c:95 plugins/check_pgsql.c:178 plugins/check_ping.c:99
-#: plugins/check_procs.c:186 plugins/negate.c:76
+#: plugins/check_procs.c:186 plugins/negate.c:79
 msgid "Cannot catch SIGALRM"
 msgstr ""
 
@@ -64,14 +64,14 @@ msgstr ""
 #: plugins/check_http.c:278 plugins/check_ldap.c:293 plugins/check_pgsql.c:311
 #: plugins/check_procs.c:429 plugins/check_radius.c:308
 #: plugins/check_real.c:356 plugins/check_smtp.c:581 plugins/check_snmp.c:726
-#: plugins/check_ssh.c:138 plugins/check_tcp.c:487 plugins/check_time.c:302
-#: plugins/check_ups.c:556 plugins/negate.c:161
+#: plugins/check_ssh.c:138 plugins/check_tcp.c:489 plugins/check_time.c:302
+#: plugins/check_ups.c:556 plugins/negate.c:164
 msgid "Timeout interval must be a positive integer"
 msgstr ""
 
 #: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:341
 #: plugins/check_radius.c:272 plugins/check_real.c:327
-#: plugins/check_smtp.c:506 plugins/check_tcp.c:493 plugins/check_time.c:296
+#: plugins/check_smtp.c:506 plugins/check_tcp.c:495 plugins/check_time.c:296
 #: plugins/check_ups.c:518
 msgid "Port must be a positive integer"
 msgstr ""
@@ -219,7 +219,7 @@ msgstr ""
 #: plugins/check_dig.c:355 plugins/check_disk.c:924 plugins/check_http.c:1560
 #: plugins/check_nagios.c:312 plugins/check_ntp.c:869
 #: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:633
-#: plugins/check_procs.c:755 plugins/negate.c:268 plugins/urlize.c:180
+#: plugins/check_procs.c:755 plugins/negate.c:271 plugins/urlize.c:180
 msgid "Examples:"
 msgstr ""
 
@@ -235,9 +235,9 @@ msgstr ""
 #: plugins/check_ping.c:603 plugins/check_procs.c:773
 #: plugins/check_radius.c:385 plugins/check_real.c:451
 #: plugins/check_smtp.c:843 plugins/check_snmp.c:1197 plugins/check_ssh.c:309
-#: plugins/check_swap.c:558 plugins/check_tcp.c:666 plugins/check_time.c:371
+#: plugins/check_swap.c:558 plugins/check_tcp.c:668 plugins/check_time.c:371
 #: plugins/check_ups.c:660 plugins/check_users.c:240
-#: plugins/check_ide_smart.c:634 plugins/negate.c:292 plugins/urlize.c:197
+#: plugins/check_ide_smart.c:640 plugins/negate.c:295 plugins/urlize.c:197
 #: plugins-root/check_dhcp.c:1417 plugins-root/check_icmp.c:1354
 msgid "Usage:"
 msgstr ""
@@ -289,7 +289,7 @@ msgstr ""
 #: plugins/check_nt.c:758 plugins/check_ntp.c:865 plugins/check_ntp_peer.c:696
 #: plugins/check_ntp_time.c:626 plugins/check_nwstat.c:1670
 #: plugins/check_overcr.c:456 plugins/check_snmp.c:1168
-#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
+#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:277
 #: plugins-root/check_icmp.c:1329
 msgid "Notes:"
 msgstr ""
@@ -1114,8 +1114,8 @@ msgid "file does not exist or is not readable"
 msgstr ""
 
 #: plugins/check_http.c:310 plugins/check_http.c:315 plugins/check_http.c:321
-#: plugins/check_smtp.c:600 plugins/check_tcp.c:558 plugins/check_tcp.c:562
-#: plugins/check_tcp.c:568
+#: plugins/check_smtp.c:600 plugins/check_tcp.c:560 plugins/check_tcp.c:564
+#: plugins/check_tcp.c:570
 msgid "Invalid certificate expiration period"
 msgstr ""
 
@@ -1125,7 +1125,7 @@ msgid ""
 "(SSLv3)"
 msgstr ""
 
-#: plugins/check_http.c:354 plugins/check_tcp.c:581
+#: plugins/check_http.c:354 plugins/check_tcp.c:583
 msgid "Invalid option - SSL is not available"
 msgstr ""
 
@@ -1149,7 +1149,7 @@ msgstr ""
 
 #: plugins/check_http.c:464 plugins/check_ntp.c:722
 #: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:512
-#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:459
+#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:461
 msgid "IPv6 support not available"
 msgstr ""
 
@@ -4145,7 +4145,7 @@ msgstr ""
 msgid "Invalid REAL response received from host on port %d\n"
 msgstr ""
 
-#: plugins/check_real.c:184 plugins/check_tcp.c:287
+#: plugins/check_real.c:184 plugins/check_tcp.c:289
 #, c-format
 msgid "No data received from host\n"
 msgstr ""
@@ -4380,7 +4380,7 @@ msgstr ""
 msgid "FQDN used for HELO"
 msgstr ""
 
-#: plugins/check_smtp.c:809 plugins/check_tcp.c:647
+#: plugins/check_smtp.c:809 plugins/check_tcp.c:649
 msgid "Minimum number of days a certificate has to be valid."
 msgstr ""
 
@@ -4820,105 +4820,105 @@ msgstr ""
 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."
 msgstr ""
 
-#: plugins/check_tcp.c:198
+#: plugins/check_tcp.c:200
 msgid "CRITICAL - Generic check_tcp called with unknown service\n"
 msgstr ""
 
-#: plugins/check_tcp.c:222
+#: plugins/check_tcp.c:224
 msgid "With UDP checks, a send/expect string must be specified."
 msgstr ""
 
-#: plugins/check_tcp.c:414
+#: plugins/check_tcp.c:416
 msgid "No arguments found"
 msgstr ""
 
-#: plugins/check_tcp.c:516
+#: plugins/check_tcp.c:518
 msgid "Maxbytes must be a positive integer"
 msgstr ""
 
-#: plugins/check_tcp.c:534
+#: plugins/check_tcp.c:536
 msgid "Refuse must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:544
+#: plugins/check_tcp.c:546
 msgid "Mismatch must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:550
+#: plugins/check_tcp.c:552
 msgid "Delay must be a positive integer"
 msgstr ""
 
-#: plugins/check_tcp.c:595
+#: plugins/check_tcp.c:597
 msgid "You must provide a server address"
 msgstr ""
 
-#: plugins/check_tcp.c:597
+#: plugins/check_tcp.c:599
 msgid "Invalid hostname, address or socket"
 msgstr ""
 
-#: plugins/check_tcp.c:611
+#: plugins/check_tcp.c:613
 #, c-format
 msgid ""
 "This plugin tests %s connections with the specified host (or unix socket).\n"
 "\n"
 msgstr ""
 
-#: plugins/check_tcp.c:624
+#: plugins/check_tcp.c:626
 msgid ""
 "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or "
 "quit option"
 msgstr ""
 
-#: plugins/check_tcp.c:625
+#: plugins/check_tcp.c:627
 msgid "Default: nothing added to send, \\r\\n added to end of quit"
 msgstr ""
 
-#: plugins/check_tcp.c:627
+#: plugins/check_tcp.c:629
 msgid "String to send to the server"
 msgstr ""
 
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:631
 msgid "String to expect in server response"
 msgstr ""
 
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:631
 msgid "(may be repeated)"
 msgstr ""
 
-#: plugins/check_tcp.c:631
+#: plugins/check_tcp.c:633
 msgid "All expect strings need to occur in server response. Default is any"
 msgstr ""
 
-#: plugins/check_tcp.c:633
+#: plugins/check_tcp.c:635
 msgid "String to send server to initiate a clean close of the connection"
 msgstr ""
 
-#: plugins/check_tcp.c:635
+#: plugins/check_tcp.c:637
 msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
 msgstr ""
 
-#: plugins/check_tcp.c:637
+#: plugins/check_tcp.c:639
 msgid ""
 "Accept expected string mismatches with states ok, warn, crit (default: warn)"
 msgstr ""
 
-#: plugins/check_tcp.c:639
+#: plugins/check_tcp.c:641
 msgid "Hide output from TCP socket"
 msgstr ""
 
-#: plugins/check_tcp.c:641
+#: plugins/check_tcp.c:643
 msgid "Close connection once more than this number of bytes are received"
 msgstr ""
 
-#: plugins/check_tcp.c:643
+#: plugins/check_tcp.c:645
 msgid "Seconds to wait between sending string and polling for response"
 msgstr ""
 
-#: plugins/check_tcp.c:648
+#: plugins/check_tcp.c:650
 msgid "1st is #days for warning, 2nd is critical (if not specified - 0)."
 msgstr ""
 
-#: plugins/check_tcp.c:650
+#: plugins/check_tcp.c:652
 msgid "Use SSL for the connection."
 msgstr ""
 
@@ -5177,250 +5177,250 @@ msgstr ""
 msgid "Set CRITICAL status if more than INTEGER users are logged in"
 msgstr ""
 
-#: plugins/check_ide_smart.c:250
+#: plugins/check_ide_smart.c:256
 #, c-format
 msgid "CRITICAL - Couldn't open device %s: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:255
+#: plugins/check_ide_smart.c:261
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:317 plugins/check_ide_smart.c:344
+#: plugins/check_ide_smart.c:323 plugins/check_ide_smart.c:350
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:415
+#: plugins/check_ide_smart.c:421
 #, c-format
 msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:423
+#: plugins/check_ide_smart.c:429
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:431
+#: plugins/check_ide_smart.c:437
 #, c-format
 msgid "OK - Operational (%d/%d tests passed)\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:435
+#: plugins/check_ide_smart.c:441
 #, c-format
 msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:468
+#: plugins/check_ide_smart.c:474
 #, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:474
+#: plugins/check_ide_smart.c:480
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:480
+#: plugins/check_ide_smart.c:486
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:502 plugins/check_ide_smart.c:526
+#: plugins/check_ide_smart.c:508 plugins/check_ide_smart.c:532
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:547 plugins/check_ide_smart.c:574
+#: plugins/check_ide_smart.c:553 plugins/check_ide_smart.c:580
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:593
+#: plugins/check_ide_smart.c:599
 #, c-format
 msgid ""
 "This plugin checks a local hard drive with the (Linux specific) SMART "
 "interface [http://smartlinux.sourceforge.net/smart/index.php]."
 msgstr ""
 
-#: plugins/check_ide_smart.c:603
+#: plugins/check_ide_smart.c:609
 msgid "Select device DEVICE"
 msgstr ""
 
-#: plugins/check_ide_smart.c:604
+#: plugins/check_ide_smart.c:610
 msgid ""
 "Note: if the device is selected with this option, _no_ other options are "
 "accepted"
 msgstr ""
 
-#: plugins/check_ide_smart.c:606
+#: plugins/check_ide_smart.c:612
 msgid "Perform immediately offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:608
+#: plugins/check_ide_smart.c:614
 msgid "Returns the number of failed tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:610
+#: plugins/check_ide_smart.c:616
 msgid "Turn on automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:612
+#: plugins/check_ide_smart.c:618
 msgid "Turn off automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:614
+#: plugins/check_ide_smart.c:620
 msgid "Output suitable for Nagios"
 msgstr ""
 
-#: plugins/negate.c:96
+#: plugins/negate.c:99
 msgid "No data returned from command\n"
 msgstr ""
 
-#: plugins/negate.c:167
+#: plugins/negate.c:170
 msgid ""
 "Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
 "or integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:171
+#: plugins/negate.c:174
 msgid ""
 "Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer "
 "(0-3)."
 msgstr ""
 
-#: plugins/negate.c:177
+#: plugins/negate.c:180
 msgid ""
 "Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:182
+#: plugins/negate.c:185
 msgid ""
 "Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:187
+#: plugins/negate.c:190
 msgid ""
 "Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:214
+#: plugins/negate.c:217
 msgid "Require path to command"
 msgstr ""
 
-#: plugins/negate.c:243
+#: plugins/negate.c:246
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL and vice-versa)."
 msgstr ""
 
-#: plugins/negate.c:244
+#: plugins/negate.c:247
 msgid "Additional switches can be used to control which state becomes what."
 msgstr ""
 
-#: plugins/negate.c:253
+#: plugins/negate.c:256
 msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status."
 msgstr ""
 
-#: plugins/negate.c:255
+#: plugins/negate.c:258
 msgid "Custom result on Negate timeouts; see below for STATUS definition\n"
 msgstr ""
 
-#: plugins/negate.c:261
+#: plugins/negate.c:264
 #, c-format
 msgid ""
 "    STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n"
 msgstr ""
 
-#: plugins/negate.c:262
+#: plugins/negate.c:265
 #, c-format
 msgid ""
 "    quotes. Numeric values are accepted. If nothing is specified, permutes\n"
 msgstr ""
 
-#: plugins/negate.c:263
+#: plugins/negate.c:266
 #, c-format
 msgid "    OK and CRITICAL.\n"
 msgstr ""
 
-#: plugins/negate.c:265
+#: plugins/negate.c:268
 #, c-format
 msgid ""
 "    Substitute output text as well. Will only substitute text in CAPITALS\n"
 msgstr ""
 
-#: plugins/negate.c:270
+#: plugins/negate.c:273
 msgid "Run check_ping and invert result. Must use full path to plugin"
 msgstr ""
 
-#: plugins/negate.c:272
+#: plugins/negate.c:275
 msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"
 msgstr ""
 
-#: plugins/negate.c:275
+#: plugins/negate.c:278
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert it."
 msgstr ""
 
-#: plugins/negate.c:276
+#: plugins/negate.c:279
 msgid "The full path of the plugin must be provided."
 msgstr ""
 
-#: plugins/negate.c:277
+#: plugins/negate.c:280
 msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL."
 msgstr ""
 
-#: plugins/negate.c:278
+#: plugins/negate.c:281
 msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK."
 msgstr ""
 
-#: plugins/negate.c:279
+#: plugins/negate.c:282
 msgid "Otherwise, the output state of the wrapped plugin is unchanged."
 msgstr ""
 
-#: plugins/negate.c:281
+#: plugins/negate.c:284
 msgid ""
 "Using timeout-result, it is possible to override the timeout behaviour or a"
 msgstr ""
 
-#: plugins/negate.c:282
+#: plugins/negate.c:285
 msgid "plugin by setting the negate timeout a bit lower."
 msgstr ""
 
-#: plugins/netutils.c:48
+#: plugins/netutils.c:49
 #, c-format
 msgid "%s - Socket timeout after %d seconds\n"
 msgstr ""
 
-#: plugins/netutils.c:50
+#: plugins/netutils.c:51
 #, c-format
 msgid "%s - Abnormal timeout after %d seconds\n"
 msgstr ""
 
-#: plugins/netutils.c:78 plugins/netutils.c:280
+#: plugins/netutils.c:79 plugins/netutils.c:281
 msgid "Send failed"
 msgstr ""
 
-#: plugins/netutils.c:95 plugins/netutils.c:295
+#: plugins/netutils.c:96 plugins/netutils.c:296
 msgid "No data was received from host!"
 msgstr ""
 
-#: plugins/netutils.c:203 plugins/netutils.c:239
+#: plugins/netutils.c:204 plugins/netutils.c:240
 msgid "Socket creation failed"
 msgstr ""
 
-#: plugins/netutils.c:232
+#: plugins/netutils.c:233
 msgid "Supplied path too long unix domain socket"
 msgstr ""
 
-#: plugins/netutils.c:304
+#: plugins/netutils.c:305
 msgid "Receive failed"
 msgstr ""
 
-#: plugins/netutils.c:330 plugins-root/check_dhcp.c:1337
+#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1337
 #, c-format
 msgid "Invalid hostname/address - %s"
 msgstr ""
@@ -5502,31 +5502,31 @@ msgstr ""
 msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\""
 msgstr ""
 
-#: plugins/utils.c:171
+#: plugins/utils.c:174
 #, c-format
 msgid "%s - Plugin timed out after %d seconds\n"
 msgstr ""
 
-#: plugins/utils.c:466
+#: plugins/utils.c:469
 msgid "failed realloc in strpcpy\n"
 msgstr ""
 
-#: plugins/utils.c:508
+#: plugins/utils.c:511
 msgid "failed malloc in strscat\n"
 msgstr ""
 
-#: plugins/utils.c:528
+#: plugins/utils.c:531
 msgid "failed malloc in xvasprintf\n"
 msgstr ""
 
-#: plugins/utils.h:142
+#: plugins/utils.h:137
 #, c-format
 msgid ""
 "       %s (-h | --help) for detailed help\n"
 "       %s (-V | --version) for version information\n"
 msgstr ""
 
-#: plugins/utils.h:146
+#: plugins/utils.h:141
 msgid ""
 "\n"
 "Options:\n"
@@ -5536,7 +5536,7 @@ msgid ""
 "    Print version information\n"
 msgstr ""
 
-#: plugins/utils.h:153
+#: plugins/utils.h:148
 #, c-format
 msgid ""
 " -H, --hostname=ADDRESS\n"
@@ -5545,7 +5545,7 @@ msgid ""
 "    Port number (default: %s)\n"
 msgstr ""
 
-#: plugins/utils.h:159
+#: plugins/utils.h:154
 msgid ""
 " -4, --use-ipv4\n"
 "    Use IPv4 connection\n"
@@ -5553,13 +5553,13 @@ msgid ""
 "    Use IPv6 connection\n"
 msgstr ""
 
-#: plugins/utils.h:165
+#: plugins/utils.h:160
 msgid ""
 " -v, --verbose\n"
 "    Show details for command-line debugging (Nagios may truncate output)\n"
 msgstr ""
 
-#: plugins/utils.h:169
+#: plugins/utils.h:164
 msgid ""
 " -w, --warning=DOUBLE\n"
 "    Response time to result in warning status (seconds)\n"
@@ -5567,7 +5567,7 @@ msgid ""
 "    Response time to result in critical status (seconds)\n"
 msgstr ""
 
-#: plugins/utils.h:175
+#: plugins/utils.h:170
 msgid ""
 " -w, --warning=RANGE\n"
 "    Warning range (format: start:end). Alert if outside this range\n"
@@ -5575,21 +5575,21 @@ msgid ""
 "    Critical range\n"
 msgstr ""
 
-#: plugins/utils.h:181
+#: plugins/utils.h:176
 #, c-format
 msgid ""
 " -t, --timeout=INTEGER\n"
 "    Seconds before connection times out (default: %d)\n"
 msgstr ""
 
-#: plugins/utils.h:186
+#: plugins/utils.h:181
 msgid ""
 " --extra-opts=[section][@file]\n"
 "    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
 "    for usage and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:194
+#: plugins/utils.h:189
 msgid ""
 " See:\n"
 " http://nagiosplug.sourceforge.net/developer-guidelines."
@@ -5597,7 +5597,7 @@ msgid ""
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:199
+#: plugins/utils.h:194
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -5606,7 +5606,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/utils.h:204
+#: plugins/utils.h:199
 msgid ""
 "\n"
 "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"