commit changes caused by upstream code mods

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

1 files changed, 737 insertions, 698 deletions

diff --git a/po/fr.po b/po/fr.po
index c43429fb..65a5a9ba 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,11 +3,10 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Karl DeBisschop <kdebisschop@users.sourceforge.net>, 2003.
 #
-#: plugins/check_nt.c:311
 msgid ""
 msgstr ""
 "Project-Id-Version: nagios-plugins 1.3.99\n"
-"POT-Creation-Date: 2003-08-10 07:52-0400\n"
+"POT-Creation-Date: 2003-10-29 21:39-0500\n"
 "PO-Revision-Date: 2003-07-25 06:55-0400\n"
 "Last-Translator: Pierre-Antoine Angelini <paangelini@users.sourceforge.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -16,98 +15,94 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \n"
 
-#: plugins/check_by_ssh.c:69 plugins/check_dig.c:65 plugins/check_disk.c:157
-#: plugins/check_fping.c:73 plugins/check_nagios.c:60 plugins/check_nt.c:100
-#: plugins/check_nwstat.c:121 plugins/check_radius.c:107
-#: plugins/check_ssh.c:52 plugins/check_tcp.c:210 plugins/check_users.c:45
-#: plugins/negate.c:79
+#: plugins/check_by_ssh.c:69 plugins/check_dig.c:68 plugins/check_disk.c:164
+#: plugins/check_fping.c:69 plugins/check_nagios.c:64 plugins/check_nt.c:103
+#: plugins/check_nwstat.c:125 plugins/check_radius.c:111
+#: plugins/check_ssh.c:56 plugins/check_tcp.c:211 plugins/check_users.c:49
+#: plugins/negate.c:83
 msgid "Could not parse arguments\n"
 msgstr ""
 
+#: plugins/check_by_ssh.c:74 plugins/check_dns.c:91 plugins/check_nagios.c:68
+#: plugins/check_pgsql.c:140 plugins/check_ping.c:84 plugins/negate.c:87
+msgid "Cannot catch SIGALRM"
+msgstr ""
+
 #: plugins/check_by_ssh.c:88
 #, c-format
 msgid "Unable to open pipe: %s"
 msgstr ""
 
-#: plugins/check_by_ssh.c:96 plugins/check_dig.c:85 plugins/check_dns.c:112
-#: plugins/check_fping.c:93 plugins/check_hpjd.c:114 plugins/check_load.c:112
-#: plugins/check_nagios.c:97 plugins/check_procs.c:123
-#: plugins/check_snmp.c:175 plugins/check_swap.c:112 plugins/check_users.c:56
-#: plugins/negate.c:93 plugins/urlize.c:89
+#: plugins/check_by_ssh.c:96 plugins/check_dig.c:89 plugins/check_dns.c:117
+#: plugins/check_fping.c:89 plugins/check_hpjd.c:118 plugins/check_load.c:115
+#: plugins/check_nagios.c:101 plugins/check_procs.c:129
+#: plugins/check_snmp.c:179 plugins/check_swap.c:137 plugins/check_users.c:60
+#: plugins/negate.c:97 plugins/urlize.c:93
 #, c-format
 msgid "Could not open stderr for %s\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:121
+#: plugins/check_by_ssh.c:123
 #, c-format
 msgid "SSH WARNING: could not open %s\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:128
-msgid "STATUS CODE: "
-msgstr ""
-
-#: plugins/check_by_ssh.c:139
-#, c-format
-msgid "STATUS CODE: %d"
-msgstr ""
-
-#: plugins/check_by_ssh.c:140
+#: plugins/check_by_ssh.c:142
 #, c-format
 msgid "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:224
+#: plugins/check_by_ssh.c:228
 msgid "timeout interval must be an integer"
 msgstr ""
 
-#: plugins/check_by_ssh.c:229
+#: plugins/check_by_ssh.c:234
 msgid "invalid host name"
 msgstr ""
 
-#: plugins/check_by_ssh.c:234
+#: plugins/check_by_ssh.c:239
 msgid "port must be an integer"
 msgstr ""
 
-#: plugins/check_by_ssh.c:279
+#: plugins/check_by_ssh.c:284
 #, c-format
 msgid "%s: You must provide a host name\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:281
+#: plugins/check_by_ssh.c:286
 #, c-format
 msgid "%s: Invalid host name %s\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:297
+#: plugins/check_by_ssh.c:302
 msgid "No remotecmd\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:315
+#: plugins/check_by_ssh.c:320
 #, c-format
 msgid ""
 "%s: In passive mode, you must provide a service name for each command.\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:318
+#: plugins/check_by_ssh.c:323
 #, c-format
 msgid ""
 "%s: In passive mode, you must provide the host short name from the nagios "
 "configs.\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:333
+#: plugins/check_by_ssh.c:338
 msgid ""
 "Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:336
+#: plugins/check_by_ssh.c:341
 msgid ""
 "This plugin uses SSH to execute commands on a remote host\n"
 "\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:346
+#: plugins/check_by_ssh.c:351
 msgid ""
 " -1, --proto1\n"
 "    tell ssh to use Protocol 1\n"
@@ -117,7 +112,7 @@ msgid ""
 "    tells ssh to fork rather than create a tty\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:354
+#: plugins/check_by_ssh.c:359
 msgid ""
 " -C, --command='COMMAND STRING'\n"
 "    command to execute on the remote machine\n"
@@ -133,7 +128,7 @@ msgid ""
 "    short name of host in nagios configuration [optional]\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:372
+#: plugins/check_by_ssh.c:377
 msgid ""
 "\n"
 "The most common mode of use is to refer to a local identity file with\n"
@@ -145,7 +140,7 @@ msgid ""
 "execute additional commands as proxy\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:381
+#: plugins/check_by_ssh.c:386
 msgid ""
 "\n"
 "To use passive mode, provide multiple '-C' options, and provide\n"
@@ -153,7 +148,7 @@ msgid ""
 "options)\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:394
+#: plugins/check_by_ssh.c:401
 #, c-format
 msgid ""
 "\n"
@@ -161,101 +156,99 @@ msgid ""
 "  -C <command> [-n name] [-s servicelist] [-O outputfile] [-p port]\n"
 msgstr ""
 
-#: plugins/check_dig.c:62
+#: plugins/check_dig.c:65
 msgid "Cannot catch SIGALRM\n"
 msgstr ""
 
-#: plugins/check_dig.c:79 plugins/check_dns.c:106 plugins/check_hpjd.c:108
-#: plugins/check_nagios.c:91 plugins/check_procs.c:117
-#: plugins/check_snmp.c:169 plugins/check_swap.c:106 plugins/check_users.c:50
-#: plugins/negate.c:89 plugins/urlize.c:83
+#: plugins/check_dig.c:83 plugins/check_dns.c:111 plugins/check_hpjd.c:112
+#: plugins/check_nagios.c:95 plugins/check_procs.c:123
+#: plugins/check_snmp.c:173 plugins/check_swap.c:131 plugins/check_users.c:54
+#: plugins/negate.c:93 plugins/urlize.c:87
 #, c-format
 msgid "Could not open pipe: %s\n"
 msgstr ""
 
-#: plugins/check_dig.c:104
+#: plugins/check_dig.c:108
 msgid "Server not found in ANSWER SECTION"
 msgstr ""
 
-#: plugins/check_dig.c:114
+#: plugins/check_dig.c:118
 msgid "No ANSWER SECTION found"
 msgstr ""
 
-#: plugins/check_dig.c:131
+#: plugins/check_dig.c:135
 msgid "dig returned error status"
 msgstr ""
 
-#: plugins/check_dig.c:137 plugins/check_dns.c:214 plugins/check_dns.c:217
-#: plugins/check_dns.c:220
+#: plugins/check_dig.c:142 plugins/check_dns.c:221 plugins/check_dns.c:224
+#: plugins/check_dns.c:227
 msgid " Probably a non-existent host/domain"
 msgstr ""
 
-#: plugins/check_dig.c:140
+#: plugins/check_dig.c:150
 #, c-format
-msgid "DNS OK - %d seconds response time (%s)\n"
+msgid "%.3f seconds response time (%s)"
 msgstr ""
 
-#: plugins/check_dig.c:143 plugins/check_dns.c:213
-#, c-format
-msgid "DNS WARNING - %s\n"
+#: plugins/check_dig.c:198 plugins/check_pgsql.c:210 plugins/check_ping.c:199
+#: plugins/check_time.c:206 plugins/negate.c:172 plugins/urlize.c:72
+msgid "Unknown argument"
 msgstr ""
 
-#: plugins/check_dig.c:145 plugins/check_dns.c:216
-#, c-format
-msgid "DNS CRITICAL - %s\n"
+#: plugins/check_dig.c:210 plugins/check_dig.c:265 plugins/check_hpjd.c:347
+#: plugins/check_real.c:368 plugins/check_smtp.c:314
+msgid "Invalid host name"
 msgstr ""
 
-#: plugins/check_dig.c:147 plugins/check_dns.c:219
-#, c-format
-msgid "DNS problem - %s\n"
+#: plugins/check_dig.c:218
+msgid "Server port must be a nonnegative integer"
 msgstr ""
 
-#: plugins/check_dig.c:184 plugins/check_pgsql.c:206 plugins/check_ping.c:194
-#: plugins/check_time.c:180 plugins/negate.c:168 plugins/urlize.c:68
-msgid "Unknown argument"
+#: plugins/check_dig.c:228
+msgid "Input causes overflow in warning interval"
 msgstr ""
 
-#: plugins/check_dig.c:196 plugins/check_dig.c:247 plugins/check_hpjd.c:343
-#: plugins/check_real.c:364 plugins/check_smtp.c:308
-msgid "Invalid host name"
+#: plugins/check_dig.c:231
+msgid "Warning interval must be a nonnegative integer"
 msgstr ""
 
-#: plugins/check_dig.c:204 plugins/check_time.c:245 plugins/check_udp.c:182
-msgid "Server port must be a nonnegative integer\n"
+#: plugins/check_dig.c:238
+msgid "Input causes overflow in critical interval"
 msgstr ""
 
-#: plugins/check_dig.c:215
-msgid "Warning interval must be a nonnegative integer\n"
+#: plugins/check_dig.c:241
+msgid "Critical interval must be a nonnegative integer"
 msgstr ""
 
-#: plugins/check_dig.c:223
-msgid "Critical interval must be a nonnegative integer\n"
+#: plugins/check_dig.c:249
+msgid "Time interval must be a nonnegative integer"
 msgstr ""
 
-#: plugins/check_dig.c:231 plugins/check_real.c:344 plugins/check_smtp.c:278
-msgid "Time interval must be a nonnegative integer\n"
+#: plugins/check_dig.c:301 plugins/urlize.c:132
+msgid ""
+"Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"
 msgstr ""
 
-#: plugins/check_dig.c:285
+#: plugins/check_dig.c:304
 msgid ""
 "Test the DNS service on the specified host using dig\n"
 "\n"
 msgstr ""
 
-#: plugins/check_dig.c:293
+#: plugins/check_dig.c:312
 msgid ""
 " -l, --lookup=STRING\n"
 "   machine name to lookup\n"
 msgstr ""
 
-#: plugins/check_dig.c:312
+#: plugins/check_dig.c:331
 #, c-format
 msgid ""
 "Usage: %s -H host -l lookup [-p <server port>] [-w <warning interval>]\n"
 "         [-c <critical interval>] [-t <timeout>] [-v]\n"
 msgstr ""
 
-#: plugins/check_disk.c:197
+#: plugins/check_disk.c:212
 #, c-format
 msgid ""
 "%s\n"
@@ -263,69 +256,70 @@ msgid ""
 "lu warn%%:%.0f%% crit%%:%.0f%%"
 msgstr ""
 
-#: plugins/check_disk.c:213
+#: plugins/check_disk.c:230
 #, c-format
 msgid "%s [%s not found]"
 msgstr ""
 
-#: plugins/check_disk.c:289
+#: plugins/check_disk.c:306
 msgid "Timeout Interval must be an integer!\n"
 msgstr ""
 
-#: plugins/check_disk.c:306 plugins/check_swap.c:247
+#: plugins/check_disk.c:323 plugins/check_swap.c:292
 msgid "Warning threshold must be integer or percentage!\n"
 msgstr ""
 
-#: plugins/check_disk.c:323 plugins/check_swap.c:264
+#: plugins/check_disk.c:340 plugins/check_swap.c:309
 msgid "Critical threshold must be integer or percentage!\n"
 msgstr ""
 
-#: plugins/check_disk.c:344
+#: plugins/check_disk.c:361
 #, c-format
 msgid "unit type %s not known\n"
 msgstr ""
 
-#: plugins/check_disk.c:347
+#: plugins/check_disk.c:364
 #, c-format
 msgid "failed allocating storage for '%s'\n"
 msgstr ""
 
-#: plugins/check_disk.c:414
+#: plugins/check_disk.c:431
 msgid "check_disk: unrecognized option\n"
 msgstr ""
 
-#: plugins/check_disk.c:471
+#: plugins/check_disk.c:488
 msgid "INPUT ERROR: No thresholds specified"
 msgstr ""
 
-#: plugins/check_disk.c:477
+#: plugins/check_disk.c:494
 #, c-format
 msgid ""
 "INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be "
 "between zero and 100 percent, inclusive"
 msgstr ""
 
-#: plugins/check_disk.c:484
+#: plugins/check_disk.c:501
 #, c-format
 msgid ""
 "INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be "
 "greater than zero"
 msgstr ""
 
-#: plugins/check_disk.c:549 plugins/check_dummy.c:80 plugins/check_http.c:995
-#: plugins/check_mrtg.c:303 plugins/check_mrtgtraf.c:325
-#: plugins/check_nwstat.c:899 plugins/check_overcr.c:419
+#: plugins/check_disk.c:566 plugins/check_dns.c:406 plugins/check_dummy.c:84
+#: plugins/check_hpjd.c:381 plugins/check_http.c:1103 plugins/check_mrtg.c:307
+#: plugins/check_mrtgtraf.c:325 plugins/check_nwstat.c:903
+#: plugins/check_overcr.c:423 plugins/check_tcp.c:596
 msgid "Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n"
 msgstr ""
 
-#: plugins/check_disk.c:552
+#: plugins/check_disk.c:569
 msgid ""
 "This plugin checks the amount of used disk space on a mounted file system\n"
 "and generates an alert if free space is less than one of the threshold "
 "values."
 msgstr ""
 
-#: plugins/check_disk.c:560
+#: plugins/check_disk.c:577
 #, c-format
 msgid ""
 " -w, --warning=INTEGER\n"
@@ -341,7 +335,7 @@ msgid ""
 "    Clear thresholds\n"
 msgstr ""
 
-#: plugins/check_disk.c:572
+#: plugins/check_disk.c:589
 msgid ""
 " -u, --units=STRING\n"
 "    Choose bytes, kB, MB, GB, TB (default: MB)\n"
@@ -351,7 +345,7 @@ msgid ""
 "    Same as '--units MB'\n"
 msgstr ""
 
-#: plugins/check_disk.c:580
+#: plugins/check_disk.c:597
 msgid ""
 " -l, --local\n"
 "    Only check local filesystems\n"
@@ -367,14 +361,14 @@ msgid ""
 "    Display only devices/mountpoints with errors\n"
 msgstr ""
 
-#: plugins/check_disk.c:600
+#: plugins/check_disk.c:617
 msgid ""
 "Examples:\n"
 " check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n"
 "   Checks /tmp and /var at 10%,5% and / at 100MB, 50MB\n"
 msgstr ""
 
-#: plugins/check_disk.c:613
+#: plugins/check_disk.c:630
 #, c-format
 msgid ""
 "Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e]\n"
@@ -383,104 +377,114 @@ msgid ""
 "       %s (-V|--version)\n"
 msgstr ""
 
-#: plugins/check_dns.c:86 plugins/check_nagios.c:64 plugins/check_pgsql.c:136
-#: plugins/check_ping.c:79 plugins/negate.c:83
-msgid "Cannot catch SIGALRM"
-msgstr ""
-
-#: plugins/check_dns.c:124 plugins/check_dns.c:153
+#: plugins/check_dns.c:129 plugins/check_dns.c:158
 msgid "Unknown error (plugin)"
 msgstr ""
 
-#: plugins/check_dns.c:148
+#: plugins/check_dns.c:153
 #, c-format
 msgid "DNS CRITICAL - '%s' returned empty host name string\n"
 msgstr ""
 
-#: plugins/check_dns.c:185
+#: plugins/check_dns.c:190
 msgid "nslookup returned error status"
 msgstr ""
 
-#: plugins/check_dns.c:192
+#: plugins/check_dns.c:197
 #, c-format
 msgid "DNS CRITICAL - '%s' output parsing exited with no address\n"
 msgstr ""
 
-#: plugins/check_dns.c:198
+#: plugins/check_dns.c:203
 #, c-format
 msgid "expected %s but got %s"
 msgstr ""
 
-#: plugins/check_dns.c:209
+#: plugins/check_dns.c:215
+#, c-format
+msgid "DNS ok - %.3f seconds response time, address%s %s|%s\n"
+msgstr ""
+
+#: plugins/check_dns.c:220
+#, c-format
+msgid "DNS WARNING - %s\n"
+msgstr ""
+
+#: plugins/check_dns.c:223
 #, c-format
-msgid "DNS ok - %.3f seconds response time, address%s %s|time=%.3f\n"
+msgid "DNS CRITICAL - %s\n"
 msgstr ""
 
-#: plugins/check_dns.c:237
+#: plugins/check_dns.c:226
+#, c-format
+msgid "DNS problem - %s\n"
+msgstr ""
+
+#: plugins/check_dns.c:244
 #, c-format
 msgid "No response from name server %s\n"
 msgstr ""
 
-#: plugins/check_dns.c:241
+#: plugins/check_dns.c:248
 #, c-format
 msgid "Name server %s has no records\n"
 msgstr ""
 
-#: plugins/check_dns.c:248
+#: plugins/check_dns.c:255
 #, c-format
 msgid "Connection to name server %s was refused\n"
 msgstr ""
 
-#: plugins/check_dns.c:254
+#: plugins/check_dns.c:261
 #, c-format
 msgid "Domain %s was not found by the server\n"
 msgstr ""
 
-#: plugins/check_dns.c:258
+#: plugins/check_dns.c:265
 msgid "Network is unreachable\n"
 msgstr ""
 
-#: plugins/check_dns.c:262
+#: plugins/check_dns.c:269
 #, c-format
 msgid "Server failure for %s\n"
 msgstr ""
 
-#: plugins/check_dns.c:307 plugins/check_fping.c:243 plugins/check_game.c:200
-#: plugins/check_overcr.c:331 plugins/check_radius.c:209
-#: plugins/check_tcp.c:401 plugins/check_udp.c:143 plugins/check_users.c:130
+#: plugins/check_dns.c:314 plugins/check_fping.c:243 plugins/check_game.c:210
+#: plugins/check_overcr.c:335 plugins/check_radius.c:213
+#: plugins/check_tcp.c:402 plugins/check_udp.c:147 plugins/check_users.c:134
 #, c-format
 msgid ""
 "%s: Unknown argument: %s\n"
 "\n"
 msgstr ""
 
-#: plugins/check_dns.c:324 plugins/check_dns.c:336 plugins/check_dns.c:347
-#: plugins/check_dns.c:352 plugins/check_dns.c:362 plugins/check_dns.c:373
-#: plugins/check_game.c:217 plugins/check_game.c:225
+#: plugins/check_dns.c:331 plugins/check_dns.c:343 plugins/check_dns.c:354
+#: plugins/check_dns.c:359 plugins/check_dns.c:369 plugins/check_dns.c:380
+#: plugins/check_game.c:227 plugins/check_game.c:235
 msgid "Input buffer overflow\n"
 msgstr ""
 
-#: plugins/check_dns.c:331
+#: plugins/check_dns.c:338
 msgid ""
 "Invalid server name/address\n"
 "\n"
 msgstr ""
 
-#: plugins/check_dns.c:342 plugins/check_fping.c:257
-#: plugins/check_radius.c:223
+#: plugins/check_dns.c:349 plugins/check_fping.c:257
+#: plugins/check_radius.c:227
 msgid ""
 "Invalid host name/address\n"
 "\n"
 msgstr ""
 
-#: plugins/check_dns.c:369
+#: plugins/check_dns.c:376
 #, c-format
 msgid ""
 "Invalid name/address: %s\n"
 "\n"
 msgstr ""
 
-#: plugins/check_dns.c:405
+#: plugins/check_dns.c:413
 msgid ""
 "-H, --hostname=HOST\n"
 "   The name or address you want to query\n"
@@ -490,7 +494,7 @@ msgid ""
 "   Optional IP address you expect the DNS server to return\n"
 msgstr ""
 
-#: plugins/check_dns.c:415
+#: plugins/check_dns.c:423
 msgid ""
 "\n"
 "This plugin uses the nslookup program to obtain the IP address\n"
@@ -499,7 +503,7 @@ msgid ""
 "specified in /etc/resolv.conf will be used.\n"
 msgstr ""
 
-#: plugins/check_dns.c:430
+#: plugins/check_dns.c:438
 #, c-format
 msgid ""
 "Usage: %s -H host [-s server] [-a expected-address] [-t timeout]\n"
@@ -507,91 +511,93 @@ msgid ""
 "       %s --version\n"
 msgstr ""
 
-#: plugins/check_dummy.c:38
+#: plugins/check_dummy.c:42
 msgid "Incorrect number of arguments supplied\n"
 msgstr ""
 
-#: plugins/check_dummy.c:48
+#: plugins/check_dummy.c:52
 msgid "Arguments to check_dummy must be an integer\n"
 msgstr ""
 
-#: plugins/check_dummy.c:87
+#: plugins/check_dummy.c:91
 msgid ""
 "\n"
 "This plugin will simply return the state corresponding to the numeric value\n"
 "of the <state> argument.\n"
 msgstr ""
 
-#: plugins/check_dummy.c:99
+#: plugins/check_dummy.c:103
 #, c-format
 msgid "Usage: %s <integer state>\n"
 msgstr ""
 
-#: plugins/check_fping.c:87
+#: plugins/check_fping.c:83
 #, c-format
 msgid "Unable to open pipe: %s\n"
 msgstr ""
 
-#: plugins/check_fping.c:134
+#: plugins/check_fping.c:130
 #, c-format
 msgid "FPING unknown - %s not found\n"
 msgstr ""
 
-#: plugins/check_fping.c:138
+#: plugins/check_fping.c:134
 #, c-format
 msgid "FPING critical - %s is unreachable\n"
 msgstr ""
 
-#: plugins/check_fping.c:143
+#: plugins/check_fping.c:139
 #, c-format
 msgid "FPING critical - %s is down\n"
 msgstr ""
 
-#: plugins/check_fping.c:169
+#: plugins/check_fping.c:166
 #, c-format
-msgid "FPING %s - %s (loss=%f%%, rta=%f ms)\n"
+msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"
 msgstr ""
 
-#: plugins/check_fping.c:188
+#: plugins/check_fping.c:187
 #, c-format
-msgid "FPING %s - %s (loss=%f%% )\n"
+msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
 msgstr ""
 
-#: plugins/check_fping.c:289
+#: plugins/check_fping.c:293
 msgid "Packet size must be a positive integer"
 msgstr ""
 
-#: plugins/check_fping.c:295
+#: plugins/check_fping.c:299
 msgid "Packet count must be a positive integer"
 msgstr ""
 
-#: plugins/check_fping.c:302
+#: plugins/check_fping.c:306
 msgid ""
 "Host name was not supplied\n"
 "\n"
 msgstr ""
 
-#: plugins/check_fping.c:325
+#: plugins/check_fping.c:329
 #, c-format
 msgid "%s: Only one threshold may be packet loss (%s)\n"
 msgstr ""
 
-#: plugins/check_fping.c:329
+#: plugins/check_fping.c:333
 #, c-format
 msgid "%s: Only one threshold must be packet loss (%s)\n"
 msgstr ""
 
-#: plugins/check_fping.c:362
+#: plugins/check_fping.c:365
+msgid "Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n"
+msgstr ""
+
+#: plugins/check_fping.c:368
 msgid ""
-"Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n"
-"\n"
 "This plugin will use the /bin/fping command (from saint) to ping the\n"
 "specified host for a fast check if the host is alive. Note that it is\n"
 "necessary to set the suid flag on fping.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_fping.c:372
+#: plugins/check_fping.c:377
 #, c-format
 msgid ""
 " -H, --hostname=HOST\n"
@@ -607,7 +613,7 @@ msgid ""
 "    Number of ICMP packets to send (default: %d)\n"
 msgstr ""
 
-#: plugins/check_fping.c:388
+#: plugins/check_fping.c:393
 #, c-format
 msgid ""
 "\n"
@@ -616,38 +622,38 @@ msgid ""
 "percentage of packet loss to trigger an alarm state.\n"
 msgstr ""
 
-#: plugins/check_fping.c:402
+#: plugins/check_fping.c:407
 #, c-format
 msgid "Usage: %s <host_address>\n"
 msgstr ""
 
-#: plugins/check_game.c:66 plugins/check_snmp.c:157
+#: plugins/check_game.c:70 plugins/check_snmp.c:161
 msgid "Incorrect arguments supplied\n"
 msgstr ""
 
-#: plugins/check_game.c:69
+#: plugins/check_game.c:73
 msgid "Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n"
 msgstr ""
 
-#: plugins/check_game.c:70
+#: plugins/check_game.c:74
 msgid "License: GPL\n"
 msgstr ""
 
-#: plugins/check_game.c:90
+#: plugins/check_game.c:94
 #, c-format
 msgid "Error - Could not open pipe: %s\n"
 msgstr ""
 
-#: plugins/check_game.c:110
+#: plugins/check_game.c:114
 msgid "ERROR: Host type parameter incorrect!\n"
 msgstr ""
 
-#: plugins/check_game.c:286
+#: plugins/check_game.c:313
 #, fuzzy, c-format
 msgid "This plugin tests %s connections with the specified host."
 msgstr "Le plugin tests a %s connection with l'host specified\n"
 
-#: plugins/check_game.c:292
+#: plugins/check_game.c:319
 msgid ""
 "<game>        = Game type that is recognised by qstat (without the leading "
 "dash)\n"
@@ -658,7 +664,7 @@ msgid ""
 " [ping_field]  = Field number in raw qstat output that contains ping time\n"
 msgstr ""
 
-#: plugins/check_game.c:302
+#: plugins/check_game.c:329
 msgid ""
 "\n"
 "Notes:\n"
@@ -670,310 +676,338 @@ msgid ""
 "plugin.\n"
 msgstr ""
 
-#: plugins/check_game.c:317
+#: plugins/check_game.c:344
 #, c-format
 msgid ""
 "Usage: %s <game> <ip_address> [-p port] [-gf game_field] [-mf map_field]\n"
 "  [-pf ping_field]\n"
 msgstr ""
 
-#: plugins/check_hpjd.c:83 plugins/check_mrtg.c:57 plugins/check_mrtgtraf.c:67
-#: plugins/check_mysql.c:47 plugins/check_real.c:65 plugins/check_smtp.c:69
-#: plugins/check_swap.c:77 plugins/check_time.c:58
+#: plugins/check_hpjd.c:87 plugins/check_mrtg.c:61 plugins/check_mrtgtraf.c:67
+#: plugins/check_mysql.c:51 plugins/check_real.c:69 plugins/check_smtp.c:74
+#: plugins/check_swap.c:78 plugins/check_time.c:63
 msgid "Invalid command arguments supplied\n"
 msgstr ""
 
-#: plugins/check_hpjd.c:218
+#: plugins/check_hpjd.c:222
 msgid "Paper Jam"
 msgstr ""
 
-#: plugins/check_hpjd.c:222
+#: plugins/check_hpjd.c:226
 msgid "Out of Paper"
 msgstr ""
 
-#: plugins/check_hpjd.c:227
+#: plugins/check_hpjd.c:231
 msgid "Printer Offline"
 msgstr ""
 
-#: plugins/check_hpjd.c:232
+#: plugins/check_hpjd.c:236
 msgid "Peripheral Error"
 msgstr ""
 
-#: plugins/check_hpjd.c:236
+#: plugins/check_hpjd.c:240
 msgid "Intervention Required"
 msgstr ""
 
-#: plugins/check_hpjd.c:240
+#: plugins/check_hpjd.c:244
 msgid "Toner Low"
 msgstr ""
 
-#: plugins/check_hpjd.c:244
+#: plugins/check_hpjd.c:248
 msgid "Insufficient Memory"
 msgstr ""
 
-#: plugins/check_hpjd.c:248
+#: plugins/check_hpjd.c:252
 msgid "A Door is Open"
 msgstr ""
 
-#: plugins/check_hpjd.c:252
+#: plugins/check_hpjd.c:256
 msgid "Output Tray is Full"
 msgstr ""
 
-#: plugins/check_hpjd.c:256
+#: plugins/check_hpjd.c:260
 msgid "Data too Slow for Engine"
 msgstr ""
 
-#: plugins/check_hpjd.c:260
+#: plugins/check_hpjd.c:264
 msgid "Unknown Paper Error"
 msgstr ""
 
-#: plugins/check_hpjd.c:265
+#: plugins/check_hpjd.c:269
 #, c-format
 msgid "Printer ok - (%s)\n"
 msgstr ""
 
-#: plugins/check_hpjd.c:320 plugins/check_mysql.c:128 plugins/check_real.c:302
-#: plugins/check_smtp.c:230
+#: plugins/check_hpjd.c:324 plugins/check_mysql.c:132 plugins/check_real.c:306
+#: plugins/check_smtp.c:236
 msgid "Invalid host name\n"
 msgstr ""
 
-#: plugins/check_hpjd.c:333 plugins/check_load.c:219 plugins/check_mrtg.c:224
-#: plugins/check_mrtgtraf.c:264 plugins/check_mysql.c:150
-#: plugins/check_real.c:354 plugins/check_smtp.c:298 plugins/check_swap.c:279
+#: plugins/check_hpjd.c:337 plugins/check_load.c:230 plugins/check_mrtg.c:228
+#: plugins/check_mrtgtraf.c:264 plugins/check_mysql.c:154
+#: plugins/check_real.c:358 plugins/check_smtp.c:304 plugins/check_swap.c:324
 msgid "Invalid argument\n"
 msgstr ""
 
-#: plugins/check_hpjd.c:379
+#: plugins/check_hpjd.c:384
 msgid ""
 "This plugin tests the STATUS of an HP printer with a JetDirect card.\n"
 "Net-snmp must be installed on the computer running the plugin.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_hpjd.c:387
+#: plugins/check_hpjd.c:392
 #, c-format
 msgid ""
 " -C, --community=STRING\n"
 "    The SNMP community name (default=%s)\n"
 msgstr ""
 
-#: plugins/check_hpjd.c:400
+#: plugins/check_hpjd.c:405
 #, c-format
 msgid "Usage: %s -H host [-C community]\n"
 msgstr ""
 
-#: plugins/check_http.c:135
+#: plugins/check_http.c:141
 msgid "check_http: could not parse arguments\n"
 msgstr ""
 
-#: plugins/check_http.c:156
+#: plugins/check_http.c:162
 msgid "HTTP CRITICAL - Could not make SSL connection\n"
 msgstr ""
 
-#: plugins/check_http.c:162 plugins/check_http.c:499
+#: plugins/check_http.c:168 plugins/check_http.c:495
 msgid "ERROR: Cannot retrieve server certificate.\n"
 msgstr ""
 
-#: plugins/check_http.c:233
+#: plugins/check_http.c:239
 msgid "unknown argument"
 msgstr ""
 
-#: plugins/check_http.c:245
+#: plugins/check_http.c:251
 msgid "timeout interval must be a non-negative integer"
 msgstr ""
 
-#: plugins/check_http.c:251
+#: plugins/check_http.c:257
 msgid "invalid critical threshold"
 msgstr ""
 
-#: plugins/check_http.c:259
+#: plugins/check_http.c:265
 msgid "invalid warning threshold"
 msgstr ""
 
-#: plugins/check_http.c:273 plugins/check_http.c:288
+#: plugins/check_http.c:279 plugins/check_http.c:294
 msgid "check_http: invalid option - SSL is not available\n"
 msgstr ""
 
-#: plugins/check_http.c:282
+#: plugins/check_http.c:288
 msgid "invalid certificate expiration period"
 msgstr ""
 
-#: plugins/check_http.c:303
+#: plugins/check_http.c:309
 #, c-format
 msgid "option f:%d \n"
 msgstr ""
 
-#: plugins/check_http.c:318
+#: plugins/check_http.c:324
 msgid "invalid port number"
 msgstr ""
 
-#: plugins/check_http.c:346
+#: plugins/check_http.c:352
 msgid "check_http: call for regex which was not a compiled option\n"
 msgstr ""
 
-#: plugins/check_http.c:360
+#: plugins/check_http.c:366
 #, c-format
 msgid "Could Not Compile Regular Expression: %s"
 msgstr ""
 
-#: plugins/check_http.c:372 plugins/check_ldap.c:233 plugins/check_ping.c:217
-#: plugins/check_smtp.c:288 plugins/check_ssh.c:124 plugins/check_tcp.c:420
+#: plugins/check_http.c:378 plugins/check_ldap.c:241 plugins/check_ping.c:222
+#: plugins/check_smtp.c:294 plugins/check_ssh.c:128 plugins/check_tcp.c:421
 msgid "IPv6 support not available\n"
 msgstr ""
 
-#: plugins/check_http.c:394
+#: plugins/check_http.c:400
 msgid "check_http: you must specify a server address or host name\n"
 msgstr ""
 
-#: plugins/check_http.c:492 plugins/check_http.c:507
-msgid "Unable to open TCP socket"
+#: plugins/check_http.c:488 plugins/check_http.c:503
+msgid "Unable to open TCP socket\n"
 msgstr ""
 
-#: plugins/check_http.c:566
+#: plugins/check_http.c:561
 msgid "Client Certificate Required\n"
 msgstr ""
 
-#: plugins/check_http.c:568 plugins/check_http.c:573
-msgid "Error in recv()"
+#: plugins/check_http.c:563 plugins/check_http.c:568
+msgid "Error in recv()\n"
 msgstr ""
 
-#: plugins/check_http.c:581
+#: plugins/check_http.c:576
 #, c-format
-msgid "No data received %s"
+msgid "No data received %s\n"
 msgstr ""
 
-#: plugins/check_http.c:624
+#: plugins/check_http.c:620
 msgid "Invalid HTTP response received from host\n"
 msgstr ""
 
-#: plugins/check_http.c:627
+#: plugins/check_http.c:623
 #, c-format
 msgid "Invalid HTTP response received from host on port %d\n"
 msgstr ""
 
-#: plugins/check_http.c:635
+#: plugins/check_http.c:631
 #, c-format
 msgid "HTTP OK: Status line output matched \"%s\"\n"
 msgstr ""
 
-#: plugins/check_http.c:650
+#: plugins/check_http.c:643
 #, c-format
-msgid "HTTP CRITICAL: %s\n"
+msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
 msgstr ""
 
-#: plugins/check_http.c:659
+#: plugins/check_http.c:650
 #, c-format
-msgid "HTTP WARNING: %s\n"
-msgstr ""
-
-#: plugins/check_http.c:675
-msgid "ERROR: could not allocate server_address"
+msgid "HTTP CRITICAL: Invalid Status (%s)\n"
 msgstr ""
 
-#: plugins/check_http.c:679
-msgid "ERROR: could not allocate server_url"
+#: plugins/check_http.c:654
+#, c-format
+msgid "HTTP CRITICAL: %s\n"
 msgstr ""
 
-#: plugins/check_http.c:727
+#: plugins/check_http.c:658
 #, c-format
-msgid "UNKNOWN - Could not find redirect location - %s%s"
+msgid "HTTP WARNING: %s\n"
 msgstr ""
 
-#: plugins/check_http.c:733
+#: plugins/check_http.c:666
 msgid "UNKNOWN"
 msgstr ""
 
-#: plugins/check_http.c:735 plugins/check_http.c:828
+#: plugins/check_http.c:668 plugins/check_http.c:918 plugins/check_procs.c:249
 msgid "OK"
 msgstr ""
 
-#: plugins/check_http.c:737
+#: plugins/check_http.c:670 plugins/check_procs.c:251
 msgid "WARNING"
 msgstr ""
 
-#: plugins/check_http.c:739
+#: plugins/check_http.c:672 plugins/check_procs.c:256
 msgid "CRITICAL"
 msgstr ""
 
-#: plugins/check_http.c:742
+#: plugins/check_http.c:676
 #, c-format
-msgid " - %s - %.3f second response time %s%s|time=%ldus size=%dB\n"
+msgid " - %s - %.3f second response time %s%s|%s %s\n"
 msgstr ""
 
-#: plugins/check_http.c:755
+#: plugins/check_http.c:688
 #, c-format
-msgid "HTTP problem: %s - %.3f second response time %s%s|time=%ldus size=%dB\n"
+msgid "HTTP problem: %s - %.3f second response time %s%s|%s %s\n"
 msgstr ""
 
-#: plugins/check_http.c:768 plugins/check_http.c:783 plugins/check_http.c:811
+#: plugins/check_http.c:702 plugins/check_http.c:719
 #, c-format
-msgid "HTTP OK %s - %.3f second response time %s%s|time=%ldus size=%dB\n"
+msgid "HTTP OK %s - %.3f second response time %s%s|%s %s\n"
 msgstr ""
 
-#: plugins/check_http.c:774
+#: plugins/check_http.c:709
 #, c-format
-msgid ""
-"CRITICAL - string not found%s|time=%ldus\n"
-" size=%dB"
+msgid "CRITICAL - string not found%s|%s %s\n"
 msgstr ""
 
-#: plugins/check_http.c:790
+#: plugins/check_http.c:727
 #, c-format
-msgid "CRITICAL - pattern not found%s|time=%ldus size=%dB\n"
+msgid "CRITICAL - pattern not found%s|%s %s\n"
 msgstr ""
 
-#: plugins/check_http.c:796
+#: plugins/check_http.c:734
 #, c-format
 msgid "CRITICAL - Execute Error: %s\n"
 msgstr ""
 
-#: plugins/check_http.c:806
+#: plugins/check_http.c:744
 #, c-format
-msgid "HTTP WARNING: page size too small%s|size=%i\n"
+msgid "HTTP WARNING: page size %d too small%s|%s\n"
+msgstr ""
+
+#: plugins/check_http.c:749
+#, c-format
+msgid "HTTP OK %s - %d bytes in %.3f seconds %s%s|%s %s\n"
+msgstr ""
+
+#: plugins/check_http.c:785
+msgid "ERROR: could not allocate addr\n"
+msgstr ""
+
+#: plugins/check_http.c:789 plugins/check_http.c:809
+msgid "ERROR: could not allocate url\n"
 msgstr ""
 
-#: plugins/check_http.c:828
+#: plugins/check_http.c:799
+#, c-format
+msgid "UNKNOWN - Could not find redirect location - %s%s\n"
+msgstr ""
+
+#: plugins/check_http.c:852
+#, c-format
+msgid "UNKNOWN - Could not parse redirect location - %s%s\n"
+msgstr ""
+
+#: plugins/check_http.c:862
+#, c-format
+msgid "WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"
+msgstr ""
+
+#: plugins/check_http.c:870
+#, c-format
+msgid "WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"
+msgstr ""
+
+#: plugins/check_http.c:918
 #, c-format
 msgid "SSL seeding: %s\n"
 msgstr ""
 
-#: plugins/check_http.c:828
+#: plugins/check_http.c:918
 msgid "Failed"
 msgstr ""
 
-#: plugins/check_http.c:835
+#: plugins/check_http.c:925
 msgid "CRITICAL -  Cannot create SSL context.\n"
 msgstr ""
 
-#: plugins/check_http.c:859
+#: plugins/check_http.c:949
 msgid "CRITICAL - Cannot initiate SSL handshake.\n"
 msgstr ""
 
-#: plugins/check_http.c:887 plugins/check_http.c:899
+#: plugins/check_http.c:977 plugins/check_http.c:989
 msgid "CRITICAL - Wrong time format in certificate.\n"
 msgstr ""
 
-#: plugins/check_http.c:928
+#: plugins/check_http.c:1018
 #, c-format
 msgid "WARNING - Certificate expires in %d day(s) (%s).\n"
 msgstr ""
 
-#: plugins/check_http.c:932
+#: plugins/check_http.c:1022
 #, c-format
 msgid "CRITICAL - Certificate expired on %s.\n"
 msgstr ""
 
-#: plugins/check_http.c:937
+#: plugins/check_http.c:1027
 #, c-format
 msgid "WARNING - Certificate expires today (%s).\n"
 msgstr ""
 
-#: plugins/check_http.c:941
+#: plugins/check_http.c:1031
 #, c-format
 msgid "OK - Certificate will expire on %s.\n"
 msgstr ""
 
-#: plugins/check_http.c:998
+#: plugins/check_http.c:1106
 msgid ""
 "This plugin tests the HTTP service on the specified host. It can test\n"
 "normal (http) and secure (https) servers, follow redirects, search for\n"
@@ -981,11 +1015,11 @@ msgid ""
 "certificate expiration times.\n"
 msgstr ""
 
-#: plugins/check_http.c:1006
+#: plugins/check_http.c:1114
 msgid "NOTE: One or both of -H and -I must be specified\n"
 msgstr ""
 
-#: plugins/check_http.c:1010
+#: plugins/check_http.c:1118
 #, fuzzy, c-format
 msgid ""
 " -H, --hostname=ADDRESS\n"
@@ -1006,7 +1040,7 @@ msgstr ""
 " -6, --use-ipv6\n"
 "    Use IPv6 connection\n"
 
-#: plugins/check_http.c:1021
+#: plugins/check_http.c:1129
 msgid ""
 " -S, --ssl\n"
 "    Connect via SSL\n"
@@ -1015,7 +1049,7 @@ msgid ""
 "    (when this option is used the url is not checked.)\n"
 msgstr ""
 
-#: plugins/check_http.c:1029
+#: plugins/check_http.c:1137
 #, c-format
 msgid ""
 " -e, --expect=STRING\n"
@@ -1030,7 +1064,7 @@ msgid ""
 "   URL encoded http POST data\n"
 msgstr ""
 
-#: plugins/check_http.c:1041
+#: plugins/check_http.c:1149
 msgid ""
 " -l, --linespan\n"
 "    Allow regex to span newlines (must precede -r or -R)\n"
@@ -1040,7 +1074,7 @@ msgid ""
 "    Search page for case-insensitive regex STRING\n"
 msgstr ""
 
-#: plugins/check_http.c:1050
+#: plugins/check_http.c:1158
 msgid ""
 " -a, --authorization=AUTH_PAIR\n"
 "   Username:password on sites with basic authentication\n"
@@ -1052,7 +1086,7 @@ msgid ""
 "   Minimum page size required (bytes)\n"
 msgstr ""
 
-#: plugins/check_http.c:1066
+#: plugins/check_http.c:1174
 msgid ""
 "This plugin will attempt to open an HTTP connection with the host. "
 "Successful\n"
@@ -1064,7 +1098,7 @@ msgid ""
 "(fully qualified domain name) as the [host_name] argument.\n"
 msgstr ""
 
-#: plugins/check_http.c:1075
+#: plugins/check_http.c:1183
 msgid ""
 "\n"
 "This plugin can also check whether an SSL enabled web server is able to\n"
@@ -1072,7 +1106,7 @@ msgid ""
 "certificate is still valid for the specified number of days.\n"
 msgstr ""
 
-#: plugins/check_http.c:1079
+#: plugins/check_http.c:1187
 msgid ""
 "\n"
 "CHECK CONTENT: check_http -w 5 -c 10 --ssl www.verisign.com\n"
@@ -1085,7 +1119,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_http.c:1086
+#: plugins/check_http.c:1194
 msgid ""
 "CHECK CERTIFICATE: check_http www.verisign.com -C 14\n"
 "\n"
@@ -1098,7 +1132,7 @@ msgid ""
 "the certificate is expired.\n"
 msgstr ""
 
-#: plugins/check_http.c:1104
+#: plugins/check_http.c:1212
 #, c-format
 msgid ""
 "Usage: %s (-H <vhost> | -I <IP-address>) [-u <uri>] [-p <port>]\n"
@@ -1177,79 +1211,69 @@ msgid ""
 " -V, --version\n"
 msgstr ""
 
-#: plugins/check_ide-smart.c:432
+#: plugins/check_ide-smart.c:436
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: plugins/check_ide-smart.c:449
+#: plugins/check_ide-smart.c:453
 #, c-format
 msgid "Critical: Couldn't open device: %s\n"
 msgstr ""
 
-#: plugins/check_ide-smart.c:454
+#: plugins/check_ide-smart.c:458
 msgid "Critical: SMART_CMD_ENABLE\n"
 msgstr ""
 
-#: plugins/check_ldap.c:68
+#: plugins/check_ldap.c:74
 msgid "check_ldap: could not parse arguments\n"
 msgstr ""
 
-#: plugins/check_ldap.c:82
+#: plugins/check_ldap.c:88
 #, c-format
 msgid "Could not connect to the server at port %i\n"
 msgstr ""
 
-#: plugins/check_ldap.c:90
+#: plugins/check_ldap.c:96
 #, c-format
 msgid "Could not set protocol version %d\n"
 msgstr ""
 
-#: plugins/check_ldap.c:98
+#: plugins/check_ldap.c:104
 msgid "Could not bind to the ldap-server\n"
 msgstr ""
 
-#: plugins/check_ldap.c:106
+#: plugins/check_ldap.c:112
 #, c-format
 msgid "Could not search/find objectclasses in %s\n"
 msgstr ""
 
-#: plugins/check_ldap.c:123
-#, c-format
-msgid "LDAP CRITICAL - %i seconds response time\n"
-msgstr ""
-
-#: plugins/check_ldap.c:128
+#: plugins/check_ldap.c:135
 #, c-format
-msgid "LDAP WARNING - %i seconds response time\n"
+msgid "LDAP %s - %.3f seconds response time|%s\n"
 msgstr ""
 
-#: plugins/check_ldap.c:133
-#, c-format
-msgid "LDAP OK - %i seconds response time\n"
-msgstr ""
-
-#: plugins/check_ldap.c:190
+#: plugins/check_ldap.c:198
 msgid "timeout interval must be a positive integer"
 msgstr ""
 
-#: plugins/check_ldap.c:237
+#: plugins/check_ldap.c:245
 msgid "check_ldap: could not parse unknown arguments\n"
 msgstr ""
 
-#: plugins/check_ldap.c:256
+#: plugins/check_ldap.c:264
 msgid "please specify the host name\n"
 msgstr ""
 
-#: plugins/check_ldap.c:259
+#: plugins/check_ldap.c:267
 msgid "please specify the LDAP base\n"
 msgstr ""
 
-#: plugins/check_ldap.c:278
+#: plugins/check_ldap.c:286
 msgid "Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n"
 msgstr ""
 
-#: plugins/check_ldap.c:289
+#: plugins/check_ldap.c:297
 msgid ""
 " -a [--attr]\n"
 "    ldap attribute to search (default: \"(objectclass=*)\"\n"
@@ -1261,7 +1285,7 @@ msgid ""
 "    ldap password (if required)\n"
 msgstr ""
 
-#: plugins/check_ldap.c:300
+#: plugins/check_ldap.c:308
 #, c-format
 msgid ""
 " -2 [--ver2]\n"
@@ -1271,7 +1295,7 @@ msgid ""
 "    (default protocol version: %d)\n"
 msgstr ""
 
-#: plugins/check_ldap.c:324
+#: plugins/check_ldap.c:332
 #, c-format
 msgid ""
 "Usage: %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]\n"
@@ -1279,107 +1303,92 @@ msgid ""
 "(Note: all times are in seconds.)\n"
 msgstr ""
 
-#: plugins/check_load.c:88 plugins/check_load.c:107
+#: plugins/check_load.c:91 plugins/check_load.c:110
 #, c-format
 msgid "Error opening %s\n"
 msgstr ""
 
-#: plugins/check_load.c:119
+#: plugins/check_load.c:122
 #, c-format
 msgid "Error code %d returned in %s\n"
 msgstr ""
 
-#: plugins/check_load.c:127
+#: plugins/check_load.c:131
 msgid "Error in getloadavg()\n"
 msgstr ""
 
-#: plugins/check_load.c:130 plugins/check_load.c:132
+#: plugins/check_load.c:134 plugins/check_load.c:136
 #, c-format
 msgid "Error processing %s\n"
 msgstr ""
 
-#: plugins/check_load.c:137
+#: plugins/check_load.c:142
 #, c-format
 msgid "load average: %.2f, %.2f, %.2f"
 msgstr ""
 
-#: plugins/check_load.c:139
-#, c-format
-msgid "CRITICAL - %s\n"
-msgstr ""
-
-#: plugins/check_load.c:143
-#, c-format
-msgid "WARNING - %s\n"
-msgstr ""
-
-#: plugins/check_load.c:146
-#, c-format
-msgid "OK - %s\n"
-msgstr ""
-
-#: plugins/check_load.c:194
+#: plugins/check_load.c:205
 msgid "Warning threshold must be float or float triplet!\n"
 msgstr ""
 
-#: plugins/check_load.c:210
+#: plugins/check_load.c:221
 msgid "Critical threshold must be float or float triplet!\n"
 msgstr ""
 
-#: plugins/check_load.c:265
+#: plugins/check_load.c:276
 msgid "Warning threshold for 1-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:267
+#: plugins/check_load.c:278
 msgid "Warning threshold for 5-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:269
+#: plugins/check_load.c:280
 msgid "Warning threshold for 15-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:271
+#: plugins/check_load.c:282
 msgid "Critical threshold for 1-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:273
+#: plugins/check_load.c:284
 msgid "Critical threshold for 5-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:275
+#: plugins/check_load.c:286
 msgid "Critical threshold for 15-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:277
+#: plugins/check_load.c:288
 msgid ""
 "Parameter inconsistency: 1-minute \"warning load\" greater than \"critical "
 "load\".\n"
 msgstr ""
 
-#: plugins/check_load.c:279
+#: plugins/check_load.c:290
 msgid ""
 "Parameter inconsistency: 5-minute \"warning load\" greater than \"critical "
 "load\".\n"
 msgstr ""
 
-#: plugins/check_load.c:281
+#: plugins/check_load.c:292
 msgid ""
 "Parameter inconsistency: 15-minute \"warning load\" greater than \"critical "
 "load\".\n"
 msgstr ""
 
-#: plugins/check_load.c:295
+#: plugins/check_load.c:306
 msgid ""
 "Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n"
 msgstr ""
 
-#: plugins/check_load.c:298
+#: plugins/check_load.c:309
 msgid ""
 "This plugin tests the current system load average.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_load.c:304
+#: plugins/check_load.c:315
 msgid ""
 " -w, --warning=WLOAD1,WLOAD5,WLOAD15\n"
 "   Exit with WARNING status if load average exceeds WLOADn\n"
@@ -1390,56 +1399,56 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_load.c:317
+#: plugins/check_load.c:328
 #, c-format
 msgid "Usage: %s -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:62 plugins/check_mrtgtraf.c:72
+#: plugins/check_mrtg.c:66 plugins/check_mrtgtraf.c:72
 msgid "Unable to open MRTG log file\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:110 plugins/check_mrtgtraf.c:114
+#: plugins/check_mrtg.c:114 plugins/check_mrtgtraf.c:114
 msgid "Unable to process MRTG log file\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:119 plugins/check_mrtgtraf.c:121
+#: plugins/check_mrtg.c:123 plugins/check_mrtgtraf.c:121
 #, c-format
 msgid "MRTG data has expired (%d minutes old)\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:139
+#: plugins/check_mrtg.c:143
 msgid "Ave"
 msgstr ""
 
-#: plugins/check_mrtg.c:139 plugins/check_mrtgtraf.c:175
+#: plugins/check_mrtg.c:143 plugins/check_mrtgtraf.c:175
 #: plugins/check_mrtgtraf.c:183 plugins/check_mrtgtraf.c:184
 #: plugins/check_mrtgtraf.c:189 plugins/check_mrtgtraf.c:190
 msgid "Max"
 msgstr ""
 
-#: plugins/check_mrtg.c:203 plugins/check_mrtg.c:255
+#: plugins/check_mrtg.c:207 plugins/check_mrtg.c:259
 msgid "Invalid variable number\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:238
+#: plugins/check_mrtg.c:242
 #, c-format
 msgid ""
 "%s is not a valid expiration time\n"
 "Use '%s -h' for additional help\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:282
+#: plugins/check_mrtg.c:286
 msgid "You must supply the variable number\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:306
+#: plugins/check_mrtg.c:310
 msgid ""
 "This plugin will check either the average or maximum value of one of the\n"
 "two variables recorded in an MRTG log file.\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:314
+#: plugins/check_mrtg.c:318
 msgid ""
 " -F, --logfile=FILE\n"
 "   The MRTG log file containing the data you want to monitor\n"
@@ -1455,7 +1464,7 @@ msgid ""
 "   Threshold value for data to result in CRITICAL status\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:328
+#: plugins/check_mrtg.c:332
 #, c-format
 msgid ""
 " -l, --label=STRING\n"
@@ -1465,7 +1474,7 @@ msgid ""
 "   \"Bytes Per Second\", \"%% Utilization\")\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:335
+#: plugins/check_mrtg.c:339
 msgid ""
 "If the value exceeds the <vwl> threshold, a WARNING status is returned.  If\n"
 "the value exceeds the <vcl> threshold, a CRITICAL status is returned.  If\n"
@@ -1474,7 +1483,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:341
+#: plugins/check_mrtg.c:345
 msgid ""
 "This plugin is useful for monitoring MRTG data that does not correspond to\n"
 "bandwidth usage.  (Use the check_mrtgtraf plugin for monitoring bandwidth).\n"
@@ -1486,7 +1495,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:348
+#: plugins/check_mrtg.c:352
 msgid ""
 "Notes:\n"
 "- This plugin only monitors one of the two variables stored in the MRTG log\n"
@@ -1498,7 +1507,7 @@ msgid ""
 "  http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html\n"
 msgstr ""
 
-#: plugins/check_mrtg.c:368
+#: plugins/check_mrtg.c:372
 #, c-format
 msgid ""
 "Usage: %s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n"
@@ -1577,12 +1586,12 @@ msgid ""
 "  [-e expire_minutes] [-t timeout] [-v]\n"
 msgstr ""
 
-#: plugins/check_mysql.c:217
+#: plugins/check_mysql.c:221
 #, fuzzy
 msgid "This program tests connections to a mysql server\n"
 msgstr "Le plugin tests a %s connection with l'host specified\n"
 
-#: plugins/check_mysql.c:225
+#: plugins/check_mysql.c:229
 msgid ""
 " -d, --database=STRING\n"
 "   Check database with indicated name\n"
@@ -1594,7 +1603,7 @@ msgid ""
 "   Your clear-text password will be visible as a process table entry\n"
 msgstr ""
 
-#: plugins/check_mysql.c:235
+#: plugins/check_mysql.c:239
 #, c-format
 msgid ""
 "\n"
@@ -1602,58 +1611,58 @@ msgid ""
 "a server listening on MySQL standard port %d will be checked\n"
 msgstr ""
 
-#: plugins/check_mysql.c:248
+#: plugins/check_mysql.c:252
 #, c-format
 msgid "Usage: %s [-d database] [-H host] [-P port] [-u user] [-p password]\n"
 msgstr ""
 
-#: plugins/check_nagios.c:74
+#: plugins/check_nagios.c:78
 msgid "Error: Cannot open status log for reading!\n"
 msgstr ""
 
-#: plugins/check_nagios.c:112
+#: plugins/check_nagios.c:116
 #, c-format
 msgid "Found process: %s\n"
 msgstr ""
 
-#: plugins/check_nagios.c:132
+#: plugins/check_nagios.c:136
 msgid "Could not locate a running Nagios process!\n"
 msgstr ""
 
-#: plugins/check_nagios.c:143
+#: plugins/check_nagios.c:147
 #, c-format
 msgid "Nagios %s: located %d process%s, status log updated %d second%s ago\n"
 msgstr ""
 
-#: plugins/check_nagios.c:182 plugins/check_nagios.c:216
+#: plugins/check_nagios.c:186 plugins/check_nagios.c:220
 #, c-format
 msgid ""
 "Expiration time must be an integer (seconds)\n"
 "Type '%s -h' for additional help\n"
 msgstr ""
 
-#: plugins/check_nagios.c:196
+#: plugins/check_nagios.c:200
 #, c-format
 msgid ""
 "%s: Unknown argument: %c\n"
 "\n"
 msgstr ""
 
-#: plugins/check_nagios.c:228
+#: plugins/check_nagios.c:232
 #, c-format
 msgid ""
 "You must provide the status_log\n"
 "Type '%s -h' for additional help\n"
 msgstr ""
 
-#: plugins/check_nagios.c:232
+#: plugins/check_nagios.c:236
 #, c-format
 msgid ""
 "You must provide a process string\n"
 "Type '%s -h' for additional help\n"
 msgstr ""
 
-#: plugins/check_nagios.c:250
+#: plugins/check_nagios.c:254
 msgid ""
 "This plugin attempts to check the status of the Nagios process on the local\n"
 "machine. The plugin will check to make sure the Nagios status log is no "
@@ -1665,7 +1674,7 @@ msgid ""
 "by the <process_string> argument.\n"
 msgstr ""
 
-#: plugins/check_nagios.c:261
+#: plugins/check_nagios.c:265
 msgid ""
 "-F, --filename=FILE\n"
 "   Name of the log file to check\n"
@@ -1675,93 +1684,102 @@ msgid ""
 "   Command to search for in process table\n"
 msgstr ""
 
-#: plugins/check_nagios.c:269
+#: plugins/check_nagios.c:273
 msgid ""
 "Example:\n"
 "   ./check_nagios -e 5 \\   -F /usr/local/nagios/var/status.log \\   -C /usr/"
 "local/nagios/bin/nagios\n"
 msgstr ""
 
-#: plugins/check_nagios.c:282
+#: plugins/check_nagios.c:286
 #, c-format
 msgid ""
 "Usage: %s -F <status log file> -e <expire_minutes> -C <process_string>\n"
 msgstr ""
 
-#: plugins/check_nt.c:121 plugins/check_nt.c:174
+#: plugins/check_nt.c:118
+#, c-format
+msgid "Wrong client version - running: %s, required: %s"
+msgstr ""
+
+#: plugins/check_nt.c:129 plugins/check_nt.c:182
 msgid "missing -l parameters"
 msgstr ""
 
-#: plugins/check_nt.c:123
+#: plugins/check_nt.c:131
 msgid "wrong -l parameter."
 msgstr ""
 
-#: plugins/check_nt.c:127
+#: plugins/check_nt.c:135
 msgid "CPU Load"
 msgstr ""
 
-#: plugins/check_nt.c:148
+#: plugins/check_nt.c:156
 #, c-format
 msgid " %lu%% (%lu min average)"
 msgstr ""
 
-#: plugins/check_nt.c:155
+#: plugins/check_nt.c:163
 msgid "not enough values for -l parameters"
 msgstr ""
 
-#: plugins/check_nt.c:167
+#: plugins/check_nt.c:175
 #, c-format
 msgid "System Uptime : %u day(s) %u hour(s) %u minute(s)"
 msgstr ""
 
-#: plugins/check_nt.c:176
+#: plugins/check_nt.c:184
 msgid "wrong -l argument"
 msgstr ""
 
-#: plugins/check_nt.c:185
+#: plugins/check_nt.c:193
 #, c-format
 msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"
 msgstr ""
 
-#: plugins/check_nt.c:200
+#: plugins/check_nt.c:208
 msgid "Free disk space : Invalid drive "
 msgstr ""
 
-#: plugins/check_nt.c:210
+#: plugins/check_nt.c:218
 msgid "No service/process specified"
 msgstr ""
 
-#: plugins/check_nt.c:214
+#: plugins/check_nt.c:222
 msgid "ShowAll"
 msgstr ""
 
-#: plugins/check_nt.c:214
+#: plugins/check_nt.c:222
 msgid "ShowFail"
 msgstr ""
 
-#: plugins/check_nt.c:229
+#: plugins/check_nt.c:237
 #, c-format
 msgid ""
 "Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"
 msgstr ""
 
-#: plugins/check_nt.c:245 plugins/check_nt.c:281
+#: plugins/check_nt.c:253 plugins/check_nt.c:289
 msgid "No counter specified"
 msgstr ""
 
-#: plugins/check_nt.c:396 plugins/check_nwstat.c:771
-#: plugins/check_overcr.c:348
+#: plugins/check_nt.c:319
+msgid "Please specify a variable to check"
+msgstr ""
+
+#: plugins/check_nt.c:404 plugins/check_nwstat.c:775
+#: plugins/check_overcr.c:352
 #, c-format
 msgid ""
 "Server port an integer (seconds)\n"
 "Type '%s -h' for additional help\n"
 msgstr ""
 
-#: plugins/check_nt.c:449
+#: plugins/check_nt.c:457
 msgid "None"
 msgstr ""
 
-#: plugins/check_nt.c:508
+#: plugins/check_nt.c:516
 msgid ""
 "Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n"
 "\n"
@@ -1770,7 +1788,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_nt.c:513
+#: plugins/check_nt.c:521
 #, c-format
 msgid ""
 "\n"
@@ -1793,17 +1811,19 @@ msgid ""
 "  Print version information\n"
 msgstr ""
 
-#: plugins/check_nt.c:531
+#: plugins/check_nt.c:539
 msgid ""
 "-v, --variable=STRING\n"
 "  Variable to check.  Valid variables are:\n"
 msgstr ""
 
-#: plugins/check_nt.c:534
-msgid "   CLIENTVERSION = Get the NSClient version\n"
+#: plugins/check_nt.c:542
+msgid ""
+"   CLIENTVERSION = Get the NSClient version\n"
+"     If -l <version> is specified, will return warning if versions differ.\n"
 msgstr ""
 
-#: plugins/check_nt.c:536
+#: plugins/check_nt.c:545
 msgid ""
 "   CPULOAD = Average CPU load on last x minutes.\n"
 "     Request a -l parameter with the following syntax:\n"
@@ -1814,26 +1834,26 @@ msgid ""
 "     ie: -l 60,90,95,120,90,95\n"
 msgstr ""
 
-#: plugins/check_nt.c:543
+#: plugins/check_nt.c:552
 msgid ""
 "   UPTIME = Get the uptime of the machine.\n"
 "     No specific parameters. No warning or critical threshold\n"
 msgstr ""
 
-#: plugins/check_nt.c:546
+#: plugins/check_nt.c:555
 msgid ""
 "   USEDDISKSPACE = Size and percentage of disk use.\n"
 "     Request a -l parameter containing the drive letter only.\n"
 "     Warning and critical thresholds can be specified with -w and -c.\n"
 msgstr ""
 
-#: plugins/check_nt.c:550
+#: plugins/check_nt.c:559
 msgid ""
 "   MEMUSE = Memory use.\n"
 "     Warning and critical thresholds can be specified with -w and -c.\n"
 msgstr ""
 
-#: plugins/check_nt.c:553
+#: plugins/check_nt.c:562
 msgid ""
 "   SERVICESTATE = Check the state of one or several services.\n"
 "     Request a -l parameters with the following syntax:\n"
@@ -1842,13 +1862,13 @@ msgid ""
 "\t\t in the returned string.\n"
 msgstr ""
 
-#: plugins/check_nt.c:559
+#: plugins/check_nt.c:568
 msgid ""
 "   PROCSTATE = Check if one or several process are running.\n"
 "     Same syntax as SERVICESTATE.\n"
 msgstr ""
 
-#: plugins/check_nt.c:562
+#: plugins/check_nt.c:571
 #, c-format
 msgid ""
 "   COUNTER = Check any performance counter of Windows NT/2000.\n"
@@ -1861,7 +1881,7 @@ msgid ""
 "       \"%%.f %%%% paging file used.\"\n"
 msgstr ""
 
-#: plugins/check_nt.c:571
+#: plugins/check_nt.c:580
 msgid ""
 "Notes:\n"
 " - The NSClient service should be running on the server to get any "
@@ -1870,191 +1890,191 @@ msgid ""
 " - Critical thresholds should be lower than warning thresholds\n"
 msgstr ""
 
-#: plugins/check_nt.c:582
+#: plugins/check_nt.c:591
 #, c-format
 msgid ""
 "Usage: %s -H host -v variable [-p port] [-w warning] [-c critical]\n"
 "  [-l params] [-d SHOWALL] [-t timeout]\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:139
+#: plugins/check_nwstat.c:143
 #, c-format
 msgid "NetWare %s: "
 msgstr ""
 
-#: plugins/check_nwstat.c:170
+#: plugins/check_nwstat.c:174
 #, c-format
 msgid "Up %s,"
 msgstr ""
 
-#: plugins/check_nwstat.c:178
+#: plugins/check_nwstat.c:182
 #, c-format
 msgid "Load %s - %s %s-min load average = %lu%%"
 msgstr ""
 
-#: plugins/check_nwstat.c:199
+#: plugins/check_nwstat.c:203
 #, c-format
 msgid "Conns %s - %lu current connections"
 msgstr ""
 
-#: plugins/check_nwstat.c:218
+#: plugins/check_nwstat.c:222
 #, c-format
 msgid "%s: Long term cache hits = %lu%%"
 msgstr ""
 
-#: plugins/check_nwstat.c:237
+#: plugins/check_nwstat.c:241
 #, c-format
 msgid "%s: Total cache buffers = %lu"
 msgstr ""
 
-#: plugins/check_nwstat.c:256
+#: plugins/check_nwstat.c:260
 #, c-format
 msgid "%s: Dirty cache buffers = %lu"
 msgstr ""
 
-#: plugins/check_nwstat.c:275
+#: plugins/check_nwstat.c:279
 #, c-format
 msgid "%s: LRU sitting time = %lu minutes"
 msgstr ""
 
-#: plugins/check_nwstat.c:289 plugins/check_nwstat.c:314
-#: plugins/check_nwstat.c:434 plugins/check_nwstat.c:455
-#: plugins/check_nwstat.c:487 plugins/check_nwstat.c:508
+#: plugins/check_nwstat.c:293 plugins/check_nwstat.c:318
+#: plugins/check_nwstat.c:438 plugins/check_nwstat.c:459
+#: plugins/check_nwstat.c:491 plugins/check_nwstat.c:512
 #, c-format
 msgid "Error: Volume '%s' does not exist!"
 msgstr ""
 
-#: plugins/check_nwstat.c:298
+#: plugins/check_nwstat.c:302
 #, c-format
 msgid "%s%lu KB free on volume %s"
 msgstr ""
 
-#: plugins/check_nwstat.c:299 plugins/check_nwstat.c:442
-#: plugins/check_nwstat.c:495
+#: plugins/check_nwstat.c:303 plugins/check_nwstat.c:446
+#: plugins/check_nwstat.c:499
 msgid "Only "
 msgstr ""
 
-#: plugins/check_nwstat.c:334
+#: plugins/check_nwstat.c:338
 #, c-format
 msgid "%lu MB (%lu%%) free on volume %s"
 msgstr ""
 
-#: plugins/check_nwstat.c:353
+#: plugins/check_nwstat.c:357
 #, c-format
 msgid "Directory Services Database is %s (DS version %s)"
 msgstr ""
 
-#: plugins/check_nwstat.c:367
+#: plugins/check_nwstat.c:371
 #, c-format
 msgid "Logins are %s"
 msgstr ""
 
-#: plugins/check_nwstat.c:367
+#: plugins/check_nwstat.c:371
 msgid "enabled"
 msgstr ""
 
-#: plugins/check_nwstat.c:367
+#: plugins/check_nwstat.c:371
 msgid "disabled"
 msgstr ""
 
-#: plugins/check_nwstat.c:400
+#: plugins/check_nwstat.c:404
 #, c-format
 msgid "%lu of %lu (%lu%%) packet receive buffers used"
 msgstr ""
 
-#: plugins/check_nwstat.c:421
+#: plugins/check_nwstat.c:425
 #, c-format
 msgid "%lu entries in SAP table"
 msgstr ""
 
-#: plugins/check_nwstat.c:423
+#: plugins/check_nwstat.c:427
 #, c-format
 msgid "%lu entries in SAP table for SAP type %d"
 msgstr ""
 
-#: plugins/check_nwstat.c:442
+#: plugins/check_nwstat.c:446
 #, c-format
 msgid "%s%lu KB purgeable on volume %s"
 msgstr ""
 
-#: plugins/check_nwstat.c:475
+#: plugins/check_nwstat.c:479
 #, c-format
 msgid "%lu MB (%lu%%) purgeable on volume %s"
 msgstr ""
 
-#: plugins/check_nwstat.c:495
+#: plugins/check_nwstat.c:499
 #, c-format
 msgid "%s%lu KB not yet purgeable on volume %s"
 msgstr ""
 
-#: plugins/check_nwstat.c:528
+#: plugins/check_nwstat.c:532
 #, c-format
 msgid "%lu MB (%lu%%) not yet purgeable on volume %s"
 msgstr ""
 
-#: plugins/check_nwstat.c:546
+#: plugins/check_nwstat.c:550
 #, c-format
 msgid "%lu open files"
 msgstr ""
 
-#: plugins/check_nwstat.c:563
+#: plugins/check_nwstat.c:567
 #, c-format
 msgid "%lu abended threads"
 msgstr ""
 
-#: plugins/check_nwstat.c:588
+#: plugins/check_nwstat.c:592
 #, c-format
 msgid "%lu current service processes (%lu max)"
 msgstr ""
 
-#: plugins/check_nwstat.c:604
+#: plugins/check_nwstat.c:608
 msgid "Critical: Time not in sync with network!"
 msgstr ""
 
-#: plugins/check_nwstat.c:607
+#: plugins/check_nwstat.c:611
 msgid "OK! Time in sync with network!"
 msgstr ""
 
-#: plugins/check_nwstat.c:623
+#: plugins/check_nwstat.c:627
 #, c-format
 msgid "LRU sitting time = %lu seconds"
 msgstr ""
 
-#: plugins/check_nwstat.c:639
+#: plugins/check_nwstat.c:643
 #, c-format
 msgid "dirty cache buffers = %lu%% of the total"
 msgstr ""
 
-#: plugins/check_nwstat.c:654
+#: plugins/check_nwstat.c:658
 #, c-format
 msgid "total cache buffers = %lu%% of the original"
 msgstr ""
 
-#: plugins/check_nwstat.c:664
+#: plugins/check_nwstat.c:668
 #, c-format
 msgid "NDS Version %s"
 msgstr ""
 
-#: plugins/check_nwstat.c:673
+#: plugins/check_nwstat.c:677
 #, c-format
 msgid "Up %s"
 msgstr ""
 
-#: plugins/check_nwstat.c:683
+#: plugins/check_nwstat.c:687
 #, c-format
 msgid "Module %s version %s is loaded"
 msgstr ""
 
-#: plugins/check_nwstat.c:686
+#: plugins/check_nwstat.c:690
 #, c-format
 msgid "Module %s is not loaded"
 msgstr ""
 
-#: plugins/check_nwstat.c:691 plugins/check_overcr.c:266
+#: plugins/check_nwstat.c:695 plugins/check_overcr.c:270
 msgid "Nothing to check!\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:902
+#: plugins/check_nwstat.c:906
 #, c-format
 msgid ""
 "Usage: %s This plugin attempts to contact the MRTGEXT NLM running\n"
@@ -2062,7 +2082,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:913
+#: plugins/check_nwstat.c:917
 msgid ""
 " -v, --variable=STRING\n"
 "    Variable to check.  Valid variables include:\n"
@@ -2074,7 +2094,7 @@ msgid ""
 "      UPTIME    = server uptime\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:923
+#: plugins/check_nwstat.c:927
 msgid ""
 "      LTCH      = percent long term cache hits\n"
 "      CBUFF     = current number of cache buffers\n"
@@ -2083,7 +2103,7 @@ msgid ""
 "      TCB       = dirty cache buffers as a percentage of the original\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:930
+#: plugins/check_nwstat.c:934
 msgid ""
 "      OFILES    = number of open files\n"
 "      VPF<vol>  = percent free space on volume <vol>\n"
@@ -2094,7 +2114,7 @@ msgid ""
 "      VKNP<vol> = KB of not yet purgeable space on volume <vol>\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:939
+#: plugins/check_nwstat.c:943
 msgid ""
 "      LRUM      = LRU sitting time in minutes\n"
 "      LRUS      = LRU sitting time in seconds\n"
@@ -2106,7 +2126,7 @@ msgid ""
 "      SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:949
+#: plugins/check_nwstat.c:953
 msgid ""
 "      TSYNC     = timesync status \n"
 "      LOGINS    = check to see if logins are enabled\n"
@@ -2115,7 +2135,7 @@ msgid ""
 "                  (e.g. \"NLM:TSANDS.NLM\")\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:956
+#: plugins/check_nwstat.c:960
 msgid ""
 " -w, --warning=INTEGER\n"
 "    Threshold which will result in a warning status\n"
@@ -2125,7 +2145,7 @@ msgid ""
 "    Include server version string in results\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:966
+#: plugins/check_nwstat.c:970
 msgid ""
 "\n"
 "Notes:\n"
@@ -2137,81 +2157,81 @@ msgid ""
 "  TCB, LRUS and LRUM.\n"
 msgstr ""
 
-#: plugins/check_nwstat.c:983
+#: plugins/check_nwstat.c:987
 #, c-format
 msgid ""
 "Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n"
 "  [-t timeout].\n"
 msgstr ""
 
-#: plugins/check_overcr.c:104
+#: plugins/check_overcr.c:108
 msgid "Unknown error fetching load data\n"
 msgstr ""
 
-#: plugins/check_overcr.c:108
+#: plugins/check_overcr.c:112
 msgid "Invalid response from server - no load information\n"
 msgstr ""
 
-#: plugins/check_overcr.c:114
+#: plugins/check_overcr.c:118
 msgid "Invalid response from server after load 1\n"
 msgstr ""
 
-#: plugins/check_overcr.c:120
+#: plugins/check_overcr.c:124
 msgid "Invalid response from server after load 5\n"
 msgstr ""
 
-#: plugins/check_overcr.c:145
+#: plugins/check_overcr.c:149
 #, c-format
 msgid "Load %s - %s-min load average = %0.2f"
 msgstr ""
 
-#: plugins/check_overcr.c:155
+#: plugins/check_overcr.c:159
 msgid "Unknown error fetching disk data\n"
 msgstr ""
 
-#: plugins/check_overcr.c:165 plugins/check_overcr.c:217
-#: plugins/check_overcr.c:221
+#: plugins/check_overcr.c:169 plugins/check_overcr.c:221
+#: plugins/check_overcr.c:225
 msgid "Invalid response from server\n"
 msgstr ""
 
-#: plugins/check_overcr.c:192
+#: plugins/check_overcr.c:196
 msgid "Unknown error fetching network status\n"
 msgstr ""
 
-#: plugins/check_overcr.c:202
+#: plugins/check_overcr.c:206
 #, c-format
 msgid "Net %s - %d connection%s on port %d"
 msgstr ""
 
-#: plugins/check_overcr.c:213
+#: plugins/check_overcr.c:217
 msgid "Unknown error fetching process status\n"
 msgstr ""
 
-#: plugins/check_overcr.c:231
+#: plugins/check_overcr.c:235
 #, c-format
 msgid "Process %s - %d instance%s of %s running"
 msgstr ""
 
-#: plugins/check_overcr.c:258
+#: plugins/check_overcr.c:262
 #, c-format
 msgid "Uptime %s - Up %d days %d hours %d minutes"
 msgstr ""
 
-#: plugins/check_overcr.c:404
+#: plugins/check_overcr.c:408
 #, c-format
 msgid ""
 "Usage: %s -H host [-p port] [-v variable] [-w warning] [-c critical]\n"
 "  [-t timeout]\n"
 msgstr ""
 
-#: plugins/check_overcr.c:422
+#: plugins/check_overcr.c:426
 msgid ""
 "This plugin attempts to contact the Over-CR collector daemon running on the\n"
 "remote UNIX server in order to gather the requested system information.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_overcr.c:432
+#: plugins/check_overcr.c:436
 msgid ""
 "-v, --variable=STRING\n"
 "   Variable to check.  Valid variables include:\n"
@@ -2224,7 +2244,7 @@ msgid ""
 "     UPTIME        = system uptime in seconds\n"
 msgstr ""
 
-#: plugins/check_overcr.c:443
+#: plugins/check_overcr.c:447
 msgid ""
 " -w, --warning=INTEGER\n"
 "   Threshold which will result in a warning status\n"
@@ -2232,7 +2252,7 @@ msgid ""
 "   Threshold which will result in a critical status\n"
 msgstr ""
 
-#: plugins/check_overcr.c:451
+#: plugins/check_overcr.c:455
 msgid ""
 "Notes:\n"
 " - For the available options, the critical threshold value should always be\n"
@@ -2240,7 +2260,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_overcr.c:456
+#: plugins/check_overcr.c:460
 msgid ""
 " - This plugin requres that Eric Molitors' Over-CR collector daemon be\n"
 "   running on the remote server. Over-CR can be downloaded from\n"
@@ -2249,191 +2269,187 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:150
+#: plugins/check_pgsql.c:154
 #, c-format
 msgid "PGSQL: CRITICAL - no connection to '%s' (%s).\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:157
+#: plugins/check_pgsql.c:161
 #, c-format
 msgid "PGSQL: CRITICAL - database %s (%d sec.)\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:163
+#: plugins/check_pgsql.c:167
 #, c-format
 msgid "PGSQL: WARNING - database %s (%d sec.)\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:168
+#: plugins/check_pgsql.c:172
 #, c-format
 msgid "PGSQL: ok - database %s (%d sec.)\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:216 plugins/check_snmp.c:445 plugins/negate.c:179
+#: plugins/check_pgsql.c:220 plugins/check_snmp.c:449 plugins/negate.c:183
 msgid "Timeout Interval must be an integer"
 msgstr ""
 
-#: plugins/check_pgsql.c:222 plugins/check_pgsql.c:228
+#: plugins/check_pgsql.c:226 plugins/check_pgsql.c:232
 msgid "Invalid critical threshold"
 msgstr ""
 
-#: plugins/check_pgsql.c:234
+#: plugins/check_pgsql.c:238
 msgid "You gave an invalid host name"
 msgstr ""
 
-#: plugins/check_pgsql.c:240
+#: plugins/check_pgsql.c:244
 msgid "Port must be an integer"
 msgstr ""
 
-#: plugins/check_pgsql.c:246
+#: plugins/check_pgsql.c:250
 msgid "Database name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:252
+#: plugins/check_pgsql.c:256
 msgid "user name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:386
+#: plugins/check_pgsql.c:390
 msgid ""
 "Test whether a PostgreSQL DBMS is accepting connections.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:75
+#: plugins/check_ping.c:80
 msgid "Could not parse arguments"
 msgstr ""
 
-#: plugins/check_ping.c:118
+#: plugins/check_ping.c:123
 msgid "Error: Could not interpret output from ping command\n"
 msgstr ""
 
-#: plugins/check_ping.c:134
+#: plugins/check_ping.c:139
 #, c-format
 msgid "PING %s - %sPacket loss = %d%%"
 msgstr ""
 
-#: plugins/check_ping.c:137
+#: plugins/check_ping.c:142
 #, c-format
 msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"
 msgstr ""
 
-#: plugins/check_ping.c:228
+#: plugins/check_ping.c:233
 msgid "Could not realloc() addresses\n"
 msgstr ""
 
-#: plugins/check_ping.c:243 plugins/check_ping.c:323
+#: plugins/check_ping.c:248 plugins/check_ping.c:328
 #, c-format
 msgid "<max_packets> (%s) must be a non-negative number\n"
 msgstr ""
 
-#: plugins/check_ping.c:266
+#: plugins/check_ping.c:271
 #, c-format
 msgid ""
 "Invalid host name/address: %s\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:277
+#: plugins/check_ping.c:282
 #, c-format
 msgid "<wpl> (%s) must be an integer percentage\n"
 msgstr ""
 
-#: plugins/check_ping.c:288
+#: plugins/check_ping.c:293
 #, c-format
 msgid "<cpl> (%s) must be an integer percentage\n"
 msgstr ""
 
-#: plugins/check_ping.c:299
+#: plugins/check_ping.c:304
 #, c-format
 msgid "<wrta> (%s) must be a non-negative number\n"
 msgstr ""
 
-#: plugins/check_ping.c:310
+#: plugins/check_ping.c:315
 #, c-format
 msgid "<crta> (%s) must be a non-negative number\n"
 msgstr ""
 
-#: plugins/check_ping.c:341
+#: plugins/check_ping.c:346
 #, c-format
 msgid ""
 "%s: Warning threshold must be integer or percentage!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:352
+#: plugins/check_ping.c:357
 msgid "<wrta> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:356
+#: plugins/check_ping.c:361
 msgid "<crta> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:360
+#: plugins/check_ping.c:365
 msgid "<wpl> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:364
+#: plugins/check_ping.c:369
 msgid "<cpl> was not set\n"
 msgstr ""
 
-#: plugins/check_ping.c:368
+#: plugins/check_ping.c:373
 #, c-format
 msgid "<wrta> (%f) cannot be larger than <crta> (%f)\n"
 msgstr ""
 
-#: plugins/check_ping.c:372
+#: plugins/check_ping.c:377
 #, c-format
 msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
 msgstr ""
 
-#: plugins/check_ping.c:385
+#: plugins/check_ping.c:390
 msgid "Invalid host name/address"
 msgstr ""
 
-#: plugins/check_ping.c:403
+#: plugins/check_ping.c:408
 #, c-format
 msgid "Cannot open pipe: %s"
 msgstr ""
 
-#: plugins/check_ping.c:407
+#: plugins/check_ping.c:412
 #, c-format
 msgid "Cannot open stderr for %s\n"
 msgstr ""
 
-#: plugins/check_ping.c:411
-msgid "(DUP!)"
-msgstr ""
-
-#: plugins/check_ping.c:415 plugins/check_ping.c:462
-msgid "unable to realloc warn_text"
-msgstr ""
-
-#: plugins/check_ping.c:448
+#: plugins/check_ping.c:468
 #, c-format
 msgid "PING CRITICAL - Network unreachable (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:452
+#: plugins/check_ping.c:470
 #, c-format
 msgid "PING CRITICAL - Host Unreachable (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:456
+#: plugins/check_ping.c:472
 #, c-format
 msgid "PING CRITICAL - Host not found (%s)"
 msgstr ""
 
-#: plugins/check_ping.c:501 plugins/check_procs.c:581
+#: plugins/check_ping.c:479
+msgid "unable to realloc warn_text"
+msgstr ""
+
+#: plugins/check_ping.c:505 plugins/check_procs.c:586
 msgid "Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>"
 msgstr ""
 
-#: plugins/check_ping.c:504
+#: plugins/check_ping.c:508
 msgid ""
 "Use ping to check connection statistics for a remote host.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:512
+#: plugins/check_ping.c:516
 #, c-format
 msgid ""
 "-H, --hostname=HOST\n"
@@ -2448,7 +2464,7 @@ msgid ""
 "   show HTML in the plugin output (obsoleted by urlize)\n"
 msgstr ""
 
-#: plugins/check_ping.c:527
+#: plugins/check_ping.c:531
 #, c-format
 msgid ""
 "THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel\n"
@@ -2457,7 +2473,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ping.c:532
+#: plugins/check_ping.c:536
 msgid ""
 "This plugin uses the ping command to probe the specified host for packet "
 "loss\n"
@@ -2469,172 +2485,169 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:110
+#: plugins/check_procs.c:116
 msgid "Unable to parse command line\n"
 msgstr ""
 
-#: plugins/check_procs.c:113
+#: plugins/check_procs.c:119
 #, c-format
 msgid "CMD: %s\n"
 msgstr ""
 
-#: plugins/check_procs.c:202
+#: plugins/check_procs.c:215
 #, c-format
 msgid "Not parseable: %s"
 msgstr ""
 
-#: plugins/check_procs.c:209
+#: plugins/check_procs.c:222
 #, c-format
 msgid "STDERR: %s"
 msgstr ""
 
-#: plugins/check_procs.c:211
+#: plugins/check_procs.c:224
 msgid "System call sent warnings to stderr\n"
 msgstr ""
 
-#: plugins/check_procs.c:218
+#: plugins/check_procs.c:231
 msgid "System call returned nonzero status\n"
 msgstr ""
 
-#: plugins/check_procs.c:223 plugins/check_users.c:92
+#: plugins/check_procs.c:236 plugins/check_users.c:96
 msgid "Unable to read output\n"
 msgstr ""
 
-#: plugins/check_procs.c:236
+#: plugins/check_procs.c:253
 #, c-format
-msgid "%s OK: %d process%s"
+msgid "%d warn out of "
 msgstr ""
 
-#: plugins/check_procs.c:240
+#: plugins/check_procs.c:258
 #, c-format
-msgid "PROCS WARNING: %d process%s"
+msgid "%d crit, %d warn out of "
 msgstr ""
 
-#: plugins/check_procs.c:243
+#: plugins/check_procs.c:261
 #, c-format
-msgid "%s WARNING: %d warn out of %d process%s"
-msgstr ""
-
-#: plugins/check_procs.c:249
-#, c-format
-msgid "PROCS CRITICAL: %d process%s"
-msgstr ""
+msgid "%d process"
+msgid_plural "%d processes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/check_procs.c:252
+#: plugins/check_procs.c:264
 #, c-format
-msgid "%s CRITICAL: %d crit, %d warn out of %d process%s"
+msgid " with %s"
 msgstr ""
 
-#: plugins/check_procs.c:323 plugins/check_ssh.c:113
+#: plugins/check_procs.c:328 plugins/check_ssh.c:117
 msgid ""
 "Timeout Interval must be an integer!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:337
+#: plugins/check_procs.c:342
 msgid ""
 "Critical Process Count must be an integer!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:349
+#: plugins/check_procs.c:354
 #, c-format
 msgid ""
 "%s: Warning Process Count must be an integer!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:357
+#: plugins/check_procs.c:362
 #, c-format
 msgid ""
 "%s: Parent Process ID must be an integer!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:366 plugins/check_procs.c:479
+#: plugins/check_procs.c:371 plugins/check_procs.c:484
 #, c-format
 msgid "%s%sSTATE = %s"
 msgstr ""
 
-#: plugins/check_procs.c:375
+#: plugins/check_procs.c:380
 #, c-format
 msgid "UID %d was not found\n"
 msgstr ""
 
-#: plugins/check_procs.c:384
+#: plugins/check_procs.c:389
 #, c-format
 msgid "User name %s was not found\n"
 msgstr ""
 
-#: plugins/check_procs.c:392
+#: plugins/check_procs.c:397
 #, c-format
 msgid "%s%sUID = %d (%s)"
 msgstr ""
 
-#: plugins/check_procs.c:401
+#: plugins/check_procs.c:406
 #, c-format
 msgid "%s%scommand name '%s'"
 msgstr ""
 
-#: plugins/check_procs.c:410
+#: plugins/check_procs.c:415
 #, c-format
 msgid "%s%sargs '%s'"
 msgstr ""
 
-#: plugins/check_procs.c:415
+#: plugins/check_procs.c:420
 #, c-format
 msgid "%s%sRSS >= %d"
 msgstr ""
 
-#: plugins/check_procs.c:419
+#: plugins/check_procs.c:424
 #, c-format
 msgid ""
 "%s: RSS must be an integer!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:425
+#: plugins/check_procs.c:430
 #, c-format
 msgid "%s%sVSZ >= %d"
 msgstr ""
 
-#: plugins/check_procs.c:429
+#: plugins/check_procs.c:434
 #, c-format
 msgid ""
 "%s: VSZ must be an integer!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:436
+#: plugins/check_procs.c:441
 #, c-format
 msgid "%s%sPCPU >= %.2f"
 msgstr ""
 
-#: plugins/check_procs.c:440
+#: plugins/check_procs.c:445
 #, c-format
 msgid ""
 "%s: PCPU must be a float!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:462
+#: plugins/check_procs.c:467
 #, c-format
 msgid ""
 "%s: metric must be one of PROCS, VSZ, RSS, CPU!\n"
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:499
+#: plugins/check_procs.c:504
 #, c-format
 msgid "wmax (%d) cannot be greater than cmax (%d)\n"
 msgstr ""
 
-#: plugins/check_procs.c:503
+#: plugins/check_procs.c:508
 #, c-format
 msgid "wmin (%d) cannot be less than cmin (%d)\n"
 msgstr ""
 
-#: plugins/check_procs.c:584
+#: plugins/check_procs.c:589
 msgid ""
 "Checks all processes and generates WARNING or CRITICAL states if the "
 "specified\n"
@@ -2645,7 +2658,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:591
+#: plugins/check_procs.c:596
 msgid ""
 "\n"
 "Required Arguments:\n"
@@ -2655,7 +2668,7 @@ msgid ""
 "   Generate critical state if metric is outside this range\n"
 msgstr ""
 
-#: plugins/check_procs.c:598
+#: plugins/check_procs.c:603
 msgid ""
 "\n"
 "Optional Arguments:\n"
@@ -2669,7 +2682,7 @@ msgid ""
 "   Extra information. Up to 3 verbosity levels\n"
 msgstr ""
 
-#: plugins/check_procs.c:609
+#: plugins/check_procs.c:614
 msgid ""
 "\n"
 "Optional Filters:\n"
@@ -2685,7 +2698,7 @@ msgid ""
 "   Only scan for processes with rss higher than indicated.\n"
 msgstr ""
 
-#: plugins/check_procs.c:622
+#: plugins/check_procs.c:627
 msgid ""
 " -P, --pcpu=PCPU\n"
 "   Only scan for processes with pcpu higher than indicated.\n"
@@ -2694,10 +2707,10 @@ msgid ""
 " -a, --argument-array=STRING\n"
 "   Only scan for processes with args that contain STRING.\n"
 " -C, --command=COMMAND\n"
-"   Only scan for exact matches to the named COMMAND.\n"
+"   Only scan for exact matches of COMMAND (without path).\n"
 msgstr ""
 
-#: plugins/check_procs.c:632
+#: plugins/check_procs.c:637
 msgid ""
 "\n"
 "RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n"
@@ -2706,7 +2719,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:637
+#: plugins/check_procs.c:642
 msgid ""
 "This plugin checks the number of currently running processes and\n"
 "generates WARNING or CRITICAL states if the process count is outside\n"
@@ -2716,7 +2729,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:644
+#: plugins/check_procs.c:649
 msgid ""
 "Examples:\n"
 " check_procs -w 2:2 -c 2:1024 -C portsentry\n"
@@ -2732,53 +2745,53 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_radius.c:112
+#: plugins/check_radius.c:116
 msgid "Config file error"
 msgstr ""
 
-#: plugins/check_radius.c:119
+#: plugins/check_radius.c:123
 msgid "Out of Memory?"
 msgstr ""
 
-#: plugins/check_radius.c:140
+#: plugins/check_radius.c:144
 msgid "Timeout"
 msgstr ""
 
-#: plugins/check_radius.c:142
+#: plugins/check_radius.c:146
 msgid "Auth Error"
 msgstr ""
 
-#: plugins/check_radius.c:144
+#: plugins/check_radius.c:148
 msgid "Auth Failed"
 msgstr ""
 
-#: plugins/check_radius.c:148
+#: plugins/check_radius.c:152
 msgid "Auth OK"
 msgstr ""
 
-#: plugins/check_radius.c:186 plugins/check_radius.c:257
+#: plugins/check_radius.c:190 plugins/check_radius.c:261
 msgid "Timeout interval must be a positive integer"
 msgstr ""
 
-#: plugins/check_radius.c:190 plugins/check_radius.c:251
+#: plugins/check_radius.c:194 plugins/check_radius.c:255
 msgid "Number of retries must be a positive integer"
 msgstr ""
 
-#: plugins/check_radius.c:195 plugins/check_radius.c:233
+#: plugins/check_radius.c:199 plugins/check_radius.c:237
 msgid "Server port must be a positive integer"
 msgstr ""
 
-#: plugins/check_radius.c:277
+#: plugins/check_radius.c:281
 msgid "Copyright (c) 1999 Robert August Vincent II\n"
 msgstr ""
 
-#: plugins/check_radius.c:280
+#: plugins/check_radius.c:284
 msgid ""
 "Tests to see if a radius server is accepting connections.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_radius.c:288
+#: plugins/check_radius.c:292
 msgid ""
 " -u, --username=STRING\n"
 "    The user to authenticate\n"
@@ -2792,7 +2805,7 @@ msgid ""
 "    Number of times to retry a failed connection\n"
 msgstr ""
 
-#: plugins/check_radius.c:302
+#: plugins/check_radius.c:306
 msgid ""
 "\n"
 "This plugin tests a radius server to see if it is accepting connections.\n"
@@ -2803,7 +2816,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_radius.c:309
+#: plugins/check_radius.c:313
 msgid ""
 "The password option presents a substantial security issue because the\n"
 "password can be determined by careful watching of the command line in\n"
@@ -2813,62 +2826,66 @@ msgid ""
 "otherwise compormise could occur.\n"
 msgstr ""
 
-#: plugins/check_real.c:76
+#: plugins/check_real.c:80
 #, c-format
 msgid "Unable to connect to %s on port %d\n"
 msgstr ""
 
-#: plugins/check_real.c:98
+#: plugins/check_real.c:102
 #, c-format
 msgid "No data received from %s\n"
 msgstr ""
 
-#: plugins/check_real.c:103 plugins/check_real.c:176
+#: plugins/check_real.c:107 plugins/check_real.c:180
 msgid "Invalid REAL response received from host\n"
 msgstr ""
 
-#: plugins/check_real.c:105 plugins/check_real.c:178
+#: plugins/check_real.c:109 plugins/check_real.c:182
 #, c-format
 msgid "Invalid REAL response received from host on port %d\n"
 msgstr ""
 
-#: plugins/check_real.c:169 plugins/check_tcp.c:274
+#: plugins/check_real.c:173 plugins/check_tcp.c:275
 msgid "No data received from host\n"
 msgstr ""
 
-#: plugins/check_real.c:232
+#: plugins/check_real.c:236
 #, c-format
 msgid "REAL %s - %d second response time\n"
 msgstr ""
 
-#: plugins/check_real.c:315 plugins/check_smtp.c:237 plugins/check_tcp.c:458
+#: plugins/check_real.c:319 plugins/check_smtp.c:243 plugins/check_tcp.c:459
 msgid "Server port must be a positive integer\n"
 msgstr ""
 
-#: plugins/check_real.c:324 plugins/check_smtp.c:267
+#: plugins/check_real.c:328 plugins/check_smtp.c:273
 msgid "Warning time must be a nonnegative integer\n"
 msgstr ""
 
-#: plugins/check_real.c:333 plugins/check_smtp.c:258
+#: plugins/check_real.c:337 plugins/check_smtp.c:264
 msgid "Critical time must be a nonnegative integer\n"
 msgstr ""
 
-#: plugins/check_real.c:369
+#: plugins/check_real.c:348 plugins/check_smtp.c:284
+msgid "Time interval must be a nonnegative integer\n"
+msgstr ""
+
+#: plugins/check_real.c:373
 msgid "You must provide a server to check\n"
 msgstr ""
 
-#: plugins/check_real.c:402
+#: plugins/check_real.c:406
 msgid "Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n"
 msgstr ""
 
-#: plugins/check_real.c:405
+#: plugins/check_real.c:409
 #, fuzzy
 msgid ""
 "This plugin tests the REAL service on the specified host.\n"
 "\n"
 msgstr "Le plugin tests a %s connection with l'host specified\n"
 
-#: plugins/check_real.c:413
+#: plugins/check_real.c:417
 #, c-format
 msgid ""
 " -u, --url=STRING\n"
@@ -2877,7 +2894,7 @@ msgid ""
 "   String to expect in first line of server response (default: %s)\n"
 msgstr ""
 
-#: plugins/check_real.c:426
+#: plugins/check_real.c:430
 msgid ""
 "This plugin will attempt to open an RTSP connection with the host.\n"
 "Successul connects return STATE_OK, refusals and timeouts return\n"
@@ -2886,48 +2903,48 @@ msgid ""
 "values."
 msgstr ""
 
-#: plugins/check_smtp.c:103
+#: plugins/check_smtp.c:108
 msgid "recv() failed\n"
 msgstr ""
 
-#: plugins/check_smtp.c:112
+#: plugins/check_smtp.c:117
 msgid "Invalid SMTP response received from host\n"
 msgstr ""
 
-#: plugins/check_smtp.c:114
+#: plugins/check_smtp.c:119
 #, c-format
 msgid "Invalid SMTP response received from host on port %d\n"
 msgstr ""
 
-#: plugins/check_smtp.c:144
+#: plugins/check_smtp.c:149
 #, c-format
 msgid ""
 "DUMMYCMD: %s\n"
 "%s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:166
+#: plugins/check_smtp.c:172
 #, c-format
-msgid "SMTP %s - %.3f sec. response time, %s|time=%.3f\n"
+msgid "SMTP %s - %.3f sec. response time, %s|time=%ldus\n"
 msgstr ""
 
-#: plugins/check_smtp.c:169
+#: plugins/check_smtp.c:175
 #, c-format
-msgid "SMTP %s - %.3f second response time|time=%.3f\n"
+msgid "SMTP %s - %.3f second response time|time=%ldus\n"
 msgstr ""
 
-#: plugins/check_smtp.c:350
+#: plugins/check_smtp.c:356
 msgid "Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n"
 msgstr ""
 
-#: plugins/check_smtp.c:353
+#: plugins/check_smtp.c:359
 #, fuzzy
 msgid ""
 "This plugin will attempt to open an SMTP connection with the host.\n"
 "\n"
 msgstr "Le plugin tests a %s connection with l'host specified\n"
 
-#: plugins/check_smtp.c:364
+#: plugins/check_smtp.c:370
 #, c-format
 msgid ""
 " -e, --expect=STRING\n"
@@ -2941,7 +2958,7 @@ msgid ""
 "   (default: '%s')\n"
 msgstr ""
 
-#: plugins/check_smtp.c:381
+#: plugins/check_smtp.c:387
 msgid ""
 "\n"
 "Successul connects return STATE_OK, refusals and timeouts return\n"
@@ -2950,74 +2967,74 @@ msgid ""
 "STATE_WARNING return values.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:274
+#: plugins/check_snmp.c:278
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:281 plugins/check_snmp.c:519
+#: plugins/check_snmp.c:285 plugins/check_snmp.c:524
 #, c-format
 msgid "%s UNKNOWN: call for regex which was not a compiled option"
 msgstr ""
 
-#: plugins/check_snmp.c:318 plugins/negate.c:104
+#: plugins/check_snmp.c:322 plugins/negate.c:108
 #, c-format
 msgid ""
 "%s problem - No data recieved from host\n"
 "CMD: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:452
+#: plugins/check_snmp.c:457
 #, c-format
 msgid "Invalid critical threshold: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:466
+#: plugins/check_snmp.c:471
 #, c-format
 msgid "Invalid warning threshold: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:513
+#: plugins/check_snmp.c:518
 msgid "Could Not Compile Regular Expression"
 msgstr ""
 
-#: plugins/check_snmp.c:539
+#: plugins/check_snmp.c:544
 #, c-format
 msgid "Could not realloc() labels[%d]"
 msgstr ""
 
-#: plugins/check_snmp.c:552
+#: plugins/check_snmp.c:557
 msgid "Could not realloc() labels\n"
 msgstr ""
 
-#: plugins/check_snmp.c:570
+#: plugins/check_snmp.c:575
 #, c-format
 msgid "Could not realloc() units [%d]\n"
 msgstr ""
 
-#: plugins/check_snmp.c:583
+#: plugins/check_snmp.c:588
 msgid "Could not realloc() units\n"
 msgstr ""
 
-#: plugins/check_snmp.c:656
+#: plugins/check_snmp.c:661
 #, c-format
 msgid ""
 "Missing secname (%s) or authpassword (%s) ! \n"
 ")"
 msgstr ""
 
-#: plugins/check_snmp.c:674
+#: plugins/check_snmp.c:679
 #, c-format
 msgid "Invalid SNMP version: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:869
+#: plugins/check_snmp.c:874
 msgid ""
 "Check status of remote machines and obtain sustem information via SNMP\n"
 "\n"
 msgstr ""
 
-#: plugins/check_snmp.c:879
+#: plugins/check_snmp.c:884
 msgid ""
 " -P, --protocol=[1|3]\n"
 "    SNMP protocol version\n"
@@ -3027,7 +3044,7 @@ msgid ""
 "    SNMPv3 auth proto\n"
 msgstr ""
 
-#: plugins/check_snmp.c:888
+#: plugins/check_snmp.c:893
 #, c-format
 msgid ""
 " -C, --community=STRING\n"
@@ -3041,7 +3058,7 @@ msgid ""
 "    SNMPv3 crypt passwd (DES)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:900
+#: plugins/check_snmp.c:905
 #, c-format
 msgid ""
 " -o, --oid=OID(s)\n"
@@ -3054,7 +3071,7 @@ msgid ""
 "    to be the data that should be used in the evaluation.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:910
+#: plugins/check_snmp.c:915
 msgid ""
 " -w, --warning=INTEGER_RANGE(s)\n"
 "    Range(s) which will not result in a WARNING status\n"
@@ -3062,7 +3079,7 @@ msgid ""
 "    Range(s) which will not result in a CRITICAL status\n"
 msgstr ""
 
-#: plugins/check_snmp.c:917
+#: plugins/check_snmp.c:922
 msgid ""
 " -s, --string=STRING\n"
 "    Return OK state (for that OID) if STRING is an exact match\n"
@@ -3076,7 +3093,7 @@ msgid ""
 "    Prefix label for output from plugin (default -s 'SNMP')\n"
 msgstr ""
 
-#: plugins/check_snmp.c:928
+#: plugins/check_snmp.c:933
 msgid ""
 " -u, --units=STRING\n"
 "    Units label(s) for output data (e.g., 'sec.').\n"
@@ -3084,7 +3101,7 @@ msgid ""
 "    Separates output on multiple OID requests\n"
 msgstr ""
 
-#: plugins/check_snmp.c:938
+#: plugins/check_snmp.c:943
 msgid ""
 "\n"
 "- This plugin uses the 'snmpget' command included with the NET-SNMP "
@@ -3094,14 +3111,14 @@ msgid ""
 "  http://net-snmp.sourceforge.net before you can use this plugin.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:943
+#: plugins/check_snmp.c:948
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
 "with\n"
 "  internal spaces must be quoted) [max 8 OIDs]\n"
 msgstr ""
 
-#: plugins/check_snmp.c:947
+#: plugins/check_snmp.c:952
 msgid ""
 "- Ranges are inclusive and are indicated with colons. When specified as\n"
 "  'min:max' a STATE_OK will be returned if the result is within the "
@@ -3110,14 +3127,14 @@ msgid ""
 "  returned if the result is outside the specified range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:953
+#: plugins/check_snmp.c:958
 msgid ""
 "- If specified in the order 'max:min' a non-OK state will be returned if "
 "the\n"
 "  result is within the (inclusive) range.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:957
+#: plugins/check_snmp.c:962
 msgid ""
 "- Upper or lower bounds may be omitted to skip checking the respective "
 "limit.\n"
@@ -3130,7 +3147,7 @@ msgid ""
 "  returned from the SNMP query is an unsigned integer.\n"
 msgstr ""
 
-#: plugins/check_snmp.c:971
+#: plugins/check_snmp.c:976
 #, c-format
 msgid ""
 "Usage: %s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range] \n"
@@ -3141,61 +3158,71 @@ msgid ""
 "  [-X privpasswd]\n"
 msgstr ""
 
-#: plugins/check_ssh.c:203
+#: plugins/check_ssh.c:207
 #, c-format
 msgid "Server answer: %s"
 msgstr ""
 
-#: plugins/check_ssh.c:214
+#: plugins/check_ssh.c:218
 #, c-format
 msgid "SSH OK - %s (protocol %s)\n"
 msgstr ""
 
-#: plugins/check_ssh.c:232
+#: plugins/check_ssh.c:236
 msgid "Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n"
 msgstr ""
 
-#: plugins/check_ssh.c:235
+#: plugins/check_ssh.c:239
 msgid ""
 "Try to connect to SSH server at specified server and port\n"
 "\n"
 msgstr ""
 
-#: plugins/check_ssh.c:255
+#: plugins/check_ssh.c:259
 #, c-format
 msgid "Usage: %s [-46] [-t <timeout>] [-p <port>] <host>\n"
 msgstr ""
 
-#: plugins/check_swap.c:100
+#: plugins/check_swap.c:125
 #, c-format
 msgid "Command: %s\n"
 msgstr ""
 
-#: plugins/check_swap.c:142
+#: plugins/check_swap.c:127
+#, c-format
+msgid "Format: %s\n"
+msgstr ""
+
+#: plugins/check_swap.c:163
+#, c-format
+msgid "total=%d, used=%d, free=%d\n"
+msgstr ""
+
+#: plugins/check_swap.c:186
 #, c-format
 msgid "total=%d, free=%d\n"
 msgstr ""
 
-#: plugins/check_swap.c:159
+#: plugins/check_swap.c:222
 #, c-format
 msgid " %d%% free (%lu MB out of %lu MB)%s"
 msgstr ""
 
-#: plugins/check_swap.c:320
+#: plugins/check_swap.c:365
 msgid "Warning percentage should be more than critical percentage\n"
 msgstr ""
 
-#: plugins/check_swap.c:324
+#: plugins/check_swap.c:369
 msgid "Warning free space should be more than critical free space\n"
 msgstr ""
 
-#: plugins/check_swap.c:341
+#: plugins/check_swap.c:386
 msgid ""
 "Check swap space on local server.\n"
 "\n"
 msgstr ""
 
-#: plugins/check_swap.c:347
+#: plugins/check_swap.c:392
 #, c-format
 msgid ""
 "\n"
@@ -3215,7 +3242,7 @@ msgid ""
 "    Conduct comparisons for all swap partitions, one by one\n"
 msgstr ""
 
-#: plugins/check_swap.c:360
+#: plugins/check_swap.c:404
 msgid ""
 "\n"
 "On Solaris, if -a specified, uses swap -l, otherwise uses swap -s.\n"
@@ -3223,7 +3250,13 @@ msgid ""
 "real memory\n"
 msgstr ""
 
-#: plugins/check_swap.c:375
+#: plugins/check_swap.c:408
+msgid ""
+"\n"
+"On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.\n"
+msgstr ""
+
+#: plugins/check_swap.c:420
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3233,74 +3266,74 @@ msgid ""
 " %s (-V | --version) for version information\n"
 msgstr ""
 
-#: plugins/check_tcp.c:201
+#: plugins/check_tcp.c:202
 msgid "ERROR: Generic check_tcp called with unknown service\n"
 msgstr ""
 
-#: plugins/check_tcp.c:286
+#: plugins/check_tcp.c:287
 msgid "Invalid response from host\n"
 msgstr ""
 
-#: plugins/check_tcp.c:325
+#: plugins/check_tcp.c:326
 #, c-format
 msgid "%s %s%s - %.3f second response time on port %d"
 msgstr ""
 
-#: plugins/check_tcp.c:425
+#: plugins/check_tcp.c:426
 msgid "invalid host name or address"
 msgstr ""
 
-#: plugins/check_tcp.c:430 plugins/check_time.c:226 plugins/check_time.c:238
-#: plugins/check_udp.c:162 plugins/check_users.c:141
+#: plugins/check_tcp.c:431 plugins/check_time.c:252 plugins/check_time.c:264
+#: plugins/check_udp.c:166 plugins/check_users.c:145
 msgid "Critical threshold must be a nonnegative integer\n"
 msgstr ""
 
-#: plugins/check_tcp.c:437 plugins/check_time.c:207 plugins/check_time.c:231
-#: plugins/check_udp.c:169 plugins/check_users.c:147 plugins/check_users.c:157
-#: plugins/check_users.c:164
+#: plugins/check_tcp.c:438 plugins/check_time.c:233 plugins/check_time.c:257
+#: plugins/check_udp.c:173 plugins/check_users.c:151 plugins/check_users.c:161
+#: plugins/check_users.c:168
 msgid "Warning threshold must be a nonnegative integer\n"
 msgstr ""
 
-#: plugins/check_tcp.c:452
+#: plugins/check_tcp.c:453
 msgid "Timeout interval must be a positive integer\n"
 msgstr ""
 
-#: plugins/check_tcp.c:475
+#: plugins/check_tcp.c:476
 msgid "Maxbytes must be a positive integer\n"
 msgstr ""
 
-#: plugins/check_tcp.c:489
+#: plugins/check_tcp.c:490
 msgid "Refuse mut be one of ok, warn, crit\n"
 msgstr ""
 
-#: plugins/check_tcp.c:495
+#: plugins/check_tcp.c:496
 msgid "Delay must be a positive integer\n"
 msgstr ""
 
-#: plugins/check_tcp.c:500
+#: plugins/check_tcp.c:501
 msgid "SSL support not available. Install OpenSSL and recompile."
 msgstr ""
 
-#: plugins/check_tcp.c:508
+#: plugins/check_tcp.c:509
 msgid "You must provide a server address\n"
 msgstr ""
 
-#: plugins/check_tcp.c:526
+#: plugins/check_tcp.c:527
 msgid "ERROR: Cannot create SSL context.\n"
 msgstr ""
 
-#: plugins/check_tcp.c:552
+#: plugins/check_tcp.c:553
 msgid "ERROR: Cannot initiate SSL handshake.\n"
 msgstr ""
 
-#: plugins/check_tcp.c:597
+#: plugins/check_tcp.c:599
 #, 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:608
+#: plugins/check_tcp.c:610
 msgid ""
 " -s, --send=STRING\n"
 "    String to send to the server\n"
@@ -3316,7 +3349,7 @@ msgstr ""
 " -q, --quit=STRING\n"
 "    String to send server to initiate a clean close of the connection\n"
 
-#: plugins/check_tcp.c:616
+#: plugins/check_tcp.c:618
 #, fuzzy
 msgid ""
 " -r, --refuse=ok|warn|crit\n"
@@ -3337,7 +3370,7 @@ msgstr ""
 " -c, --critical=DOUBLE\n"
 "    Response time to result in critical status (seconds)\n"
 
-#: plugins/check_tcp.c:639
+#: plugins/check_tcp.c:641
 #, fuzzy, c-format
 msgid ""
 "Usage: %s -H host -p port [-w <warning time>] [-c <critical time>]\n"
@@ -3349,60 +3382,71 @@ msgstr ""
 "\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_time.c:76
+#: plugins/check_time.c:87
 #, c-format
 msgid "TIME UNKNOWN - could not connect to server %s, port %d\n"
 msgstr ""
 
-#: plugins/check_time.c:99
+#: plugins/check_time.c:100
+#, c-format
+msgid "TIME UNKNOWN - could not send UDP request to server %s, port %d\n"
+msgstr ""
+
+#: plugins/check_time.c:124
 #, c-format
 msgid "TIME UNKNOWN - no data on recv() from server %s, port %d\n"
 msgstr ""
 
-#: plugins/check_time.c:111
+#: plugins/check_time.c:136
 #, c-format
 msgid "TIME %s - %d second response time\n"
 msgstr ""
 
-#: plugins/check_time.c:125
+#: plugins/check_time.c:150
 #, c-format
 msgid "TIME %s - %lu second time difference\n"
 msgstr ""
 
-#: plugins/check_time.c:189 plugins/check_time.c:262 plugins/check_udp.c:157
-#: plugins/check_udp.c:198
+#: plugins/check_time.c:215 plugins/check_time.c:290 plugins/check_udp.c:161
+#: plugins/check_udp.c:202
 msgid "Invalid host name/address\n"
 msgstr ""
 
-#: plugins/check_time.c:203
+#: plugins/check_time.c:229
 msgid "Warning thresholds must be a nonnegative integer\n"
 msgstr ""
 
-#: plugins/check_time.c:222
+#: plugins/check_time.c:248
 msgid "Critical thresholds must be a nonnegative integer\n"
 msgstr ""
 
-#: plugins/check_time.c:251 plugins/check_udp.c:176
+#: plugins/check_time.c:271 plugins/check_udp.c:186
+msgid "Server port must be a nonnegative integer\n"
+msgstr ""
+
+#: plugins/check_time.c:277 plugins/check_udp.c:180
 msgid "Timeout interval must be a nonnegative integer\n"
 msgstr ""
 
-#: plugins/check_time.c:266 plugins/check_udp.c:203
+#: plugins/check_time.c:294 plugins/check_udp.c:207
 msgid "Host name was not supplied\n"
 msgstr ""
 
-#: plugins/check_time.c:286 plugins/check_udp.c:221 plugins/check_users.c:182
+#: plugins/check_time.c:314 plugins/check_udp.c:225 plugins/check_users.c:186
 msgid "Copyright (c) 1999 Ethan Galstad\n"
 msgstr ""
 
-#: plugins/check_time.c:289
+#: plugins/check_time.c:317
 #, fuzzy
 msgid ""
 "This plugin will check the time on the specified host.\n"
 "\n"
 msgstr "Le plugin tests a %s connection with l'host specified\n"
 
-#: plugins/check_time.c:298
+#: plugins/check_time.c:326
 msgid ""
+" -u, --udp\n"
+"    Use UDP to connect, not TCP\n"
 " -w, --warning-variance=INTEGER\n"
 "    Time difference (sec.) necessary to result in a warning status\n"
 " -c, --critical-variance=INTEGER\n"
@@ -3413,34 +3457,34 @@ msgid ""
 "    Response time (sec.) necessary to result in critical status\n"
 msgstr ""
 
-#: plugins/check_time.c:319
+#: plugins/check_time.c:349
 #, c-format
 msgid ""
-"Usage: %s -H <host_address> [-p port] [-w variance] [-c variance]\n"
+"Usage: %s -H <host_address> [-p port] [-u] [-w variance] [-c variance]\n"
 "    [-W connect_time] [-C connect_time] [-t timeout]\n"
 msgstr ""
 
-#: plugins/check_udp.c:88
+#: plugins/check_udp.c:92
 #, c-format
 msgid "Connection %s on port %d - %d second response time\n"
 msgstr ""
 
-#: plugins/check_udp.c:89
+#: plugins/check_udp.c:93
 msgid "accepted"
 msgstr ""
 
-#: plugins/check_udp.c:89
+#: plugins/check_udp.c:93
 msgid "problem"
 msgstr ""
 
-#: plugins/check_udp.c:224
+#: plugins/check_udp.c:228
 #, fuzzy
 msgid ""
 "This plugin tests an UDP connection with the specified host.\n"
 "\n"
 msgstr "Le plugin tests a %s connection with l'host specified\n"
 
-#: plugins/check_udp.c:233
+#: plugins/check_udp.c:237
 #, fuzzy
 msgid ""
 " -e, --expect=STRING <optional>\n"
@@ -3455,7 +3499,7 @@ msgstr ""
 " -q, --quit=STRING\n"
 "    String to send server to initiate a clean close of the connection\n"
 
-#: plugins/check_udp.c:245
+#: plugins/check_udp.c:249
 msgid ""
 "This plugin will attempt to connect to the specified port on the host.\n"
 "Successful connects return STATE_OK, refusals and timeouts return\n"
@@ -3463,18 +3507,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_udp.c:262
+#: plugins/check_udp.c:266
 #, c-format
 msgid ""
 "Usage: %s -H <host_address> [-p port] [-w warn_time] [-c crit_time]\n"
 "    [-e expect] [-s send] [-t to_sec] [-v]\n"
 msgstr ""
 
-#: plugins/check_ups.c:542
+#: plugins/check_ups.c:546
 msgid "Copyright (c) 2000 Tom Shields"
 msgstr ""
 
-#: plugins/check_ups.c:545
+#: plugins/check_ups.c:549
 msgid ""
 "This plugin tests the UPS service on the specified host.\n"
 "Network UPS Tools from www.exploits.org must be running for this plugin to\n"
@@ -3482,13 +3526,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:555
+#: plugins/check_ups.c:559
 msgid ""
 " -u, --ups=STRING\n"
 "    Name of UPS\n"
 msgstr ""
 
-#: plugins/check_ups.c:565
+#: plugins/check_ups.c:569
 msgid ""
 "This plugin attempts to determine the status of a UPS (Uninterruptible "
 "Power\n"
@@ -3501,7 +3545,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:572
+#: plugins/check_ups.c:576
 msgid ""
 "You may also specify a variable to check [such as temperature, utility "
 "voltage,\n"
@@ -3513,7 +3557,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:578
+#: plugins/check_ups.c:582
 msgid ""
 "Notes:\n"
 "\n"
@@ -3524,31 +3568,31 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_ups.c:593
+#: plugins/check_ups.c:597
 #, c-format
 msgid ""
 "Usage: %s -H host [-e expect] [-p port] [-w warn] [-c crit]\n"
 "    [-t timeout] [-v]\n"
 msgstr ""
 
-#: plugins/check_users.c:69
+#: plugins/check_users.c:73
 #, c-format
 msgid "# users=%d"
 msgstr ""
 
-#: plugins/check_users.c:94
+#: plugins/check_users.c:98
 #, c-format
 msgid "USERS %s - %d users currently logged in\n"
 msgstr ""
 
-#: plugins/check_users.c:185
+#: plugins/check_users.c:189
 msgid ""
 "This plugin checks the number of users currently logged in on the local\n"
 "system and generates an error if the number exceeds the thresholds "
 "specified.\n"
 msgstr ""
 
-#: plugins/check_users.c:193
+#: plugins/check_users.c:197
 msgid ""
 " -w, --warning=INTEGER\n"
 "    Set WARNING status if more than INTEGER users are logged in\n"
@@ -3556,17 +3600,17 @@ msgid ""
 "    Set CRITICAL status if more than INTEGER users are logged in\n"
 msgstr ""
 
-#: plugins/negate.c:234
+#: plugins/negate.c:238
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).\n"
 "\n"
 msgstr ""
 
-#: plugins/negate.c:244
+#: plugins/negate.c:248
 msgid "     [keep timeout than the plugin timeout to retain CRITICAL status]\n"
 msgstr ""
 
-#: plugins/negate.c:247
+#: plugins/negate.c:251
 msgid ""
 "  negate \"/usr/local/nagios/libexec/check_ping -H host\"\n"
 "    Run check_ping and invert result. Must use full path to plugin\n"
@@ -3574,7 +3618,7 @@ msgid ""
 "    Use single quotes if you need to retain spaces\n"
 msgstr ""
 
-#: plugins/negate.c:253
+#: plugins/negate.c:257
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert "
 "it.\n"
@@ -3585,24 +3629,19 @@ msgid ""
 "Otherwise, the output state of the wrapped plugin is unchanged.\n"
 msgstr ""
 
-#: plugins/negate.c:269
+#: plugins/negate.c:273
 #, c-format
 msgid "Usage: %s [-t timeout] <definition of wrapped plugin>\n"
 msgstr ""
 
-#: plugins/urlize.c:101
+#: plugins/urlize.c:105
 #, c-format
 msgid ""
 "%s problem - No data recieved from host\n"
 "CMD: %s</A>\n"
 msgstr ""
 
-#: plugins/urlize.c:128
-msgid ""
-"Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"
-msgstr ""
-
-#: plugins/urlize.c:131
+#: plugins/urlize.c:135
 msgid ""
 "\n"
 "This plugin wraps the text output of another command (plugin) in HTML\n"
@@ -3612,7 +3651,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/urlize.c:139
+#: plugins/urlize.c:143
 msgid ""
 "\n"
 "Pay close attention to quoting to ensure that the shell passes the expected\n"
@@ -3629,14 +3668,14 @@ msgid ""
 "    urlize http://example.com/ \"check_http -H example.com -r 'two words'\"\n"
 msgstr ""
 
-#: plugins/urlize.c:162
+#: plugins/urlize.c:166
 #, c-format
 msgid ""
 "Usage:\n"
 " %s <url> <plugin> <arg1> ... <argN>\n"
 msgstr ""
 
-#: plugins/utils.c:81
+#: plugins/utils.c:80
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -3644,7 +3683,7 @@ msgid ""
 "send email to nagiosplug-devel@lists.sourceforge.net\n"
 msgstr ""
 
-#: plugins/utils.c:107
+#: plugins/utils.c:106
 msgid ""
 "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
 "copies of the plugins under the terms of the GNU General Public License.\n"