Update extra-opts help text based on ML agreement

4 files changed, 58 insertions, 71 deletions

diff --git a/plugins/utils.h b/plugins/utils.h
index 812f588b..3c3f1892 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -183,7 +183,8 @@ char *fperfdata (const char *,
 #ifdef NP_EXTRA_OPTS
 #define UT_EXTRA_OPTS _("\
  --extra-opts=[section][@file]\n\
-    Read options from an ini file. See http://nagiosplugins.org/extra-opts for usage\n")
+    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n\
+    for usage and examples.\n")
 #else
 #define UT_EXTRA_OPTS ""
 #endif
diff --git a/po/de.po b/po/de.po
index 310d0ae3..a3c73727 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-21 23:38-0400\n"
+"POT-Creation-Date: 2010-04-28 05:59-0400\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: English <en@li.org>\n"
@@ -227,7 +227,7 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:273
+#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:274
 #: 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
@@ -236,13 +236,13 @@ msgstr ""
 #: 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_ping.c:601 plugins/check_procs.c:760
+#: 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 ""
 
@@ -300,8 +300,11 @@ msgstr ""
 
 #: plugins/check_cluster.c:263
 msgid ""
-"Will alert critical if there are 3 or more service data points in a non-OK "
-"state"
+"Will alert critical if there are 3 or more service data points in a non-OK"
+msgstr ""
+
+#: plugins/check_cluster.c:264 plugins/check_ups.c:639
+msgid "state."
 msgstr ""
 
 #: plugins/check_dig.c:99 plugins/check_dig.c:101
@@ -3811,11 +3814,6 @@ msgstr ""
 msgid "Alert if CPU of any processes over 10%% or 20%%"
 msgstr ""
 
-#: plugins/check_procs.c:760
-#, c-format
-msgid "Usage: "
-msgstr ""
-
 #: plugins/check_radius.c:165
 msgid "Config file error"
 msgstr ""
@@ -4883,10 +4881,6 @@ msgid ""
 "CRITICAL"
 msgstr ""
 
-#: plugins/check_ups.c:639
-msgid "state."
-msgstr ""
-
 #: plugins/check_ups.c:643
 msgid ""
 "You may also specify a variable to check (such as temperature, utility "
@@ -5375,11 +5369,11 @@ msgstr ""
 #: plugins/utils.h:184
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read options from an ini file. See http://nagiosplugins.org/extra-opts "
-"for usage\n"
+"    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
+"    for usage and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:191
+#: plugins/utils.h:192
 msgid ""
 " See:\n"
 " http://nagiosplug.sourceforge.net/developer-guidelines."
@@ -5387,7 +5381,7 @@ msgid ""
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:196
+#: plugins/utils.h:197
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -5396,7 +5390,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/utils.h:201
+#: plugins/utils.h:202
 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 a9a2b393..3a4a8565 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-04-21 23:38-0400\n"
+"POT-Creation-Date: 2010-04-28 05:59-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-"
@@ -229,7 +229,7 @@ msgstr ""
 msgid "Examples:"
 msgstr "Exemples:"
 
-#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:273
+#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:274
 #: 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
@@ -238,13 +238,13 @@ msgstr "Exemples:"
 #: 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_ping.c:601 plugins/check_procs.c:760
+#: 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:"
 
@@ -302,8 +302,11 @@ 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"
+"Will alert critical if there are 3 or more service data points in a non-OK"
+msgstr ""
+
+#: plugins/check_cluster.c:264 plugins/check_ups.c:639
+msgid "state."
 msgstr ""
 
 #: plugins/check_dig.c:99 plugins/check_dig.c:101
@@ -3875,11 +3878,6 @@ msgstr ""
 msgid "Alert if CPU of any processes over 10%% or 20%%"
 msgstr ""
 
-#: plugins/check_procs.c:760
-#, c-format
-msgid "Usage: "
-msgstr "Utilisation: "
-
 #: plugins/check_radius.c:165
 msgid "Config file error"
 msgstr "Erreur dans le fichier de configuration"
@@ -4953,10 +4951,6 @@ msgid ""
 "CRITICAL"
 msgstr ""
 
-#: plugins/check_ups.c:639
-msgid "state."
-msgstr ""
-
 #: plugins/check_ups.c:643
 msgid ""
 "You may also specify a variable to check (such as temperature, utility "
@@ -5499,14 +5493,15 @@ msgstr ""
 #: plugins/utils.h:184
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read options from an ini file. See http://nagiosplugins.org/extra-opts "
-"for usage\n"
+"    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
+"    for usage and examples.\n"
 msgstr ""
 " --extra-opts=[section][@file]\n"
 "    Lire les options d'un fichier ini. Voir http://nagiosplugins.org/extra-"
-"opts pour l'utilisation\n"
+"opts\n"
+"    pour les instructions et examples.\n"
 
-#: plugins/utils.h:191
+#: plugins/utils.h:192
 msgid ""
 " See:\n"
 " http://nagiosplug.sourceforge.net/developer-guidelines."
@@ -5518,7 +5513,7 @@ msgstr ""
 "html#THRESHOLDFORMAT\n"
 " pour le format et examples des seuils (THRESHOLD).\n"
 
-#: plugins/utils.h:196
+#: plugins/utils.h:197
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -5534,7 +5529,7 @@ msgstr ""
 "améliorations, envoyez un email à nagiosplug-devel@lists.sourceforge.net\n"
 "\n"
 
-#: plugins/utils.h:201
+#: plugins/utils.h:202
 msgid ""
 "\n"
 "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
@@ -5974,6 +5969,9 @@ msgstr ""
 msgid "The -v switch can be specified several times for increased verbosity."
 msgstr ""
 
+#~ msgid "Usage: "
+#~ msgstr "Utilisation: "
+
 #~ msgid ""
 #~ " See: http://nagiosplugins.org/extra-opts for --extra-opts usage and "
 #~ "examples.\n"
diff --git a/po/nagios-plugins.pot b/po/nagios-plugins.pot
index 4d2ceca1..85ee8526 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-21 23:38-0400\n"
+"POT-Creation-Date: 2010-04-28 05:59-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"
@@ -218,7 +218,7 @@ msgstr ""
 msgid "Examples:"
 msgstr ""
 
-#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:273
+#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:274
 #: 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
@@ -227,13 +227,13 @@ msgstr ""
 #: 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_ping.c:601 plugins/check_procs.c:760
+#: 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 ""
 
@@ -291,8 +291,11 @@ msgstr ""
 
 #: plugins/check_cluster.c:263
 msgid ""
-"Will alert critical if there are 3 or more service data points in a non-OK "
-"state"
+"Will alert critical if there are 3 or more service data points in a non-OK"
+msgstr ""
+
+#: plugins/check_cluster.c:264 plugins/check_ups.c:639
+msgid "state."
 msgstr ""
 
 #: plugins/check_dig.c:99 plugins/check_dig.c:101
@@ -3720,11 +3723,6 @@ msgstr ""
 msgid "Alert if CPU of any processes over 10%% or 20%%"
 msgstr ""
 
-#: plugins/check_procs.c:760
-#, c-format
-msgid "Usage: "
-msgstr ""
-
 #: plugins/check_radius.c:165
 msgid "Config file error"
 msgstr ""
@@ -4758,10 +4756,6 @@ msgid ""
 "CRITICAL"
 msgstr ""
 
-#: plugins/check_ups.c:639
-msgid "state."
-msgstr ""
-
 #: plugins/check_ups.c:643
 msgid ""
 "You may also specify a variable to check (such as temperature, utility "
@@ -5236,11 +5230,11 @@ msgstr ""
 #: plugins/utils.h:184
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read options from an ini file. See http://nagiosplugins.org/extra-opts "
-"for usage\n"
+"    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
+"    for usage and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:191
+#: plugins/utils.h:192
 msgid ""
 " See:\n"
 " http://nagiosplug.sourceforge.net/developer-guidelines."
@@ -5248,7 +5242,7 @@ msgid ""
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:196
+#: plugins/utils.h:197
 msgid ""
 "\n"
 "Send email to nagios-users@lists.sourceforge.net if you have questions\n"
@@ -5257,7 +5251,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/utils.h:201
+#: plugins/utils.h:202
 msgid ""
 "\n"
 "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"