From: Jeremy T. Bouse Date: Sat, 9 Aug 2003 06:51:29 +0000 (+0000) Subject: Code clean-up X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4784cac1f017a67978c2f3f2af75b161d1ef33c0;p=nagiosplug.git Code clean-up git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@673 f882894a-f735-0410-b71e-b25c423dba1c --- diff --git a/plugins/common.h b/plugins/common.h index 91b454d..e55b0bb 100644 --- a/plugins/common.h +++ b/plugins/common.h @@ -80,7 +80,7 @@ #include -#if HAVE_LWRES_NETDB_H +#ifdef HAVE_LWRES_NETDB_H #include #else # if !HAVE_GETADDRINFO @@ -90,6 +90,10 @@ # endif #endif +#ifdef HAVE_LOCALE_H +#include +#endif + /* * * Missing Functions @@ -156,7 +160,7 @@ enum { * */ -#if ENABLE_NLS +#ifdef ENABLE_NLS # include "gettext.h" # define _(String) gettext (String) # define S_(String) gettext (String) diff --git a/po/de.po b/po/de.po index 19609ea..aacee31 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: nagios-plugins 1.3.99\n" -"POT-Creation-Date: 2003-07-26 01:27-0400\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-08-08 21:40-0700\n" "PO-Revision-Date: 2003-07-20 22:24-0400\n" "Last-Translator: Michael Wirtgen \n" "Language-Team: de \n" @@ -19,42 +20,19 @@ msgstr "" #, c-format msgid "" "Usage: %s -H host -p port [-w ] [-c ]\n" -"\t[-s ] [-e ] [-q ]\n" -"\t[-m ] [-d ]\t[-t ]\n" -"\t[-r ] [-v] [-4|-6]\n" +" [-s ] [-e ] [-q ]\n" +" [-m ] [-d ] [-t ]\n" +" [-r ] [-v] [-4|-6]\n" msgstr "" -#: plugins/check_tcp.c:113 -#, c-format -msgid "" -"Copyright (c) %s Nagios Plugin Development Team\n" -"\t<%s>\n" -"\n" -msgstr "" - -#: plugins/check_tcp.c:118 +#: plugins/check_tcp.c:114 #, c-format msgid "" "This plugin tests %s connections with the specified host.\n" "\n" msgstr "" -#: plugins/check_tcp.c:124 -msgid "" -"\n" -"Options:\n" -" -H, --hostname=ADDRESS\n" -" Host name argument for servers using host headers (use numeric\n" -" address if possible to bypass DNS lookup).\n" -" -p, --port=INTEGER\n" -" Port number\n" -" -4, --use-ipv4\n" -" Use IPv4 connection\n" -" -6, --use-ipv6\n" -" Use IPv6 connection\n" -msgstr "" - -#: plugins/check_tcp.c:136 +#: plugins/check_tcp.c:125 msgid "" " -s, --send=STRING\n" " String to send to the server\n" @@ -64,7 +42,7 @@ msgid "" " String to send server to initiate a clean close of the connection\n" msgstr "" -#: plugins/check_tcp.c:144 +#: plugins/check_tcp.c:133 msgid "" " -r, --refuse=ok|warn|crit\n" " Accept tcp refusals with states ok, warn, crit (default: crit)\n" @@ -72,102 +50,84 @@ msgid "" " Close connection once more than this number of bytes are received\n" " -d, --delay=INTEGER\n" " Seconds to wait between sending string and polling for response\n" -" -w, --warning=DOUBLE\n" -" Response time to result in warning status (seconds)\n" -" -c, --critical=DOUBLE\n" -" Response time to result in critical status (seconds)\n" msgstr "" -#: plugins/check_tcp.c:156 -#, c-format -msgid "" -" -t, --timeout=INTEGER\n" -" Seconds before connection times out (default: %d)\n" -" -v, --verbose\n" -" Show details for command-line debugging (Nagios may truncate output)\n" -" -h, --help\n" -" Print detailed help screen\n" -" -V, --version\n" -" Print version information\n" -"\n" -msgstr "" - -#: plugins/check_tcp.c:274 +#: plugins/check_tcp.c:254 msgid "ERROR: Generic check_tcp called with unknown service\n" msgstr "" -#: plugins/check_tcp.c:283 +#: plugins/check_tcp.c:263 msgid "Could not parse arguments\n" msgstr "" -#: plugins/check_tcp.c:346 +#: plugins/check_tcp.c:326 msgid "No data received from host\n" msgstr "" -#: plugins/check_tcp.c:358 +#: plugins/check_tcp.c:338 msgid "Invalid response from host\n" msgstr "" -#: plugins/check_tcp.c:396 +#: plugins/check_tcp.c:376 #, c-format msgid "%s %s%s - %.3f second response time on port %d" msgstr "" -#: plugins/check_tcp.c:472 +#: plugins/check_tcp.c:452 #, c-format msgid "" "%s: Unknown argument: %s\n" "\n" msgstr "" -#: plugins/check_tcp.c:491 +#: plugins/check_tcp.c:471 msgid "IPv6 support not available\n" msgstr "" -#: plugins/check_tcp.c:496 +#: plugins/check_tcp.c:476 msgid "invalid host name or address" msgstr "" -#: plugins/check_tcp.c:501 +#: plugins/check_tcp.c:481 msgid "Critical threshold must be a nonnegative integer\n" msgstr "" -#: plugins/check_tcp.c:507 +#: plugins/check_tcp.c:487 msgid "Warning threshold must be a nonnegative integer\n" msgstr "" -#: plugins/check_tcp.c:521 +#: plugins/check_tcp.c:501 msgid "Timeout interval must be a positive integer\n" msgstr "" -#: plugins/check_tcp.c:526 +#: plugins/check_tcp.c:506 msgid "Server port must be a positive integer\n" msgstr "" -#: plugins/check_tcp.c:542 +#: plugins/check_tcp.c:522 msgid "Maxbytes must be a positive integer\n" msgstr "" -#: plugins/check_tcp.c:555 +#: plugins/check_tcp.c:535 msgid "Refuse mut be one of ok, warn, crit\n" msgstr "" -#: plugins/check_tcp.c:561 +#: plugins/check_tcp.c:541 msgid "Delay must be a positive integer\n" msgstr "" -#: plugins/check_tcp.c:566 +#: plugins/check_tcp.c:546 msgid "SSL support not available. Install OpenSSL and recompile." msgstr "" -#: plugins/check_tcp.c:574 +#: plugins/check_tcp.c:554 msgid "You must provide a server address\n" msgstr "" -#: plugins/check_tcp.c:592 +#: plugins/check_tcp.c:572 msgid "ERROR: Cannot create SSL context.\n" msgstr "" -#: plugins/check_tcp.c:618 +#: plugins/check_tcp.c:598 msgid "ERROR: Cannot initiate SSL handshake.\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 58c3474..134c556 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: nagios-plugins 1.3.99\n" -"POT-Creation-Date: 2003-07-26 01:27-0400\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2003-08-08 21:40-0700\n" "PO-Revision-Date: 2003-07-25 06:55-0400\n" "Last-Translator: Pierre-Antoine Angelini \n" "Language-Team: French \n" @@ -18,55 +19,22 @@ msgstr "" #, fuzzy, c-format msgid "" "Usage: %s -H host -p port [-w ] [-c ]\n" -"\t[-s ] [-e ] [-q ]\n" -"\t[-m ] [-d ]\t[-t ]\n" -"\t[-r ] [-v] [-4|-6]\n" +" [-s ] [-e ] [-q ]\n" +" [-m ] [-d ] [-t ]\n" +" [-r ] [-v] [-4|-6]\n" msgstr "" "-H host -p port [-w warn_time] [-c crit_time] [-s send_string]\n" "\t[-e expect_string] [-q quit_string] [-m maxbytes] [-d delay]\n" "\t[-t to_sec] [-r refuse_state] [-v] [-4|-6]\n" -#: plugins/check_tcp.c:113 -#, c-format -msgid "" -"Copyright (c) %s Nagios Plugin Development Team\n" -"\t<%s>\n" -"\n" -msgstr "" - -#: plugins/check_tcp.c:118 +#: plugins/check_tcp.c:114 #, fuzzy, c-format msgid "" "This plugin tests %s connections with the specified host.\n" "\n" msgstr "Le plugin tests a %s connection with l'host specified\n" -#: plugins/check_tcp.c:124 -#, fuzzy -msgid "" -"\n" -"Options:\n" -" -H, --hostname=ADDRESS\n" -" Host name argument for servers using host headers (use numeric\n" -" address if possible to bypass DNS lookup).\n" -" -p, --port=INTEGER\n" -" Port number\n" -" -4, --use-ipv4\n" -" Use IPv4 connection\n" -" -6, --use-ipv6\n" -" Use IPv6 connection\n" -msgstr "" -" -H, --hostname=ADDRESS\n" -" Host name argument for servers using host headers (use numeric\n" -" address if possible to bypass DNS lookup).\n" -" -p, --port=INTEGER\n" -" Port number\n" -" -4, --use-ipv4\n" -" Use IPv4 connection\n" -" -6, --use-ipv6\n" -" Use IPv6 connection\n" - -#: plugins/check_tcp.c:136 +#: plugins/check_tcp.c:125 msgid "" " -s, --send=STRING\n" " String to send to the server\n" @@ -82,7 +50,8 @@ msgstr "" " -q, --quit=STRING\n" " String to send server to initiate a clean close of the connection\n" -#: plugins/check_tcp.c:144 +#: plugins/check_tcp.c:133 +#, fuzzy msgid "" " -r, --refuse=ok|warn|crit\n" " Accept tcp refusals with states ok, warn, crit (default: crit)\n" @@ -90,10 +59,6 @@ msgid "" " Close connection once more than this number of bytes are received\n" " -d, --delay=INTEGER\n" " Seconds to wait between sending string and polling for response\n" -" -w, --warning=DOUBLE\n" -" Response time to result in warning status (seconds)\n" -" -c, --critical=DOUBLE\n" -" Response time to result in critical status (seconds)\n" msgstr "" " -r, --refuse=ok|warn|crit\n" " Accept tcp refusals with states ok, warn, crit (default: crit)\n" @@ -106,105 +71,127 @@ msgstr "" " -c, --critical=DOUBLE\n" " Response time to result in critical status (seconds)\n" -#: plugins/check_tcp.c:156 -#, c-format -msgid "" -" -t, --timeout=INTEGER\n" -" Seconds before connection times out (default: %d)\n" -" -v, --verbose\n" -" Show details for command-line debugging (Nagios may truncate output)\n" -" -h, --help\n" -" Print detailed help screen\n" -" -V, --version\n" -" Print version information\n" -"\n" -msgstr "" -" -t, --timeout=INTEGER\n" -" Seconds before connection times out (default: %d)\n" -" -v, --verbose\n" -" Show details for command-line debugging (Nagios may truncate output)\n" -" -h, --help\n" -" Print detailed help screen\n" -" -V, --version\n" -" Print version information\n" -"\n" - -#: plugins/check_tcp.c:274 +#: plugins/check_tcp.c:254 msgid "ERROR: Generic check_tcp called with unknown service\n" msgstr "" -#: plugins/check_tcp.c:283 +#: plugins/check_tcp.c:263 msgid "Could not parse arguments\n" msgstr "" -#: plugins/check_tcp.c:346 +#: plugins/check_tcp.c:326 msgid "No data received from host\n" msgstr "" -#: plugins/check_tcp.c:358 +#: plugins/check_tcp.c:338 msgid "Invalid response from host\n" msgstr "" -#: plugins/check_tcp.c:396 +#: plugins/check_tcp.c:376 #, c-format msgid "%s %s%s - %.3f second response time on port %d" msgstr "" -#: plugins/check_tcp.c:472 +#: plugins/check_tcp.c:452 #, c-format msgid "" "%s: Unknown argument: %s\n" "\n" msgstr "" -#: plugins/check_tcp.c:491 +#: plugins/check_tcp.c:471 msgid "IPv6 support not available\n" msgstr "" -#: plugins/check_tcp.c:496 +#: plugins/check_tcp.c:476 msgid "invalid host name or address" msgstr "" -#: plugins/check_tcp.c:501 +#: plugins/check_tcp.c:481 msgid "Critical threshold must be a nonnegative integer\n" msgstr "" -#: plugins/check_tcp.c:507 +#: plugins/check_tcp.c:487 msgid "Warning threshold must be a nonnegative integer\n" msgstr "" -#: plugins/check_tcp.c:521 +#: plugins/check_tcp.c:501 msgid "Timeout interval must be a positive integer\n" msgstr "" -#: plugins/check_tcp.c:526 +#: plugins/check_tcp.c:506 msgid "Server port must be a positive integer\n" msgstr "" -#: plugins/check_tcp.c:542 +#: plugins/check_tcp.c:522 msgid "Maxbytes must be a positive integer\n" msgstr "" -#: plugins/check_tcp.c:555 +#: plugins/check_tcp.c:535 msgid "Refuse mut be one of ok, warn, crit\n" msgstr "" -#: plugins/check_tcp.c:561 +#: plugins/check_tcp.c:541 msgid "Delay must be a positive integer\n" msgstr "" -#: plugins/check_tcp.c:566 +#: plugins/check_tcp.c:546 msgid "SSL support not available. Install OpenSSL and recompile." msgstr "" -#: plugins/check_tcp.c:574 +#: plugins/check_tcp.c:554 msgid "You must provide a server address\n" msgstr "" -#: plugins/check_tcp.c:592 +#: plugins/check_tcp.c:572 msgid "ERROR: Cannot create SSL context.\n" msgstr "" -#: plugins/check_tcp.c:618 +#: plugins/check_tcp.c:598 msgid "ERROR: Cannot initiate SSL handshake.\n" msgstr "" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Options:\n" +#~ " -H, --hostname=ADDRESS\n" +#~ " Host name argument for servers using host headers (use numeric\n" +#~ " address if possible to bypass DNS lookup).\n" +#~ " -p, --port=INTEGER\n" +#~ " Port number\n" +#~ " -4, --use-ipv4\n" +#~ " Use IPv4 connection\n" +#~ " -6, --use-ipv6\n" +#~ " Use IPv6 connection\n" +#~ msgstr "" +#~ " -H, --hostname=ADDRESS\n" +#~ " Host name argument for servers using host headers (use numeric\n" +#~ " address if possible to bypass DNS lookup).\n" +#~ " -p, --port=INTEGER\n" +#~ " Port number\n" +#~ " -4, --use-ipv4\n" +#~ " Use IPv4 connection\n" +#~ " -6, --use-ipv6\n" +#~ " Use IPv6 connection\n" + +#~ msgid "" +#~ " -t, --timeout=INTEGER\n" +#~ " Seconds before connection times out (default: %d)\n" +#~ " -v, --verbose\n" +#~ " Show details for command-line debugging (Nagios may truncate output)\n" +#~ " -h, --help\n" +#~ " Print detailed help screen\n" +#~ " -V, --version\n" +#~ " Print version information\n" +#~ "\n" +#~ msgstr "" +#~ " -t, --timeout=INTEGER\n" +#~ " Seconds before connection times out (default: %d)\n" +#~ " -v, --verbose\n" +#~ " Show details for command-line debugging (Nagios may truncate output)\n" +#~ " -h, --help\n" +#~ " Print detailed help screen\n" +#~ " -V, --version\n" +#~ " Print version information\n" +#~ "\n"