summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--plugins-root/check_dhcp.c10
-rw-r--r--plugins-root/check_icmp.c8
-rw-r--r--plugins/check_apt.c10
-rw-r--r--plugins/check_by_ssh.c18
-rw-r--r--plugins/check_cluster.c10
-rw-r--r--plugins/check_dig.c16
-rw-r--r--plugins/check_disk.c12
-rw-r--r--plugins/check_dns.c10
-rw-r--r--plugins/check_dummy.c4
-rw-r--r--plugins/check_fping.c10
-rw-r--r--plugins/check_game.c10
-rw-r--r--plugins/check_hpjd.c8
-rw-r--r--plugins/check_http.c16
-rw-r--r--plugins/check_ide_smart.c8
-rw-r--r--plugins/check_ldap.c18
-rw-r--r--plugins/check_load.c8
-rw-r--r--plugins/check_mrtg.c8
-rw-r--r--plugins/check_mrtgtraf.c8
-rw-r--r--plugins/check_mysql.c10
-rw-r--r--plugins/check_mysql_query.c12
-rw-r--r--plugins/check_nagios.c10
-rw-r--r--plugins/check_nt.c8
-rw-r--r--plugins/check_ntp.c16
-rw-r--r--plugins/check_ntp_peer.c16
-rw-r--r--plugins/check_ntp_time.c16
-rw-r--r--plugins/check_nwstat.c12
-rw-r--r--plugins/check_overcr.c14
-rw-r--r--plugins/check_pgsql.c18
-rw-r--r--plugins/check_ping.c12
-rw-r--r--plugins/check_procs.c10
-rw-r--r--plugins/check_radius.c12
-rw-r--r--plugins/check_real.c16
-rw-r--r--plugins/check_smtp.c18
-rw-r--r--plugins/check_snmp.c16
-rw-r--r--plugins/check_ssh.c16
-rw-r--r--plugins/check_swap.c10
-rw-r--r--plugins/check_tcp.c18
-rw-r--r--plugins/check_time.c12
-rw-r--r--plugins/check_ups.c16
-rw-r--r--plugins/check_users.c8
-rw-r--r--plugins/negate.c6
-rw-r--r--plugins/urlize.c4
-rw-r--r--plugins/utils.h52
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/de.po102
-rw-r--r--po/fr.po164
-rw-r--r--po/nagios-plugins.pot102
48 files changed, 631 insertions, 289 deletions
diff --git a/NEWS b/NEWS
index 8a11b32..47033b2 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ This file documents the major additions and syntax changes between releases.
20 check_ldap now allows for specifying an empty LDAP base 20 check_ldap now allows for specifying an empty LDAP base
21 Fix compilation error of pst3 in Solaris 8 21 Fix compilation error of pst3 in Solaris 8
22 Fix check_radius returning OK on unexpected results (Craig Leres - #2911752) 22 Fix check_radius returning OK on unexpected results (Craig Leres - #2911752)
23 Fix translations when extra-opts aren't enabled (Jan Wagner - #2832884)
23 WARNINGS 24 WARNINGS
24 Updated developer documentation to say that performance labels should not have an equals sign or 25 Updated developer documentation to say that performance labels should not have an equals sign or
25 single quote in the label 26 single quote in the label
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index bdd348f..51ac96e 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -1392,10 +1392,10 @@ void print_help(void){
1392 1392
1393 print_usage(); 1393 print_usage();
1394 1394
1395 printf (_(UT_HELP_VRSN)); 1395 printf (UT_HELP_VRSN);
1396 printf (_(UT_EXTRA_OPTS)); 1396 printf (UT_EXTRA_OPTS);
1397 1397
1398 printf (_(UT_VERBOSE)); 1398 printf (UT_VERBOSE);
1399 1399
1400 printf (" %s\n", "-s, --serverip=IPADDRESS"); 1400 printf (" %s\n", "-s, --serverip=IPADDRESS");
1401 printf (" %s\n", _("IP address of DHCP server that we must hear from")); 1401 printf (" %s\n", _("IP address of DHCP server that we must hear from"));
@@ -1413,10 +1413,10 @@ void print_help(void){
1413#ifdef NP_EXTRA_OPTS 1413#ifdef NP_EXTRA_OPTS
1414 printf ("\n"); 1414 printf ("\n");
1415 printf ("%s\n", _("Notes:")); 1415 printf ("%s\n", _("Notes:"));
1416 printf (_(UT_EXTRA_OPTS_NOTES)); 1416 printf (UT_EXTRA_OPTS_NOTES);
1417#endif 1417#endif
1418 1418
1419 printf (_(UT_SUPPORT)); 1419 printf (UT_SUPPORT);
1420 return; 1420 return;
1421 } 1421 }
1422 1422
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 2a1b813..590bb1a 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -1281,8 +1281,8 @@ print_help(void)
1281 1281
1282 print_usage (); 1282 print_usage ();
1283 1283
1284 printf (_(UT_HELP_VRSN)); 1284 printf (UT_HELP_VRSN);
1285 printf (_(UT_EXTRA_OPTS)); 1285 printf (UT_EXTRA_OPTS);
1286 1286
1287 printf (" %s\n", "-H"); 1287 printf (" %s\n", "-H");
1288 printf (" %s\n", _("specify a target")); 1288 printf (" %s\n", _("specify a target"));
@@ -1337,10 +1337,10 @@ print_help(void)
1337*/ 1337*/
1338#ifdef NP_EXTRA_OPTS 1338#ifdef NP_EXTRA_OPTS
1339 printf ("\n"); 1339 printf ("\n");
1340 printf (_(UT_EXTRA_OPTS_NOTES)); 1340 printf (UT_EXTRA_OPTS_NOTES);
1341#endif 1341#endif
1342 1342
1343 printf (_(UT_SUPPORT)); 1343 printf (UT_SUPPORT);
1344} 1344}
1345 1345
1346 1346
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 3da54bc..7276f03 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -411,10 +411,10 @@ print_help (void)
411 411
412 print_usage(); 412 print_usage();
413 413
414 printf(_(UT_HELP_VRSN)); 414 printf(UT_HELP_VRSN);
415 printf(_(UT_EXTRA_OPTS)); 415 printf(UT_EXTRA_OPTS);
416 416
417 printf(_(UT_TIMEOUT), timeout_interval); 417 printf(UT_TIMEOUT, timeout_interval);
418 418
419 printf (" %s\n", "-U, --upgrade=OPTS"); 419 printf (" %s\n", "-U, --upgrade=OPTS");
420 printf (" %s\n", _("[Default] Perform an upgrade. If an optional OPTS argument is provided,")); 420 printf (" %s\n", _("[Default] Perform an upgrade. If an optional OPTS argument is provided,"));
@@ -456,10 +456,10 @@ print_help (void)
456#ifdef NP_EXTRA_OPTS 456#ifdef NP_EXTRA_OPTS
457 printf("\n"); 457 printf("\n");
458 printf("%s\n", _("Notes:")); 458 printf("%s\n", _("Notes:"));
459 printf(_(UT_EXTRA_OPTS_NOTES)); 459 printf(UT_EXTRA_OPTS_NOTES);
460#endif 460#endif
461 461
462 printf(_(UT_SUPPORT)); 462 printf(UT_SUPPORT);
463} 463}
464 464
465 465
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 793c03d..b688d43 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -386,13 +386,13 @@ print_help (void)
386 386
387 print_usage (); 387 print_usage ();
388 388
389 printf (_(UT_HELP_VRSN)); 389 printf (UT_HELP_VRSN);
390 390
391 printf (_(UT_EXTRA_OPTS)); 391 printf (UT_EXTRA_OPTS);
392 392
393 printf (_(UT_HOST_PORT), 'p', "none"); 393 printf (UT_HOST_PORT, 'p', "none");
394 394
395 printf (_(UT_IPv46)); 395 printf (UT_IPv46);
396 396
397 printf (" %s\n", "-1, --proto1"); 397 printf (" %s\n", "-1, --proto1");
398 printf (" %s\n", _("tell ssh to use Protocol 1 [optional]")); 398 printf (" %s\n", _("tell ssh to use Protocol 1 [optional]"));
@@ -420,9 +420,9 @@ print_help (void)
420 printf (" %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]")); 420 printf (" %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));
421 printf (" %s\n","-q, --quiet"); 421 printf (" %s\n","-q, --quiet");
422 printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]")); 422 printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
423 printf (_(UT_WARN_CRIT)); 423 printf (UT_WARN_CRIT);
424 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 424 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
425 printf (_(UT_VERBOSE)); 425 printf (UT_VERBOSE);
426 printf("\n"); 426 printf("\n");
427 printf (" %s\n", _("The most common mode of use is to refer to a local identity file with")); 427 printf (" %s\n", _("The most common mode of use is to refer to a local identity file with"));
428 printf (" %s\n", _("the '-i' option. In this mode, the identity pair should have a null")); 428 printf (" %s\n", _("the '-i' option. In this mode, the identity pair should have a null"));
@@ -445,10 +445,10 @@ print_help (void)
445#ifdef NP_EXTRA_OPTS 445#ifdef NP_EXTRA_OPTS
446 printf("\n"); 446 printf("\n");
447 printf("%s\n", _("Notes:")); 447 printf("%s\n", _("Notes:"));
448 printf(_(UT_EXTRA_OPTS_NOTES)); 448 printf(UT_EXTRA_OPTS_NOTES);
449#endif 449#endif
450 450
451 printf(_(UT_SUPPORT)); 451 printf(UT_SUPPORT);
452} 452}
453 453
454 454
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index 89b1a0e..f232227 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -234,7 +234,7 @@ print_help(void)
234 234
235 printf("\n"); 235 printf("\n");
236 printf("%s\n", _("Options:")); 236 printf("%s\n", _("Options:"));
237 printf(_(UT_EXTRA_OPTS)); 237 printf(UT_EXTRA_OPTS);
238 printf (" %s\n", "-s, --service"); 238 printf (" %s\n", "-s, --service");
239 printf (" %s\n", _("Check service cluster status")); 239 printf (" %s\n", _("Check service cluster status"));
240 printf (" %s\n", "-h, --host"); 240 printf (" %s\n", "-h, --host");
@@ -251,14 +251,14 @@ print_help(void)
251 printf (" %s\n", _("The status codes of the hosts or services in the cluster, separated by")); 251 printf (" %s\n", _("The status codes of the hosts or services in the cluster, separated by"));
252 printf (" %s\n", _("commas")); 252 printf (" %s\n", _("commas"));
253 253
254 printf(_(UT_VERBOSE)); 254 printf(UT_VERBOSE);
255 255
256 printf("\n"); 256 printf("\n");
257 printf("%s\n", _("Notes:")); 257 printf("%s\n", _("Notes:"));
258 printf(_(UT_THRESHOLDS_NOTES)); 258 printf(UT_THRESHOLDS_NOTES);
259#ifdef NP_EXTRA_OPTS 259#ifdef NP_EXTRA_OPTS
260 printf ("\n"); 260 printf ("\n");
261 printf (_(UT_EXTRA_OPTS_NOTES)); 261 printf (UT_EXTRA_OPTS_NOTES);
262#endif 262#endif
263 263
264 printf ("\n"); 264 printf ("\n");
@@ -266,7 +266,7 @@ print_help(void)
266 printf (" %s\n", "check_cluster -s -d 2,0,2,0 -c @3:"); 266 printf (" %s\n", "check_cluster -s -d 2,0,2,0 -c @3:");
267 printf (" %s\n", _("Will alert critical if there are 3 or more service data points in a non-OK state") ); 267 printf (" %s\n", _("Will alert critical if there are 3 or more service data points in a non-OK state") );
268 268
269 printf(_(UT_SUPPORT)); 269 printf(UT_SUPPORT);
270} 270}
271 271
272 272
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 08be937..45189b0 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -319,11 +319,11 @@ print_help (void)
319 319
320 print_usage (); 320 print_usage ();
321 321
322 printf (_(UT_HELP_VRSN)); 322 printf (UT_HELP_VRSN);
323 323
324 printf (_(UT_EXTRA_OPTS)); 324 printf (UT_EXTRA_OPTS);
325 325
326 printf (_(UT_HOST_PORT), 'p', myport); 326 printf (UT_HOST_PORT, 'p', myport);
327 327
328 printf (" %s\n","-l, --query_address=STRING"); 328 printf (" %s\n","-l, --query_address=STRING");
329 printf (" %s\n",_("Machine name to lookup")); 329 printf (" %s\n",_("Machine name to lookup"));
@@ -334,9 +334,9 @@ print_help (void)
334 printf (" %s\n",_("was in -l")); 334 printf (" %s\n",_("was in -l"));
335 printf (" %s\n","-A, --dig-arguments=STRING"); 335 printf (" %s\n","-A, --dig-arguments=STRING");
336 printf (" %s\n",_("Pass STRING as argument(s) to dig")); 336 printf (" %s\n",_("Pass STRING as argument(s) to dig"));
337 printf (_(UT_WARN_CRIT)); 337 printf (UT_WARN_CRIT);
338 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 338 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
339 printf (_(UT_VERBOSE)); 339 printf (UT_VERBOSE);
340 340
341 printf ("\n"); 341 printf ("\n");
342 printf ("%s\n", _("Examples:")); 342 printf ("%s\n", _("Examples:"));
@@ -346,10 +346,10 @@ print_help (void)
346#ifdef NP_EXTRA_OPTS 346#ifdef NP_EXTRA_OPTS
347 printf ("\n"); 347 printf ("\n");
348 printf ("%s\n", _("Notes:")); 348 printf ("%s\n", _("Notes:"));
349 printf (_(UT_EXTRA_OPTS_NOTES)); 349 printf (UT_EXTRA_OPTS_NOTES);
350#endif 350#endif
351 351
352 printf (_(UT_SUPPORT)); 352 printf (UT_SUPPORT);
353} 353}
354 354
355 355
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 5c0eec5..633aa5f 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -904,8 +904,8 @@ print_help (void)
904 904
905 print_usage (); 905 print_usage ();
906 906
907 printf (_(UT_HELP_VRSN)); 907 printf (UT_HELP_VRSN);
908 printf (_(UT_EXTRA_OPTS)); 908 printf (UT_EXTRA_OPTS);
909 909
910 printf (" %s\n", "-w, --warning=INTEGER"); 910 printf (" %s\n", "-w, --warning=INTEGER");
911 printf (" %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free")); 911 printf (" %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free"));
@@ -952,17 +952,17 @@ print_help (void)
952 printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); 952 printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)"));
953 printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); 953 printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION");
954 printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); 954 printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)"));
955 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 955 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
956 printf (" %s\n", "-u, --units=STRING"); 956 printf (" %s\n", "-u, --units=STRING");
957 printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); 957 printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)"));
958 printf (_(UT_VERBOSE)); 958 printf (UT_VERBOSE);
959 printf (" %s\n", "-X, --exclude-type=TYPE"); 959 printf (" %s\n", "-X, --exclude-type=TYPE");
960 printf (" %s\n", _("Ignore all filesystems of indicated type (may be repeated)")); 960 printf (" %s\n", _("Ignore all filesystems of indicated type (may be repeated)"));
961 961
962#ifdef NP_EXTRA_OPTS 962#ifdef NP_EXTRA_OPTS
963 printf ("\n"); 963 printf ("\n");
964 printf ("%s\n", _("Notes:")); 964 printf ("%s\n", _("Notes:"));
965 printf (_(UT_EXTRA_OPTS_NOTES)); 965 printf (UT_EXTRA_OPTS_NOTES);
966#endif 966#endif
967 967
968 printf ("\n"); 968 printf ("\n");
@@ -975,7 +975,7 @@ print_help (void)
975 printf (" %s\n", "check_disk -w 100M -c 50M -C -w 1000M -c 500M -p /foo -C -w 5% -c 3% -p /bar"); 975 printf (" %s\n", "check_disk -w 100M -c 50M -C -w 1000M -c 500M -p /foo -C -w 5% -c 3% -p /bar");
976 printf (" %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M")); 976 printf (" %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M"));
977 977
978 printf (_(UT_SUPPORT)); 978 printf (UT_SUPPORT);
979} 979}
980 980
981 981
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 873dcae..a921429 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -455,8 +455,8 @@ print_help (void)
455 455
456 print_usage (); 456 print_usage ();
457 457
458 printf (_(UT_HELP_VRSN)); 458 printf (UT_HELP_VRSN);
459 printf (_(UT_EXTRA_OPTS)); 459 printf (UT_EXTRA_OPTS);
460 460
461 printf (" -H, --hostname=HOST\n"); 461 printf (" -H, --hostname=HOST\n");
462 printf (" %s\n", _("The name or address you want to query")); 462 printf (" %s\n", _("The name or address you want to query"));
@@ -474,15 +474,15 @@ print_help (void)
474 printf (" -c, --critical=seconds\n"); 474 printf (" -c, --critical=seconds\n");
475 printf (" %s\n", _("Return critical if elapsed time exceeds value. Default off")); 475 printf (" %s\n", _("Return critical if elapsed time exceeds value. Default off"));
476 476
477 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 477 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
478 478
479#ifdef NP_EXTRA_OPTS 479#ifdef NP_EXTRA_OPTS
480 printf ("\n"); 480 printf ("\n");
481 printf ("%s\n", _("Notes:")); 481 printf ("%s\n", _("Notes:"));
482 printf (_(UT_EXTRA_OPTS_NOTES)); 482 printf (UT_EXTRA_OPTS_NOTES);
483#endif 483#endif
484 484
485 printf (_(UT_SUPPORT)); 485 printf (UT_SUPPORT);
486} 486}
487 487
488 488
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 8c3f535..e72bf30 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -109,9 +109,9 @@ print_help (void)
109 109
110 print_usage (); 110 print_usage ();
111 111
112 printf (_(UT_HELP_VRSN)); 112 printf (UT_HELP_VRSN);
113 113
114 printf (_(UT_SUPPORT)); 114 printf (UT_SUPPORT);
115} 115}
116 116
117 117
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index b27389d..4e6533f 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -399,8 +399,8 @@ print_help (void)
399 399
400 print_usage (); 400 print_usage ();
401 401
402 printf (_(UT_HELP_VRSN)); 402 printf (UT_HELP_VRSN);
403 printf (_(UT_EXTRA_OPTS)); 403 printf (UT_EXTRA_OPTS);
404 404
405 printf (" %s\n", "-H, --hostname=HOST"); 405 printf (" %s\n", "-H, --hostname=HOST");
406 printf (" %s\n", _("name or IP Address of host to ping (IP Address bypasses name lookup, reducing system load)")); 406 printf (" %s\n", _("name or IP Address of host to ping (IP Address bypasses name lookup, reducing system load)"));
@@ -416,7 +416,7 @@ print_help (void)
416 printf (" %s (default: fping's default for -t)\n", _("Target timeout (ms)"),PACKET_COUNT); 416 printf (" %s (default: fping's default for -t)\n", _("Target timeout (ms)"),PACKET_COUNT);
417 printf (" %s\n", "-i, --interval=INTEGER"); 417 printf (" %s\n", "-i, --interval=INTEGER");
418 printf (" %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"),PACKET_COUNT); 418 printf (" %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"),PACKET_COUNT);
419 printf (_(UT_VERBOSE)); 419 printf (UT_VERBOSE);
420 printf ("\n"); 420 printf ("\n");
421 printf (" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)")); 421 printf (" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)"));
422 printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of")); 422 printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"));
@@ -425,10 +425,10 @@ print_help (void)
425#ifdef NP_EXTRA_OPTS 425#ifdef NP_EXTRA_OPTS
426 printf ("\n"); 426 printf ("\n");
427 printf ("%s\n", _("Notes:")); 427 printf ("%s\n", _("Notes:"));
428 printf (_(UT_EXTRA_OPTS_NOTES)); 428 printf (UT_EXTRA_OPTS_NOTES);
429#endif 429#endif
430 430
431 printf (_(UT_SUPPORT)); 431 printf (UT_SUPPORT);
432} 432}
433 433
434 434
diff --git a/plugins/check_game.c b/plugins/check_game.c
index b1b6f7c..bcde103 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -300,8 +300,8 @@ print_help (void)
300 300
301 print_usage (); 301 print_usage ();
302 302
303 printf (_(UT_HELP_VRSN)); 303 printf (UT_HELP_VRSN);
304 printf (_(UT_EXTRA_OPTS)); 304 printf (UT_EXTRA_OPTS);
305 305
306 printf (" %s\n", "-p"); 306 printf (" %s\n", "-p");
307 printf (" %s\n", _("Optional port of which to connect")); 307 printf (" %s\n", _("Optional port of which to connect"));
@@ -312,7 +312,7 @@ print_help (void)
312 printf (" %s\n", "-pf"); 312 printf (" %s\n", "-pf");
313 printf (" %s\n", _("Field number in raw qstat output that contains ping time")); 313 printf (" %s\n", _("Field number in raw qstat output that contains ping time"));
314 314
315 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 315 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
316 316
317 printf ("\n"); 317 printf ("\n");
318 printf ("%s\n", _("Notes:")); 318 printf ("%s\n", _("Notes:"));
@@ -321,10 +321,10 @@ print_help (void)
321 printf (" %s\n", _("http://www.activesw.com/people/steve/qstat.html before you can use this plugin.")); 321 printf (" %s\n", _("http://www.activesw.com/people/steve/qstat.html before you can use this plugin."));
322#ifdef NP_EXTRA_OPTS 322#ifdef NP_EXTRA_OPTS
323 printf ("\n"); 323 printf ("\n");
324 printf (_(UT_EXTRA_OPTS_NOTES)); 324 printf (UT_EXTRA_OPTS_NOTES);
325#endif 325#endif
326 326
327 printf (_(UT_SUPPORT)); 327 printf (UT_SUPPORT);
328} 328}
329 329
330 330
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index add9cc8..e4e8e6e 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -395,8 +395,8 @@ print_help (void)
395 395
396 print_usage (); 396 print_usage ();
397 397
398 printf (_(UT_HELP_VRSN)); 398 printf (UT_HELP_VRSN);
399 printf (_(UT_EXTRA_OPTS)); 399 printf (UT_EXTRA_OPTS);
400 400
401 printf (" %s\n", "-C, --community=STRING"); 401 printf (" %s\n", "-C, --community=STRING");
402 printf (" %s", _("The SNMP community name ")); 402 printf (" %s", _("The SNMP community name "));
@@ -406,10 +406,10 @@ print_help (void)
406#ifdef NP_EXTRA_OPTS 406#ifdef NP_EXTRA_OPTS
407 printf ("\n"); 407 printf ("\n");
408 printf ("%s\n", _("Notes:")); 408 printf ("%s\n", _("Notes:"));
409 printf (_(UT_EXTRA_OPTS_NOTES)); 409 printf (UT_EXTRA_OPTS_NOTES);
410#endif 410#endif
411 411
412 printf (_(UT_SUPPORT)); 412 printf (UT_SUPPORT);
413} 413}
414 414
415 415
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 0a8910c..6c53f7a 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1315,8 +1315,8 @@ print_help (void)
1315 1315
1316 printf ("\n"); 1316 printf ("\n");
1317 1317
1318 printf (_(UT_HELP_VRSN)); 1318 printf (UT_HELP_VRSN);
1319 printf (_(UT_EXTRA_OPTS)); 1319 printf (UT_EXTRA_OPTS);
1320 1320
1321 printf (" %s\n", "-H, --hostname=ADDRESS"); 1321 printf (" %s\n", "-H, --hostname=ADDRESS");
1322 printf (" %s\n", _("Host name argument for servers using host headers (virtual host)")); 1322 printf (" %s\n", _("Host name argument for servers using host headers (virtual host)"));
@@ -1327,7 +1327,7 @@ print_help (void)
1327 printf (" %s", _("Port number (default: ")); 1327 printf (" %s", _("Port number (default: "));
1328 printf ("%d)\n", HTTP_PORT); 1328 printf ("%d)\n", HTTP_PORT);
1329 1329
1330 printf (_(UT_IPv46)); 1330 printf (UT_IPv46);
1331 1331
1332#ifdef HAVE_SSL 1332#ifdef HAVE_SSL
1333 printf (" %s\n", "-S, --ssl"); 1333 printf (" %s\n", "-S, --ssl");
@@ -1386,11 +1386,11 @@ print_help (void)
1386 printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>"); 1386 printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
1387 printf (" %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)")); 1387 printf (" %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
1388 1388
1389 printf (_(UT_WARN_CRIT)); 1389 printf (UT_WARN_CRIT);
1390 1390
1391 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 1391 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
1392 1392
1393 printf (_(UT_VERBOSE)); 1393 printf (UT_VERBOSE);
1394 1394
1395 printf ("\n"); 1395 printf ("\n");
1396 printf ("%s\n", _("Notes:")); 1396 printf ("%s\n", _("Notes:"));
@@ -1401,7 +1401,7 @@ print_help (void)
1401 printf (" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN")); 1401 printf (" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN"));
1402 printf (" %s\n", _("(fully qualified domain name) as the [host_name] argument.")); 1402 printf (" %s\n", _("(fully qualified domain name) as the [host_name] argument."));
1403 printf ("\n"); 1403 printf ("\n");
1404 printf (_(UT_EXTRA_OPTS_NOTES)); 1404 printf (UT_EXTRA_OPTS_NOTES);
1405 1405
1406#ifdef HAVE_SSL 1406#ifdef HAVE_SSL
1407 printf ("\n"); 1407 printf ("\n");
@@ -1423,7 +1423,7 @@ print_help (void)
1423 printf (" %s\n", _("the certificate is expired.")); 1423 printf (" %s\n", _("the certificate is expired."));
1424#endif 1424#endif
1425 1425
1426 printf (_(UT_SUPPORT)); 1426 printf (UT_SUPPORT);
1427 1427
1428} 1428}
1429 1429
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index e036a37..3811dc1 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -489,8 +489,8 @@ print_help (void)
489 489
490 print_usage (); 490 print_usage ();
491 491
492 printf (_(UT_HELP_VRSN)); 492 printf (UT_HELP_VRSN);
493 printf (_(UT_EXTRA_OPTS)); 493 printf (UT_EXTRA_OPTS);
494 494
495 printf (" %s\n", "-d, --device=DEVICE"); 495 printf (" %s\n", "-d, --device=DEVICE");
496 printf (" %s\n", _("Select device DEVICE")); 496 printf (" %s\n", _("Select device DEVICE"));
@@ -509,10 +509,10 @@ print_help (void)
509#ifdef NP_EXTRA_OPTS 509#ifdef NP_EXTRA_OPTS
510 printf ("\n"); 510 printf ("\n");
511 printf ("%s\n", _("Notes:")); 511 printf ("%s\n", _("Notes:"));
512 printf (_(UT_EXTRA_OPTS_NOTES)); 512 printf (UT_EXTRA_OPTS_NOTES);
513#endif 513#endif
514 514
515 printf (_(UT_SUPPORT)); 515 printf (UT_SUPPORT);
516} 516}
517 517
518 /* todo : add to the long nanual as example 518 /* todo : add to the long nanual as example
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 400d74a..66834e8 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -396,12 +396,12 @@ print_help (void)
396 396
397 print_usage (); 397 print_usage ();
398 398
399 printf (_(UT_HELP_VRSN)); 399 printf (UT_HELP_VRSN);
400 printf (_(UT_EXTRA_OPTS)); 400 printf (UT_EXTRA_OPTS);
401 401
402 printf (_(UT_HOST_PORT), 'p', myport); 402 printf (UT_HOST_PORT, 'p', myport);
403 403
404 printf (_(UT_IPv46)); 404 printf (UT_IPv46);
405 405
406 printf (" %s\n", "-a [--attr]"); 406 printf (" %s\n", "-a [--attr]");
407 printf (" %s\n", _("ldap attribute to search (default: \"(objectclass=*)\"")); 407 printf (" %s\n", _("ldap attribute to search (default: \"(objectclass=*)\""));
@@ -424,11 +424,11 @@ print_help (void)
424 printf (" (%s %d)\n", _("default protocol version:"), DEFAULT_PROTOCOL); 424 printf (" (%s %d)\n", _("default protocol version:"), DEFAULT_PROTOCOL);
425#endif 425#endif
426 426
427 printf (_(UT_WARN_CRIT)); 427 printf (UT_WARN_CRIT);
428 428
429 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 429 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
430 430
431 printf (_(UT_VERBOSE)); 431 printf (UT_VERBOSE);
432 432
433 printf ("\n"); 433 printf ("\n");
434 printf ("%s\n", _("Notes:")); 434 printf ("%s\n", _("Notes:"));
@@ -439,10 +439,10 @@ print_help (void)
439 printf (" %s\n", _("to define the behaviour explicitly instead.")); 439 printf (" %s\n", _("to define the behaviour explicitly instead."));
440#ifdef NP_EXTRA_OPTS 440#ifdef NP_EXTRA_OPTS
441 printf ("\n"); 441 printf ("\n");
442 printf (_(UT_EXTRA_OPTS_NOTES)); 442 printf (UT_EXTRA_OPTS_NOTES);
443#endif 443#endif
444 444
445 printf (_(UT_SUPPORT)); 445 printf (UT_SUPPORT);
446} 446}
447 447
448/* todo 448/* todo
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 940d37e..450a4fc 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -305,8 +305,8 @@ print_help (void)
305 305
306 print_usage (); 306 print_usage ();
307 307
308 printf (_(UT_HELP_VRSN)); 308 printf (UT_HELP_VRSN);
309 printf (_(UT_EXTRA_OPTS)); 309 printf (UT_EXTRA_OPTS);
310 310
311 printf (" %s\n", "-w, --warning=WLOAD1,WLOAD5,WLOAD15"); 311 printf (" %s\n", "-w, --warning=WLOAD1,WLOAD5,WLOAD15");
312 printf (" %s\n", _("Exit with WARNING status if load average exceeds WLOADn")); 312 printf (" %s\n", _("Exit with WARNING status if load average exceeds WLOADn"));
@@ -319,10 +319,10 @@ print_help (void)
319#ifdef NP_EXTRA_OPTS 319#ifdef NP_EXTRA_OPTS
320 printf ("\n"); 320 printf ("\n");
321 printf ("%s\n", _("Notes:")); 321 printf ("%s\n", _("Notes:"));
322 printf (_(UT_EXTRA_OPTS_NOTES)); 322 printf (UT_EXTRA_OPTS_NOTES);
323#endif 323#endif
324 324
325 printf (_(UT_SUPPORT)); 325 printf (UT_SUPPORT);
326} 326}
327 327
328void 328void
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 65260ed..6736c11 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -325,8 +325,8 @@ print_help (void)
325 325
326 print_usage (); 326 print_usage ();
327 327
328 printf (_(UT_HELP_VRSN)); 328 printf (UT_HELP_VRSN);
329 printf (_(UT_EXTRA_OPTS)); 329 printf (UT_EXTRA_OPTS);
330 330
331 printf (" %s\n", "-F, --logfile=FILE"); 331 printf (" %s\n", "-F, --logfile=FILE");
332 printf (" %s\n", _("The MRTG log file containing the data you want to monitor")); 332 printf (" %s\n", _("The MRTG log file containing the data you want to monitor"));
@@ -368,10 +368,10 @@ print_help (void)
368 printf (" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher. It can be downloaded from")); 368 printf (" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher. It can be downloaded from"));
369 printf (" %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html"); 369 printf (" %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
370#ifdef NP_EXTRA_OPTS 370#ifdef NP_EXTRA_OPTS
371 printf (" -%s", _(UT_EXTRA_OPTS_NOTES)); 371 printf (" -%s", UT_EXTRA_OPTS_NOTES);
372#endif 372#endif
373 373
374 printf (_(UT_SUPPORT)); 374 printf (UT_SUPPORT);
375} 375}
376 376
377 377
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 376a509..1234bff 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -343,8 +343,8 @@ print_help (void)
343 343
344 print_usage (); 344 print_usage ();
345 345
346 printf (_(UT_HELP_VRSN)); 346 printf (UT_HELP_VRSN);
347 printf (_(UT_EXTRA_OPTS)); 347 printf (UT_EXTRA_OPTS);
348 348
349 printf (" %s\n", "-F, --filename=STRING"); 349 printf (" %s\n", "-F, --filename=STRING");
350 printf (" %s\n", _("File to read log from")); 350 printf (" %s\n", _("File to read log from"));
@@ -367,10 +367,10 @@ print_help (void)
367 printf (" %s\n", _(" reports. I'm not sure why this is right now, but will look into it")); 367 printf (" %s\n", _(" reports. I'm not sure why this is right now, but will look into it"));
368 printf (" %s\n", _(" for future enhancements of this plugin.")); 368 printf (" %s\n", _(" for future enhancements of this plugin."));
369#ifdef NP_EXTRA_OPTS 369#ifdef NP_EXTRA_OPTS
370 printf (" -%s", _(UT_EXTRA_OPTS_NOTES)); 370 printf (" -%s", UT_EXTRA_OPTS_NOTES);
371#endif 371#endif
372 372
373 printf (_(UT_SUPPORT)); 373 printf (UT_SUPPORT);
374} 374}
375 375
376 376
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 05d2b01..ce19062 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -381,10 +381,10 @@ print_help (void)
381 381
382 print_usage (); 382 print_usage ();
383 383
384 printf (_(UT_HELP_VRSN)); 384 printf (UT_HELP_VRSN);
385 printf (_(UT_EXTRA_OPTS)); 385 printf (UT_EXTRA_OPTS);
386 386
387 printf (_(UT_HOST_PORT), 'P', myport); 387 printf (UT_HOST_PORT, 'P', myport);
388 printf (" %s\n", "-s, --socket=STRING"); 388 printf (" %s\n", "-s, --socket=STRING");
389 printf (" %s\n", _("Use the specified socket (has no effect if -H is used)")); 389 printf (" %s\n", _("Use the specified socket (has no effect if -H is used)"));
390 390
@@ -413,13 +413,13 @@ print_help (void)
413#ifdef NP_EXTRA_OPTS 413#ifdef NP_EXTRA_OPTS
414 printf ("\n"); 414 printf ("\n");
415 printf ("%s\n", _("Notes:")); 415 printf ("%s\n", _("Notes:"));
416 printf (_(UT_EXTRA_OPTS_NOTES)); 416 printf (UT_EXTRA_OPTS_NOTES);
417 printf ("\n"); 417 printf ("\n");
418 printf (" %s\n", _("You must specify -p with an empty string to force an empty password,")); 418 printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
419 printf (" %s\n", _("overriding any my.cnf settings.")); 419 printf (" %s\n", _("overriding any my.cnf settings."));
420#endif 420#endif
421 421
422 printf (_(UT_SUPPORT)); 422 printf (UT_SUPPORT);
423} 423}
424 424
425 425
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 47dd861..40adf09 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -289,12 +289,12 @@ print_help (void)
289 289
290 print_usage (); 290 print_usage ();
291 291
292 printf (_(UT_HELP_VRSN)); 292 printf (UT_HELP_VRSN);
293 printf (_(UT_EXTRA_OPTS)); 293 printf (UT_EXTRA_OPTS);
294 printf (" -q, --query=STRING\n"); 294 printf (" -q, --query=STRING\n");
295 printf (" %s\n", _("SQL query to run. Only first column in first row will be read")); 295 printf (" %s\n", _("SQL query to run. Only first column in first row will be read"));
296 printf (_(UT_WARN_CRIT_RANGE)); 296 printf (UT_WARN_CRIT_RANGE);
297 printf (_(UT_HOST_PORT), 'P', myport); 297 printf (UT_HOST_PORT, 'P', myport);
298 printf (" %s\n", "-s, --socket=STRING"); 298 printf (" %s\n", "-s, --socket=STRING");
299 printf (" %s\n", _("Use the specified socket (has no effect if -H is used)")); 299 printf (" %s\n", _("Use the specified socket (has no effect if -H is used)"));
300 printf (" -d, --database=STRING\n"); 300 printf (" -d, --database=STRING\n");
@@ -313,13 +313,13 @@ print_help (void)
313#ifdef NP_EXTRA_OPTS 313#ifdef NP_EXTRA_OPTS
314 printf ("\n"); 314 printf ("\n");
315 printf ("%s\n", _("Notes:")); 315 printf ("%s\n", _("Notes:"));
316 printf (_(UT_EXTRA_OPTS_NOTES)); 316 printf (UT_EXTRA_OPTS_NOTES);
317 printf ("\n"); 317 printf ("\n");
318 printf (" %s\n", _("You must specify -p with an empty string to force an empty password,")); 318 printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
319 printf (" %s\n", _("overriding any my.cnf settings.")); 319 printf (" %s\n", _("overriding any my.cnf settings."));
320#endif 320#endif
321 321
322 printf (_(UT_SUPPORT)); 322 printf (UT_SUPPORT);
323} 323}
324 324
325 325
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 954ff71..24ddadd 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -287,8 +287,8 @@ print_help (void)
287 287
288 print_usage (); 288 print_usage ();
289 289
290 printf (_(UT_HELP_VRSN)); 290 printf (UT_HELP_VRSN);
291 printf (_(UT_EXTRA_OPTS)); 291 printf (UT_EXTRA_OPTS);
292 292
293 printf (" %s\n", "-F, --filename=FILE"); 293 printf (" %s\n", "-F, --filename=FILE");
294 printf (" %s\n", _("Name of the log file to check")); 294 printf (" %s\n", _("Name of the log file to check"));
@@ -296,19 +296,19 @@ print_help (void)
296 printf (" %s\n", _("Minutes aging after which logfile is considered stale")); 296 printf (" %s\n", _("Minutes aging after which logfile is considered stale"));
297 printf (" %s\n", "-C, --command=STRING"); 297 printf (" %s\n", "-C, --command=STRING");
298 printf (" %s\n", _("Substring to search for in process arguments")); 298 printf (" %s\n", _("Substring to search for in process arguments"));
299 printf (_(UT_VERBOSE)); 299 printf (UT_VERBOSE);
300 300
301#ifdef NP_EXTRA_OPTS 301#ifdef NP_EXTRA_OPTS
302 printf ("\n"); 302 printf ("\n");
303 printf ("%s\n", _("Notes:")); 303 printf ("%s\n", _("Notes:"));
304 printf (_(UT_EXTRA_OPTS_NOTES)); 304 printf (UT_EXTRA_OPTS_NOTES);
305#endif 305#endif
306 306
307 printf ("\n"); 307 printf ("\n");
308 printf ("%s\n", _("Examples:")); 308 printf ("%s\n", _("Examples:"));
309 printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios"); 309 printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
310 310
311 printf (_(UT_SUPPORT)); 311 printf (UT_SUPPORT);
312} 312}
313 313
314 314
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index d038efe..c877f9c 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -655,8 +655,8 @@ void print_help(void)
655 655
656 print_usage(); 656 print_usage();
657 657
658 printf (_(UT_HELP_VRSN)); 658 printf (UT_HELP_VRSN);
659 printf (_(UT_EXTRA_OPTS)); 659 printf (UT_EXTRA_OPTS);
660 660
661 printf ("%s\n", _("Options:")); 661 printf ("%s\n", _("Options:"));
662 printf (" %s\n", "-H, --hostname=HOST"); 662 printf (" %s\n", "-H, --hostname=HOST");
@@ -749,10 +749,10 @@ void print_help(void)
749 printf (" %s\n", _("One fix for this is to change the port to something else on check_nt ")); 749 printf (" %s\n", _("One fix for this is to change the port to something else on check_nt "));
750 printf (" %s\n", _("and on the client service it\'s connecting to.")); 750 printf (" %s\n", _("and on the client service it\'s connecting to."));
751#ifdef NP_EXTRA_OPTS 751#ifdef NP_EXTRA_OPTS
752 printf (" -%s", _(UT_EXTRA_OPTS_NOTES)); 752 printf (" -%s", UT_EXTRA_OPTS_NOTES);
753#endif 753#endif
754 754
755 printf (_(UT_SUPPORT)); 755 printf (UT_SUPPORT);
756} 756}
757 757
758 758
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index fdbdc14..35fddec 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -842,9 +842,9 @@ void print_help(void){
842 printf ("\n\n"); 842 printf ("\n\n");
843 843
844 print_usage(); 844 print_usage();
845 printf (_(UT_HELP_VRSN)); 845 printf (UT_HELP_VRSN);
846 printf (_(UT_EXTRA_OPTS)); 846 printf (UT_EXTRA_OPTS);
847 printf (_(UT_HOST_PORT), 'p', "123"); 847 printf (UT_HOST_PORT, 'p', "123");
848 printf (" %s\n", "-w, --warning=THRESHOLD"); 848 printf (" %s\n", "-w, --warning=THRESHOLD");
849 printf (" %s\n", _("Offset to result in warning status (seconds)")); 849 printf (" %s\n", _("Offset to result in warning status (seconds)"));
850 printf (" %s\n", "-c, --critical=THRESHOLD"); 850 printf (" %s\n", "-c, --critical=THRESHOLD");
@@ -853,15 +853,15 @@ void print_help(void){
853 printf (" %s\n", _("Warning threshold for jitter")); 853 printf (" %s\n", _("Warning threshold for jitter"));
854 printf (" %s\n", "-k, --jcrit=THRESHOLD"); 854 printf (" %s\n", "-k, --jcrit=THRESHOLD");
855 printf (" %s\n", _("Critical threshold for jitter")); 855 printf (" %s\n", _("Critical threshold for jitter"));
856 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 856 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
857 printf (_(UT_VERBOSE)); 857 printf (UT_VERBOSE);
858 858
859 printf("\n"); 859 printf("\n");
860 printf("%s\n", _("Notes:")); 860 printf("%s\n", _("Notes:"));
861 printf(_(UT_THRESHOLDS_NOTES)); 861 printf(UT_THRESHOLDS_NOTES);
862#ifdef NP_EXTRA_OPTS 862#ifdef NP_EXTRA_OPTS
863 printf("\n"); 863 printf("\n");
864 printf(_(UT_EXTRA_OPTS_NOTES)); 864 printf(UT_EXTRA_OPTS_NOTES);
865#endif 865#endif
866 866
867 printf("\n"); 867 printf("\n");
@@ -873,7 +873,7 @@ void print_help(void){
873 printf(" %s\n", _("(See Notes above for more details on thresholds formats):")); 873 printf(" %s\n", _("(See Notes above for more details on thresholds formats):"));
874 printf(" %s\n", ("./check_ntp -H ntpserv -w 0.5 -c 1 -j -1:100 -k -1:200")); 874 printf(" %s\n", ("./check_ntp -H ntpserv -w 0.5 -c 1 -j -1:100 -k -1:200"));
875 875
876 printf (_(UT_SUPPORT)); 876 printf (UT_SUPPORT);
877 877
878 printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or")); 878 printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
879 printf ("%s\n\n", _("check_ntp_time instead.")); 879 printf ("%s\n\n", _("check_ntp_time instead."));
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 0512058..fa18cfb 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -658,9 +658,9 @@ void print_help(void){
658 printf ("\n\n"); 658 printf ("\n\n");
659 659
660 print_usage(); 660 print_usage();
661 printf (_(UT_HELP_VRSN)); 661 printf (UT_HELP_VRSN);
662 printf (_(UT_EXTRA_OPTS)); 662 printf (UT_EXTRA_OPTS);
663 printf (_(UT_HOST_PORT), 'p', "123"); 663 printf (UT_HOST_PORT, 'p', "123");
664 printf (" %s\n", "-q, --quiet"); 664 printf (" %s\n", "-q, --quiet");
665 printf (" %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized")); 665 printf (" %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"));
666 printf (" %s\n", "-w, --warning=THRESHOLD"); 666 printf (" %s\n", "-w, --warning=THRESHOLD");
@@ -679,8 +679,8 @@ void print_help(void){
679 printf (" %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")")); 679 printf (" %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")"));
680 printf (" %s\n", "-n, --tcrit=THRESHOLD"); 680 printf (" %s\n", "-n, --tcrit=THRESHOLD");
681 printf (" %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")")); 681 printf (" %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")"));
682 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 682 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
683 printf (_(UT_VERBOSE)); 683 printf (UT_VERBOSE);
684 684
685 printf("\n"); 685 printf("\n");
686 printf("%s\n", _("This plugin checks an NTP server independent of any commandline")); 686 printf("%s\n", _("This plugin checks an NTP server independent of any commandline"));
@@ -692,10 +692,10 @@ void print_help(void){
692 printf(" %s\n", _("plugin will not check the clock offset between the local host and NTP")); 692 printf(" %s\n", _("plugin will not check the clock offset between the local host and NTP"));
693 printf(" %s\n", _("server; please use check_ntp_time for that purpose.")); 693 printf(" %s\n", _("server; please use check_ntp_time for that purpose."));
694 printf("\n"); 694 printf("\n");
695 printf(_(UT_THRESHOLDS_NOTES)); 695 printf(UT_THRESHOLDS_NOTES);
696#ifdef NP_EXTRA_OPTS 696#ifdef NP_EXTRA_OPTS
697 printf("\n"); 697 printf("\n");
698 printf(_(UT_EXTRA_OPTS_NOTES)); 698 printf(UT_EXTRA_OPTS_NOTES);
699#endif 699#endif
700 700
701 printf("\n"); 701 printf("\n");
@@ -713,7 +713,7 @@ void print_help(void){
713 printf(" %s\n", _("Check only stratum:")); 713 printf(" %s\n", _("Check only stratum:"));
714 printf(" %s\n", ("./check_ntp_peer -H ntpserv -W 4 -C 6")); 714 printf(" %s\n", ("./check_ntp_peer -H ntpserv -W 4 -C 6"));
715 715
716 printf (_(UT_SUPPORT)); 716 printf (UT_SUPPORT);
717} 717}
718 718
719void 719void
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index c7c7a75..cd412fe 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -600,17 +600,17 @@ void print_help(void){
600 printf ("\n\n"); 600 printf ("\n\n");
601 601
602 print_usage(); 602 print_usage();
603 printf (_(UT_HELP_VRSN)); 603 printf (UT_HELP_VRSN);
604 printf (_(UT_EXTRA_OPTS)); 604 printf (UT_EXTRA_OPTS);
605 printf (_(UT_HOST_PORT), 'p', "123"); 605 printf (UT_HOST_PORT, 'p', "123");
606 printf (" %s\n", "-q, --quiet"); 606 printf (" %s\n", "-q, --quiet");
607 printf (" %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found")); 607 printf (" %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found"));
608 printf (" %s\n", "-w, --warning=THRESHOLD"); 608 printf (" %s\n", "-w, --warning=THRESHOLD");
609 printf (" %s\n", _("Offset to result in warning status (seconds)")); 609 printf (" %s\n", _("Offset to result in warning status (seconds)"));
610 printf (" %s\n", "-c, --critical=THRESHOLD"); 610 printf (" %s\n", "-c, --critical=THRESHOLD");
611 printf (" %s\n", _("Offset to result in critical status (seconds)")); 611 printf (" %s\n", _("Offset to result in critical status (seconds)"));
612 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 612 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
613 printf (_(UT_VERBOSE)); 613 printf (UT_VERBOSE);
614 614
615 printf("\n"); 615 printf("\n");
616 printf("%s\n", _("This plugin checks the clock offset between the local host and a")); 616 printf("%s\n", _("This plugin checks the clock offset between the local host and a"));
@@ -622,17 +622,17 @@ void print_help(void){
622 printf(" %s\n", _("If you'd rather want to monitor an NTP server, please use")); 622 printf(" %s\n", _("If you'd rather want to monitor an NTP server, please use"));
623 printf(" %s\n", _("check_ntp_peer.")); 623 printf(" %s\n", _("check_ntp_peer."));
624 printf("\n"); 624 printf("\n");
625 printf(_(UT_THRESHOLDS_NOTES)); 625 printf(UT_THRESHOLDS_NOTES);
626#ifdef NP_EXTRA_OPTS 626#ifdef NP_EXTRA_OPTS
627 printf("\n"); 627 printf("\n");
628 printf(_(UT_EXTRA_OPTS_NOTES)); 628 printf(UT_EXTRA_OPTS_NOTES);
629#endif 629#endif
630 630
631 printf("\n"); 631 printf("\n");
632 printf("%s\n", _("Examples:")); 632 printf("%s\n", _("Examples:"));
633 printf(" %s\n", ("./check_ntp_time -H ntpserv -w 0.5 -c 1")); 633 printf(" %s\n", ("./check_ntp_time -H ntpserv -w 0.5 -c 1"));
634 634
635 printf (_(UT_SUPPORT)); 635 printf (UT_SUPPORT);
636} 636}
637 637
638void 638void
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 72a47b1..2c3369a 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -1605,10 +1605,10 @@ void print_help(void)
1605 1605
1606 print_usage(); 1606 print_usage();
1607 1607
1608 printf (_(UT_HELP_VRSN)); 1608 printf (UT_HELP_VRSN);
1609 printf (_(UT_EXTRA_OPTS)); 1609 printf (UT_EXTRA_OPTS);
1610 1610
1611 printf (_(UT_HOST_PORT), 'p', myport); 1611 printf (UT_HOST_PORT, 'p', myport);
1612 1612
1613 printf (" %s\n", "-v, --variable=STRING"); 1613 printf (" %s\n", "-v, --variable=STRING");
1614 printf (" %s\n", _("Variable to check. Valid variables include:")); 1614 printf (" %s\n", _("Variable to check. Valid variables include:"));
@@ -1664,7 +1664,7 @@ void print_help(void)
1664 printf (" %s\n", "-o, --osversion"); 1664 printf (" %s\n", "-o, --osversion");
1665 printf (" %s\n", _("Include server version string in results")); 1665 printf (" %s\n", _("Include server version string in results"));
1666 1666
1667 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 1667 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
1668 1668
1669 printf ("\n"); 1669 printf ("\n");
1670 printf ("%s\n", _("Notes:")); 1670 printf ("%s\n", _("Notes:"));
@@ -1675,10 +1675,10 @@ void print_help(void)
1675 printf (" %s\n", _(" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, ")); 1675 printf (" %s\n", _(" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
1676 printf (" %s\n", _(" TCB, LRUS and LRUM.")); 1676 printf (" %s\n", _(" TCB, LRUS and LRUM."));
1677#ifdef NP_EXTRA_OPTS 1677#ifdef NP_EXTRA_OPTS
1678 printf (" -%s", _(UT_EXTRA_OPTS_NOTES)); 1678 printf (" -%s", UT_EXTRA_OPTS_NOTES);
1679#endif 1679#endif
1680 1680
1681 printf (_(UT_SUPPORT)); 1681 printf (UT_SUPPORT);
1682} 1682}
1683 1683
1684 1684
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 1d9ec8c..5751dc0 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -423,10 +423,10 @@ print_help (void)
423 423
424 print_usage (); 424 print_usage ();
425 425
426 printf (_(UT_HELP_VRSN)); 426 printf (UT_HELP_VRSN);
427 printf (_(UT_EXTRA_OPTS)); 427 printf (UT_EXTRA_OPTS);
428 428
429 printf (_(UT_HOST_PORT), 'p', myport); 429 printf (UT_HOST_PORT, 'p', myport);
430 430
431 printf (" %s\n", "-w, --warning=INTEGER"); 431 printf (" %s\n", "-w, --warning=INTEGER");
432 printf (" %s\n", _("Threshold which will result in a warning status")); 432 printf (" %s\n", _("Threshold which will result in a warning status"));
@@ -442,9 +442,9 @@ print_help (void)
442 printf (" %s\n", _("NET<port> = number of active connections on TCP port <port>")); 442 printf (" %s\n", _("NET<port> = number of active connections on TCP port <port>"));
443 printf (" %s\n", _("UPTIME = system uptime in seconds")); 443 printf (" %s\n", _("UPTIME = system uptime in seconds"));
444 444
445 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 445 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
446 446
447 printf (_(UT_VERBOSE)); 447 printf (UT_VERBOSE);
448 448
449 printf ("\n"); 449 printf ("\n");
450 printf ("%s\n", _("This plugin requires that Eric Molitors' Over-CR collector daemon be")); 450 printf ("%s\n", _("This plugin requires that Eric Molitors' Over-CR collector daemon be"));
@@ -458,10 +458,10 @@ print_help (void)
458 printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable")); 458 printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable"));
459#ifdef NP_EXTRA_OPTS 459#ifdef NP_EXTRA_OPTS
460 printf ("\n"); 460 printf ("\n");
461 printf (_(UT_EXTRA_OPTS_NOTES)); 461 printf (UT_EXTRA_OPTS_NOTES);
462#endif 462#endif
463 463
464 printf (_(UT_SUPPORT)); 464 printf (UT_SUPPORT);
465} 465}
466 466
467 467
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 40c104e..a365214 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -429,12 +429,12 @@ print_help (void)
429 429
430 print_usage (); 430 print_usage ();
431 431
432 printf (_(UT_HELP_VRSN)); 432 printf (UT_HELP_VRSN);
433 printf (_(UT_EXTRA_OPTS)); 433 printf (UT_EXTRA_OPTS);
434 434
435 printf (_(UT_HOST_PORT), 'P', myport); 435 printf (UT_HOST_PORT, 'P', myport);
436 436
437 printf (_(UT_IPv46)); 437 printf (UT_IPv46);
438 438
439 printf (" %s\n", "-d, --database=STRING"); 439 printf (" %s\n", "-d, --database=STRING");
440 printf (" %s", _("Database to check ")); 440 printf (" %s", _("Database to check "));
@@ -444,11 +444,11 @@ print_help (void)
444 printf (" %s\n", "-p, --password = STRING"); 444 printf (" %s\n", "-p, --password = STRING");
445 printf (" %s\n", _("Password (BIG SECURITY ISSUE)")); 445 printf (" %s\n", _("Password (BIG SECURITY ISSUE)"));
446 446
447 printf (_(UT_WARN_CRIT)); 447 printf (UT_WARN_CRIT);
448 448
449 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 449 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
450 450
451 printf (_(UT_VERBOSE)); 451 printf (UT_VERBOSE);
452 452
453 printf ("\n"); 453 printf ("\n");
454 printf (" %s\n", _("All parameters are optional.")); 454 printf (" %s\n", _("All parameters are optional."));
@@ -469,10 +469,10 @@ print_help (void)
469#ifdef NP_EXTRA_OPTS 469#ifdef NP_EXTRA_OPTS
470 printf ("\n"); 470 printf ("\n");
471 printf ("%s\n", _("Notes:")); 471 printf ("%s\n", _("Notes:"));
472 printf (_(UT_EXTRA_OPTS_NOTES)); 472 printf (UT_EXTRA_OPTS_NOTES);
473#endif 473#endif
474 474
475 printf (_(UT_SUPPORT)); 475 printf (UT_SUPPORT);
476} 476}
477 477
478 478
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 8c4c0e6..45108af 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -562,10 +562,10 @@ print_help (void)
562 562
563 print_usage (); 563 print_usage ();
564 564
565 printf (_(UT_HELP_VRSN)); 565 printf (UT_HELP_VRSN);
566 printf (_(UT_EXTRA_OPTS)); 566 printf (UT_EXTRA_OPTS);
567 567
568 printf (_(UT_IPv46)); 568 printf (UT_IPv46);
569 569
570 printf (" %s\n", "-H, --hostname=HOST"); 570 printf (" %s\n", "-H, --hostname=HOST");
571 printf (" %s\n", _("host to ping")); 571 printf (" %s\n", _("host to ping"));
@@ -579,7 +579,7 @@ print_help (void)
579 printf (" %s\n", "-L, --link"); 579 printf (" %s\n", "-L, --link");
580 printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); 580 printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
581 581
582 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 582 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
583 583
584 printf ("\n"); 584 printf ("\n");
585 printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel")); 585 printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));
@@ -595,10 +595,10 @@ print_help (void)
595#ifdef NP_EXTRA_OPTS 595#ifdef NP_EXTRA_OPTS
596 printf ("\n"); 596 printf ("\n");
597 printf ("%s\n", _("Notes:")); 597 printf ("%s\n", _("Notes:"));
598 printf (_(UT_EXTRA_OPTS_NOTES)); 598 printf (UT_EXTRA_OPTS_NOTES);
599#endif 599#endif
600 600
601 printf (_(UT_SUPPORT)); 601 printf (UT_SUPPORT);
602} 602}
603 603
604void 604void
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 937c0ad..e9372ff 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -683,8 +683,8 @@ print_help (void)
683 683
684 print_usage (); 684 print_usage ();
685 685
686 printf (_(UT_HELP_VRSN)); 686 printf (UT_HELP_VRSN);
687 printf (_(UT_EXTRA_OPTS)); 687 printf (UT_EXTRA_OPTS);
688 printf (" %s\n", "-w, --warning=RANGE"); 688 printf (" %s\n", "-w, --warning=RANGE");
689 printf (" %s\n", _("Generate warning state if metric is outside this range")); 689 printf (" %s\n", _("Generate warning state if metric is outside this range"));
690 printf (" %s\n", "-c, --critical=RANGE"); 690 printf (" %s\n", "-c, --critical=RANGE");
@@ -699,7 +699,7 @@ print_help (void)
699#if defined( __linux__ ) 699#if defined( __linux__ )
700 printf (" %s\n", _("ELAPSED - time elapsed in seconds")); 700 printf (" %s\n", _("ELAPSED - time elapsed in seconds"));
701#endif /* defined(__linux__) */ 701#endif /* defined(__linux__) */
702 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 702 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
703 703
704 printf (" %s\n", "-v, --verbose"); 704 printf (" %s\n", "-v, --verbose");
705 printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); 705 printf (" %s\n", _("Extra information. Up to 3 verbosity levels"));
@@ -741,7 +741,7 @@ be the total number of running processes\n\n"));
741 741
742#ifdef NP_EXTRA_OPTS 742#ifdef NP_EXTRA_OPTS
743 printf ("%s\n", _("Notes:")); 743 printf ("%s\n", _("Notes:"));
744 printf (_(UT_EXTRA_OPTS_NOTES)); 744 printf (UT_EXTRA_OPTS_NOTES);
745 printf ("\n"); 745 printf ("\n");
746#endif 746#endif
747 747
@@ -757,7 +757,7 @@ be the total number of running processes\n\n"));
757 printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU"); 757 printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
758 printf (" %s\n", _("Alert if CPU of any processes over 10%% or 20%%")); 758 printf (" %s\n", _("Alert if CPU of any processes over 10%% or 20%%"));
759 759
760 printf (_(UT_SUPPORT)); 760 printf (UT_SUPPORT);
761} 761}
762 762
763void 763void
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index b2f5732..c95fbe1 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -341,10 +341,10 @@ print_help (void)
341 341
342 print_usage (); 342 print_usage ();
343 343
344 printf (_(UT_HELP_VRSN)); 344 printf (UT_HELP_VRSN);
345 printf (_(UT_EXTRA_OPTS)); 345 printf (UT_EXTRA_OPTS);
346 346
347 printf (_(UT_HOST_PORT), 'P', myport); 347 printf (UT_HOST_PORT, 'P', myport);
348 348
349 printf (" %s\n", "-u, --username=STRING"); 349 printf (" %s\n", "-u, --username=STRING");
350 printf (" %s\n", _("The user to authenticate")); 350 printf (" %s\n", _("The user to authenticate"));
@@ -361,7 +361,7 @@ print_help (void)
361 printf (" %s\n", "-r, --retries=INTEGER"); 361 printf (" %s\n", "-r, --retries=INTEGER");
362 printf (" %s\n", _("Number of times to retry a failed connection")); 362 printf (" %s\n", _("Number of times to retry a failed connection"));
363 363
364 printf (_(UT_TIMEOUT), timeout_interval); 364 printf (UT_TIMEOUT, timeout_interval);
365 365
366 printf ("\n"); 366 printf ("\n");
367 printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); 367 printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
@@ -377,10 +377,10 @@ print_help (void)
377#ifdef NP_EXTRA_OPTS 377#ifdef NP_EXTRA_OPTS
378 printf ("\n"); 378 printf ("\n");
379 printf ("%s\n", _("Notes:")); 379 printf ("%s\n", _("Notes:"));
380 printf (_(UT_EXTRA_OPTS_NOTES)); 380 printf (UT_EXTRA_OPTS_NOTES);
381#endif 381#endif
382 382
383 printf (_(UT_SUPPORT)); 383 printf (UT_SUPPORT);
384} 384}
385 385
386 386
diff --git a/plugins/check_real.c b/plugins/check_real.c
index cbc3103..1643347 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -416,10 +416,10 @@ print_help (void)
416 416
417 print_usage (); 417 print_usage ();
418 418
419 printf (_(UT_HELP_VRSN)); 419 printf (UT_HELP_VRSN);
420 printf (_(UT_EXTRA_OPTS)); 420 printf (UT_EXTRA_OPTS);
421 421
422 printf (_(UT_HOST_PORT), 'p', myport); 422 printf (UT_HOST_PORT, 'p', myport);
423 423
424 printf (" %s\n", "-u, --url=STRING"); 424 printf (" %s\n", "-u, --url=STRING");
425 printf (" %s\n", _("Connect to this url")); 425 printf (" %s\n", _("Connect to this url"));
@@ -427,11 +427,11 @@ print_help (void)
427 printf (_("String to expect in first line of server response (default: %s)\n"), 427 printf (_("String to expect in first line of server response (default: %s)\n"),
428 EXPECT); 428 EXPECT);
429 429
430 printf (_(UT_WARN_CRIT)); 430 printf (UT_WARN_CRIT);
431 431
432 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 432 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
433 433
434 printf (_(UT_VERBOSE)); 434 printf (UT_VERBOSE);
435 435
436 printf ("\n"); 436 printf ("\n");
437 printf ("%s\n", _("This plugin will attempt to open an RTSP connection with the host.")); 437 printf ("%s\n", _("This plugin will attempt to open an RTSP connection with the host."));
@@ -443,10 +443,10 @@ print_help (void)
443#ifdef NP_EXTRA_OPTS 443#ifdef NP_EXTRA_OPTS
444 printf ("\n"); 444 printf ("\n");
445 printf ("%s\n", _("Notes:")); 445 printf ("%s\n", _("Notes:"));
446 printf (_(UT_EXTRA_OPTS_NOTES)); 446 printf (UT_EXTRA_OPTS_NOTES);
447#endif 447#endif
448 448
449 printf (_(UT_SUPPORT)); 449 printf (UT_SUPPORT);
450} 450}
451 451
452 452
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 62f1025..c78b709 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -767,12 +767,12 @@ print_help (void)
767 767
768 print_usage (); 768 print_usage ();
769 769
770 printf (_(UT_HELP_VRSN)); 770 printf (UT_HELP_VRSN);
771 printf (_(UT_EXTRA_OPTS)); 771 printf (UT_EXTRA_OPTS);
772 772
773 printf (_(UT_HOST_PORT), 'p', myport); 773 printf (UT_HOST_PORT, 'p', myport);
774 774
775 printf (_(UT_IPv46)); 775 printf (UT_IPv46);
776 776
777 printf (" %s\n", "-e, --expect=STRING"); 777 printf (" %s\n", "-e, --expect=STRING");
778 printf (_(" String to expect in first line of server response (default: '%s')\n"), SMTP_EXPECT); 778 printf (_(" String to expect in first line of server response (default: '%s')\n"), SMTP_EXPECT);
@@ -796,11 +796,11 @@ print_help (void)
796 printf (" %s\n", "-P, --authpass=STRING"); 796 printf (" %s\n", "-P, --authpass=STRING");
797 printf (" %s\n", _("SMTP AUTH password")); 797 printf (" %s\n", _("SMTP AUTH password"));
798 798
799 printf (_(UT_WARN_CRIT)); 799 printf (UT_WARN_CRIT);
800 800
801 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 801 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
802 802
803 printf (_(UT_VERBOSE)); 803 printf (UT_VERBOSE);
804 804
805 printf("\n"); 805 printf("\n");
806 printf ("%s\n", _("Successul connects return STATE_OK, refusals and timeouts return")); 806 printf ("%s\n", _("Successul connects return STATE_OK, refusals and timeouts return"));
@@ -811,10 +811,10 @@ print_help (void)
811#ifdef NP_EXTRA_OPTS 811#ifdef NP_EXTRA_OPTS
812 printf ("\n"); 812 printf ("\n");
813 printf ("%s\n", _("Notes:")); 813 printf ("%s\n", _("Notes:"));
814 printf (_(UT_EXTRA_OPTS_NOTES)); 814 printf (UT_EXTRA_OPTS_NOTES);
815#endif 815#endif
816 816
817 printf (_(UT_SUPPORT)); 817 printf (UT_SUPPORT);
818} 818}
819 819
820 820
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index fdb5819..f04ca85 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -806,10 +806,10 @@ print_help (void)
806 806
807 print_usage (); 807 print_usage ();
808 808
809 printf (_(UT_HELP_VRSN)); 809 printf (UT_HELP_VRSN);
810 printf (_(UT_EXTRA_OPTS)); 810 printf (UT_EXTRA_OPTS);
811 811
812 printf (_(UT_HOST_PORT), 'p', DEFAULT_PORT); 812 printf (UT_HOST_PORT, 'p', DEFAULT_PORT);
813 813
814 /* SNMP and Authentication Protocol */ 814 /* SNMP and Authentication Protocol */
815 printf (" %s\n", "-n, --next"); 815 printf (" %s\n", "-n, --next");
@@ -867,11 +867,11 @@ print_help (void)
867 printf (" %s\n", "-D, --output-delimiter=STRING"); 867 printf (" %s\n", "-D, --output-delimiter=STRING");
868 printf (" %s\n", _("Separates output on multiple OID requests")); 868 printf (" %s\n", _("Separates output on multiple OID requests"));
869 869
870 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 870 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
871 printf (" %s\n", "-e, --retries=INTEGER"); 871 printf (" %s\n", "-e, --retries=INTEGER");
872 printf (" %s\n", _("Number of retries to be used in the requests")); 872 printf (" %s\n", _("Number of retries to be used in the requests"));
873 873
874 printf (_(UT_VERBOSE)); 874 printf (UT_VERBOSE);
875 875
876 printf ("\n"); 876 printf ("\n");
877 printf ("%s\n", _("This plugin uses the 'snmpget' command included with the NET-SNMP package.")); 877 printf ("%s\n", _("This plugin uses the 'snmpget' command included with the NET-SNMP package."));
@@ -883,17 +883,17 @@ print_help (void)
883 printf (" %s\n", _("- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with")); 883 printf (" %s\n", _("- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with"));
884 printf (" %s\n", _("internal spaces must be quoted) [max 8 OIDs]")); 884 printf (" %s\n", _("internal spaces must be quoted) [max 8 OIDs]"));
885 885
886 printf(" -%s", _(UT_THRESHOLDS_NOTES)); 886 printf(" -%s", UT_THRESHOLDS_NOTES);
887 887
888 printf (" %s\n", _("- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'")); 888 printf (" %s\n", _("- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'"));
889 printf (" %s\n", _("- Note that only one string and one regex may be checked at present")); 889 printf (" %s\n", _("- Note that only one string and one regex may be checked at present"));
890 printf (" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value")); 890 printf (" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value"));
891 printf (" %s\n", _("returned from the SNMP query is an unsigned integer.")); 891 printf (" %s\n", _("returned from the SNMP query is an unsigned integer."));
892#ifdef NP_EXTRA_OPTS 892#ifdef NP_EXTRA_OPTS
893 printf (" -%s", _(UT_EXTRA_OPTS_NOTES)); 893 printf (" -%s", UT_EXTRA_OPTS_NOTES);
894#endif 894#endif
895 895
896 printf (_(UT_SUPPORT)); 896 printf (UT_SUPPORT);
897} 897}
898 898
899 899
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 04cc4d9..9a19343 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -277,27 +277,27 @@ print_help (void)
277 277
278 print_usage (); 278 print_usage ();
279 279
280 printf (_(UT_HELP_VRSN)); 280 printf (UT_HELP_VRSN);
281 printf (_(UT_EXTRA_OPTS)); 281 printf (UT_EXTRA_OPTS);
282 282
283 printf (_(UT_HOST_PORT), 'p', myport); 283 printf (UT_HOST_PORT, 'p', myport);
284 284
285 printf (_(UT_IPv46)); 285 printf (UT_IPv46);
286 286
287 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 287 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
288 288
289 printf (" %s\n", "-r, --remote-version=STRING"); 289 printf (" %s\n", "-r, --remote-version=STRING");
290 printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); 290 printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
291 291
292 printf (_(UT_VERBOSE)); 292 printf (UT_VERBOSE);
293 293
294#ifdef NP_EXTRA_OPTS 294#ifdef NP_EXTRA_OPTS
295 printf ("\n"); 295 printf ("\n");
296 printf ("%s\n", _("Notes:")); 296 printf ("%s\n", _("Notes:"));
297 printf (_(UT_EXTRA_OPTS_NOTES)); 297 printf (UT_EXTRA_OPTS_NOTES);
298#endif 298#endif
299 299
300 printf (_(UT_SUPPORT)); 300 printf (UT_SUPPORT);
301} 301}
302 302
303 303
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index be20ca3..a1356cf 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -528,8 +528,8 @@ print_help (void)
528 528
529 print_usage (); 529 print_usage ();
530 530
531 printf (_(UT_HELP_VRSN)); 531 printf (UT_HELP_VRSN);
532 printf (_(UT_EXTRA_OPTS)); 532 printf (UT_EXTRA_OPTS);
533 533
534 printf (" %s\n", "-w, --warning=INTEGER"); 534 printf (" %s\n", "-w, --warning=INTEGER");
535 printf (" %s\n", _("Exit with WARNING status if less than INTEGER bytes of swap space are free")); 535 printf (" %s\n", _("Exit with WARNING status if less than INTEGER bytes of swap space are free"));
@@ -541,18 +541,18 @@ print_help (void)
541 printf (" %s\n", _("Exit with CRITCAL status if less than PERCENT of swap space is free")); 541 printf (" %s\n", _("Exit with CRITCAL status if less than PERCENT of swap space is free"));
542 printf (" %s\n", "-a, --allswaps"); 542 printf (" %s\n", "-a, --allswaps");
543 printf (" %s\n", _("Conduct comparisons for all swap partitions, one by one")); 543 printf (" %s\n", _("Conduct comparisons for all swap partitions, one by one"));
544 printf (_(UT_VERBOSE)); 544 printf (UT_VERBOSE);
545 545
546 printf ("\n"); 546 printf ("\n");
547 printf ("%s\n", _("Notes:")); 547 printf ("%s\n", _("Notes:"));
548 printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.")); 548 printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
549#ifdef NP_EXTRA_OPTS 549#ifdef NP_EXTRA_OPTS
550 printf ("\n"); 550 printf ("\n");
551 printf (_(UT_EXTRA_OPTS_NOTES)); 551 printf (UT_EXTRA_OPTS_NOTES);
552#endif 552#endif
553 553
554 554
555 printf (_(UT_SUPPORT)); 555 printf (UT_SUPPORT);
556} 556}
557 557
558 558
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index b094207..156765e 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -599,12 +599,12 @@ print_help (void)
599 599
600 print_usage (); 600 print_usage ();
601 601
602 printf (_(UT_HELP_VRSN)); 602 printf (UT_HELP_VRSN);
603 printf (_(UT_EXTRA_OPTS)); 603 printf (UT_EXTRA_OPTS);
604 604
605 printf (_(UT_HOST_PORT), 'p', "none"); 605 printf (UT_HOST_PORT, 'p', "none");
606 606
607 printf (_(UT_IPv46)); 607 printf (UT_IPv46);
608 608
609 printf (" %s\n", "-E, --escape"); 609 printf (" %s\n", "-E, --escape");
610 printf (" %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or quit option")); 610 printf (" %s\n", _("Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or quit option"));
@@ -635,19 +635,19 @@ print_help (void)
635 printf (" %s\n", _("Use SSL for the connection.")); 635 printf (" %s\n", _("Use SSL for the connection."));
636#endif 636#endif
637 637
638 printf (_(UT_WARN_CRIT)); 638 printf (UT_WARN_CRIT);
639 639
640 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 640 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
641 641
642 printf (_(UT_VERBOSE)); 642 printf (UT_VERBOSE);
643 643
644#ifdef NP_EXTRA_OPTS 644#ifdef NP_EXTRA_OPTS
645 printf ("\n"); 645 printf ("\n");
646 printf ("%s\n", _("Notes:")); 646 printf ("%s\n", _("Notes:"));
647 printf (_(UT_EXTRA_OPTS_NOTES)); 647 printf (UT_EXTRA_OPTS_NOTES);
648#endif 648#endif
649 649
650 printf (_(UT_SUPPORT)); 650 printf (UT_SUPPORT);
651} 651}
652 652
653 653
diff --git a/plugins/check_time.c b/plugins/check_time.c
index ee93816..7816b23 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -342,10 +342,10 @@ print_help (void)
342 342
343 print_usage (); 343 print_usage ();
344 344
345 printf (_(UT_HELP_VRSN)); 345 printf (UT_HELP_VRSN);
346 printf (_(UT_EXTRA_OPTS)); 346 printf (UT_EXTRA_OPTS);
347 347
348 printf (_(UT_HOST_PORT), 'p', myport); 348 printf (UT_HOST_PORT, 'p', myport);
349 349
350 printf (" %s\n", "-u, --udp"); 350 printf (" %s\n", "-u, --udp");
351 printf (" %s\n", _("Use UDP to connect, not TCP")); 351 printf (" %s\n", _("Use UDP to connect, not TCP"));
@@ -358,15 +358,15 @@ print_help (void)
358 printf (" %s\n", "-C, --critical-connect=INTEGER"); 358 printf (" %s\n", "-C, --critical-connect=INTEGER");
359 printf (" %s\n", _("Response time (sec.) necessary to result in critical status")); 359 printf (" %s\n", _("Response time (sec.) necessary to result in critical status"));
360 360
361 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 361 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
362 362
363#ifdef NP_EXTRA_OPTS 363#ifdef NP_EXTRA_OPTS
364 printf ("\n"); 364 printf ("\n");
365 printf ("%s\n", _("Notes:")); 365 printf ("%s\n", _("Notes:"));
366 printf (_(UT_EXTRA_OPTS_NOTES)); 366 printf (UT_EXTRA_OPTS_NOTES);
367#endif 367#endif
368 368
369 printf (_(UT_SUPPORT)); 369 printf (UT_SUPPORT);
370} 370}
371 371
372 372
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 8985b74..ce57ef3 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -611,10 +611,10 @@ print_help (void)
611 611
612 print_usage (); 612 print_usage ();
613 613
614 printf (_(UT_HELP_VRSN)); 614 printf (UT_HELP_VRSN);
615 printf (_(UT_EXTRA_OPTS)); 615 printf (UT_EXTRA_OPTS);
616 616
617 printf (_(UT_HOST_PORT), 'p', myport); 617 printf (UT_HOST_PORT, 'p', myport);
618 618
619 printf (" %s\n", "-u, --ups=STRING"); 619 printf (" %s\n", "-u, --ups=STRING");
620 printf (" %s\n", _("Name of UPS")); 620 printf (" %s\n", _("Name of UPS"));
@@ -623,13 +623,13 @@ print_help (void)
623 printf (" %s\n", "-v, --variable=STRING"); 623 printf (" %s\n", "-v, --variable=STRING");
624 printf (" %s %s\n", _("Valid values for STRING are"), "LINE, TEMP, BATTPCT or LOADPCT"); 624 printf (" %s %s\n", _("Valid values for STRING are"), "LINE, TEMP, BATTPCT or LOADPCT");
625 625
626 printf (_(UT_WARN_CRIT)); 626 printf (UT_WARN_CRIT);
627 627
628 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 628 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
629 629
630/* TODO: -v clashing with -v/-variable. Commenting out help text since verbose 630/* TODO: -v clashing with -v/-variable. Commenting out help text since verbose
631 is unused up to now */ 631 is unused up to now */
632/* printf (_(UT_VERBOSE)); */ 632/* printf (UT_VERBOSE); */
633 633
634 printf ("\n"); 634 printf ("\n");
635 printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power")); 635 printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
@@ -651,10 +651,10 @@ print_help (void)
651 printf (" %s\n", _("http://www.networkupstools.org")); 651 printf (" %s\n", _("http://www.networkupstools.org"));
652#ifdef NP_EXTRA_OPTS 652#ifdef NP_EXTRA_OPTS
653 printf ("\n"); 653 printf ("\n");
654 printf (_(UT_EXTRA_OPTS_NOTES)); 654 printf (UT_EXTRA_OPTS_NOTES);
655#endif 655#endif
656 656
657 printf (_(UT_SUPPORT)); 657 printf (UT_SUPPORT);
658} 658}
659 659
660 660
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 1bd2c8b..dc661d8 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -211,8 +211,8 @@ print_help (void)
211 211
212 print_usage (); 212 print_usage ();
213 213
214 printf (_(UT_HELP_VRSN)); 214 printf (UT_HELP_VRSN);
215 printf (_(UT_EXTRA_OPTS)); 215 printf (UT_EXTRA_OPTS);
216 216
217 printf (" %s\n", "-w, --warning=INTEGER"); 217 printf (" %s\n", "-w, --warning=INTEGER");
218 printf (" %s\n", _("Set WARNING status if more than INTEGER users are logged in")); 218 printf (" %s\n", _("Set WARNING status if more than INTEGER users are logged in"));
@@ -222,10 +222,10 @@ print_help (void)
222#ifdef NP_EXTRA_OPTS 222#ifdef NP_EXTRA_OPTS
223 printf ("\n"); 223 printf ("\n");
224 printf ("%s\n", _("Notes:")); 224 printf ("%s\n", _("Notes:"));
225 printf (_(UT_EXTRA_OPTS_NOTES)); 225 printf (UT_EXTRA_OPTS_NOTES);
226#endif 226#endif
227 227
228 printf (_(UT_SUPPORT)); 228 printf (UT_SUPPORT);
229} 229}
230 230
231 231
diff --git a/plugins/negate.c b/plugins/negate.c
index 8eac722..869b9d9 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -247,9 +247,9 @@ print_help (void)
247 247
248 print_usage (); 248 print_usage ();
249 249
250 printf (_(UT_HELP_VRSN)); 250 printf (UT_HELP_VRSN);
251 251
252 printf (_(UT_TIMEOUT), timeout_interval); 252 printf (UT_TIMEOUT, timeout_interval);
253 printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); 253 printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status."));
254 printf (" -T, --timeout-result=STATUS\n"); 254 printf (" -T, --timeout-result=STATUS\n");
255 printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n")); 255 printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n"));
@@ -281,7 +281,7 @@ print_help (void)
281 printf (" %s\n", _("Using timeout-result, it is possible to override the timeout behaviour or a")); 281 printf (" %s\n", _("Using timeout-result, it is possible to override the timeout behaviour or a"));
282 printf (" %s\n", _("plugin by setting the negate timeout a bit lower.")); 282 printf (" %s\n", _("plugin by setting the negate timeout a bit lower."));
283 283
284 printf (_(UT_SUPPORT)); 284 printf (UT_SUPPORT);
285} 285}
286 286
287 287
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 202fa04..5fb3aca 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -174,7 +174,7 @@ print_help (void)
174 174
175 print_usage (); 175 print_usage ();
176 176
177 printf (_(UT_HELP_VRSN)); 177 printf (UT_HELP_VRSN);
178 178
179 printf ("\n"); 179 printf ("\n");
180 printf ("%s\n", _("Examples:")); 180 printf ("%s\n", _("Examples:"));
@@ -186,7 +186,7 @@ print_help (void)
186 printf (" %s\n\n", _("You probably want:")); 186 printf (" %s\n\n", _("You probably want:"));
187 printf (" %s\n", _("urlize http://example.com/ \"check_http -H example.com -r 'two words'\"")); 187 printf (" %s\n", _("urlize http://example.com/ \"check_http -H example.com -r 'two words'\""));
188 188
189 printf (_(UT_SUPPORT)); 189 printf (UT_SUPPORT);
190} 190}
191 191
192 192
diff --git a/plugins/utils.h b/plugins/utils.h
index d6e9c8f..8da2160 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -137,73 +137,73 @@ char *fperfdata (const char *,
137#define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\ 137#define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\
138\t<%s>\n\n" 138\t<%s>\n\n"
139 139
140#define UT_HLP_VRS "\ 140#define UT_HLP_VRS _("\
141 %s (-h | --help) for detailed help\n\ 141 %s (-h | --help) for detailed help\n\
142 %s (-V | --version) for version information\n" 142 %s (-V | --version) for version information\n")
143 143
144#define UT_HELP_VRSN "\ 144#define UT_HELP_VRSN _("\
145\nOptions:\n\ 145\nOptions:\n\
146 -h, --help\n\ 146 -h, --help\n\
147 Print detailed help screen\n\ 147 Print detailed help screen\n\
148 -V, --version\n\ 148 -V, --version\n\
149 Print version information\n" 149 Print version information\n")
150 150
151#define UT_HOST_PORT "\ 151#define UT_HOST_PORT _("\
152 -H, --hostname=ADDRESS\n\ 152 -H, --hostname=ADDRESS\n\
153 Host name, IP Address, or unix socket (must be an absolute path)\n\ 153 Host name, IP Address, or unix socket (must be an absolute path)\n\
154 -%c, --port=INTEGER\n\ 154 -%c, --port=INTEGER\n\
155 Port number (default: %s)\n" 155 Port number (default: %s)\n")
156 156
157#define UT_IPv46 "\ 157#define UT_IPv46 _("\
158 -4, --use-ipv4\n\ 158 -4, --use-ipv4\n\
159 Use IPv4 connection\n\ 159 Use IPv4 connection\n\
160 -6, --use-ipv6\n\ 160 -6, --use-ipv6\n\
161 Use IPv6 connection\n" 161 Use IPv6 connection\n")
162 162
163#define UT_VERBOSE "\ 163#define UT_VERBOSE _("\
164 -v, --verbose\n\ 164 -v, --verbose\n\
165 Show details for command-line debugging (Nagios may truncate output)\n" 165 Show details for command-line debugging (Nagios may truncate output)\n")
166 166
167#define UT_WARN_CRIT "\ 167#define UT_WARN_CRIT _("\
168 -w, --warning=DOUBLE\n\ 168 -w, --warning=DOUBLE\n\
169 Response time to result in warning status (seconds)\n\ 169 Response time to result in warning status (seconds)\n\
170 -c, --critical=DOUBLE\n\ 170 -c, --critical=DOUBLE\n\
171 Response time to result in critical status (seconds)\n" 171 Response time to result in critical status (seconds)\n")
172 172
173#define UT_WARN_CRIT_RANGE "\ 173#define UT_WARN_CRIT_RANGE _("\
174 -w, --warning=RANGE\n\ 174 -w, --warning=RANGE\n\
175 Warning range (format: start:end). Alert if outside this range\n\ 175 Warning range (format: start:end). Alert if outside this range\n\
176 -c, --critical=RANGE\n\ 176 -c, --critical=RANGE\n\
177 Critical range\n" 177 Critical range\n")
178 178
179#define UT_TIMEOUT "\ 179#define UT_TIMEOUT _("\
180 -t, --timeout=INTEGER\n\ 180 -t, --timeout=INTEGER\n\
181 Seconds before connection times out (default: %d)\n" 181 Seconds before connection times out (default: %d)\n")
182 182
183#ifdef NP_EXTRA_OPTS 183#ifdef NP_EXTRA_OPTS
184#define UT_EXTRA_OPTS "\ 184#define UT_EXTRA_OPTS _("\
185 --extra-opts=[section][@file]\n\ 185 --extra-opts=[section][@file]\n\
186 Read additionnal options from ini file\n" 186 Read additionnal options from ini file\n")
187#define UT_EXTRA_OPTS_NOTES "\ 187#define UT_EXTRA_OPTS_NOTES _("\
188 See: http://nagiosplugins.org/extra-opts for --extra-opts usage and examples.\n" 188 See: http://nagiosplugins.org/extra-opts for --extra-opts usage and examples.\n")
189#else 189#else
190#define UT_EXTRA_OPTS "" 190#define UT_EXTRA_OPTS ""
191#define UT_EXTRA_OPTS_NOTES "" 191#define UT_EXTRA_OPTS_NOTES ""
192#endif 192#endif
193 193
194#define UT_THRESHOLDS_NOTES "\ 194#define UT_THRESHOLDS_NOTES _("\
195 See:\n\ 195 See:\n\
196 http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT\n\ 196 http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT\n\
197 for THRESHOLD format and examples.\n" 197 for THRESHOLD format and examples.\n")
198 198
199#define UT_SUPPORT "\n\ 199#define UT_SUPPORT _("\n\
200Send email to nagios-users@lists.sourceforge.net if you have questions\n\ 200Send email to nagios-users@lists.sourceforge.net if you have questions\n\
201regarding use of this software. To submit patches or suggest improvements,\n\ 201regarding use of this software. To submit patches or suggest improvements,\n\
202send email to nagiosplug-devel@lists.sourceforge.net\n\n" 202send email to nagiosplug-devel@lists.sourceforge.net\n\n")
203 203
204#define UT_NOWARRANTY "\n\ 204#define UT_NOWARRANTY _("\n\
205The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\ 205The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
206copies of the plugins under the terms of the GNU General Public License.\n\ 206copies of the plugins under the terms of the GNU General Public License.\n\
207For more information about these matters, see the file named COPYING.\n" 207For more information about these matters, see the file named COPYING.\n")
208 208
209#endif /* NP_UTILS_H */ 209#endif /* NP_UTILS_H */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 133793c..6e491d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,5 +39,6 @@ plugins/netutils.c
39plugins/popen.c 39plugins/popen.c
40plugins/urlize.c 40plugins/urlize.c
41plugins/utils.c 41plugins/utils.c
42plugins/utils.h
42plugins-root/check_dhcp.c 43plugins-root/check_dhcp.c
43plugins-root/check_icmp.c 44plugins-root/check_icmp.c
diff --git a/po/de.po b/po/de.po
index b7a3df4..dce8620 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
9msgstr "" 9msgstr ""
10"Project-Id-Version: nagiosplug\n" 10"Project-Id-Version: nagiosplug\n"
11"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" 11"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
12"POT-Creation-Date: 2010-04-14 05:43-0400\n" 12"POT-Creation-Date: 2010-04-14 06:17-0400\n"
13"PO-Revision-Date: 2004-12-23 17:46+0100\n" 13"PO-Revision-Date: 2004-12-23 17:46+0100\n"
14"Last-Translator: <>\n" 14"Last-Translator: <>\n"
15"Language-Team: English <en@li.org>\n" 15"Language-Team: English <en@li.org>\n"
@@ -5317,6 +5317,106 @@ msgstr "konnte keinen Speicher für '%s' reservieren\n"
5317msgid "failed malloc in strscat\n" 5317msgid "failed malloc in strscat\n"
5318msgstr "konnte keinen Speicher für '%s' reservieren\n" 5318msgstr "konnte keinen Speicher für '%s' reservieren\n"
5319 5319
5320#: plugins/utils.h:140
5321#, c-format
5322msgid ""
5323" %s (-h | --help) for detailed help\n"
5324" %s (-V | --version) for version information\n"
5325msgstr ""
5326
5327#: plugins/utils.h:144
5328msgid ""
5329"\n"
5330"Options:\n"
5331" -h, --help\n"
5332" Print detailed help screen\n"
5333" -V, --version\n"
5334" Print version information\n"
5335msgstr ""
5336
5337#: plugins/utils.h:151
5338#, c-format
5339msgid ""
5340" -H, --hostname=ADDRESS\n"
5341" Host name, IP Address, or unix socket (must be an absolute path)\n"
5342" -%c, --port=INTEGER\n"
5343" Port number (default: %s)\n"
5344msgstr ""
5345
5346#: plugins/utils.h:157
5347msgid ""
5348" -4, --use-ipv4\n"
5349" Use IPv4 connection\n"
5350" -6, --use-ipv6\n"
5351" Use IPv6 connection\n"
5352msgstr ""
5353
5354#: plugins/utils.h:163
5355msgid ""
5356" -v, --verbose\n"
5357" Show details for command-line debugging (Nagios may truncate output)\n"
5358msgstr ""
5359
5360#: plugins/utils.h:167
5361msgid ""
5362" -w, --warning=DOUBLE\n"
5363" Response time to result in warning status (seconds)\n"
5364" -c, --critical=DOUBLE\n"
5365" Response time to result in critical status (seconds)\n"
5366msgstr ""
5367
5368#: plugins/utils.h:173
5369msgid ""
5370" -w, --warning=RANGE\n"
5371" Warning range (format: start:end). Alert if outside this range\n"
5372" -c, --critical=RANGE\n"
5373" Critical range\n"
5374msgstr ""
5375
5376#: plugins/utils.h:179
5377#, c-format
5378msgid ""
5379" -t, --timeout=INTEGER\n"
5380" Seconds before connection times out (default: %d)\n"
5381msgstr ""
5382
5383#: plugins/utils.h:184
5384msgid ""
5385" --extra-opts=[section][@file]\n"
5386" Read additionnal options from ini file\n"
5387msgstr ""
5388
5389#: plugins/utils.h:187
5390msgid ""
5391" See: http://nagiosplugins.org/extra-opts for --extra-opts usage and "
5392"examples.\n"
5393msgstr ""
5394
5395#: plugins/utils.h:194
5396msgid ""
5397" See:\n"
5398" http://nagiosplug.sourceforge.net/developer-guidelines."
5399"html#THRESHOLDFORMAT\n"
5400" for THRESHOLD format and examples.\n"
5401msgstr ""
5402
5403#: plugins/utils.h:199
5404msgid ""
5405"\n"
5406"Send email to nagios-users@lists.sourceforge.net if you have questions\n"
5407"regarding use of this software. To submit patches or suggest improvements,\n"
5408"send email to nagiosplug-devel@lists.sourceforge.net\n"
5409"\n"
5410msgstr ""
5411
5412#: plugins/utils.h:204
5413msgid ""
5414"\n"
5415"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
5416"copies of the plugins under the terms of the GNU General Public License.\n"
5417"For more information about these matters, see the file named COPYING.\n"
5418msgstr ""
5419
5320#: plugins-root/check_dhcp.c:320 5420#: plugins-root/check_dhcp.c:320
5321#, c-format 5421#, c-format
5322msgid "Error: Could not get hardware address of interface '%s'\n" 5422msgid "Error: Could not get hardware address of interface '%s'\n"
diff --git a/po/fr.po b/po/fr.po
index bced839..744bbdd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
10msgstr "" 10msgstr ""
11"Project-Id-Version: fr\n" 11"Project-Id-Version: fr\n"
12"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" 12"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
13"POT-Creation-Date: 2010-04-14 05:43-0400\n" 13"POT-Creation-Date: 2010-04-14 06:17-0400\n"
14"PO-Revision-Date: 2010-04-14 05:30-0400\n" 14"PO-Revision-Date: 2010-04-14 05:30-0400\n"
15"Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n" 15"Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
16"Language-Team: Nagios Plugin Development Mailing List <nagiosplug-" 16"Language-Team: Nagios Plugin Development Mailing List <nagiosplug-"
@@ -2612,12 +2612,12 @@ msgstr "Ce plugin vérifie le service ntp sur l'hôte"
2612#: plugins/check_ntp.c:849 plugins/check_ntp_peer.c:667 2612#: plugins/check_ntp.c:849 plugins/check_ntp_peer.c:667
2613#: plugins/check_ntp_time.c:609 2613#: plugins/check_ntp_time.c:609
2614msgid "Offset to result in warning status (seconds)" 2614msgid "Offset to result in warning status (seconds)"
2615msgstr "Décalage résultant un avertissement (secondes)" 2615msgstr "Décalage résultant en un avertissement (secondes)"
2616 2616
2617#: plugins/check_ntp.c:851 plugins/check_ntp_peer.c:669 2617#: plugins/check_ntp.c:851 plugins/check_ntp_peer.c:669
2618#: plugins/check_ntp_time.c:611 2618#: plugins/check_ntp_time.c:611
2619msgid "Offset to result in critical status (seconds)" 2619msgid "Offset to result in critical status (seconds)"
2620msgstr "Décalage résultant un état critique (secondes)" 2620msgstr "Décalage résultant en un état critique (secondes)"
2621 2621
2622#: plugins/check_ntp.c:853 plugins/check_ntp_peer.c:675 2622#: plugins/check_ntp.c:853 plugins/check_ntp_peer.c:675
2623msgid "Warning threshold for jitter" 2623msgid "Warning threshold for jitter"
@@ -5411,6 +5411,155 @@ msgstr "La fonction realloc à échoué dans strpcpy\n"
5411msgid "failed malloc in strscat\n" 5411msgid "failed malloc in strscat\n"
5412msgstr "La fonction malloc à échoué dans strscat\n" 5412msgstr "La fonction malloc à échoué dans strscat\n"
5413 5413
5414#: plugins/utils.h:140
5415#, c-format
5416msgid ""
5417" %s (-h | --help) for detailed help\n"
5418" %s (-V | --version) for version information\n"
5419msgstr ""
5420" %s (-h | --help) pour l'aide détaillée\n"
5421" %s (-V | --version) pour les informations relative à la version\n"
5422
5423#: plugins/utils.h:144
5424msgid ""
5425"\n"
5426"Options:\n"
5427" -h, --help\n"
5428" Print detailed help screen\n"
5429" -V, --version\n"
5430" Print version information\n"
5431msgstr ""
5432"\n"
5433"Options:\n"
5434" -h, --help\n"
5435" Afficher l'aide détaillée\n"
5436" -V, --version\n"
5437" Afficher les informations relative à la version\n"
5438
5439#: plugins/utils.h:151
5440#, c-format
5441msgid ""
5442" -H, --hostname=ADDRESS\n"
5443" Host name, IP Address, or unix socket (must be an absolute path)\n"
5444" -%c, --port=INTEGER\n"
5445" Port number (default: %s)\n"
5446msgstr ""
5447" -H, --hostname=ADDRESS\n"
5448" Nom d'hôte, Adresse IP, ou socket UNIX (doit être un chemin absolu)\n"
5449" -%c, --port=INTEGER\n"
5450" Numéro de port (défaut: %s)\n"
5451
5452#: plugins/utils.h:157
5453msgid ""
5454" -4, --use-ipv4\n"
5455" Use IPv4 connection\n"
5456" -6, --use-ipv6\n"
5457" Use IPv6 connection\n"
5458msgstr ""
5459" -4, --use-ipv4\n"
5460" Utiliser une connection IPv4\n"
5461" -6, --use-ipv6\n"
5462" Utiliser une connection IPv6\n"
5463
5464#: plugins/utils.h:163
5465msgid ""
5466" -v, --verbose\n"
5467" Show details for command-line debugging (Nagios may truncate output)\n"
5468msgstr ""
5469" -v, --verbose\n"
5470" Affiche les informations de déboguage en ligne de commande (Nagios peut "
5471"tronquer la sortie)\n"
5472
5473#: plugins/utils.h:167
5474msgid ""
5475" -w, --warning=DOUBLE\n"
5476" Response time to result in warning status (seconds)\n"
5477" -c, --critical=DOUBLE\n"
5478" Response time to result in critical status (seconds)\n"
5479msgstr ""
5480" -w, --warning=DOUBLE\n"
5481" Temps de réponse résultant en un état d'avertissement (secondes)\n"
5482" -c, --critical=DOUBLE\n"
5483" Temps de réponse résultant en un état critique (secondes)\n"
5484
5485#: plugins/utils.h:173
5486msgid ""
5487" -w, --warning=RANGE\n"
5488" Warning range (format: start:end). Alert if outside this range\n"
5489" -c, --critical=RANGE\n"
5490" Critical range\n"
5491msgstr ""
5492" -w, --warning=RANGE\n"
5493" Seuil d'avertissement (format: début:fin). Alerte à l'extérieur de la "
5494"plage\n"
5495" -c, --critical=RANGE\n"
5496" Seuil critique\n"
5497
5498#: plugins/utils.h:179
5499#, c-format
5500msgid ""
5501" -t, --timeout=INTEGER\n"
5502" Seconds before connection times out (default: %d)\n"
5503msgstr ""
5504" -t, --timeout=INTEGER\n"
5505" Délais de connection en secondes (défaut: %d)\n"
5506
5507#: plugins/utils.h:184
5508msgid ""
5509" --extra-opts=[section][@file]\n"
5510" Read additionnal options from ini file\n"
5511msgstr ""
5512" --extra-opts=[section][@file]\n"
5513" Lire les options additionnelles à partir d'un fichier ini\n"
5514
5515#: plugins/utils.h:187
5516msgid ""
5517" See: http://nagiosplugins.org/extra-opts for --extra-opts usage and "
5518"examples.\n"
5519msgstr ""
5520" Voir: http://nagiosplugins.org/extra-opts pour le format et examples de --"
5521"extra-opts.\n"
5522
5523#: plugins/utils.h:194
5524msgid ""
5525" See:\n"
5526" http://nagiosplug.sourceforge.net/developer-guidelines."
5527"html#THRESHOLDFORMAT\n"
5528" for THRESHOLD format and examples.\n"
5529msgstr ""
5530" Voir:\n"
5531" http://nagiosplug.sourceforge.net/developer-guidelines."
5532"html#THRESHOLDFORMAT\n"
5533" pour le format et examples des seuils (THRESHOLD).\n"
5534
5535#: plugins/utils.h:199
5536msgid ""
5537"\n"
5538"Send email to nagios-users@lists.sourceforge.net if you have questions\n"
5539"regarding use of this software. To submit patches or suggest improvements,\n"
5540"send email to nagiosplug-devel@lists.sourceforge.net\n"
5541"\n"
5542msgstr ""
5543"\n"
5544"Envoyez un email à nagios-users@lists.sourceforge.net si vous avez des "
5545"questions\n"
5546"reliées à l'utilisation de ce logiciel. Pour envoyer des patches ou suggérer "
5547"des\n"
5548"améliorations, envoyez un email à nagiosplug-devel@lists.sourceforge.net\n"
5549"\n"
5550
5551#: plugins/utils.h:204
5552msgid ""
5553"\n"
5554"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
5555"copies of the plugins under the terms of the GNU General Public License.\n"
5556"For more information about these matters, see the file named COPYING.\n"
5557msgstr ""
5558"\n"
5559"Les plugins de Nagios ne portent AUCUNE GARANTIE. Vous pouvez redistribuer\n"
5560"des copies des plugins selon les termes de la GNU General Public License.\n"
5561"Pour de plus ample informations, voir le fichier COPYING.\n"
5562
5414#: plugins-root/check_dhcp.c:320 5563#: plugins-root/check_dhcp.c:320
5415#, c-format 5564#, c-format
5416msgid "Error: Could not get hardware address of interface '%s'\n" 5565msgid "Error: Could not get hardware address of interface '%s'\n"
@@ -5838,12 +5987,3 @@ msgstr ""
5838#: plugins-root/check_icmp.c:1334 5987#: plugins-root/check_icmp.c:1334
5839msgid "The -v switch can be specified several times for increased verbosity." 5988msgid "The -v switch can be specified several times for increased verbosity."
5840msgstr "" 5989msgstr ""
5841
5842#~ msgid "See:"
5843#~ msgstr "Voir:"
5844
5845#~ msgid "for THRESHOLD format and examples."
5846#~ msgstr "pour le format et examples des seuils (THRESHOLD)."
5847
5848#~ msgid "for --extra-opts usage and examples."
5849#~ msgstr "pour le format et examples de --extra-opts."
diff --git a/po/nagios-plugins.pot b/po/nagios-plugins.pot
index 4d7dc2b..5b02cac 100644
--- a/po/nagios-plugins.pot
+++ b/po/nagios-plugins.pot
@@ -8,7 +8,7 @@ msgid ""
8msgstr "" 8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n" 9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n" 10"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
11"POT-Creation-Date: 2010-04-14 05:43-0400\n" 11"POT-Creation-Date: 2010-04-14 06:17-0400\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n" 14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5178,6 +5178,106 @@ msgstr ""
5178msgid "failed malloc in strscat\n" 5178msgid "failed malloc in strscat\n"
5179msgstr "" 5179msgstr ""
5180 5180
5181#: plugins/utils.h:140
5182#, c-format
5183msgid ""
5184" %s (-h | --help) for detailed help\n"
5185" %s (-V | --version) for version information\n"
5186msgstr ""
5187
5188#: plugins/utils.h:144
5189msgid ""
5190"\n"
5191"Options:\n"
5192" -h, --help\n"
5193" Print detailed help screen\n"
5194" -V, --version\n"
5195" Print version information\n"
5196msgstr ""
5197
5198#: plugins/utils.h:151
5199#, c-format
5200msgid ""
5201" -H, --hostname=ADDRESS\n"
5202" Host name, IP Address, or unix socket (must be an absolute path)\n"
5203" -%c, --port=INTEGER\n"
5204" Port number (default: %s)\n"
5205msgstr ""
5206
5207#: plugins/utils.h:157
5208msgid ""
5209" -4, --use-ipv4\n"
5210" Use IPv4 connection\n"
5211" -6, --use-ipv6\n"
5212" Use IPv6 connection\n"
5213msgstr ""
5214
5215#: plugins/utils.h:163
5216msgid ""
5217" -v, --verbose\n"
5218" Show details for command-line debugging (Nagios may truncate output)\n"
5219msgstr ""
5220
5221#: plugins/utils.h:167
5222msgid ""
5223" -w, --warning=DOUBLE\n"
5224" Response time to result in warning status (seconds)\n"
5225" -c, --critical=DOUBLE\n"
5226" Response time to result in critical status (seconds)\n"
5227msgstr ""
5228
5229#: plugins/utils.h:173
5230msgid ""
5231" -w, --warning=RANGE\n"
5232" Warning range (format: start:end). Alert if outside this range\n"
5233" -c, --critical=RANGE\n"
5234" Critical range\n"
5235msgstr ""
5236
5237#: plugins/utils.h:179
5238#, c-format
5239msgid ""
5240" -t, --timeout=INTEGER\n"
5241" Seconds before connection times out (default: %d)\n"
5242msgstr ""
5243
5244#: plugins/utils.h:184
5245msgid ""
5246" --extra-opts=[section][@file]\n"
5247" Read additionnal options from ini file\n"
5248msgstr ""
5249
5250#: plugins/utils.h:187
5251msgid ""
5252" See: http://nagiosplugins.org/extra-opts for --extra-opts usage and "
5253"examples.\n"
5254msgstr ""
5255
5256#: plugins/utils.h:194
5257msgid ""
5258" See:\n"
5259" http://nagiosplug.sourceforge.net/developer-guidelines."
5260"html#THRESHOLDFORMAT\n"
5261" for THRESHOLD format and examples.\n"
5262msgstr ""
5263
5264#: plugins/utils.h:199
5265msgid ""
5266"\n"
5267"Send email to nagios-users@lists.sourceforge.net if you have questions\n"
5268"regarding use of this software. To submit patches or suggest improvements,\n"
5269"send email to nagiosplug-devel@lists.sourceforge.net\n"
5270"\n"
5271msgstr ""
5272
5273#: plugins/utils.h:204
5274msgid ""
5275"\n"
5276"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
5277"copies of the plugins under the terms of the GNU General Public License.\n"
5278"For more information about these matters, see the file named COPYING.\n"
5279msgstr ""
5280
5181#: plugins-root/check_dhcp.c:320 5281#: plugins-root/check_dhcp.c:320
5182#, c-format 5282#, c-format
5183msgid "Error: Could not get hardware address of interface '%s'\n" 5283msgid "Error: Could not get hardware address of interface '%s'\n"