Update French translations with extra-opts change

3 files changed, 391 insertions, 424 deletions

diff --git a/po/de.po b/po/de.po
index dce8620d..310d0ae3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nagiosplug\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-04-14 06:17-0400\n"
+"POT-Creation-Date: 2010-04-21 23:38-0400\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: English <en@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102
 #: plugins/check_pgsql.c:154 plugins/check_ping.c:95 plugins/check_procs.c:147
 #: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:140
-#: plugins/check_snmp.c:159 plugins/check_ssh.c:73 plugins/check_swap.c:110
+#: plugins/check_snmp.c:180 plugins/check_ssh.c:73 plugins/check_swap.c:110
 #: plugins/check_tcp.c:209 plugins/check_time.c:78 plugins/check_ups.c:122
 #: plugins/check_users.c:68 plugins/negate.c:211 plugins-root/check_dhcp.c:270
 msgid "Could not parse arguments"
@@ -63,7 +63,7 @@ msgstr ""
 #: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
 #: plugins/check_http.c:255 plugins/check_ldap.c:293 plugins/check_pgsql.c:250
 #: plugins/check_procs.c:364 plugins/check_radius.c:308
-#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:485
+#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:540
 #: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
 #: plugins/check_ups.c:556 plugins/negate.c:161
 msgid "Timeout interval must be a positive integer"
@@ -219,48 +219,29 @@ msgid ""
 "all of -O, -s, and -n options (servicelist order must match '-C'options)"
 msgstr ""
 
-#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:265
-#: plugins/check_dig.c:342 plugins/check_disk.c:969 plugins/check_http.c:1412
-#: plugins/check_nagios.c:308 plugins/check_ntp.c:868
-#: plugins/check_ntp_peer.c:702 plugins/check_ntp_time.c:632
-#: plugins/check_procs.c:748 plugins/negate.c:268 plugins/urlize.c:180
+#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:261
+#: plugins/check_dig.c:342 plugins/check_disk.c:963 plugins/check_http.c:1410
+#: plugins/check_nagios.c:302 plugins/check_ntp.c:864
+#: plugins/check_ntp_peer.c:698 plugins/check_ntp_time.c:628
+#: plugins/check_procs.c:742 plugins/negate.c:268 plugins/urlize.c:180
 msgid "Examples:"
 msgstr ""
 
-#: plugins/check_by_ssh.c:447 plugins/check_cluster.c:257
-#: plugins/check_dig.c:348 plugins/check_disk.c:964 plugins/check_dns.c:481
-#: plugins/check_fping.c:427 plugins/check_game.c:318 plugins/check_hpjd.c:408
-#: plugins/check_http.c:1396 plugins/check_ldap.c:434 plugins/check_load.c:321
-#: plugins/check_mrtg.c:363 plugins/check_mrtgtraf.c:361
-#: plugins/check_mysql.c:415 plugins/check_nagios.c:303 plugins/check_nt.c:743
-#: plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
-#: plugins/check_ntp_time.c:621 plugins/check_nwstat.c:1670
-#: plugins/check_overcr.c:456 plugins/check_pgsql.c:471
-#: plugins/check_ping.c:597 plugins/check_procs.c:743
-#: plugins/check_radius.c:379 plugins/check_real.c:445
-#: plugins/check_smtp.c:813 plugins/check_snmp.c:882 plugins/check_ssh.c:296
-#: plugins/check_swap.c:547 plugins/check_tcp.c:646 plugins/check_time.c:365
-#: plugins/check_ups.c:642 plugins/check_users.c:224
-#: plugins/check_ide_smart.c:511 plugins/negate.c:274
-#: plugins-root/check_dhcp.c:1415 plugins-root/check_icmp.c:1322
-msgid "Notes:"
-msgstr ""
-
-#: plugins/check_by_ssh.c:459 plugins/check_cluster.c:277
-#: plugins/check_dig.c:360 plugins/check_disk.c:986 plugins/check_dns.c:492
-#: plugins/check_dummy.c:122 plugins/check_fping.c:438
-#: plugins/check_game.c:335 plugins/check_hpjd.c:420 plugins/check_http.c:1435
-#: plugins/check_ldap.c:456 plugins/check_load.c:331 plugins/check_mrtg.c:385
-#: plugins/check_mysql.c:429 plugins/check_nagios.c:319 plugins/check_nt.c:762
-#: plugins/check_ntp.c:887 plugins/check_ntp_peer.c:722
-#: plugins/check_ntp_time.c:641 plugins/check_nwstat.c:1688
-#: plugins/check_overcr.c:471 plugins/check_pgsql.c:483
-#: plugins/check_ping.c:607 plugins/check_radius.c:391
-#: plugins/check_real.c:457 plugins/check_smtp.c:825 plugins/check_snmp.c:904
-#: plugins/check_ssh.c:308 plugins/check_swap.c:563 plugins/check_tcp.c:657
-#: plugins/check_time.c:377 plugins/check_ups.c:664 plugins/check_users.c:235
-#: plugins/check_ide_smart.c:533 plugins/negate.c:292 plugins/urlize.c:197
-#: plugins-root/check_dhcp.c:1427 plugins-root/check_icmp.c:1351
+#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:273
+#: plugins/check_dig.c:354 plugins/check_disk.c:980 plugins/check_dns.c:486
+#: plugins/check_dummy.c:122 plugins/check_fping.c:432
+#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1433
+#: plugins/check_ldap.c:452 plugins/check_load.c:325 plugins/check_mrtg.c:382
+#: plugins/check_mysql.c:425 plugins/check_nagios.c:313 plugins/check_nt.c:759
+#: plugins/check_ntp.c:883 plugins/check_ntp_peer.c:718
+#: plugins/check_ntp_time.c:637 plugins/check_nwstat.c:1685
+#: plugins/check_overcr.c:467 plugins/check_pgsql.c:477
+#: plugins/check_ping.c:601 plugins/check_radius.c:385
+#: plugins/check_real.c:451 plugins/check_smtp.c:819 plugins/check_snmp.c:956
+#: plugins/check_ssh.c:302 plugins/check_swap.c:558 plugins/check_tcp.c:651
+#: plugins/check_time.c:371 plugins/check_ups.c:660 plugins/check_users.c:229
+#: plugins/check_ide_smart.c:527 plugins/negate.c:292 plugins/urlize.c:197
+#: plugins-root/check_dhcp.c:1421 plugins-root/check_icmp.c:1347
 #, c-format
 msgid "Usage:"
 msgstr ""
@@ -306,7 +287,18 @@ msgstr ""
 msgid "commas"
 msgstr ""
 
-#: plugins/check_cluster.c:267
+#: plugins/check_cluster.c:257 plugins/check_game.c:318
+#: plugins/check_http.c:1396 plugins/check_ldap.c:434 plugins/check_mrtg.c:363
+#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:414
+#: plugins/check_nt.c:743 plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
+#: plugins/check_ntp_time.c:621 plugins/check_nwstat.c:1670
+#: plugins/check_overcr.c:456 plugins/check_snmp.c:937
+#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
+#: plugins-root/check_icmp.c:1322
+msgid "Notes:"
+msgstr ""
+
+#: plugins/check_cluster.c:263
 msgid ""
 "Will alert critical if there are 3 or more service data points in a non-OK "
 "state"
@@ -390,7 +382,7 @@ msgstr ""
 msgid "DISK %s: %s not found\n"
 msgstr "%s [%s nicht gefunden]"
 
-#: plugins/check_disk.c:214 plugins/check_disk.c:1001 plugins/check_dns.c:241
+#: plugins/check_disk.c:214 plugins/check_disk.c:995 plugins/check_dns.c:241
 #: plugins/check_dummy.c:74 plugins/check_mysql.c:212
 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168
 #: plugins/check_nagios.c:172 plugins/check_procs.c:290
@@ -578,34 +570,34 @@ msgstr ""
 msgid "Ignore all filesystems of indicated type (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:971
+#: plugins/check_disk.c:965
 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"
 msgstr ""
 
-#: plugins/check_disk.c:973
+#: plugins/check_disk.c:967
 msgid ""
 "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
 "r regex"
 msgstr ""
 
-#: plugins/check_disk.c:974
+#: plugins/check_disk.c:968
 msgid ""
 "are grouped which means the freespace thresholds are applied to all disks "
 "together"
 msgstr ""
 
-#: plugins/check_disk.c:976
+#: plugins/check_disk.c:970
 msgid ""
 "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
 "100M/50M"
 msgstr ""
 
-#: plugins/check_disk.c:1002
+#: plugins/check_disk.c:996
 #, c-format
 msgid "%s %s: %s\n"
 msgstr ""
 
-#: plugins/check_disk.c:1002
+#: plugins/check_disk.c:996
 msgid "is not accessible"
 msgstr ""
 
@@ -1489,55 +1481,55 @@ msgstr ""
 msgid "(fully qualified domain name) as the [host_name] argument."
 msgstr ""
 
-#: plugins/check_http.c:1408
+#: plugins/check_http.c:1406
 msgid "This plugin can also check whether an SSL enabled web server is able to"
 msgstr ""
 
-#: plugins/check_http.c:1409
+#: plugins/check_http.c:1407
 msgid "serve content (optionally within a specified time) or whether the X509 "
 msgstr ""
 
-#: plugins/check_http.c:1410
+#: plugins/check_http.c:1408
 msgid "certificate is still valid for the specified number of days."
 msgstr ""
 
-#: plugins/check_http.c:1414
+#: plugins/check_http.c:1412
 msgid ""
 "When the 'www.verisign.com' server returns its content within 5 seconds,"
 msgstr ""
 
-#: plugins/check_http.c:1415
+#: plugins/check_http.c:1413
 msgid ""
 "a STATE_OK will be returned. When the server returns its content but exceeds"
 msgstr ""
 
-#: plugins/check_http.c:1416
+#: plugins/check_http.c:1414
 msgid ""
 "the 5-second threshold, a STATE_WARNING will be returned. When an error "
 "occurs,"
 msgstr ""
 
-#: plugins/check_http.c:1417
+#: plugins/check_http.c:1415
 msgid "a STATE_CRITICAL will be returned."
 msgstr ""
 
-#: plugins/check_http.c:1420
+#: plugins/check_http.c:1418
 msgid ""
 "When the certificate of 'www.verisign.com' is valid for more than 14 days,"
 msgstr ""
 
-#: plugins/check_http.c:1421
+#: plugins/check_http.c:1419
 msgid ""
 "a STATE_OK is returned. When the certificate is still valid, but for less "
 "than"
 msgstr ""
 
-#: plugins/check_http.c:1422
+#: plugins/check_http.c:1420
 msgid ""
 "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
 msgstr ""
 
-#: plugins/check_http.c:1423
+#: plugins/check_http.c:1421
 #, fuzzy
 msgid "the certificate is expired."
 msgstr "Clientzertifikat benötigt\n"
@@ -1987,7 +1979,7 @@ msgstr ""
 msgid "  for future enhancements of this plugin."
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:381
+#: plugins/check_mrtgtraf.c:378
 #, c-format
 msgid "Usage"
 msgstr ""
@@ -2074,11 +2066,11 @@ msgstr ""
 msgid "IP address or FQDN ('localhost' will use the socket as well)."
 msgstr ""
 
-#: plugins/check_mysql.c:418
+#: plugins/check_mysql.c:415
 msgid "You must specify -p with an empty string to force an empty password,"
 msgstr ""
 
-#: plugins/check_mysql.c:419
+#: plugins/check_mysql.c:416
 msgid "overriding any my.cnf settings."
 msgstr ""
 
@@ -2579,24 +2571,24 @@ msgstr "Warning threshold  Integer sein"
 msgid "Critical threshold for jitter"
 msgstr "Critical threshold muss ein Integer sein"
 
-#: plugins/check_ntp.c:869
+#: plugins/check_ntp.c:865
 msgid "Normal offset check:"
 msgstr ""
 
-#: plugins/check_ntp.c:872 plugins/check_ntp_peer.c:706
+#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:702
 msgid ""
 "Check jitter too, avoiding critical notifications if jitter isn't available"
 msgstr ""
 
-#: plugins/check_ntp.c:873 plugins/check_ntp_peer.c:707
+#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:703
 msgid "(See Notes above for more details on thresholds formats):"
 msgstr ""
 
-#: plugins/check_ntp.c:878 plugins/check_ntp.c:885
+#: plugins/check_ntp.c:874 plugins/check_ntp.c:881
 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or"
 msgstr ""
 
-#: plugins/check_ntp.c:879 plugins/check_ntp.c:886
+#: plugins/check_ntp.c:875 plugins/check_ntp.c:882
 msgid "check_ntp_time instead."
 msgstr ""
 
@@ -2660,15 +2652,15 @@ msgstr ""
 msgid "server; please use check_ntp_time for that purpose."
 msgstr ""
 
-#: plugins/check_ntp_peer.c:703
+#: plugins/check_ntp_peer.c:699
 msgid "Simple NTP server check:"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:710
+#: plugins/check_ntp_peer.c:706
 msgid "Only check the number of usable time sources (\"truechimers\"):"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:713
+#: plugins/check_ntp_peer.c:709
 msgid "Check only stratum:"
 msgstr ""
 
@@ -3794,32 +3786,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:750
+#: plugins/check_procs.c:744
 msgid "Warning if not two processes with command name portsentry."
 msgstr ""
 
-#: plugins/check_procs.c:751
+#: plugins/check_procs.c:745
 msgid "Critical if < 2 or > 1024 processes"
 msgstr ""
 
-#: plugins/check_procs.c:753
+#: plugins/check_procs.c:747
 msgid "Warning alert if > 10 processes with command arguments containing"
 msgstr ""
 
-#: plugins/check_procs.c:754
+#: plugins/check_procs.c:748
 msgid "'/usr/local/bin/perl' and owned by root"
 msgstr ""
 
-#: plugins/check_procs.c:756
+#: plugins/check_procs.c:750
 msgid "Alert if VSZ of any processes over 50K or 100K"
 msgstr ""
 
-#: plugins/check_procs.c:758
+#: plugins/check_procs.c:752
 #, c-format
 msgid "Alert if CPU of any processes over 10%% or 20%%"
 msgstr ""
 
-#: plugins/check_procs.c:766
+#: plugins/check_procs.c:760
 #, c-format
 msgid "Usage: "
 msgstr ""
@@ -4102,7 +4094,7 @@ msgstr ""
 msgid "CRITICAL - Cannot retrieve server certificate."
 msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
 
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:542
+#: plugins/check_smtp.c:311 plugins/check_snmp.c:597
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr ""
@@ -4112,7 +4104,7 @@ msgstr ""
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr ""
 
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:320
+#: plugins/check_smtp.c:324 plugins/check_snmp.c:374
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr ""
@@ -4252,224 +4244,224 @@ msgstr ""
 msgid "STATE_WARNING return values."
 msgstr ""
 
-#: plugins/check_snmp.c:236
+#: plugins/check_snmp.c:257
 #, fuzzy, c-format
 msgid "External command error: %s\n"
 msgstr "Papierfehler"
 
-#: plugins/check_snmp.c:241
+#: plugins/check_snmp.c:262
 #, c-format
 msgid "External command error with no output (return code: %d)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:298
+#: plugins/check_snmp.c:352
 msgid "No valid data returned"
 msgstr ""
 
-#: plugins/check_snmp.c:500
+#: plugins/check_snmp.c:555
 #, fuzzy
 msgid "Retries interval must be a positive integer"
 msgstr "Time interval muss ein positiver Integer sein"
 
-#: plugins/check_snmp.c:563
+#: plugins/check_snmp.c:618
 #, fuzzy, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr "Konnte addr nicht zuweisen\n"
 
-#: plugins/check_snmp.c:575
+#: plugins/check_snmp.c:630
 #, fuzzy
 msgid "Could not reallocate labels\n"
 msgstr "Konnte·url·nicht·zuweisen\n"
 
-#: plugins/check_snmp.c:592
+#: plugins/check_snmp.c:647
 #, fuzzy, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr "Konnte·url·nicht·zuweisen\n"
 
-#: plugins/check_snmp.c:604
+#: plugins/check_snmp.c:659
 msgid "Could not realloc() units\n"
 msgstr ""
 
-#: plugins/check_snmp.c:662
+#: plugins/check_snmp.c:717
 #, fuzzy
 msgid "No host specified\n"
 msgstr ""
 "Kein Hostname angegeben\n"
 "\n"
 
-#: plugins/check_snmp.c:666
+#: plugins/check_snmp.c:721
 #, fuzzy
 msgid "No OIDs specified\n"
 msgstr ""
 "Kein Hostname angegeben\n"
 "\n"
 
-#: plugins/check_snmp.c:688
+#: plugins/check_snmp.c:743
 msgid "Invalid seclevel"
 msgstr ""
 
-#: plugins/check_snmp.c:695 plugins/check_snmp.c:698 plugins/check_snmp.c:716
+#: plugins/check_snmp.c:750 plugins/check_snmp.c:753 plugins/check_snmp.c:771
 #, c-format
 msgid "Required parameter: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:737
+#: plugins/check_snmp.c:792
 msgid "Invalid SNMP version"
 msgstr ""
 
-#: plugins/check_snmp.c:754
+#: plugins/check_snmp.c:809
 msgid "Unbalanced quotes\n"
 msgstr ""
 
-#: plugins/check_snmp.c:803
+#: plugins/check_snmp.c:858
 msgid "Check status of remote machines and obtain system information via SNMP"
 msgstr ""
 
-#: plugins/check_snmp.c:816
+#: plugins/check_snmp.c:871
 msgid "Use SNMP GETNEXT instead of SNMP GET"
 msgstr ""
 
-#: plugins/check_snmp.c:818
+#: plugins/check_snmp.c:873
 msgid "SNMP protocol version"
 msgstr ""
 
-#: plugins/check_snmp.c:820
+#: plugins/check_snmp.c:875
 msgid "SNMPv3 securityLevel"
 msgstr ""
 
-#: plugins/check_snmp.c:822
+#: plugins/check_snmp.c:877
 msgid "SNMPv3 auth proto"
 msgstr ""
 
-#: plugins/check_snmp.c:824
+#: plugins/check_snmp.c:879
 msgid "SNMPv3 priv proto (default DES)"
 msgstr ""
 
-#: plugins/check_snmp.c:828
+#: plugins/check_snmp.c:883
 msgid "Optional community string for SNMP communication"
 msgstr ""
 
-#: plugins/check_snmp.c:829
+#: plugins/check_snmp.c:884
 msgid "default is"
 msgstr ""
 
-#: plugins/check_snmp.c:831
+#: plugins/check_snmp.c:886
 msgid "SNMPv3 username"
 msgstr ""
 
-#: plugins/check_snmp.c:833
+#: plugins/check_snmp.c:888
 msgid "SNMPv3 authentication password"
 msgstr ""
 
-#: plugins/check_snmp.c:835
+#: plugins/check_snmp.c:890
 msgid "SNMPv3 privacy password"
 msgstr ""
 
-#: plugins/check_snmp.c:839
+#: plugins/check_snmp.c:894
 msgid "Object identifier(s) or SNMP variables whose value you wish to query"
 msgstr ""
 
-#: plugins/check_snmp.c:841
+#: plugins/check_snmp.c:896
 msgid ""
 "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
 msgstr ""
 
-#: plugins/check_snmp.c:842
+#: plugins/check_snmp.c:897
 msgid "for symbolic OIDs.)"
 msgstr ""
 
-#: plugins/check_snmp.c:844
+#: plugins/check_snmp.c:899
 msgid "Delimiter to use when parsing returned data. Default is"
 msgstr ""
 
-#: plugins/check_snmp.c:845
+#: plugins/check_snmp.c:900
 msgid "Any data on the right hand side of the delimiter is considered"
 msgstr ""
 
-#: plugins/check_snmp.c:846
+#: plugins/check_snmp.c:901
 msgid "to be the data that should be used in the evaluation."
 msgstr ""
 
-#: plugins/check_snmp.c:850
+#: plugins/check_snmp.c:905
 #, fuzzy
 msgid "Warning threshold range(s)"
 msgstr "Warning threshold  Integer sein"
 
-#: plugins/check_snmp.c:852
+#: plugins/check_snmp.c:907
 #, fuzzy
 msgid "Critical threshold range(s)"
 msgstr "Critical threshold muss ein Integer sein"
 
-#: plugins/check_snmp.c:856
+#: plugins/check_snmp.c:911
 msgid "Return OK state (for that OID) if STRING is an exact match"
 msgstr ""
 
-#: plugins/check_snmp.c:858
+#: plugins/check_snmp.c:913
 msgid ""
 "Return OK state (for that OID) if extended regular expression REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:860
+#: plugins/check_snmp.c:915
 msgid ""
 "Return OK state (for that OID) if case-insensitive extended REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:862
+#: plugins/check_snmp.c:917
 msgid "Prefix label for output from plugin (default -s 'SNMP')"
 msgstr ""
 
-#: plugins/check_snmp.c:866
+#: plugins/check_snmp.c:921
 msgid "Units label(s) for output data (e.g., 'sec.')."
 msgstr ""
 
-#: plugins/check_snmp.c:868
+#: plugins/check_snmp.c:923
 msgid "Separates output on multiple OID requests"
 msgstr ""
 
-#: plugins/check_snmp.c:872
+#: plugins/check_snmp.c:927
 msgid "Number of retries to be used in the requests"
 msgstr ""
 
-#: plugins/check_snmp.c:877
+#: plugins/check_snmp.c:932
 msgid ""
 "This plugin uses the 'snmpget' command included with the NET-SNMP package."
 msgstr ""
 
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:933
 msgid ""
 "if you don't have the package installed, you will need to download it from"
 msgstr ""
 
-#: plugins/check_snmp.c:879
+#: plugins/check_snmp.c:934
 msgid "http://net-snmp.sourceforge.net before you can use this plugin."
 msgstr ""
 
-#: plugins/check_snmp.c:883
+#: plugins/check_snmp.c:938
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
 "with"
 msgstr ""
 
-#: plugins/check_snmp.c:884
+#: plugins/check_snmp.c:939
 msgid "internal spaces must be quoted) [max 8 OIDs]"
 msgstr ""
 
-#: plugins/check_snmp.c:888
+#: plugins/check_snmp.c:943
 msgid ""
 "- When checking multiple OIDs, separate ranges by commas like '-w "
 "1:10,1:,:20'"
 msgstr ""
 
-#: plugins/check_snmp.c:889
+#: plugins/check_snmp.c:944
 msgid "- Note that only one string and one regex may be checked at present"
 msgstr ""
 
-#: plugins/check_snmp.c:890
+#: plugins/check_snmp.c:945
 msgid ""
 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
 msgstr ""
 
-#: plugins/check_snmp.c:891
+#: plugins/check_snmp.c:946
 msgid "returned from the SNMP query is an unsigned integer."
 msgstr ""
 
@@ -5383,16 +5375,11 @@ msgstr ""
 #: plugins/utils.h:184
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read additionnal options from ini file\n"
-msgstr ""
-
-#: plugins/utils.h:187
-msgid ""
-" See: http://nagiosplugins.org/extra-opts for --extra-opts usage and "
-"examples.\n"
+"    Read options from an ini file. See http://nagiosplugins.org/extra-opts "
+"for usage\n"
 msgstr ""
 
-#: plugins/utils.h:194
+#: plugins/utils.h:191
 msgid ""
 " See:\n"
 " http://nagiosplug.sourceforge.net/developer-guidelines."
@@ -5400,7 +5387,7 @@ msgid ""
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:199
+#: plugins/utils.h:196
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -5409,7 +5396,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/utils.h:204
+#: plugins/utils.h:201
 msgid ""
 "\n"
 "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
diff --git a/po/fr.po b/po/fr.po
index 744bbdd6..a9a2b393 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-04-14 06:17-0400\n"
-"PO-Revision-Date: 2010-04-14 05:30-0400\n"
+"POT-Creation-Date: 2010-04-21 23:38-0400\n"
+"PO-Revision-Date: 2010-04-21 23:38-0400\n"
 "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
 "Language-Team: Nagios Plugin Development Mailing List <nagiosplug-"
 "devel@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@ msgstr ""
 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102
 #: plugins/check_pgsql.c:154 plugins/check_ping.c:95 plugins/check_procs.c:147
 #: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:140
-#: plugins/check_snmp.c:159 plugins/check_ssh.c:73 plugins/check_swap.c:110
+#: plugins/check_snmp.c:180 plugins/check_ssh.c:73 plugins/check_swap.c:110
 #: plugins/check_tcp.c:209 plugins/check_time.c:78 plugins/check_ups.c:122
 #: plugins/check_users.c:68 plugins/negate.c:211 plugins-root/check_dhcp.c:270
 msgid "Could not parse arguments"
@@ -66,7 +66,7 @@ msgstr "%s: Erreur d'analyse du résultat\n"
 #: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
 #: plugins/check_http.c:255 plugins/check_ldap.c:293 plugins/check_pgsql.c:250
 #: plugins/check_procs.c:364 plugins/check_radius.c:308
-#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:485
+#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:540
 #: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
 #: plugins/check_ups.c:556 plugins/negate.c:161
 msgid "Timeout interval must be a positive integer"
@@ -221,48 +221,29 @@ msgstr ""
 "et les options -O, -s, n (l'ordre des services doit correspondre aux "
 "multiples options '-C)"
 
-#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:265
-#: plugins/check_dig.c:342 plugins/check_disk.c:969 plugins/check_http.c:1412
-#: plugins/check_nagios.c:308 plugins/check_ntp.c:868
-#: plugins/check_ntp_peer.c:702 plugins/check_ntp_time.c:632
-#: plugins/check_procs.c:748 plugins/negate.c:268 plugins/urlize.c:180
+#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:261
+#: plugins/check_dig.c:342 plugins/check_disk.c:963 plugins/check_http.c:1410
+#: plugins/check_nagios.c:302 plugins/check_ntp.c:864
+#: plugins/check_ntp_peer.c:698 plugins/check_ntp_time.c:628
+#: plugins/check_procs.c:742 plugins/negate.c:268 plugins/urlize.c:180
 msgid "Examples:"
 msgstr "Exemples:"
 
-#: plugins/check_by_ssh.c:447 plugins/check_cluster.c:257
-#: plugins/check_dig.c:348 plugins/check_disk.c:964 plugins/check_dns.c:481
-#: plugins/check_fping.c:427 plugins/check_game.c:318 plugins/check_hpjd.c:408
-#: plugins/check_http.c:1396 plugins/check_ldap.c:434 plugins/check_load.c:321
-#: plugins/check_mrtg.c:363 plugins/check_mrtgtraf.c:361
-#: plugins/check_mysql.c:415 plugins/check_nagios.c:303 plugins/check_nt.c:743
-#: plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
-#: plugins/check_ntp_time.c:621 plugins/check_nwstat.c:1670
-#: plugins/check_overcr.c:456 plugins/check_pgsql.c:471
-#: plugins/check_ping.c:597 plugins/check_procs.c:743
-#: plugins/check_radius.c:379 plugins/check_real.c:445
-#: plugins/check_smtp.c:813 plugins/check_snmp.c:882 plugins/check_ssh.c:296
-#: plugins/check_swap.c:547 plugins/check_tcp.c:646 plugins/check_time.c:365
-#: plugins/check_ups.c:642 plugins/check_users.c:224
-#: plugins/check_ide_smart.c:511 plugins/negate.c:274
-#: plugins-root/check_dhcp.c:1415 plugins-root/check_icmp.c:1322
-msgid "Notes:"
-msgstr "Notes:"
-
-#: plugins/check_by_ssh.c:459 plugins/check_cluster.c:277
-#: plugins/check_dig.c:360 plugins/check_disk.c:986 plugins/check_dns.c:492
-#: plugins/check_dummy.c:122 plugins/check_fping.c:438
-#: plugins/check_game.c:335 plugins/check_hpjd.c:420 plugins/check_http.c:1435
-#: plugins/check_ldap.c:456 plugins/check_load.c:331 plugins/check_mrtg.c:385
-#: plugins/check_mysql.c:429 plugins/check_nagios.c:319 plugins/check_nt.c:762
-#: plugins/check_ntp.c:887 plugins/check_ntp_peer.c:722
-#: plugins/check_ntp_time.c:641 plugins/check_nwstat.c:1688
-#: plugins/check_overcr.c:471 plugins/check_pgsql.c:483
-#: plugins/check_ping.c:607 plugins/check_radius.c:391
-#: plugins/check_real.c:457 plugins/check_smtp.c:825 plugins/check_snmp.c:904
-#: plugins/check_ssh.c:308 plugins/check_swap.c:563 plugins/check_tcp.c:657
-#: plugins/check_time.c:377 plugins/check_ups.c:664 plugins/check_users.c:235
-#: plugins/check_ide_smart.c:533 plugins/negate.c:292 plugins/urlize.c:197
-#: plugins-root/check_dhcp.c:1427 plugins-root/check_icmp.c:1351
+#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:273
+#: plugins/check_dig.c:354 plugins/check_disk.c:980 plugins/check_dns.c:486
+#: plugins/check_dummy.c:122 plugins/check_fping.c:432
+#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1433
+#: plugins/check_ldap.c:452 plugins/check_load.c:325 plugins/check_mrtg.c:382
+#: plugins/check_mysql.c:425 plugins/check_nagios.c:313 plugins/check_nt.c:759
+#: plugins/check_ntp.c:883 plugins/check_ntp_peer.c:718
+#: plugins/check_ntp_time.c:637 plugins/check_nwstat.c:1685
+#: plugins/check_overcr.c:467 plugins/check_pgsql.c:477
+#: plugins/check_ping.c:601 plugins/check_radius.c:385
+#: plugins/check_real.c:451 plugins/check_smtp.c:819 plugins/check_snmp.c:956
+#: plugins/check_ssh.c:302 plugins/check_swap.c:558 plugins/check_tcp.c:651
+#: plugins/check_time.c:371 plugins/check_ups.c:660 plugins/check_users.c:229
+#: plugins/check_ide_smart.c:527 plugins/negate.c:292 plugins/urlize.c:197
+#: plugins-root/check_dhcp.c:1421 plugins-root/check_icmp.c:1347
 #, c-format
 msgid "Usage:"
 msgstr "Utilisation:"
@@ -308,7 +289,18 @@ msgstr "Les codes d'état des hÎtes ou des services du cluster, séparés par d
 msgid "commas"
 msgstr "virgules"
 
-#: plugins/check_cluster.c:267
+#: plugins/check_cluster.c:257 plugins/check_game.c:318
+#: plugins/check_http.c:1396 plugins/check_ldap.c:434 plugins/check_mrtg.c:363
+#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:414
+#: plugins/check_nt.c:743 plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
+#: plugins/check_ntp_time.c:621 plugins/check_nwstat.c:1670
+#: plugins/check_overcr.c:456 plugins/check_snmp.c:937
+#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
+#: plugins-root/check_icmp.c:1322
+msgid "Notes:"
+msgstr "Notes:"
+
+#: plugins/check_cluster.c:263
 msgid ""
 "Will alert critical if there are 3 or more service data points in a non-OK "
 "state"
@@ -387,7 +379,7 @@ msgstr ""
 msgid "DISK %s: %s not found\n"
 msgstr "DISK %s: %s non trouvé\n"
 
-#: plugins/check_disk.c:214 plugins/check_disk.c:1001 plugins/check_dns.c:241
+#: plugins/check_disk.c:214 plugins/check_disk.c:995 plugins/check_dns.c:241
 #: plugins/check_dummy.c:74 plugins/check_mysql.c:212
 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168
 #: plugins/check_nagios.c:172 plugins/check_procs.c:290
@@ -591,34 +583,34 @@ msgstr ""
 "Ignorer tout les systÚmes de fichiers qui correspondent au type indiqué "
 "(peut ĂȘtre utilisĂ© plusieurs fois)"
 
-#: plugins/check_disk.c:971
+#: plugins/check_disk.c:965
 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"
 msgstr "VĂ©rifie /tmp Ă  10% et /var Ă  5% et / Ă  100MB et 50MB"
 
-#: plugins/check_disk.c:973
+#: plugins/check_disk.c:967
 msgid ""
 "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
 "r regex"
 msgstr ""
 
-#: plugins/check_disk.c:974
+#: plugins/check_disk.c:968
 msgid ""
 "are grouped which means the freespace thresholds are applied to all disks "
 "together"
 msgstr ""
 
-#: plugins/check_disk.c:976
+#: plugins/check_disk.c:970
 msgid ""
 "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
 "100M/50M"
 msgstr ""
 
-#: plugins/check_disk.c:1002
+#: plugins/check_disk.c:996
 #, c-format
 msgid "%s %s: %s\n"
 msgstr ""
 
-#: plugins/check_disk.c:1002
+#: plugins/check_disk.c:996
 msgid "is not accessible"
 msgstr ""
 
@@ -1526,55 +1518,55 @@ msgstr ""
 msgid "(fully qualified domain name) as the [host_name] argument."
 msgstr ""
 
-#: plugins/check_http.c:1408
+#: plugins/check_http.c:1406
 msgid "This plugin can also check whether an SSL enabled web server is able to"
 msgstr ""
 
-#: plugins/check_http.c:1409
+#: plugins/check_http.c:1407
 msgid "serve content (optionally within a specified time) or whether the X509 "
 msgstr ""
 
-#: plugins/check_http.c:1410
+#: plugins/check_http.c:1408
 msgid "certificate is still valid for the specified number of days."
 msgstr ""
 
-#: plugins/check_http.c:1414
+#: plugins/check_http.c:1412
 msgid ""
 "When the 'www.verisign.com' server returns its content within 5 seconds,"
 msgstr ""
 
-#: plugins/check_http.c:1415
+#: plugins/check_http.c:1413
 msgid ""
 "a STATE_OK will be returned. When the server returns its content but exceeds"
 msgstr ""
 
-#: plugins/check_http.c:1416
+#: plugins/check_http.c:1414
 msgid ""
 "the 5-second threshold, a STATE_WARNING will be returned. When an error "
 "occurs,"
 msgstr ""
 
-#: plugins/check_http.c:1417
+#: plugins/check_http.c:1415
 msgid "a STATE_CRITICAL will be returned."
 msgstr ""
 
-#: plugins/check_http.c:1420
+#: plugins/check_http.c:1418
 msgid ""
 "When the certificate of 'www.verisign.com' is valid for more than 14 days,"
 msgstr ""
 
-#: plugins/check_http.c:1421
+#: plugins/check_http.c:1419
 msgid ""
 "a STATE_OK is returned. When the certificate is still valid, but for less "
 "than"
 msgstr ""
 
-#: plugins/check_http.c:1422
+#: plugins/check_http.c:1420
 msgid ""
 "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
 msgstr ""
 
-#: plugins/check_http.c:1423
+#: plugins/check_http.c:1421
 msgid "the certificate is expired."
 msgstr "le certificat est expiré."
 
@@ -2033,7 +2025,7 @@ msgstr ""
 msgid "  for future enhancements of this plugin."
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:381
+#: plugins/check_mrtgtraf.c:378
 #, c-format
 msgid "Usage"
 msgstr "Utilisation"
@@ -2123,11 +2115,11 @@ msgstr ""
 msgid "IP address or FQDN ('localhost' will use the socket as well)."
 msgstr ""
 
-#: plugins/check_mysql.c:418
+#: plugins/check_mysql.c:415
 msgid "You must specify -p with an empty string to force an empty password,"
 msgstr ""
 
-#: plugins/check_mysql.c:419
+#: plugins/check_mysql.c:416
 msgid "overriding any my.cnf settings."
 msgstr ""
 
@@ -2627,27 +2619,27 @@ msgstr "Seuil d'avertissement pour la variation (jitter)"
 msgid "Critical threshold for jitter"
 msgstr "Seuil critique pour la variation (jitter)"
 
-#: plugins/check_ntp.c:869
+#: plugins/check_ntp.c:865
 msgid "Normal offset check:"
 msgstr "Vérification normale du décalage:"
 
-#: plugins/check_ntp.c:872 plugins/check_ntp_peer.c:706
+#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:702
 msgid ""
 "Check jitter too, avoiding critical notifications if jitter isn't available"
 msgstr ""
 "VĂ©rifier aussi la variation (jitter) en Ă©vitant les notifications s'il n'est "
 "pas dispoible"
 
-#: plugins/check_ntp.c:873 plugins/check_ntp_peer.c:707
+#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:703
 msgid "(See Notes above for more details on thresholds formats):"
 msgstr ""
 "(Voir les Notes ci-dessus pour plus de détails sur le format des seuils)"
 
-#: plugins/check_ntp.c:878 plugins/check_ntp.c:885
+#: plugins/check_ntp.c:874 plugins/check_ntp.c:881
 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or"
 msgstr "ATTENTION: check_ntp est périmé, utilisez plutÎt check_ntp_peer"
 
-#: plugins/check_ntp.c:879 plugins/check_ntp.c:886
+#: plugins/check_ntp.c:875 plugins/check_ntp.c:882
 msgid "check_ntp_time instead."
 msgstr "ou check_ntp_time."
 
@@ -2714,15 +2706,15 @@ msgstr ""
 msgid "server; please use check_ntp_time for that purpose."
 msgstr "NTP; utilisez plutĂŽt check_ntp_time Ă  cette fin."
 
-#: plugins/check_ntp_peer.c:703
+#: plugins/check_ntp_peer.c:699
 msgid "Simple NTP server check:"
 msgstr "VĂ©rification simple du serveur NTP:"
 
-#: plugins/check_ntp_peer.c:710
+#: plugins/check_ntp_peer.c:706
 msgid "Only check the number of usable time sources (\"truechimers\"):"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:713
+#: plugins/check_ntp_peer.c:709
 msgid "Check only stratum:"
 msgstr "VĂ©rification du stratum seulement:"
 
@@ -3858,32 +3850,32 @@ msgstr ""
 "état actuel (ex: 'Z'), ou par le nombre de processus en cours d'exécution\n"
 "\n"
 
-#: plugins/check_procs.c:750
+#: plugins/check_procs.c:744
 msgid "Warning if not two processes with command name portsentry."
 msgstr ""
 
-#: plugins/check_procs.c:751
+#: plugins/check_procs.c:745
 msgid "Critical if < 2 or > 1024 processes"
 msgstr ""
 
-#: plugins/check_procs.c:753
+#: plugins/check_procs.c:747
 msgid "Warning alert if > 10 processes with command arguments containing"
 msgstr ""
 
-#: plugins/check_procs.c:754
+#: plugins/check_procs.c:748
 msgid "'/usr/local/bin/perl' and owned by root"
 msgstr ""
 
-#: plugins/check_procs.c:756
+#: plugins/check_procs.c:750
 msgid "Alert if VSZ of any processes over 50K or 100K"
 msgstr ""
 
-#: plugins/check_procs.c:758
+#: plugins/check_procs.c:752
 #, c-format
 msgid "Alert if CPU of any processes over 10%% or 20%%"
 msgstr ""
 
-#: plugins/check_procs.c:766
+#: plugins/check_procs.c:760
 #, c-format
 msgid "Usage: "
 msgstr "Utilisation: "
@@ -4159,7 +4151,7 @@ msgstr ""
 msgid "CRITICAL - Cannot retrieve server certificate."
 msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur"
 
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:542
+#: plugins/check_smtp.c:311 plugins/check_snmp.c:597
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr "Impossible de compiler l'expression rationnelle"
@@ -4169,7 +4161,7 @@ msgstr "Impossible de compiler l'expression rationnelle"
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr "SMTP %s - réponse invalide de '%s' à la commande '%s'\n"
 
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:320
+#: plugins/check_smtp.c:324 plugins/check_snmp.c:374
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr "Erreur d'exécution: %s\n"
@@ -4310,218 +4302,218 @@ msgstr ""
 msgid "STATE_WARNING return values."
 msgstr ""
 
-#: plugins/check_snmp.c:236
+#: plugins/check_snmp.c:257
 #, c-format
 msgid "External command error: %s\n"
 msgstr "Erreur d'exécution de commande externe: %s\n"
 
-#: plugins/check_snmp.c:241
+#: plugins/check_snmp.c:262
 #, c-format
 msgid "External command error with no output (return code: %d)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:298
+#: plugins/check_snmp.c:352
 msgid "No valid data returned"
 msgstr "Pas de données valides reçues"
 
-#: plugins/check_snmp.c:500
+#: plugins/check_snmp.c:555
 msgid "Retries interval must be a positive integer"
 msgstr "L'intervalle pour les essais doit ĂȘtre un entier positif"
 
-#: plugins/check_snmp.c:563
+#: plugins/check_snmp.c:618
 #, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr "Impossible de réallouer des labels[%d]"
 
-#: plugins/check_snmp.c:575
+#: plugins/check_snmp.c:630
 msgid "Could not reallocate labels\n"
 msgstr "Impossible de réallouer des labels\n"
 
-#: plugins/check_snmp.c:592
+#: plugins/check_snmp.c:647
 #, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr "Impossible de réallouer des unités [%d]\n"
 
-#: plugins/check_snmp.c:604
+#: plugins/check_snmp.c:659
 msgid "Could not realloc() units\n"
 msgstr "Impossible de réallouer des unités\n"
 
-#: plugins/check_snmp.c:662
+#: plugins/check_snmp.c:717
 msgid "No host specified\n"
 msgstr "Pas d'hÎte spécifié\n"
 
-#: plugins/check_snmp.c:666
+#: plugins/check_snmp.c:721
 msgid "No OIDs specified\n"
 msgstr "Pas de compteur spécifié\n"
 
-#: plugins/check_snmp.c:688
+#: plugins/check_snmp.c:743
 msgid "Invalid seclevel"
 msgstr ""
 
-#: plugins/check_snmp.c:695 plugins/check_snmp.c:698 plugins/check_snmp.c:716
+#: plugins/check_snmp.c:750 plugins/check_snmp.c:753 plugins/check_snmp.c:771
 #, c-format
 msgid "Required parameter: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:737
+#: plugins/check_snmp.c:792
 msgid "Invalid SNMP version"
 msgstr "Version de SNMP invalide"
 
-#: plugins/check_snmp.c:754
+#: plugins/check_snmp.c:809
 msgid "Unbalanced quotes\n"
 msgstr "Guillemets manquants\n"
 
-#: plugins/check_snmp.c:803
+#: plugins/check_snmp.c:858
 msgid "Check status of remote machines and obtain system information via SNMP"
 msgstr ""
 "VĂ©rifie l'Ă©tat des machines distantes et obtient l'information systĂšme via "
 "SNMP"
 
-#: plugins/check_snmp.c:816
+#: plugins/check_snmp.c:871
 msgid "Use SNMP GETNEXT instead of SNMP GET"
 msgstr "Utiliser SNMP GETNEXT au lieu de SNMP GET"
 
-#: plugins/check_snmp.c:818
+#: plugins/check_snmp.c:873
 msgid "SNMP protocol version"
 msgstr "Version du protocole SNMP"
 
-#: plugins/check_snmp.c:820
+#: plugins/check_snmp.c:875
 msgid "SNMPv3 securityLevel"
 msgstr "Niveau de sécurité SNMPv3 (securityLevel)"
 
-#: plugins/check_snmp.c:822
+#: plugins/check_snmp.c:877
 msgid "SNMPv3 auth proto"
 msgstr "Protocole d'authentification SNMPv3"
 
-#: plugins/check_snmp.c:824
+#: plugins/check_snmp.c:879
 msgid "SNMPv3 priv proto (default DES)"
 msgstr ""
 
-#: plugins/check_snmp.c:828
+#: plugins/check_snmp.c:883
 msgid "Optional community string for SNMP communication"
 msgstr "Communauté optionnelle pour la communication SNMP"
 
-#: plugins/check_snmp.c:829
+#: plugins/check_snmp.c:884
 msgid "default is"
 msgstr "défaut:"
 
-#: plugins/check_snmp.c:831
+#: plugins/check_snmp.c:886
 msgid "SNMPv3 username"
 msgstr "Nom d'utilisateur SNMPv3"
 
-#: plugins/check_snmp.c:833
+#: plugins/check_snmp.c:888
 msgid "SNMPv3 authentication password"
 msgstr "Mot de passe d'authentification SNMPv3"
 
-#: plugins/check_snmp.c:835
+#: plugins/check_snmp.c:890
 msgid "SNMPv3 privacy password"
 msgstr "Mot de passe de confidentialité SNMPv3"
 
-#: plugins/check_snmp.c:839
+#: plugins/check_snmp.c:894
 msgid "Object identifier(s) or SNMP variables whose value you wish to query"
 msgstr ""
 
-#: plugins/check_snmp.c:841
+#: plugins/check_snmp.c:896
 msgid ""
 "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
 msgstr ""
 
-#: plugins/check_snmp.c:842
+#: plugins/check_snmp.c:897
 msgid "for symbolic OIDs.)"
 msgstr ""
 
-#: plugins/check_snmp.c:844
+#: plugins/check_snmp.c:899
 msgid "Delimiter to use when parsing returned data. Default is"
 msgstr ""
 
-#: plugins/check_snmp.c:845
+#: plugins/check_snmp.c:900
 msgid "Any data on the right hand side of the delimiter is considered"
 msgstr ""
 
-#: plugins/check_snmp.c:846
+#: plugins/check_snmp.c:901
 msgid "to be the data that should be used in the evaluation."
 msgstr ""
 
-#: plugins/check_snmp.c:850
+#: plugins/check_snmp.c:905
 msgid "Warning threshold range(s)"
 msgstr "Valeurs pour le seuil d'avertissement"
 
-#: plugins/check_snmp.c:852
+#: plugins/check_snmp.c:907
 msgid "Critical threshold range(s)"
 msgstr "Valeurs pour le seuil critique"
 
-#: plugins/check_snmp.c:856
+#: plugins/check_snmp.c:911
 msgid "Return OK state (for that OID) if STRING is an exact match"
 msgstr ""
 
-#: plugins/check_snmp.c:858
+#: plugins/check_snmp.c:913
 msgid ""
 "Return OK state (for that OID) if extended regular expression REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:860
+#: plugins/check_snmp.c:915
 msgid ""
 "Return OK state (for that OID) if case-insensitive extended REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:862
+#: plugins/check_snmp.c:917
 msgid "Prefix label for output from plugin (default -s 'SNMP')"
 msgstr ""
 
-#: plugins/check_snmp.c:866
+#: plugins/check_snmp.c:921
 msgid "Units label(s) for output data (e.g., 'sec.')."
 msgstr ""
 
-#: plugins/check_snmp.c:868
+#: plugins/check_snmp.c:923
 msgid "Separates output on multiple OID requests"
 msgstr ""
 
-#: plugins/check_snmp.c:872
+#: plugins/check_snmp.c:927
 msgid "Number of retries to be used in the requests"
 msgstr "Le nombre d'essai pour les requĂȘtes"
 
-#: plugins/check_snmp.c:877
+#: plugins/check_snmp.c:932
 msgid ""
 "This plugin uses the 'snmpget' command included with the NET-SNMP package."
 msgstr ""
 
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:933
 msgid ""
 "if you don't have the package installed, you will need to download it from"
 msgstr ""
 "Si vous n'avez pas le programme installé, vous devrez le télécharger depuis"
 
-#: plugins/check_snmp.c:879
+#: plugins/check_snmp.c:934
 msgid "http://net-snmp.sourceforge.net before you can use this plugin."
 msgstr "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin."
 
-#: plugins/check_snmp.c:883
+#: plugins/check_snmp.c:938
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
 "with"
 msgstr ""
 "- Des OIDs multiples peuvent ĂȘtre indiquĂ©es par une virgule ou par des listes"
 
-#: plugins/check_snmp.c:884
+#: plugins/check_snmp.c:939
 msgid "internal spaces must be quoted) [max 8 OIDs]"
 msgstr ""
 
-#: plugins/check_snmp.c:888
+#: plugins/check_snmp.c:943
 msgid ""
 "- When checking multiple OIDs, separate ranges by commas like '-w "
 "1:10,1:,:20'"
 msgstr ""
 
-#: plugins/check_snmp.c:889
+#: plugins/check_snmp.c:944
 msgid "- Note that only one string and one regex may be checked at present"
 msgstr ""
 
-#: plugins/check_snmp.c:890
+#: plugins/check_snmp.c:945
 msgid ""
 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
 msgstr ""
 
-#: plugins/check_snmp.c:891
+#: plugins/check_snmp.c:946
 msgid "returned from the SNMP query is an unsigned integer."
 msgstr ""
 
@@ -5507,20 +5499,14 @@ msgstr ""
 #: plugins/utils.h:184
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read additionnal options from ini file\n"
+"    Read options from an ini file. See http://nagiosplugins.org/extra-opts "
+"for usage\n"
 msgstr ""
 " --extra-opts=[section][@file]\n"
-"    Lire les options additionnelles Ă  partir d'un fichier ini\n"
+"    Lire les options d'un fichier ini. Voir http://nagiosplugins.org/extra-"
+"opts pour l'utilisation\n"
 
-#: plugins/utils.h:187
-msgid ""
-" See: http://nagiosplugins.org/extra-opts for --extra-opts usage and "
-"examples.\n"
-msgstr ""
-" Voir: http://nagiosplugins.org/extra-opts pour le format et examples de --"
-"extra-opts.\n"
-
-#: plugins/utils.h:194
+#: plugins/utils.h:191
 msgid ""
 " See:\n"
 " http://nagiosplug.sourceforge.net/developer-guidelines."
@@ -5532,7 +5518,7 @@ msgstr ""
 "html#THRESHOLDFORMAT\n"
 " pour le format et examples des seuils (THRESHOLD).\n"
 
-#: plugins/utils.h:199
+#: plugins/utils.h:196
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -5548,7 +5534,7 @@ msgstr ""
 "améliorations, envoyez un email à nagiosplug-devel@lists.sourceforge.net\n"
 "\n"
 
-#: plugins/utils.h:204
+#: plugins/utils.h:201
 msgid ""
 "\n"
 "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
@@ -5987,3 +5973,10 @@ msgstr ""
 #: plugins-root/check_icmp.c:1334
 msgid "The -v switch can be specified several times for increased verbosity."
 msgstr ""
+
+#~ msgid ""
+#~ " See: http://nagiosplugins.org/extra-opts for --extra-opts usage and "
+#~ "examples.\n"
+#~ msgstr ""
+#~ " Voir: http://nagiosplugins.org/extra-opts pour le format et examples de "
+#~ "--extra-opts.\n"
diff --git a/po/nagios-plugins.pot b/po/nagios-plugins.pot
index 5b02caca..4d2ceca1 100644
--- a/po/nagios-plugins.pot
+++ b/po/nagios-plugins.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-04-14 06:17-0400\n"
+"POT-Creation-Date: 2010-04-21 23:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102
 #: plugins/check_pgsql.c:154 plugins/check_ping.c:95 plugins/check_procs.c:147
 #: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:140
-#: plugins/check_snmp.c:159 plugins/check_ssh.c:73 plugins/check_swap.c:110
+#: plugins/check_snmp.c:180 plugins/check_ssh.c:73 plugins/check_swap.c:110
 #: plugins/check_tcp.c:209 plugins/check_time.c:78 plugins/check_ups.c:122
 #: plugins/check_users.c:68 plugins/negate.c:211 plugins-root/check_dhcp.c:270
 msgid "Could not parse arguments"
@@ -62,7 +62,7 @@ msgstr ""
 #: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
 #: plugins/check_http.c:255 plugins/check_ldap.c:293 plugins/check_pgsql.c:250
 #: plugins/check_procs.c:364 plugins/check_radius.c:308
-#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:485
+#: plugins/check_real.c:356 plugins/check_smtp.c:587 plugins/check_snmp.c:540
 #: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
 #: plugins/check_ups.c:556 plugins/negate.c:161
 msgid "Timeout interval must be a positive integer"
@@ -210,48 +210,29 @@ msgid ""
 "all of -O, -s, and -n options (servicelist order must match '-C'options)"
 msgstr ""
 
-#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:265
-#: plugins/check_dig.c:342 plugins/check_disk.c:969 plugins/check_http.c:1412
-#: plugins/check_nagios.c:308 plugins/check_ntp.c:868
-#: plugins/check_ntp_peer.c:702 plugins/check_ntp_time.c:632
-#: plugins/check_procs.c:748 plugins/negate.c:268 plugins/urlize.c:180
+#: plugins/check_by_ssh.c:438 plugins/check_cluster.c:261
+#: plugins/check_dig.c:342 plugins/check_disk.c:963 plugins/check_http.c:1410
+#: plugins/check_nagios.c:302 plugins/check_ntp.c:864
+#: plugins/check_ntp_peer.c:698 plugins/check_ntp_time.c:628
+#: plugins/check_procs.c:742 plugins/negate.c:268 plugins/urlize.c:180
 msgid "Examples:"
 msgstr ""
 
-#: plugins/check_by_ssh.c:447 plugins/check_cluster.c:257
-#: plugins/check_dig.c:348 plugins/check_disk.c:964 plugins/check_dns.c:481
-#: plugins/check_fping.c:427 plugins/check_game.c:318 plugins/check_hpjd.c:408
-#: plugins/check_http.c:1396 plugins/check_ldap.c:434 plugins/check_load.c:321
-#: plugins/check_mrtg.c:363 plugins/check_mrtgtraf.c:361
-#: plugins/check_mysql.c:415 plugins/check_nagios.c:303 plugins/check_nt.c:743
-#: plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
-#: plugins/check_ntp_time.c:621 plugins/check_nwstat.c:1670
-#: plugins/check_overcr.c:456 plugins/check_pgsql.c:471
-#: plugins/check_ping.c:597 plugins/check_procs.c:743
-#: plugins/check_radius.c:379 plugins/check_real.c:445
-#: plugins/check_smtp.c:813 plugins/check_snmp.c:882 plugins/check_ssh.c:296
-#: plugins/check_swap.c:547 plugins/check_tcp.c:646 plugins/check_time.c:365
-#: plugins/check_ups.c:642 plugins/check_users.c:224
-#: plugins/check_ide_smart.c:511 plugins/negate.c:274
-#: plugins-root/check_dhcp.c:1415 plugins-root/check_icmp.c:1322
-msgid "Notes:"
-msgstr ""
-
-#: plugins/check_by_ssh.c:459 plugins/check_cluster.c:277
-#: plugins/check_dig.c:360 plugins/check_disk.c:986 plugins/check_dns.c:492
-#: plugins/check_dummy.c:122 plugins/check_fping.c:438
-#: plugins/check_game.c:335 plugins/check_hpjd.c:420 plugins/check_http.c:1435
-#: plugins/check_ldap.c:456 plugins/check_load.c:331 plugins/check_mrtg.c:385
-#: plugins/check_mysql.c:429 plugins/check_nagios.c:319 plugins/check_nt.c:762
-#: plugins/check_ntp.c:887 plugins/check_ntp_peer.c:722
-#: plugins/check_ntp_time.c:641 plugins/check_nwstat.c:1688
-#: plugins/check_overcr.c:471 plugins/check_pgsql.c:483
-#: plugins/check_ping.c:607 plugins/check_radius.c:391
-#: plugins/check_real.c:457 plugins/check_smtp.c:825 plugins/check_snmp.c:904
-#: plugins/check_ssh.c:308 plugins/check_swap.c:563 plugins/check_tcp.c:657
-#: plugins/check_time.c:377 plugins/check_ups.c:664 plugins/check_users.c:235
-#: plugins/check_ide_smart.c:533 plugins/negate.c:292 plugins/urlize.c:197
-#: plugins-root/check_dhcp.c:1427 plugins-root/check_icmp.c:1351
+#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:273
+#: plugins/check_dig.c:354 plugins/check_disk.c:980 plugins/check_dns.c:486
+#: plugins/check_dummy.c:122 plugins/check_fping.c:432
+#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1433
+#: plugins/check_ldap.c:452 plugins/check_load.c:325 plugins/check_mrtg.c:382
+#: plugins/check_mysql.c:425 plugins/check_nagios.c:313 plugins/check_nt.c:759
+#: plugins/check_ntp.c:883 plugins/check_ntp_peer.c:718
+#: plugins/check_ntp_time.c:637 plugins/check_nwstat.c:1685
+#: plugins/check_overcr.c:467 plugins/check_pgsql.c:477
+#: plugins/check_ping.c:601 plugins/check_radius.c:385
+#: plugins/check_real.c:451 plugins/check_smtp.c:819 plugins/check_snmp.c:956
+#: plugins/check_ssh.c:302 plugins/check_swap.c:558 plugins/check_tcp.c:651
+#: plugins/check_time.c:371 plugins/check_ups.c:660 plugins/check_users.c:229
+#: plugins/check_ide_smart.c:527 plugins/negate.c:292 plugins/urlize.c:197
+#: plugins-root/check_dhcp.c:1421 plugins-root/check_icmp.c:1347
 #, c-format
 msgid "Usage:"
 msgstr ""
@@ -297,7 +278,18 @@ msgstr ""
 msgid "commas"
 msgstr ""
 
-#: plugins/check_cluster.c:267
+#: plugins/check_cluster.c:257 plugins/check_game.c:318
+#: plugins/check_http.c:1396 plugins/check_ldap.c:434 plugins/check_mrtg.c:363
+#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:414
+#: plugins/check_nt.c:743 plugins/check_ntp.c:860 plugins/check_ntp_peer.c:689
+#: plugins/check_ntp_time.c:621 plugins/check_nwstat.c:1670
+#: plugins/check_overcr.c:456 plugins/check_snmp.c:937
+#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
+#: plugins-root/check_icmp.c:1322
+msgid "Notes:"
+msgstr ""
+
+#: plugins/check_cluster.c:263
 msgid ""
 "Will alert critical if there are 3 or more service data points in a non-OK "
 "state"
@@ -375,7 +367,7 @@ msgstr ""
 msgid "DISK %s: %s not found\n"
 msgstr ""
 
-#: plugins/check_disk.c:214 plugins/check_disk.c:1001 plugins/check_dns.c:241
+#: plugins/check_disk.c:214 plugins/check_disk.c:995 plugins/check_dns.c:241
 #: plugins/check_dummy.c:74 plugins/check_mysql.c:212
 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168
 #: plugins/check_nagios.c:172 plugins/check_procs.c:290
@@ -557,34 +549,34 @@ msgstr ""
 msgid "Ignore all filesystems of indicated type (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:971
+#: plugins/check_disk.c:965
 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"
 msgstr ""
 
-#: plugins/check_disk.c:973
+#: plugins/check_disk.c:967
 msgid ""
 "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
 "r regex"
 msgstr ""
 
-#: plugins/check_disk.c:974
+#: plugins/check_disk.c:968
 msgid ""
 "are grouped which means the freespace thresholds are applied to all disks "
 "together"
 msgstr ""
 
-#: plugins/check_disk.c:976
+#: plugins/check_disk.c:970
 msgid ""
 "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
 "100M/50M"
 msgstr ""
 
-#: plugins/check_disk.c:1002
+#: plugins/check_disk.c:996
 #, c-format
 msgid "%s %s: %s\n"
 msgstr ""
 
-#: plugins/check_disk.c:1002
+#: plugins/check_disk.c:996
 msgid "is not accessible"
 msgstr ""
 
@@ -1442,55 +1434,55 @@ msgstr ""
 msgid "(fully qualified domain name) as the [host_name] argument."
 msgstr ""
 
-#: plugins/check_http.c:1408
+#: plugins/check_http.c:1406
 msgid "This plugin can also check whether an SSL enabled web server is able to"
 msgstr ""
 
-#: plugins/check_http.c:1409
+#: plugins/check_http.c:1407
 msgid "serve content (optionally within a specified time) or whether the X509 "
 msgstr ""
 
-#: plugins/check_http.c:1410
+#: plugins/check_http.c:1408
 msgid "certificate is still valid for the specified number of days."
 msgstr ""
 
-#: plugins/check_http.c:1414
+#: plugins/check_http.c:1412
 msgid ""
 "When the 'www.verisign.com' server returns its content within 5 seconds,"
 msgstr ""
 
-#: plugins/check_http.c:1415
+#: plugins/check_http.c:1413
 msgid ""
 "a STATE_OK will be returned. When the server returns its content but exceeds"
 msgstr ""
 
-#: plugins/check_http.c:1416
+#: plugins/check_http.c:1414
 msgid ""
 "the 5-second threshold, a STATE_WARNING will be returned. When an error "
 "occurs,"
 msgstr ""
 
-#: plugins/check_http.c:1417
+#: plugins/check_http.c:1415
 msgid "a STATE_CRITICAL will be returned."
 msgstr ""
 
-#: plugins/check_http.c:1420
+#: plugins/check_http.c:1418
 msgid ""
 "When the certificate of 'www.verisign.com' is valid for more than 14 days,"
 msgstr ""
 
-#: plugins/check_http.c:1421
+#: plugins/check_http.c:1419
 msgid ""
 "a STATE_OK is returned. When the certificate is still valid, but for less "
 "than"
 msgstr ""
 
-#: plugins/check_http.c:1422
+#: plugins/check_http.c:1420
 msgid ""
 "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
 msgstr ""
 
-#: plugins/check_http.c:1423
+#: plugins/check_http.c:1421
 msgid "the certificate is expired."
 msgstr ""
 
@@ -1936,7 +1928,7 @@ msgstr ""
 msgid "  for future enhancements of this plugin."
 msgstr ""
 
-#: plugins/check_mrtgtraf.c:381
+#: plugins/check_mrtgtraf.c:378
 #, c-format
 msgid "Usage"
 msgstr ""
@@ -2023,11 +2015,11 @@ msgstr ""
 msgid "IP address or FQDN ('localhost' will use the socket as well)."
 msgstr ""
 
-#: plugins/check_mysql.c:418
+#: plugins/check_mysql.c:415
 msgid "You must specify -p with an empty string to force an empty password,"
 msgstr ""
 
-#: plugins/check_mysql.c:419
+#: plugins/check_mysql.c:416
 msgid "overriding any my.cnf settings."
 msgstr ""
 
@@ -2512,24 +2504,24 @@ msgstr ""
 msgid "Critical threshold for jitter"
 msgstr ""
 
-#: plugins/check_ntp.c:869
+#: plugins/check_ntp.c:865
 msgid "Normal offset check:"
 msgstr ""
 
-#: plugins/check_ntp.c:872 plugins/check_ntp_peer.c:706
+#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:702
 msgid ""
 "Check jitter too, avoiding critical notifications if jitter isn't available"
 msgstr ""
 
-#: plugins/check_ntp.c:873 plugins/check_ntp_peer.c:707
+#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:703
 msgid "(See Notes above for more details on thresholds formats):"
 msgstr ""
 
-#: plugins/check_ntp.c:878 plugins/check_ntp.c:885
+#: plugins/check_ntp.c:874 plugins/check_ntp.c:881
 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or"
 msgstr ""
 
-#: plugins/check_ntp.c:879 plugins/check_ntp.c:886
+#: plugins/check_ntp.c:875 plugins/check_ntp.c:882
 msgid "check_ntp_time instead."
 msgstr ""
 
@@ -2586,15 +2578,15 @@ msgstr ""
 msgid "server; please use check_ntp_time for that purpose."
 msgstr ""
 
-#: plugins/check_ntp_peer.c:703
+#: plugins/check_ntp_peer.c:699
 msgid "Simple NTP server check:"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:710
+#: plugins/check_ntp_peer.c:706
 msgid "Only check the number of usable time sources (\"truechimers\"):"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:713
+#: plugins/check_ntp_peer.c:709
 msgid "Check only stratum:"
 msgstr ""
 
@@ -3703,32 +3695,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:750
+#: plugins/check_procs.c:744
 msgid "Warning if not two processes with command name portsentry."
 msgstr ""
 
-#: plugins/check_procs.c:751
+#: plugins/check_procs.c:745
 msgid "Critical if < 2 or > 1024 processes"
 msgstr ""
 
-#: plugins/check_procs.c:753
+#: plugins/check_procs.c:747
 msgid "Warning alert if > 10 processes with command arguments containing"
 msgstr ""
 
-#: plugins/check_procs.c:754
+#: plugins/check_procs.c:748
 msgid "'/usr/local/bin/perl' and owned by root"
 msgstr ""
 
-#: plugins/check_procs.c:756
+#: plugins/check_procs.c:750
 msgid "Alert if VSZ of any processes over 50K or 100K"
 msgstr ""
 
-#: plugins/check_procs.c:758
+#: plugins/check_procs.c:752
 #, c-format
 msgid "Alert if CPU of any processes over 10%% or 20%%"
 msgstr ""
 
-#: plugins/check_procs.c:766
+#: plugins/check_procs.c:760
 #, c-format
 msgid "Usage: "
 msgstr ""
@@ -4001,7 +3993,7 @@ msgstr ""
 msgid "CRITICAL - Cannot retrieve server certificate."
 msgstr ""
 
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:542
+#: plugins/check_smtp.c:311 plugins/check_snmp.c:597
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr ""
@@ -4011,7 +4003,7 @@ msgstr ""
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr ""
 
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:320
+#: plugins/check_smtp.c:324 plugins/check_snmp.c:374
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr ""
@@ -4150,214 +4142,214 @@ msgstr ""
 msgid "STATE_WARNING return values."
 msgstr ""
 
-#: plugins/check_snmp.c:236
+#: plugins/check_snmp.c:257
 #, c-format
 msgid "External command error: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:241
+#: plugins/check_snmp.c:262
 #, c-format
 msgid "External command error with no output (return code: %d)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:298
+#: plugins/check_snmp.c:352
 msgid "No valid data returned"
 msgstr ""
 
-#: plugins/check_snmp.c:500
+#: plugins/check_snmp.c:555
 msgid "Retries interval must be a positive integer"
 msgstr ""
 
-#: plugins/check_snmp.c:563
+#: plugins/check_snmp.c:618
 #, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr ""
 
-#: plugins/check_snmp.c:575
+#: plugins/check_snmp.c:630
 msgid "Could not reallocate labels\n"
 msgstr ""
 
-#: plugins/check_snmp.c:592
+#: plugins/check_snmp.c:647
 #, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr ""
 
-#: plugins/check_snmp.c:604
+#: plugins/check_snmp.c:659
 msgid "Could not realloc() units\n"
 msgstr ""
 
-#: plugins/check_snmp.c:662
+#: plugins/check_snmp.c:717
 msgid "No host specified\n"
 msgstr ""
 
-#: plugins/check_snmp.c:666
+#: plugins/check_snmp.c:721
 msgid "No OIDs specified\n"
 msgstr ""
 
-#: plugins/check_snmp.c:688
+#: plugins/check_snmp.c:743
 msgid "Invalid seclevel"
 msgstr ""
 
-#: plugins/check_snmp.c:695 plugins/check_snmp.c:698 plugins/check_snmp.c:716
+#: plugins/check_snmp.c:750 plugins/check_snmp.c:753 plugins/check_snmp.c:771
 #, c-format
 msgid "Required parameter: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:737
+#: plugins/check_snmp.c:792
 msgid "Invalid SNMP version"
 msgstr ""
 
-#: plugins/check_snmp.c:754
+#: plugins/check_snmp.c:809
 msgid "Unbalanced quotes\n"
 msgstr ""
 
-#: plugins/check_snmp.c:803
+#: plugins/check_snmp.c:858
 msgid "Check status of remote machines and obtain system information via SNMP"
 msgstr ""
 
-#: plugins/check_snmp.c:816
+#: plugins/check_snmp.c:871
 msgid "Use SNMP GETNEXT instead of SNMP GET"
 msgstr ""
 
-#: plugins/check_snmp.c:818
+#: plugins/check_snmp.c:873
 msgid "SNMP protocol version"
 msgstr ""
 
-#: plugins/check_snmp.c:820
+#: plugins/check_snmp.c:875
 msgid "SNMPv3 securityLevel"
 msgstr ""
 
-#: plugins/check_snmp.c:822
+#: plugins/check_snmp.c:877
 msgid "SNMPv3 auth proto"
 msgstr ""
 
-#: plugins/check_snmp.c:824
+#: plugins/check_snmp.c:879
 msgid "SNMPv3 priv proto (default DES)"
 msgstr ""
 
-#: plugins/check_snmp.c:828
+#: plugins/check_snmp.c:883
 msgid "Optional community string for SNMP communication"
 msgstr ""
 
-#: plugins/check_snmp.c:829
+#: plugins/check_snmp.c:884
 msgid "default is"
 msgstr ""
 
-#: plugins/check_snmp.c:831
+#: plugins/check_snmp.c:886
 msgid "SNMPv3 username"
 msgstr ""
 
-#: plugins/check_snmp.c:833
+#: plugins/check_snmp.c:888
 msgid "SNMPv3 authentication password"
 msgstr ""
 
-#: plugins/check_snmp.c:835
+#: plugins/check_snmp.c:890
 msgid "SNMPv3 privacy password"
 msgstr ""
 
-#: plugins/check_snmp.c:839
+#: plugins/check_snmp.c:894
 msgid "Object identifier(s) or SNMP variables whose value you wish to query"
 msgstr ""
 
-#: plugins/check_snmp.c:841
+#: plugins/check_snmp.c:896
 msgid ""
 "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
 msgstr ""
 
-#: plugins/check_snmp.c:842
+#: plugins/check_snmp.c:897
 msgid "for symbolic OIDs.)"
 msgstr ""
 
-#: plugins/check_snmp.c:844
+#: plugins/check_snmp.c:899
 msgid "Delimiter to use when parsing returned data. Default is"
 msgstr ""
 
-#: plugins/check_snmp.c:845
+#: plugins/check_snmp.c:900
 msgid "Any data on the right hand side of the delimiter is considered"
 msgstr ""
 
-#: plugins/check_snmp.c:846
+#: plugins/check_snmp.c:901
 msgid "to be the data that should be used in the evaluation."
 msgstr ""
 
-#: plugins/check_snmp.c:850
+#: plugins/check_snmp.c:905
 msgid "Warning threshold range(s)"
 msgstr ""
 
-#: plugins/check_snmp.c:852
+#: plugins/check_snmp.c:907
 msgid "Critical threshold range(s)"
 msgstr ""
 
-#: plugins/check_snmp.c:856
+#: plugins/check_snmp.c:911
 msgid "Return OK state (for that OID) if STRING is an exact match"
 msgstr ""
 
-#: plugins/check_snmp.c:858
+#: plugins/check_snmp.c:913
 msgid ""
 "Return OK state (for that OID) if extended regular expression REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:860
+#: plugins/check_snmp.c:915
 msgid ""
 "Return OK state (for that OID) if case-insensitive extended REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:862
+#: plugins/check_snmp.c:917
 msgid "Prefix label for output from plugin (default -s 'SNMP')"
 msgstr ""
 
-#: plugins/check_snmp.c:866
+#: plugins/check_snmp.c:921
 msgid "Units label(s) for output data (e.g., 'sec.')."
 msgstr ""
 
-#: plugins/check_snmp.c:868
+#: plugins/check_snmp.c:923
 msgid "Separates output on multiple OID requests"
 msgstr ""
 
-#: plugins/check_snmp.c:872
+#: plugins/check_snmp.c:927
 msgid "Number of retries to be used in the requests"
 msgstr ""
 
-#: plugins/check_snmp.c:877
+#: plugins/check_snmp.c:932
 msgid ""
 "This plugin uses the 'snmpget' command included with the NET-SNMP package."
 msgstr ""
 
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:933
 msgid ""
 "if you don't have the package installed, you will need to download it from"
 msgstr ""
 
-#: plugins/check_snmp.c:879
+#: plugins/check_snmp.c:934
 msgid "http://net-snmp.sourceforge.net before you can use this plugin."
 msgstr ""
 
-#: plugins/check_snmp.c:883
+#: plugins/check_snmp.c:938
 msgid ""
 "- Multiple OIDs may be indicated by a comma- or space-delimited list (lists "
 "with"
 msgstr ""
 
-#: plugins/check_snmp.c:884
+#: plugins/check_snmp.c:939
 msgid "internal spaces must be quoted) [max 8 OIDs]"
 msgstr ""
 
-#: plugins/check_snmp.c:888
+#: plugins/check_snmp.c:943
 msgid ""
 "- When checking multiple OIDs, separate ranges by commas like '-w "
 "1:10,1:,:20'"
 msgstr ""
 
-#: plugins/check_snmp.c:889
+#: plugins/check_snmp.c:944
 msgid "- Note that only one string and one regex may be checked at present"
 msgstr ""
 
-#: plugins/check_snmp.c:890
+#: plugins/check_snmp.c:945
 msgid ""
 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
 msgstr ""
 
-#: plugins/check_snmp.c:891
+#: plugins/check_snmp.c:946
 msgid "returned from the SNMP query is an unsigned integer."
 msgstr ""
 
@@ -5244,16 +5236,11 @@ msgstr ""
 #: plugins/utils.h:184
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read additionnal options from ini file\n"
-msgstr ""
-
-#: plugins/utils.h:187
-msgid ""
-" See: http://nagiosplugins.org/extra-opts for --extra-opts usage and "
-"examples.\n"
+"    Read options from an ini file. See http://nagiosplugins.org/extra-opts "
+"for usage\n"
 msgstr ""
 
-#: plugins/utils.h:194
+#: plugins/utils.h:191
 msgid ""
 " See:\n"
 " http://nagiosplug.sourceforge.net/developer-guidelines."
@@ -5261,7 +5248,7 @@ msgid ""
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:199
+#: plugins/utils.h:196
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -5270,7 +5257,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/utils.h:204
+#: plugins/utils.h:201
 msgid ""
 "\n"
 "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"