summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy T. Bouse <undrgrid@users.sourceforge.net>2003-08-09 06:51:29 +0000
committerJeremy T. Bouse <undrgrid@users.sourceforge.net>2003-08-09 06:51:29 +0000
commit4784cac1f017a67978c2f3f2af75b161d1ef33c0 (patch)
tree3274e9d5348fd16d6b89ec42aa995ae1c5ee8d0f
parenta228492c4bea15a3e6e7bdbfd6631611c97fe92c (diff)
downloadmonitoring-plugins-4784cac1f017a67978c2f3f2af75b161d1ef33c0.tar.gz
Code clean-up
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@673 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat
-rw-r--r--plugins/common.h8
-rw-r--r--po/de.po94
-rw-r--r--po/fr.po159
3 files changed, 106 insertions, 155 deletions
diff --git a/plugins/common.h b/plugins/common.h
index 91b454db..e55b0bbd 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -80,7 +80,7 @@
80 80
81#include <ctype.h> 81#include <ctype.h>
82 82
83#if HAVE_LWRES_NETDB_H 83#ifdef HAVE_LWRES_NETDB_H
84#include <lwres/netdb.h> 84#include <lwres/netdb.h>
85#else 85#else
86# if !HAVE_GETADDRINFO 86# if !HAVE_GETADDRINFO
@@ -90,6 +90,10 @@
90# endif 90# endif
91#endif 91#endif
92 92
93#ifdef HAVE_LOCALE_H
94#include <locale.h>
95#endif
96
93/* 97/*
94 * 98 *
95 * Missing Functions 99 * Missing Functions
@@ -156,7 +160,7 @@ enum {
156 * 160 *
157 */ 161 */
158 162
159#if ENABLE_NLS 163#ifdef ENABLE_NLS
160# include "gettext.h" 164# include "gettext.h"
161# define _(String) gettext (String) 165# define _(String) gettext (String)
162# define S_(String) gettext (String) 166# define S_(String) gettext (String)
diff --git a/po/de.po b/po/de.po
index 19609eab..aacee317 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,8 @@
7msgid "" 7msgid ""
8msgstr "" 8msgstr ""
9"Project-Id-Version: nagios-plugins 1.3.99\n" 9"Project-Id-Version: nagios-plugins 1.3.99\n"
10"POT-Creation-Date: 2003-07-26 01:27-0400\n" 10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2003-08-08 21:40-0700\n"
11"PO-Revision-Date: 2003-07-20 22:24-0400\n" 12"PO-Revision-Date: 2003-07-20 22:24-0400\n"
12"Last-Translator: Michael Wirtgen <Michael.Wirtgen@miwi-dv.com>\n" 13"Last-Translator: Michael Wirtgen <Michael.Wirtgen@miwi-dv.com>\n"
13"Language-Team: de <LL@li.org>\n" 14"Language-Team: de <LL@li.org>\n"
@@ -19,42 +20,19 @@ msgstr ""
19#, c-format 20#, c-format
20msgid "" 21msgid ""
21"Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n" 22"Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n"
22"\t[-s <send string>] [-e <expect string>] [-q <quit string>]\n" 23" [-s <send string>] [-e <expect string>] [-q <quit string>]\n"
23"\t[-m <maximum bytes>] [-d <delay>]\t[-t <timeout seconds>]\n" 24" [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n"
24"\t[-r <refuse state>] [-v] [-4|-6]\n" 25" [-r <refuse state>] [-v] [-4|-6]\n"
25msgstr "" 26msgstr ""
26 27
27#: plugins/check_tcp.c:113 28#: plugins/check_tcp.c:114
28#, c-format
29msgid ""
30"Copyright (c) %s Nagios Plugin Development Team\n"
31"\t<%s>\n"
32"\n"
33msgstr ""
34
35#: plugins/check_tcp.c:118
36#, c-format 29#, c-format
37msgid "" 30msgid ""
38"This plugin tests %s connections with the specified host.\n" 31"This plugin tests %s connections with the specified host.\n"
39"\n" 32"\n"
40msgstr "" 33msgstr ""
41 34
42#: plugins/check_tcp.c:124 35#: plugins/check_tcp.c:125
43msgid ""
44"\n"
45"Options:\n"
46" -H, --hostname=ADDRESS\n"
47" Host name argument for servers using host headers (use numeric\n"
48" address if possible to bypass DNS lookup).\n"
49" -p, --port=INTEGER\n"
50" Port number\n"
51" -4, --use-ipv4\n"
52" Use IPv4 connection\n"
53" -6, --use-ipv6\n"
54" Use IPv6 connection\n"
55msgstr ""
56
57#: plugins/check_tcp.c:136
58msgid "" 36msgid ""
59" -s, --send=STRING\n" 37" -s, --send=STRING\n"
60" String to send to the server\n" 38" String to send to the server\n"
@@ -64,7 +42,7 @@ msgid ""
64" String to send server to initiate a clean close of the connection\n" 42" String to send server to initiate a clean close of the connection\n"
65msgstr "" 43msgstr ""
66 44
67#: plugins/check_tcp.c:144 45#: plugins/check_tcp.c:133
68msgid "" 46msgid ""
69" -r, --refuse=ok|warn|crit\n" 47" -r, --refuse=ok|warn|crit\n"
70" Accept tcp refusals with states ok, warn, crit (default: crit)\n" 48" Accept tcp refusals with states ok, warn, crit (default: crit)\n"
@@ -72,102 +50,84 @@ msgid ""
72" Close connection once more than this number of bytes are received\n" 50" Close connection once more than this number of bytes are received\n"
73" -d, --delay=INTEGER\n" 51" -d, --delay=INTEGER\n"
74" Seconds to wait between sending string and polling for response\n" 52" Seconds to wait between sending string and polling for response\n"
75" -w, --warning=DOUBLE\n"
76" Response time to result in warning status (seconds)\n"
77" -c, --critical=DOUBLE\n"
78" Response time to result in critical status (seconds)\n"
79msgstr "" 53msgstr ""
80 54
81#: plugins/check_tcp.c:156 55#: plugins/check_tcp.c:254
82#, c-format
83msgid ""
84" -t, --timeout=INTEGER\n"
85" Seconds before connection times out (default: %d)\n"
86" -v, --verbose\n"
87" Show details for command-line debugging (Nagios may truncate output)\n"
88" -h, --help\n"
89" Print detailed help screen\n"
90" -V, --version\n"
91" Print version information\n"
92"\n"
93msgstr ""
94
95#: plugins/check_tcp.c:274
96msgid "ERROR: Generic check_tcp called with unknown service\n" 56msgid "ERROR: Generic check_tcp called with unknown service\n"
97msgstr "" 57msgstr ""
98 58
99#: plugins/check_tcp.c:283 59#: plugins/check_tcp.c:263
100msgid "Could not parse arguments\n" 60msgid "Could not parse arguments\n"
101msgstr "" 61msgstr ""
102 62
103#: plugins/check_tcp.c:346 63#: plugins/check_tcp.c:326
104msgid "No data received from host\n" 64msgid "No data received from host\n"
105msgstr "" 65msgstr ""
106 66
107#: plugins/check_tcp.c:358 67#: plugins/check_tcp.c:338
108msgid "Invalid response from host\n" 68msgid "Invalid response from host\n"
109msgstr "" 69msgstr ""
110 70
111#: plugins/check_tcp.c:396 71#: plugins/check_tcp.c:376
112#, c-format 72#, c-format
113msgid "%s %s%s - %.3f second response time on port %d" 73msgid "%s %s%s - %.3f second response time on port %d"
114msgstr "" 74msgstr ""
115 75
116#: plugins/check_tcp.c:472 76#: plugins/check_tcp.c:452
117#, c-format 77#, c-format
118msgid "" 78msgid ""
119"%s: Unknown argument: %s\n" 79"%s: Unknown argument: %s\n"
120"\n" 80"\n"
121msgstr "" 81msgstr ""
122 82
123#: plugins/check_tcp.c:491 83#: plugins/check_tcp.c:471
124msgid "IPv6 support not available\n" 84msgid "IPv6 support not available\n"
125msgstr "" 85msgstr ""
126 86
127#: plugins/check_tcp.c:496 87#: plugins/check_tcp.c:476
128msgid "invalid host name or address" 88msgid "invalid host name or address"
129msgstr "" 89msgstr ""
130 90
131#: plugins/check_tcp.c:501 91#: plugins/check_tcp.c:481
132msgid "Critical threshold must be a nonnegative integer\n" 92msgid "Critical threshold must be a nonnegative integer\n"
133msgstr "" 93msgstr ""
134 94
135#: plugins/check_tcp.c:507 95#: plugins/check_tcp.c:487
136msgid "Warning threshold must be a nonnegative integer\n" 96msgid "Warning threshold must be a nonnegative integer\n"
137msgstr "" 97msgstr ""
138 98
139#: plugins/check_tcp.c:521 99#: plugins/check_tcp.c:501
140msgid "Timeout interval must be a positive integer\n" 100msgid "Timeout interval must be a positive integer\n"
141msgstr "" 101msgstr ""
142 102
143#: plugins/check_tcp.c:526 103#: plugins/check_tcp.c:506
144msgid "Server port must be a positive integer\n" 104msgid "Server port must be a positive integer\n"
145msgstr "" 105msgstr ""
146 106
147#: plugins/check_tcp.c:542 107#: plugins/check_tcp.c:522
148msgid "Maxbytes must be a positive integer\n" 108msgid "Maxbytes must be a positive integer\n"
149msgstr "" 109msgstr ""
150 110
151#: plugins/check_tcp.c:555 111#: plugins/check_tcp.c:535
152msgid "Refuse mut be one of ok, warn, crit\n" 112msgid "Refuse mut be one of ok, warn, crit\n"
153msgstr "" 113msgstr ""
154 114
155#: plugins/check_tcp.c:561 115#: plugins/check_tcp.c:541
156msgid "Delay must be a positive integer\n" 116msgid "Delay must be a positive integer\n"
157msgstr "" 117msgstr ""
158 118
159#: plugins/check_tcp.c:566 119#: plugins/check_tcp.c:546
160msgid "SSL support not available. Install OpenSSL and recompile." 120msgid "SSL support not available. Install OpenSSL and recompile."
161msgstr "" 121msgstr ""
162 122
163#: plugins/check_tcp.c:574 123#: plugins/check_tcp.c:554
164msgid "You must provide a server address\n" 124msgid "You must provide a server address\n"
165msgstr "" 125msgstr ""
166 126
167#: plugins/check_tcp.c:592 127#: plugins/check_tcp.c:572
168msgid "ERROR: Cannot create SSL context.\n" 128msgid "ERROR: Cannot create SSL context.\n"
169msgstr "" 129msgstr ""
170 130
171#: plugins/check_tcp.c:618 131#: plugins/check_tcp.c:598
172msgid "ERROR: Cannot initiate SSL handshake.\n" 132msgid "ERROR: Cannot initiate SSL handshake.\n"
173msgstr "" 133msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 58c34746..134c556c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,8 @@
6msgid "" 6msgid ""
7msgstr "" 7msgstr ""
8"Project-Id-Version: nagios-plugins 1.3.99\n" 8"Project-Id-Version: nagios-plugins 1.3.99\n"
9"POT-Creation-Date: 2003-07-26 01:27-0400\n" 9"Report-Msgid-Bugs-To: \n"
10"POT-Creation-Date: 2003-08-08 21:40-0700\n"
10"PO-Revision-Date: 2003-07-25 06:55-0400\n" 11"PO-Revision-Date: 2003-07-25 06:55-0400\n"
11"Last-Translator: Pierre-Antoine Angelini <paangelini@users.sourceforge.net>\n" 12"Last-Translator: Pierre-Antoine Angelini <paangelini@users.sourceforge.net>\n"
12"Language-Team: French <traduc@traduc.org>\n" 13"Language-Team: French <traduc@traduc.org>\n"
@@ -18,55 +19,22 @@ msgstr ""
18#, fuzzy, c-format 19#, fuzzy, c-format
19msgid "" 20msgid ""
20"Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n" 21"Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n"
21"\t[-s <send string>] [-e <expect string>] [-q <quit string>]\n" 22" [-s <send string>] [-e <expect string>] [-q <quit string>]\n"
22"\t[-m <maximum bytes>] [-d <delay>]\t[-t <timeout seconds>]\n" 23" [-m <maximum bytes>] [-d <delay>] [-t <timeout seconds>]\n"
23"\t[-r <refuse state>] [-v] [-4|-6]\n" 24" [-r <refuse state>] [-v] [-4|-6]\n"
24msgstr "" 25msgstr ""
25"-H host -p port [-w warn_time] [-c crit_time] [-s send_string]\n" 26"-H host -p port [-w warn_time] [-c crit_time] [-s send_string]\n"
26"\t[-e expect_string] [-q quit_string] [-m maxbytes] [-d delay]\n" 27"\t[-e expect_string] [-q quit_string] [-m maxbytes] [-d delay]\n"
27"\t[-t to_sec] [-r refuse_state] [-v] [-4|-6]\n" 28"\t[-t to_sec] [-r refuse_state] [-v] [-4|-6]\n"
28 29
29#: plugins/check_tcp.c:113 30#: plugins/check_tcp.c:114
30#, c-format
31msgid ""
32"Copyright (c) %s Nagios Plugin Development Team\n"
33"\t<%s>\n"
34"\n"
35msgstr ""
36
37#: plugins/check_tcp.c:118
38#, fuzzy, c-format 31#, fuzzy, c-format
39msgid "" 32msgid ""
40"This plugin tests %s connections with the specified host.\n" 33"This plugin tests %s connections with the specified host.\n"
41"\n" 34"\n"
42msgstr "Le plugin tests a %s connection with l'host specified\n" 35msgstr "Le plugin tests a %s connection with l'host specified\n"
43 36
44#: plugins/check_tcp.c:124 37#: plugins/check_tcp.c:125
45#, fuzzy
46msgid ""
47"\n"
48"Options:\n"
49" -H, --hostname=ADDRESS\n"
50" Host name argument for servers using host headers (use numeric\n"
51" address if possible to bypass DNS lookup).\n"
52" -p, --port=INTEGER\n"
53" Port number\n"
54" -4, --use-ipv4\n"
55" Use IPv4 connection\n"
56" -6, --use-ipv6\n"
57" Use IPv6 connection\n"
58msgstr ""
59" -H, --hostname=ADDRESS\n"
60" Host name argument for servers using host headers (use numeric\n"
61" address if possible to bypass DNS lookup).\n"
62" -p, --port=INTEGER\n"
63" Port number\n"
64" -4, --use-ipv4\n"
65" Use IPv4 connection\n"
66" -6, --use-ipv6\n"
67" Use IPv6 connection\n"
68
69#: plugins/check_tcp.c:136
70msgid "" 38msgid ""
71" -s, --send=STRING\n" 39" -s, --send=STRING\n"
72" String to send to the server\n" 40" String to send to the server\n"
@@ -82,7 +50,8 @@ msgstr ""
82" -q, --quit=STRING\n" 50" -q, --quit=STRING\n"
83" String to send server to initiate a clean close of the connection\n" 51" String to send server to initiate a clean close of the connection\n"
84 52
85#: plugins/check_tcp.c:144 53#: plugins/check_tcp.c:133
54#, fuzzy
86msgid "" 55msgid ""
87" -r, --refuse=ok|warn|crit\n" 56" -r, --refuse=ok|warn|crit\n"
88" Accept tcp refusals with states ok, warn, crit (default: crit)\n" 57" Accept tcp refusals with states ok, warn, crit (default: crit)\n"
@@ -90,10 +59,6 @@ msgid ""
90" Close connection once more than this number of bytes are received\n" 59" Close connection once more than this number of bytes are received\n"
91" -d, --delay=INTEGER\n" 60" -d, --delay=INTEGER\n"
92" Seconds to wait between sending string and polling for response\n" 61" Seconds to wait between sending string and polling for response\n"
93" -w, --warning=DOUBLE\n"
94" Response time to result in warning status (seconds)\n"
95" -c, --critical=DOUBLE\n"
96" Response time to result in critical status (seconds)\n"
97msgstr "" 62msgstr ""
98" -r, --refuse=ok|warn|crit\n" 63" -r, --refuse=ok|warn|crit\n"
99" Accept tcp refusals with states ok, warn, crit (default: crit)\n" 64" Accept tcp refusals with states ok, warn, crit (default: crit)\n"
@@ -106,105 +71,127 @@ msgstr ""
106" -c, --critical=DOUBLE\n" 71" -c, --critical=DOUBLE\n"
107" Response time to result in critical status (seconds)\n" 72" Response time to result in critical status (seconds)\n"
108 73
109#: plugins/check_tcp.c:156 74#: plugins/check_tcp.c:254
110#, c-format
111msgid ""
112" -t, --timeout=INTEGER\n"
113" Seconds before connection times out (default: %d)\n"
114" -v, --verbose\n"
115" Show details for command-line debugging (Nagios may truncate output)\n"
116" -h, --help\n"
117" Print detailed help screen\n"
118" -V, --version\n"
119" Print version information\n"
120"\n"
121msgstr ""
122" -t, --timeout=INTEGER\n"
123" Seconds before connection times out (default: %d)\n"
124" -v, --verbose\n"
125" Show details for command-line debugging (Nagios may truncate output)\n"
126" -h, --help\n"
127" Print detailed help screen\n"
128" -V, --version\n"
129" Print version information\n"
130"\n"
131
132#: plugins/check_tcp.c:274
133msgid "ERROR: Generic check_tcp called with unknown service\n" 75msgid "ERROR: Generic check_tcp called with unknown service\n"
134msgstr "" 76msgstr ""
135 77
136#: plugins/check_tcp.c:283 78#: plugins/check_tcp.c:263
137msgid "Could not parse arguments\n" 79msgid "Could not parse arguments\n"
138msgstr "" 80msgstr ""
139 81
140#: plugins/check_tcp.c:346 82#: plugins/check_tcp.c:326
141msgid "No data received from host\n" 83msgid "No data received from host\n"
142msgstr "" 84msgstr ""
143 85
144#: plugins/check_tcp.c:358 86#: plugins/check_tcp.c:338
145msgid "Invalid response from host\n" 87msgid "Invalid response from host\n"
146msgstr "" 88msgstr ""
147 89
148#: plugins/check_tcp.c:396 90#: plugins/check_tcp.c:376
149#, c-format 91#, c-format
150msgid "%s %s%s - %.3f second response time on port %d" 92msgid "%s %s%s - %.3f second response time on port %d"
151msgstr "" 93msgstr ""
152 94
153#: plugins/check_tcp.c:472 95#: plugins/check_tcp.c:452
154#, c-format 96#, c-format
155msgid "" 97msgid ""
156"%s: Unknown argument: %s\n" 98"%s: Unknown argument: %s\n"
157"\n" 99"\n"
158msgstr "" 100msgstr ""
159 101
160#: plugins/check_tcp.c:491 102#: plugins/check_tcp.c:471
161msgid "IPv6 support not available\n" 103msgid "IPv6 support not available\n"
162msgstr "" 104msgstr ""
163 105
164#: plugins/check_tcp.c:496 106#: plugins/check_tcp.c:476
165msgid "invalid host name or address" 107msgid "invalid host name or address"
166msgstr "" 108msgstr ""
167 109
168#: plugins/check_tcp.c:501 110#: plugins/check_tcp.c:481
169msgid "Critical threshold must be a nonnegative integer\n" 111msgid "Critical threshold must be a nonnegative integer\n"
170msgstr "" 112msgstr ""
171 113
172#: plugins/check_tcp.c:507 114#: plugins/check_tcp.c:487
173msgid "Warning threshold must be a nonnegative integer\n" 115msgid "Warning threshold must be a nonnegative integer\n"
174msgstr "" 116msgstr ""
175 117
176#: plugins/check_tcp.c:521 118#: plugins/check_tcp.c:501
177msgid "Timeout interval must be a positive integer\n" 119msgid "Timeout interval must be a positive integer\n"
178msgstr "" 120msgstr ""
179 121
180#: plugins/check_tcp.c:526 122#: plugins/check_tcp.c:506
181msgid "Server port must be a positive integer\n" 123msgid "Server port must be a positive integer\n"
182msgstr "" 124msgstr ""
183 125
184#: plugins/check_tcp.c:542 126#: plugins/check_tcp.c:522
185msgid "Maxbytes must be a positive integer\n" 127msgid "Maxbytes must be a positive integer\n"
186msgstr "" 128msgstr ""
187 129
188#: plugins/check_tcp.c:555 130#: plugins/check_tcp.c:535
189msgid "Refuse mut be one of ok, warn, crit\n" 131msgid "Refuse mut be one of ok, warn, crit\n"
190msgstr "" 132msgstr ""
191 133
192#: plugins/check_tcp.c:561 134#: plugins/check_tcp.c:541
193msgid "Delay must be a positive integer\n" 135msgid "Delay must be a positive integer\n"
194msgstr "" 136msgstr ""
195 137
196#: plugins/check_tcp.c:566 138#: plugins/check_tcp.c:546
197msgid "SSL support not available. Install OpenSSL and recompile." 139msgid "SSL support not available. Install OpenSSL and recompile."
198msgstr "" 140msgstr ""
199 141
200#: plugins/check_tcp.c:574 142#: plugins/check_tcp.c:554
201msgid "You must provide a server address\n" 143msgid "You must provide a server address\n"
202msgstr "" 144msgstr ""
203 145
204#: plugins/check_tcp.c:592 146#: plugins/check_tcp.c:572
205msgid "ERROR: Cannot create SSL context.\n" 147msgid "ERROR: Cannot create SSL context.\n"
206msgstr "" 148msgstr ""
207 149
208#: plugins/check_tcp.c:618 150#: plugins/check_tcp.c:598
209msgid "ERROR: Cannot initiate SSL handshake.\n" 151msgid "ERROR: Cannot initiate SSL handshake.\n"
210msgstr "" 152msgstr ""
153
154#, fuzzy
155#~ msgid ""
156#~ "\n"
157#~ "Options:\n"
158#~ " -H, --hostname=ADDRESS\n"
159#~ " Host name argument for servers using host headers (use numeric\n"
160#~ " address if possible to bypass DNS lookup).\n"
161#~ " -p, --port=INTEGER\n"
162#~ " Port number\n"
163#~ " -4, --use-ipv4\n"
164#~ " Use IPv4 connection\n"
165#~ " -6, --use-ipv6\n"
166#~ " Use IPv6 connection\n"
167#~ msgstr ""
168#~ " -H, --hostname=ADDRESS\n"
169#~ " Host name argument for servers using host headers (use numeric\n"
170#~ " address if possible to bypass DNS lookup).\n"
171#~ " -p, --port=INTEGER\n"
172#~ " Port number\n"
173#~ " -4, --use-ipv4\n"
174#~ " Use IPv4 connection\n"
175#~ " -6, --use-ipv6\n"
176#~ " Use IPv6 connection\n"
177
178#~ msgid ""
179#~ " -t, --timeout=INTEGER\n"
180#~ " Seconds before connection times out (default: %d)\n"
181#~ " -v, --verbose\n"
182#~ " Show details for command-line debugging (Nagios may truncate output)\n"
183#~ " -h, --help\n"
184#~ " Print detailed help screen\n"
185#~ " -V, --version\n"
186#~ " Print version information\n"
187#~ "\n"
188#~ msgstr ""
189#~ " -t, --timeout=INTEGER\n"
190#~ " Seconds before connection times out (default: %d)\n"
191#~ " -v, --verbose\n"
192#~ " Show details for command-line debugging (Nagios may truncate output)\n"
193#~ " -h, --help\n"
194#~ " Print detailed help screen\n"
195#~ " -V, --version\n"
196#~ " Print version information\n"
197#~ "\n"