Fix translations when extra-opts aren't enabled

Bug #2832884 reported problem with translations outputting pot file
headers. This is caused by "" matching the header of the translation
files.

This patch moves gettext macros inside utils macros and update some
french translations.

48 files changed, 631 insertions, 289 deletions

diff --git a/NEWS b/NEWS
index 8a11b321..47033b21 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ This file documents the major additions and syntax changes between releases.
         check_ldap now allows for specifying an empty LDAP base
         Fix compilation error of pst3 in Solaris 8
         Fix check_radius returning OK on unexpected results (Craig Leres - #2911752)
+        Fix translations when extra-opts aren't enabled (Jan Wagner - #2832884)
         WARNINGS
         Updated developer documentation to say that performance labels should not have an equals sign or
         single quote in the label
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index bdd348f2..51ac96ea 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -1392,10 +1392,10 @@ void print_help(void){
 
         print_usage();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_VERBOSE));
+        printf (UT_VERBOSE);
 
         printf (" %s\n", "-s, --serverip=IPADDRESS");
   printf ("    %s\n", _("IP address of DHCP server that we must hear from"));
@@ -1413,10 +1413,10 @@ void print_help(void){
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
         return;
         }
 
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 2a1b8133..590bb1a6 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -1281,8 +1281,8 @@ print_help(void)
 
   print_usage ();
 
-  printf (_(UT_HELP_VRSN));
-  printf (_(UT_EXTRA_OPTS));
+  printf (UT_HELP_VRSN);
+  printf (UT_EXTRA_OPTS);
 
   printf (" %s\n", "-H");
   printf ("    %s\n", _("specify a target"));
@@ -1337,10 +1337,10 @@ print_help(void)
 */
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 3da54bcf..7276f031 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -411,10 +411,10 @@ print_help (void)
 
   print_usage();
 
-  printf(_(UT_HELP_VRSN));
-  printf(_(UT_EXTRA_OPTS));
+  printf(UT_HELP_VRSN);
+  printf(UT_EXTRA_OPTS);
 
-  printf(_(UT_TIMEOUT), timeout_interval);
+  printf(UT_TIMEOUT, timeout_interval);
 
   printf (" %s\n", "-U, --upgrade=OPTS");
   printf ("    %s\n", _("[Default] Perform an upgrade.  If an optional OPTS argument is provided,"));
@@ -456,10 +456,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
   printf("\n");
   printf("%s\n", _("Notes:"));
-  printf(_(UT_EXTRA_OPTS_NOTES));
+  printf(UT_EXTRA_OPTS_NOTES);
 #endif
 
-  printf(_(UT_SUPPORT));
+  printf(UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 793c03d3..b688d435 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -386,13 +386,13 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
+        printf (UT_HELP_VRSN);
 
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', "none");
+        printf (UT_HOST_PORT, 'p', "none");
 
-        printf (_(UT_IPv46));
+        printf (UT_IPv46);
 
   printf (" %s\n", "-1, --proto1");
   printf ("    %s\n", _("tell ssh to use Protocol 1 [optional]"));
@@ -420,9 +420,9 @@ print_help (void)
   printf ("    %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));
   printf (" %s\n","-q, --quiet");
   printf ("    %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
-        printf (_(UT_WARN_CRIT));
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
-        printf (_(UT_VERBOSE));
+        printf (UT_WARN_CRIT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_VERBOSE);
         printf("\n");
   printf (" %s\n", _("The most common mode of use is to refer to a local identity file with"));
   printf (" %s\n", _("the '-i' option. In this mode, the identity pair should have a null"));
@@ -445,10 +445,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
         printf("\n");
         printf("%s\n", _("Notes:"));
-        printf(_(UT_EXTRA_OPTS_NOTES));
+        printf(UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf(_(UT_SUPPORT));
+        printf(UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index 89b1a0e1..f2322271 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -234,7 +234,7 @@ print_help(void)
 
         printf("\n");
         printf("%s\n", _("Options:"));
-        printf(_(UT_EXTRA_OPTS));
+        printf(UT_EXTRA_OPTS);
         printf (" %s\n", "-s, --service");
         printf ("    %s\n", _("Check service cluster status"));
         printf (" %s\n", "-h, --host");
@@ -251,14 +251,14 @@ print_help(void)
         printf ("    %s\n", _("The status codes of the hosts or services in the cluster, separated by"));
         printf ("    %s\n", _("commas"));
 
-        printf(_(UT_VERBOSE));
+        printf(UT_VERBOSE);
 
         printf("\n");
         printf("%s\n", _("Notes:"));
-        printf(_(UT_THRESHOLDS_NOTES));
+        printf(UT_THRESHOLDS_NOTES);
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
         printf ("\n");
@@ -266,7 +266,7 @@ print_help(void)
         printf (" %s\n", "check_cluster -s -d 2,0,2,0 -c @3:");
         printf ("    %s\n", _("Will alert critical if there are 3 or more service data points in a non-OK state") );
 
-        printf(_(UT_SUPPORT));
+        printf(UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 08be9373..45189b00 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -319,11 +319,11 @@ print_help (void)
 
   print_usage ();
 
-  printf (_(UT_HELP_VRSN));
+  printf (UT_HELP_VRSN);
 
-  printf (_(UT_EXTRA_OPTS));
+  printf (UT_EXTRA_OPTS);
 
-  printf (_(UT_HOST_PORT), 'p', myport);
+  printf (UT_HOST_PORT, 'p', myport);
 
   printf (" %s\n","-l, --query_address=STRING");
   printf ("    %s\n",_("Machine name to lookup"));
@@ -334,9 +334,9 @@ print_help (void)
   printf ("    %s\n",_("was in -l"));
   printf (" %s\n","-A, --dig-arguments=STRING");
   printf ("    %s\n",_("Pass STRING as argument(s) to dig"));
-  printf (_(UT_WARN_CRIT));
-  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
-  printf (_(UT_VERBOSE));
+  printf (UT_WARN_CRIT);
+  printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+  printf (UT_VERBOSE);
 
   printf ("\n");
   printf ("%s\n", _("Examples:"));
@@ -346,10 +346,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 5c0eec59..633aa5fc 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -904,8 +904,8 @@ print_help (void)
 
   print_usage ();
 
-  printf (_(UT_HELP_VRSN));
-  printf (_(UT_EXTRA_OPTS));
+  printf (UT_HELP_VRSN);
+  printf (UT_EXTRA_OPTS);
 
   printf (" %s\n", "-w, --warning=INTEGER");
   printf ("    %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free"));
@@ -952,17 +952,17 @@ print_help (void)
   printf ("    %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)"));
   printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION");
   printf ("    %s\n", _("Regular expression to ignore selected path or partition (may be repeated)"));
-  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
   printf (" %s\n", "-u, --units=STRING");
   printf ("    %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)"));
-  printf (_(UT_VERBOSE));
+  printf (UT_VERBOSE);
   printf (" %s\n", "-X, --exclude-type=TYPE");
   printf ("    %s\n", _("Ignore all filesystems of indicated type (may be repeated)"));
 
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
   printf ("\n");
@@ -975,7 +975,7 @@ print_help (void)
   printf (" %s\n", "check_disk -w 100M -c 50M -C -w 1000M -c 500M -p /foo -C -w 5% -c 3% -p /bar");
   printf ("    %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M"));
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 873dcae0..a9214298 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -455,8 +455,8 @@ print_help (void)
 
   print_usage ();
 
-  printf (_(UT_HELP_VRSN));
-  printf (_(UT_EXTRA_OPTS));
+  printf (UT_HELP_VRSN);
+  printf (UT_EXTRA_OPTS);
 
   printf (" -H, --hostname=HOST\n");
   printf ("    %s\n", _("The name or address you want to query"));
@@ -474,15 +474,15 @@ print_help (void)
   printf (" -c, --critical=seconds\n");
   printf ("    %s\n", _("Return critical if elapsed time exceeds value. Default off"));
 
-  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 8c3f5354..e72bf30b 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -109,9 +109,9 @@ print_help (void)
 
   print_usage ();
 
-  printf (_(UT_HELP_VRSN));
+  printf (UT_HELP_VRSN);
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index b27389d7..4e6533fa 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -399,8 +399,8 @@ print_help (void)
 
   print_usage ();
 
-  printf (_(UT_HELP_VRSN));
-  printf (_(UT_EXTRA_OPTS));
+  printf (UT_HELP_VRSN);
+  printf (UT_EXTRA_OPTS);
 
   printf (" %s\n", "-H, --hostname=HOST");
   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)
   printf ("    %s (default: fping's default for -t)\n", _("Target timeout (ms)"),PACKET_COUNT);
   printf (" %s\n", "-i, --interval=INTEGER");
   printf ("    %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"),PACKET_COUNT);
-  printf (_(UT_VERBOSE));
+  printf (UT_VERBOSE);
   printf ("\n");
   printf (" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)"));
   printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"));
@@ -425,10 +425,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_game.c b/plugins/check_game.c
index b1b6f7c0..bcde1038 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -300,8 +300,8 @@ print_help (void)
 
   print_usage ();
 
-  printf (_(UT_HELP_VRSN));
-  printf (_(UT_EXTRA_OPTS));
+  printf (UT_HELP_VRSN);
+  printf (UT_EXTRA_OPTS);
 
   printf (" %s\n", "-p");
   printf ("    %s\n", _("Optional port of which to connect"));
@@ -312,7 +312,7 @@ print_help (void)
   printf (" %s\n", "-pf");
   printf ("    %s\n", _("Field number in raw qstat output that contains ping time"));
 
-  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf ("\n");
   printf ("%s\n", _("Notes:"));
@@ -321,10 +321,10 @@ print_help (void)
   printf (" %s\n", _("http://www.activesw.com/people/steve/qstat.html before you can use this plugin."));
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index add9cc82..e4e8e6e5 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -395,8 +395,8 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
         printf (" %s\n", "-C, --community=STRING");
         printf ("    %s", _("The SNMP community name "));
@@ -406,10 +406,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
         printf ("%s\n", _("Notes:"));
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 0a8910c3..6c53f7ad 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1315,8 +1315,8 @@ print_help (void)
 
   printf ("\n");
 
-  printf (_(UT_HELP_VRSN));
-  printf (_(UT_EXTRA_OPTS));
+  printf (UT_HELP_VRSN);
+  printf (UT_EXTRA_OPTS);
 
   printf (" %s\n", "-H, --hostname=ADDRESS");
   printf ("    %s\n", _("Host name argument for servers using host headers (virtual host)"));
@@ -1327,7 +1327,7 @@ print_help (void)
   printf ("    %s", _("Port number (default: "));
   printf ("%d)\n", HTTP_PORT);
 
-  printf (_(UT_IPv46));
+  printf (UT_IPv46);
 
 #ifdef HAVE_SSL
   printf (" %s\n", "-S, --ssl");
@@ -1386,11 +1386,11 @@ print_help (void)
   printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
   printf ("    %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
 
-  printf (_(UT_WARN_CRIT));
+  printf (UT_WARN_CRIT);
 
-  printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+  printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-  printf (_(UT_VERBOSE));
+  printf (UT_VERBOSE);
 
   printf ("\n");
   printf ("%s\n", _("Notes:"));
@@ -1401,7 +1401,7 @@ print_help (void)
   printf (" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN"));
   printf (" %s\n", _("(fully qualified domain name) as the [host_name] argument."));
   printf ("\n");
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 
 #ifdef HAVE_SSL
   printf ("\n");
@@ -1423,7 +1423,7 @@ print_help (void)
   printf (" %s\n", _("the certificate is expired."));
 #endif
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 
 }
 
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index e036a37a..3811dc12 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -489,8 +489,8 @@ print_help (void)
 
   print_usage ();
 
-  printf (_(UT_HELP_VRSN));
-  printf (_(UT_EXTRA_OPTS));
+  printf (UT_HELP_VRSN);
+  printf (UT_EXTRA_OPTS);
 
   printf (" %s\n", "-d, --device=DEVICE");
   printf ("    %s\n", _("Select device DEVICE"));
@@ -509,10 +509,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
  /* todo : add to the long nanual as example
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 400d74ad..66834e88 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -396,12 +396,12 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', myport);
+        printf (UT_HOST_PORT, 'p', myport);
 
-        printf (_(UT_IPv46));
+        printf (UT_IPv46);
 
         printf (" %s\n", "-a [--attr]");
   printf ("    %s\n", _("ldap attribute to search (default: \"(objectclass=*)\""));
@@ -424,11 +424,11 @@ print_help (void)
   printf ("    (%s %d)\n", _("default protocol version:"), DEFAULT_PROTOCOL);
 #endif
 
-        printf (_(UT_WARN_CRIT));
+        printf (UT_WARN_CRIT);
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (_(UT_VERBOSE));
+        printf (UT_VERBOSE);
 
         printf ("\n");
         printf ("%s\n", _("Notes:"));
@@ -439,10 +439,10 @@ print_help (void)
         printf (" %s\n", _("to define the behaviour explicitly instead."));
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 /* todo
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 940d37ec..450a4fc3 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -305,8 +305,8 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
         printf (" %s\n", "-w, --warning=WLOAD1,WLOAD5,WLOAD15");
   printf ("    %s\n", _("Exit with WARNING status if load average exceeds WLOADn"));
@@ -319,10 +319,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
         printf ("%s\n", _("Notes:"));
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 void
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 65260ed1..6736c117 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -325,8 +325,8 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
         printf (" %s\n", "-F, --logfile=FILE");
   printf ("   %s\n", _("The MRTG log file containing the data you want to monitor"));
@@ -368,10 +368,10 @@ print_help (void)
   printf (" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded from"));
   printf ("   %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
 #ifdef NP_EXTRA_OPTS
-        printf (" -%s", _(UT_EXTRA_OPTS_NOTES));
+        printf (" -%s", UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 376a5099..1234bff4 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -343,8 +343,8 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
         printf (" %s\n", "-F, --filename=STRING");
   printf ("    %s\n", _("File to read log from"));
@@ -367,10 +367,10 @@ print_help (void)
   printf (" %s\n", _("  reports.  I'm not sure why this is right now, but will look into it"));
   printf (" %s\n", _("  for future enhancements of this plugin."));
 #ifdef NP_EXTRA_OPTS
-        printf (" -%s", _(UT_EXTRA_OPTS_NOTES));
+        printf (" -%s", UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 05d2b019..ce190621 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -381,10 +381,10 @@ print_help (void)
 
         print_usage ();
 
-  printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+  printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-  printf (_(UT_HOST_PORT), 'P', myport);
+  printf (UT_HOST_PORT, 'P', myport);
   printf (" %s\n", "-s, --socket=STRING");
   printf ("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
 
@@ -413,13 +413,13 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
         printf ("%s\n", _("Notes:"));
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
         printf ("\n");
         printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
         printf (" %s\n", _("overriding any my.cnf settings."));
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 47dd8616..40adf092 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -289,12 +289,12 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
         printf (" -q, --query=STRING\n");
         printf ("    %s\n", _("SQL query to run. Only first column in first row will be read"));
-        printf (_(UT_WARN_CRIT_RANGE));
-        printf (_(UT_HOST_PORT), 'P', myport);
+        printf (UT_WARN_CRIT_RANGE);
+        printf (UT_HOST_PORT, 'P', myport);
         printf (" %s\n", "-s, --socket=STRING");
         printf ("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
         printf (" -d, --database=STRING\n");
@@ -313,13 +313,13 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
         printf ("%s\n", _("Notes:"));
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
         printf ("\n");
         printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
         printf (" %s\n", _("overriding any my.cnf settings."));
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 954ff711..24ddadd7 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -287,8 +287,8 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
         printf (" %s\n", "-F, --filename=FILE");
   printf ("    %s\n", _("Name of the log file to check"));
@@ -296,19 +296,19 @@ print_help (void)
   printf ("    %s\n", _("Minutes aging after which logfile is considered stale"));
   printf (" %s\n", "-C, --command=STRING");
   printf ("    %s\n", _("Substring to search for in process arguments"));
-  printf (_(UT_VERBOSE));
+  printf (UT_VERBOSE);
 
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
   printf ("\n");
   printf ("%s\n", _("Examples:"));
   printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index d038efe7..c877f9cc 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -655,8 +655,8 @@ void print_help(void)
 
         print_usage();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
         printf ("%s\n", _("Options:"));
         printf (" %s\n", "-H, --hostname=HOST");
@@ -749,10 +749,10 @@ void print_help(void)
         printf ("   %s\n", _("One fix for this is to change the port to something else on check_nt "));
         printf ("   %s\n", _("and on the client service it\'s connecting to."));
 #ifdef NP_EXTRA_OPTS
-        printf (" -%s", _(UT_EXTRA_OPTS_NOTES));
+        printf (" -%s", UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index fdbdc141..35fddec9 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -842,9 +842,9 @@ void print_help(void){
         printf ("\n\n");
 
         print_usage();
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
-        printf (_(UT_HOST_PORT), 'p', "123");
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
+        printf (UT_HOST_PORT, 'p', "123");
         printf (" %s\n", "-w, --warning=THRESHOLD");
         printf ("    %s\n", _("Offset to result in warning status (seconds)"));
         printf (" %s\n", "-c, --critical=THRESHOLD");
@@ -853,15 +853,15 @@ void print_help(void){
         printf ("    %s\n", _("Warning threshold for jitter"));
         printf (" %s\n", "-k, --jcrit=THRESHOLD");
         printf ("    %s\n", _("Critical threshold for jitter"));
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
-        printf (_(UT_VERBOSE));
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_VERBOSE);
 
         printf("\n");
         printf("%s\n", _("Notes:"));
-        printf(_(UT_THRESHOLDS_NOTES));
+        printf(UT_THRESHOLDS_NOTES);
 #ifdef NP_EXTRA_OPTS
         printf("\n");
-        printf(_(UT_EXTRA_OPTS_NOTES));
+        printf(UT_EXTRA_OPTS_NOTES);
 #endif
 
         printf("\n");
@@ -873,7 +873,7 @@ void print_help(void){
         printf(" %s\n", _("(See Notes above for more details on thresholds formats):"));
         printf("  %s\n", ("./check_ntp -H ntpserv -w 0.5 -c 1 -j -1:100 -k -1:200"));
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 
         printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
         printf ("%s\n\n", _("check_ntp_time instead."));
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 0512058d..fa18cfb9 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -658,9 +658,9 @@ void print_help(void){
         printf ("\n\n");
 
         print_usage();
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
-        printf (_(UT_HOST_PORT), 'p', "123");
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
+        printf (UT_HOST_PORT, 'p', "123");
         printf (" %s\n", "-q, --quiet");
         printf ("    %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"));
         printf (" %s\n", "-w, --warning=THRESHOLD");
@@ -679,8 +679,8 @@ void print_help(void){
         printf ("    %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")"));
         printf (" %s\n", "-n, --tcrit=THRESHOLD");
         printf ("    %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")"));
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
-        printf (_(UT_VERBOSE));
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_VERBOSE);
 
         printf("\n");
         printf("%s\n", _("This plugin checks an NTP server independent of any commandline"));
@@ -692,10 +692,10 @@ void print_help(void){
         printf(" %s\n", _("plugin will not check the clock offset between the local host and NTP"));
         printf(" %s\n", _("server; please use check_ntp_time for that purpose."));
         printf("\n");
-        printf(_(UT_THRESHOLDS_NOTES));
+        printf(UT_THRESHOLDS_NOTES);
 #ifdef NP_EXTRA_OPTS
         printf("\n");
-        printf(_(UT_EXTRA_OPTS_NOTES));
+        printf(UT_EXTRA_OPTS_NOTES);
 #endif
 
         printf("\n");
@@ -713,7 +713,7 @@ void print_help(void){
         printf(" %s\n", _("Check only stratum:"));
         printf("  %s\n", ("./check_ntp_peer -H ntpserv -W 4 -C 6"));
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 void
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index c7c7a754..cd412fe5 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -600,17 +600,17 @@ void print_help(void){
         printf ("\n\n");
 
         print_usage();
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
-        printf (_(UT_HOST_PORT), 'p', "123");
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
+        printf (UT_HOST_PORT, 'p', "123");
         printf (" %s\n", "-q, --quiet");
         printf ("    %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found"));
         printf (" %s\n", "-w, --warning=THRESHOLD");
         printf ("    %s\n", _("Offset to result in warning status (seconds)"));
         printf (" %s\n", "-c, --critical=THRESHOLD");
         printf ("    %s\n", _("Offset to result in critical status (seconds)"));
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
-        printf (_(UT_VERBOSE));
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_VERBOSE);
 
         printf("\n");
         printf("%s\n", _("This plugin checks the clock offset between the local host and a"));
@@ -622,17 +622,17 @@ void print_help(void){
         printf(" %s\n", _("If you'd rather want to monitor an NTP server, please use"));
         printf(" %s\n", _("check_ntp_peer."));
         printf("\n");
-        printf(_(UT_THRESHOLDS_NOTES));
+        printf(UT_THRESHOLDS_NOTES);
 #ifdef NP_EXTRA_OPTS
         printf("\n");
-        printf(_(UT_EXTRA_OPTS_NOTES));
+        printf(UT_EXTRA_OPTS_NOTES);
 #endif
 
         printf("\n");
         printf("%s\n", _("Examples:"));
         printf("  %s\n", ("./check_ntp_time -H ntpserv -w 0.5 -c 1"));
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 void
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 72a47b16..2c3369a5 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -1605,10 +1605,10 @@ void print_help(void)
 
         print_usage();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', myport);
+        printf (UT_HOST_PORT, 'p', myport);
 
         printf (" %s\n", "-v, --variable=STRING");
   printf ("   %s\n", _("Variable to check.  Valid variables include:"));
@@ -1664,7 +1664,7 @@ void print_help(void)
   printf (" %s\n", "-o, --osversion");
   printf ("    %s\n", _("Include server version string in results"));
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf ("\n");
   printf ("%s\n", _("Notes:"));
@@ -1675,10 +1675,10 @@ void print_help(void)
   printf (" %s\n", _("  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
   printf (" %s\n", _("  TCB, LRUS and LRUM."));
 #ifdef NP_EXTRA_OPTS
-  printf (" -%s", _(UT_EXTRA_OPTS_NOTES));
+  printf (" -%s", UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 1d9ec8cf..5751dc05 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -423,10 +423,10 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', myport);
+        printf (UT_HOST_PORT, 'p', myport);
 
   printf (" %s\n", "-w, --warning=INTEGER");
   printf ("    %s\n", _("Threshold which will result in a warning status"));
@@ -442,9 +442,9 @@ print_help (void)
   printf ("    %s\n", _("NET<port>     = number of active connections on TCP port <port>"));
   printf ("    %s\n", _("UPTIME        = system uptime in seconds"));
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-  printf (_(UT_VERBOSE));
+  printf (UT_VERBOSE);
 
   printf ("\n");
   printf ("%s\n", _("This plugin requires that Eric Molitors' Over-CR collector daemon be"));
@@ -458,10 +458,10 @@ print_help (void)
   printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable"));
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-  printf (_(UT_SUPPORT));
+  printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 40c104eb..a3652149 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -429,12 +429,12 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'P', myport);
+        printf (UT_HOST_PORT, 'P', myport);
 
-        printf (_(UT_IPv46));
+        printf (UT_IPv46);
 
         printf (" %s\n", "-d, --database=STRING");
         printf ("    %s", _("Database to check "));
@@ -444,11 +444,11 @@ print_help (void)
         printf (" %s\n", "-p, --password = STRING");
         printf ("    %s\n", _("Password (BIG SECURITY ISSUE)"));
 
-        printf (_(UT_WARN_CRIT));
+        printf (UT_WARN_CRIT);
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (_(UT_VERBOSE));
+        printf (UT_VERBOSE);
 
         printf ("\n");
         printf (" %s\n", _("All parameters are optional."));
@@ -469,10 +469,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
         printf ("%s\n", _("Notes:"));
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 8c4c0e64..45108afb 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -562,10 +562,10 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_IPv46));
+        printf (UT_IPv46);
 
         printf (" %s\n", "-H, --hostname=HOST");
   printf ("    %s\n", _("host to ping"));
@@ -579,7 +579,7 @@ print_help (void)
   printf (" %s\n", "-L, --link");
   printf ("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf ("\n");
         printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));
@@ -595,10 +595,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 void
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 937c0ad5..e9372ff6 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -683,8 +683,8 @@ print_help (void)
 
         print_usage ();
 
-  printf (_(UT_HELP_VRSN));
-  printf (_(UT_EXTRA_OPTS));
+  printf (UT_HELP_VRSN);
+  printf (UT_EXTRA_OPTS);
   printf (" %s\n", "-w, --warning=RANGE");
   printf ("   %s\n", _("Generate warning state if metric is outside this range"));
   printf (" %s\n", "-c, --critical=RANGE");
@@ -699,7 +699,7 @@ print_help (void)
 #if defined( __linux__ )
         printf ("  %s\n", _("ELAPSED - time elapsed in seconds"));
 #endif /* defined(__linux__) */
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (" %s\n", "-v, --verbose");
   printf ("    %s\n", _("Extra information. Up to 3 verbosity levels"));
@@ -741,7 +741,7 @@ be the total number of running processes\n\n"));
 
 #ifdef NP_EXTRA_OPTS
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
   printf ("\n");
 #endif
 
@@ -757,7 +757,7 @@ be the total number of running processes\n\n"));
   printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
   printf ("  %s\n", _("Alert if CPU of any processes over 10%% or 20%%"));
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 void
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index b2f5732c..c95fbe1f 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -341,10 +341,10 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'P', myport);
+        printf (UT_HOST_PORT, 'P', myport);
 
         printf (" %s\n", "-u, --username=STRING");
   printf ("    %s\n", _("The user to authenticate"));
@@ -361,7 +361,7 @@ print_help (void)
   printf (" %s\n", "-r, --retries=INTEGER");
   printf ("    %s\n", _("Number of times to retry a failed connection"));
 
-        printf (_(UT_TIMEOUT), timeout_interval);
+        printf (UT_TIMEOUT, timeout_interval);
 
   printf ("\n");
   printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
@@ -377,10 +377,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_real.c b/plugins/check_real.c
index cbc3103c..16433470 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -416,10 +416,10 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', myport);
+        printf (UT_HOST_PORT, 'p', myport);
 
         printf (" %s\n", "-u, --url=STRING");
   printf ("    %s\n", _("Connect to this url"));
@@ -427,11 +427,11 @@ print_help (void)
   printf (_("String to expect in first line of server response (default: %s)\n"),
                EXPECT);
 
-        printf (_(UT_WARN_CRIT));
+        printf (UT_WARN_CRIT);
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (_(UT_VERBOSE));
+        printf (UT_VERBOSE);
 
   printf ("\n");
         printf ("%s\n", _("This plugin will attempt to open an RTSP connection with the host."));
@@ -443,10 +443,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 62f10254..c78b709c 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -767,12 +767,12 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', myport);
+        printf (UT_HOST_PORT, 'p', myport);
 
-        printf (_(UT_IPv46));
+        printf (UT_IPv46);
 
         printf (" %s\n", "-e, --expect=STRING");
   printf (_("    String to expect in first line of server response (default: '%s')\n"), SMTP_EXPECT);
@@ -796,11 +796,11 @@ print_help (void)
   printf (" %s\n", "-P, --authpass=STRING");
   printf ("    %s\n", _("SMTP AUTH password"));
 
-        printf (_(UT_WARN_CRIT));
+        printf (UT_WARN_CRIT);
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (_(UT_VERBOSE));
+        printf (UT_VERBOSE);
 
         printf("\n");
         printf ("%s\n", _("Successul connects return STATE_OK, refusals and timeouts return"));
@@ -811,10 +811,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index fdb5819e..f04ca85f 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -806,10 +806,10 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', DEFAULT_PORT);
+        printf (UT_HOST_PORT, 'p', DEFAULT_PORT);
 
         /* SNMP and Authentication Protocol */
         printf (" %s\n", "-n, --next");
@@ -867,11 +867,11 @@ print_help (void)
         printf (" %s\n", "-D, --output-delimiter=STRING");
         printf ("    %s\n", _("Separates output on multiple OID requests"));
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf (" %s\n", "-e, --retries=INTEGER");
         printf ("    %s\n", _("Number of retries to be used in the requests"));
 
-        printf (_(UT_VERBOSE));
+        printf (UT_VERBOSE);
 
         printf ("\n");
         printf ("%s\n", _("This plugin uses the 'snmpget' command included with the NET-SNMP package."));
@@ -883,17 +883,17 @@ print_help (void)
         printf (" %s\n", _("- Multiple OIDs may be indicated by a comma- or space-delimited list (lists with"));
         printf ("   %s\n", _("internal spaces must be quoted) [max 8 OIDs]"));
 
-        printf(" -%s", _(UT_THRESHOLDS_NOTES));
+        printf(" -%s", UT_THRESHOLDS_NOTES);
 
         printf (" %s\n", _("- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'"));
         printf (" %s\n", _("- Note that only one string and one regex may be checked at present"));
         printf (" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value"));
         printf ("   %s\n", _("returned from the SNMP query is an unsigned integer."));
 #ifdef NP_EXTRA_OPTS
-        printf (" -%s", _(UT_EXTRA_OPTS_NOTES));
+        printf (" -%s", UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 04cc4d97..9a193438 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -277,27 +277,27 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', myport);
+        printf (UT_HOST_PORT, 'p', myport);
 
-        printf (_(UT_IPv46));
+        printf (UT_IPv46);
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (" %s\n", "-r, --remote-version=STRING");
   printf ("    %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
 
-        printf (_(UT_VERBOSE));
+        printf (UT_VERBOSE);
 
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
         printf ("%s\n", _("Notes:"));
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index be20ca32..a1356cfa 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -528,8 +528,8 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
         printf (" %s\n", "-w, --warning=INTEGER");
   printf ("    %s\n", _("Exit with WARNING status if less than INTEGER bytes of swap space are free"));
@@ -541,18 +541,18 @@ print_help (void)
   printf ("    %s\n", _("Exit with CRITCAL status if less than PERCENT of swap space is free"));
   printf (" %s\n", "-a, --allswaps");
   printf ("    %s\n", _("Conduct comparisons for all swap partitions, one by one"));
-        printf (_(UT_VERBOSE));
+        printf (UT_VERBOSE);
 
         printf ("\n");
   printf ("%s\n", _("Notes:"));
   printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index b094207e..156765ed 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -599,12 +599,12 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', "none");
+        printf (UT_HOST_PORT, 'p', "none");
 
-        printf (_(UT_IPv46));
+        printf (UT_IPv46);
 
         printf (" %s\n", "-E, --escape");
   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)
   printf ("    %s\n", _("Use SSL for the connection."));
 #endif
 
-        printf (_(UT_WARN_CRIT));
+        printf (UT_WARN_CRIT);
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (_(UT_VERBOSE));
+        printf (UT_VERBOSE);
 
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
         printf ("%s\n", _("Notes:"));
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_time.c b/plugins/check_time.c
index ee938168..7816b238 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -342,10 +342,10 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', myport);
+        printf (UT_HOST_PORT, 'p', myport);
 
         printf (" %s\n", "-u, --udp");
   printf ("   %s\n", _("Use UDP to connect, not TCP"));
@@ -358,15 +358,15 @@ print_help (void)
   printf (" %s\n", "-C, --critical-connect=INTEGER");
   printf ("   %s\n", _("Response time (sec.) necessary to result in critical status"));
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
 #ifdef NP_EXTRA_OPTS
         printf ("\n");
         printf ("%s\n", _("Notes:"));
-        printf (_(UT_EXTRA_OPTS_NOTES));
+        printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 8985b74e..ce57ef3d 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -611,10 +611,10 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
-        printf (_(UT_HOST_PORT), 'p', myport);
+        printf (UT_HOST_PORT, 'p', myport);
 
         printf (" %s\n", "-u, --ups=STRING");
   printf ("    %s\n", _("Name of UPS"));
@@ -623,13 +623,13 @@ print_help (void)
   printf (" %s\n", "-v, --variable=STRING");
   printf ("    %s %s\n", _("Valid values for STRING are"), "LINE, TEMP, BATTPCT or LOADPCT");
 
-        printf (_(UT_WARN_CRIT));
+        printf (UT_WARN_CRIT);
 
-        printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
 /* TODO: -v clashing with -v/-variable. Commenting out help text since verbose
          is unused up to now */
-/*      printf (_(UT_VERBOSE)); */
+/*      printf (UT_VERBOSE); */
 
   printf ("\n");
         printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
@@ -651,10 +651,10 @@ print_help (void)
   printf (" %s\n", _("http://www.networkupstools.org"));
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 1bd2c8b2..dc661d89 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -211,8 +211,8 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
-        printf (_(UT_EXTRA_OPTS));
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
 
         printf (" %s\n", "-w, --warning=INTEGER");
   printf ("    %s\n", _("Set WARNING status if more than INTEGER users are logged in"));
@@ -222,10 +222,10 @@ print_help (void)
 #ifdef NP_EXTRA_OPTS
   printf ("\n");
   printf ("%s\n", _("Notes:"));
-  printf (_(UT_EXTRA_OPTS_NOTES));
+  printf (UT_EXTRA_OPTS_NOTES);
 #endif
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/negate.c b/plugins/negate.c
index 8eac7220..869b9d9d 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -247,9 +247,9 @@ print_help (void)
 
         print_usage ();
 
-        printf (_(UT_HELP_VRSN));
+        printf (UT_HELP_VRSN);
 
-        printf (_(UT_TIMEOUT), timeout_interval);
+        printf (UT_TIMEOUT, timeout_interval);
         printf ("    %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status."));
         printf (" -T, --timeout-result=STATUS\n");
         printf ("    %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n"));
@@ -281,7 +281,7 @@ print_help (void)
         printf (" %s\n", _("Using timeout-result, it is possible to override the timeout behaviour or a"));
         printf (" %s\n", _("plugin by setting the negate timeout a bit lower."));
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 202fa048..5fb3aca0 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -174,7 +174,7 @@ print_help (void)
 
         print_usage ();
 
-  printf (_(UT_HELP_VRSN));
+  printf (UT_HELP_VRSN);
 
   printf ("\n");
   printf ("%s\n", _("Examples:"));
@@ -186,7 +186,7 @@ print_help (void)
   printf ("    %s\n\n", _("You probably want:"));
   printf (" %s\n", _("urlize http://example.com/ \"check_http -H example.com -r 'two words'\""));
 
-        printf (_(UT_SUPPORT));
+        printf (UT_SUPPORT);
 }
 
 
diff --git a/plugins/utils.h b/plugins/utils.h
index d6e9c8f7..8da2160e 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -137,73 +137,73 @@ char *fperfdata (const char *,
 #define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\
 \t<%s>\n\n"
 
-#define UT_HLP_VRS "\
+#define UT_HLP_VRS _("\
        %s (-h | --help) for detailed help\n\
-       %s (-V | --version) for version information\n"
+       %s (-V | --version) for version information\n")
 
-#define UT_HELP_VRSN "\
+#define UT_HELP_VRSN _("\
 \nOptions:\n\
  -h, --help\n\
     Print detailed help screen\n\
  -V, --version\n\
-    Print version information\n"
+    Print version information\n")
 
-#define UT_HOST_PORT "\
+#define UT_HOST_PORT _("\
  -H, --hostname=ADDRESS\n\
     Host name, IP Address, or unix socket (must be an absolute path)\n\
  -%c, --port=INTEGER\n\
-    Port number (default: %s)\n"
+    Port number (default: %s)\n")
 
-#define UT_IPv46 "\
+#define UT_IPv46 _("\
  -4, --use-ipv4\n\
     Use IPv4 connection\n\
  -6, --use-ipv6\n\
-    Use IPv6 connection\n"
+    Use IPv6 connection\n")
 
-#define UT_VERBOSE "\
+#define UT_VERBOSE _("\
  -v, --verbose\n\
-    Show details for command-line debugging (Nagios may truncate output)\n"
+    Show details for command-line debugging (Nagios may truncate output)\n")
 
-#define UT_WARN_CRIT "\
+#define UT_WARN_CRIT _("\
  -w, --warning=DOUBLE\n\
     Response time to result in warning status (seconds)\n\
  -c, --critical=DOUBLE\n\
-    Response time to result in critical status (seconds)\n"
+    Response time to result in critical status (seconds)\n")
 
-#define UT_WARN_CRIT_RANGE "\
+#define UT_WARN_CRIT_RANGE _("\
  -w, --warning=RANGE\n\
     Warning range (format: start:end). Alert if outside this range\n\
  -c, --critical=RANGE\n\
-    Critical range\n"
+    Critical range\n")
 
-#define UT_TIMEOUT "\
+#define UT_TIMEOUT _("\
  -t, --timeout=INTEGER\n\
-    Seconds before connection times out (default: %d)\n"
+    Seconds before connection times out (default: %d)\n")
 
 #ifdef NP_EXTRA_OPTS
-#define UT_EXTRA_OPTS "\
+#define UT_EXTRA_OPTS _("\
  --extra-opts=[section][@file]\n\
-    Read additionnal options from ini file\n"
-#define UT_EXTRA_OPTS_NOTES "\
- See: http://nagiosplugins.org/extra-opts for --extra-opts usage and examples.\n"
+    Read additionnal options from ini file\n")
+#define UT_EXTRA_OPTS_NOTES _("\
+ See: http://nagiosplugins.org/extra-opts for --extra-opts usage and examples.\n")
 #else
 #define UT_EXTRA_OPTS ""
 #define UT_EXTRA_OPTS_NOTES ""
 #endif
 
-#define UT_THRESHOLDS_NOTES "\
+#define UT_THRESHOLDS_NOTES _("\
  See:\n\
  http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT\n\
- for THRESHOLD format and examples.\n"
+ for THRESHOLD format and examples.\n")
 
-#define UT_SUPPORT "\n\
+#define UT_SUPPORT _("\n\
 Send email to nagios-users@lists.sourceforge.net if you have questions\n\
 regarding use of this software. To submit patches or suggest improvements,\n\
-send email to nagiosplug-devel@lists.sourceforge.net\n\n"
+send email to nagiosplug-devel@lists.sourceforge.net\n\n")
 
-#define UT_NOWARRANTY "\n\
+#define UT_NOWARRANTY _("\n\
 The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
 copies of the plugins under the terms of the GNU General Public License.\n\
-For more information about these matters, see the file named COPYING.\n"
+For more information about these matters, see the file named COPYING.\n")
 
 #endif /* NP_UTILS_H */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 133793c4..6e491d78 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,5 +39,6 @@ plugins/netutils.c
 plugins/popen.c
 plugins/urlize.c
 plugins/utils.c
+plugins/utils.h
 plugins-root/check_dhcp.c
 plugins-root/check_icmp.c
diff --git a/po/de.po b/po/de.po
index b7a3df42..dce8620d 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 05:43-0400\n"
+"POT-Creation-Date: 2010-04-14 06:17-0400\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: English <en@li.org>\n"
@@ -5317,6 +5317,106 @@ msgstr "konnte keinen Speicher für '%s' reservieren\n"
 msgid "failed malloc in strscat\n"
 msgstr "konnte keinen Speicher für '%s' reservieren\n"
 
+#: plugins/utils.h:140
+#, c-format
+msgid ""
+"       %s (-h | --help) for detailed help\n"
+"       %s (-V | --version) for version information\n"
+msgstr ""
+
+#: plugins/utils.h:144
+msgid ""
+"\n"
+"Options:\n"
+" -h, --help\n"
+"    Print detailed help screen\n"
+" -V, --version\n"
+"    Print version information\n"
+msgstr ""
+
+#: plugins/utils.h:151
+#, c-format
+msgid ""
+" -H, --hostname=ADDRESS\n"
+"    Host name, IP Address, or unix socket (must be an absolute path)\n"
+" -%c, --port=INTEGER\n"
+"    Port number (default: %s)\n"
+msgstr ""
+
+#: plugins/utils.h:157
+msgid ""
+" -4, --use-ipv4\n"
+"    Use IPv4 connection\n"
+" -6, --use-ipv6\n"
+"    Use IPv6 connection\n"
+msgstr ""
+
+#: plugins/utils.h:163
+msgid ""
+" -v, --verbose\n"
+"    Show details for command-line debugging (Nagios may truncate output)\n"
+msgstr ""
+
+#: plugins/utils.h:167
+msgid ""
+" -w, --warning=DOUBLE\n"
+"    Response time to result in warning status (seconds)\n"
+" -c, --critical=DOUBLE\n"
+"    Response time to result in critical status (seconds)\n"
+msgstr ""
+
+#: plugins/utils.h:173
+msgid ""
+" -w, --warning=RANGE\n"
+"    Warning range (format: start:end). Alert if outside this range\n"
+" -c, --critical=RANGE\n"
+"    Critical range\n"
+msgstr ""
+
+#: plugins/utils.h:179
+#, c-format
+msgid ""
+" -t, --timeout=INTEGER\n"
+"    Seconds before connection times out (default: %d)\n"
+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"
+msgstr ""
+
+#: plugins/utils.h:194
+msgid ""
+" See:\n"
+" http://nagiosplug.sourceforge.net/developer-guidelines."
+"html#THRESHOLDFORMAT\n"
+" for THRESHOLD format and examples.\n"
+msgstr ""
+
+#: plugins/utils.h:199
+msgid ""
+"\n"
+"Send email to nagios-users@lists.sourceforge.net if you have questions\n"
+"regarding use of this software. To submit patches or suggest improvements,\n"
+"send email to nagiosplug-devel@lists.sourceforge.net\n"
+"\n"
+msgstr ""
+
+#: plugins/utils.h:204
+msgid ""
+"\n"
+"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
+"copies of the plugins under the terms of the GNU General Public License.\n"
+"For more information about these matters, see the file named COPYING.\n"
+msgstr ""
+
 #: plugins-root/check_dhcp.c:320
 #, c-format
 msgid "Error: Could not get hardware address of interface '%s'\n"
diff --git a/po/fr.po b/po/fr.po
index bced839c..744bbdd6 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-14 05:43-0400\n"
+"POT-Creation-Date: 2010-04-14 06:17-0400\n"
 "PO-Revision-Date: 2010-04-14 05:30-0400\n"
 "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
 "Language-Team: Nagios Plugin Development Mailing List <nagiosplug-"
@@ -2612,12 +2612,12 @@ msgstr "Ce plugin vérifie le service ntp sur l'hôte"
 #: plugins/check_ntp.c:849 plugins/check_ntp_peer.c:667
 #: plugins/check_ntp_time.c:609
 msgid "Offset to result in warning status (seconds)"
-msgstr "Décalage résultant un avertissement (secondes)"
+msgstr "Décalage résultant en un avertissement (secondes)"
 
 #: plugins/check_ntp.c:851 plugins/check_ntp_peer.c:669
 #: plugins/check_ntp_time.c:611
 msgid "Offset to result in critical status (seconds)"
-msgstr "Décalage résultant un état critique (secondes)"
+msgstr "Décalage résultant en un état critique (secondes)"
 
 #: plugins/check_ntp.c:853 plugins/check_ntp_peer.c:675
 msgid "Warning threshold for jitter"
@@ -5411,6 +5411,155 @@ msgstr "La fonction realloc à échoué dans strpcpy\n"
 msgid "failed malloc in strscat\n"
 msgstr "La fonction malloc à échoué dans strscat\n"
 
+#: plugins/utils.h:140
+#, c-format
+msgid ""
+"       %s (-h | --help) for detailed help\n"
+"       %s (-V | --version) for version information\n"
+msgstr ""
+"       %s (-h | --help) pour l'aide détaillée\n"
+"       %s (-V | --version) pour les informations relative à la version\n"
+
+#: plugins/utils.h:144
+msgid ""
+"\n"
+"Options:\n"
+" -h, --help\n"
+"    Print detailed help screen\n"
+" -V, --version\n"
+"    Print version information\n"
+msgstr ""
+"\n"
+"Options:\n"
+" -h, --help\n"
+"    Afficher l'aide détaillée\n"
+" -V, --version\n"
+"    Afficher les informations relative à la version\n"
+
+#: plugins/utils.h:151
+#, c-format
+msgid ""
+" -H, --hostname=ADDRESS\n"
+"    Host name, IP Address, or unix socket (must be an absolute path)\n"
+" -%c, --port=INTEGER\n"
+"    Port number (default: %s)\n"
+msgstr ""
+" -H, --hostname=ADDRESS\n"
+"    Nom d'hôte, Adresse IP, ou socket UNIX (doit être un chemin absolu)\n"
+" -%c, --port=INTEGER\n"
+"    Numéro de port (défaut: %s)\n"
+
+#: plugins/utils.h:157
+msgid ""
+" -4, --use-ipv4\n"
+"    Use IPv4 connection\n"
+" -6, --use-ipv6\n"
+"    Use IPv6 connection\n"
+msgstr ""
+" -4, --use-ipv4\n"
+"    Utiliser une connection IPv4\n"
+" -6, --use-ipv6\n"
+"    Utiliser une connection IPv6\n"
+
+#: plugins/utils.h:163
+msgid ""
+" -v, --verbose\n"
+"    Show details for command-line debugging (Nagios may truncate output)\n"
+msgstr ""
+" -v, --verbose\n"
+"    Affiche les informations de déboguage en ligne de commande (Nagios peut "
+"tronquer la sortie)\n"
+
+#: plugins/utils.h:167
+msgid ""
+" -w, --warning=DOUBLE\n"
+"    Response time to result in warning status (seconds)\n"
+" -c, --critical=DOUBLE\n"
+"    Response time to result in critical status (seconds)\n"
+msgstr ""
+" -w, --warning=DOUBLE\n"
+"    Temps de réponse résultant en un état d'avertissement (secondes)\n"
+" -c, --critical=DOUBLE\n"
+"    Temps de réponse résultant en un état critique (secondes)\n"
+
+#: plugins/utils.h:173
+msgid ""
+" -w, --warning=RANGE\n"
+"    Warning range (format: start:end). Alert if outside this range\n"
+" -c, --critical=RANGE\n"
+"    Critical range\n"
+msgstr ""
+" -w, --warning=RANGE\n"
+"    Seuil d'avertissement (format: début:fin). Alerte à l'extérieur de la "
+"plage\n"
+" -c, --critical=RANGE\n"
+"    Seuil critique\n"
+
+#: plugins/utils.h:179
+#, c-format
+msgid ""
+" -t, --timeout=INTEGER\n"
+"    Seconds before connection times out (default: %d)\n"
+msgstr ""
+" -t, --timeout=INTEGER\n"
+"    Délais de connection en secondes (défaut: %d)\n"
+
+#: plugins/utils.h:184
+msgid ""
+" --extra-opts=[section][@file]\n"
+"    Read additionnal options from ini file\n"
+msgstr ""
+" --extra-opts=[section][@file]\n"
+"    Lire les options additionnelles à partir d'un fichier ini\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
+msgid ""
+" See:\n"
+" http://nagiosplug.sourceforge.net/developer-guidelines."
+"html#THRESHOLDFORMAT\n"
+" for THRESHOLD format and examples.\n"
+msgstr ""
+" Voir:\n"
+" http://nagiosplug.sourceforge.net/developer-guidelines."
+"html#THRESHOLDFORMAT\n"
+" pour le format et examples des seuils (THRESHOLD).\n"
+
+#: plugins/utils.h:199
+msgid ""
+"\n"
+"Send email to nagios-users@lists.sourceforge.net if you have questions\n"
+"regarding use of this software. To submit patches or suggest improvements,\n"
+"send email to nagiosplug-devel@lists.sourceforge.net\n"
+"\n"
+msgstr ""
+"\n"
+"Envoyez un email à nagios-users@lists.sourceforge.net si vous avez des "
+"questions\n"
+"reliées à l'utilisation de ce logiciel. Pour envoyer des patches ou suggérer "
+"des\n"
+"améliorations, envoyez un email à nagiosplug-devel@lists.sourceforge.net\n"
+"\n"
+
+#: plugins/utils.h:204
+msgid ""
+"\n"
+"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
+"copies of the plugins under the terms of the GNU General Public License.\n"
+"For more information about these matters, see the file named COPYING.\n"
+msgstr ""
+"\n"
+"Les plugins de Nagios ne portent AUCUNE GARANTIE. Vous pouvez redistribuer\n"
+"des copies des plugins selon les termes de la GNU General Public License.\n"
+"Pour de plus ample informations, voir le fichier COPYING.\n"
+
 #: plugins-root/check_dhcp.c:320
 #, c-format
 msgid "Error: Could not get hardware address of interface '%s'\n"
@@ -5838,12 +5987,3 @@ msgstr ""
 #: plugins-root/check_icmp.c:1334
 msgid "The -v switch can be specified several times for increased verbosity."
 msgstr ""
-
-#~ msgid "See:"
-#~ msgstr "Voir:"
-
-#~ msgid "for THRESHOLD format and examples."
-#~ msgstr "pour le format et examples des seuils (THRESHOLD)."
-
-#~ msgid "for --extra-opts usage and examples."
-#~ msgstr "pour le format et examples de --extra-opts."
diff --git a/po/nagios-plugins.pot b/po/nagios-plugins.pot
index 4d7dc2b4..5b02caca 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 05:43-0400\n"
+"POT-Creation-Date: 2010-04-14 06:17-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"
@@ -5178,6 +5178,106 @@ msgstr ""
 msgid "failed malloc in strscat\n"
 msgstr ""
 
+#: plugins/utils.h:140
+#, c-format
+msgid ""
+"       %s (-h | --help) for detailed help\n"
+"       %s (-V | --version) for version information\n"
+msgstr ""
+
+#: plugins/utils.h:144
+msgid ""
+"\n"
+"Options:\n"
+" -h, --help\n"
+"    Print detailed help screen\n"
+" -V, --version\n"
+"    Print version information\n"
+msgstr ""
+
+#: plugins/utils.h:151
+#, c-format
+msgid ""
+" -H, --hostname=ADDRESS\n"
+"    Host name, IP Address, or unix socket (must be an absolute path)\n"
+" -%c, --port=INTEGER\n"
+"    Port number (default: %s)\n"
+msgstr ""
+
+#: plugins/utils.h:157
+msgid ""
+" -4, --use-ipv4\n"
+"    Use IPv4 connection\n"
+" -6, --use-ipv6\n"
+"    Use IPv6 connection\n"
+msgstr ""
+
+#: plugins/utils.h:163
+msgid ""
+" -v, --verbose\n"
+"    Show details for command-line debugging (Nagios may truncate output)\n"
+msgstr ""
+
+#: plugins/utils.h:167
+msgid ""
+" -w, --warning=DOUBLE\n"
+"    Response time to result in warning status (seconds)\n"
+" -c, --critical=DOUBLE\n"
+"    Response time to result in critical status (seconds)\n"
+msgstr ""
+
+#: plugins/utils.h:173
+msgid ""
+" -w, --warning=RANGE\n"
+"    Warning range (format: start:end). Alert if outside this range\n"
+" -c, --critical=RANGE\n"
+"    Critical range\n"
+msgstr ""
+
+#: plugins/utils.h:179
+#, c-format
+msgid ""
+" -t, --timeout=INTEGER\n"
+"    Seconds before connection times out (default: %d)\n"
+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"
+msgstr ""
+
+#: plugins/utils.h:194
+msgid ""
+" See:\n"
+" http://nagiosplug.sourceforge.net/developer-guidelines."
+"html#THRESHOLDFORMAT\n"
+" for THRESHOLD format and examples.\n"
+msgstr ""
+
+#: plugins/utils.h:199
+msgid ""
+"\n"
+"Send email to nagios-users@lists.sourceforge.net if you have questions\n"
+"regarding use of this software. To submit patches or suggest improvements,\n"
+"send email to nagiosplug-devel@lists.sourceforge.net\n"
+"\n"
+msgstr ""
+
+#: plugins/utils.h:204
+msgid ""
+"\n"
+"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
+"copies of the plugins under the terms of the GNU General Public License.\n"
+"For more information about these matters, see the file named COPYING.\n"
+msgstr ""
+
 #: plugins-root/check_dhcp.c:320
 #, c-format
 msgid "Error: Could not get hardware address of interface '%s'\n"