152 files changed, 5357 insertions, 3659 deletions

diff --git a/.gitignore b/.gitignore
index ebd46e1f..8ea2d8e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ NP-VERSION-FILE
 /Makefile
 /Makefile.in
 /missing
-/nagios-plugins.spec
+/monitoring-plugins.spec
 /stamp-h1
 /test.pl
 /THANKS
@@ -81,6 +81,7 @@ NP-VERSION-FILE
 /gl/stdio.h
 /gl/stdlib.h
 /gl/string.h
+/gl/strings.h
 /gl/sys_socket.h
 /gl/sys_stat.h
 /gl/sys
@@ -93,7 +94,7 @@ NP-VERSION-FILE
 # /lib/
 /lib/.deps
 /lib/getopt.h
-/lib/libnagiosplug.a
+/lib/libmonitoringplug.a
 /lib/Makefile
 /lib/Makefile.in
 
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..d73d5e89
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,42 @@
+language: c
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get purge -qq gawk
+
+install:
+  - sudo apt-get install -qq --no-install-recommends perl autotools-dev libdbi-dev libldap2-dev libpq-dev libmysqlclient-dev libradiusclient-ng-dev libkrb5-dev libnet-snmp-perl procps mawk
+  - sudo apt-get install -qq --no-install-recommends autoconf automake
+
+before_script:
+  - tools/setup
+  - ./configure
+
+script:
+  - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make; fi
+
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#Monitoring-Plugins"
+    on_success: change
+    on_failure: always
+    skip_join: true
+  email:
+    - team@monitoring-plugins.org
+
+env:
+  global:
+    # This is the encrypted COVERITY_SCAN_TOKEN, created via the "travis
+    # encrypt" command using the project repository's public key.
+    - secure: "ggJ9c/VfKcwtrwz/My+ne4My7D8g3qi3vz5Hh+yLiri0+oIXCy313ZD6ssIEY/5beQZEOnuHhBgBJd/Y3clSQNc2M9fRNc+wxOkIO992lgnY0MZJN3y9MLfpqUbTClhU9Fst0qXQqGpI6UI8yz1tj7yKi7DPrycJLRrjMpyTfyo="
+
+addons:
+  coverity_scan:
+    project:
+      name: "monitoring-plugins/monitoring-plugins"
+      description: "Monitoring Plugins"
+    notification_email: team@monitoring-plugins.org
+    build_command_prepend: tools/setup && ./configure
+    build_command: make
+    branch_pattern: coverity.*
diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS
index 7b8dbe22..50c714c3 100644
--- a/ACKNOWLEDGEMENTS
+++ b/ACKNOWLEDGEMENTS
@@ -1,6 +1,6 @@
-This file contains the origin of code copied verbatim into some or all of the Nagios plugins.
+This file contains the origin of code copied verbatim into some or all of the Monitoring Plugins.
 
-The NagiosPlugin team thanks the original authors.
+The Monitoring Plugins team thanks the original authors.
 
 Copied code is cited in the source by indented comments of the form
 
diff --git a/AUTHORS b/AUTHORS
index c761c389..50b6b3a0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-The Nagios Plugins are brought to you by the Nagios Plugins Development Team.
+The Monitoring Plugins are brought to you by the Monitoring Plugins Development Team.
 
 Jeremy T. Bouse
 Peter Bray
diff --git a/CODING b/CODING
index 15810655..74438e7c 100644
--- a/CODING
+++ b/CODING
@@ -12,8 +12,8 @@ Foundation Coding standards (which are currently available at
 http://www.gnu.org/prep/standards_toc.html). We also follow most of
 the FSF guidelines. Developers may suggest deviations from the FSF
 style recommendations, which will be considered by open discussion on
-the nagiosplug-devel mailing list. Any such deviations will apply to
-the entire code base to ensure consistency.
+the Monitoring Plugins devel mailing list. Any such deviations will
+apply to the entire code base to ensure consistency.
 
 Currently, the exceptions to FSF recommendations are roughly equivalent
 to GNU indent with invoked as 'indent -ts 2 -br'. Specifically, the
diff --git a/FAQ b/FAQ
index 4fb86536..20b837c6 100644
--- a/FAQ
+++ b/FAQ
@@ -15,7 +15,7 @@ A: All plugins that comply with minimal development guideline for
    this project include detailed version information.  When executed
    with the '-V' option, a version string will be printed:
 
-   check_radius v1.4.16 (nagios-plugins 1.4.16)
+   check_radius v1.4.16 (monitoring-plugins 1.4.16)
 
    All bug reports and help requests should reference this
    information.
@@ -32,7 +32,7 @@ A: At a minimum, the output from 'uname -a' and the version string
 Q: I'm using Redhat Linux (or some other RPM-based distribution).
    Which packages should I install?
 
-A: The package nagios-plugins-<version>.<arch>.rpm contains only
+A: The package monitoring-plugins-<version>.<arch>.rpm contains only
    those plugins that should work on any POSIX compliant system.  In
    other words, you should be able to install this package on your
    system, no matter what else is or in not installed.
@@ -42,7 +42,7 @@ A: The package nagios-plugins-<version>.<arch>.rpm contains only
    each dependency could be installed cleanly, but many people
    found that this resulted in too many packages.  So in the end,
    all the non-POSIX plugins were folded into one RPM 
-   (nagios-plugins-<version>.<arch>.rpm).  Most people will need to
+   (monitoring-plugins-<version>.<arch>.rpm).  Most people will need to
    use RPM's '--nodeps' option to install this package.
 
 
@@ -59,10 +59,10 @@ Q: I prefer to build my own RPMs. Do I need to install all of the
 
 A: Beginning with the 1.2.9-1 release, you may run
 
-   rpm --define 'custom 1' -ta nagios-plugins-<release>.tar.gz
+   rpm --define 'custom 1' -ta monitoring-plugins-<release>.tar.gz
 
    In prior releases, you must unpack the tarball and build the
-   RPM using nagios-custom.spec with 'rpm -ba'.
+   RPM using monitoring-custom.spec with 'rpm -ba'.
 
 
 Q: I get an error like
@@ -84,8 +84,8 @@ A: Commonly, system administrators will make security as tight as
 
 Q: I have a plugin to offer. What can I do?
 
-A: You can make it available on NagiosExchange (http://nagiosexchange.org)
+A: You can make it available on MonitoringExchange (http://monitoringexchange.org)
    where other people can find it for use.
 
    You can also get feedback on improving the plugin via the 
-   nagiosplug-devel@lists.sourceforge.net mailing list.
+   devel@monitoring-plugins.org mailing list.
diff --git a/Makefile.am b/Makefile.am
index 98542b94..517068ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 EXTRA_DIST = config.rpath \
         ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ LEGAL NEWS \
         NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
-        NPTest.pm pkg nagios-plugins.spec \
+        NPTest.pm pkg monitoring-plugins.spec \
         config_test/Makefile config_test/run_tests config_test/child_test.c \
         perlmods tools/build_perl_modules \
         tools/tinderbox_build
@@ -51,7 +51,7 @@ solpkg:
         cd $(BUILDDIR) && $(PERL) ../$(PKGSCRIPT) ../$(PACKDIR)
 
 THANKS: THANKS.in
-        @echo "This software is brought to you by the Nagios Plugins Development Team. However," > $@
+        @echo "This software is brought to you by the Monitoring Plugins Development Team. However," > $@
         @echo "there have been many contributors to this project. Everyone below has helped in " >> $@
         @echo "raising bug reports, creating patches or contributing new plugins." >> $@
         @echo "" >> $@
diff --git a/NEWS b/NEWS
index 153080d5..42ac42a6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,31 @@
 This file documents the major additions and syntax changes between releases.
 
+1.6 ...
+        ENHANCEMENTS
+        check_mailq now supports auto detection of qmail, postfix, exim and nullmailer with
+          fallback to sendmail
+        check_ide_smart now defaults to plugin output, original output appended with -v
+        Extra-Opts are now enabled by default
+        check_swap now supports a configurable state when there is no swap
+
+        FIXES
+        Don't let e.g. check_http's -C option reset SSL version if e.g. -S 1 -C 5 is specified
+        check_ide_smart could disable offline auto tests but could not re-enable them.
+          For this reason all SMART command modes have been disabled.
+        check_dig: fix wrong IPv6 arguments order (Stéphane Bortzmeyer)
+
+        WARNINGS
+        check_procs now ignores its parent process to avoid unexpected results when invoked via certain shells
+        utils.sh no longer defines ECH
+        check_ide_smart -q/--quiet and -n/--nagios (Nagios-compatile output) are now deprecated
+          but accepted for backward-compatibility
+        check_ide_smart -0/--auto-off, -1/--auto-on and -i/--immediate: options have
+          been disabled because they were broken
+        State retention: the NAGIOS_PLUGIN_STATE_DIRECTORY environment variable has been
+          renamed MP_STATE_DIRECTORY. The old variable will continue to work in v1.6.x
+        check_swap used to allow returning OK on a system without swap when only percent thresholds
+          were used. This is no longer the case and one must now use -n/--no-swap=<state>
+
 1.5 2nd October 2013
         ENHANCEMENTS
         New check_dbi plugin for checking an (SQL) database using DBI
@@ -288,7 +314,7 @@ This file documents the major additions and syntax changes between releases.
         check_icmp fix for *BSD when running for long time
         check_ping times out 1 second quicker if host is unreachable
         Root plugins installed with world executable
-        check_sybase from contrib now maintained in NagiosExchange
+        check_sybase from contrib now maintained in MonitoringExchange
         --with-nagios-user/group reinstated ./configure option
         New --without-world-permissions ./configure option
 
@@ -312,7 +338,7 @@ This file documents the major additions and syntax changes between releases.
         New C based check_ntp. The perl version is now deprecated.
         New check_apt plugin
         Notice: plugins in contrib/ will start to be removed from this distribution.
-          Please check at http://www.nagiosexchange.org for contributed plugins
+          Please check at http://www.monitoringexchange.org for contributed plugins
         Major bug fixes to check_disk where values were incorrectly calculated and alerted on.
         check_udp2 removed. check_udp is now linked to check_tcp.c
         check_mailq now errors if the sub-program run returns non-zero return code. This would appear
diff --git a/NPTest.pm b/NPTest.pm
index 9b856171..2baed0b0 100644
--- a/NPTest.pm
+++ b/NPTest.pm
@@ -1,7 +1,7 @@
 package NPTest;
 
 #
-# Helper Functions for testing Nagios Plugins
+# Helper Functions for testing Monitoring Plugins
 #
 
 require Exporter;
@@ -25,14 +25,14 @@ $VERSION = "1556."; # must be all one line, for MakeMaker
 
 =head1 NAME
 
-NPTest - Simplify the testing of Nagios Plugins
+NPTest - Simplify the testing of Monitoring Plugins
 
 =head1 DESCRIPTION
 
 This modules provides convenience functions to assist in the testing
-of Nagios Plugins, making the testing code easier to read and write;
+of Monitoring Plugins, making the testing code easier to read and write;
 hopefully encouraging the development of a more complete test suite for
-the Nagios Plugins. It is based on the patterns of testing seen in the
+the Monitoring Plugins. It is based on the patterns of testing seen in the
 1.4.0 release, and continues to use the L<Test> module as the basis of
 testing.
 
@@ -92,7 +92,7 @@ Testing of results would be done in your test script, not in this module.
 This function is obsolete. Use C<testCmd()> instead.
 
 This function attempts to encompass the majority of test styles used
-in testing Nagios Plugins. As each plug-in is a separate command, the
+in testing Monitoring Plugins. As each plug-in is a separate command, the
 typical tests we wish to perform are against the exit status of the
 command and the output (if any) it generated. Simplifying these tests
 into a single function call, makes the test harness easier to read and
@@ -132,7 +132,7 @@ of either C<Test::ok(...)> or C<Test::skip(...)>, so remember this
 when counting the number of tests to place in the C<Test::plan(...)>
 call.
 
-Many Nagios Plugins test network services, some of which may not be
+Many Monitoring Plugins test network services, some of which may not be
 present on all systems. To cater for this, C<checkCmd(...)> allows the
 tester to define exceptions based on the command's exit status. These
 exceptions are provided to skip tests if the test case developer
@@ -199,7 +199,7 @@ Copyright (c) 2005 Peter Bray.  All rights reserved.
 
 This package is free software and is provided "as is" without express
 or implied warranty.  It may be used, redistributed and/or modified
-under the same terms as the Nagios Plugins release.
+under the same terms as the Monitoring Plugins release.
 
 =cut
 
@@ -347,7 +347,7 @@ sub getTestParameter
   }
 
   # Set "none" if no terminal attached (eg, tinderbox build servers when new variables set)
-  return "" unless (-t STDERR);
+  return "" unless (-t STDIN);
 
   my $userResponse = "";
 
@@ -438,7 +438,7 @@ sub LoadCache
 
     chomp($fileContents);
     my( $contentsRef ) = eval $fileContents;
-    %CACHE = %{$contentsRef};
+    %CACHE = %{$contentsRef} if (defined($contentsRef));
 
   }
 
@@ -494,26 +494,35 @@ sub SetCacheFilename
 
 sub DetermineTestHarnessDirectory
 {
-  my( $userSupplied ) = @_;
+  my( @userSupplied ) = @_;
+  my @dirs;
 
   # User Supplied
-  if ( defined( $userSupplied ) && $userSupplied )
+  if ( @userSupplied > 0 )
   {
-    if ( -d $userSupplied )
+    for my $u ( @userSupplied )
     {
-      return $userSupplied;
-    }
-    else
-    {
-      return undef; # userSupplied is invalid -> FAIL
+      if ( -d $u )
+      {
+        push ( @dirs, $u );
+      }
     }
   }
 
-  # Simple Case : "t" is a subdirectory of the current directory
+  # Simple Cases: "t" and tests are subdirectories of the current directory
   if ( -d "./t" )
   {
-    return "./t";
+    push ( @dirs, "./t");
   }
+  if ( -d "./tests" )
+  {
+    push ( @dirs, "./tests");
+  }
+
+        if ( @dirs > 0 )
+        {
+                return @dirs;
+        }
 
   # To be honest I don't understand which case satisfies the
   # original code in test.pl : when $tstdir == `pwd` w.r.t.
@@ -526,7 +535,7 @@ sub DetermineTestHarnessDirectory
 
   if ( $pwd =~ m|/t$| )
   {
-    return $pwd;
+    push ( @dirs, $pwd );
 
     # The alternate that might work better is
     # chdir( ".." );
@@ -535,7 +544,7 @@ sub DetermineTestHarnessDirectory
     # to be tested is in the current directory (ie "./check_disk ....")
   }
 
-  return undef;
+  return @dirs;
 }
 
 sub TestsFrom
diff --git a/README b/README
index b3d65de8..beb77690 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
-Nagios Plugins
-==============
+Monitoring Plugins
+==================
 
-* For instructions on installing these plugins for use with Nagios,
-  see below.  In addition, generic instructions for the GNU toolchain can be
-  found in the `INSTALL` file.
+* For instructions on installing these plugins for use with your monitoring
+  system, see below.  In addition, generic instructions for the GNU
+  toolchain can be found in the `INSTALL` file.
 
 * For major changes between releases, read the `NEWS` file.
 
@@ -21,19 +21,20 @@ Nagios Plugins
 
 You can check for the latest plugins at:
 
-* <https://www.nagios-plugins.org/>
+* <https://www.monitoring-plugins.org/>
 
-Send an email to <nagiosplug-help@lists.sourceforge.net> for assistance.
-Please include the OS type and version that you are using.  Also, run the
-plugin with the `-vvv` option and provide the resulting version information.
-Of course, there may be additional diagnostic information required as well.
+Send an email to <help@monitoring-plugins.org> for assistance.  Please
+include the OS type and version that you are using.  Also, run the plugin
+with the `-vvv` option and provide the resulting version information.  Of
+course, there may be additional diagnostic information required as well.
 Use good judgment.
 
-Send an email to <nagiosplug-devel@lists.sourceforge.net> for developer
-discussions.
+Send an email to <devel@monitoring-plugins.org> for developer discussions.
 
 For patch submissions and bug reports, please use the appropriate resources
-at <https://github.com/nagios-plugins/nagios-plugins>.
+at:
+
+* <https://github.com/monitoring-plugins>
 
 
 Installation Instructions
@@ -45,17 +46,17 @@ Installation Instructions
         ./tools/setup
 
     For more detail, see the developer guidelines at
-    <https://www.nagios-plugins.org/doc/guidelines.html>.
+    <https://www.monitoring-plugins.org/doc/guidelines.html>.
 
 2.  Run the configure script to initialize variables and create a Makefile,
     etc.
 
         ./configure --prefix=BASEDIRECTORY --with-cgiurl=SOMEURL
 
-    Replace `BASEDIRECTORY` with the path of the directory under which Nagios
-    is installed (default is `/usr/local/nagios`), and replace `SOMEURL` with
-    the path used to access the Nagios CGIs with a web browser (default is
-    `/nagios/cgi-bin`).
+    Replace `BASEDIRECTORY` with the path of the directory under which your
+    monitoring system is installed (default is `/usr/local`), and replace
+    `SOMEURL` with the path used to access the monitoring system CGIs with a
+    web browser (default is `/nagios/cgi-bin`).
 
 3.  Compile the plugins with the following command:
 
@@ -77,14 +78,21 @@ Installation Instructions
         make install-root
 
 That's it!  If you have any problems or questions, feel free to send an
-email to <nagiosplug-help@lists.sourceforge.net>.
+email to <help@monitoring-plugins.org>.
+
 
+License Notice
+--------------
 
-License Stuff
--------------
+You can redistribute and/or modify this software under the terms of the GNU
+General Public License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version; with the
+additional exemption that compiling, linking, and/or using OpenSSL is
+allowed.
 
-This software is released under the GNU General Public License, Version 3,
-with the additional exemption that compiling, linking and/or using OpenSSL
-is allowed.
+This software is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.
 
-See the `COPYING` file for the complete GPLv3 text.
+See the `COPYING` file for the complete text of the GNU General Public
+License, version 3.
diff --git a/REQUIREMENTS b/REQUIREMENTS
index 1f673e98..b2bd467b 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -1,4 +1,4 @@
-Nagios Plugin Requirements
+Monitoring Plugins Requirements
 --------------------------
 
 Some plugins require that you have additional programs and/or
diff --git a/SUPPORT b/SUPPORT
index f1705aaa..d2a2b7de 100644
--- a/SUPPORT
+++ b/SUPPORT
@@ -1,14 +1,14 @@
 SUPPORT
 
-Using the mailing lists and tracker databases at SourceForge are the
-best ways to obtain direct support for the Nagios Plugins. There may
+Using the mailing lists and issue tracker at GitHub are the
+best ways to obtain direct support for the Monitoring Plugins. There may
 also be commercial support options available to you -- check
 http://www.nagios.org/ to track the current status of commercial
 support offerings.
 
-There are two mailing lists associated with Nagios Plugin development:
-'help' (mailto:nagiosplug-help@lists.sourceforge.net), and 'devel'
-(mailto:nagiosplug-devel@lists.sourceforge.net). Unless you are fairly
+There are two mailing lists associated with Monitoring Plugins development:
+'help' (mailto:help@monitoring-plugins.org), and 'devel'
+(mailto:help@monitoring-plugins.org). Unless you are fairly
 certain you have found a bug or that you are requesting a new feature,
 please direct support requests to 'help'.
 
@@ -18,8 +18,8 @@ their time to fix bug and provide feature requests, it is generally in
 you interest to do a modest amount of legwork before posting to either
 of these lists.
 
-Plugins that are in the contrib directories are provided as-is. We will 
-try to help, but sometimes the plugins have dependencies that the nagios-plugin
+Plugins that are in the contrib directories are provided as-is. We will
+try to help, but sometimes the plugins have dependencies that the monitoring-plugin
 developers do not have access to. You may be able to try the authors
 directly.
 
@@ -34,7 +34,7 @@ Requests to 'help' require posting the version number of the
 plugin. The best place to include the version information is in the
 subject. A good post would have a subject like:
 
-  Can I use SSL with check_imap (nagios-plugins 1.3.0-beta2) 1.12
+  Can I use SSL with check_imap (monitoring-plugins 1.3.0-beta2) 1.12
 
 If you do not include the version of the plugin, you risk having your
 post silently ignored.
@@ -48,17 +48,17 @@ REPORTING BUGS AND SUBMITTING PATCHES
 
 Bug reports, investigations of possible bugs, feature requests, and
 patch submissions should be submitted to the development list at
-mailto:nagiosplug-devel@lists.sourceforge.net. Please raise an issue first 
+mailto:devel@monitoring-plugins.org. Please raise an issue first
 in GitHub, otherwise your email is likely to be missed over time.
 
-You should identify the version, preferably in the subject line. 
-However, to best use developer resources, it is suggested that you 
+You should identify the version, preferably in the subject line.
+However, to best use developer resources, it is suggested that you
 reference your report to one of the following sources:
 
   1) The most recent release, including beta's
 
   2) The current snapshots (there's a link provided on
-     https://www.nagios-plugins.org/download.html)
+     https://www.monitoring-plugins.org/download.html)
 
   3) The current Git code from GitHub
 
diff --git a/THANKS.in b/THANKS.in
index c5e6057a..be13a9d3 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -301,4 +301,9 @@ Pall Sigurdsson
 Sebastian Schmidt
 Simon Kainz
 Steve Weinreich
+Geoff Oakham
 Tim Laszlo
+Stéphane Bortzmeyer
+Luca Corti
+Jethro Carr
+Evgeni Golov
diff --git a/configure.in b/configure.ac
index 7562ca41..5759e60b 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,19 +1,18 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.5)
+AC_INIT(monitoring-plugins,1.5)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile 
-        nagios-plugins.spec])
+        monitoring-plugins.spec])
 AC_CONFIG_AUX_DIR(build-aux)
 AM_INIT_AUTOMAKE([1.8.3])
-AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE([enable])
+AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_HOST
 
 RELEASE=1
 AC_SUBST(RELEASE)
 
-AC_PREFIX_DEFAULT(/usr/local/nagios)
-
 dnl Deprecated configure options
 
 
@@ -58,10 +57,10 @@ AC_SUBST(PLUGIN_TEST)dnl
 SCRIPT_TEST=`echo $srcdir/plugins-scripts/t/*.t|sed -e 's,\.*/plugins-scripts/,,g'`
 AC_SUBST(SCRIPT_TEST)dnl
 
-WARRANTY="The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n"
+WARRANTY="The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n"
 AC_SUBST(WARRANTY)
 
-SUPPORT="Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n"
+SUPPORT="Send email to help@monitoring-plugins.org if you have questions regarding use\nof this software. To submit patches or suggest improvements, send email to\ndevel@monitoring-plugins.org. Please include version information with all\ncorrespondence (when possible, use output from the --version option of the\nplugin itself).\n"
 AC_SUBST(SUPPORT)
 
 dnl CGIURL has changed for Nagios with 1.0 beta
@@ -193,7 +192,7 @@ AC_ARG_ENABLE(extra-opts,
   AC_HELP_STRING([--enable-extra-opts],
                 [Enables parsing of plugins ini config files for extra options (default: no)]),
         [enable_extra_opts=$enableval],
-        [enable_extra_opts=no])
+        [enable_extra_opts=yes])
 AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
 if test "$enable_extra_opts" = "yes" ; then
         AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
@@ -647,7 +646,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; then
         ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_cols=9
-        AC_MSG_RESULT([using nagios-plugins internal ps command (pst3) for solaris])
+        AC_MSG_RESULT([using monitoring-plugins internal ps command (pst3) for solaris])
         if test `isainfo -b` = 64 ; then
                 pst3_use_64bit=1
                 AC_MSG_NOTICE([using 64bit pst3])
@@ -1730,7 +1729,7 @@ AC_ARG_ENABLE(redhat-pthread-workaround,
         [ac_cv_enable_redhat_pthread_workaround=test])
 if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then
         if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then
-                AC_MSG_NOTICE([See http://nagiosplugins.org/faq/compile/configure_appears_to_hang if this next part takes a long time])
+                AC_MSG_NOTICE([See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time])
                 AC_MSG_CHECKING(for redhat spopen problem)
                 ( cd config_test && make && make test ) > /dev/null 2>&1
                 if test $? -eq 0 ; then
@@ -1747,7 +1746,7 @@ fi
 dnl Perl modules
 AC_ARG_ENABLE(perl-modules,
         AC_HELP_STRING([--enable-perl-modules],
-                [Enables installation of Nagios::Plugin and its dependencies (default: no)]),
+                [Enables installation of Monitoring::Plugin and its dependencies (default: no)]),
         [enable_perl_modules=$enableval],
         [enable_perl_modules=no])
 if test "$enable_perl_modules" = "yes" ; then
diff --git a/doc/LEAVERS b/doc/LEAVERS
index 65af3102..a52a6008 100644
--- a/doc/LEAVERS
+++ b/doc/LEAVERS
@@ -10,5 +10,5 @@ Administration tasks:
   - Remove from GitHub's project members. This will include Git access.
   - Remove access from project server
   - If applicable, remove from mailing list administrators
-  - Keep on nagiosplug-team mailing list, unless specifically requested to be removed
+  - Keep on team mailing list, unless specifically requested to be removed
 
diff --git a/doc/NEW_STARTERS b/doc/NEW_STARTERS
index ba194492..2c5aac88 100644
--- a/doc/NEW_STARTERS
+++ b/doc/NEW_STARTERS
@@ -4,12 +4,12 @@ These are the steps for adding someone to the team.
 
 Need to know:
   - Name
-  - Primary email for nagiosplug-team mailings
+  - Primary email for team mailings
   - GitHub account
   - Type of member (translator, developer, release manager, project administrator)
 
-1. Add member to nagiosplug-team mailing list (https://lists.sourceforge.net/lists/admin/nagiosplug-team)
-   and to the nagiosplug-checkins mailing list (https://lists.sourceforge.net/lists/admin/nagiosplug-checkins,
+1. Add member to team mailing list (https://www.monitoring-plugins.org/list/listinfo/team/)
+   and to the commits mailing list (https://www.monitoring-plugins.org/list/listinfo/commits/),
    add sourceforge email address via Privacy Options->Sender filters)
 2. Add Sourceforge access:
   - Translator: CVS access, Shell access, Release Tech (no)
@@ -21,4 +21,4 @@ Need to know:
 3. Create account on project server
   - Add public ssh keys
 4. Add Git access on repos.or.cz
-5. Send email to nagiosplug-team introducing new member
+5. Send email to team introducing new member
diff --git a/doc/RELEASING b/doc/RELEASING
index 34bed939..1eaec9de 100644
--- a/doc/RELEASING
+++ b/doc/RELEASING
@@ -1,8 +1,5 @@
 NOTES ON RELEASING NEW VERSION OF NAGIOSPLUG
 
-NB: A copy of this document is located at:
-    http://nagiosplugins.org/node/96
-
 *** Pre-release
 git pull
 . tools/devmode, if feeling adventurous
@@ -24,15 +21,15 @@ git push origin master
 git push origin release-1.4.14
 
 *** Checkout new version
-rm -fr /tmp/nagioslug
+rm -fr /tmp/monitoringlug
 # If you need to checkout the tag, don't forget to "checkout master" later to
 # get back to your development branch:
 git checkout tags/release-1.4.14
 # Beware: the trailing slash of --prefix is REQUIRED
-git checkout-index --prefix=/tmp/nagioslug/ -a
+git checkout-index --prefix=/tmp/monitoringlug/ -a
 
 *** Build the tarball
-cd /tmp/nagioslug
+cd /tmp/monitoringlug
 tools/setup
 ./configure
 make dist
@@ -43,7 +40,7 @@ SF username and password
 cd /uploads
 put file
 
-SF -> Submit News about release. Make sure it is called "Nagios Plugins" (with those caps)
+SF -> Submit News about release. Make sure it is called "Monitoring Plugins" (with those caps)
 Link to download at http://sourceforge.net/project/showfiles.php?group_id=29880
 Include contents of NEWS for this release
 List all people on team involved.
@@ -60,5 +57,5 @@ Step 3: *.tar.gz, Platform Independent, Source .gz
 Step 4: Send notice
 
 *** Announce new release
-Send email to nagiosplug-help, nagios-announce with the news text
-Add a news item to http://nagiosplugins.org
+Send email to help, announce with the news text
+Add a news item to https://monitoring-plugins.org
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 61b9f178..d9340285 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -1,18 +1,18 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" >
 <book>
-  <title>Nagios Plugin Development Guidelines</title>
+  <title>Monitoring Plugins Development Guidelines</title>
 
   <bookinfo>
     <authorgroup>
       <author>
         <affiliation>
-          <orgname>Nagios Plugins Development Team</orgname>
+          <orgname>Monitoring Plugins Development Team</orgname>
         </affiliation>
       </author>
     </authorgroup>
 
     <pubdate>2013</pubdate>
-    <title>Nagios Plugin Development Guidelines</title>
+    <title>Monitoring Plugins Development Guidelines</title>
         
     <revhistory>
        <revision>
@@ -23,7 +23,7 @@
 
         <copyright>
                 <year>2000 - 2013</year>
-                <holder>Nagios Plugins Development Team</holder>
+                <holder>Monitoring Plugins Development Team</holder>
         </copyright>
 
 </bookinfo>
@@ -34,8 +34,8 @@
     the plugin developers and encourage the standarization of the
     different kind of plugins: C, shell, perl, python, etc.</para>
 
-        <para>Nagios Plugin Development Guidelines Copyright (C) 2000-2013
-        (Nagios Plugins Team)</para>
+        <para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2013
+        (Monitoring Plugins Team)</para>
 
         <para>Permission is granted to make and distribute verbatim
         copies of this manual provided the copyright notice and this
@@ -48,8 +48,8 @@
 <article>
 <section id="DevRequirements"><title>Development platform requirements</title>
         <para>
-        Nagios Plugins are developed to the GNU standard, so any OS which is supported by GNU
-        should run the plugins. While the requirements for compiling the Nagios Plugins release 
+        Monitoring Plugins are developed to the GNU standard, so any OS which is supported by GNU
+        should run the plugins. While the requirements for compiling the Monitoring Plugins release
         are very basic, developing from the Git repository requires additional software to be
         installed. These are the minimum levels of software required:
 
@@ -152,7 +152,7 @@
                 <section><title>Plugin Return Codes</title>
                 <para>The return codes below are based on the POSIX spec of returning
                 a positive value.  Netsaint prior to v0.0.7 supported non-POSIX
-                compliant return code of "-1" for unknown.  Nagios supports POSIX return
+                compliant return code of "-1" for unknown. Nagios supports POSIX return
                 codes by default.</para>
 
                 <para>Note: Some plugins will on occasion print on STDOUT that an error
@@ -379,7 +379,7 @@
                         </listitem>
                 </orderedlist>
 
-                <para>It is up to third party programs to convert the Nagios Plugins 
+                <para>It is up to third party programs to convert the Monitoring Plugins
                 performance data into graphs.</para>
                 </section>
 
@@ -678,11 +678,6 @@ To run a test, from the top level directory, run "make test". This will run
 all the current tests and report an overall success rate.
 </para>
 
-<para>
-See the <ulink url="http://tinderbox.opsera.com">Nagios Plugins Tinderbox server</ulink>
-for the daily test results.
-</para>
-
 <section><title>Test cases for plugins</title>
 <para>These use perl's Test::More. To do a one time test, run "cd plugins && perl t/check_disk.t".
 </para>
@@ -699,7 +694,7 @@ This runs the test in a summary format.
 
 <para>
 For a good and amusing tutorial on using Test::More, see this 
-<ulink url="http://search.cpan.org/~mschwern/Test-Simple-0.62/lib/Test/Tutorial.pod">
+<ulink url="http://search.cpan.org/dist/Test-Simple/lib/Test/Tutorial.pod">
 link</ulink>
 </para>
 
@@ -720,7 +715,7 @@ properly on non-FreeBSD systems. Install with 'CPPFLAGS="-UHAVE_LIBPTHREAD" ./co
 </para>
 
 <para>
-When you run Nagios Plugins' configure, it will look for the tap library and will automatically
+When you run Monitoring Plugins' configure, it will look for the tap library and will automatically
 setup the tests. Run "make test" to run all the tests.
 </para>
 </section>
@@ -752,9 +747,9 @@ setup the tests. Run "make test" to run all the tests.
         </section>
 
         <section><title>Commit Messages</title>
-        <para>If the change is due to a contribution, please quote the contributor's name 
-        and, if applicable, add the SourceForge Tracker number. Don't forget to 
-update the THANKS.in file.</para>
+        <para>If the change is due to a contribution, please quote the contributor's name
+        and, if applicable, add the GitHub Issue Tracker number. Don't forget to
+  update the THANKS.in file.</para>
         <para>If you have a change that is useful for noting in the next release, please
         update the NEWS file.</para>
         <para>All commits will be written to a ChangeLog at release time.
@@ -765,7 +760,7 @@ update the THANKS.in file.</para>
         <para>To make the job easier for translators, please follow these guidelines:</para>
         <orderedlist>
           <listitem><para>
-            Before creating new strings, check the po/nagios-plugins.pot file to 
+            Before creating new strings, check the po/monitoring-plugins.pot file to
             see if a similar string
             already exists
           </para></listitem>
@@ -795,15 +790,15 @@ update the THANKS.in file.</para>
         version you are using. For new features, please supply a diff against
         the Git "master" branch.</para>
 
-        <para>Patches should be submitted via 
-        <ulink url="http://sourceforge.net/tracker/?group_id=29880&amp;atid=397599">SourceForge's
-        tracker system for Nagiosplug patches</ulink> 
-        and be announced to the nagiosplug-devel mailing list.</para>
+        <para>Patches should be submitted via
+        <ulink url="https://github.com/monitoring-plugins/monitoring-plugins/pulls">GitHub's
+        Pull requests for Monitoring Plugins</ulink>
+        </para>
 
         <para>Submission of a patch implies that the submmitter acknowledges that they
         are the author of the code (or have permission from the author to release the code)
-        and agree that the code can be released under the GPL. The copyright for the changes will 
-        then revert to the Nagios Plugin Development Team - this is required so that any copyright 
+        and agree that the code can be released under the GPL. The copyright for the changes will
+        then revert to the Monitoring Plugins Development Team - this is required so that any copyright
         infringements can be investigated quickly without contacting a huge list of copyright holders.
         Credit will always be given for any patches through a THANKS file in the distribution.</para>
         </section>
@@ -811,22 +806,22 @@ update the THANKS.in file.</para>
 
         <section id="Contributedplugins"><title>Contributed plugins</title>
         <para>Plugins that have been contributed to the project and 
-        distributed with the Nagios Plugin files are held in the contrib/ directory and are not installed
+        distributed with the Monitoring Plugins files are held in the contrib/ directory and are not installed
         by default. These plugins are not officially supported by the team. 
         The current policy is that these plugins should be owned and maintained by the original 
-        contributor, preferably hosted on <ulink url="http://exchange.nagios.org">Nagios Exchange</ulink>.
+        contributor, preferably hosted on <ulink url="http://monitoringexchange.org">Monitoring Exchange</ulink>.
         </para>
         <para>If patches or bugs are raised to an contributed plugin, we will start communications with the
         original contributor, but seek to remove the plugin from our distribution.
         </para>
-        <para>The aim is to distribute only code that the Nagios Plugin team are responsible for.
+        <para>The aim is to distribute only code that the Monitoring Plugins team are responsible for.
         </para>
         </section>
 
         <section id="Newplugins"><title>New plugins</title>
         <para>If you would like others to use your plugins, please add it to
         the official 3rd party plugin repository, 
-        <ulink url="http://exchange.nagios.org">Nagios Exchange</ulink>.
+        <ulink url="http://monitoringexchange.org">Monitoring Exchange</ulink>.
         </para>
 
         <para>We are not accepting requests for inclusion of plugins into 
@@ -837,7 +832,7 @@ update the THANKS.in file.</para>
       <orderedlist>
         <listitem>
           <para>Include copyright and license information in all files. Copyright must be solely
-                granted to the Nagios Plugin Development Team</para>
+                granted to the Monitoring Plugins Development Team</para>
         </listitem>
         <listitem>
           <para>The standard command options are supported (--help, --version,
diff --git a/gl/Makefile.am b/gl/Makefile.am
index c2e8e5a6..4339b2c6 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext mountlist regex setenv strsep timegm unsetenv vasprintf vsnprintf
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext mountlist regex setenv strcase strsep timegm unsetenv vasprintf vsnprintf
 
 AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects
 
@@ -1536,6 +1536,15 @@ EXTRA_DIST += stdlib.in.h
 
 ## end   gnulib module stdlib
 
+## begin gnulib module strcase
+
+
+EXTRA_DIST += strcasecmp.c strncasecmp.c
+
+EXTRA_libgnu_a_SOURCES += strcasecmp.c strncasecmp.c
+
+## end   gnulib module strcase
+
 ## begin gnulib module streq
 
 
@@ -1661,6 +1670,37 @@ EXTRA_DIST += string.in.h
 
 ## end   gnulib module string
 
+## begin gnulib module strings
+
+BUILT_SOURCES += strings.h
+
+# We need the following in order to create <strings.h> when the system
+# doesn't have one that works with the given compiler.
+strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''GUARD_PREFIX''@|GL|g' \
+              -e 's|@''HAVE_STRINGS_H''@|$(HAVE_STRINGS_H)|g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+              -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
+              -e 's|@''GNULIB_FFS''@|$(GNULIB_FFS)|g' \
+              -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
+              -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
+              -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+              < $(srcdir)/strings.in.h; \
+        } > $@-t && \
+        mv $@-t $@
+MOSTLYCLEANFILES += strings.h strings.h-t
+
+EXTRA_DIST += strings.in.h
+
+## end   gnulib module strings
+
 ## begin gnulib module strndup
 
 
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 2ed35096..e61a5362 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext mountlist regex setenv strsep timegm unsetenv vasprintf vsnprintf
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files base64 crypto/sha1 dirname environ floorf fsusage getaddrinfo gethostname getloadavg getopt-gnu gettext mountlist regex setenv strcase strsep timegm unsetenv vasprintf vsnprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -46,6 +46,7 @@ gl_MODULES([
   mountlist
   regex
   setenv
+  strcase
   strsep
   timegm
   unsetenv
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index f23f7698..b3cb4c12 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -119,10 +119,12 @@ AC_DEFUN([gl_EARLY],
   # Code from module stdint:
   # Code from module stdio:
   # Code from module stdlib:
+  # Code from module strcase:
   # Code from module streq:
   # Code from module strerror:
   # Code from module strerror-override:
   # Code from module string:
+  # Code from module strings:
   # Code from module strndup:
   # Code from module strnlen:
   # Code from module strsep:
@@ -377,6 +379,15 @@ AC_DEFUN([gl_INIT],
   gl_STDINT_H
   gl_STDIO_H
   gl_STDLIB_H
+  gl_STRCASE
+  if test $HAVE_STRCASECMP = 0; then
+    AC_LIBOBJ([strcasecmp])
+    gl_PREREQ_STRCASECMP
+  fi
+  if test $HAVE_STRNCASECMP = 0; then
+    AC_LIBOBJ([strncasecmp])
+    gl_PREREQ_STRNCASECMP
+  fi
   gl_FUNC_STRERROR
   if test $REPLACE_STRERROR = 1; then
     AC_LIBOBJ([strerror])
@@ -390,6 +401,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_SYS_H_WINSOCK2
   fi
   gl_HEADER_STRING_H
+  gl_HEADER_STRINGS_H
   gl_FUNC_STRNDUP
   if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then
     AC_LIBOBJ([strndup])
@@ -706,12 +718,15 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/stdio.in.h
   lib/stdlib.in.h
   lib/str-two-way.h
+  lib/strcasecmp.c
   lib/streq.h
   lib/strerror-override.c
   lib/strerror-override.h
   lib/strerror.c
   lib/string.in.h
+  lib/strings.in.h
   lib/stripslash.c
+  lib/strncasecmp.c
   lib/strndup.c
   lib/strnlen.c
   lib/strsep.c
@@ -845,8 +860,10 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/stdint_h.m4
   m4/stdio_h.m4
   m4/stdlib_h.m4
+  m4/strcase.m4
   m4/strerror.m4
   m4/string_h.m4
+  m4/strings_h.m4
   m4/strndup.m4
   m4/strnlen.m4
   m4/strsep.m4
diff --git a/gl/m4/strcase.m4 b/gl/m4/strcase.m4
new file mode 100644
index 00000000..22bf57c9
--- /dev/null
+++ b/gl/m4/strcase.m4
@@ -0,0 +1,45 @@
+# strcase.m4 serial 11
+dnl Copyright (C) 2002, 2005-2013 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_STRCASE],
+[
+  gl_FUNC_STRCASECMP
+  gl_FUNC_STRNCASECMP
+])
+
+AC_DEFUN([gl_FUNC_STRCASECMP],
+[
+  AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS])
+  AC_CHECK_FUNCS([strcasecmp])
+  if test $ac_cv_func_strcasecmp = no; then
+    HAVE_STRCASECMP=0
+  fi
+])
+
+AC_DEFUN([gl_FUNC_STRNCASECMP],
+[
+  AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS])
+  AC_CHECK_FUNCS([strncasecmp])
+  if test $ac_cv_func_strncasecmp = yes; then
+    HAVE_STRNCASECMP=1
+  else
+    HAVE_STRNCASECMP=0
+  fi
+  AC_CHECK_DECLS([strncasecmp])
+  if test $ac_cv_have_decl_strncasecmp = no; then
+    HAVE_DECL_STRNCASECMP=0
+  fi
+])
+
+# Prerequisites of lib/strcasecmp.c.
+AC_DEFUN([gl_PREREQ_STRCASECMP], [
+  :
+])
+
+# Prerequisites of lib/strncasecmp.c.
+AC_DEFUN([gl_PREREQ_STRNCASECMP], [
+  :
+])
diff --git a/gl/m4/strings_h.m4 b/gl/m4/strings_h.m4
new file mode 100644
index 00000000..76ef2424
--- /dev/null
+++ b/gl/m4/strings_h.m4
@@ -0,0 +1,52 @@
+# Configure a replacement for <strings.h>.
+# serial 6
+
+# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_HEADER_STRINGS_H],
+[
+  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
+  dnl once only, before all statements that occur in other macros.
+  AC_REQUIRE([gl_HEADER_STRINGS_H_BODY])
+])
+
+AC_DEFUN([gl_HEADER_STRINGS_H_BODY],
+[
+  AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS])
+
+  gl_CHECK_NEXT_HEADERS([strings.h])
+  if test $ac_cv_header_strings_h = yes; then
+    HAVE_STRINGS_H=1
+  else
+    HAVE_STRINGS_H=0
+  fi
+  AC_SUBST([HAVE_STRINGS_H])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use.
+  gl_WARN_ON_USE_PREPARE([[
+    /* Minix 3.1.8 has a bug: <sys/types.h> must be included before
+       <strings.h>.  */
+    #include <sys/types.h>
+    #include <strings.h>
+    ]], [ffs strcasecmp strncasecmp])
+])
+
+AC_DEFUN([gl_STRINGS_MODULE_INDICATOR],
+[
+  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
+  AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS])
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+])
+
+AC_DEFUN([gl_HEADER_STRINGS_H_DEFAULTS],
+[
+  GNULIB_FFS=0;            AC_SUBST([GNULIB_FFS])
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_FFS=1;              AC_SUBST([HAVE_FFS])
+  HAVE_STRCASECMP=1;       AC_SUBST([HAVE_STRCASECMP])
+  HAVE_DECL_STRNCASECMP=1; AC_SUBST([HAVE_DECL_STRNCASECMP])
+])
diff --git a/gl/strcasecmp.c b/gl/strcasecmp.c
new file mode 100644
index 00000000..0f0a742f
--- /dev/null
+++ b/gl/strcasecmp.c
@@ -0,0 +1,62 @@
+/* Case-insensitive string comparison function.
+   Copyright (C) 1998-1999, 2005-2007, 2009-2013 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <string.h>
+
+#include <ctype.h>
+#include <limits.h>
+
+#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
+
+/* Compare strings S1 and S2, ignoring case, returning less than, equal to or
+   greater than zero if S1 is lexicographically less than, equal to or greater
+   than S2.
+   Note: This function does not work with multibyte strings!  */
+
+int
+strcasecmp (const char *s1, const char *s2)
+{
+  const unsigned char *p1 = (const unsigned char *) s1;
+  const unsigned char *p2 = (const unsigned char *) s2;
+  unsigned char c1, c2;
+
+  if (p1 == p2)
+    return 0;
+
+  do
+    {
+      c1 = TOLOWER (*p1);
+      c2 = TOLOWER (*p2);
+
+      if (c1 == '\0')
+        break;
+
+      ++p1;
+      ++p2;
+    }
+  while (c1 == c2);
+
+  if (UCHAR_MAX <= INT_MAX)
+    return c1 - c2;
+  else
+    /* On machines where 'char' and 'int' are types of the same size, the
+       difference of two 'unsigned char' values - including the sign bit -
+       doesn't fit in an 'int'.  */
+    return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0);
+}
diff --git a/gl/strings.in.h b/gl/strings.in.h
new file mode 100644
index 00000000..4469f86c
--- /dev/null
+++ b/gl/strings.in.h
@@ -0,0 +1,122 @@
+/* A substitute <strings.h>.
+
+   Copyright (C) 2007-2013 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _@GUARD_PREFIX@_STRINGS_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* Minix 3.1.8 has a bug: <sys/types.h> must be included before <strings.h>.
+   But avoid namespace pollution on glibc systems.  */
+#if defined __minix && !defined __GLIBC__
+# include <sys/types.h>
+#endif
+
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_STRINGS_H@
+# @INCLUDE_NEXT@ @NEXT_STRINGS_H@
+#endif
+
+#ifndef _@GUARD_PREFIX@_STRINGS_H
+#define _@GUARD_PREFIX@_STRINGS_H
+
+#if ! @HAVE_DECL_STRNCASECMP@
+/* Get size_t.  */
+# include <stddef.h>
+#endif
+
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+  /* Find the index of the least-significant set bit.  */
+#if @GNULIB_FFS@
+# if !@HAVE_FFS@
+_GL_FUNCDECL_SYS (ffs, int, (int i));
+# endif
+_GL_CXXALIAS_SYS (ffs, int, (int i));
+_GL_CXXALIASWARN (ffs);
+#elif defined GNULIB_POSIXCHECK
+# undef ffs
+# if HAVE_RAW_DECL_FFS
+_GL_WARN_ON_USE (ffs, "ffs is not portable - use the ffs module");
+# endif
+#endif
+
+/* Compare strings S1 and S2, ignoring case, returning less than, equal to or
+   greater than zero if S1 is lexicographically less than, equal to or greater
+   than S2.
+   Note: This function does not work in multibyte locales.  */
+#if ! @HAVE_STRCASECMP@
+extern int strcasecmp (char const *s1, char const *s2)
+     _GL_ARG_NONNULL ((1, 2));
+#endif
+#if defined GNULIB_POSIXCHECK
+/* strcasecmp() does not work with multibyte strings:
+   POSIX says that it operates on "strings", and "string" in POSIX is defined
+   as a sequence of bytes, not of characters.   */
+# undef strcasecmp
+# if HAVE_RAW_DECL_STRCASECMP
+_GL_WARN_ON_USE (strcasecmp, "strcasecmp cannot work correctly on character "
+                 "strings in multibyte locales - "
+                 "use mbscasecmp if you care about "
+                 "internationalization, or use c_strcasecmp , "
+                 "gnulib module c-strcase) if you want a locale "
+                 "independent function");
+# endif
+#endif
+
+/* Compare no more than N bytes of strings S1 and S2, ignoring case,
+   returning less than, equal to or greater than zero if S1 is
+   lexicographically less than, equal to or greater than S2.
+   Note: This function cannot work correctly in multibyte locales.  */
+#if ! @HAVE_DECL_STRNCASECMP@
+extern int strncasecmp (char const *s1, char const *s2, size_t n)
+     _GL_ARG_NONNULL ((1, 2));
+#endif
+#if defined GNULIB_POSIXCHECK
+/* strncasecmp() does not work with multibyte strings:
+   POSIX says that it operates on "strings", and "string" in POSIX is defined
+   as a sequence of bytes, not of characters.  */
+# undef strncasecmp
+# if HAVE_RAW_DECL_STRNCASECMP
+_GL_WARN_ON_USE (strncasecmp, "strncasecmp cannot work correctly on character "
+                 "strings in multibyte locales - "
+                 "use mbsncasecmp or mbspcasecmp if you care about "
+                 "internationalization, or use c_strncasecmp , "
+                 "gnulib module c-strcase) if you want a locale "
+                 "independent function");
+# endif
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _@GUARD_PREFIX@_STRING_H */
+#endif /* _@GUARD_PREFIX@_STRING_H */
diff --git a/gl/strncasecmp.c b/gl/strncasecmp.c
new file mode 100644
index 00000000..35840bc0
--- /dev/null
+++ b/gl/strncasecmp.c
@@ -0,0 +1,62 @@
+/* strncasecmp.c -- case insensitive string comparator
+   Copyright (C) 1998-1999, 2005-2007, 2009-2013 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <string.h>
+
+#include <ctype.h>
+#include <limits.h>
+
+#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
+
+/* Compare no more than N bytes of strings S1 and S2, ignoring case,
+   returning less than, equal to or greater than zero if S1 is
+   lexicographically less than, equal to or greater than S2.
+   Note: This function cannot work correctly in multibyte locales.  */
+
+int
+strncasecmp (const char *s1, const char *s2, size_t n)
+{
+  register const unsigned char *p1 = (const unsigned char *) s1;
+  register const unsigned char *p2 = (const unsigned char *) s2;
+  unsigned char c1, c2;
+
+  if (p1 == p2 || n == 0)
+    return 0;
+
+  do
+    {
+      c1 = TOLOWER (*p1);
+      c2 = TOLOWER (*p2);
+
+      if (--n == 0 || c1 == '\0')
+        break;
+
+      ++p1;
+      ++p2;
+    }
+  while (c1 == c2);
+
+  if (UCHAR_MAX <= INT_MAX)
+    return c1 - c2;
+  else
+    /* On machines where 'char' and 'int' are types of the same size, the
+       difference of two 'unsigned char' values - including the sign bit -
+       doesn't fit in an 'int'.  */
+    return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0);
+}
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 99fa591a..1515312c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,15 +2,15 @@
 
 SUBDIRS = . tests
 
-noinst_LIBRARIES = libnagiosplug.a
+noinst_LIBRARIES = libmonitoringplug.a
 
 AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\"
 
-libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c
+libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c
 EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h
 
 if USE_PARSE_INI
-libnagiosplug_a_SOURCES += parse_ini.c extra_opts.c
+libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c
 endif USE_PARSE_INI
 
 INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index 2939c7a1..f4d5e66a 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios-plugins extra_opts library
+* Monitoring Plugins extra_opts library
 * 
 * License: GPL
-* Copyright (c) 2007 Nagios Plugins Development Team
+* Copyright (c) 2007 Monitoring Plugins Development Team
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/lib/extra_opts.h b/lib/extra_opts.h
index 4bb7b73b..8ff14a16 100644
--- a/lib/extra_opts.h
+++ b/lib/extra_opts.h
@@ -2,7 +2,7 @@
 #define _EXTRA_OPTS_H_
 
 /*
- * extra_opts.h: routines for loading nagios-plugin defaults from ini
+ * extra_opts.h: routines for loading monitoring-plugin defaults from ini
  * configuration files.
  */
 
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 004396fe..76953e9e 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios-plugins parse_ini library
+* Monitoring Plugins parse_ini library
 * 
 * License: GPL
-* Copyright (c) 2007 Nagios Plugins Development Team
+* Copyright (c) 2007 Monitoring Plugins Development Team
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts);
 static int add_option(FILE *f, np_arg_list **optlst);
 /* internal function to find default file */
 static char* default_file(void);
-/* internal function to stat() files */
+/* internal function to test files access */
 static int test_file(const char* env, int len, const char* file, char* temp_file);
 
 /* parse_locator decomposes a string of the form
@@ -101,7 +101,7 @@ np_arg_list* np_get_defaults(const char *locator, const char *default_section){
                 } else {
                         inifile=fopen(i.file, "r");
                 }
-                if(inifile==NULL) die(STATE_UNKNOWN, _("Can't read config file"));
+                if(inifile==NULL) die(STATE_UNKNOWN, "%s\n", _("Can't read config file"));
                 if(read_defaults(inifile, i.stanza, &defaults)==FALSE)
                         die(STATE_UNKNOWN, _("Invalid section '%s' in config file '%s'\n"), i.stanza, i.file);
 
@@ -163,7 +163,7 @@ static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts){
                                          * we're dealing with a config error
                                          */
                                         case NOSTANZA:
-                                                die(STATE_UNKNOWN, _("Config file error"));
+                                                die(STATE_UNKNOWN, "%s\n", _("Config file error"));
                                                 break;
                                         /* we're in a stanza, but for a different plugin */
                                         case WRONGSTANZA:
@@ -173,7 +173,7 @@ static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts){
                                         case RIGHTSTANZA:
                                                 ungetc(c, f);
                                                 if(add_option(f, opts)){
-                                                        die(STATE_UNKNOWN, _("Config file error"));
+                                                        die(STATE_UNKNOWN, "%s\n", _("Config file error"));
                                                 }
                                                 status=TRUE;
                                                 break;
@@ -229,7 +229,7 @@ static int add_option(FILE *f, np_arg_list **optlst){
         if(optend==NULL) optend=eqptr;
         --optend;
         /* ^[[:space:]]*=foo is a syntax error */
-        if(optptr==eqptr) die(STATE_UNKNOWN, _("Config file error\n"));
+        if(optptr==eqptr) die(STATE_UNKNOWN, "%s\n", _("Config file error"));
         /* continue from '=' to start of value or EOL */
         for(valptr=eqptr+1; valptr<lineend && isspace(*valptr); valptr++);
         /* continue to the end of value */
@@ -256,7 +256,7 @@ static int add_option(FILE *f, np_arg_list **optlst){
                 cfg_len+=1;
         }
         /* A line with no equal sign isn't valid */
-        if(equals==0) die(STATE_UNKNOWN, _("Config file error\n"));
+        if(equals==0) die(STATE_UNKNOWN, "%s\n", _("Config file error"));
 
         /* okay, now we have all the info we need, so we create a new np_arg_list
          * element and set the argument...
@@ -350,7 +350,6 @@ static char* default_file(void){
  * existence. Returns 1 if found, 0 if not and -1 if test wasn't performed.
  */
 static int test_file(const char* env, int len, const char* file, char* temp_file){
-        struct stat sb;
 
         /* test if len + filelen + '/' + '\0' fits in temp_file */
         if((len+strlen(file)+2)>MAX_INPUT_BUFFER)       return -1;
@@ -360,7 +359,7 @@ static int test_file(const char* env, int len, const char* file, char* temp_file
         strncat(temp_file,"/",len+1);
         strncat(temp_file,file,len+strlen(file)+1);
 
-        if(stat(temp_file, &sb) != -1) return 1;
+        if(access(temp_file, F_OK) == 0) return 1;
         return 0;
 }
 
diff --git a/lib/parse_ini.h b/lib/parse_ini.h
index e0ba8164..a3a494ef 100644
--- a/lib/parse_ini.h
+++ b/lib/parse_ini.h
@@ -2,7 +2,7 @@
 #define _PARSE_INI_H_
 
 /*
- * parse_ini.h: routines for loading nagios-plugin defaults from ini
+ * parse_ini.h: routines for loading monitoring-plugin defaults from ini
  * configuration files.
  */
 
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 1af5891a..c0411ac5 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -28,7 +28,7 @@ endif
 
 AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
 AM_LDFLAGS = $(tap_ldflags) -ltap
-LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a
+LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a
 
 SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c
 
diff --git a/lib/tests/test_base64.t b/lib/tests/test_base64.t
index 4b9236f0..4ad64737 100755
--- a/lib/tests/test_base64.t
+++ b/lib/tests/test_base64.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Test::More;
 if (! -e "./test_base64") {
-        plan skip_all => "./test_base64 not compiled - please install tap library to test";
+        plan skip_all => "./test_base64 not compiled - please enable libtap library to test";
 }
 exec "./test_base64";
diff --git a/lib/tests/test_cmd.t b/lib/tests/test_cmd.t
index 4dd54ef9..c50dded8 100644
--- a/lib/tests/test_cmd.t
+++ b/lib/tests/test_cmd.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Test::More;
 if (! -e "./test_cmd") {
-        plan skip_all => "./test_cmd not compiled - please install tap library to test";
+        plan skip_all => "./test_cmd not compiled - please enable libtap library to test";
 }
 exec "./test_cmd";
diff --git a/lib/tests/test_disk.t b/lib/tests/test_disk.t
index d32567a9..da84dfdf 100755
--- a/lib/tests/test_disk.t
+++ b/lib/tests/test_disk.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Test::More;
 if (! -e "./test_disk") {
-        plan skip_all => "./test_disk not compiled - please install tap library to test";
+        plan skip_all => "./test_disk not compiled - please enable libtap library to test";
 }
 exec "./test_disk";
diff --git a/lib/tests/test_ini1.t b/lib/tests/test_ini1.t
index d4810116..25baed91 100755
--- a/lib/tests/test_ini1.t
+++ b/lib/tests/test_ini1.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Test::More;
 if (! -e "./test_ini1") {
-        plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test";
+        plan skip_all => "./test_ini not compiled - please enable libtap library and/or extra-opts to test";
 }
 exec "./test_ini1";
diff --git a/lib/tests/test_ini3.t b/lib/tests/test_ini3.t
index 4b0be4c6..a2ca94a4 100755
--- a/lib/tests/test_ini3.t
+++ b/lib/tests/test_ini3.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 if (! -e "./test_ini3") {
-        plan skip_all => "./test_ini not compiled - please install tap library and/or enable parse-ini to test";
+        plan skip_all => "./test_ini not compiled - please enable libtap library and/or extra-opts to test";
 }
 
 # array of argument arrays
diff --git a/lib/tests/test_opts1.t b/lib/tests/test_opts1.t
index 52eed942..1934f12b 100755
--- a/lib/tests/test_opts1.t
+++ b/lib/tests/test_opts1.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Test::More;
 if (! -e "./test_opts1") {
-        plan skip_all => "./test_opts1 not compiled - please install tap library and/or enable parse-ini to test";
+        plan skip_all => "./test_opts1 not compiled - please enable libtap library and/or extra-opts to test";
 }
 exec "./test_opts1";
diff --git a/lib/tests/test_opts2.t b/lib/tests/test_opts2.t
index f7444f6f..59b9fdb8 100755
--- a/lib/tests/test_opts2.t
+++ b/lib/tests/test_opts2.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use Test::More;
 if (! -e "./test_opts2") {
-        plan skip_all => "./test_opts2 not compiled - please install tap library and/or enable parse-ini to test";
+        plan skip_all => "./test_opts2 not compiled - please enable libtap library and/or extra-opts to test";
 }
 $ENV{"NAGIOS_CONFIG_PATH"} = ".";
 exec "./test_opts2";
diff --git a/lib/tests/test_opts3.t b/lib/tests/test_opts3.t
index fa7876d0..8d974ca0 100755
--- a/lib/tests/test_opts3.t
+++ b/lib/tests/test_opts3.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 if (! -e "./test_opts3") {
-        plan skip_all => "./test_opts3 not compiled - please install tap library and/or enable parse-ini to test";
+        plan skip_all => "./test_opts3 not compiled - please enable libtap library and/or extra-opts to test";
 }
 
 # array of argument arrays
diff --git a/lib/tests/test_tcp.t b/lib/tests/test_tcp.t
index 8f34b67b..e5e12fc8 100755
--- a/lib/tests/test_tcp.t
+++ b/lib/tests/test_tcp.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Test::More;
 if (! -e "./test_tcp") {
-        plan skip_all => "./test_tcp not compiled - please install tap library to test";
+        plan skip_all => "./test_tcp not compiled - please enable libtap library to test";
 }
 exec "./test_tcp";
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 79e1110a..356887d5 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -32,28 +32,28 @@ main (int argc, char **argv)
         range   *range;
         double  temp;
         thresholds *thresholds = NULL;
-        int     rc;
+        int     i, rc;
         char    *temp_string;
         state_key *temp_state_key = NULL;
         state_data *temp_state_data;
         time_t  current_time;
 
-        plan_tests(150);
+        plan_tests(185);
 
-        ok( this_nagios_plugin==NULL, "nagios_plugin not initialised");
+        ok( this_monitoring_plugin==NULL, "monitoring_plugin not initialised");
 
         np_init( "check_test", argc, argv );
 
-        ok( this_nagios_plugin!=NULL, "nagios_plugin now initialised");
-        ok( !strcmp(this_nagios_plugin->plugin_name, "check_test"), "plugin name initialised" );
+        ok( this_monitoring_plugin!=NULL, "monitoring_plugin now initialised");
+        ok( !strcmp(this_monitoring_plugin->plugin_name, "check_test"), "plugin name initialised" );
 
-        ok( this_nagios_plugin->argc==argc, "Argc set" );
-        ok( this_nagios_plugin->argv==argv, "Argv set" );
+        ok( this_monitoring_plugin->argc==argc, "Argc set" );
+        ok( this_monitoring_plugin->argv==argv, "Argv set" );
 
         np_set_args(0,0);
 
-        ok( this_nagios_plugin->argc==0, "argc changed" );
-        ok( this_nagios_plugin->argv==0, "argv changed" );
+        ok( this_monitoring_plugin->argc==0, "argc changed" );
+        ok( this_monitoring_plugin->argv==0, "argv changed" );
 
         np_set_args(argc, argv);
 
@@ -182,6 +182,21 @@ main (int argc, char **argv)
         ok( get_status(30.0001, thresholds) == STATE_WARNING, "30.0001 - warning");
         ok( get_status(69, thresholds) == STATE_CRITICAL, "69 - critical");
 
+        rc = _set_thresholds(&thresholds, "-10:-2", "-30:20");
+        ok( rc == 0, "Thresholds ('-30:20', '-10:-2') set");
+        ok( thresholds->warning->start == -10, "Warning start set correctly");
+        ok( thresholds->warning->end == -2, "Warning end set correctly");
+        ok( thresholds->critical->start == -30, "Critical start set correctly");
+        ok( thresholds->critical->end == 20, "Critical end set correctly");
+        ok( get_status(-31, thresholds) == STATE_CRITICAL, "-31 - critical");
+        ok( get_status(-29, thresholds) == STATE_WARNING, "-29 - warning");
+        ok( get_status(-11, thresholds) == STATE_WARNING, "-11 - warning");
+        ok( get_status(-10, thresholds) == STATE_OK, "-10 - ok");
+        ok( get_status(-2, thresholds) == STATE_OK, "-2 - ok");
+        ok( get_status(-1, thresholds) == STATE_WARNING, "-1 - warning");
+        ok( get_status(19, thresholds) == STATE_WARNING, "19 - warning");
+        ok( get_status(21, thresholds) == STATE_CRITICAL, "21 - critical");
+
         char *test;
         test = np_escaped_string("bob\\n");
         ok( strcmp(test, "bob\n") == 0, "bob\\n ok");
@@ -296,23 +311,23 @@ main (int argc, char **argv)
         diag( "You are probably running in wrong directory. Must run as ./test_utils" );
 
 
-        this_nagios_plugin->argc=4;
-        this_nagios_plugin->argv[0] = "./test_utils";
-        this_nagios_plugin->argv[1] = "here";
-        this_nagios_plugin->argv[2] = "--and";
-        this_nagios_plugin->argv[3] = "now";
+        this_monitoring_plugin->argc=4;
+        this_monitoring_plugin->argv[0] = "./test_utils";
+        this_monitoring_plugin->argv[1] = "here";
+        this_monitoring_plugin->argv[2] = "--and";
+        this_monitoring_plugin->argv[3] = "now";
         temp_string = (char *) _np_state_generate_key();
         ok(!strcmp(temp_string, "94b5e17bf5abf51cb15aff5f69b96f2f8dac5ecd"), "Got based on expected argv" );
 
-        unsetenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
+        unsetenv("MP_STATE_PATH");
         temp_string = (char *) _np_state_calculate_location_prefix();
         ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory" );
 
-        setenv("NAGIOS_PLUGIN_STATE_DIRECTORY", "", 1);
+        setenv("MP_STATE_PATH", "", 1);
         temp_string = (char *) _np_state_calculate_location_prefix();
         ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string" );
 
-        setenv("NAGIOS_PLUGIN_STATE_DIRECTORY", "/usr/local/nagios/var", 1);
+        setenv("MP_STATE_PATH", "/usr/local/nagios/var", 1);
         temp_string = (char *) _np_state_calculate_location_prefix();
         ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory" );
 
@@ -320,16 +335,16 @@ main (int argc, char **argv)
 
         ok(temp_state_key==NULL, "temp_state_key initially empty");
 
-        this_nagios_plugin->argc=1;
-        this_nagios_plugin->argv[0] = "./test_utils";
+        this_monitoring_plugin->argc=1;
+        this_monitoring_plugin->argv[0] = "./test_utils";
         np_enable_state(NULL, 51);
-        temp_state_key = this_nagios_plugin->state;
+        temp_state_key = this_monitoring_plugin->state;
         ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
         ok( !strcmp(temp_state_key->name, "83d877b6cdfefb5d6f06101fd6fe76762f21792c"), "Got generated filename" );
 
 
         np_enable_state("allowedchars_in_keyname", 77);
-        temp_state_key = this_nagios_plugin->state;
+        temp_state_key = this_monitoring_plugin->state;
         ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
         ok( !strcmp(temp_state_key->name, "allowedchars_in_keyname"), "Got key name with valid chars" );
         ok( !strcmp(temp_state_key->_filename, "/usr/local/nagios/var/check_test/allowedchars_in_keyname"), "Got internal filename" );
@@ -338,12 +353,12 @@ main (int argc, char **argv)
         /* Don't do this test just yet. Will die */
         /*
         np_enable_state("bad^chars$in@here", 77);
-        temp_state_key = this_nagios_plugin->state;
+        temp_state_key = this_monitoring_plugin->state;
         ok( !strcmp(temp_state_key->name, "bad_chars_in_here"), "Got key name with bad chars replaced" );
         */
 
         np_enable_state("funnykeyname", 54);
-        temp_state_key = this_nagios_plugin->state;
+        temp_state_key = this_monitoring_plugin->state;
         ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
         ok( !strcmp(temp_state_key->name, "funnykeyname"), "Got key name" );
 
@@ -367,9 +382,9 @@ main (int argc, char **argv)
         
         temp_state_key->_filename="var/statefile";
         temp_state_data = np_state_read();
-        ok( this_nagios_plugin->state->state_data!=NULL, "Got state data now" ) || diag("Are you running in right directory? Will get coredump next if not");
-        ok( this_nagios_plugin->state->state_data->time==1234567890, "Got time" );
-        ok( !strcmp((char *)this_nagios_plugin->state->state_data->data, "String to read"), "Data as expected" );
+        ok( this_monitoring_plugin->state->state_data!=NULL, "Got state data now" ) || diag("Are you running in right directory? Will get coredump next if not");
+        ok( this_monitoring_plugin->state->state_data->time==1234567890, "Got time" );
+        ok( !strcmp((char *)this_monitoring_plugin->state->state_data->data, "String to read"), "Data as expected" );
 
         temp_state_key->data_version=53;
         temp_state_data = np_state_read();
@@ -379,7 +394,7 @@ main (int argc, char **argv)
         temp_state_key->_filename="var/nonexistant";
         temp_state_data = np_state_read();
         ok( temp_state_data==NULL, "Missing file gives NULL" );
-        ok( this_nagios_plugin->state->state_data==NULL, "No state information" );
+        ok( this_monitoring_plugin->state->state_data==NULL, "No state information" );
 
         temp_state_key->_filename="var/oldformat";
         temp_state_data = np_state_read();
@@ -426,7 +441,7 @@ main (int argc, char **argv)
         temp_state_data = np_state_read();
         /* Check time is set to current_time */
         ok(system("cmp var/generated var/statefile > /dev/null")!=0, "Generated file should be different this time");
-        ok(this_nagios_plugin->state->state_data->time-current_time<=1, "Has time generated from current time");
+        ok(this_monitoring_plugin->state->state_data->time-current_time<=1, "Has time generated from current time");
         
 
         /* Don't know how to automatically test this. Need to be able to redefine die and catch the error */
@@ -438,7 +453,54 @@ main (int argc, char **argv)
 
         np_cleanup();
 
-        ok( this_nagios_plugin==NULL, "Free'd this_nagios_plugin" );
+        ok(this_monitoring_plugin==NULL, "Free'd this_monitoring_plugin");
+
+        ok(mp_suid() == FALSE, "Test aren't suid");
+
+        /* base states with random case */
+        char *states[] = {
+                "Ok",
+                "wArnINg",
+                "cRiTIcaL",
+                "UnKNoWN",
+                NULL
+        };
+
+        for (i=0; states[i]!=NULL; i++) {
+                /* out of the random case states, create the lower and upper versions + numeric string one */
+                char *statelower = strdup(states[i]);
+                char *stateupper = strdup(states[i]);
+                char statenum[2];
+                char *temp_ptr;
+                for (temp_ptr = statelower; *temp_ptr; temp_ptr++) {
+                        *temp_ptr = tolower(*temp_ptr);
+                }
+                for (temp_ptr = stateupper; *temp_ptr; temp_ptr++) {
+                        *temp_ptr = toupper(*temp_ptr);
+                }
+                snprintf(statenum, 2, "%i", i);
+
+                /* Base test names, we'll append the state string */
+                char testname[64] = "Translate state string: ";
+                int tlen = strlen(testname);
+
+                strcpy(testname+tlen, states[i]);
+                ok(i==mp_translate_state(states[i]), testname);
+
+                strcpy(testname+tlen, statelower);
+                ok(i==mp_translate_state(statelower), testname);
+
+                strcpy(testname+tlen, stateupper);
+                ok(i==mp_translate_state(stateupper), testname);
+
+                strcpy(testname+tlen, statenum);
+                ok(i==mp_translate_state(statenum), testname);
+        }
+        ok(ERROR==mp_translate_state("warningfewgw"), "Translate state string with garbage");
+        ok(ERROR==mp_translate_state("00"), "Translate state string: bad numeric string 1");
+        ok(ERROR==mp_translate_state("01"), "Translate state string: bad numeric string 2");
+        ok(ERROR==mp_translate_state("10"), "Translate state string: bad numeric string 3");
+        ok(ERROR==mp_translate_state(""), "Translate state string: empty string");
 
         return exit_status();
 }
diff --git a/lib/tests/test_utils.t b/lib/tests/test_utils.t
index 152eb718..e2a9311e 100755
--- a/lib/tests/test_utils.t
+++ b/lib/tests/test_utils.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 use Test::More;
 if (! -e "./test_utils") {
-        plan skip_all => "./test_utils not compiled - please install tap library to test";
+        plan skip_all => "./test_utils not compiled - please enable libtap library to test";
 }
 exec "./test_utils";
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 54463e92..04c4b4f9 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -3,7 +3,7 @@
 * utils_base.c
 *
 * License: GPL
-* Copyright (c) 2006 Nagios Plugins Development Team
+* Copyright (c) 2006 Monitoring Plugins Development Team
 *
 * Library of useful functions for plugins
 * 
@@ -30,56 +30,58 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <unistd.h>
+#include <sys/types.h>
 
 #define np_free(ptr) { if(ptr) { free(ptr); ptr = NULL; } }
 
-nagios_plugin *this_nagios_plugin=NULL;
+monitoring_plugin *this_monitoring_plugin=NULL;
 
 int _np_state_read_file(FILE *);
 
 void np_init( char *plugin_name, int argc, char **argv ) {
-        if (this_nagios_plugin==NULL) {
-                this_nagios_plugin = calloc(1, sizeof(nagios_plugin));
-                if (this_nagios_plugin==NULL) {
+        if (this_monitoring_plugin==NULL) {
+                this_monitoring_plugin = calloc(1, sizeof(monitoring_plugin));
+                if (this_monitoring_plugin==NULL) {
                         die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                             strerror(errno));
                 }
-                this_nagios_plugin->plugin_name = strdup(plugin_name);
-                if (this_nagios_plugin->plugin_name==NULL)
+                this_monitoring_plugin->plugin_name = strdup(plugin_name);
+                if (this_monitoring_plugin->plugin_name==NULL)
                         die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
-                this_nagios_plugin->argc = argc;
-                this_nagios_plugin->argv = argv;
+                this_monitoring_plugin->argc = argc;
+                this_monitoring_plugin->argv = argv;
         }
 }
 
 void np_set_args( int argc, char **argv ) {
-        if (this_nagios_plugin==NULL)
+        if (this_monitoring_plugin==NULL)
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
 
-        this_nagios_plugin->argc = argc;
-        this_nagios_plugin->argv = argv;
+        this_monitoring_plugin->argc = argc;
+        this_monitoring_plugin->argv = argv;
 }
 
 
 void np_cleanup() {
-        if (this_nagios_plugin!=NULL) {
-                if(this_nagios_plugin->state!=NULL) {
-                        if(this_nagios_plugin->state->state_data) { 
-                                np_free(this_nagios_plugin->state->state_data->data);
-                                np_free(this_nagios_plugin->state->state_data);
+        if (this_monitoring_plugin!=NULL) {
+                if(this_monitoring_plugin->state!=NULL) {
+                        if(this_monitoring_plugin->state->state_data) {
+                                np_free(this_monitoring_plugin->state->state_data->data);
+                                np_free(this_monitoring_plugin->state->state_data);
                         }
-                        np_free(this_nagios_plugin->state->name);
-                        np_free(this_nagios_plugin->state);
+                        np_free(this_monitoring_plugin->state->name);
+                        np_free(this_monitoring_plugin->state);
                 }
-                np_free(this_nagios_plugin->plugin_name);
-                np_free(this_nagios_plugin);
+                np_free(this_monitoring_plugin->plugin_name);
+                np_free(this_monitoring_plugin);
         }
-        this_nagios_plugin=NULL;
+        this_monitoring_plugin=NULL;
 }
 
-/* Hidden function to get a pointer to this_nagios_plugin for testing */
-void _get_nagios_plugin( nagios_plugin **pointer ){
-        *pointer = this_nagios_plugin;
+/* Hidden function to get a pointer to this_monitoring_plugin for testing */
+void _get_monitoring_plugin( monitoring_plugin **pointer ){
+        *pointer = this_monitoring_plugin;
 }
 
 void
@@ -89,7 +91,7 @@ die (int result, const char *fmt, ...)
         va_start (ap, fmt);
         vprintf (fmt, ap);
         va_end (ap);
-        if(this_nagios_plugin!=NULL) {
+        if(this_monitoring_plugin!=NULL) {
                 np_cleanup();
         }
         exit (result);
@@ -367,6 +369,23 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
         return value;
 }
 
+
+/*
+ * Read a string representing a state (ok, warning... or numeric: 0, 1) and
+ * return the corresponding STATE_ value or ERROR)
+ */
+int mp_translate_state (char *state_text) {
+        if (!strcasecmp(state_text,"OK") || !strcmp(state_text,"0"))
+                return STATE_OK;
+        if (!strcasecmp(state_text,"WARNING") || !strcmp(state_text,"1"))
+                return STATE_WARNING;
+        if (!strcasecmp(state_text,"CRITICAL") || !strcmp(state_text,"2"))
+                return STATE_CRITICAL;
+        if (!strcasecmp(state_text,"UNKNOWN") || !strcmp(state_text,"3"))
+                return STATE_UNKNOWN;
+        return ERROR;
+}
+
 /*
  * Returns a string to use as a keyname, based on an md5 hash of argv, thus
  * hopefully a unique key per service/plugin invocation. Use the extra-opts
@@ -375,14 +394,14 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
 char *_np_state_generate_key() {
         struct sha1_ctx ctx;
         int i;
-        char **argv = this_nagios_plugin->argv;
+        char **argv = this_monitoring_plugin->argv;
         unsigned char result[20];
         char keyname[41];
         char *p=NULL;
 
         sha1_init_ctx(&ctx);
         
-        for(i=0; i<this_nagios_plugin->argc; i++) {
+        for(i=0; i<this_monitoring_plugin->argc; i++) {
                 sha1_process_bytes(argv[i], strlen(argv[i]), &ctx);
         }
 
@@ -401,9 +420,9 @@ char *_np_state_generate_key() {
 }
 
 void _cleanup_state_data() {
-        if (this_nagios_plugin->state->state_data!=NULL) {
-                np_free(this_nagios_plugin->state->state_data->data);
-                np_free(this_nagios_plugin->state->state_data);
+        if (this_monitoring_plugin->state->state_data!=NULL) {
+                np_free(this_monitoring_plugin->state->state_data->data);
+                np_free(this_monitoring_plugin->state->state_data);
         }
 }
 
@@ -415,9 +434,18 @@ void _cleanup_state_data() {
 char* _np_state_calculate_location_prefix(){
         char *env_dir;
 
-        env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
-        if(env_dir && env_dir[0] != '\0')
-                return env_dir;
+        /* Do not allow passing MP_STATE_PATH in setuid plugins
+         * for security reasons */
+        if (mp_suid() == FALSE) {
+                env_dir = getenv("MP_STATE_PATH");
+                if(env_dir && env_dir[0] != '\0')
+                        return env_dir;
+                /* This is the former ENV, for backward-compatibility */
+                env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
+                if(env_dir && env_dir[0] != '\0')
+                        return env_dir;
+        }
+
         return NP_STATE_DIR_PREFIX;
 }
 
@@ -432,7 +460,7 @@ void np_enable_state(char *keyname, int expected_data_version) {
         char *temp_keyname = NULL;
         char *p=NULL;
 
-        if(this_nagios_plugin==NULL)
+        if(this_monitoring_plugin==NULL)
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
 
         this_state = (state_key *) calloc(1, sizeof(state_key));
@@ -456,15 +484,15 @@ void np_enable_state(char *keyname, int expected_data_version) {
                 p++;
         }
         this_state->name=temp_keyname;
-        this_state->plugin_name=this_nagios_plugin->plugin_name;
+        this_state->plugin_name=this_monitoring_plugin->plugin_name;
         this_state->data_version=expected_data_version;
         this_state->state_data=NULL;
 
         /* Calculate filename */
-        asprintf(&temp_filename, "%s/%s/%s", _np_state_calculate_location_prefix(), this_nagios_plugin->plugin_name, this_state->name);
+        asprintf(&temp_filename, "%s/%s/%s", _np_state_calculate_location_prefix(), this_monitoring_plugin->plugin_name, this_state->name);
         this_state->_filename=temp_filename;
 
-        this_nagios_plugin->state = this_state;
+        this_monitoring_plugin->state = this_state;
 }
 
 /*
@@ -479,11 +507,11 @@ state_data *np_state_read() {
         FILE *statefile;
         int rc = FALSE;
 
-        if(this_nagios_plugin==NULL)
+        if(this_monitoring_plugin==NULL)
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
 
         /* Open file. If this fails, no previous state found */
-        statefile = fopen( this_nagios_plugin->state->_filename, "r" );
+        statefile = fopen( this_monitoring_plugin->state->_filename, "r" );
         if(statefile!=NULL) {
 
                 this_state_data = (state_data *) calloc(1, sizeof(state_data));
@@ -492,7 +520,7 @@ state_data *np_state_read() {
                             strerror(errno));
 
                 this_state_data->data=NULL;
-                this_nagios_plugin->state->state_data = this_state_data;
+                this_monitoring_plugin->state->state_data = this_state_data;
 
                 rc = _np_state_read_file(statefile);
 
@@ -503,10 +531,10 @@ state_data *np_state_read() {
                 _cleanup_state_data();
         }
 
-        return this_nagios_plugin->state->state_data;
+        return this_monitoring_plugin->state->state_data;
 }
 
-/* 
+/*
  * Read the state file
  */
 int _np_state_read_file(FILE *f) {
@@ -544,7 +572,7 @@ int _np_state_read_file(FILE *f) {
                                 break;
                         case STATE_DATA_VERSION:
                                 i=atoi(line);
-                                if(i != this_nagios_plugin->state->data_version)
+                                if(i != this_monitoring_plugin->state->data_version)
                                         failure++;
                                 else
                                         expected=STATE_DATA_TIME;
@@ -555,13 +583,13 @@ int _np_state_read_file(FILE *f) {
                                 if(data_time > current_time)
                                         failure++;
                                 else {
-                                        this_nagios_plugin->state->state_data->time = data_time;
+                                        this_monitoring_plugin->state->state_data->time = data_time;
                                         expected=STATE_DATA_TEXT;
                                 }
                                 break;
                         case STATE_DATA_TEXT:
-                                this_nagios_plugin->state->state_data->data = strdup(line);
-                                if(this_nagios_plugin->state->state_data->data==NULL)
+                                this_monitoring_plugin->state->state_data->data = strdup(line);
+                                if(this_monitoring_plugin->state->state_data->data==NULL)
                                         die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
                                 expected=STATE_DATA_END;
                                 status=TRUE;
@@ -596,8 +624,8 @@ void np_state_write_string(time_t data_time, char *data_string) {
                 current_time=data_time;
         
         /* If file doesn't currently exist, create directories */
-        if(access(this_nagios_plugin->state->_filename,F_OK)!=0) {
-                asprintf(&directories, "%s", this_nagios_plugin->state->_filename);
+        if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
+                asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
                 if(directories==NULL)
                         die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                             strerror(errno));
@@ -607,7 +635,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
                                 *p='\0';
                                 if((access(directories,F_OK)!=0) && (mkdir(directories, S_IRWXU)!=0)) {
                                         /* Can't free this! Otherwise error message is wrong! */
-                                        /* np_free(directories); */ 
+                                        /* np_free(directories); */
                                         die(STATE_UNKNOWN, _("Cannot create directory: %s"), directories);
                                 }
                                 *p='/';
@@ -616,7 +644,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
                 np_free(directories);
         }
 
-        asprintf(&temp_file,"%s.XXXXXX",this_nagios_plugin->state->_filename);
+        asprintf(&temp_file,"%s.XXXXXX",this_monitoring_plugin->state->_filename);
         if(temp_file==NULL)
                 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                     strerror(errno));
@@ -636,7 +664,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
         
         fprintf(fp,"# NP State file\n");
         fprintf(fp,"%d\n",NP_STATE_FORMAT_VERSION);
-        fprintf(fp,"%d\n",this_nagios_plugin->state->data_version);
+        fprintf(fp,"%d\n",this_monitoring_plugin->state->data_version);
         fprintf(fp,"%lu\n",current_time);
         fprintf(fp,"%s\n",data_string);
         
@@ -654,7 +682,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
                 die(STATE_UNKNOWN, _("Error writing temp file"));
         }
 
-        if(rename(temp_file, this_nagios_plugin->state->_filename)!=0) {
+        if(rename(temp_file, this_monitoring_plugin->state->_filename)!=0) {
                 unlink(temp_file);
                 np_free(temp_file);
                 die(STATE_UNKNOWN, _("Cannot rename state temp file"));
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 0cb371fd..d69b0da1 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -1,6 +1,6 @@
 #ifndef _UTILS_BASE_
 #define _UTILS_BASE_
-/* Header file for nagios plugins utils_base.c */
+/* Header file for Monitoring Plugins utils_base.c */
 
 #include "sha1.h"
 
@@ -52,7 +52,7 @@ typedef struct np_struct {
         state_key *state;
         int       argc;
         char      **argv;
-        } nagios_plugin;
+        } monitoring_plugin;
 
 range *parse_range_string (char *);
 int _set_thresholds(thresholds **, char *, char *);
@@ -62,7 +62,7 @@ int check_range(double, range *);
 int get_status(double, thresholds *);
 
 /* All possible characters in a threshold range */
-#define NP_THRESHOLDS_CHARS "0123456789.:@~"
+#define NP_THRESHOLDS_CHARS "-0123456789.:@~"
 
 char *np_escaped_string (const char *);
 
@@ -79,6 +79,10 @@ int np_check_if_root(void);
  * code from the above function, in case it's helpful for testing */
 int np_warn_if_not_root(void);
 
+/* mp_suid() returns true if the real and effective uids differs, such as when
+ * running a suid plugin */
+#define mp_suid() (getuid() != geteuid())
+
 /*
  * Extract the value from key/value pairs, or return NULL. The value returned
  * can be free()ed.
@@ -93,6 +97,11 @@ char *np_extract_value(const char*, const char*, char);
  */
 #define np_extract_ntpvar(l, n) np_extract_value(l, n, ',')
 
+/*
+ * Read a string representing a state (ok, warning... or numeric: 0, 1) and
+ * return the corresponding NP_STATE or ERROR)
+ */
+int mp_translate_state (char *);
 
 void np_enable_state(char *, int);
 state_data *np_state_read();
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 0c853dcc..4c6d0be1 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 *
-* Nagios run command utilities
+* Monitoring run command utilities
 *
 * License: GPL
-* Copyright (c) 2005-2006 Nagios Plugins Development Team
+* Copyright (c) 2005-2006 Monitoring Plugins Development Team
 *
 * Description :
 *
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index 8ebb5894..ebaf15be 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -2,7 +2,7 @@
 #define _UTILS_CMD_
 
 /* 
- * Header file for nagios plugins utils_cmd.c
+ * Header file for Monitoring Plugins utils_cmd.c
  * 
  * 
  */
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index 5be2b2c0..efe35fc5 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -3,7 +3,7 @@
 * Library for check_disk
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index 46ad7f72..b37c446f 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -3,7 +3,7 @@
 * Library for check_tcp
 * 
 * License: GPL
-* Copyright (c) 1999-2013 Nagios Plugins Development Team
+* Copyright (c) 1999-2013 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4
index cd36c4f7..c2a4d2a7 100644
--- a/m4/np_mysqlclient.m4
+++ b/m4/np_mysqlclient.m4
@@ -1,6 +1,6 @@
 # np_mysqlclient.m4
-dnl Copyright (C) 2007 Nagios Plugins Team
-dnl This file is free software; the Nagios Plugin Team
+dnl Copyright (C) 2007 Monitoring Plugins Team
+dnl This file is free software; the Monitoring Plugins Team
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
diff --git a/nagios-plugins.spec.in b/monitoring-plugins.spec.in
index 17a44c36..f0034982 100644
--- a/nagios-plugins.spec.in
+++ b/monitoring-plugins.spec.in
@@ -15,15 +15,15 @@
 %define nphome /opt/nagios
 %define npgrp nagios
 
-Name: nagios-plugins
+Name: monitoring-plugins
 Version: @PACKAGE_VERSION@
 Release: @RELEASE@
-Summary: Host/service/network monitoring program plugins for Nagios
+Summary: Host/service/network monitoring program plugins for Nagios and compatible
 
 Group: Applications/System
 License: GPL
-URL: http://nagiosplug.sourceforge.net/
-Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
+URL: https://www.monitoring-plugins.org/
+Source0: https://www.monitoring-plugins.org/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define npdir %{_builddir}/%{name}-%{version}
@@ -34,11 +34,11 @@ Prefix: %{_prefix}
 Prefix: %{_prefix}/lib/nagios/plugins
 %endif
 Packager: Karl DeBisschop <kdebisschop@users.sourceforge.net>
-Vendor: Nagios Plugin Development Group
-Provides: nagios-plugins
+Vendor: Monitoring Plugins Development Team
+Provides: monitoring-plugins
 
 %{!?custom:%global custom 0}
-Obsoletes: nagios-plugins-custom nagios-plugins-extras
+Obsoletes: monitoring-plugins-custom monitoring-plugins-extras
 
 
 # Requires
@@ -105,8 +105,8 @@ network, and to email or page you when a problem arises or is
 resolved. Nagios runs on a unix server as a background or daemon
 process, intermittently running checks on various services that you
 specify. The actual service checks are performed by separate "plugin"
-programs which return the status of the checks to Nagios. This package
-contains those plugins.
+programs which return the status of the checks to the monitoring
+system. This package contains those plugins.
 
 
 %prep
@@ -163,8 +163,6 @@ fi
 %install
 rm -rf $RPM_BUILD_ROOT
 make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install
-build-aux/install-sh -c  -d ${RPM_BUILD_ROOT}%{_sysconfdir}
-build-aux/install-sh -c  -m 664 command.cfg ${RPM_BUILD_ROOT}%{_sysconfdir}
 %find_lang %{name}
 echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang
 comm -13 %{npdir}/ls-plugins-before %{npdir}/ls-plugins-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
@@ -174,6 +172,10 @@ echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang
 comm -13 %{npdir}/ls-plugins-scripts-before %{npdir}/ls-plugins-scripts-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
 echo "%{_libexecdir}/utils.pm" >> %{name}.lang
 echo "%{_libexecdir}/utils.sh" >> %{name}.lang
+echo "%{_libexecdir}/check_ldaps" >> %{name}.lang
+
+sed -i '/libnpcommon/d' %{name}.lang
+sed -i '/monitoring-plugins.mo/d' %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -184,8 +186,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc CODING COPYING FAQ INSTALL LEGAL README REQUIREMENTS SUPPORT THANKS
 %doc ChangeLog command.cfg
 %if ! %{isaix}
-%{_datadir}/locale/de/LC_MESSAGES/nagios-plugins.mo
-%{_datadir}/locale/fr/LC_MESSAGES/nagios-plugins.mo
+%{_datadir}/locale/de/LC_MESSAGES/monitoring-plugins.mo
+%{_datadir}/locale/fr/LC_MESSAGES/monitoring-plugins.mo
 %endif
 
 %changelog
diff --git a/perlmods/Monitoring-Plugin-0.37.tar.gz b/perlmods/Monitoring-Plugin-0.37.tar.gz
new file mode 100644
index 00000000..bb6fe69e
--- /dev/null
+++ b/perlmods/Monitoring-Plugin-0.37.tar.gz
diff --git a/perlmods/Nagios-Plugin-0.36.tar.gz b/perlmods/Nagios-Plugin-0.36.tar.gz
deleted file mode 100644
index 811dcb91..00000000
--- a/perlmods/Nagios-Plugin-0.36.tar.gz
+++ /dev/null
diff --git a/perlmods/install_order b/perlmods/install_order
index c44c8723..287cf8f3 100644
--- a/perlmods/install_order
+++ b/perlmods/install_order
@@ -13,4 +13,4 @@ Params-Validate
 Math-Calc-Units
 Class-Accessor
 Config-Tiny
-Nagios-Plugin
+Monitoring-Plugin
diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in
index 3bed3464..835ce6de 100644
--- a/pkg/solaris/pkginfo.in
+++ b/pkg/solaris/pkginfo.in
@@ -1,11 +1,11 @@
 PKG="NGOSplugin"
-NAME="nagios-plugins"
-DESC="Nagios network monitoring plugins"
+NAME="monitoring-plugins"
+DESC="Network Monitoring Plugins for Nagios and compatible"
 ARCH="@PKG_ARCH@"
 VERSION="@PACKAGE_VERSION@,REV=@REV_DATESTAMP@"
 CATEGORY="application"
-VENDOR="Nagios Plugin Development Team"
-EMAIL="nagiosplug-devel@lists.sourceforge.net"
+VENDOR="Monitoring Plugins Development Team"
+EMAIL="devel@monitoring-plugins.org"
 PSTAMP="nag@REV_TIMESTAMP@"
 BASEDIR="/"
 CLASSES="none"
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 9623b1fa..a1ebb6d2 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_PROGRAMS = pst3
 
 EXTRA_DIST = t pst3.c
 
-BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
+BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
@@ -83,7 +83,7 @@ check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
 # -m64 needed at compiler and linker phase
 pst3_CFLAGS = @PST3CFLAGS@
 pst3_LDFLAGS = @PST3CFLAGS@
-# pst3 must not use nagiosplug/gnulib includes!
+# pst3 must not use monitoringplug/gnulib includes!
 pst3_CPPFLAGS =
 
 check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 42eedec8..1ec5c396 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_dhcp plugin
+* Monitoring check_dhcp plugin
 * 
 * License: GPL
 * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2001-2007 Nagios Plugin Development Team
+* Copyright (c) 2001-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -35,7 +35,7 @@
 
 const char *progname = "check_dhcp";
 const char *copyright = "2001-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 56685f86..4b4197d8 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_icmp plugin
+* Monitoring check_icmp plugin
 * 
 * License: GPL
-* Copyright (c) 2005-2008 Nagios Plugins Development Team
+* Copyright (c) 2005-2008 Monitoring Plugins Development Team
 * Original Author : Andreas Ericsson <ae@op5.se>
 * 
 * Description:
@@ -40,9 +40,9 @@
 /* char *progname = "check_icmp"; */
 char *progname;
 const char *copyright = "2005-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
-/** nagios plugins basic includes */
+/** Monitoring Plugins basic includes */
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c
index 8ca52814..ee9d108d 100644
--- a/plugins-root/pst3.c
+++ b/plugins-root/pst3.c
@@ -3,7 +3,7 @@
 * pst3
 * 
 * License: GPL
-* Copyright (c) 2008 Nagios Plugin Development Team
+* Copyright (c) 2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index 58db0604..4ea262af 100644
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -19,7 +19,7 @@ libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
         utils.sh utils.pm
 
 EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
-        check_log.sh check_ntp.pl check_oracle.sh check_rpc.pl check_sensors.sh \
+        check_log.sh check_oracle.sh check_rpc.pl check_sensors.sh \
         check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
         utils.sh.in utils.pm.in t
 
diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl
index 037060c8..917a1c6f 100755
--- a/plugins-scripts/check_breeze.pl
+++ b/plugins-scripts/check_breeze.pl
@@ -4,7 +4,8 @@
 use strict;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_w $opt_c $opt_H $opt_C $PROGNAME);
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw(%ERRORS &print_revision &support &usage);
 
 $PROGNAME = "check_breeze";
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 01c560ef..36259d59 100755
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -3,7 +3,7 @@
 #
 # check_disk.pl <host> <share> <user> <pass> [warn] [critical] [port]
 #
-# Nagios host script to get the disk usage from a SMB share
+# Monitoring host script to get the disk usage from a SMB share
 #
 # Changes and Modifications
 # =========================
@@ -24,7 +24,8 @@ use strict;
 use Getopt::Long;
 use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose);
 use vars qw($PROGNAME);
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
 sub print_help ();
@@ -171,7 +172,7 @@ my $res = undef;
 my $perfdata = "";
 my @lines = undef;
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub { 
         print "No Answer from Client\n";
         exit $ERRORS{"UNKNOWN"};
@@ -293,7 +294,7 @@ sub print_help () {
         print_revision($PROGNAME,'@NP_VERSION@');
         print "Copyright (c) 2000 Michael Anthon/Karl DeBisschop
 
-Perl Check SMB Disk plugin for Nagios
+Perl Check SMB Disk plugin for monitoring
 
 ";
         print_usage();
diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl
index 37bbe86f..e0280381 100755
--- a/plugins-scripts/check_file_age.pl
+++ b/plugins-scripts/check_file_age.pl
@@ -17,9 +17,8 @@
 # GNU General Public License for more details.
 #
 # you should have received a copy of the GNU General Public License
-# along with this program (or with Nagios);  if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA
+# along with this program if not, write to the Free Software Foundation,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 use strict;
 use English;
@@ -32,7 +31,7 @@ use utils qw (%ERRORS &print_revision &support);
 sub print_help ();
 sub print_usage ();
 
-my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V);
+my ($opt_c, $opt_f, $opt_w, $opt_C, $opt_W, $opt_h, $opt_V, $opt_i);
 my ($result, $message, $age, $size, $st);
 
 $PROGNAME="check_file_age";
@@ -51,6 +50,7 @@ Getopt::Long::Configure('bundling');
 GetOptions(
         "V"   => \$opt_V, "version"     => \$opt_V,
         "h"   => \$opt_h, "help"        => \$opt_h,
+        "i"   => \$opt_i, "ignore-missing"      => \$opt_i,
         "f=s" => \$opt_f, "file"        => \$opt_f,
         "w=f" => \$opt_w, "warning-age=f" => \$opt_w,
         "W=f" => \$opt_W, "warning-size=f" => \$opt_W,
@@ -76,8 +76,15 @@ if (! $opt_f) {
 
 # Check that file exists (can be directory or link)
 unless (-e $opt_f) {
-        print "FILE_AGE CRITICAL: File not found - $opt_f\n";
-        exit $ERRORS{'CRITICAL'};
+        if ($opt_i) {
+                $result = 'OK';
+                print "FILE_AGE $result: $opt_f doesn't exist, but ignore-missing was set\n";
+                exit $ERRORS{$result};
+
+        } else {
+                print "FILE_AGE CRITICAL: File not found - $opt_f\n";
+                exit $ERRORS{'CRITICAL'};
+        }
 }
 
 $st = File::stat::stat($opt_f);
@@ -99,7 +106,7 @@ exit $ERRORS{$result};
 
 sub print_usage () {
         print "Usage:\n";
-        print "  $PROGNAME [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] -f <file>\n";
+        print "  $PROGNAME [-w <secs>] [-c <secs>] [-W <size>] [-C <size>] [-i] -f <file>\n";
         print "  $PROGNAME [-h | --help]\n";
         print "  $PROGNAME [-V | --version]\n";
 }
@@ -109,6 +116,7 @@ sub print_help () {
         print "Copyright (c) 2003 Steven Grimm\n\n";
         print_usage();
         print "\n";
+        print "  -i | --ignore-missing :  return OK if the file does not exist\n";
         print "  <secs>  File must be no more than this many seconds old (default: warn 240 secs, crit 600)\n";
         print "  <size>  File must be at least this many bytes long (default: crit 0 bytes)\n";
         print "\n";
diff --git a/plugins-scripts/check_flexlm.pl b/plugins-scripts/check_flexlm.pl
index 05973777..de63d3ab 100755
--- a/plugins-scripts/check_flexlm.pl
+++ b/plugins-scripts/check_flexlm.pl
@@ -9,7 +9,7 @@
 # Check and interpret the output of lmstat
 # and create returncodes and output.
 #
-# Contrary to the nagios concept, this script takes
+# Contrary to most other plugins, this script takes
 # a file, not a hostname as an argument and returns
 # the status of hosts and services described in that
 # file. Use these hosts.cfg entries as an example
@@ -35,7 +35,8 @@
 use strict;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_F $opt_t $verbose $PROGNAME);
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw(%ERRORS &print_revision &support &usage);
 
 $PROGNAME="check_flexlm";
@@ -72,7 +73,7 @@ unless (defined $opt_F) {
         print_usage();
         exit $ERRORS{'UNKNOWN'};
 }
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
         print "Timeout: No Answer from Client\n";
         exit $ERRORS{'UNKNOWN'};
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index 452911b7..159eb62e 100755
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -1,9 +1,9 @@
 #!/usr/local/bin/perl -w
 #
-# check_ifoperstatus.pl - nagios plugin 
+# check_ifoperstatus.pl - monitoring plugin
 #
 # Copyright (C) 2000 Christoph Kron,
-# Modified 5/2002 to conform to updated Nagios Plugin Guidelines
+# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines
 # Added support for named interfaces per Valdimir Ivaschenko (S. Ghosh)
 # Added SNMPv3 support (10/2003)
 #
@@ -19,10 +19,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA
 #
 #
-# Report bugs to:  nagiosplug-help@lists.sourceforge.net
+# Report bugs to:  help@monitoring-plugins.org
 #
 # 11.01.2000 Version 1.0
 #
@@ -34,7 +35,8 @@
 
 use POSIX;
 use strict;
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 
 use Net::SNMP;
@@ -101,7 +103,7 @@ my %session_opts;
 $status = process_arguments();
 
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
         print ("ERROR: No snmp response from $hostname (alarm)\n");
         exit $ERRORS{"UNKNOWN"};
@@ -292,7 +294,7 @@ sub print_usage() {
 sub print_help() {
         print_revision($PROGNAME, '@NP_VERSION@');
         print_usage();
-        printf "check_ifoperstatus plugin for Nagios monitors operational \n";
+        printf "check_ifoperstatus plugin for monitoring operational \n";
         printf "status of a particular network interface on the target host\n";
         printf "\nUsage:\n";
         printf "   -H (--hostname)   Hostname to query - (required)\n";
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 421580ad..4760a281 100755
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -1,10 +1,10 @@
 #!/usr/local/bin/perl -w
 #
-# check_ifstatus.pl - nagios plugin 
+# check_ifstatus.pl - monitoring plugin
 # 
 #
 # Copyright (C) 2000 Christoph Kron
-# Modified 5/2002 to conform to updated Nagios Plugin Guidelines (S. Ghosh)
+# Modified 5/2002 to conform to updated Monitoring Plugins Guidelines (S. Ghosh)
 #  Added -x option (4/2003)
 #  Added -u option (4/2003)
 #  Added -M option (10/2003)
@@ -22,17 +22,18 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 #
 #
-# Report bugs to: ck@zet.net, nagiosplug-help@lists.sf.net
+# Report bugs to: ck@zet.net, help@monitoring-plugins.org
 # 
 # 11.01.2000 Version 1.0
 #
 
 use POSIX;
 use strict;
-use lib utils.pm ;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 
 use Net::SNMP;
@@ -102,7 +103,7 @@ my %session_opts;
 
 
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
      print ("ERROR: No snmp response from $hostname (alarm timeout)\n");
      exit $ERRORS{"UNKNOWN"};
@@ -242,7 +243,7 @@ sub print_usage() {
 sub print_help() {
         print_revision($PROGNAME, '@NP_VERSION@');
         print_usage();
-        printf "check_ifstatus plugin for Nagios monitors operational \n";
+        printf "check_ifstatus plugin for monitoring operational \n";
         printf "status of each network interface on the target host\n";
         printf "\nUsage:\n";
         printf "   -H (--hostname)   Hostname to query - (required)\n";
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index f80c5c65..dab65954 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -16,8 +16,6 @@
 # -----------------------------------------------------------------------------
 # Copyright 1999 (c) Richard Mayhew
 #
-# Credits go to Ethan Galstad for coding Nagios
-#
 # If any changes are made to this script, please mail me a copy of the
 # changes :)
 #
@@ -51,7 +49,8 @@ use strict;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose);
 use vars qw($PROGNAME);
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
 # ----------------------------------------------------[ Function Prototypes ]--
@@ -121,7 +120,7 @@ sub print_help ()
         print_revision($PROGNAME,'@NP_VERSION@');
         print "Copyright (c) 2000 Richard Mayhew/Karl DeBisschop
 
-Perl Check IRCD plugin for Nagios
+Perl Check IRCD plugin for monitoring
 
 ";
         print_usage();
@@ -205,7 +204,7 @@ MAIN:
 
         if ($opt_t && $opt_t =~ /^([0-9]+)$/) { $TIMEOUT = $1; }
 
-        # Just in case of problems, let's not hang Nagios
+        # Just in case of problems, let's not hang the monitoring system
         $SIG{'ALRM'} = sub {
                 print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
                 exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index a9ff06ad..be4c7be1 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Log file pattern detector plugin for Nagios
+# Log file pattern detector plugin for monitoring
 # Written by Ethan Galstad (nagios@nagios.org)
 # Last Modified: 07-31-1999
 #
@@ -29,15 +29,15 @@
 #
 # If you use this plugin make sure to keep the following in mind:
 #
-#    1.  The "max_attempts" value for the service should be 1, as this
-#        will prevent Nagios from retrying the service check (the
+#    1.  The "max_attempts" value for the service should be 1, as this will
+#        prevent the monitoring system from retrying the service check (the
 #        next time the check is run it will not produce the same results).
 #
-#    2.  The "notify_recovery" value for the service should be 0, so that
-#        Nagios does not notify you of "recoveries" for the check.  Since
-#        pattern matches in the log file will only be reported once and not
-#        the next time, there will always be "recoveries" for the service, even
-#        though recoveries really don't apply to this type of check.
+#    2.  The "notify_recovery" value for the service should be 0, so that the
+#        monitoring system does not notify you of "recoveries" for the check.
+#        Since pattern matches in the log file will only be reported once and
+#        not the next time, there will always be "recoveries" for the service,
+#        even though recoveries really don't apply to this type of check.
 #
 #    3.  You *must* supply a different <old_file_log> for each service that
 #        you define to use this plugin script - even if the different services
@@ -58,7 +58,6 @@
 # Paths to commands used in this script.  These
 # may have to be modified to match your system setup.
 
-ECHO="/bin/echo"
 GREP="/bin/egrep"
 DIFF="/bin/diff"
 TAIL="/bin/tail"
@@ -85,7 +84,7 @@ print_help() {
     echo ""
     print_usage
     echo ""
-    echo "Log file pattern detector plugin for Nagios"
+    echo "Log file pattern detector plugin for monitoring"
     echo ""
     support
 }
@@ -166,10 +165,10 @@ done
 # If the source log file doesn't exist, exit
 
 if [ ! -e $logfile ]; then
-    $ECHO "Log check error: Log file $logfile does not exist!\n"
+    echo "Log check error: Log file $logfile does not exist!"
     exit $STATE_UNKNOWN
 elif [ ! -r $logfile ] ; then
-    $ECHO "Log check error: Log file $logfile is not readable!\n"
+    echo "Log check error: Log file $logfile is not readable!"
     exit $STATE_UNKNOWN
 fi
 
@@ -179,7 +178,7 @@ fi
 
 if [ ! -e $oldlog ]; then
     $CAT $logfile > $oldlog
-    $ECHO "Log check data initialized...\n"
+    echo "Log check data initialized..."
     exit $STATE_OK
 fi
 
@@ -208,10 +207,10 @@ $RM -f $tempdiff
 $CAT $logfile > $oldlog
 
 if [ "$count" = "0" ]; then # no matches, exit with no error
-    $ECHO "Log check ok - 0 pattern matches found\n"
+    echo "Log check ok - 0 pattern matches found"
     exitstatus=$STATE_OK
 else # Print total matche count and the last entry we found
-    $ECHO "($count) $lastentry"
+    echo "($count) $lastentry"
     exitstatus=$STATE_CRITICAL
 fi
 
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index 1d0a3ad7..488cf2f1 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -20,8 +20,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
+# Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+# USA
 #
 ############################################################################
 
@@ -31,7 +31,8 @@ use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t
                                         $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq @lines
                                         %srcdomains %dstdomains);
-use lib  utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw(%ERRORS &print_revision &support &usage );
 
 
@@ -199,20 +200,20 @@ if ($mailq eq "sendmail") {
         ## now check the queue length(s)
 
         if ($msg_q == 0) {
-                $msg = "OK: mailq is empty";
+                $msg = "OK: $mailq mailq is empty";
                 $state = $ERRORS{'OK'};
         } else {
                 print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose;
         
                 # overall queue length
                 if ($msg_q < $opt_w) {
-                        $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                        $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
                         $state = $ERRORS{'OK'};
                 }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
-                        $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
+                        $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
                         $state = $ERRORS{'WARNING'};
                 }else {
-                        $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
+                        $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
                         $state = $ERRORS{'CRITICAL'};
                 }
 
@@ -344,20 +345,20 @@ elsif ( $mailq eq "postfix" ) {
 
         # check queue length(s)
         if ($msg_q == 0){
-                $msg = "OK: mailq reports queue is empty";
+                $msg = "OK: $mailq mailq reports queue is empty";
                 $state = $ERRORS{'OK'};
         } else {
                 print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose;
 
                 # overall queue length
                 if ($msg_q < $opt_w) {
-                        $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                        $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
                         $state = $ERRORS{'OK'};
                 }elsif  ($msg_q >= $opt_w  && $msg_q < $opt_c) {
-                        $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
+                        $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
                         $state = $ERRORS{'WARNING'};
                 }else {
-                        $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
+                        $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
                         $state = $ERRORS{'CRITICAL'};
                 }
 
@@ -373,7 +374,7 @@ elsif ( $mailq eq "postfix" ) {
                 #        }
                 #}
         }
-} # end of ($mailq eq "postfixl")
+} # end of ($mailq eq "postfix")
 elsif ( $mailq eq "qmail" ) {
 
         # open qmail-qstat 
@@ -431,13 +432,13 @@ elsif ( $mailq eq "qmail" ) {
                 
                 # overall queue length
                 if ($msg_q < $opt_w) {
-                        $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                        $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
                         $state = $ERRORS{'OK'};
                 }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
-                        $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
+                        $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
                         $state = $ERRORS{'WARNING'};
                 }else {
-                        $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
+                        $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
                         $state = $ERRORS{'CRITICAL'};
                 }
 
@@ -489,17 +490,54 @@ elsif ( $mailq eq "exim" ) {
                 exit $ERRORS{CRITICAL};
         }
         if ($msg_q < $opt_w) {
-                $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
                 $state = $ERRORS{'OK'};
         }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
-                $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)";
+                $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
                 $state = $ERRORS{'WARNING'};
         }else {
-                $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)";
+                $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
                 $state = $ERRORS{'CRITICAL'};
         }
 } # end of ($mailq eq "exim")
 
+elsif ( $mailq eq "nullmailer" ) {
+        ## open mailq
+        if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
+                if (! open (MAILQ, "$utils::PATH_TO_MAILQ | " ) ) {
+                        print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
+                        exit $ERRORS{'UNKNOWN'};
+                }
+        }elsif( defined $utils::PATH_TO_MAILQ){
+                unless (-x $utils::PATH_TO_MAILQ) {
+                        print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
+                        exit $ERRORS{'UNKNOWN'};
+                }
+        } else {
+                print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
+                exit $ERRORS{'UNKNOWN'};
+        }
+
+        while (<MAILQ>) {
+            #2006-06-22 16:00:00  282 bytes
+
+            if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-2][0-9]\:[0-2][0-9]\s{2}[0-9]+\sbytes$/) {
+                $msg_q++ ;
+            }
+        }
+        close(MAILQ) ;
+        if ($msg_q < $opt_w) {
+                $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)";
+                $state = $ERRORS{'OK'};
+        }elsif ($msg_q >= $opt_w  && $msg_q < $opt_c) {
+                $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)";
+                $state = $ERRORS{'WARNING'};
+        }else {
+                $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)";
+                $state = $ERRORS{'CRITICAL'};
+        }
+} # end of ($mailq eq "nullmailer")
+
 # Perfdata support
 print "$msg|unsent=$msg_q;$opt_w;$opt_c;0\n";
 exit $state;
@@ -559,7 +597,7 @@ sub process_arguments(){
         }
 
         if (defined $opt_M) {
-                if ($opt_M =~ /^(sendmail|qmail|postfix|exim)$/) {
+                if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) {
                         $mailq = $opt_M ;
                 }elsif( $opt_M eq ''){
                         $mailq = 'sendmail';
@@ -568,7 +606,30 @@ sub process_arguments(){
                         exit $ERRORS{'UNKNOWN'};
                 }
         }else{
-                $mailq = 'sendmail' ;
+                if (defined $utils::PATH_TO_QMAIL_QSTAT
+                    && -x $utils::PATH_TO_QMAIL_QSTAT)
+                {
+                        $mailq = 'qmail';
+                }
+                elsif (-d '/var/lib/postfix' || -d '/var/local/lib/postfix'
+                       || -e '/usr/sbin/postfix' || -e '/usr/local/sbin/postfix')
+                {
+                        $mailq = 'postfix';
+                }
+                elsif (-d '/usr/lib/exim4' || -d '/usr/local/lib/exim4'
+                       || -e '/usr/sbin/exim' || -e '/usr/local/sbin/exim')
+                {
+                        $mailq = 'exim';
+                }
+                elsif (-d '/usr/lib/nullmailer' || -d '/usr/local/lib/nullmailer'
+                       || -e '/usr/sbin/nullmailer-send'
+                       || -e '/usr/local/sbin/nullmailer-send')
+                {
+                        $mailq = 'nullmailer';
+                }
+                else {
+                        $mailq = 'sendmail';
+                }
         }
                 
         return $ERRORS{'OK'};
@@ -591,7 +652,7 @@ sub print_help () {
         print "-W (--Warning)   = Min. number of messages for same domain in queue to generate warning\n";
         print "-C (--Critical)  = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
         print "-t (--timeout)   = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
-        print "-M (--mailserver) = [ sendmail | qmail | postfix | exim ] (default = sendmail)\n";
+        print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = autodetect)\n";
         print "-h (--help)\n";
         print "-V (--version)\n";
         print "-v (--verbose)   = debugging output\n";
@@ -599,6 +660,8 @@ sub print_help () {
         print "Note: -w and -c are required arguments.  -W and -C are optional.\n";
         print " -W and -C are applied to domains listed on the queues - both FROM and TO. (sendmail)\n";
         print " -W and -C are applied message not yet preproccessed. (qmail)\n";
+        print " This plugin tries to autodetect which mailserver you are running,\n";
+        print " you can override the autodetection with -M.\n";
         print " This plugin uses the system mailq command (sendmail) or qmail-stat (qmail)\n";
         print " to look at the queues. Mailq can usually only be accessed by root or \n";
         print " a TrustedUser. You will have to set appropriate permissions for the plugin to work.\n";
diff --git a/plugins-scripts/check_mssql.pl b/plugins-scripts/check_mssql.pl
index 4486149d..cf23ae82 100755
--- a/plugins-scripts/check_mssql.pl
+++ b/plugins-scripts/check_mssql.pl
@@ -21,7 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# Report bugs to: nagiosplug-help@lists.sourceforge.net
+# Report bugs to: help@monitoring-plugins.org
 # 
 #
 
@@ -48,7 +48,7 @@ my $exitcode = $ERRORS{'OK'};
 
 process_arguments();
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
      print ("SQL UNKNOWN: ERROR connection $server (alarm timeout)\n");
      exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_netdns.pl b/plugins-scripts/check_netdns.pl
index 9871a9a5..6e0d02d1 100755
--- a/plugins-scripts/check_netdns.pl
+++ b/plugins-scripts/check_netdns.pl
@@ -27,7 +27,8 @@
 
 use Getopt::Long;
 use Net::DNS;
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils ;
 
 my $PROGNAME = "check_netdns";
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index f5302e3b..efa1df19 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -3,7 +3,7 @@
 # latigid010@yahoo.com
 # 01/06/2000
 #
-#  This Nagios plugin was created to check Oracle status
+#  This Monitoring plugin was created to check Oracle status
 #
 
 PROGNAME=`basename $0`
@@ -164,7 +164,7 @@ case "$cmd" in
     }'
     ;;
 --db)
-    pmonchk=`ps -ef | grep -v grep | grep -c "ora_pmon_${2}$"`
+    pmonchk=`ps -ef | grep -v grep | grep -E -c "(asm|ora)_pmon_${2}$"`
     if [ ${pmonchk} -ge 1 ] ; then
         echo "${2} OK - ${pmonchk} PMON process(es) running"
         exit $STATE_OK
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl
index e09754dd..f7fe0321 100755
--- a/plugins-scripts/check_rpc.pl
+++ b/plugins-scripts/check_rpc.pl
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# check_rpc plugin for nagios
+# check_rpc plugin for monitoring
 #
 # usage:
 #    check_rpc host service
@@ -20,7 +20,8 @@
 #
 
 use strict;
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use vars qw($PROGNAME);
 my ($verbose,@proto,%prognum,$host,$response,$prognum,$port,$cmd,$progver,$state);
@@ -254,7 +255,7 @@ $proto = 't' if ($opt_t);
 $proto = 'u' if ($opt_u);
 
 
-# Just in case of problems, let's not hang Nagios
+# Just in case of problems, let's not hang the monitoring system
 $SIG{'ALRM'} = sub {
         print ("ERROR: No response from RPC server (alarm)\n");
         exit $ERRORS{"UNKNOWN"};
diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl
index 8f9a4da3..51927534 100755
--- a/plugins-scripts/check_wave.pl
+++ b/plugins-scripts/check_wave.pl
@@ -3,7 +3,8 @@
 
 
 use strict;
-use lib utils.pm;
+use FindBin;
+use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support);
 use vars qw($PROGNAME);
 use Getopt::Long;
diff --git a/plugins-scripts/subst.in b/plugins-scripts/subst.in
index 49a95ca1..c730b770 100644
--- a/plugins-scripts/subst.in
+++ b/plugins-scripts/subst.in
@@ -19,19 +19,6 @@ function which(c,path) {
         return c;
 }
 
-# used to replace "use lib utils.pm" with "use lib @libexecdir"
-#
-function led() {
-        led1 = "@libexecdir@";
-        led2 = "@exec_prefix@";
-        led3 = "@prefix@";
-        if ( match(led1, /^\$\{exec_prefix\}/ ) != 0 ) {
-                return "\"" led3 "/libexec\" " ;
-        
-        }
-        return "\"" led1 "\"" ;
-}
-
 BEGIN {
         split(ENVIRON["PATH"] ":/sbin:/usr/sbin",path,/:/);
 
@@ -58,9 +45,6 @@ BEGIN {
         sub(c,which(c,path));
 }
 
-# add to libexecdir to INC for perl utils.pm
-/^use/ { if (/lib/) { if (/utils.pm|"."/ ) {sub(/utils.pm|"."/,led() )} } }
-
 # Trusted path mechanism
 /@trusted_path@/ {sub(/@trusted_path@/,"@with_trusted_path@");}
 
diff --git a/plugins-scripts/t/check_file_age.t b/plugins-scripts/t/check_file_age.t
index 384c276b..a5156491 100644
--- a/plugins-scripts/t/check_file_age.t
+++ b/plugins-scripts/t/check_file_age.t
@@ -5,7 +5,7 @@
 #
 
 use strict;
-use Test::More tests => 15;
+use Test::More tests => 16;
 use NPTest;
 
 my $successOutput = '/^FILE_AGE OK: /';
@@ -58,6 +58,11 @@ $result = NPTest->testCmd(
 cmp_ok( $result->return_code, '==', 0, "Checking file size" );
 
 $result = NPTest->testCmd(
+        "./check_file_age -f /non/existent --ignore-missing"
+        );
+cmp_ok( $result->return_code, '==', 0, "Honours --ignore-missing" );
+
+$result = NPTest->testCmd(
         "./check_file_age -f $temp_file -c 1000 -W 101"
         );
 cmp_ok( $result->return_code, '==', 1, "One byte too short" );
diff --git a/plugins-scripts/utils.pm.in b/plugins-scripts/utils.pm.in
index 37cd62c3..0f53243c 100644
--- a/plugins-scripts/utils.pm.in
+++ b/plugins-scripts/utils.pm.in
@@ -1,6 +1,6 @@
-# Utility drawer for Nagios plugins.
+# Utility drawer for Monitoring Plugins.
 #
-# This will be deprecated soon. Please use Nagios::Plugin from CPAN
+# This will be deprecated soon. Please use Monitoring::Plugin from CPAN
 # for new plugins
 
 package utils;
diff --git a/plugins-scripts/utils.sh.in b/plugins-scripts/utils.sh.in
index 4a07df89..031c0357 100644
--- a/plugins-scripts/utils.sh.in
+++ b/plugins-scripts/utils.sh.in
@@ -6,19 +6,13 @@ STATE_CRITICAL=2
 STATE_UNKNOWN=3
 STATE_DEPENDENT=4
 
-if test -x /usr/bin/printf; then
-        ECHO=/usr/bin/printf
-else
-        ECHO=echo
-fi
-
 print_revision() {
         echo "$1 v$2 (@PACKAGE@ @VERSION@)"
-        $ECHO "@WARRANTY@" | sed -e 's/\n/ /g'
+        printf '%b' "@WARRANTY@"
 }
 
 support() {
-        $ECHO "@SUPPORT@" | sed -e 's/\n/ /g'
+        printf '%b' "@SUPPORT@"
 }
 
 #
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 031dd251..368876ea 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -11,7 +11,7 @@ endif
 
 AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
 
-VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
+VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
 
 INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
 
@@ -48,7 +48,7 @@ noinst_LIBRARIES = libnpcommon.a
 libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c  \
         popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h
 
-BASEOBJS = libnpcommon.a ../lib/libnagiosplug.a ../gl/libgnu.a
+BASEOBJS = libnpcommon.a ../lib/libmonitoringplug.a ../gl/libgnu.a
 NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS)
@@ -129,11 +129,10 @@ install-exec-hook:
         cd $(DESTDIR)$(libexecdir) && \
         for i in $(check_tcp_programs) ; do rm -f $$i; ln -s check_tcp $$i ; done ;\
         if [ -x check_ldap ] ; then rm -f check_ldaps ; ln -s check_ldap check_ldaps ; fi
-        
+
 clean-local:
         rm -f $(check_tcp_programs)
         rm -f NP-VERSION-FILE
 
 uninstall-local:
         cd $(DESTDIR)$(libexecdir) && rm -f $(check_tcp_programs)
-
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index daeb7578..9994213a 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_apt plugin
+* Monitoring check_apt plugin
 * 
 * License: GPL
-* Copyright (c) 2006-2008 Nagios Plugins Development Team
+* Copyright (c) 2006-2008 Monitoring Plugins Development Team
 * 
 * Original author: Sean Finney
 * 
@@ -31,7 +31,7 @@
 
 const char *progname = "check_apt";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "runcmd.h"
@@ -430,7 +430,7 @@ print_help (void)
   printf(UT_HELP_VRSN);
   printf(UT_EXTRA_OPTS);
 
-  printf(UT_TIMEOUT, timeout_interval);
+  printf(UT_PLUG_TIMEOUT, timeout_interval);
 
   printf (" %s\n", "-U, --upgrade=OPTS");
   printf ("    %s\n", _("[Default] Perform an upgrade.  If an optional OPTS argument is provided,"));
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index c5f0d529..58f333d3 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_by_ssh plugin
+* Monitoring check_by_ssh plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2008 Nagios Plugins Development Team
+* Copyright (c) 2000-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -28,7 +28,7 @@
 
 const char *progname = "check_by_ssh";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -246,7 +246,7 @@ process_arguments (int argc, char **argv)
                         }
                         service[services - 1] = p1;
                         break;
-                case 'n':                                                                       /* short name of host in nagios configuration */
+                case 'n':                                                                       /* short name of host in the monitoring configuration */
                         host_shortname = optarg;
                         break;
 
@@ -371,7 +371,7 @@ validate_arguments (void)
                 die (STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname);
 
         if (passive && host_shortname == NULL)
-                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the nagios configs.\n"), progname);
+                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\n"), progname);
 
         return OK;
 }
@@ -416,11 +416,11 @@ print_help (void)
   printf (" %s\n","-i, --identity=KEYFILE");
   printf ("    %s\n", _("identity of an authorized key [optional]"));
   printf (" %s\n","-O, --output=FILE");
-  printf ("    %s\n", _("external command file for nagios [optional]"));
+  printf ("    %s\n", _("external command file for monitoring [optional]"));
   printf (" %s\n","-s, --services=LIST");
-  printf ("    %s\n", _("list of nagios service names, separated by ':' [optional]"));
+  printf ("    %s\n", _("list of monitoring service names, separated by ':' [optional]"));
   printf (" %s\n","-n, --name=NAME");
-  printf ("    %s\n", _("short name of host in nagios configuration [optional]"));
+  printf ("    %s\n", _("short name of host in the monitoring configuration [optional]"));
   printf (" %s\n","-o, --ssh-option=OPTION");
   printf ("    %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));
   printf (" %s\n","-F, --configfile");
@@ -428,7 +428,7 @@ print_help (void)
   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_CONN_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"));
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index d4e39e0f..cf699e1f 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* check_cluster.c - Host and Service Cluster Plugin for Nagios 2.x
+* check_cluster.c - Host and Service Cluster Plugin for Monitoring
 * 
 * License: GPL
 * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2007 Nagios Plugins Development Team
+* Copyright (c) 2007 Monitoring Plugins Development Team
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 
 const char *progname = "check_cluster";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -227,7 +227,7 @@ print_help(void)
         printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
         printf(COPYRIGHT, copyright, email);
 
-        printf(_("Host/Service Cluster Plugin for Nagios 2"));
+        printf(_("Host/Service Cluster Plugin for Monitoring"));
         printf("\n\n");
 
         print_usage();
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c
index 8c4a511d..c6244fd2 100644
--- a/plugins/check_dbi.c
+++ b/plugins/check_dbi.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_dbi plugin
+* Monitoring check_dbi plugin
 * 
 * License: GPL
-* Copyright (c) 2011 Nagios Plugins Development Team
+* Copyright (c) 2011 Monitoring Plugins Development Team
 * Author: Sebastian 'tokkee' Harl <sh@teamix.net>
 * 
 * Description:
@@ -31,7 +31,7 @@
 
 const char *progname = "check_dbi";
 const char *copyright = "2011";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -562,7 +562,7 @@ print_help (void)
         printf ("                   %s\n", _("(ignore the query result)"));
         printf ("\n");
 
-        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (UT_VERBOSE);
 
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index c113d87b..d9481f2d 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_dig plugin
+* Monitoring check_dig plugin
 * 
 * License: GPL
-* Copyright (c) 2002-2008 Nagios Plugins Development Team
+* Copyright (c) 2002-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 
 const char *progname = "check_dig";
 const char *copyright = "2002-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -48,6 +48,7 @@ void print_usage (void);
 
 #define UNDEFINED 0
 #define DEFAULT_PORT 53
+#define DEFAULT_TRIES 3
 
 char *query_address = NULL;
 char *record_type = "A";
@@ -57,6 +58,7 @@ char *dig_args = "";
 char *query_transport = "";
 int verbose = FALSE;
 int server_port = DEFAULT_PORT;
+int number_tries = DEFAULT_TRIES;
 double warning_interval = UNDEFINED;
 double critical_interval = UNDEFINED;
 struct timeval tv;
@@ -72,6 +74,7 @@ main (int argc, char **argv)
   long microsec;
   double elapsed_time;
   int result = STATE_UNKNOWN;
+  int timeout_interval_dig;
 
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
@@ -87,9 +90,12 @@ main (int argc, char **argv)
   if (process_arguments (argc, argv) == ERROR)
     usage_va(_("Could not parse arguments"));
 
+  /* dig applies the timeout to each try, so we need to work around this */
+  timeout_interval_dig = timeout_interval / number_tries + number_tries;
+
   /* get the command to run */
-  xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s",
-            PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport);
+  xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d",
+            PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport, number_tries, timeout_interval_dig);
 
   alarm (timeout_interval);
   gettimeofday (&tv, NULL);
@@ -348,7 +354,7 @@ print_help (void)
   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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
   printf (UT_VERBOSE);
 
   printf ("\n");
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 04d588fb..c12b5d98 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_disk plugin
+* Monitoring check_disk plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2008 Nagios Plugins Development Team
+* Copyright (c) 1999-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -29,7 +29,7 @@
 const char *progname = "check_disk";
 const char *program_name = "check_disk";  /* Required for coreutils libs */
 const char *copyright = "1999-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 
 #include "common.h"
@@ -877,7 +877,7 @@ print_help (void)
   printf (" %s\n", "-K, --icritical=PERCENT%");
   printf ("    %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free"));
   printf (" %s\n", "-p, --path=PATH, --partition=PARTITION");
-  printf ("    %s\n", _("Path or partition (may be repeated)"));
+  printf ("    %s\n", _("Mount point or block device as emitted by the mount(8) command (may be repeated)"));
   printf (" %s\n", "-x, --exclude_device=PATH <STRING>");
   printf ("    %s\n", _("Ignore device (only works if -p unspecified)"));
   printf (" %s\n", "-C, --clear");
@@ -911,7 +911,7 @@ 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_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
   printf (" %s\n", "-u, --units=STRING");
   printf ("    %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)"));
   printf (UT_VERBOSE);
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index ac6cfc38..eebe72cc 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_dns plugin
+* Monitoring check_dns plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2008 Nagios Plugins Development Team
+* Copyright (c) 2000-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 
 const char *progname = "check_dns";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -474,7 +474,7 @@ 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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf (UT_SUPPORT);
 }
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 3cfc9ede..3ed68717 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_dummy plugin
+* Monitoring check_dummy plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_dummy";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index dad000e6..46046b4f 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_fping plugin
+* Monitoring check_fping plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 
 const char *progname = "check_fping";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "popen.h"
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 89bb4b12..29e59e2f 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_game plugin
+* Monitoring check_game plugin
 * 
 * License: GPL
-* Copyright (c) 2002-2007 Nagios Plugins Development Team
+* Copyright (c) 2002-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 
 const char *progname = "check_game";
 const char *copyright = "2002-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf ("\n");
   printf ("%s\n", _("Notes:"));
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 60e922ed..1e7605ba 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_hpjd plugin
+* Monitoring check_hpjd plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 
 const char *progname = "check_hpjd";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "popen.h"
diff --git a/plugins/check_http.c b/plugins/check_http.c
index c36d916a..92861d97 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 *
-* Nagios check_http plugin
+* Monitoring check_http plugin
 *
 * License: GPL
-* Copyright (c) 1999-2013 Nagios Plugins Development Team
+* Copyright (c) 1999-2013 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -35,7 +35,7 @@
 
 const char *progname = "check_http";
 const char *copyright = "1999-2013";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -57,7 +57,7 @@ enum {
 
 #ifdef HAVE_SSL
 int check_cert = FALSE;
-int ssl_version;
+int ssl_version = 0;
 int days_till_exp_warn, days_till_exp_crit;
 char *randbuff;
 X509 *server_cert;
@@ -157,7 +157,7 @@ main (int argc, char **argv)
   /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
   server_url = strdup(HTTP_URL);
   server_url_length = strlen(server_url);
-  xasprintf (&user_agent, "User-Agent: check_http/v%s (nagios-plugins %s)",
+  xasprintf (&user_agent, "User-Agent: check_http/v%s (monitoring-plugins %s)",
             NP_VERSION, VERSION);
 
   /* Parse extra opts if any */
@@ -257,7 +257,7 @@ process_arguments (int argc, char **argv)
   }
 
   while (1) {
-    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:N:E", longopts, &option);
+    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:NE", longopts, &option);
     if (c == -1 || c == EOF)
       break;
 
@@ -339,10 +339,10 @@ process_arguments (int argc, char **argv)
     case 'S': /* use SSL */
 #ifdef HAVE_SSL
     enable_ssl:
+      /* ssl_version initialized to 0 as a default. Only set if it's non-zero.  This helps when we include multiple
+         parameters, like -S and -C combinations */
       use_ssl = TRUE;
-      if (optarg == NULL || c != 'S')
-        ssl_version = 0;
-      else {
+      if (c=='S' && optarg != NULL) {
         ssl_version = atoi(optarg);
         if (ssl_version < 1 || ssl_version > 3)
             usage4 (_("Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 (SSLv3)"));
@@ -1534,7 +1534,7 @@ print_help (void)
 
   printf (UT_WARN_CRIT);
 
-  printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+  printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf (UT_VERBOSE);
 
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 0a8009ab..55faacce 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -1,13 +1,13 @@
 /*****************************************************************************
 * 
-* Nagios check_ide_smart plugin
+* Monitoring check_ide_smart plugin
 * ide-smart 1.3 - IDE S.M.A.R.T. checking tool
 * 
 * License: GPL
 * Copyright (C) 1998-1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>
 *               1998      Gadi Oxman <gadio@netvision.net.il>
 * Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -35,7 +35,7 @@
 
 const char *progname = "check_ide_smart";
 const char *copyright = "1998-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
         
 #include "common.h"
 #include "utils.h"
@@ -172,12 +172,12 @@ void print_value (value_t *, threshold_t *);
 void print_values (values_t *, thresholds_t *);
 int smart_cmd_simple (int, enum SmartCommand, __u8, char);
 int smart_read_thresholds (int, thresholds_t *);
+int verbose = FALSE;
 
 int
 main (int argc, char *argv[]) 
 {
         char *device = NULL;
-        int command = -1;
         int o, longindex;
         int retval = 0;
 
@@ -191,7 +191,7 @@ main (int argc, char *argv[])
                 {"quiet-check", no_argument, 0, 'q'}, 
                 {"auto-on", no_argument, 0, '1'}, 
                 {"auto-off", no_argument, 0, '0'}, 
-                {"nagios", no_argument, 0, 'n'}, 
+                {"nagios", no_argument, 0, 'n'}, /* DEPRECATED, but we still accept it */
                 {"help", no_argument, 0, 'h'}, 
                 {"version", no_argument, 0, 'V'},
                 {0, 0, 0, 0}
@@ -206,7 +206,7 @@ main (int argc, char *argv[])
 
         while (1) {
                 
-                o = getopt_long (argc, argv, "+d:iq10nhV", longopts, &longindex);
+                o = getopt_long (argc, argv, "+d:iq10nhVv", longopts, &longindex);
 
                 if (o == -1 || o == EOF || o == 1)
                         break;
@@ -216,19 +216,21 @@ main (int argc, char *argv[])
                         device = optarg;
                         break;
                 case 'q':
-                        command = 3;
+                        fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"."));
+                        fprintf (stderr, "%s\n", _("Nagios-compatible output is now always returned."));
                         break;
                 case 'i':
-                        command = 2;
-                        break;
                 case '1':
-                        command = 1;
-                        break;
                 case '0':
-                        command = 0;
+                        printf ("%s\n", _("SMART commands are broken and have been disabled (See Notes in --help)."));
+                        return STATE_CRITICAL;
                         break;
                 case 'n':
-                        command = 4;
+                        fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the"));
+                        fprintf (stderr, "%s\n", _("default and will be removed from future releases."));
+                        break;
+                case 'v': /* verbose */
+                        verbose = TRUE;
                         break;
                 case 'h':
                         print_help ();
@@ -257,37 +259,16 @@ main (int argc, char *argv[])
                 return STATE_CRITICAL;
         }
 
-        if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, TRUE)) {
+        if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, FALSE)) {
                 printf (_("CRITICAL - SMART_CMD_ENABLE\n"));
                 return STATE_CRITICAL;
         }
 
-        switch (command) {
-        case 0:
-                retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0, TRUE);
-                break;
-        case 1:
-                retval = smart_cmd_simple (fd, SMART_CMD_AUTO_OFFLINE, 0xF8, TRUE);
-                break;
-        case 2:
-                retval = smart_cmd_simple (fd, SMART_CMD_IMMEDIATE_OFFLINE, 0, TRUE);
-                break;
-        case 3:
-                smart_read_values (fd, &values);
-                smart_read_thresholds (fd, &thresholds);
-                retval = values_not_passed (&values, &thresholds);
-                break;
-        case 4:
-                smart_read_values (fd, &values);
-                smart_read_thresholds (fd, &thresholds);
-                retval = nagios (&values, &thresholds);
-                break;
-        default:
-                smart_read_values (fd, &values);
-                smart_read_thresholds (fd, &thresholds);
-                print_values (&values, &thresholds);
-                break;
-        }
+        smart_read_values (fd, &values);
+        smart_read_thresholds (fd, &thresholds);
+        retval = nagios (&values, &thresholds);
+        if (verbose) print_values (&values, &thresholds);
+
         close (fd);
         return retval;
 }
@@ -368,7 +349,7 @@ values_not_passed (values_t * p, thresholds_t * t)
         int i;
         for (i = 0; i < NR_ATTRIBUTES; i++) {
                 if (value->id && threshold->id && value->id == threshold->id) {
-                        if (value->value <= threshold->threshold) {
+                        if (value->value < threshold->threshold) {
                                 ++failed;
                         }
                         else {
@@ -397,7 +378,7 @@ nagios (values_t * p, thresholds_t * t)
         int i;
         for (i = 0; i < NR_ATTRIBUTES; i++) {
                 if (value->id && threshold->id && value->id == threshold->id) {
-                        if (value->value <= threshold->threshold) {
+                        if (value->value < threshold->threshold) {
                                 ++failed;
                                 if (value->status & 1) {
                                         status = PREFAILURE;
@@ -454,7 +435,7 @@ print_value (value_t * p, threshold_t * t)
         printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n",
                                         p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory   ",
                                         p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold,
-                                        p->value > t->threshold ? "Passed" : "Failed");
+                                        p->value >= t->threshold ? "Passed" : "Failed");
 }
 
 
@@ -495,7 +476,7 @@ print_values (values_t * p, thresholds_t * t)
 int
 smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error) 
 {
-        int e = 0;
+        int e = STATE_UNKNOWN;
 #ifdef __linux__
         __u8 args[4];
         args[0] = WIN_SMART;
@@ -503,11 +484,15 @@ smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error)
         args[2] = smart_command[command].value;
         args[3] = 0;
         if (ioctl (fd, HDIO_DRIVE_CMD, &args)) {
-                e = errno;
-                if (show_error) {
+                e = STATE_CRITICAL;
+                if (show_error)
                         printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
-                }
+        } else {
+                e = STATE_OK;
+                if (show_error)
+                        printf (_("OK - Command sent (%s)\n"), smart_command[command].text);
         }
+
 #endif /* __linux__ */
 #ifdef __NetBSD__
         struct atareq req;
@@ -528,10 +513,15 @@ smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error)
         }
 
         if (errno != 0) {
-                e = errno;
-                printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
-                return e;
+                e = STATE_CRITICAL;
+                if (show_error)
+                        printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
+        } else {
+                e = STATE_OK;
+                if (show_error)
+                        printf (_("OK - Command sent (%s)\n"), smart_command[command].text);
         }
+
 #endif /* __NetBSD__ */
         return e;
 }
@@ -592,8 +582,8 @@ print_help (void)
 {
         print_revision (progname, NP_VERSION);
 
-        printf ("Nagios feature - 1999 Robert Dale <rdale@digital-mission.com>\n");
         printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
+        printf ("Plugin implementation - 1999 Robert Dale <rdale@digital-mission.com>\n");
         printf (COPYRIGHT, copyright, email);
 
         printf (_("This plugin checks a local hard drive with the (Linux specific) SMART interface [http://smartlinux.sourceforge.net/smart/index.php]."));
@@ -607,17 +597,19 @@ print_help (void)
 
   printf (" %s\n", "-d, --device=DEVICE");
   printf ("    %s\n", _("Select device DEVICE"));
-  printf ("    %s\n", _("Note: if the device is selected with this option, _no_ other options are accepted"));
-  printf (" %s\n", "-i, --immediate");
-  printf ("    %s\n", _("Perform immediately offline tests"));
-  printf (" %s\n", "-q, --quiet-check");
-  printf ("    %s\n", _("Returns the number of failed tests"));
-  printf (" %s\n", "-1, --auto-on");
-  printf ("    %s\n", _("Turn on automatic offline tests"));
-  printf (" %s\n", "-0, --auto-off");
-  printf ("    %s\n", _("Turn off automatic offline tests"));
-  printf (" %s\n", "-n, --nagios");
-  printf ("    %s\n", _("Output suitable for Nagios"));
+  printf ("    %s\n", _("Note: if the device is specified without this option, any further option will"));
+  printf ("          %s\n", _("be ignored."));
+
+  printf (UT_VERBOSE);
+
+  printf ("\n");
+  printf ("%s\n", _("Notes:"));
+  printf (" %s\n", _("The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were"));
+  printf (" %s\n", _("broken in an underhand manner and have been disabled. You can use smartctl"));
+  printf (" %s\n", _("instead:"));
+  printf ("  %s\n", _("-0/--auto-off:  use \"smartctl --offlineauto=off\""));
+  printf ("  %s\n", _("-1/--auto-on:   use \"smartctl --offlineauto=on\""));
+  printf ("  %s\n", _("-i/--immediate: use \"smartctl --test=offline\""));
 
   printf (UT_SUPPORT);
 }
@@ -638,6 +630,5 @@ void
 print_usage (void)
 {
   printf ("%s\n", _("Usage:"));
-  printf ("%s [-d <device>] [-i <immediate>] [-q quiet] [-1 <auto-on>]",progname);
-  printf (" [-O <auto-off>] [-n <nagios>]\n");
+  printf ("%s [-d <device>] [-v]", progname);
 }
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index b05aca9a..c371be97 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_ldap plugin
+* Monitoring check_ldap plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2008 Nagios Plugins Development Team
+* Copyright (c) 2000-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -29,7 +29,7 @@
 /* progname may be check_ldaps */
 char *progname = "check_ldap";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -430,7 +430,7 @@ print_help (void)
 
         printf (UT_WARN_CRIT);
 
-        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (UT_VERBOSE);
 
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 296a8233..cde63e56 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_load plugin
+* Monitoring check_load plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_load";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index d6162f35..ed75f4ce 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_mrtg plugin
+* Monitoring check_mrtg plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 
 const char *progname = "check_mrtg";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index a8226514..32ba0507 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_mrtgtraf plugin
+* Monitoring check_mrtgtraf plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 
 const char *progname = "check_mrtgtraf";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 int process_arguments (int, char **);
 int validate_arguments (void);
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index db670e2d..135aa18c 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -1,11 +1,11 @@
 /*****************************************************************************
 * 
-* Nagios check_mysql plugin
+* Monitoring check_mysql plugin
 * 
 * License: GPL
 * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
 * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 1999-2011 Nagios Plugins Development Team
+* Copyright (c) 1999-2011 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -32,7 +32,7 @@
 
 const char *progname = "check_mysql";
 const char *copyright = "1999-2011";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #define SLAVERESULTSIZE 70
 
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 0bb83c3e..71ab7768 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_mysql_query plugin
+* Monitoring check_mysql_query plugin
 * 
 * License: GPL
-* Copyright (c) 2006-2009 Nagios Plugins Development Team
+* Copyright (c) 2006-2009 Monitoring Plugins Development Team
 * Original code from check_mysql, copyright 1999 Didi Rieder
 * 
 * Description:
@@ -31,7 +31,7 @@
 
 const char *progname = "check_mysql_query";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -46,6 +46,8 @@ char *db_host = NULL;
 char *db_socket = NULL;
 char *db_pass = NULL;
 char *db = NULL;
+char *opt_file = NULL;
+char *opt_group = NULL;
 unsigned int db_port = MYSQL_PORT;
 
 int process_arguments (int, char **);
@@ -83,7 +85,13 @@ main (int argc, char **argv)
         /* initialize mysql  */
         mysql_init (&mysql);
 
-        mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
+        if (opt_file != NULL)
+                mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,opt_file);
+
+        if (opt_group != NULL)
+                mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,opt_group);
+        else
+                mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
 
         /* establish a connection to the server and error checking */
         if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,db_socket,0)) {
@@ -152,7 +160,13 @@ main (int argc, char **argv)
         } else if (status == STATE_CRITICAL) {
                 printf("QUERY %s: ", _("CRITICAL"));
         }
-        printf(_("'%s' returned %f"), sql_query, value);
+        printf(_("'%s' returned %f | %s"), sql_query, value,
+                fperfdata("result", value, "",
+                my_thresholds->warning?TRUE:FALSE, my_thresholds->warning?my_thresholds->warning->end:0,
+                my_thresholds->critical?TRUE:FALSE, my_thresholds->critical?my_thresholds->critical->end:0,
+                FALSE, 0, 
+                FALSE, 0)
+        );
         printf("\n");
 
         return status;
@@ -174,6 +188,8 @@ process_arguments (int argc, char **argv)
                 {"database", required_argument, 0, 'd'},
                 {"username", required_argument, 0, 'u'},
                 {"password", required_argument, 0, 'p'},
+                {"file", required_argument, 0, 'f'},
+                {"group", required_argument, 0, 'g'},
                 {"port", required_argument, 0, 'P'},
                 {"verbose", no_argument, 0, 'v'},
                 {"version", no_argument, 0, 'V'},
@@ -188,7 +204,7 @@ process_arguments (int argc, char **argv)
                 return ERROR;
 
         while (1) {
-                c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:", longopts, &option);
+                c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:f:g:", longopts, &option);
 
                 if (c == -1 || c == EOF)
                         break;
@@ -220,6 +236,12 @@ process_arguments (int argc, char **argv)
                                 optarg++;
                         }
                         break;
+                case 'f':                                                                       /* client options file */
+                        opt_file = optarg;
+                        break;
+                case 'g':                                                                       /* client options group */
+                        opt_group = optarg;
+                        break;
                 case 'P':                                                                       /* critical time threshold */
                         db_port = atoi (optarg);
                         break;
@@ -299,6 +321,10 @@ print_help (void)
         printf ("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
         printf (" -d, --database=STRING\n");
         printf ("    %s\n", _("Database to check"));
+        printf (" %s\n", "-f, --file=STRING");
+        printf ("    %s\n", _("Read from the specified client options file"));
+        printf (" %s\n", "-g, --group=STRING");
+        printf ("    %s\n", _("Use a client options group"));
         printf (" -u, --username=STRING\n");
         printf ("    %s\n", _("Username to login with"));
         printf (" -p, --password=STRING\n");
@@ -324,5 +350,5 @@ print_usage (void)
 {
   printf ("%s\n", _("Usage:"));
   printf (" %s -q SQL_query [-w warn] [-c crit] [-H host] [-P port] [-s socket]\n",progname);
-  printf ("       [-d database] [-u user] [-p password]\n");
+  printf ("       [-d database] [-u user] [-p password] [-f optfile] [-g group]\n");
 }
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 4fd6342d..791b6dbe 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_nagios plugin
+* Monitoring check_nagios plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 
 const char *progname = "check_nagios";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "runcmd.h"
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 52bbd1c5..1aa7ab51 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_nt plugin
+* Monitoring check_nt plugin
 * 
 * License: GPL
 * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
-* Copyright (c) 2003-2007 Nagios Plugins Development Team
+* Copyright (c) 2003-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 
 const char *progname = "check_nt";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -750,7 +750,7 @@ void print_help(void)
         printf ("  %s\n", _("The purpose of this is to be run from command line to determine what instances"));
         printf ("  %s\n", _(" are available for monitoring without having to log onto the Windows server"));
         printf ("  %s\n", _("  to run Perfmon directly."));
-        printf ("  %s\n", _("It can also be used in scripts that automatically create Nagios service"));
+        printf ("  %s\n", _("It can also be used in scripts that automatically create the monitoring service"));
         printf ("  %s\n", _(" configuration files."));
         printf ("  %s\n", _("Some examples:"));
         printf ("  %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"));
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 16be7c51..0a7640a7 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_ntp plugin
+* Monitoring check_ntp plugin
 * 
 * License: GPL
 * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Nagios Plugins Development Team
+* Copyright (c) 2006-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -32,7 +32,7 @@
 
 const char *progname = "check_ntp";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -54,7 +54,9 @@ void print_help (void);
 void print_usage (void);
 
 /* number of times to perform each request to get a good average. */
+#ifndef AVG_NUM
 #define AVG_NUM 4
+#endif
 
 /* max size of control message data */
 #define MAX_CM_SIZE 468
@@ -480,7 +482,7 @@ double offset_request(const char *host, int *status){
         } else {
                 /* finally, calculate the average offset */
                 for(i=0; i<servers[best_index].num_responses;i++){
-                        avg_offset+=servers[best_index].offset[j];
+                        avg_offset+=servers[best_index].offset[i];
                 }
                 avg_offset/=servers[best_index].num_responses;
         }
@@ -858,7 +860,7 @@ 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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf (UT_VERBOSE);
 
         printf("\n");
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 76152e17..8dc19788 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_ntp_peer plugin
+* Monitoring check_ntp_peer plugin
 * 
 * License: GPL
 * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Nagios Plugins Development Team
+* Copyright (c) 2006-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -37,7 +37,7 @@
 
 const char *progname = "check_ntp_peer";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -686,7 +686,7 @@ 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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf (UT_VERBOSE);
 
         printf("\n");
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index bbcaa0ba..72dffbd8 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios check_ntp_time plugin
+* Monitoring check_ntp_time plugin
 * 
 * License: GPL
 * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Nagios Plugins Development Team
+* Copyright (c) 2006-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -36,7 +36,7 @@
 
 const char *progname = "check_ntp_time";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -55,7 +55,9 @@ void print_help (void);
 void print_usage (void);
 
 /* number of times to perform each request to get a good average. */
+#ifndef AVG_NUM
 #define AVG_NUM 4
+#endif
 
 /* max size of control message data */
 #define MAX_CM_SIZE 468
@@ -426,7 +428,7 @@ double offset_request(const char *host, int *status){
         } else {
                 /* finally, calculate the average offset */
                 for(i=0; i<servers[best_index].num_responses;i++){
-                        avg_offset+=servers[best_index].offset[j];
+                        avg_offset+=servers[best_index].offset[i];
                 }
                 avg_offset/=servers[best_index].num_responses;
         }
@@ -614,7 +616,7 @@ void print_help(void){
         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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf (UT_VERBOSE);
 
         printf("\n");
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 6ebe8f83..1a7bfa16 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_nwstat plugin
+* Monitoring check_nwstat plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 
 const char *progname = "check_nwstat";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf ("\n");
   printf ("%s\n", _("Notes:"));
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 95977e91..af5eb9b9 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_overcr plugin
+* Monitoring check_overcr plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 
 const char *progname = "check_overcr";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -442,7 +442,7 @@ 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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf (UT_VERBOSE);
 
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 324bd5f4..4f2cf1d8 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_pgsql plugin
+* Monitoring check_pgsql plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2011 Nagios Plugins Development Team
+* Copyright (c) 1999-2011 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_pgsql";
 const char *copyright = "1999-2011";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -524,7 +524,7 @@ print_help (void)
 
         printf (UT_WARN_CRIT);
 
-        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (" %s\n", "-q, --query=STRING");
         printf ("    %s\n", _("SQL query to run. Only first column in first row will be read"));
@@ -563,7 +563,7 @@ print_help (void)
         printf (" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP"));
         printf (" %s\n\n", _("connections (start the postmaster with the -i option)."));
 
-        printf (" %s\n", _("Typically, the nagios user (unless the --logname option is used) should be"));
+        printf (" %s\n", _("Typically, the monitoring user (unless the --logname option is used) should be"));
         printf (" %s\n", _("able to connect to the database without a password. The plugin can also send"));
         printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password."));
 
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index eef2195b..95ac7b44 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_ping plugin
+* Monitoring check_ping plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_ping";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -482,7 +482,11 @@ run_ping (const char *cmd, const char *addr)
         /* check stderr, setting at least WARNING if there is output here */
         /* Add warning into warn_text */
         while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
-                if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")) {
+                if (
+                        ! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")
+                        && ! strstr(buf,"Warning: time of day goes back")
+
+                ) {
                         if (verbose >= 3) {
                                 printf("Got stderr: %s", buf);
                         }
@@ -581,7 +585,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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf ("\n");
         printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index d20b027f..402aac53 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_procs plugin
+* Monitoring check_procs plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2008 Nagios Plugins Development Team
+* Copyright (c) 2000-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -34,7 +34,7 @@
 const char *progname = "check_procs";
 const char *program_name = "check_procs";  /* Required for coreutils libs */
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -123,6 +123,7 @@ main (int argc, char **argv)
         char *procprog;
 
         pid_t mypid = 0;
+        pid_t myppid = 0;
         struct stat statbuf;
         dev_t mydev = 0;
         ino_t myino = 0;
@@ -172,6 +173,7 @@ main (int argc, char **argv)
 
         /* find ourself */
         mypid = getpid();
+        myppid = getppid();
         if (usepid || stat_exe(mypid, &statbuf) == -1) {
                 /* usepid might have been set by -T */
                 usepid = 1;
@@ -241,6 +243,12 @@ main (int argc, char **argv)
                                          printf("not considering - is myself or gone\n");
                                 continue;
                         }
+                        /* Ignore parent*/
+                        else if (myppid == procpid) {
+                                if (verbose >= 3)
+                                         printf("not considering - is parent\n");
+                                continue;
+                        }
 
                         /* filter kernel threads (childs of KTHREAD_PARENT)*/
                         /* TODO adapt for other OSes than GNU/Linux
@@ -707,7 +715,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_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (" %s\n", "-v, --verbose");
   printf ("    %s\n", _("Extra information. Up to 3 verbosity levels"));
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index e54105b0..3481f0cc 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_radius plugin
+* Monitoring check_radius plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2008 Nagios Plugins Development Team
+* Copyright (c) 1999-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_radius";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -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_CONN_TIMEOUT, timeout_interval);
 
   printf ("\n");
   printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
@@ -370,8 +370,8 @@ print_help (void)
   printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
         printf ("%s\n", _("The password option presents a substantial security issue because the"));
   printf ("%s\n", _("password can possibly be determined by careful watching of the command line"));
-  printf ("%s\n", _("in a process listing. This risk is exacerbated because nagios will"));
-  printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that"));
+  printf ("%s\n", _("in a process listing. This risk is exacerbated because the plugin will"));
+  printf ("%s\n", _("typically be executed at regular predictable intervals. Please be sure that"));
   printf ("%s\n", _("the password used does not allow access to sensitive system resources."));
 
         printf (UT_SUPPORT);
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 18240f30..47776c5b 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_real plugin
+* Monitoring check_real plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_real";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -429,7 +429,7 @@ print_help (void)
 
         printf (UT_WARN_CRIT);
 
-        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (UT_VERBOSE);
 
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index d477a51e..24304534 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_smtp plugin
+* Monitoring check_smtp plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_smtp";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -822,7 +822,7 @@ print_help (void)
    
         printf (UT_WARN_CRIT);
 
-        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (UT_VERBOSE);
 
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 52ad31ea..d516fbc1 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_snmp plugin
+* Monitoring check_snmp plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_snmp";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "runcmd.h"
@@ -459,7 +459,7 @@ main (int argc, char **argv)
                 /* Process this block for numeric comparisons */
                 /* Make some special values,like Timeticks numeric only if a threshold is defined */
                 if (thlds[i]->warning || thlds[i]->critical || calculate_rate) {
-                        ptr = strpbrk (show, "0123456789");
+                        ptr = strpbrk (show, "-0123456789");
                         if (ptr == NULL)
                                 die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show);
                         while (i >= response_size) {
@@ -1160,7 +1160,7 @@ 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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf (" %s\n", "-e, --retries=INTEGER");
         printf ("    %s\n", _("Number of retries to be used in the requests"));
 
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 6e8a5fc5..f4522e2b 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_ssh plugin
+* Monitoring check_ssh plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_ssh";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -291,7 +291,7 @@ print_help (void)
 
         printf (UT_IPv46);
 
-        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_CONN_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)"));
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 1b2a8dd5..88a2a2ad 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -1,14 +1,14 @@
 /*****************************************************************************
 * 
-* Nagios check_disk plugin
+* Monitoring check_disk plugin
 * 
 * License: GPL
 * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
-* This file contains the check_disk plugin
+* This file contains the check_swap plugin
 * 
 * 
 * This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 
 const char *progname = "check_swap";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "popen.h"
@@ -60,9 +60,10 @@ void print_help (void);
 int warn_percent = 0;
 int crit_percent = 0;
 float warn_size_bytes = 0;
-float crit_size_bytes= 0;
+float crit_size_bytes = 0;
 int verbose;
 int allswaps;
+int no_swap_state = STATE_CRITICAL;
 
 int
 main (int argc, char **argv)
@@ -350,7 +351,7 @@ main (int argc, char **argv)
         if(total_swap_mb) {
                 percent_used = 100 * ((double) used_swap_mb) / ((double) total_swap_mb);
         } else {
-                percent_used = 0;
+                percent_used = 100;
         }
 
         result = max_state (result, check_swap (percent_used, free_swap_mb));
@@ -372,6 +373,9 @@ main (int argc, char **argv)
 int
 check_swap (int usp, float free_swap_mb)
 {
+
+        if (!free_swap_mb) return no_swap_state;
+
         int result = STATE_UNKNOWN;
         float free_swap = free_swap_mb * (1024 * 1024);         /* Convert back to bytes as warn and crit specified in bytes */
         if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent))
@@ -400,6 +404,7 @@ process_arguments (int argc, char **argv)
                 {"warning", required_argument, 0, 'w'},
                 {"critical", required_argument, 0, 'c'},
                 {"allswaps", no_argument, 0, 'a'},
+                {"no-swap", required_argument, 0, 'n'},
                 {"verbose", no_argument, 0, 'v'},
                 {"version", no_argument, 0, 'V'},
                 {"help", no_argument, 0, 'h'},
@@ -410,7 +415,7 @@ process_arguments (int argc, char **argv)
                 return ERROR;
 
         while (1) {
-                c = getopt_long (argc, argv, "+?Vvhac:w:", longopts, &option);
+                c = getopt_long (argc, argv, "+?Vvhac:w:n:", longopts, &option);
 
                 if (c == -1 || c == EOF)
                         break;
@@ -455,6 +460,10 @@ process_arguments (int argc, char **argv)
                 case 'a':                                                                       /* all swap */
                         allswaps = TRUE;
                         break;
+                case 'n':
+                        if ((no_swap_state = mp_translate_state(optarg)) == ERROR) {
+                                usage4 (_("no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                        }
                 case 'v':                                                                       /* verbose */
                         verbose++;
                         break;
@@ -538,13 +547,16 @@ print_help (void)
   printf (" %s\n", "-c, --critical=INTEGER");
   printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of swap space are free"));
   printf (" %s\n", "-c, --critical=PERCENT%%");
-  printf ("    %s\n", _("Exit with CRITCAL status if less than PERCENT of swap space is free"));
+  printf ("    %s\n", _("Exit with CRITICAL 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 (" %s\n", "-n, --no-swap=<ok|warning|critical|unknown>");
+  printf ("    %s %s\n", _("Resulting state when there is no swap regardless of thresholds. Default:"), state_text(no_swap_state));
         printf (UT_VERBOSE);
 
         printf ("\n");
   printf ("%s\n", _("Notes:"));
+  printf (" %s\n", _("Both INTEGER and PERCENT thresholds can be specified, they are all checked."));
   printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
 
         printf (UT_SUPPORT);
@@ -556,6 +568,6 @@ void
 print_usage (void)
 {
         printf ("%s\n", _("Usage:"));
-  printf ("%s [-av] -w <percent_free>%% -c <percent_free>%%\n",progname);
-  printf ("%s [-av] -w <bytes_free> -c <bytes_free>\n", progname);
+  printf (" %s [-av] -w <percent_free>%% -c <percent_free>%%\n",progname);
+  printf ("  -w <bytes_free> -c <bytes_free> [-n <state>]\n");
 }
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 6ab82616..2714961f 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 *
-* Nagios check_tcp plugin
+* Monitoring check_tcp plugin
 *
 * License: GPL
-* Copyright (c) 1999-2013 Nagios Plugins Development Team
+* Copyright (c) 1999-2013 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -30,7 +30,7 @@
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
 const char *copyright = "1999-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include <ctype.h>
 
@@ -670,7 +670,7 @@ print_help (void)
 
         printf (UT_WARN_CRIT);
 
-        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (UT_VERBOSE);
 
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 7ee014e9..3943742a 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_time plugin
+* Monitoring check_time plugin
 * 
 * License: GPL
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_time";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -358,7 +358,7 @@ 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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (UT_SUPPORT);
 }
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 59dcc264..7cced495 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -1,16 +1,16 @@
 /*****************************************************************************
 * 
-* Nagios check_ups plugin
+* Monitoring check_ups plugin
 * 
 * License: GPL
 * Copyright (c) 2000 Tom Shields
 *               2004 Alain Richard <alain.richard@equation.fr>
 *               2004 Arnaud Quette <arnaud.quette@mgeups.com>
-* Copyright (c) 2002-2007 Nagios Plugins Development Team
+* Copyright (c) 2002-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
-* This file contains Network UPS Tools plugin for Nagios
+* This file contains Network UPS Tools plugin for Monitoring
 * 
 * This plugin tests the UPS service on the specified host. Network UPS Tools
 * from www.networkupstools.org must be running for this plugin to work.
@@ -34,7 +34,7 @@
 
 const char *progname = "check_ups";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -625,7 +625,7 @@ print_help (void)
 
         printf (UT_WARN_CRIT);
 
-        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
 /* TODO: -v clashing with -v/-variable. Commenting out help text since verbose
          is unused up to now */
diff --git a/plugins/check_users.c b/plugins/check_users.c
index ff2aedd2..458a7ca6 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_users plugin
+* Monitoring check_users plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2012 Nagios Plugins Development Team
+* Copyright (c) 2000-2012 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -32,7 +32,7 @@
 
 const char *progname = "check_users";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/common.h b/plugins/common.h
index f1358380..01003b3b 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios plugins common include file
+* Monitoring Plugins common include file
 * 
 * License: GPL
 * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2007 Nagios Plugins Development Team
+* Copyright (c) 2003-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/negate.c b/plugins/negate.c
index ef7d4e03..4bd09deb 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios negate plugin
+* Monitoring negate plugin
 * 
 * License: GPL
-* Copyright (c) 2002-2008 Nagios Plugins Development Team
+* Copyright (c) 2002-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 
 const char *progname = "negate";
 const char *copyright = "2002-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #define DEFAULT_TIMEOUT 11
 
@@ -45,7 +45,6 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 static const char **process_arguments (int, char **);
 int validate_arguments (char **);
-int translate_state (char *);
 void print_help (void);
 void print_usage (void);
 int subst_text = FALSE;
@@ -166,27 +165,27 @@ process_arguments (int argc, char **argv)
                                 timeout_interval = atoi (optarg);
                         break;
                 case 'T':     /* Result to return on timeouts */
-                        if ((timeout_state = translate_state(optarg)) == ERROR)
+                        if ((timeout_state = mp_translate_state(optarg)) == ERROR)
                                 usage4 (_("Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         break;
                 case 'o':     /* replacement for OK */
-                        if ((state[STATE_OK] = translate_state(optarg)) == ERROR)
+                        if ((state[STATE_OK] = mp_translate_state(optarg)) == ERROR)
                                 usage4 (_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         permute = FALSE;
                         break;
 
                 case 'w':     /* replacement for WARNING */
-                        if ((state[STATE_WARNING] = translate_state(optarg)) == ERROR)
+                        if ((state[STATE_WARNING] = mp_translate_state(optarg)) == ERROR)
                                 usage4 (_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         permute = FALSE;
                         break;
                 case 'c':     /* replacement for CRITICAL */
-                        if ((state[STATE_CRITICAL] = translate_state(optarg)) == ERROR)
+                        if ((state[STATE_CRITICAL] = mp_translate_state(optarg)) == ERROR)
                                 usage4 (_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         permute = FALSE;
                         break;
                 case 'u':     /* replacement for UNKNOWN */
-                        if ((state[STATE_UNKNOWN] = translate_state(optarg)) == ERROR)
+                        if ((state[STATE_UNKNOWN] = mp_translate_state(optarg)) == ERROR)
                                 usage4 (_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         permute = FALSE;
                         break;
@@ -218,24 +217,6 @@ validate_arguments (char **command_line)
 }
 
 
-int
-translate_state (char *state_text)
-{
-        char *temp_ptr;
-        for (temp_ptr = state_text; *temp_ptr; temp_ptr++) {
-                *temp_ptr = toupper(*temp_ptr);
-        }
-        if (!strcmp(state_text,"OK") || !strcmp(state_text,"0"))
-                return STATE_OK;
-        if (!strcmp(state_text,"WARNING") || !strcmp(state_text,"1"))
-                return STATE_WARNING;
-        if (!strcmp(state_text,"CRITICAL") || !strcmp(state_text,"2"))
-                return STATE_CRITICAL;
-        if (!strcmp(state_text,"UNKNOWN") || !strcmp(state_text,"3"))
-                return STATE_UNKNOWN;
-        return ERROR;
-}
-
 void
 print_help (void)
 {
@@ -252,7 +233,7 @@ print_help (void)
 
         printf (UT_HELP_VRSN);
 
-        printf (UT_TIMEOUT, timeout_interval);
+        printf (UT_PLUG_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"));
diff --git a/plugins/netutils.c b/plugins/netutils.c
index 9f18723a..00440465 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios plugins network utilities
+* Monitoring Plugins network utilities
 * 
 * License: GPL
 * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2008 Nagios Plugins Development Team
+* Copyright (c) 2003-2008 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 347509e2..c5aa18fc 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
 * 
-* Nagios plugins net utilities include file
+* Monitoring Plugins net utilities include file
 * 
 * License: GPL
 * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2007 Nagios Plugins Development Team
+* Copyright (c) 2003-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/popen.c b/plugins/popen.c
index 716bd524..592263fd 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios plugins popen
+* Monitoring Plugins popen
 * 
 * License: GPL
-* Copyright (c) 2005-2007 Nagios Plugins Development Team
+* Copyright (c) 2005-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 8aba1e33..4352e603 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios run command utilities
+* Monitoring run command utilities
 * 
 * License: GPL
-* Copyright (c) 2005-2006 Nagios Plugins Development Team
+* Copyright (c) 2005-2006 Monitoring Plugins Development Team
 * 
 * Description :
 * 
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index fe660673..2dcdadf0 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 * 
 * License: GPL
-* Copyright (c) 2005 Nagios Plugins Development Team
+* Copyright (c) 2005 Monitoring Plugins Development Team
 * Author: Andreas Ericsson <ae@op5.se>
 * 
 * 
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 2ec91904..2732125d 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios plugins SSL utilities
+* Monitoring Plugins SSL utilities
 * 
 * License: GPL
-* Copyright (c) 2005-2010 Nagios Plugins Development Team
+* Copyright (c) 2005-2010 Monitoring Plugins Development Team
 * 
 * Description:
 * 
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index 39b4ca9f..7e0f74b7 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -4,7 +4,7 @@
 #
 #
 
-# TODO: Add in tests for perf data. Need to beef up Nagios::Plugin::Performance to cater for max, min, etc
+# TODO: Add in tests for perf data. Need to beef up Monitoring::Plugin::Performance to cater for max, min, etc
 
 use strict;
 use Test::More;
@@ -37,7 +37,7 @@ cmp_ok( $c, '==', 2, "Got two mountpoints in output");
 
 
 # Get perf data
-# Should use Nagios::Plugin
+# Should use Monitoring::Plugin
 my @perf_data = sort(split(/ /, $result->perf_output));
 
 
diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t
index 64aaf0ce..2c903db9 100644
--- a/plugins/t/check_dns.t
+++ b/plugins/t/check_dns.t
@@ -17,7 +17,7 @@ my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/';
 my $hostname_valid = getTestParameter( 
                         "NP_HOSTNAME_VALID",
                         "A valid (known to DNS) hostname",
-                        "nagios.com"
+                        "monitoring-plugins.org"
                         );
 
 my $hostname_valid_ip = getTestParameter(
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index 29086737..2539a289 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -31,8 +31,8 @@ my $internet_access = getTestParameter( "NP_INTERNET_ACCESS",
                 "yes");
 
 my $host_tcp_http2  = getTestParameter( "NP_HOST_TCP_HTTP2",
-            "A host providing an index page containing the string 'nagios'",
-            "nagios.org" );
+            "A host providing an index page containing the string 'monitoring'",
+            "test.monitoring-plugins.org" );
 
 
 $res = NPTest->testCmd(
@@ -62,27 +62,27 @@ cmp_ok( $res->return_code, '==', 2, "Webserver $hostname_invalid not valid" );
 like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK");
 
 SKIP: {
-        skip "No host serving nagios in index file", 7 unless $host_tcp_http2;
+        skip "No host serving monitoring in index file", 7 unless $host_tcp_http2;
 
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios'" );
-        cmp_ok( $res->return_code, "==", 0, "Got a reference to 'nagios'");
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring'" );
+        cmp_ok( $res->return_code, "==", 0, "Got a reference to 'monitoring'");
 
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs'" );
-        cmp_ok( $res->return_code, "==", 2, "Not got 'nAGiOs'");
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing'" );
+        cmp_ok( $res->return_code, "==", 2, "Not got 'mONiTORing'");
         like ( $res->output, "/pattern not found/", "Error message says 'pattern not found'");
 
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'nAGiOs'" );
-        cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'nAGiOs'");
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'mONiTORing'" );
+        cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'mONiTORing'");
 
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios' --invert-regex" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'monitoring' --invert-regex" );
         cmp_ok( $res->return_code, "==", 2, "Invert results work when found");
         like ( $res->output, "/pattern found/", "Error message says 'pattern found'");
 
-        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs' --invert-regex" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'mONiTORing' --invert-regex" );
         cmp_ok( $res->return_code, "==", 0, "And also when not found");
 }
 SKIP: {
-        skip "No internet access", 11 if $internet_access eq "no";
+        skip "No internet access", 16 if $internet_access eq "no";
 
         $res = NPTest->testCmd(
                 "./check_http --ssl www.verisign.com"
diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index d9716458..28cd4cd0 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -21,27 +21,29 @@ plan skip_all => "check_mysql not compiled" unless (-x "check_mysql");
 plan tests => 15;
 
 my $bad_login_output = '/Access denied for user /';
-my $mysqlserver = getTestParameter( 
-                "NP_MYSQL_SERVER", 
+my $mysqlserver = getTestParameter(
+                "NP_MYSQL_SERVER",
                 "A MySQL Server hostname or IP with no slaves setup"
                 );
-my $mysqlsocket = getTestParameter( 
-                "NP_MYSQL_SOCKET", 
-                "A MySQL Server socket with no slaves setup"
+my $mysqlsocket = getTestParameter(
+                "NP_MYSQL_SOCKET",
+                "Full path to a MySQL Server socket with no slaves setup"
                 );
-my $mysql_login_details = getTestParameter( 
-                "MYSQL_LOGIN_DETAILS", 
-                "Command line parameters to specify login access",
-                "-u user -ppw -d db",
+my $mysql_login_details = getTestParameter(
+                "MYSQL_LOGIN_DETAILS",
+                "Command line parameters to specify login access (requires " .
+                "REPLICATION CLIENT privleges)",
+                "-u test -ptest",
                 );
-my $with_slave = getTestParameter( 
-                "NP_MYSQL_WITH_SLAVE", 
+my $with_slave = getTestParameter(
+                "NP_MYSQL_WITH_SLAVE",
                 "MySQL server with slaves setup"
                 );
-my $with_slave_login = getTestParameter( 
-                "NP_MYSQL_WITH_SLAVE_LOGIN", 
-                "Login details for server with slave", 
-                "-uroot -ppw"
+my $with_slave_login = getTestParameter(
+                "NP_MYSQL_WITH_SLAVE_LOGIN",
+                "Login details for server with slave (requires REPLICATION CLIENT " .
+                "privleges)",
+                $mysql_login_details || "-u test -ptest"
                 );
 
 my $result;
diff --git a/plugins/t/check_procs.t b/plugins/t/check_procs.t
index 1dea5643..ca4acdd7 100644
--- a/plugins/t/check_procs.t
+++ b/plugins/t/check_procs.t
@@ -13,7 +13,7 @@ my $t;
 if (`uname -s` eq "SunOS\n" && ! -x "/usr/local/nagios/libexec/pst3") {
         plan skip_all => "Ignoring tests on solaris because of pst3";
 } else {
-        plan tests => 12;
+        plan tests => 14;
 }
 
 my $result;
@@ -26,6 +26,11 @@ $result = NPTest->testCmd( "./check_procs -w 100000 -c 100000 -s Z" );
 is( $result->return_code, 0, "Checking less than 100000 zombie processes" );
 like( $result->output, '/^PROCS OK: [0-9]+ process(es)? with /', "Output correct" );
 
+if(fork() == 0) { exec("sleep 7"); } # fork a test process
+$result = NPTest->testCmd( "./check_procs -a 'sleep 7'" );
+is( $result->return_code, 0, "Parent process is ignored" );
+like( $result->output, '/^PROCS OK: 1 process?/', "Output correct" );
+
 $result = NPTest->testCmd( "./check_procs -w 0 -c 100000" );
 is( $result->return_code, 1, "Checking warning if processes > 0" );
 like( $result->output, '/^PROCS WARNING: [0-9]+ process(es)? | procs=[0-9]+;0;100000;0;$/', "Output correct" );
diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t
index abb16aec..f996685d 100644
--- a/plugins/t/check_tcp.t
+++ b/plugins/t/check_tcp.t
@@ -12,7 +12,6 @@ BEGIN {
     use NPTest;
     $has_ipv6 = NPTest::has_ipv6();
     $tests = $has_ipv6 ? 14 : 11;
-    plan tests => $tests;
 }
 
 
@@ -25,20 +24,29 @@ my $host_nonresponsive = getTestParameter( "host_nonresponsive", "NP_HOST_NONRES
 my $hostname_invalid   = getTestParameter( "hostname_invalid",   "NP_HOSTNAME_INVALID",   "nosuchhost",
                                            "An invalid (not known to DNS) hostname" );
 
+my $internet_access    = getTestParameter( "NP_INTERNET_ACCESS",
+                                           "Is this system directly connected to the internet?",
+                                           "yes");
+
 my $successOutput = '/^TCP OK\s-\s+[0-9]?\.?[0-9]+ second response time on port [0-9]+/';
 
 my $failedExpect = '/^TCP WARNING\s-\sUnexpected response from host/socket on port [0-9]+/';
 
 my $t;
 
+$tests = $tests - 4 if $internet_access eq "no";
+plan tests => $tests;
+
 $t += checkCmd( "./check_tcp $host_tcp_http      -p 80 -wt 300 -ct 600",       0, $successOutput );
 $t += checkCmd( "./check_tcp $host_tcp_http      -p 81 -wt   0 -ct   0 -to 1", 2 ); # use invalid port for this test
 $t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt   0 -ct   0 -to 1", 2 );
 $t += checkCmd( "./check_tcp $hostname_invalid   -p 80 -wt   0 -ct   0 -to 1", 2 );
-$t += checkCmd( "./check_tcp -S -D 1 -H www.verisign.com -p 443",              0 );
-$t += checkCmd( "./check_tcp -S -D 9000,1    -H www.verisign.com -p 443",      1 );
-$t += checkCmd( "./check_tcp -S -D 9000      -H www.verisign.com -p 443",      1 );
-$t += checkCmd( "./check_tcp -S -D 9000,8999 -H www.verisign.com -p 443",      2 );
+if($internet_access ne "no") {
+    $t += checkCmd( "./check_tcp -S -D 1 -H www.verisign.com -p 443",              0 );
+    $t += checkCmd( "./check_tcp -S -D 9000,1    -H www.verisign.com -p 443",      1 );
+    $t += checkCmd( "./check_tcp -S -D 9000      -H www.verisign.com -p 443",      1 );
+    $t += checkCmd( "./check_tcp -S -D 9000,8999 -H www.verisign.com -p 443",      2 );
+}
 
 # Need the \r\n to make it more standards compliant with web servers. Need the various quotes
 # so that perl doesn't interpret the \r\n and is passed onto command line correctly
diff --git a/plugins/t/negate.t b/plugins/t/negate.t
index 0afe3ae6..f18acc39 100644
--- a/plugins/t/negate.t
+++ b/plugins/t/negate.t
@@ -78,7 +78,7 @@ foreach my $current_state (keys(%state)) {
         }
 }
 
-# Same as aboce with substitute
+# Same as above with substitute
 foreach my $current_state (keys(%state)) {
         foreach my $new_state (keys(%state)) {
                 $res = NPTest->testCmd( "./negate -s --$current_state=$new_state ./check_dummy ".$state{$current_state}." 'Fake $new_state'" );
diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t
index c3085e13..2c89beb0 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -7,7 +7,7 @@
 # Country Name (2 letter code) [AU]:UK
 # State or Province Name (full name) [Some-State]:Derbyshire
 # Locality Name (eg, city) []:Belper
-# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Nagios Plugins
+# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins
 # Organizational Unit Name (eg, section) []:
 # Common Name (eg, YOUR name) []:Ton Voon
 # Email Address []:tonvoon@mac.com
diff --git a/plugins/tests/check_procs.t b/plugins/tests/check_procs.t
index d71c83a2..1ad2c2f1 100644..100755
--- a/plugins/tests/check_procs.t
+++ b/plugins/tests/check_procs.t
@@ -18,31 +18,35 @@ my $command = "./check_procs --input-file=tests/var/ps-axwo.darwin";
 
 $result = NPTest->testCmd( "$command" );
 is( $result->return_code, 0, "Run with no options" );
-like( $result->output, '/^PROCS OK: 95 processes$/', "Output correct" );
+is( $result->output, "PROCS OK: 95 processes | procs=95;;;0;", "Output correct" );
 
 $result = NPTest->testCmd( "$command -w 5" );
 is( $result->return_code, 1, "Checking > 5 processes" );
-like( $result->output, '/^PROCS WARNING: 95 processes$/', "Output correct" );
+is( $result->output, "PROCS WARNING: 95 processes | procs=95;5;;0;", "Output correct" );
 
 $result = NPTest->testCmd( "$command -w 4 -c 44" );
 is( $result->return_code, 2, "Checking critical" );
-like( $result->output, '/^PROCS CRITICAL: 95 processes$/', "Output correct" );
+is( $result->output, "PROCS CRITICAL: 95 processes | procs=95;4;44;0;", "Output correct" );
 
 $result = NPTest->testCmd( "$command -w 100 -c 200" );
 is( $result->return_code, 0, "Checking no threshold breeched" );
-like( $result->output, '/^PROCS OK: 95 processes$/', "Output correct" );
+is( $result->output, "PROCS OK: 95 processes | procs=95;100;200;0;", "Output correct" );
 
 $result = NPTest->testCmd( "$command -C launchd -c 5" );
 is( $result->return_code, 2, "Checking processes filtered by command name" );
-like( $result->output, '/^PROCS CRITICAL: 6 processes with command name \'launchd\'$/', "Output correct" );
+is( $result->output, "PROCS CRITICAL: 6 processes with command name 'launchd' | procs=6;;5;0;", "Output correct" );
 
-$result = NPTest->testCmd( "$command -u 501 -w 39 -c 41" );
-is( $result->return_code, 1, "Checking processes filtered by userid" );
-like( $result->output, '/^PROCS WARNING: 40 processes with UID = 501 (.*)$/', "Output correct" );
+SKIP: {
+    skip 'user with uid 501 required', 4 unless getpwuid(501);
 
-$result = NPTest->testCmd( "$command -C launchd -u 501" );
-is( $result->return_code, 0, "Checking processes filtered by command name and userid" );
-like( $result->output, '/^PROCS OK: 1 process with command name \'launchd\', UID = 501 (.*)$/', "Output correct" );
+    $result = NPTest->testCmd( "$command -u 501 -w 39 -c 41" );
+    is( $result->return_code, 1, "Checking processes filtered by userid" );
+    like( $result->output, '/^PROCS WARNING: 40 processes with UID = 501 (.*)$/', "Output correct" );
+
+    $result = NPTest->testCmd( "$command -C launchd -u 501" );
+    is( $result->return_code, 0, "Checking processes filtered by command name and userid" );
+    like( $result->output, '/^PROCS OK: 1 process with command name \'launchd\', UID = 501 (.*)$/', "Output correct" );
+}
 
 $result = NPTest->testCmd( "$command -u -2 -w 2:2" );
 is( $result->return_code, 1, "Checking processes with userid=-2" );
@@ -62,15 +66,15 @@ like( $result->output, '/^PROCS OK: 0 processes with UID = -2 \(nobody\), args \
 
 $result = NPTest->testCmd( "$command --ereg-argument-array='mdworker.*501'" );
 is( $result->return_code, 0, "Checking regexp search of arguments" );
-is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501'", "Output correct" );
+is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501' | procs=1;;;0;", "Output correct" );
 
 $result = NPTest->testCmd( "$command --vsz 1000000" );
 is( $result->return_code, 0, "Checking filter by VSZ" );
-like( $result->output, '/^PROCS OK: 24 processes with VSZ >= 1000000$/', "Output correct" );
+is( $result->output, 'PROCS OK: 24 processes with VSZ >= 1000000 | procs=24;;;0;', "Output correct" );
 
 $result = NPTest->testCmd( "$command --rss 100000" );
 is( $result->return_code, 0, "Checking filter by RSS" );
-like( $result->output, '/^PROCS OK: 3 processes with RSS >= 100000$/', "Output correct" );
+is( $result->output, 'PROCS OK: 3 processes with RSS >= 100000 | procs=3;;;0;', "Output correct" );
 
 $result = NPTest->testCmd( "$command -s S" );
 is( $result->return_code, 0, "Checking filter for sleeping processes" );
@@ -86,34 +90,38 @@ like( $result->output, '/^PROCS CRITICAL: 39 processes with PPID = 1/', "Output
 
 $result = NPTest->testCmd( "$command -P 0.71" );
 is( $result->return_code, 0, "Checking filter for percentage cpu > 0.71" );
-is( $result->output, 'PROCS OK: 7 processes with PCPU >= 0.71', "Output correct" );
+is( $result->output, 'PROCS OK: 7 processes with PCPU >= 0.71 | procs=7;;;0;', "Output correct" );
 
 $result = NPTest->testCmd( "$command -P 0.70" );
 is( $result->return_code, 0, "Checking filter for percentage cpu > 0.70" );
-is( $result->output, 'PROCS OK: 8 processes with PCPU >= 0.70', "Output correct" );
+is( $result->output, 'PROCS OK: 8 processes with PCPU >= 0.70 | procs=8;;;0;', "Output correct" );
 
 $result = NPTest->testCmd( "$command --metric=CPU -w 8" );
 is( $result->return_code, 1, "Checking against metric of CPU > 8" );
-is( $result->output, 'CPU WARNING: 1 warn out of 95 processes', "Output correct" );
+is( $result->output, 'CPU WARNING: 1 warn out of 95 processes | procs=95;;;0; procs_warn=1;;;0; procs_crit=0;;;0;', "Output correct" );
 
 # TODO: Because of a conversion to int, if CPU is 1.45%, will not alert, but 2.01% will.
-$result = NPTest->testCmd( "$command --metric=CPU -w 1 -u 501 -v" );
-is( $result->return_code, 1, "Checking against metric of CPU > 1 with uid=501 - TODO" );
-is( $result->output, 'CPU WARNING: 2 warn out of 40 processes with UID = 501 (tonvoon) [Skype, PubSubAgent]', "Output correct" );
+SKIP: {
+    skip 'user with uid 501 required', 2 unless getpwuid(501);
+
+    $result = NPTest->testCmd( "$command --metric=CPU -w 1 -u 501 -v" );
+    is( $result->return_code, 1, "Checking against metric of CPU > 1 with uid=501 - TODO" );
+    is( $result->output, 'CPU WARNING: 2 warn out of 40 processes with UID = 501 (tonvoon) [Skype, PubSubAgent]', "Output correct" );
+};
 
 $result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" );
 is( $result->return_code, 1, "Checking against VSZ > 1.2GB" );
-is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype]', "Output correct" );
+is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype] | procs=95;;;0; procs_warn=4;;;0; procs_crit=0;;;0;', "Output correct" );
 
 $result = NPTest->testCmd( "$command --metric=VSZ -w 1200000 -v" );
 is( $result->return_code, 1, "Checking against VSZ > 1.2GB" );
-is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype]', "Output correct" );
+is( $result->output, 'VSZ WARNING: 4 warn out of 95 processes [WindowServer, Safari, Mail, Skype] | procs=95;;;0; procs_warn=4;;;0; procs_crit=0;;;0;', "Output correct" );
 
 $result = NPTest->testCmd( "$command --metric=RSS -c 70000 -v" );
 is( $result->return_code, 2, "Checking against RSS > 70MB" );
-is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowServer, SystemUIServer, Safari, Mail, Safari]', "Output correct" );
+is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowServer, SystemUIServer, Safari, Mail, Safari] | procs=95;;;0; procs_warn=0;;;0; procs_crit=5;;;0;', "Output correct" );
 
 $result = NPTest->testCmd( "$command --ereg-argument-array='(nosuchname|nosuch2name)'" );
 is( $result->return_code, 0, "Checking no pipe symbol in output" );
-is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)'", "Output correct" );
+is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)' | procs=0;;;0;", "Output correct" );
 
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index 1ef0b209..d865e190 100755
--- a/plugins/tests/check_snmp.t
+++ b/plugins/tests/check_snmp.t
@@ -8,7 +8,7 @@ use Test::More;
 use NPTest;
 use FindBin qw($Bin);
 
-my $tests = 53;
+my $tests = 67;
 # Check that all dependent modules are available
 eval {
         require NetSNMP::OID;
@@ -59,7 +59,7 @@ if ($ARGV[0] && $ARGV[0] eq "-d") {
 }
 
 # We should merge that with $ENV{'NPTEST_CACHE'}, use one dir for all test data
-$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'} ||= "/var/tmp";
+$ENV{'MP_STATE_PATH'} ||= "/var/tmp";
 
 my $res;
 
@@ -79,7 +79,7 @@ Copyright (c) 1986-2004 by cisco Systems, Inc.
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.0 -o sysContact.0 -o .1.3.6.1.4.1.8072.3.2.67.1");
 cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
 like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
-like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software Alice Kisco Outernetwork Oserating Gystem Totware | 
+like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software "Alice" Kisco Outernetwork Oserating Gystem Totware | 
 .1.3.6.1.4.1.8072.3.2.67.0:
 "Cisco Internetwork Operating System Software
 IOS (tm) Catalyst 4000 \"L3\" Switch Software (cat4000-I9K91S-M), Version
@@ -109,7 +109,7 @@ like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C
 "And now have fun with with this: \"C:\\\\\"
 because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
 
-system("rm -f ".$ENV{'NAGIOS_PLUGIN_STATE_DIRECTORY'}."/check_snmp/*");
+system("rm -f ".$ENV{'MP_STATE_PATH'}."/check_snmp/*");
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
 is($res->return_code, 0, "Returns OK");
 is($res->output, "No previous data to calculate rate - assume okay");
@@ -214,3 +214,31 @@ $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1
 is($res->return_code, 0, "String check should check whole string, not a parsed number" );
 is($res->output, 'SNMP OK - "CUSTOM CHECK OK: foo is 12345" | ', "String check witn numbers returns whole string");
 
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
+is($res->return_code, 0, "Negative integer check OK" );
+is($res->output, 'SNMP OK - -2 | iso.3.6.1.4.1.8072.3.2.67.16=-2 ', "Negative integer check OK output" );
+
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
+is($res->return_code, 1, "Negative integer check WARNING" );
+is($res->output, 'SNMP WARNING - *-3* | iso.3.6.1.4.1.8072.3.2.67.16=-3 ', "Negative integer check WARNING output" );
+
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
+is($res->return_code, 2, "Negative integer check CRITICAL" );
+is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.16=-4 ', "Negative integer check CRITICAL output" );
+
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -3: -c -6:" );
+is($res->return_code, 1, "Negative integer as string, WARNING" );
+is($res->output, 'SNMP WARNING - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4 ', "Negative integer as string, WARNING output" );
+
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -2: -c -3:" );
+is($res->return_code, 2, "Negative integer as string, CRITICAL" );
+is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4 ', "Negative integer as string, CRITICAL output" );
+
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -c ~:-6.5" );
+is($res->return_code, 0, "Negative float OK" );
+is($res->output, 'SNMP OK - -6.6 | iso.3.6.1.4.1.8072.3.2.67.18=-6.6 ', "Negative float OK output" );
+
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -w ~:-6.65 -c ~:-6.55" );
+is($res->return_code, 1, "Negative float WARNING" );
+is($res->output, 'SNMP WARNING - *-6.6* | iso.3.6.1.4.1.8072.3.2.67.18=-6.6 ', "Negative float WARNING output" );
+
diff --git a/plugins/tests/check_snmp_agent.pl b/plugins/tests/check_snmp_agent.pl
index 8cacd527..0e41d575 100644
--- a/plugins/tests/check_snmp_agent.pl
+++ b/plugins/tests/check_snmp_agent.pl
@@ -7,7 +7,7 @@
 use NetSNMP::OID qw(:all);
 use NetSNMP::agent;
 use NetSNMP::ASN qw(ASN_OCTET_STR ASN_COUNTER ASN_COUNTER64 ASN_INTEGER ASN_INTEGER64 ASN_UNSIGNED ASN_UNSIGNED64);
-#use Math::Int64 qw(uint64); # Skip that module whie we don't need it
+#use Math::Int64 qw(uint64); # Skip that module while we don't need it
 sub uint64 { return $_ }
 
 if (!$agent) {
@@ -16,8 +16,6 @@ if (!$agent) {
 }
 
 my $baseoid = '.1.3.6.1.4.1.8072.3.2.67';
-# Next are arrays of indexes (Type, initial value and increments)
-# Undef miltipliers are randomized
 my $multiline = 'Cisco Internetwork Operating System Software
 IOS (tm) Catalyst 4000 "L3" Switch Software (cat4000-I9K91S-M), Version
 12.2(20)EWA, RELEASE SOFTWARE (fc1)
@@ -33,10 +31,12 @@ ends with with this: C:\\';
 my $multilin5 = 'And now have fun with with this: "C:\\"
 because we\'re not done yet!';
 
-# 0..15 <---- please update comment when adding/removing fields
-my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR );
-my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345' );
-my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef );
+# Next are arrays of indexes (Type, initial value and increments)
+# 0..16 <---- please update comment when adding/removing fields
+my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER, ASN_OCTET_STR, ASN_OCTET_STR );
+my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345', -2, '-4', '-6.6' );
+# undef increments are randomized
+my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef, -1, undef, undef );
 
 # Number of elements in our OID
 my $oidelts;
diff --git a/plugins/tests/var/ps_axwo.debian b/plugins/tests/var/ps_axwo.debian
index 0d7d7bce..37a2d35e 100644
--- a/plugins/tests/var/ps_axwo.debian
+++ b/plugins/tests/var/ps_axwo.debian
@@ -31,7 +31,7 @@ S        0  6907     1  2308  892  0.0 mysqld_safe      /bin/sh /usr/bin/mysqld_
 S      103  6944  6907 123220 27724  0.0 mysqld         /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --user=mysql --pid-file=/var/run/mysqld/mysqld.pid --skip-locking --port=3306 --socket=/var/run/mysqld/mysqld.sock
 S        0  6945  6907  1488  420  0.0 logger           logger -p daemon.err -t mysqld_safe -i -t mysqld
 S     1001 17778     1  6436 1588  0.0 snmpd            /usr/sbin/snmpd -u nagios -Lsd -Lf /dev/null -p/var/run/snmpd.pid
-Ss       0 17789     1  9496 5556  0.0 snmptrapd        /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/nagios/snmp/load -p /var/run/snmptrapd.pid
+Ss       0 17789     1  9496 5556  0.0 snmptrapd        /usr/sbin/snmptrapd -t -m ALL -M /usr/share/snmp/mibs:/usr/local/monitoring/snmp/load -p /var/run/snmptrapd.pid
 Ss       0   847  2319 14452 1752  0.0 sshd             sshd: tonvoon [priv]
 S     1000   857   847 14616 1832  0.0 sshd             sshd: tonvoon@pts/3
 Ss    1000   860   857  2984 1620  0.0 bash             -bash
@@ -79,6 +79,6 @@ Ss    1001 23783     1  3220  764  0.0 ndo2db           /usr/local/nagios/bin/nd
 Ss    1001 23784     1  6428 4948  0.0 import_ndologsd  import_ndologsd
 S+    1001  9803 18955  4132 1936  0.0 ssh              ssh altinity@cube02.lei.altinity
 S     1001 22505 22324 20256 1616  0.0 nagios           ../../bin/nagios -d /usr/local/nagios/etc/nagios.cfg
-S     1001 22506 22505  1676  608  0.0 check_ping       /usr/local/nagios/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1
+S     1001 22506 22505  1676  608  0.0 check_ping       /usr/local/libexec/check_ping -H 192.168.10.23 -w 3000.0,80% -c 5000.0,100% -p 1
 S     1001 22507 22506  1660  492  0.0 ping             /bin/ping -n -U -w 10 -c 1 192.168.10.23
 R+    1001 22508 23370  2308  680  0.0 ps               ps axwo stat uid pid ppid vsz rss pcpu comm args
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 30b2a353..6fda72d1 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -1,17 +1,16 @@
 /*****************************************************************************
 * 
-* Nagios urlize plugin
+* Monitoring urlize plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
 * This file contains the urlize plugin
 * 
 * This plugin wraps the text output of another command (plugin) in HTML <A>
-* tags, thus displaying the child plugin's output as a clickable link in the
-* Nagios status screen.  This plugin returns the status of the invoked plugin.
+* tags.  This plugin returns the status of the invoked plugin.
 * 
 * 
 * This program is free software: you can redistribute it and/or modify
@@ -32,7 +31,7 @@
 
 const char *progname = "urlize";
 const char *copyright = "2000-2006";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
@@ -166,9 +165,9 @@ print_help (void)
         printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
         printf (COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin wraps the text output of another command (plugin)"));
-  printf ("%s\n", _("in HTML <A> tags, thus displaying the child plugin's output as a clickable link in"));
-  printf ("%s\n", _("the Nagios status screen.  This plugin returns the status of the invoked plugin."));
+        printf ("%s\n", _("This plugin wraps the text output of another command (plugin) in HTML <A>"));
+  printf ("%s\n", _("tags, thus displaying the child plugin's output as a clickable link in compatible"));
+  printf ("%s\n", _("monitoring status screen. This plugin returns the status of the invoked plugin."));
 
   printf ("\n\n");
 
diff --git a/plugins/utils.c b/plugins/utils.c
index b57d5e17..58b153d8 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -4,7 +4,7 @@
 * 
 * License: GPL
 * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
-* Copyright (c) 2002-2007 Nagios Plugin Development Team
+* Copyright (c) 2002-2007 Monitoring Plugins Development Team
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/plugins/utils.h b/plugins/utils.h
index 657d4bfa..4c4aaccc 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -1,6 +1,6 @@
 #ifndef NP_UTILS_H
 #define NP_UTILS_H
-/* Header file for nagios plugins utils.c */
+/* Header file for Monitoring Plugins utils.c */
 
 /* This file should be included in all plugins */
 
@@ -131,7 +131,7 @@ char *fperfdata (const char *,
 {"warning",required_argument,0,'w'},\
 {"hostname",required_argument,0,'H'}
 
-#define COPYRIGHT "Copyright (c) %s Nagios Plugin Development Team\n\
+#define COPYRIGHT "Copyright (c) %s Monitoring Plugins Development Team\n\
 \t<%s>\n\n"
 
 #define UT_HLP_VRS _("\
@@ -159,7 +159,8 @@ char *fperfdata (const char *,
 
 #define UT_VERBOSE _("\
  -v, --verbose\n\
-    Show details for command-line debugging (Nagios may truncate output)\n")
+    Show details for command-line debugging (output may be truncated by\n\
+    the monitoring system)\n")
 
 #define UT_WARN_CRIT _("\
  -w, --warning=DOUBLE\n\
@@ -173,31 +174,36 @@ char *fperfdata (const char *,
  -c, --critical=RANGE\n\
     Critical range\n")
 
-#define UT_TIMEOUT _("\
+#define UT_CONN_TIMEOUT _("\
  -t, --timeout=INTEGER\n\
     Seconds before connection times out (default: %d)\n")
 
+#define UT_PLUG_TIMEOUT _("\
+ -t, --timeout=INTEGER\n\
+    Seconds before plugin times out (default: %d)\n")
+
 #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\n\
+    Read options from an ini file. See\n\
+    https://www.monitoring-plugins.org/doc/extra-opts.html\n\
     for usage and examples.\n")
 #else
-#define UT_EXTRA_OPTS ""
+#define UT_EXTRA_OPTS " \b"
 #endif
 
 #define UT_THRESHOLDS_NOTES _("\
  See:\n\
- http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT\n\
+ https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\
  for THRESHOLD format and examples.\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 help@monitoring-plugins.org if you have questions regarding\n\
+use of this software. To submit patches or suggest improvements, send email\n\
+to devel@monitoring-plugins.org\n\n")
 
 #define UT_NOWARRANTY _("\n\
-The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
+The Monitoring 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")
 
diff --git a/po/Makevars b/po/Makevars
index 152edec2..1bf1e0db 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -18,12 +18,12 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --flag=error:3:c-format --flag=error
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Nagios Plugin Development Group
+COPYRIGHT_HOLDER = Monitoring Plugins Development Team
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
 # Email address were to send bug report for the .po translation files
-PACKAGE_BUGREPORT = nagiosplug-devel@lists.sourceforge.net
+PACKAGE_BUGREPORT = devel@monitoring-plugins.org
 
diff --git a/po/de.po b/po/de.po
index cb886f91..b9dd8f26 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,35 +8,36 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nagiosplug\n"
-"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-07-09 19:30-0400\n"
+"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
+"POT-Creation-Date: 2014-01-19 16:30-0500\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);X-Generator: KBabel 1.3.1\n"
 
-#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:87
-#: plugins/check_disk.c:192 plugins/check_dns.c:102 plugins/check_dummy.c:52
-#: plugins/check_fping.c:89 plugins/check_game.c:82 plugins/check_hpjd.c:103
-#: plugins/check_http.c:157 plugins/check_ldap.c:109 plugins/check_load.c:122
-#: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:85
-#: plugins/check_nagios.c:91 plugins/check_nt.c:126 plugins/check_ntp.c:766
-#: plugins/check_ntp_peer.c:569 plugins/check_ntp_time.c:548
+#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:88
+#: plugins/check_disk.c:194 plugins/check_dns.c:102 plugins/check_dummy.c:52
+#: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:103
+#: plugins/check_http.c:167 plugins/check_ldap.c:109 plugins/check_load.c:122
+#: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:122
+#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:770
+#: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:552
 #: 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:205 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
+#: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:172
+#: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144
+#: plugins/check_snmp.c:240 plugins/check_ssh.c:73 plugins/check_swap.c:110
+#: plugins/check_tcp.c:218 plugins/check_time.c:78 plugins/check_ups.c:122
+#: plugins/check_users.c:77 plugins/negate.c:214 plugins-root/check_dhcp.c:270
 msgid "Could not parse arguments"
 msgstr "Argumente konnten nicht ausgewertet werden"
 
-#: plugins/check_by_ssh.c:90 plugins/check_dig.c:81 plugins/check_dns.c:95
-#: plugins/check_nagios.c:95 plugins/check_pgsql.c:160 plugins/check_ping.c:99
-#: plugins/check_procs.c:154 plugins/negate.c:76
+#: plugins/check_by_ssh.c:90 plugins/check_dig.c:82 plugins/check_dns.c:95
+#: plugins/check_nagios.c:95 plugins/check_pgsql.c:178 plugins/check_ping.c:99
+#: plugins/check_procs.c:188 plugins/check_snmp.c:336 plugins/negate.c:79
 msgid "Cannot catch SIGALRM"
 msgstr "Konnte SIGALRM nicht erhalten"
 
@@ -60,198 +61,202 @@ msgstr "SSH WARNING: Konnte %s nicht öffnen\n"
 msgid "%s: Error parsing output\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
-#: plugins/check_http.c:256 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:665
-#: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
-#: plugins/check_ups.c:556 plugins/negate.c:161
+#: plugins/check_by_ssh.c:220 plugins/check_disk.c:476
+#: plugins/check_http.c:278 plugins/check_ldap.c:293 plugins/check_pgsql.c:311
+#: plugins/check_procs.c:437 plugins/check_radius.c:308
+#: plugins/check_real.c:356 plugins/check_smtp.c:581 plugins/check_snmp.c:736
+#: plugins/check_ssh.c:138 plugins/check_tcp.c:505 plugins/check_time.c:302
+#: plugins/check_ups.c:556 plugins/negate.c:164
 msgid "Timeout interval must be a positive integer"
 msgstr "Timeout interval muss ein positiver Integer sein"
 
-#: plugins/check_by_ssh.c:229 plugins/check_pgsql.c:274
+#: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:341
 #: plugins/check_radius.c:272 plugins/check_real.c:327
-#: plugins/check_smtp.c:514 plugins/check_tcp.c:496 plugins/check_time.c:296
+#: plugins/check_smtp.c:506 plugins/check_tcp.c:511 plugins/check_time.c:296
 #: plugins/check_ups.c:518
 msgid "Port must be a positive integer"
 msgstr "Port muss ein positiver Integer sein"
 
-#: plugins/check_by_ssh.c:290
+#: plugins/check_by_ssh.c:291
 #, fuzzy
 msgid "skip-stdout argument must be an integer"
 msgstr "skip-stdout argument muss ein Integer sein"
 
-#: plugins/check_by_ssh.c:298
+#: plugins/check_by_ssh.c:299
 #, fuzzy
 msgid "skip-stderr argument must be an integer"
 msgstr "skip-stderr argument muss ein Integer sein"
 
-#: plugins/check_by_ssh.c:317
+#: plugins/check_by_ssh.c:322
 #, c-format
 msgid "%s: You must provide a host name\n"
 msgstr "%s: Hostname muss angegeben werden\n"
 
-#: plugins/check_by_ssh.c:335
+#: plugins/check_by_ssh.c:340
 msgid "No remotecmd"
 msgstr "Kein remotecm"
 
-#: plugins/check_by_ssh.c:349
+#: plugins/check_by_ssh.c:354
 #, c-format
 msgid "%s: Argument limit of %d exceeded\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:352
+#: plugins/check_by_ssh.c:357
 #, fuzzy
 msgid "Can not (re)allocate 'commargv' buffer\n"
 msgstr "Konnte·url·nicht·zuweisen\n"
 
-#: plugins/check_by_ssh.c:366
+#: plugins/check_by_ssh.c:371
 #, c-format
 msgid ""
 "%s: In passive mode, you must provide a service name for each command.\n"
 msgstr ""
 "%s: Im passive mode muss ein Servicename für jeden Befehl angegeben werden.\n"
 
-#: plugins/check_by_ssh.c:369
-#, c-format
+#: plugins/check_by_ssh.c:374
+#, fuzzy, c-format
 msgid ""
-"%s: In passive mode, you must provide the host short name from the nagios "
-"configs.\n"
+"%s: In passive mode, you must provide the host short name from the "
+"monitoring configs.\n"
 msgstr ""
 "%s: Im passive mode muss der \"host short name\" aus der Nagios "
 "Konfiguration angegeben werden\n"
 
-#: plugins/check_by_ssh.c:383
+#: plugins/check_by_ssh.c:388
 #, fuzzy, c-format
 msgid "This plugin uses SSH to execute commands on a remote host"
 msgstr ""
 "Dieses Plugin nutzt SSH um Befehle auf dem entfernten Rechner auszuführen\n"
 "\n"
 
-#: plugins/check_by_ssh.c:398
+#: plugins/check_by_ssh.c:403
 msgid "tell ssh to use Protocol 1 [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:400
+#: plugins/check_by_ssh.c:405
 msgid "tell ssh to use Protocol 2 [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:402
+#: plugins/check_by_ssh.c:407
 msgid "Ignore all or (if specified) first n lines on STDOUT [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:404
+#: plugins/check_by_ssh.c:409
 msgid "Ignore all or (if specified) first n lines on STDERR [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:406
+#: plugins/check_by_ssh.c:411
 msgid ""
 "tells ssh to fork rather than create a tty [optional]. This will always "
 "return OK if ssh is executed"
 msgstr ""
 
-#: plugins/check_by_ssh.c:408
+#: plugins/check_by_ssh.c:413
 msgid "command to execute on the remote machine"
 msgstr ""
 
-#: plugins/check_by_ssh.c:410
+#: plugins/check_by_ssh.c:415
 msgid "SSH user name on remote host [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:412
+#: plugins/check_by_ssh.c:417
 msgid "identity of an authorized key [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:414
-msgid "external command file for nagios [optional]"
+#: plugins/check_by_ssh.c:419
+msgid "external command file for monitoring [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:416
-msgid "list of nagios service names, separated by ':' [optional]"
+#: plugins/check_by_ssh.c:421
+msgid "list of monitoring service names, separated by ':' [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:418
-msgid "short name of host in nagios configuration [optional]"
+#: plugins/check_by_ssh.c:423
+msgid "short name of host in the monitoring configuration [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:420
+#: plugins/check_by_ssh.c:425
 msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:422
+#: plugins/check_by_ssh.c:427
+msgid "Tell ssh to use this configfile [optional]"
+msgstr ""
+
+#: plugins/check_by_ssh.c:429
 msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:427
+#: plugins/check_by_ssh.c:434
 msgid "The most common mode of use is to refer to a local identity file with"
 msgstr ""
 
-#: plugins/check_by_ssh.c:428
+#: plugins/check_by_ssh.c:435
 msgid "the '-i' option. In this mode, the identity pair should have a null"
 msgstr ""
 
-#: plugins/check_by_ssh.c:429
+#: plugins/check_by_ssh.c:436
 msgid "passphrase and the public key should be listed in the authorized_keys"
 msgstr ""
 
-#: plugins/check_by_ssh.c:430
+#: plugins/check_by_ssh.c:437
 msgid "file of the remote host. Usually the key will be restricted to running"
 msgstr ""
 
-#: plugins/check_by_ssh.c:431
+#: plugins/check_by_ssh.c:438
 msgid "only one command on the remote server. If the remote SSH server tracks"
 msgstr ""
 
-#: plugins/check_by_ssh.c:432
+#: plugins/check_by_ssh.c:439
 msgid "invocation arguments, the one remote program may be an agent that can"
 msgstr ""
 
-#: plugins/check_by_ssh.c:433
+#: plugins/check_by_ssh.c:440
 msgid "execute additional commands as proxy"
 msgstr ""
 
-#: plugins/check_by_ssh.c:435
+#: plugins/check_by_ssh.c:442
 msgid "To use passive mode, provide multiple '-C' options, and provide"
 msgstr ""
 
-#: plugins/check_by_ssh.c:436
+#: plugins/check_by_ssh.c:443
 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:261
-#: plugins/check_dig.c:342 plugins/check_disk.c:963 plugins/check_http.c:1415
-#: 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
+#: plugins/check_by_ssh.c:445 plugins/check_cluster.c:261
+#: plugins/check_dig.c:355 plugins/check_disk.c:924 plugins/check_http.c:1560
+#: plugins/check_nagios.c:312 plugins/check_ntp.c:869
+#: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:633
+#: plugins/check_procs.c:763 plugins/negate.c:271 plugins/urlize.c:180
 msgid "Examples:"
 msgstr ""
 
-#: 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:1438
-#: 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_procs.c:760
+#: plugins/check_by_ssh.c:460 plugins/check_cluster.c:274
+#: plugins/check_dig.c:367 plugins/check_disk.c:941 plugins/check_dns.c:486
+#: plugins/check_dummy.c:122 plugins/check_fping.c:505
+#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1590
+#: plugins/check_ldap.c:451 plugins/check_load.c:334 plugins/check_mrtg.c:382
+#: plugins/check_mysql.c:569 plugins/check_nagios.c:323 plugins/check_nt.c:774
+#: plugins/check_ntp.c:888 plugins/check_ntp_peer.c:725
+#: plugins/check_ntp_time.c:642 plugins/check_nwstat.c:1685
+#: plugins/check_overcr.c:467 plugins/check_pgsql.c:578
+#: plugins/check_ping.c:603 plugins/check_procs.c:781
 #: plugins/check_radius.c:385 plugins/check_real.c:451
-#: plugins/check_smtp.c:821 plugins/check_snmp.c:1107 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
+#: plugins/check_smtp.c:843 plugins/check_snmp.c:1207 plugins/check_ssh.c:309
+#: plugins/check_swap.c:558 plugins/check_tcp.c:684 plugins/check_time.c:371
+#: plugins/check_ups.c:660 plugins/check_users.c:240
+#: plugins/check_ide_smart.c:640 plugins/negate.c:295 plugins/urlize.c:197
+#: plugins-root/check_dhcp.c:1422 plugins-root/check_icmp.c:1354
 msgid "Usage:"
 msgstr ""
 
 #: plugins/check_cluster.c:230
 #, c-format
-msgid "Host/Service Cluster Plugin for Nagios 2"
+msgid "Host/Service Cluster Plugin for Monitoring"
 msgstr ""
 
-#: plugins/check_cluster.c:236 plugins/check_nt.c:661
+#: plugins/check_cluster.c:236 plugins/check_nt.c:676
 msgid "Options:"
 msgstr ""
 
@@ -288,13 +293,13 @@ msgid "commas"
 msgstr ""
 
 #: plugins/check_cluster.c:257 plugins/check_game.c:318
-#: plugins/check_http.c:1401 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:1078
-#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
-#: plugins-root/check_icmp.c:1322
+#: plugins/check_http.c:1542 plugins/check_ldap.c:438 plugins/check_mrtg.c:363
+#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:558
+#: plugins/check_nt.c:758 plugins/check_ntp.c:865 plugins/check_ntp_peer.c:696
+#: plugins/check_ntp_time.c:626 plugins/check_nwstat.c:1670
+#: plugins/check_overcr.c:456 plugins/check_snmp.c:1178
+#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:277
+#: plugins-root/check_icmp.c:1329
 msgid "Notes:"
 msgstr ""
 
@@ -307,64 +312,72 @@ msgstr ""
 msgid "state."
 msgstr ""
 
-#: plugins/check_dig.c:99 plugins/check_dig.c:101
+#: plugins/check_dig.c:100 plugins/check_dig.c:102
 #, c-format
 msgid "Looking for: '%s'\n"
 msgstr ""
 
-#: plugins/check_dig.c:108
+#: plugins/check_dig.c:109
 msgid "dig returned an error status"
 msgstr "dig hat einen Fehler zurückgegeben"
 
-#: plugins/check_dig.c:133
+#: plugins/check_dig.c:134
 msgid "Server not found in ANSWER SECTION"
 msgstr "Server nicht gefunden in ANSWER SECTION"
 
-#: plugins/check_dig.c:143
+#: plugins/check_dig.c:144
 msgid "No ANSWER SECTION found"
 msgstr "Keine ANSWER SECTION gefunden"
 
-#: plugins/check_dig.c:170
+#: plugins/check_dig.c:171
 #, fuzzy
 msgid "Probably a non-existent host/domain"
 msgstr "nicht existierender Host/Domain"
 
-#: plugins/check_dig.c:230
+#: plugins/check_dig.c:233
 #, fuzzy, c-format
 msgid "Port must be a positive integer - %s"
 msgstr "Port muss ein positiver Integer sein - %s"
 
-#: plugins/check_dig.c:241
+#: plugins/check_dig.c:244
 #, fuzzy, c-format
 msgid "Warning interval must be a positive integer - %s"
 msgstr "Warning interval muss ein positiver Integer sein - %s"
 
-#: plugins/check_dig.c:249
+#: plugins/check_dig.c:252
 #, fuzzy, c-format
 msgid "Critical interval must be a positive integer - %s"
 msgstr "Critical interval muss ein positiver Integer sein - %s"
 
-#: plugins/check_dig.c:257
+#: plugins/check_dig.c:260
 #, fuzzy, c-format
 msgid "Timeout interval must be a positive integer - %s"
 msgstr "Timeout interval muss ein positiver Integer sein - %s"
 
-#: plugins/check_dig.c:316
+#: plugins/check_dig.c:325
 #, fuzzy, c-format
 msgid "This plugin test the DNS service on the specified host using dig"
 msgstr "Testet den DNS Dienst auf dem angegebenen Host mit dig"
 
-#: plugins/check_dig.c:329
+#: plugins/check_dig.c:338
+msgid "Force dig to only use IPv4 query transport"
+msgstr ""
+
+#: plugins/check_dig.c:340
+msgid "Force dig to only use IPv6 query transport"
+msgstr ""
+
+#: plugins/check_dig.c:342
 #, fuzzy
 msgid "Machine name to lookup"
 msgstr "zu prüfender Hostname"
 
-#: plugins/check_dig.c:331
+#: plugins/check_dig.c:344
 #, fuzzy
 msgid "Record type to lookup (default: A)"
 msgstr "abzufragender Datensatztyp (Default: A)"
 
-#: plugins/check_dig.c:333
+#: plugins/check_dig.c:346
 #, fuzzy
 msgid ""
 "An address expected to be in the answer section. If not set, uses whatever"
@@ -372,93 +385,96 @@ msgstr ""
 "Adresse die in der ANSWER SECTION erwartet wird.wenn nicht gesetzt, "
 "ubernommen aus -l"
 
-#: plugins/check_dig.c:334
+#: plugins/check_dig.c:347
 msgid "was in -l"
 msgstr ""
 
-#: plugins/check_dig.c:336
+#: plugins/check_dig.c:349
 msgid "Pass STRING as argument(s) to dig"
 msgstr ""
 
-#: plugins/check_disk.c:214
+#: plugins/check_disk.c:216
 #, fuzzy, c-format
 msgid "DISK %s: %s not found\n"
 msgstr "%s [%s nicht gefunden]"
 
-#: 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_disk.c:216 plugins/check_disk.c:956 plugins/check_dns.c:241
+#: plugins/check_dummy.c:74 plugins/check_mysql.c:299
 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168
-#: plugins/check_nagios.c:172 plugins/check_procs.c:290
+#: plugins/check_nagios.c:172 plugins/check_pgsql.c:601
+#: plugins/check_pgsql.c:618 plugins/check_pgsql.c:627
+#: plugins/check_pgsql.c:642 plugins/check_procs.c:351
 #, c-format
 msgid "CRITICAL"
 msgstr "CRITICAL"
 
-#: plugins/check_disk.c:599
+#: plugins/check_disk.c:550
 #, c-format
 msgid "unit type %s not known\n"
 msgstr "unbekannter unit type: %s\n"
 
-#: plugins/check_disk.c:602
+#: plugins/check_disk.c:553
 #, c-format
 msgid "failed allocating storage for '%s'\n"
 msgstr "konnte keinen Speicher für '%s' reservieren\n"
 
-#: plugins/check_disk.c:626 plugins/check_disk.c:664 plugins/check_disk.c:669
-#: plugins/check_disk.c:676 plugins/check_disk.c:680 plugins/check_disk.c:720
-#: plugins/check_disk.c:726 plugins/check_disk.c:745 plugins/check_dummy.c:77
-#: plugins/check_dummy.c:80 plugins/check_procs.c:451
+#: plugins/check_disk.c:577 plugins/check_disk.c:618 plugins/check_disk.c:626
+#: plugins/check_disk.c:633 plugins/check_disk.c:637 plugins/check_disk.c:677
+#: plugins/check_disk.c:683 plugins/check_disk.c:702 plugins/check_dummy.c:77
+#: plugins/check_dummy.c:80 plugins/check_pgsql.c:643
+#: plugins/check_procs.c:506
 #, c-format
 msgid "UNKNOWN"
 msgstr "UNKNOWN"
 
-#: plugins/check_disk.c:626
+#: plugins/check_disk.c:577
 msgid "Must set a threshold value before using -p\n"
 msgstr ""
 
-#: plugins/check_disk.c:664
+#: plugins/check_disk.c:618
 msgid "Must set -E before selecting paths\n"
 msgstr ""
 
-#: plugins/check_disk.c:669
+#: plugins/check_disk.c:626
 msgid "Must set group value before selecting paths\n"
 msgstr ""
 
-#: plugins/check_disk.c:676
+#: plugins/check_disk.c:633
 msgid ""
 "Paths need to be selected before using -i/-I. Use -A to select all paths "
 "explicitly"
 msgstr ""
 
-#: plugins/check_disk.c:680 plugins/check_disk.c:726 plugins/check_procs.c:451
+#: plugins/check_disk.c:637 plugins/check_disk.c:683 plugins/check_procs.c:506
 msgid "Could not compile regular expression"
 msgstr ""
 
-#: plugins/check_disk.c:720
+#: plugins/check_disk.c:677
 msgid "Must set a threshold value before using -r/-R\n"
 msgstr ""
 
-#: plugins/check_disk.c:746
+#: plugins/check_disk.c:703
 msgid "Regular expression did not match any path or disk"
 msgstr ""
 
-#: plugins/check_disk.c:792
+#: plugins/check_disk.c:749
 #, fuzzy
 msgid "Unknown argument"
 msgstr "Unbekanntes Argument"
 
-#: plugins/check_disk.c:826
+#: plugins/check_disk.c:783
 #, c-format
 msgid " for %s\n"
 msgstr ""
 
-#: plugins/check_disk.c:900
+#: plugins/check_disk.c:857
 #, fuzzy
 msgid ""
 "This plugin checks the amount of used disk space on a mounted file system"
 msgstr ""
 "Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem"
 
-#: plugins/check_disk.c:901
+#: plugins/check_disk.c:858
 #, fuzzy
 msgid ""
 "and generates an alert if free space is less than one of the threshold values"
@@ -466,141 +482,149 @@ msgstr ""
 "und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte "
 "unterschritten wird."
 
-#: plugins/check_disk.c:911
+#: plugins/check_disk.c:868
 msgid "Exit with WARNING status if less than INTEGER units of disk are free"
 msgstr ""
 
-#: plugins/check_disk.c:913
+#: plugins/check_disk.c:870
 msgid "Exit with WARNING status if less than PERCENT of disk space is free"
 msgstr ""
 
-#: plugins/check_disk.c:915
+#: plugins/check_disk.c:872
 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free"
 msgstr ""
 
-#: plugins/check_disk.c:917
-msgid "Exit with CRITCAL status if less than PERCENT of disk space is free"
+#: plugins/check_disk.c:874
+msgid "Exit with CRITICAL status if less than PERCENT of disk space is free"
 msgstr ""
 
-#: plugins/check_disk.c:919
+#: plugins/check_disk.c:876
 msgid "Exit with WARNING status if less than PERCENT of inode space is free"
 msgstr ""
 
-#: plugins/check_disk.c:921
+#: plugins/check_disk.c:878
 msgid "Exit with CRITICAL status if less than PERCENT of inode space is free"
 msgstr ""
 
-#: plugins/check_disk.c:923
+#: plugins/check_disk.c:880
 msgid "Path or partition (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:925
+#: plugins/check_disk.c:882
 msgid "Ignore device (only works if -p unspecified)"
 msgstr ""
 
-#: plugins/check_disk.c:927
+#: plugins/check_disk.c:884
 msgid "Clear thresholds"
 msgstr ""
 
-#: plugins/check_disk.c:929
+#: plugins/check_disk.c:886
 msgid "For paths or partitions specified with -p, only check for exact paths"
 msgstr ""
 
-#: plugins/check_disk.c:931
+#: plugins/check_disk.c:888
 msgid "Display only devices/mountpoints with errors"
 msgstr ""
 
-#: plugins/check_disk.c:933
+#: plugins/check_disk.c:890
+msgid "Don't account root-reserved blocks into freespace in perfdata"
+msgstr ""
+
+#: plugins/check_disk.c:892
 msgid ""
 "Group paths. Thresholds apply to (free-)space of all partitions together"
 msgstr ""
 
-#: plugins/check_disk.c:935
+#: plugins/check_disk.c:894
 msgid "Same as '--units kB'"
 msgstr ""
 
-#: plugins/check_disk.c:937
+#: plugins/check_disk.c:896
 msgid "Only check local filesystems"
 msgstr ""
 
-#: plugins/check_disk.c:939
+#: plugins/check_disk.c:898
 msgid ""
 "Only check local filesystems against thresholds. Yet call stat on remote "
 "filesystems"
 msgstr ""
 
-#: plugins/check_disk.c:940
+#: plugins/check_disk.c:899
 msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)"
 msgstr ""
 
-#: plugins/check_disk.c:942
+#: plugins/check_disk.c:901
 msgid "Display the mountpoint instead of the partition"
 msgstr ""
 
-#: plugins/check_disk.c:944
+#: plugins/check_disk.c:903
 msgid "Same as '--units MB'"
 msgstr ""
 
-#: plugins/check_disk.c:946
+#: plugins/check_disk.c:905
 msgid "Explicitly select all paths. This is equivalent to -R '.*'"
 msgstr ""
 
-#: plugins/check_disk.c:948
+#: plugins/check_disk.c:907
 msgid ""
 "Case insensitive regular expression for path/partition (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:950
+#: plugins/check_disk.c:909
 msgid "Regular expression for path or partition (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:952
+#: plugins/check_disk.c:911
 msgid ""
 "Regular expression to ignore selected path/partition (case insensitive) (may "
 "be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:954
+#: plugins/check_disk.c:913
 msgid ""
 "Regular expression to ignore selected path or partition (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:957
+#: plugins/check_disk.c:916
 msgid "Choose bytes, kB, MB, GB, TB (default: MB)"
 msgstr ""
 
-#: plugins/check_disk.c:960
+#: plugins/check_disk.c:919
 msgid "Ignore all filesystems of indicated type (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:965
+#: plugins/check_disk.c:921
+msgid "Check only filesystems of indicated type (may be repeated)"
+msgstr ""
+
+#: plugins/check_disk.c:926
 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"
 msgstr ""
 
-#: plugins/check_disk.c:967
+#: plugins/check_disk.c:928
 msgid ""
 "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
 "r regex"
 msgstr ""
 
-#: plugins/check_disk.c:968
+#: plugins/check_disk.c:929
 msgid ""
 "are grouped which means the freespace thresholds are applied to all disks "
 "together"
 msgstr ""
 
-#: plugins/check_disk.c:970
+#: plugins/check_disk.c:931
 msgid ""
 "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
 "100M/50M"
 msgstr ""
 
-#: plugins/check_disk.c:996
+#: plugins/check_disk.c:957
 #, c-format
 msgid "%s %s: %s\n"
 msgstr ""
 
-#: plugins/check_disk.c:996
+#: plugins/check_disk.c:957
 msgid "is not accessible"
 msgstr ""
 
@@ -638,13 +662,15 @@ msgid "server %s is not authoritative for %s"
 msgstr "Server %s ist nicht autoritativ für %s"
 
 #: plugins/check_dns.c:237 plugins/check_dummy.c:68 plugins/check_nagios.c:182
-#: plugins/check_procs.c:283
+#: plugins/check_pgsql.c:638 plugins/check_procs.c:344
 #, c-format
 msgid "OK"
 msgstr "OK"
 
-#: plugins/check_dns.c:239 plugins/check_dummy.c:71 plugins/check_mysql.c:209
-#: plugins/check_nagios.c:182 plugins/check_procs.c:285
+#: plugins/check_dns.c:239 plugins/check_dummy.c:71 plugins/check_mysql.c:296
+#: plugins/check_nagios.c:182 plugins/check_pgsql.c:607
+#: plugins/check_pgsql.c:612 plugins/check_pgsql.c:640
+#: plugins/check_procs.c:346
 #, c-format
 msgid "WARNING"
 msgstr "WARNING"
@@ -811,146 +837,182 @@ msgstr ""
 msgid "of the <state> argument with optional text"
 msgstr ""
 
-#: plugins/check_fping.c:108 plugins/check_hpjd.c:128 plugins/check_ping.c:437
-#: plugins/check_swap.c:175 plugins/check_users.c:73 plugins/urlize.c:110
+#: plugins/check_fping.c:125 plugins/check_hpjd.c:128 plugins/check_ping.c:438
+#: plugins/check_swap.c:175 plugins/check_users.c:94 plugins/urlize.c:110
 #, c-format
 msgid "Could not open pipe: %s\n"
 msgstr "Pipe: %s konnte nicht geöffnet werden\n"
 
-#: plugins/check_fping.c:114 plugins/check_hpjd.c:134 plugins/check_load.c:153
-#: plugins/check_swap.c:181 plugins/check_users.c:79 plugins/urlize.c:116
+#: plugins/check_fping.c:131 plugins/check_hpjd.c:134 plugins/check_load.c:153
+#: plugins/check_swap.c:181 plugins/check_users.c:100 plugins/urlize.c:116
 #, c-format
 msgid "Could not open stderr for %s\n"
 msgstr "Konnte stderr nicht öffnen für: %s\n"
 
-#: plugins/check_fping.c:154
+#: plugins/check_fping.c:157
+#, fuzzy
+msgid "FPING UNKNOWN - IP address not found\n"
+msgstr "FPING UNKNOW - %s nicht gefunden\n"
+
+#: plugins/check_fping.c:160
+msgid "FPING UNKNOWN - invalid commandline argument\n"
+msgstr ""
+
+#: plugins/check_fping.c:163
+#, fuzzy
+msgid "FPING UNKNOWN - failed system call\n"
+msgstr "FPING UNKNOW - %s nicht gefunden\n"
+
+#: plugins/check_fping.c:187
 #, c-format
 msgid "FPING UNKNOW - %s not found\n"
 msgstr "FPING UNKNOW - %s nicht gefunden\n"
 
-#: plugins/check_fping.c:158
+#: plugins/check_fping.c:191
 #, c-format
 msgid "FPING CRITICAL - %s is unreachable\n"
 msgstr "FPING CRITICAL - %s ist nicht erreichbar\n"
 
-#: plugins/check_fping.c:163
+#: plugins/check_fping.c:196
+#, fuzzy, c-format
+msgid "FPING UNKNOWN - %s parameter error\n"
+msgstr "FPING UNKNOW - %s nicht gefunden\n"
+
+#: plugins/check_fping.c:200 plugins/check_fping.c:240
 #, c-format
 msgid "FPING CRITICAL - %s is down\n"
 msgstr "FPING CRITICAL - %s ist down\n"
 
-#: plugins/check_fping.c:190
+#: plugins/check_fping.c:227
 #, c-format
 msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"
 msgstr "FPING %s - %s (verloren=%.0f%%, rta=%f ms)|%s %s\n"
 
-#: plugins/check_fping.c:211
+#: plugins/check_fping.c:253
 #, c-format
 msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
 msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n"
 
-#: plugins/check_fping.c:280 plugins/check_hpjd.c:338 plugins/check_hpjd.c:361
-#: plugins/check_mysql.c:276 plugins/check_mysql.c:334 plugins/check_ntp.c:705
-#: plugins/check_ntp_peer.c:491 plugins/check_ntp_time.c:492
-#: plugins/check_pgsql.c:268 plugins/check_ping.c:295 plugins/check_ping.c:418
+#: plugins/check_fping.c:326 plugins/check_fping.c:332
+#: plugins/check_hpjd.c:338 plugins/check_hpjd.c:361 plugins/check_mysql.c:371
+#: plugins/check_mysql.c:455 plugins/check_ntp.c:709
+#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:496
+#: plugins/check_pgsql.c:335 plugins/check_ping.c:295 plugins/check_ping.c:418
 #: plugins/check_radius.c:264 plugins/check_real.c:314
-#: plugins/check_real.c:376 plugins/check_smtp.c:507 plugins/check_smtp.c:633
+#: plugins/check_real.c:376 plugins/check_smtp.c:499 plugins/check_smtp.c:641
 #: plugins/check_ssh.c:157 plugins/check_time.c:240 plugins/check_time.c:315
 #: plugins/check_ups.c:504 plugins/check_ups.c:573
 msgid "Invalid hostname/address"
 msgstr "Ungültige(r) Hostname/Adresse"
 
-#: plugins/check_fping.c:314
+#: plugins/check_fping.c:345 plugins/check_ldap.c:353 plugins/check_ping.c:246
+msgid "IPv6 support not available\n"
+msgstr ""
+
+#: plugins/check_fping.c:378
 msgid "Packet size must be a positive integer"
 msgstr "Paketgröße muss ein positiver Integer sein"
 
-#: plugins/check_fping.c:320
+#: plugins/check_fping.c:384
 msgid "Packet count must be a positive integer"
 msgstr "Paketanzahl muss ein positiver Integer sein"
 
-#: plugins/check_fping.c:326
+#: plugins/check_fping.c:390
 #, fuzzy
 msgid "Target timeout must be a positive integer"
 msgstr "Warnung time muss ein positiver Integer sein"
 
-#: plugins/check_fping.c:332
+#: plugins/check_fping.c:396
 #, fuzzy
 msgid "Interval must be a positive integer"
 msgstr "Timeout interval muss ein positiver Integer sein"
 
-#: plugins/check_fping.c:338 plugins/check_ntp.c:729
-#: plugins/check_ntp_peer.c:518 plugins/check_ntp_time.c:519
+#: plugins/check_fping.c:402 plugins/check_ntp.c:733
+#: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:523
 #: plugins/check_radius.c:314 plugins/check_time.c:319
 msgid "Hostname was not supplied"
 msgstr ""
 
-#: plugins/check_fping.c:358
+#: plugins/check_fping.c:422
 #, c-format
 msgid "%s: Only one threshold may be packet loss (%s)\n"
 msgstr "%s: Nur ein Wert darf für paket loss angegeben werden (%s)\n"
 
-#: plugins/check_fping.c:362
+#: plugins/check_fping.c:426
 #, c-format
 msgid "%s: Only one threshold must be packet loss (%s)\n"
 msgstr "%s: Nur ein Wert darf für paket loss angegeben werden (%s)\n"
 
-#: plugins/check_fping.c:394
+#: plugins/check_fping.c:458
 msgid ""
 "This plugin will use the fping command to ping the specified host for a fast "
 "check"
 msgstr ""
 
-#: plugins/check_fping.c:396
+#: plugins/check_fping.c:460
 msgid "Note that it is necessary to set the suid flag on fping."
 msgstr ""
 
-#: plugins/check_fping.c:406
+#: plugins/check_fping.c:472
 msgid ""
 "name or IP Address of host to ping (IP Address bypasses name lookup, "
 "reducing system load)"
 msgstr ""
 
-#: plugins/check_fping.c:408 plugins/check_ping.c:573
+#: plugins/check_fping.c:474 plugins/check_ping.c:575
 #, fuzzy
 msgid "warning threshold pair"
 msgstr "Warning threshold  Integer sein"
 
-#: plugins/check_fping.c:410 plugins/check_ping.c:575
+#: plugins/check_fping.c:476 plugins/check_ping.c:577
 #, fuzzy
 msgid "critical threshold pair"
 msgstr "Critical threshold muss ein Integer sein"
 
-#: plugins/check_fping.c:412
+#: plugins/check_fping.c:478
 msgid "size of ICMP packet"
 msgstr ""
 
-#: plugins/check_fping.c:414
+#: plugins/check_fping.c:480
 msgid "number of ICMP packets to send"
 msgstr ""
 
-#: plugins/check_fping.c:416
+#: plugins/check_fping.c:482
 msgid "Target timeout (ms)"
 msgstr ""
 
-#: plugins/check_fping.c:418
+#: plugins/check_fping.c:484
 msgid "Interval (ms) between sending packets"
 msgstr ""
 
-#: plugins/check_fping.c:421
+#: plugins/check_fping.c:486
+msgid "name or IP Address of sourceip"
+msgstr ""
+
+#: plugins/check_fping.c:488
+msgid "source interface name"
+msgstr ""
+
+#: plugins/check_fping.c:491
 #, c-format
 msgid ""
 "THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time "
 "(ms)"
 msgstr ""
 
-#: plugins/check_fping.c:422
+#: plugins/check_fping.c:492
 msgid ""
 "which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"
 msgstr ""
 
-#: plugins/check_fping.c:423
+#: plugins/check_fping.c:493
 msgid "packet loss to trigger an alarm state."
 msgstr ""
 
+#: plugins/check_fping.c:496
+msgid "IPv4 is used by default. Specify -6 to use IPv6."
+msgstr ""
+
 #: plugins/check_game.c:111
 #, c-format
 msgid "CRITICAL - Host type parameter incorrect!\n"
@@ -1086,457 +1148,535 @@ msgstr ""
 msgid "(default=%s)"
 msgstr ""
 
-#: plugins/check_http.c:262
-msgid "Critical threshold must be integer"
-msgstr "Critical threshold muss ein Integer sein"
-
-#: plugins/check_http.c:270
-msgid "Warning threshold must be integer"
-msgstr "Warning threshold  Integer sein"
+#: plugins/check_http.c:189
+msgid "file does not exist or is not readable"
+msgstr ""
 
-#: plugins/check_http.c:296 plugins/check_tcp.c:559
+#: plugins/check_http.c:310 plugins/check_http.c:315 plugins/check_http.c:321
+#: plugins/check_smtp.c:600 plugins/check_tcp.c:576 plugins/check_tcp.c:580
+#: plugins/check_tcp.c:586
 msgid "Invalid certificate expiration period"
 msgstr "Ungültiger Zertifikatsablauftermin"
 
-#: plugins/check_http.c:305 plugins/check_tcp.c:571
+#: plugins/check_http.c:348
+msgid ""
+"Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 "
+"(SSLv3)"
+msgstr ""
+
+#: plugins/check_http.c:354 plugins/check_tcp.c:599
 #, fuzzy
 msgid "Invalid option - SSL is not available"
 msgstr "Ungültige Option - SSL ist nicht verfügbar\n"
 
-#: plugins/check_http.c:329
+#: plugins/check_http.c:375
 msgid "Invalid onredirect option"
 msgstr ""
 
-#: plugins/check_http.c:331
+#: plugins/check_http.c:377
 #, c-format
 msgid "option f:%d \n"
 msgstr "Option f:%d \n"
 
-#: plugins/check_http.c:352
+#: plugins/check_http.c:398
 msgid "Invalid port number"
 msgstr "Ungültige Portnummer"
 
-#: plugins/check_http.c:400
+#: plugins/check_http.c:450
 #, c-format
 msgid "Could Not Compile Regular Expression: %s"
 msgstr ""
 
-#: plugins/check_http.c:414 plugins/check_ntp.c:718
-#: plugins/check_ntp_peer.c:507 plugins/check_ntp_time.c:508
-#: plugins/check_smtp.c:613 plugins/check_ssh.c:149 plugins/check_tcp.c:463
+#: plugins/check_http.c:464 plugins/check_ntp.c:722
+#: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:512
+#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:477
 msgid "IPv6 support not available"
 msgstr "IPv6 Unterstützung nicht vorhanden"
 
-#: plugins/check_http.c:476 plugins/check_ping.c:422
+#: plugins/check_http.c:529 plugins/check_ping.c:422
 msgid "You must specify a server address or host name"
 msgstr "Hostname oder Serveradresse muss angegeben werden"
 
-#: plugins/check_http.c:609 plugins/check_http.c:777
+#: plugins/check_http.c:543
+msgid ""
+"If you use a client certificate you must also specify a private key file"
+msgstr ""
+
+#: plugins/check_http.c:667 plugins/check_http.c:835
 #, fuzzy
 msgid "HTTP UNKNOWN - Memory allocation error\n"
 msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n"
 
-#: plugins/check_http.c:681
+#: plugins/check_http.c:739
 #, fuzzy, c-format
 msgid "%sServer date unknown, "
 msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n"
 
-#: plugins/check_http.c:684
+#: plugins/check_http.c:742
 #, fuzzy, c-format
 msgid "%sDocument modification date unknown, "
 msgstr "HTTP CRITICAL - Datum der letzten Änderung unbekannt\n"
 
-#: plugins/check_http.c:691
+#: plugins/check_http.c:749
 #, fuzzy, c-format
 msgid "%sServer date \"%100s\" unparsable, "
 msgstr "HTTP CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
 
-#: plugins/check_http.c:694
+#: plugins/check_http.c:752
 #, fuzzy, c-format
 msgid "%sDocument date \"%100s\" unparsable, "
 msgstr ""
 "HTTP CRITICAL - Dokumentendatum \"%100s\" konnte nicht verarbeitet werden"
 
-#: plugins/check_http.c:697
+#: plugins/check_http.c:755
 #, fuzzy, c-format
 msgid "%sDocument is %d seconds in the future, "
 msgstr "HTTP CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
 
-#: plugins/check_http.c:702
+#: plugins/check_http.c:760
 #, fuzzy, c-format
 msgid "%sLast modified %.1f days ago, "
 msgstr "HTTP CRITICAL - Letzte Änderung vor %.1f Tagen\n"
 
-#: plugins/check_http.c:705
+#: plugins/check_http.c:763
 #, fuzzy, c-format
 msgid "%sLast modified %d:%02d:%02d ago, "
 msgstr "HTTP CRITICAL - Letzte Änderung vor %d:%02d:%02d \n"
 
-#: plugins/check_http.c:807
+#: plugins/check_http.c:876
 msgid "HTTP CRITICAL - Unable to open TCP socket\n"
 msgstr "HTTP CRITICAL - Konnte TCP socket nicht öffnen\n"
 
-#: plugins/check_http.c:910
+#: plugins/check_http.c:995
 msgid "HTTP CRITICAL - Error on receive\n"
 msgstr "HTTP CRITICAL - Fehler beim Empfangen\n"
 
-#: plugins/check_http.c:920
+#: plugins/check_http.c:1005
 #, fuzzy
 msgid "HTTP CRITICAL - No data received from host\n"
 msgstr "HTTP CRITICAL - Keine Daten empfangen\n"
 
-#: plugins/check_http.c:971
+#: plugins/check_http.c:1056
 #, fuzzy, c-format
 msgid "Invalid HTTP response received from host: %s\n"
 msgstr "Ungültige HTTP Antwort von Host empfangen\n"
 
-#: plugins/check_http.c:975
+#: plugins/check_http.c:1060
 #, fuzzy, c-format
 msgid "Invalid HTTP response received from host on port %d: %s\n"
 msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n"
 
-#: plugins/check_http.c:984
+#: plugins/check_http.c:1069
 #, fuzzy, c-format
 msgid "Status line output matched \"%s\" - "
 msgstr "HTTP OK: Statusausgabe passt auf \"%s\"\n"
 
-#: plugins/check_http.c:995
+#: plugins/check_http.c:1080
 #, c-format
 msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
 msgstr "HTTP CRITICAL: Ungültige Statusmeldung (%s)\n"
 
-#: plugins/check_http.c:1002
+#: plugins/check_http.c:1087
 #, c-format
 msgid "HTTP CRITICAL: Invalid Status (%s)\n"
 msgstr "HTTP CRITICAL: Ungültiger Status (%s)\n"
 
-#: plugins/check_http.c:1006 plugins/check_http.c:1011
-#: plugins/check_http.c:1021 plugins/check_http.c:1025
+#: plugins/check_http.c:1091 plugins/check_http.c:1096
+#: plugins/check_http.c:1106 plugins/check_http.c:1110
 #, c-format
 msgid "%s - "
 msgstr ""
 
-#: plugins/check_http.c:1045
+#: plugins/check_http.c:1129
+#, fuzzy, c-format
+msgid "%sheader '%s' not found on '%s://%s:%d%s', "
+msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
+
+#: plugins/check_http.c:1141
 #, fuzzy, c-format
 msgid "%sstring '%s' not found on '%s://%s:%d%s', "
 msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
 
-#: plugins/check_http.c:1058
+#: plugins/check_http.c:1154
 #, fuzzy, c-format
 msgid "%spattern not found, "
 msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
 
-#: plugins/check_http.c:1060
+#: plugins/check_http.c:1156
 #, fuzzy, c-format
 msgid "%spattern found, "
 msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
 
-#: plugins/check_http.c:1066
+#: plugins/check_http.c:1162
 #, fuzzy, c-format
 msgid "%sExecute Error: %s, "
 msgstr "HTTP CRITICAL - Fehler: %s\n"
 
-#: plugins/check_http.c:1082
+#: plugins/check_http.c:1178
 #, fuzzy, c-format
 msgid "%spage size %d too large, "
 msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n"
 
-#: plugins/check_http.c:1085
+#: plugins/check_http.c:1181
 #, fuzzy, c-format
 msgid "%spage size %d too small, "
 msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n"
 
-#: plugins/check_http.c:1097
+#: plugins/check_http.c:1194
+#, fuzzy, c-format
+msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s"
+msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n"
+
+#: plugins/check_http.c:1206
 #, fuzzy, c-format
 msgid "%s - %d bytes in %.3f second response time %s|%s %s"
 msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n"
 
-#: plugins/check_http.c:1137
+#: plugins/check_http.c:1244
 msgid "HTTP UNKNOWN - Could not allocate addr\n"
 msgstr "HTTP UNKNOWN - Konnte addr nicht zuweisen\n"
 
-#: plugins/check_http.c:1141 plugins/check_http.c:1172
+#: plugins/check_http.c:1248 plugins/check_http.c:1279
 #, fuzzy
 msgid "HTTP UNKNOWN - Could not allocate URL\n"
 msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n"
 
-#: plugins/check_http.c:1150
+#: plugins/check_http.c:1257
 #, c-format
 msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1165
+#: plugins/check_http.c:1272
 #, fuzzy, c-format
 msgid "HTTP UNKNOWN - Empty redirect location%s\n"
 msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n"
 
-#: plugins/check_http.c:1215
+#: plugins/check_http.c:1322
 #, c-format
 msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1225
+#: plugins/check_http.c:1332
 #, fuzzy, c-format
 msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"
 msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n"
 
-#: plugins/check_http.c:1233
+#: plugins/check_http.c:1340
 #, c-format
 msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"
 msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n"
 
-#: plugins/check_http.c:1254
+#: plugins/check_http.c:1361
 #, fuzzy, c-format
 msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"
 msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n"
 
-#: plugins/check_http.c:1259
+#: plugins/check_http.c:1366
 #, c-format
 msgid "Redirection to %s://%s:%d%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1310
+#: plugins/check_http.c:1440
 #, fuzzy
 msgid "This plugin tests the HTTP service on the specified host. It can test"
 msgstr ""
 "Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
 "\n"
 
-#: plugins/check_http.c:1311
+#: plugins/check_http.c:1441
 msgid "normal (http) and secure (https) servers, follow redirects, search for"
 msgstr ""
 
-#: plugins/check_http.c:1312
+#: plugins/check_http.c:1442
 msgid "strings and regular expressions, check connection times, and report on"
 msgstr ""
 
-#: plugins/check_http.c:1313
+#: plugins/check_http.c:1443
 #, fuzzy
 msgid "certificate expiration times."
 msgstr "Clientzertifikat benötigt\n"
 
-#: plugins/check_http.c:1319
+#: plugins/check_http.c:1449
 #, c-format
 msgid "NOTE: One or both of -H and -I must be specified"
 msgstr ""
 
-#: plugins/check_http.c:1327
+#: plugins/check_http.c:1457
 msgid "Host name argument for servers using host headers (virtual host)"
 msgstr ""
 
-#: plugins/check_http.c:1328
+#: plugins/check_http.c:1458
 msgid "Append a port to include it in the header (eg: example.com:5000)"
 msgstr ""
 
-#: plugins/check_http.c:1330
+#: plugins/check_http.c:1460
 msgid ""
 "IP address or name (use numeric address if possible to bypass DNS lookup)."
 msgstr ""
 
-#: plugins/check_http.c:1332
+#: plugins/check_http.c:1462
 msgid "Port number (default: "
 msgstr ""
 
-#: plugins/check_http.c:1339
-msgid "Connect via SSL. Port defaults to 443"
+#: plugins/check_http.c:1469
+msgid ""
+"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"
 msgstr ""
 
-#: plugins/check_http.c:1341
+#: plugins/check_http.c:1470
+msgid "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)."
+msgstr ""
+
+#: plugins/check_http.c:1472
 msgid "Enable SSL/TLS hostname extension support (SNI)"
 msgstr ""
 
-#: plugins/check_http.c:1343
+#: plugins/check_http.c:1474
 msgid ""
 "Minimum number of days a certificate has to be valid. Port defaults to 443"
 msgstr ""
 
-#: plugins/check_http.c:1344
-msgid "(when this option is used the URL is not checked.)\n"
+#: plugins/check_http.c:1475
+msgid "(when this option is used the URL is not checked.)"
+msgstr ""
+
+#: plugins/check_http.c:1477
+msgid "Name of file that contains the client certificate (PEM format)"
 msgstr ""
 
-#: plugins/check_http.c:1348
+#: plugins/check_http.c:1478
+msgid "to be used in establishing the SSL session"
+msgstr ""
+
+#: plugins/check_http.c:1480
+msgid "Name of file containing the private key (PEM format)"
+msgstr ""
+
+#: plugins/check_http.c:1481
+msgid "matching the client certificate"
+msgstr ""
+
+#: plugins/check_http.c:1485
 msgid "Comma-delimited list of strings, at least one of them is expected in"
 msgstr ""
 
-#: plugins/check_http.c:1349
+#: plugins/check_http.c:1486
 msgid "the first (status) line of the server response (default: "
 msgstr ""
 
-#: plugins/check_http.c:1351
+#: plugins/check_http.c:1488
 msgid ""
 "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"
 msgstr ""
 
-#: plugins/check_http.c:1353
+#: plugins/check_http.c:1490
+msgid "String to expect in the response headers"
+msgstr ""
+
+#: plugins/check_http.c:1492
 msgid "String to expect in the content"
 msgstr ""
 
-#: plugins/check_http.c:1355
+#: plugins/check_http.c:1494
 msgid "URL to GET or POST (default: /)"
 msgstr ""
 
-#: plugins/check_http.c:1357
+#: plugins/check_http.c:1496
 msgid "URL encoded http POST data"
 msgstr ""
 
-#: plugins/check_http.c:1359
+#: plugins/check_http.c:1498
 msgid "Set HTTP method."
 msgstr ""
 
-#: plugins/check_http.c:1361
+#: plugins/check_http.c:1500
 msgid "Don't wait for document body: stop reading after headers."
 msgstr ""
 
-#: plugins/check_http.c:1362
+#: plugins/check_http.c:1501
 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)"
 msgstr ""
 
-#: plugins/check_http.c:1364
+#: plugins/check_http.c:1503
 msgid "Warn if document is more than SECONDS old. the number can also be of"
 msgstr ""
 
-#: plugins/check_http.c:1365
+#: plugins/check_http.c:1504
 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."
 msgstr ""
 
-#: plugins/check_http.c:1367
+#: plugins/check_http.c:1506
 msgid "specify Content-Type header media type when POSTing\n"
 msgstr ""
 
-#: plugins/check_http.c:1370
+#: plugins/check_http.c:1509
 msgid "Allow regex to span newlines (must precede -r or -R)"
 msgstr ""
 
-#: plugins/check_http.c:1372
+#: plugins/check_http.c:1511
 msgid "Search page for regex STRING"
 msgstr ""
 
-#: plugins/check_http.c:1374
+#: plugins/check_http.c:1513
 msgid "Search page for case-insensitive regex STRING"
 msgstr ""
 
-#: plugins/check_http.c:1376
+#: plugins/check_http.c:1515
 msgid "Return CRITICAL if found, OK if not\n"
 msgstr ""
 
-#: plugins/check_http.c:1379
+#: plugins/check_http.c:1518
 msgid "Username:password on sites with basic authentication"
 msgstr ""
 
-#: plugins/check_http.c:1381
+#: plugins/check_http.c:1520
 msgid "Username:password on proxy-servers with basic authentication"
 msgstr ""
 
-#: plugins/check_http.c:1383
+#: plugins/check_http.c:1522
 msgid "String to be sent in http header as \"User Agent\""
 msgstr ""
 
-#: plugins/check_http.c:1385
+#: plugins/check_http.c:1524
 msgid ""
-" Any other tags to be sent in http header. Use multiple times for additional "
+"Any other tags to be sent in http header. Use multiple times for additional "
 "headers"
 msgstr ""
 
-#: plugins/check_http.c:1387
+#: plugins/check_http.c:1526
+msgid "Print additional performance data"
+msgstr ""
+
+#: plugins/check_http.c:1528
 msgid "Wrap output in HTML link (obsoleted by urlize)"
 msgstr ""
 
-#: plugins/check_http.c:1389
+#: plugins/check_http.c:1530
 msgid "How to handle redirected pages. sticky is like follow but stick to the"
 msgstr ""
 
-#: plugins/check_http.c:1390
-msgid "specified IP address. stickyport also ensure post stays the same."
+#: plugins/check_http.c:1531
+msgid "specified IP address. stickyport also ensures port stays the same."
 msgstr ""
 
-#: plugins/check_http.c:1392
+#: plugins/check_http.c:1533
 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)"
 msgstr ""
 
-#: plugins/check_http.c:1402
+#: plugins/check_http.c:1543
 #, fuzzy
 msgid "This plugin will attempt to open an HTTP connection with the host."
 msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
 
-#: plugins/check_http.c:1403
+#: plugins/check_http.c:1544
 msgid ""
 "Successful connects return STATE_OK, refusals and timeouts return "
 "STATE_CRITICAL"
 msgstr ""
 
-#: plugins/check_http.c:1404
+#: plugins/check_http.c:1545
 msgid ""
 "other errors return STATE_UNKNOWN.  Successful connects, but incorrect "
 "reponse"
 msgstr ""
 
-#: plugins/check_http.c:1405
+#: plugins/check_http.c:1546
 msgid ""
 "messages from the host result in STATE_WARNING return values.  If you are"
 msgstr ""
 
-#: plugins/check_http.c:1406
+#: plugins/check_http.c:1547
 msgid ""
 "checking a virtual server that uses 'host headers' you must supply the FQDN"
 msgstr ""
 
-#: plugins/check_http.c:1407
+#: plugins/check_http.c:1548
 msgid "(fully qualified domain name) as the [host_name] argument."
 msgstr ""
 
-#: plugins/check_http.c:1411
+#: plugins/check_http.c:1552
 msgid "This plugin can also check whether an SSL enabled web server is able to"
 msgstr ""
 
-#: plugins/check_http.c:1412
+#: plugins/check_http.c:1553
 msgid "serve content (optionally within a specified time) or whether the X509 "
 msgstr ""
 
-#: plugins/check_http.c:1413
+#: plugins/check_http.c:1554
 msgid "certificate is still valid for the specified number of days."
 msgstr ""
 
-#: plugins/check_http.c:1417
+#: plugins/check_http.c:1556
+#, fuzzy
+msgid "Please note that this plugin does not check if the presented server"
+msgstr ""
+"Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
+"\n"
+
+#: plugins/check_http.c:1557
+msgid "certificate matches the hostname of the server, or if the certificate"
+msgstr ""
+
+#: plugins/check_http.c:1558
+msgid "has a valid chain of trust to one of the locally installed CAs."
+msgstr ""
+
+#: plugins/check_http.c:1562
 msgid ""
 "When the 'www.verisign.com' server returns its content within 5 seconds,"
 msgstr ""
 
-#: plugins/check_http.c:1418
+#: plugins/check_http.c:1563
 msgid ""
 "a STATE_OK will be returned. When the server returns its content but exceeds"
 msgstr ""
 
-#: plugins/check_http.c:1419
+#: plugins/check_http.c:1564
 msgid ""
 "the 5-second threshold, a STATE_WARNING will be returned. When an error "
 "occurs,"
 msgstr ""
 
-#: plugins/check_http.c:1420
+#: plugins/check_http.c:1565
 msgid "a STATE_CRITICAL will be returned."
 msgstr ""
 
-#: plugins/check_http.c:1423
+#: plugins/check_http.c:1568
 msgid ""
 "When the certificate of 'www.verisign.com' is valid for more than 14 days,"
 msgstr ""
 
-#: plugins/check_http.c:1424
+#: plugins/check_http.c:1569 plugins/check_http.c:1575
 msgid ""
 "a STATE_OK is returned. When the certificate is still valid, but for less "
 "than"
 msgstr ""
 
-#: plugins/check_http.c:1425
+#: plugins/check_http.c:1570
 msgid ""
 "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
 msgstr ""
 
-#: plugins/check_http.c:1426
+#: plugins/check_http.c:1571
 #, fuzzy
 msgid "the certificate is expired."
 msgstr "Clientzertifikat benötigt\n"
 
+#: plugins/check_http.c:1574
+msgid ""
+"When the certificate of 'www.verisign.com' is valid for more than 30 days,"
+msgstr ""
+
+#: plugins/check_http.c:1576
+msgid "30 days, but more than 14 days, a STATE_WARNING is returned."
+msgstr ""
+
+#: plugins/check_http.c:1577
+msgid ""
+"A STATE_CRITICAL will be returned when certificate expires in less than 14 "
+"days"
+msgstr ""
+
 #: plugins/check_ldap.c:133
 #, c-format
 msgid "Could not connect to the server at port %i\n"
@@ -1582,81 +1722,77 @@ msgstr ""
 msgid "LDAP %s - %.3f seconds response time|%s\n"
 msgstr ""
 
-#: plugins/check_ldap.c:339 plugins/check_ldap.c:346
+#: plugins/check_ldap.c:339 plugins/check_ldap.c:347
 #, c-format
 msgid "%s cannot be combined with %s"
 msgstr ""
 
-#: plugins/check_ldap.c:352 plugins/check_ping.c:246
-msgid "IPv6 support not available\n"
-msgstr ""
-
-#: plugins/check_ldap.c:375
+#: plugins/check_ldap.c:379
 msgid "Please specify the host name\n"
 msgstr ""
 
-#: plugins/check_ldap.c:378
+#: plugins/check_ldap.c:382
 msgid "Please specify the LDAP base\n"
 msgstr ""
 
-#: plugins/check_ldap.c:407
+#: plugins/check_ldap.c:411
 msgid "ldap attribute to search (default: \"(objectclass=*)\""
 msgstr ""
 
-#: plugins/check_ldap.c:409
+#: plugins/check_ldap.c:413
 msgid "ldap base (eg. ou=my unit, o=my org, c=at"
 msgstr ""
 
-#: plugins/check_ldap.c:411
+#: plugins/check_ldap.c:415
 msgid "ldap bind DN (if required)"
 msgstr ""
 
-#: plugins/check_ldap.c:413
+#: plugins/check_ldap.c:417
 msgid "ldap password (if required)"
 msgstr ""
 
-#: plugins/check_ldap.c:415
+#: plugins/check_ldap.c:419
 msgid "use starttls mechanism introduced in protocol version 3"
 msgstr ""
 
-#: plugins/check_ldap.c:417
+#: plugins/check_ldap.c:421
 msgid "use ldaps (ldap v2 ssl method). this also sets the default port to"
 msgstr ""
 
-#: plugins/check_ldap.c:421
+#: plugins/check_ldap.c:425
 msgid "use ldap protocol version 2"
 msgstr ""
 
-#: plugins/check_ldap.c:423
+#: plugins/check_ldap.c:427
 msgid "use ldap protocol version 3"
 msgstr ""
 
-#: plugins/check_ldap.c:424
+#: plugins/check_ldap.c:428
 msgid "default protocol version:"
 msgstr ""
 
-#: plugins/check_ldap.c:435
+#: plugins/check_ldap.c:439
 msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"
 msgstr ""
 
-#: plugins/check_ldap.c:436
+#: plugins/check_ldap.c:440
 #, c-format
 msgid ""
 " implied (using default port %i) unless --port=636 is specified. In that "
 "case\n"
 msgstr ""
 
-#: plugins/check_ldap.c:437
+#: plugins/check_ldap.c:441
 msgid "'SSL on connect' will be used no matter how the plugin was called."
 msgstr ""
 
-#: plugins/check_ldap.c:438
+#: plugins/check_ldap.c:442
 msgid ""
 "This detection is deprecated, please use 'check_ldap' with the '--starttls' "
 "or '--ssl' flags"
 msgstr ""
 
-#: plugins/check_ldap.c:439
+#: plugins/check_ldap.c:443
 msgid "to define the behaviour explicitly instead."
 msgstr ""
 
@@ -1669,61 +1805,66 @@ msgstr ""
 msgid "Error opening %s\n"
 msgstr ""
 
-#: plugins/check_load.c:160
+#: plugins/check_load.c:163
+#, fuzzy, c-format
+msgid "could not parse load from uptime: %s\n"
+msgstr "Argumente konnten nicht ausgewertet werden"
+
+#: plugins/check_load.c:169
 #, c-format
 msgid "Error code %d returned in %s\n"
 msgstr ""
 
-#: plugins/check_load.c:175
+#: plugins/check_load.c:184
 #, c-format
 msgid "Error in getloadavg()\n"
 msgstr ""
 
-#: plugins/check_load.c:178 plugins/check_load.c:180
+#: plugins/check_load.c:187 plugins/check_load.c:189
 #, c-format
 msgid "Error processing %s\n"
 msgstr ""
 
-#: plugins/check_load.c:189
+#: plugins/check_load.c:198
 #, c-format
 msgid "load average: %.2f, %.2f, %.2f"
 msgstr ""
 
-#: plugins/check_load.c:282
+#: plugins/check_load.c:291
 #, fuzzy, c-format
 msgid "Critical threshold for %d-minute load average is not specified\n"
 msgstr "Critical threshold muss ein positiver Integer sein\n"
 
-#: plugins/check_load.c:284
+#: plugins/check_load.c:293
 #, fuzzy, c-format
 msgid "Warning threshold for %d-minute load average is not specified\n"
 msgstr "Warning threshold muss ein positiver Integer sein\n"
 
-#: plugins/check_load.c:286
+#: plugins/check_load.c:295
 #, c-format
 msgid ""
 "Parameter inconsistency: %d-minute \"warning load\" is greater than "
 "\"critical load\"\n"
 msgstr ""
 
-#: plugins/check_load.c:302
+#: plugins/check_load.c:311
 #, c-format
 msgid "This plugin tests the current system load average."
 msgstr ""
 
-#: plugins/check_load.c:312
+#: plugins/check_load.c:321
 msgid "Exit with WARNING status if load average exceeds WLOADn"
 msgstr ""
 
-#: plugins/check_load.c:314
+#: plugins/check_load.c:323
 msgid "Exit with CRITICAL status if load average exceed CLOADn"
 msgstr ""
 
-#: plugins/check_load.c:315
+#: plugins/check_load.c:324
 msgid "the load average format is the same used by \"uptime\" and \"w\""
 msgstr ""
 
-#: plugins/check_load.c:317
+#: plugins/check_load.c:326
 msgid "Divide the load averages by the number of CPUs (when possible)"
 msgstr ""
 
@@ -1987,93 +2128,130 @@ msgstr ""
 msgid "Usage"
 msgstr ""
 
-#: plugins/check_mysql.c:126
+#: plugins/check_mysql.c:171
+#, c-format
+msgid "status store_result error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:202
 #, c-format
 msgid "slave query error: %s\n"
 msgstr ""
 
-#: plugins/check_mysql.c:133
+#: plugins/check_mysql.c:209
 #, c-format
 msgid "slave store_result error: %s\n"
 msgstr ""
 
-#: plugins/check_mysql.c:139
+#: plugins/check_mysql.c:215
 msgid "No slaves defined"
 msgstr ""
 
-#: plugins/check_mysql.c:147
+#: plugins/check_mysql.c:223
 #, c-format
 msgid "slave fetch row error: %s\n"
 msgstr ""
 
-#: plugins/check_mysql.c:152
+#: plugins/check_mysql.c:228
 #, c-format
 msgid "Slave running: %s"
 msgstr ""
 
-#: plugins/check_mysql.c:378
+#: plugins/check_mysql.c:505
 msgid "This program tests connections to a MySQL server"
 msgstr ""
 
-#: plugins/check_mysql.c:389
+#: plugins/check_mysql.c:516
 msgid "Use the specified socket (has no effect if -H is used)"
 msgstr ""
 
-#: plugins/check_mysql.c:392
+#: plugins/check_mysql.c:519
 msgid "Check database with indicated name"
 msgstr ""
 
-#: plugins/check_mysql.c:394
+#: plugins/check_mysql.c:521
+msgid "Read from the specified client options file"
+msgstr ""
+
+#: plugins/check_mysql.c:523
+msgid "Use a client options group"
+msgstr ""
+
+#: plugins/check_mysql.c:525
 msgid "Connect using the indicated username"
 msgstr ""
 
-#: plugins/check_mysql.c:396
+#: plugins/check_mysql.c:527
 msgid "Use the indicated password to authenticate the connection"
 msgstr ""
 
-#: plugins/check_mysql.c:397
+#: plugins/check_mysql.c:528
 msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"
 msgstr ""
 
-#: plugins/check_mysql.c:398
+#: plugins/check_mysql.c:529
 msgid "Your clear-text password could be visible as a process table entry"
 msgstr ""
 
-#: plugins/check_mysql.c:400
+#: plugins/check_mysql.c:531
 msgid "Check if the slave thread is running properly."
 msgstr ""
 
-#: plugins/check_mysql.c:402
+#: plugins/check_mysql.c:533
 msgid "Exit with WARNING status if slave server is more than INTEGER seconds"
 msgstr ""
 
-#: plugins/check_mysql.c:403 plugins/check_mysql.c:406
+#: plugins/check_mysql.c:534 plugins/check_mysql.c:537
 msgid "behind master"
 msgstr ""
 
-#: plugins/check_mysql.c:405
+#: plugins/check_mysql.c:536
 msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds"
 msgstr ""
 
-#: plugins/check_mysql.c:409
+#: plugins/check_mysql.c:539
+msgid "Use ssl encryptation"
+msgstr ""
+
+#: plugins/check_mysql.c:541
+msgid "Path to CA signing the cert"
+msgstr ""
+
+#: plugins/check_mysql.c:543
+msgid "Path to SSL certificate"
+msgstr ""
+
+#: plugins/check_mysql.c:545
+msgid "Path to private SSL key"
+msgstr ""
+
+#: plugins/check_mysql.c:547
+msgid "Path to CA directory"
+msgstr ""
+
+#: plugins/check_mysql.c:549
+msgid "List of valid SSL ciphers"
+msgstr ""
+
+#: plugins/check_mysql.c:553
 msgid ""
 "There are no required arguments. By default, the local database is checked"
 msgstr ""
 
-#: plugins/check_mysql.c:410
+#: plugins/check_mysql.c:554
 msgid ""
 "using the default unix socket. You can force TCP on localhost by using an"
 msgstr ""
 
-#: plugins/check_mysql.c:411
+#: plugins/check_mysql.c:555
 msgid "IP address or FQDN ('localhost' will use the socket as well)."
 msgstr ""
 
-#: plugins/check_mysql.c:415
+#: plugins/check_mysql.c:559
 msgid "You must specify -p with an empty string to force an empty password,"
 msgstr ""
 
-#: plugins/check_mysql.c:416
+#: plugins/check_mysql.c:560
 msgid "overriding any my.cnf settings."
 msgstr ""
 
@@ -2094,7 +2272,7 @@ msgstr ""
 msgid "Cannot parse Nagios log file for valid time"
 msgstr ""
 
-#: plugins/check_nagios.c:183 plugins/check_procs.c:295
+#: plugins/check_nagios.c:183 plugins/check_procs.c:356
 #, c-format
 msgid "%d process"
 msgid_plural "%d processes"
@@ -2108,22 +2286,27 @@ msgid_plural "status log updated %d seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/check_nagios.c:223 plugins/check_nagios.c:252
+#: plugins/check_nagios.c:224 plugins/check_nagios.c:253
 #, fuzzy
 msgid "Expiration time must be an integer (seconds)\n"
 msgstr "skip lines muss ein Integer sein"
 
-#: plugins/check_nagios.c:264
+#: plugins/check_nagios.c:260
+#, fuzzy
+msgid "Timeout must be an integer (seconds)\n"
+msgstr "skip lines muss ein Integer sein"
+
+#: plugins/check_nagios.c:272
 #, fuzzy
 msgid "You must provide the status_log\n"
 msgstr "%s: Hostname muss angegeben werden\n"
 
-#: plugins/check_nagios.c:267
+#: plugins/check_nagios.c:275
 #, fuzzy
 msgid "You must provide a process string\n"
 msgstr "%s: Hostname muss angegeben werden\n"
 
-#: plugins/check_nagios.c:281
+#: plugins/check_nagios.c:289
 #, fuzzy
 msgid ""
 "This plugin checks the status of the Nagios process on the local machine"
@@ -2133,552 +2316,555 @@ msgstr ""
 "unterschritten wird.\n"
 "\n"
 
-#: plugins/check_nagios.c:282
+#: plugins/check_nagios.c:290
 msgid ""
 "The plugin will check to make sure the Nagios status log is no older than"
 msgstr ""
 
-#: plugins/check_nagios.c:283
+#: plugins/check_nagios.c:291
 msgid "the number of minutes specified by the expires option."
 msgstr ""
 
-#: plugins/check_nagios.c:284
+#: plugins/check_nagios.c:292
 msgid ""
 "It also checks the process table for a process matching the command argument."
 msgstr ""
 
-#: plugins/check_nagios.c:294
+#: plugins/check_nagios.c:302
 msgid "Name of the log file to check"
 msgstr ""
 
-#: plugins/check_nagios.c:296
+#: plugins/check_nagios.c:304
 msgid "Minutes aging after which logfile is considered stale"
 msgstr ""
 
-#: plugins/check_nagios.c:298
+#: plugins/check_nagios.c:306
 msgid "Substring to search for in process arguments"
 msgstr ""
 
-#: plugins/check_nt.c:141
+#: plugins/check_nagios.c:308
+msgid "Timeout for the plugin in seconds"
+msgstr ""
+
+#: plugins/check_nt.c:142
 #, c-format
 msgid "Wrong client version - running: %s, required: %s"
 msgstr ""
 
-#: plugins/check_nt.c:152 plugins/check_nt.c:212
+#: plugins/check_nt.c:153 plugins/check_nt.c:218
 msgid "missing -l parameters"
 msgstr ""
 
-#: plugins/check_nt.c:154
+#: plugins/check_nt.c:155
 msgid "wrong -l parameter."
 msgstr ""
 
-#: plugins/check_nt.c:158
+#: plugins/check_nt.c:159
 msgid "CPU Load"
 msgstr ""
 
-#: plugins/check_nt.c:181
+#: plugins/check_nt.c:182
 #, c-format
 msgid " %lu%% (%lu min average)"
 msgstr ""
 
-#: plugins/check_nt.c:183
+#: plugins/check_nt.c:184
 #, c-format
 msgid " '%lu min avg Load'=%lu%%;%lu;%lu;0;100"
 msgstr ""
 
-#: plugins/check_nt.c:193
+#: plugins/check_nt.c:194
 msgid "not enough values for -l parameters"
 msgstr ""
 
-#: plugins/check_nt.c:205
+#: plugins/check_nt.c:206
 #, c-format
 msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)"
 msgstr ""
 
-#: plugins/check_nt.c:214
+#: plugins/check_nt.c:220
 msgid "wrong -l argument"
 msgstr ""
 
-#: plugins/check_nt.c:230
+#: plugins/check_nt.c:236
 #, c-format
 msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"
 msgstr ""
 
-#: plugins/check_nt.c:233
+#: plugins/check_nt.c:239
 #, c-format
 msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"
 msgstr ""
 
-#: plugins/check_nt.c:247
+#: plugins/check_nt.c:253
 msgid "Free disk space : Invalid drive"
 msgstr ""
 
-#: plugins/check_nt.c:257
+#: plugins/check_nt.c:263
 msgid "No service/process specified"
 msgstr ""
 
-#: plugins/check_nt.c:281
+#: plugins/check_nt.c:271 plugins/check_nt.c:284 plugins/check_nt.c:288
+#: plugins/check_nt.c:622
+msgid "could not fetch information from server\n"
+msgstr ""
+
+#: plugins/check_nt.c:296
 #, c-format
 msgid ""
 "Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"
 msgstr ""
 
-#: plugins/check_nt.c:284
+#: plugins/check_nt.c:299
 #, c-format
 msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"
 msgstr ""
 
-#: plugins/check_nt.c:320 plugins/check_nt.c:405 plugins/check_nt.c:435
+#: plugins/check_nt.c:335 plugins/check_nt.c:420 plugins/check_nt.c:450
 msgid "No counter specified"
 msgstr ""
 
-#: plugins/check_nt.c:352
+#: plugins/check_nt.c:367
 msgid "Minimum value contains non-numbers"
 msgstr ""
 
-#: plugins/check_nt.c:356
+#: plugins/check_nt.c:371
 msgid "Maximum value contains non-numbers"
 msgstr ""
 
-#: plugins/check_nt.c:363
+#: plugins/check_nt.c:378
 msgid "No unit counter specified"
 msgstr ""
 
-#: plugins/check_nt.c:450
+#: plugins/check_nt.c:465
 msgid "Please specify a variable to check"
 msgstr ""
 
-#: plugins/check_nt.c:534
+#: plugins/check_nt.c:549
 #, fuzzy
 msgid "Server port must be an integer\n"
 msgstr "skip lines muss ein Integer sein"
 
-#: plugins/check_nt.c:588
+#: plugins/check_nt.c:603
 #, fuzzy
 msgid "You must provide a server address or host name"
 msgstr "Hostname oder Serveradresse muss angegeben werden"
 
-#: plugins/check_nt.c:594
+#: plugins/check_nt.c:609
 msgid "None"
 msgstr ""
 
-#: plugins/check_nt.c:607
-msgid "could not fetch information from server\n"
-msgstr ""
-
-#: plugins/check_nt.c:651
+#: plugins/check_nt.c:666
 msgid "This plugin collects data from the NSClient service running on a"
 msgstr ""
 
-#: plugins/check_nt.c:652
+#: plugins/check_nt.c:667
 msgid "Windows NT/2000/XP/2003 server."
 msgstr ""
 
-#: plugins/check_nt.c:663
+#: plugins/check_nt.c:678
 msgid "Name of the host to check"
 msgstr ""
 
-#: plugins/check_nt.c:665
+#: plugins/check_nt.c:680
 #, fuzzy
 msgid "Optional port number (default: "
 msgstr "Ungültige Portnummer"
 
-#: plugins/check_nt.c:668
+#: plugins/check_nt.c:683
 msgid "Password needed for the request"
 msgstr ""
 
-#: plugins/check_nt.c:670 plugins/check_nwstat.c:1661
+#: plugins/check_nt.c:685 plugins/check_nwstat.c:1661
 #: plugins/check_overcr.c:432
 msgid "Threshold which will result in a warning status"
 msgstr ""
 
-#: plugins/check_nt.c:672 plugins/check_nwstat.c:1663
+#: plugins/check_nt.c:687 plugins/check_nwstat.c:1663
 #: plugins/check_overcr.c:434
 msgid "Threshold which will result in a critical status"
 msgstr ""
 
-#: plugins/check_nt.c:674
+#: plugins/check_nt.c:689
 msgid "Seconds before connection attempt times out (default: "
 msgstr ""
 
-#: plugins/check_nt.c:676
+#: plugins/check_nt.c:691
 msgid "Parameters passed to specified check (see below)"
 msgstr ""
 
-#: plugins/check_nt.c:678
+#: plugins/check_nt.c:693
 msgid "Display options (currently only SHOWALL works)"
 msgstr ""
 
-#: plugins/check_nt.c:680
+#: plugins/check_nt.c:695
 msgid "Return UNKNOWN on timeouts"
 msgstr ""
 
-#: plugins/check_nt.c:683
+#: plugins/check_nt.c:698
 msgid "Print this help screen"
 msgstr ""
 
-#: plugins/check_nt.c:685
+#: plugins/check_nt.c:700
 msgid "Print version information"
 msgstr ""
 
-#: plugins/check_nt.c:687
+#: plugins/check_nt.c:702
 msgid "Variable to check"
 msgstr ""
 
-#: plugins/check_nt.c:688
+#: plugins/check_nt.c:703
 msgid "Valid variables are:"
 msgstr ""
 
-#: plugins/check_nt.c:690
+#: plugins/check_nt.c:705
 msgid "Get the NSClient version"
 msgstr ""
 
-#: plugins/check_nt.c:691
+#: plugins/check_nt.c:706
 msgid "If -l <version> is specified, will return warning if versions differ."
 msgstr ""
 
-#: plugins/check_nt.c:693
+#: plugins/check_nt.c:708
 msgid "Average CPU load on last x minutes."
 msgstr ""
 
-#: plugins/check_nt.c:694
+#: plugins/check_nt.c:709
 msgid "Request a -l parameter with the following syntax:"
 msgstr ""
 
-#: plugins/check_nt.c:695
+#: plugins/check_nt.c:710
 msgid "-l <minutes range>,<warning threshold>,<critical threshold>."
 msgstr ""
 
-#: plugins/check_nt.c:696
+#: plugins/check_nt.c:711
 msgid "<minute range> should be less than 24*60."
 msgstr ""
 
-#: plugins/check_nt.c:697
+#: plugins/check_nt.c:712
 msgid ""
 "Thresholds are percentage and up to 10 requests can be done in one shot."
 msgstr ""
 
-#: plugins/check_nt.c:700
+#: plugins/check_nt.c:715
 msgid "Get the uptime of the machine."
 msgstr ""
 
-#: plugins/check_nt.c:701
+#: plugins/check_nt.c:716
 msgid "No specific parameters. No warning or critical threshold"
 msgstr ""
 
-#: plugins/check_nt.c:703
+#: plugins/check_nt.c:718
 msgid "Size and percentage of disk use."
 msgstr ""
 
-#: plugins/check_nt.c:704
+#: plugins/check_nt.c:719
 msgid "Request a -l parameter containing the drive letter only."
 msgstr ""
 
-#: plugins/check_nt.c:705 plugins/check_nt.c:708
+#: plugins/check_nt.c:720 plugins/check_nt.c:723
 msgid "Warning and critical thresholds can be specified with -w and -c."
 msgstr ""
 
-#: plugins/check_nt.c:707
+#: plugins/check_nt.c:722
 msgid "Memory use."
 msgstr ""
 
-#: plugins/check_nt.c:710
+#: plugins/check_nt.c:725
 msgid "Check the state of one or several services."
 msgstr ""
 
-#: plugins/check_nt.c:711 plugins/check_nt.c:720
+#: plugins/check_nt.c:726 plugins/check_nt.c:735
 msgid "Request a -l parameters with the following syntax:"
 msgstr ""
 
-#: plugins/check_nt.c:712
+#: plugins/check_nt.c:727
 msgid "-l <service1>,<service2>,<service3>,..."
 msgstr ""
 
-#: plugins/check_nt.c:713
+#: plugins/check_nt.c:728
 msgid "You can specify -d SHOWALL in case you want to see working services"
 msgstr ""
 
-#: plugins/check_nt.c:714
+#: plugins/check_nt.c:729
 msgid "in the returned string."
 msgstr ""
 
-#: plugins/check_nt.c:716
+#: plugins/check_nt.c:731
 msgid "Check if one or several process are running."
 msgstr ""
 
-#: plugins/check_nt.c:717
+#: plugins/check_nt.c:732
 msgid "Same syntax as SERVICESTATE."
 msgstr ""
 
-#: plugins/check_nt.c:719
+#: plugins/check_nt.c:734
 msgid "Check any performance counter of Windows NT/2000."
 msgstr ""
 
-#: plugins/check_nt.c:721
+#: plugins/check_nt.c:736
 msgid "-l \"\\\\<performance object>\\\\counter\",\"<description>"
 msgstr ""
 
-#: plugins/check_nt.c:722
+#: plugins/check_nt.c:737
 msgid "The <description> parameter is optional and is given to a printf "
 msgstr ""
 
-#: plugins/check_nt.c:723
+#: plugins/check_nt.c:738
 msgid "output command which requires a float parameter."
 msgstr ""
 
-#: plugins/check_nt.c:724
+#: plugins/check_nt.c:739
 #, c-format
 msgid "If <description> does not include \"%%\", it is used as a label."
 msgstr ""
 
-#: plugins/check_nt.c:725 plugins/check_nt.c:740
+#: plugins/check_nt.c:740 plugins/check_nt.c:755
 msgid "Some examples:"
 msgstr ""
 
-#: plugins/check_nt.c:729
+#: plugins/check_nt.c:744
 msgid "Check any performance counter object of Windows NT/2000."
 msgstr ""
 
-#: plugins/check_nt.c:730
+#: plugins/check_nt.c:745
 msgid ""
 "Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"
 msgstr ""
 
-#: plugins/check_nt.c:731
+#: plugins/check_nt.c:746
 msgid "<counter object> is a Windows Perfmon Counter object (eg. Process),"
 msgstr ""
 
-#: plugins/check_nt.c:732
+#: plugins/check_nt.c:747
 msgid "if it is two words, it should be enclosed in quotes"
 msgstr ""
 
-#: plugins/check_nt.c:733
+#: plugins/check_nt.c:748
 msgid "The returned results will be a comma-separated list of instances on "
 msgstr ""
 
-#: plugins/check_nt.c:734
+#: plugins/check_nt.c:749
 msgid " the selected computer for that object."
 msgstr ""
 
-#: plugins/check_nt.c:735
+#: plugins/check_nt.c:750
 msgid ""
 "The purpose of this is to be run from command line to determine what "
 "instances"
 msgstr ""
 
-#: plugins/check_nt.c:736
+#: plugins/check_nt.c:751
 msgid ""
 " are available for monitoring without having to log onto the Windows server"
 msgstr ""
 
-#: plugins/check_nt.c:737
+#: plugins/check_nt.c:752
 msgid "  to run Perfmon directly."
 msgstr ""
 
-#: plugins/check_nt.c:738
-msgid "It can also be used in scripts that automatically create Nagios service"
+#: plugins/check_nt.c:753
+msgid ""
+"It can also be used in scripts that automatically create the monitoring "
+"service"
 msgstr ""
 
-#: plugins/check_nt.c:739
+#: plugins/check_nt.c:754
 msgid " configuration files."
 msgstr ""
 
-#: plugins/check_nt.c:741
+#: plugins/check_nt.c:756
 msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"
 msgstr ""
 
-#: plugins/check_nt.c:744
+#: plugins/check_nt.c:759
 msgid ""
 "- The NSClient service should be running on the server to get any information"
 msgstr ""
 
-#: plugins/check_nt.c:746
+#: plugins/check_nt.c:761
 msgid "- Critical thresholds should be lower than warning thresholds"
 msgstr ""
 
-#: plugins/check_nt.c:747
+#: plugins/check_nt.c:762
 msgid "- Default port 1248 is sometimes in use by other services. The error"
 msgstr ""
 
-#: plugins/check_nt.c:748
+#: plugins/check_nt.c:763
 msgid ""
 "output when this happens contains \"Cannot map xxxxx to protocol number\"."
 msgstr ""
 
-#: plugins/check_nt.c:749
+#: plugins/check_nt.c:764
 msgid "One fix for this is to change the port to something else on check_nt "
 msgstr ""
 
-#: plugins/check_nt.c:750
+#: plugins/check_nt.c:765
 msgid "and on the client service it's connecting to."
 msgstr ""
 
-#: plugins/check_ntp.c:803 plugins/check_ntp_peer.c:606
-#: plugins/check_ntp_time.c:567
-#, c-format
+#: plugins/check_ntp.c:807 plugins/check_ntp_peer.c:612
+#: plugins/check_ntp_time.c:571
 msgid "NTP CRITICAL:"
 msgstr "NTP CRITICAL:"
 
-#: plugins/check_ntp.c:806 plugins/check_ntp_peer.c:609
-#: plugins/check_ntp_time.c:570
-#, c-format
+#: plugins/check_ntp.c:810 plugins/check_ntp_peer.c:615
+#: plugins/check_ntp_time.c:574
 msgid "NTP WARNING:"
 msgstr "NTP WARNING:"
 
-#: plugins/check_ntp.c:809 plugins/check_ntp_peer.c:612
-#: plugins/check_ntp_time.c:573
-#, c-format
+#: plugins/check_ntp.c:813 plugins/check_ntp_peer.c:618
+#: plugins/check_ntp_time.c:577
 msgid "NTP OK:"
 msgstr "NTP OK:"
 
-#: plugins/check_ntp.c:812 plugins/check_ntp_peer.c:615
-#: plugins/check_ntp_time.c:576
-#, c-format
+#: plugins/check_ntp.c:816 plugins/check_ntp_peer.c:621
+#: plugins/check_ntp_time.c:580
 msgid "NTP UNKNOWN:"
 msgstr "NTP UNKNOWN:"
 
-#: plugins/check_ntp.c:816 plugins/check_ntp_peer.c:624
-#: plugins/check_ntp_time.c:580
+#: plugins/check_ntp.c:820 plugins/check_ntp_peer.c:630
+#: plugins/check_ntp_time.c:584
 msgid "Offset unknown"
 msgstr ""
 
-#: plugins/check_ntp.c:819 plugins/check_ntp_peer.c:627
-#: plugins/check_ntp_time.c:583
+#: plugins/check_ntp.c:823 plugins/check_ntp_peer.c:633
+#: plugins/check_ntp_time.c:587
 msgid "Offset"
 msgstr ""
 
-#: plugins/check_ntp.c:840 plugins/check_ntp_peer.c:656
+#: plugins/check_ntp.c:844 plugins/check_ntp_peer.c:662
 #, fuzzy
 msgid "This plugin checks the selected ntp server"
 msgstr ""
 "Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
 "\n"
 
-#: plugins/check_ntp.c:849 plugins/check_ntp_peer.c:667
-#: plugins/check_ntp_time.c:609
+#: plugins/check_ntp.c:854 plugins/check_ntp_peer.c:674
+#: plugins/check_ntp_time.c:614
 msgid "Offset to result in warning status (seconds)"
 msgstr ""
 
-#: plugins/check_ntp.c:851 plugins/check_ntp_peer.c:669
-#: plugins/check_ntp_time.c:611
+#: plugins/check_ntp.c:856 plugins/check_ntp_peer.c:676
+#: plugins/check_ntp_time.c:616
 msgid "Offset to result in critical status (seconds)"
 msgstr ""
 
-#: plugins/check_ntp.c:853 plugins/check_ntp_peer.c:675
+#: plugins/check_ntp.c:858 plugins/check_ntp_peer.c:682
 #, fuzzy
 msgid "Warning threshold for jitter"
 msgstr "Warning threshold  Integer sein"
 
-#: plugins/check_ntp.c:855 plugins/check_ntp_peer.c:677
+#: plugins/check_ntp.c:860 plugins/check_ntp_peer.c:684
 #, fuzzy
 msgid "Critical threshold for jitter"
 msgstr "Critical threshold muss ein Integer sein"
 
-#: plugins/check_ntp.c:865
+#: plugins/check_ntp.c:870
 msgid "Normal offset check:"
 msgstr ""
 
-#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:702
+#: plugins/check_ntp.c:873 plugins/check_ntp_peer.c:709
 msgid ""
 "Check jitter too, avoiding critical notifications if jitter isn't available"
 msgstr ""
 
-#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:703
+#: plugins/check_ntp.c:874 plugins/check_ntp_peer.c:710
 msgid "(See Notes above for more details on thresholds formats):"
 msgstr ""
 
-#: plugins/check_ntp.c:874 plugins/check_ntp.c:881
+#: plugins/check_ntp.c:879 plugins/check_ntp.c:886
 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or"
 msgstr ""
 
-#: plugins/check_ntp.c:875 plugins/check_ntp.c:882
+#: plugins/check_ntp.c:880 plugins/check_ntp.c:887
 msgid "check_ntp_time instead."
 msgstr ""
 
-#: plugins/check_ntp_peer.c:619
+#: plugins/check_ntp_peer.c:625
 msgid "Server not synchronized"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:621
+#: plugins/check_ntp_peer.c:627
 msgid "Server has the LI_ALARM bit set"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:665
+#: plugins/check_ntp_peer.c:672
 msgid ""
 "Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:671
+#: plugins/check_ntp_peer.c:678
 #, fuzzy
-msgid "Warning threshold for stratum"
+msgid "Warning threshold for stratum of server's synchronization peer"
 msgstr "Warning threshold  Integer sein"
 
-#: plugins/check_ntp_peer.c:673
+#: plugins/check_ntp_peer.c:680
 #, fuzzy
-msgid "Critical threshold for stratum"
+msgid "Critical threshold for stratum of server's synchronization peer"
 msgstr "Critical threshold muss ein Integer sein"
 
-#: plugins/check_ntp_peer.c:679
+#: plugins/check_ntp_peer.c:686
 #, fuzzy
 msgid "Warning threshold for number of usable time sources (\"truechimers\")"
 msgstr "Warning threshold muss ein positiver Integer sein\n"
 
-#: plugins/check_ntp_peer.c:681
+#: plugins/check_ntp_peer.c:688
 #, fuzzy
 msgid "Critical threshold for number of usable time sources (\"truechimers\")"
 msgstr "Critical threshold muss ein positiver Integer sein\n"
 
-#: plugins/check_ntp_peer.c:686
+#: plugins/check_ntp_peer.c:693
 msgid "This plugin checks an NTP server independent of any commandline"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:687
+#: plugins/check_ntp_peer.c:694
 msgid "programs or external libraries."
 msgstr ""
 
-#: plugins/check_ntp_peer.c:690
+#: plugins/check_ntp_peer.c:697
 #, fuzzy
 msgid "Use this plugin to check the health of an NTP server. It supports"
 msgstr ""
 "Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
 "\n"
 
-#: plugins/check_ntp_peer.c:691
+#: plugins/check_ntp_peer.c:698
 msgid "checking the offset with the sync peer, the jitter and stratum. This"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:692
+#: plugins/check_ntp_peer.c:699
 msgid "plugin will not check the clock offset between the local host and NTP"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:693
+#: plugins/check_ntp_peer.c:700
 msgid "server; please use check_ntp_time for that purpose."
 msgstr ""
 
-#: plugins/check_ntp_peer.c:699
+#: plugins/check_ntp_peer.c:706
 msgid "Simple NTP server check:"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:706
+#: plugins/check_ntp_peer.c:713
 msgid "Only check the number of usable time sources (\"truechimers\"):"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:709
+#: plugins/check_ntp_peer.c:716
 msgid "Check only stratum:"
 msgstr ""
 
-#: plugins/check_ntp_time.c:598
+#: plugins/check_ntp_time.c:602
 #, fuzzy
 msgid "This plugin checks the clock offset with the ntp server"
 msgstr ""
 "Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
 "\n"
 
-#: plugins/check_ntp_time.c:607
+#: plugins/check_ntp_time.c:612
 msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found"
 msgstr ""
 
-#: plugins/check_ntp_time.c:616
+#: plugins/check_ntp_time.c:621
 #, fuzzy
 msgid "This plugin checks the clock offset between the local host and a"
 msgstr ""
@@ -2687,19 +2873,19 @@ msgstr ""
 "unterschritten wird.\n"
 "\n"
 
-#: plugins/check_ntp_time.c:617
+#: plugins/check_ntp_time.c:622
 msgid "remote NTP server. It is independent of any commandline programs or"
 msgstr ""
 
-#: plugins/check_ntp_time.c:618
+#: plugins/check_ntp_time.c:623
 msgid "external libraries."
 msgstr ""
 
-#: plugins/check_ntp_time.c:622
+#: plugins/check_ntp_time.c:627
 msgid "If you'd rather want to monitor an NTP server, please use"
 msgstr ""
 
-#: plugins/check_ntp_time.c:623
+#: plugins/check_ntp_time.c:628
 msgid "check_ntp_peer."
 msgstr ""
 
@@ -2798,17 +2984,15 @@ msgid "disabled"
 msgstr ""
 
 #: plugins/check_nwstat.c:560
-#, fuzzy, c-format
+#, fuzzy
 msgid "CRITICAL - NRM Status is bad!"
 msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
 
 #: plugins/check_nwstat.c:565
-#, c-format
 msgid "Warning - NRM Status is suspect!"
 msgstr ""
 
 #: plugins/check_nwstat.c:568
-#, c-format
 msgid "OK - NRM Status is good!"
 msgstr ""
 
@@ -2868,12 +3052,10 @@ msgid "%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu"
 msgstr ""
 
 #: plugins/check_nwstat.c:904
-#, c-format
 msgid "CRITICAL - Time not in sync with network!"
 msgstr ""
 
 #: plugins/check_nwstat.c:907
-#, c-format
 msgid "OK - Time in sync with network!"
 msgstr ""
 
@@ -3275,112 +3457,219 @@ msgid ""
 "higher than the warning threshold value, EXCEPT with the uptime variable"
 msgstr ""
 
-#: plugins/check_pgsql.c:183
+#: plugins/check_pgsql.c:222
 #, c-format
 msgid "CRITICAL - no connection to '%s' (%s).\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:200
+#: plugins/check_pgsql.c:250
 #, c-format
-msgid " %s - database %s (%d sec.)|%s\n"
+msgid " %s - database %s (%f sec.)|%s\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:256 plugins/check_time.c:277 plugins/check_time.c:289
-#: plugins/check_users.c:166
+#: plugins/check_pgsql.c:317 plugins/check_time.c:277 plugins/check_time.c:289
+#: plugins/check_users.c:181
 msgid "Critical threshold must be a positive integer"
 msgstr "Critical threshold muss ein positiver Integer sein"
 
-#: plugins/check_pgsql.c:262 plugins/check_time.c:258 plugins/check_time.c:282
-#: plugins/check_users.c:172 plugins/check_users.c:182
-#: plugins/check_users.c:189
+#: plugins/check_pgsql.c:323 plugins/check_time.c:258 plugins/check_time.c:282
+#: plugins/check_users.c:187 plugins/check_users.c:197
+#: plugins/check_users.c:203
 msgid "Warning threshold must be a positive integer"
 msgstr "Warning threshold muss ein positiver Integer sein"
 
-#: plugins/check_pgsql.c:280
+#: plugins/check_pgsql.c:347
 msgid "Database name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:286
+#: plugins/check_pgsql.c:353
 msgid "User name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:426
+#: plugins/check_pgsql.c:504
 #, c-format
 msgid "Test whether a PostgreSQL Database is accepting connections."
 msgstr ""
 
-#: plugins/check_pgsql.c:440
+#: plugins/check_pgsql.c:516
 msgid "Database to check "
 msgstr ""
 
-#: plugins/check_pgsql.c:441
+#: plugins/check_pgsql.c:517
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: plugins/check_pgsql.c:443
+#: plugins/check_pgsql.c:519
 msgid "Login name of user"
 msgstr ""
 
-#: plugins/check_pgsql.c:445
+#: plugins/check_pgsql.c:521
 msgid "Password (BIG SECURITY ISSUE)"
 msgstr ""
 
-#: plugins/check_pgsql.c:454
+#: plugins/check_pgsql.c:523
+msgid "Connection parameters (keyword = value), see below"
+msgstr ""
+
+#: plugins/check_pgsql.c:530
+msgid "SQL query to run. Only first column in first row will be read"
+msgstr ""
+
+#: plugins/check_pgsql.c:532
+msgid "SQL query value to result in warning status (double)"
+msgstr ""
+
+#: plugins/check_pgsql.c:534
+msgid "SQL query value to result in critical status (double)"
+msgstr ""
+
+#: plugins/check_pgsql.c:539
 msgid "All parameters are optional."
 msgstr ""
 
-#: plugins/check_pgsql.c:455
+#: plugins/check_pgsql.c:540
 msgid ""
 "This plugin tests a PostgreSQL DBMS to determine whether it is active and"
 msgstr ""
 
-#: plugins/check_pgsql.c:456
+#: plugins/check_pgsql.c:541
 msgid "accepting queries. In its current operation, it simply connects to the"
 msgstr ""
 
-#: plugins/check_pgsql.c:457
+#: plugins/check_pgsql.c:542
 msgid ""
 "specified database, and then disconnects. If no database is specified, it"
 msgstr ""
 
-#: plugins/check_pgsql.c:458
+#: plugins/check_pgsql.c:543
 msgid ""
 "connects to the template1 database, which is present in every functioning"
 msgstr ""
 
-#: plugins/check_pgsql.c:459
+#: plugins/check_pgsql.c:544
 msgid "PostgreSQL DBMS."
 msgstr ""
 
-#: plugins/check_pgsql.c:461
+#: plugins/check_pgsql.c:546
+msgid "If a query is specified using the -q option, it will be executed after"
+msgstr ""
+
+#: plugins/check_pgsql.c:547
+msgid "connecting to the server. The result from the query has to be numeric."
+msgstr ""
+
+#: plugins/check_pgsql.c:548
+msgid ""
+"Multiple SQL commands, separated by semicolon, are allowed but the result "
+msgstr ""
+
+#: plugins/check_pgsql.c:549
+msgid "of the last command is taken into account only. The value of the first"
+msgstr ""
+
+#: plugins/check_pgsql.c:550
+msgid "column in the first row is used as the check result."
+msgstr ""
+
+#: plugins/check_pgsql.c:552
+msgid ""
+"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"
+msgstr ""
+
+#: plugins/check_pgsql.c:553
+msgid ""
+"for details about how to access internal statistics of the database server."
+msgstr ""
+
+#: plugins/check_pgsql.c:555
+msgid ""
+"For a list of available connection parameters which may be used with the -o"
+msgstr ""
+
+#: plugins/check_pgsql.c:556
+msgid ""
+"command line option, see the documentation for PQconnectdb() in the chapter"
+msgstr ""
+
+#: plugins/check_pgsql.c:557
+msgid ""
+"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"
+msgstr ""
+
+#: plugins/check_pgsql.c:558
+msgid ""
+"used to specify a service name in pg_service.conf to be used for additional"
+msgstr ""
+
+#: plugins/check_pgsql.c:559
+msgid "connection parameters: -o 'service=<name>' or to specify the SSL mode:"
+msgstr ""
+
+#: plugins/check_pgsql.c:560
+msgid "-o 'sslmode=require'."
+msgstr ""
+
+#: plugins/check_pgsql.c:562
 msgid ""
 "The plugin will connect to a local postmaster if no host is specified. To"
 msgstr ""
 
-#: plugins/check_pgsql.c:462
+#: plugins/check_pgsql.c:563
 msgid ""
 "connect to a remote host, be sure that the remote postmaster accepts TCP/IP"
 msgstr ""
 
-#: plugins/check_pgsql.c:463
+#: plugins/check_pgsql.c:564
 msgid "connections (start the postmaster with the -i option)."
 msgstr ""
 
-#: plugins/check_pgsql.c:465
+#: plugins/check_pgsql.c:566
 msgid ""
-"Typically, the nagios user (unless the --logname option is used) should be"
+"Typically, the monitoring user (unless the --logname option is used) should "
+"be"
 msgstr ""
 
-#: plugins/check_pgsql.c:466
+#: plugins/check_pgsql.c:567
 msgid ""
 "able to connect to the database without a password. The plugin can also send"
 msgstr ""
 
-#: plugins/check_pgsql.c:467
+#: plugins/check_pgsql.c:568
 msgid "a password, but no effort is made to obsure or encrypt the password."
 msgstr ""
 
+#: plugins/check_pgsql.c:601
+#, c-format
+msgid "QUERY %s - %s: %s.\n"
+msgstr ""
+
+#: plugins/check_pgsql.c:601
+msgid "Error with query"
+msgstr ""
+
+#: plugins/check_pgsql.c:607
+msgid "No rows returned"
+msgstr ""
+
+#: plugins/check_pgsql.c:612
+msgid "No columns returned"
+msgstr ""
+
+#: plugins/check_pgsql.c:618
+#, fuzzy
+msgid "No data returned"
+msgstr "Keine Daten empfangen %s\n"
+
+#: plugins/check_pgsql.c:627
+msgid "Is not a numeric"
+msgstr ""
+
+#: plugins/check_pgsql.c:644
+#, fuzzy, c-format
+msgid "'%s' returned %f"
+msgstr "%s hat %s zurückgegeben"
+
 #: plugins/check_ping.c:141
 msgid "CRITICAL - Could not interpret output from ping command\n"
 msgstr ""
@@ -3461,314 +3750,307 @@ msgstr ""
 msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
 msgstr ""
 
-#: plugins/check_ping.c:441
+#: plugins/check_ping.c:442
 #, c-format
 msgid "Cannot open stderr for %s\n"
 msgstr ""
 
-#: plugins/check_ping.c:490 plugins/check_ping.c:492
+#: plugins/check_ping.c:492 plugins/check_ping.c:494
 msgid "System call sent warnings to stderr "
 msgstr ""
 
 #: plugins/check_ping.c:519
 #, fuzzy, c-format
-msgid "CRITICAL - Network Unreachable (%s)"
+msgid "CRITICAL - Network Unreachable (%s)\n"
 msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
 
 #: plugins/check_ping.c:521
-#, c-format
-msgid "CRITICAL - Host Unreachable (%s)"
-msgstr ""
+#, fuzzy, c-format
+msgid "CRITICAL - Host Unreachable (%s)\n"
+msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
 
 #: plugins/check_ping.c:523
 #, fuzzy, c-format
-msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)"
+msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"
 msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
 
 #: plugins/check_ping.c:525
 #, fuzzy, c-format
-msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"
+msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"
 msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
 
 #: plugins/check_ping.c:527
 #, fuzzy, c-format
-msgid "CRITICAL - Network Prohibited (%s)"
+msgid "CRITICAL - Network Prohibited (%s)\n"
 msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
 
 #: plugins/check_ping.c:529
 #, fuzzy, c-format
-msgid "CRITICAL - Host Prohibited (%s)"
+msgid "CRITICAL - Host Prohibited (%s)\n"
 msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
 
 #: plugins/check_ping.c:531
 #, fuzzy, c-format
-msgid "CRITICAL - Packet Filtered (%s)"
+msgid "CRITICAL - Packet Filtered (%s)\n"
 msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
 
 #: plugins/check_ping.c:533
-#, c-format
-msgid "CRITICAL - Host not found (%s)"
-msgstr ""
+#, fuzzy, c-format
+msgid "CRITICAL - Host not found (%s)\n"
+msgstr "CRITICAL - Text nicht gefunden%s|%s %s\n"
 
 #: plugins/check_ping.c:535
-#, c-format
-msgid "CRITICAL - Time to live exceeded (%s)"
-msgstr ""
+#, fuzzy, c-format
+msgid "CRITICAL - Time to live exceeded (%s)\n"
+msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
+
+#: plugins/check_ping.c:537
+#, fuzzy, c-format
+msgid "CRITICAL - Destination Unreachable (%s)\n"
+msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
 
-#: plugins/check_ping.c:542
-msgid "Unable to realloc warn_text"
+#: plugins/check_ping.c:544
+msgid "Unable to realloc warn_text\n"
 msgstr ""
 
-#: plugins/check_ping.c:559
+#: plugins/check_ping.c:561
 #, c-format
 msgid "Use ping to check connection statistics for a remote host."
 msgstr ""
 
-#: plugins/check_ping.c:571
+#: plugins/check_ping.c:573
 msgid "host to ping"
 msgstr ""
 
-#: plugins/check_ping.c:577
+#: plugins/check_ping.c:579
 msgid "number of ICMP ECHO packets to send"
 msgstr ""
 
-#: plugins/check_ping.c:578
+#: plugins/check_ping.c:580
 #, c-format
 msgid "(Default: %d)\n"
 msgstr ""
 
-#: plugins/check_ping.c:580
+#: plugins/check_ping.c:582
 msgid "show HTML in the plugin output (obsoleted by urlize)"
 msgstr ""
 
-#: plugins/check_ping.c:585
+#: plugins/check_ping.c:587
 msgid "THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"
 msgstr ""
 
-#: plugins/check_ping.c:586
+#: plugins/check_ping.c:588
 msgid "time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"
 msgstr ""
 
-#: plugins/check_ping.c:587
+#: plugins/check_ping.c:589
 msgid "percentage of packet loss to trigger an alarm state."
 msgstr ""
 
-#: plugins/check_ping.c:590
+#: plugins/check_ping.c:592
 #, fuzzy
 msgid ""
 "This plugin uses the ping command to probe the specified host for packet loss"
 msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
 
-#: plugins/check_ping.c:591
+#: plugins/check_ping.c:593
 msgid ""
 "(percentage) and round trip average (milliseconds). It can produce HTML "
 "output"
 msgstr ""
 
-#: plugins/check_ping.c:592
+#: plugins/check_ping.c:594
 msgid ""
 "linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"
 msgstr ""
 
-#: plugins/check_ping.c:593
+#: plugins/check_ping.c:595
 msgid "the contrib area of the downloads section at http://www.nagios.org/"
 msgstr ""
 
-#: plugins/check_procs.c:159
+#: plugins/check_procs.c:193
 #, c-format
 msgid "CMD: %s\n"
 msgstr ""
 
-#: plugins/check_procs.c:164
+#: plugins/check_procs.c:198
 msgid "System call sent warnings to stderr"
 msgstr ""
 
-#: plugins/check_procs.c:265
+#: plugins/check_procs.c:326
 #, c-format
 msgid "Not parseable: %s"
 msgstr ""
 
-#: plugins/check_procs.c:270
+#: plugins/check_procs.c:331
 #, c-format
 msgid "Unable to read output\n"
 msgstr ""
 
-#: plugins/check_procs.c:287
+#: plugins/check_procs.c:348
 #, c-format
 msgid "%d warn out of "
 msgstr ""
 
-#: plugins/check_procs.c:292
+#: plugins/check_procs.c:353
 #, c-format
 msgid "%d crit, %d warn out of "
 msgstr ""
 
-#: plugins/check_procs.c:298
+#: plugins/check_procs.c:359
 #, c-format
 msgid " with %s"
 msgstr ""
 
-#: plugins/check_procs.c:378
-#, fuzzy
-msgid "Critical Process Count must be an integer!"
-msgstr "Critical threshold muss ein Integer sein"
-
-#: plugins/check_procs.c:390
-#, fuzzy
-msgid "Warning Process Count must be an integer!"
-msgstr "Warning threshold  Integer sein"
-
-#: plugins/check_procs.c:398
+#: plugins/check_procs.c:453
 #, fuzzy
 msgid "Parent Process ID must be an integer!"
 msgstr "Argument für check_dummy muss ein Integer sein"
 
-#: plugins/check_procs.c:404 plugins/check_procs.c:518
+#: plugins/check_procs.c:459 plugins/check_procs.c:586
 #, c-format
 msgid "%s%sSTATE = %s"
 msgstr ""
 
-#: plugins/check_procs.c:413
+#: plugins/check_procs.c:468
 #, fuzzy
 msgid "UID was not found"
 msgstr "%s [%s nicht gefunden]"
 
-#: plugins/check_procs.c:419
+#: plugins/check_procs.c:474
 #, fuzzy
 msgid "User name was not found"
 msgstr "%s [%s nicht gefunden]"
 
-#: plugins/check_procs.c:434
+#: plugins/check_procs.c:489
 #, c-format
 msgid "%s%scommand name '%s'"
 msgstr ""
 
-#: plugins/check_procs.c:462
+#: plugins/check_procs.c:524
 #, fuzzy
 msgid "RSS must be an integer!"
 msgstr "skip lines muss ein Integer sein"
 
-#: plugins/check_procs.c:469
+#: plugins/check_procs.c:531
 #, fuzzy
 msgid "VSZ must be an integer!"
 msgstr "skip lines muss ein Integer sein"
 
-#: plugins/check_procs.c:477
+#: plugins/check_procs.c:539
 msgid "PCPU must be a float!"
 msgstr ""
 
-#: plugins/check_procs.c:501
+#: plugins/check_procs.c:563
 msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
 msgstr ""
 
-#: plugins/check_procs.c:537
-#, c-format
-msgid "wmax (%d) cannot be greater than cmax (%d)\n"
-msgstr ""
-
-#: plugins/check_procs.c:541
-#, c-format
-msgid "wmin (%d) cannot be less than cmin (%d)\n"
-msgstr ""
-
-#: plugins/check_procs.c:678
+#: plugins/check_procs.c:694
 msgid ""
 "Checks all processes and generates WARNING or CRITICAL states if the "
 "specified"
 msgstr ""
 
-#: plugins/check_procs.c:679
+#: plugins/check_procs.c:695
 msgid ""
 "metric is outside the required threshold ranges. The metric defaults to "
 "number"
 msgstr ""
 
-#: plugins/check_procs.c:680
+#: plugins/check_procs.c:696
 msgid ""
 "of processes.  Search filters can be applied to limit the processes to check."
 msgstr ""
 
-#: plugins/check_procs.c:689
+#: plugins/check_procs.c:705
 msgid "Generate warning state if metric is outside this range"
 msgstr ""
 
-#: plugins/check_procs.c:691
+#: plugins/check_procs.c:707
 msgid "Generate critical state if metric is outside this range"
 msgstr ""
 
-#: plugins/check_procs.c:693
+#: plugins/check_procs.c:709
 msgid "Check thresholds against metric. Valid types:"
 msgstr ""
 
-#: plugins/check_procs.c:694
+#: plugins/check_procs.c:710
 msgid "PROCS   - number of processes (default)"
 msgstr ""
 
-#: plugins/check_procs.c:695
+#: plugins/check_procs.c:711
 msgid "VSZ     - virtual memory size"
 msgstr ""
 
-#: plugins/check_procs.c:696
+#: plugins/check_procs.c:712
 msgid "RSS     - resident set memory size"
 msgstr ""
 
-#: plugins/check_procs.c:697
+#: plugins/check_procs.c:713
 msgid "CPU     - percentage CPU"
 msgstr ""
 
-#: plugins/check_procs.c:700
+#: plugins/check_procs.c:716
 msgid "ELAPSED - time elapsed in seconds"
 msgstr ""
 
-#: plugins/check_procs.c:705
+#: plugins/check_procs.c:721
 msgid "Extra information. Up to 3 verbosity levels"
 msgstr ""
 
-#: plugins/check_procs.c:710
+#: plugins/check_procs.c:724
+msgid "Filter own process the traditional way by PID instead of /proc/pid/exe"
+msgstr ""
+
+#: plugins/check_procs.c:729
 msgid "Only scan for processes that have, in the output of `ps`, one or"
 msgstr ""
 
-#: plugins/check_procs.c:711
+#: plugins/check_procs.c:730
 msgid "more of the status flags you specify (for example R, Z, S, RS,"
 msgstr ""
 
-#: plugins/check_procs.c:712
+#: plugins/check_procs.c:731
 msgid "RSZDT, plus others based on the output of your 'ps' command)."
 msgstr ""
 
-#: plugins/check_procs.c:714
+#: plugins/check_procs.c:733
 msgid "Only scan for children of the parent process ID indicated."
 msgstr ""
 
-#: plugins/check_procs.c:716
+#: plugins/check_procs.c:735
 msgid "Only scan for processes with VSZ higher than indicated."
 msgstr ""
 
-#: plugins/check_procs.c:718
+#: plugins/check_procs.c:737
 msgid "Only scan for processes with RSS higher than indicated."
 msgstr ""
 
-#: plugins/check_procs.c:720
+#: plugins/check_procs.c:739
 msgid "Only scan for processes with PCPU higher than indicated."
 msgstr ""
 
-#: plugins/check_procs.c:722
+#: plugins/check_procs.c:741
 msgid "Only scan for processes with user name or ID indicated."
 msgstr ""
 
-#: plugins/check_procs.c:724
+#: plugins/check_procs.c:743
 msgid "Only scan for processes with args that contain STRING."
 msgstr ""
 
-#: plugins/check_procs.c:726
+#: plugins/check_procs.c:745
 msgid "Only scan for processes with args that contain the regex STRING."
 msgstr ""
 
-#: plugins/check_procs.c:728
+#: plugins/check_procs.c:747
 msgid "Only scan for exact matches of COMMAND (without path)."
 msgstr ""
 
-#: plugins/check_procs.c:730
+#: plugins/check_procs.c:749
+msgid "Only scan for non kernel threads (works on Linux only)."
+msgstr ""
+
+#: plugins/check_procs.c:751
 #, c-format
 msgid ""
 "\n"
@@ -3778,7 +4060,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:735
+#: plugins/check_procs.c:756
 #, c-format
 msgid ""
 "This plugin checks the number of currently running processes and\n"
@@ -3789,27 +4071,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:744
+#: plugins/check_procs.c:765
 msgid "Warning if not two processes with command name portsentry."
 msgstr ""
 
-#: plugins/check_procs.c:745
+#: plugins/check_procs.c:766
 msgid "Critical if < 2 or > 1024 processes"
 msgstr ""
 
-#: plugins/check_procs.c:747
+#: plugins/check_procs.c:768
 msgid "Warning alert if > 10 processes with command arguments containing"
 msgstr ""
 
-#: plugins/check_procs.c:748
+#: plugins/check_procs.c:769
 msgid "'/usr/local/bin/perl' and owned by root"
 msgstr ""
 
-#: plugins/check_procs.c:750
+#: plugins/check_procs.c:771
 msgid "Alert if VSZ of any processes over 50K or 100K"
 msgstr ""
 
-#: plugins/check_procs.c:752
+#: plugins/check_procs.c:773
 #, c-format
 msgid "Alert if CPU of any processes over 10%% or 20%%"
 msgstr ""
@@ -3941,7 +4223,7 @@ msgid ""
 msgstr ""
 
 #: plugins/check_radius.c:373
-msgid "in a process listing. This risk is exacerbated because nagios will"
+msgid "in a process listing. This risk is exacerbated because the monitor will"
 msgstr ""
 
 #: plugins/check_radius.c:374
@@ -3972,7 +4254,7 @@ msgstr "Ungültige HTTP Antwort von Host empfangen\n"
 msgid "Invalid REAL response received from host on port %d\n"
 msgstr ""
 
-#: plugins/check_real.c:184 plugins/check_tcp.c:292
+#: plugins/check_real.c:184 plugins/check_tcp.c:311
 #, c-format
 msgid "No data received from host\n"
 msgstr ""
@@ -3982,11 +4264,11 @@ msgstr ""
 msgid "REAL %s - %d second response time\n"
 msgstr ""
 
-#: plugins/check_real.c:336 plugins/check_smtp.c:576 plugins/check_ups.c:536
+#: plugins/check_real.c:336 plugins/check_ups.c:536
 msgid "Warning time must be a positive integer"
 msgstr "Warnung time muss ein positiver Integer sein"
 
-#: plugins/check_real.c:345 plugins/check_smtp.c:567 plugins/check_ups.c:527
+#: plugins/check_real.c:345 plugins/check_ups.c:527
 msgid "Critical time must be a positive integer"
 msgstr "Critical time muss ein positiver Integer sein"
 
@@ -4016,7 +4298,7 @@ msgstr ""
 msgid "This plugin will attempt to open an RTSP connection with the host."
 msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
 
-#: plugins/check_real.c:438 plugins/check_smtp.c:808
+#: plugins/check_real.c:438 plugins/check_smtp.c:830
 msgid "Successul connects return STATE_OK, refusals and timeouts return"
 msgstr ""
 
@@ -4034,511 +4316,524 @@ msgstr ""
 msgid "values."
 msgstr ""
 
-#: plugins/check_smtp.c:146 plugins/check_swap.c:265 plugins/check_swap.c:271
+#: plugins/check_smtp.c:150 plugins/check_swap.c:265 plugins/check_swap.c:271
 #, c-format
 msgid "malloc() failed!\n"
 msgstr ""
 
-#: plugins/check_smtp.c:150
+#: plugins/check_smtp.c:154
 #, c-format
 msgid "gethostname() failed!\n"
 msgstr ""
 
-#: plugins/check_smtp.c:185 plugins/check_smtp.c:209
+#: plugins/check_smtp.c:189 plugins/check_smtp.c:213
 #, c-format
 msgid "recv() failed\n"
 msgstr ""
 
-#: plugins/check_smtp.c:196
+#: plugins/check_smtp.c:200
 #, fuzzy, c-format
 msgid "Invalid SMTP response received from host: %s\n"
 msgstr "Ungültige HTTP Antwort von Host empfangen\n"
 
-#: plugins/check_smtp.c:198
+#: plugins/check_smtp.c:202
 #, fuzzy, c-format
 msgid "Invalid SMTP response received from host on port %d: %s\n"
 msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n"
 
-#: plugins/check_smtp.c:219
+#: plugins/check_smtp.c:223
 #, c-format
 msgid "WARNING - TLS not supported by server\n"
 msgstr ""
 
-#: plugins/check_smtp.c:231
+#: plugins/check_smtp.c:235
 #, c-format
 msgid "Server does not support STARTTLS\n"
 msgstr ""
 
-#: plugins/check_smtp.c:237
+#: plugins/check_smtp.c:241
 #, c-format
 msgid "CRITICAL - Cannot create SSL context.\n"
 msgstr ""
 
-#: plugins/check_smtp.c:257
+#: plugins/check_smtp.c:261
 msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS."
 msgstr ""
 
-#: plugins/check_smtp.c:262
+#: plugins/check_smtp.c:266
 #, c-format
 msgid "sent %s"
 msgstr ""
 
-#: plugins/check_smtp.c:264
+#: plugins/check_smtp.c:268
 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
 msgstr ""
 
-#: plugins/check_smtp.c:276
-#, fuzzy
-msgid "CRITICAL - Cannot retrieve server certificate."
-msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
-
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:722
+#: plugins/check_smtp.c:303 plugins/check_snmp.c:806
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr ""
 
-#: plugins/check_smtp.c:320
+#: plugins/check_smtp.c:312
 #, c-format
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr ""
 
-#: plugins/check_smtp.c:324 plugins/check_snmp.c:453
+#: plugins/check_smtp.c:316 plugins/check_snmp.c:511
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:338
-#, c-format
+#: plugins/check_smtp.c:330
 msgid "no authuser specified, "
 msgstr ""
 
-#: plugins/check_smtp.c:343
-#, c-format
+#: plugins/check_smtp.c:335
 msgid "no authpass specified, "
 msgstr ""
 
-#: plugins/check_smtp.c:350 plugins/check_smtp.c:372 plugins/check_smtp.c:393
-#: plugins/check_smtp.c:668
+#: plugins/check_smtp.c:342 plugins/check_smtp.c:363 plugins/check_smtp.c:383
+#: plugins/check_smtp.c:688
 #, c-format
 msgid "sent %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:353
-#, fuzzy, c-format
+#: plugins/check_smtp.c:345
+#, fuzzy
 msgid "recv() failed after AUTH LOGIN, "
 msgstr "Ungültige HTTP Antwort von Host empfangen\n"
 
-#: plugins/check_smtp.c:358 plugins/check_smtp.c:380 plugins/check_smtp.c:401
-#: plugins/check_smtp.c:679
+#: plugins/check_smtp.c:350 plugins/check_smtp.c:371 plugins/check_smtp.c:391
+#: plugins/check_smtp.c:699
 #, fuzzy, c-format
 msgid "received %s\n"
 msgstr "Keine Daten empfangen %s\n"
 
-#: plugins/check_smtp.c:362
-#, fuzzy, c-format
+#: plugins/check_smtp.c:354
+#, fuzzy
 msgid "invalid response received after AUTH LOGIN, "
 msgstr "Ungültige HTTP Antwort von Host empfangen\n"
 
-#: plugins/check_smtp.c:376
-#, c-format
+#: plugins/check_smtp.c:367
 msgid "recv() failed after sending authuser, "
 msgstr ""
 
-#: plugins/check_smtp.c:384
-#, fuzzy, c-format
+#: plugins/check_smtp.c:375
+#, fuzzy
 msgid "invalid response received after authuser, "
 msgstr "Ungültige HTTP Antwort von Host empfangen\n"
 
-#: plugins/check_smtp.c:397
-#, c-format
+#: plugins/check_smtp.c:387
 msgid "recv() failed after sending authpass, "
 msgstr ""
 
-#: plugins/check_smtp.c:405
-#, fuzzy, c-format
+#: plugins/check_smtp.c:395
+#, fuzzy
 msgid "invalid response received after authpass, "
 msgstr "Ungültige HTTP Antwort von Host empfangen\n"
 
-#: plugins/check_smtp.c:412
-#, c-format
+#: plugins/check_smtp.c:402
 msgid "only authtype LOGIN is supported, "
 msgstr ""
 
-#: plugins/check_smtp.c:436
+#: plugins/check_smtp.c:426
 #, fuzzy, c-format
 msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n"
 msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n"
 
-#: plugins/check_smtp.c:543 plugins/check_smtp.c:555
+#: plugins/check_smtp.c:536 plugins/check_smtp.c:548
 #, c-format
 msgid "Could not realloc() units [%d]\n"
 msgstr ""
 
-#: plugins/check_smtp.c:603
+#: plugins/check_smtp.c:556
+#, fuzzy
+msgid "Critical time must be a positive"
+msgstr "Critical time muss ein positiver Integer sein"
+
+#: plugins/check_smtp.c:564
+#, fuzzy
+msgid "Warning time must be a positive"
+msgstr "Warnung time muss ein positiver Integer sein"
+
+#: plugins/check_smtp.c:611
 msgid "SSL support not available - install OpenSSL and recompile"
 msgstr ""
 
-#: plugins/check_smtp.c:674
+#: plugins/check_smtp.c:679 plugins/check_smtp.c:684
+#, c-format
+msgid "Connection closed by server before sending QUIT command\n"
+msgstr ""
+
+#: plugins/check_smtp.c:694
 #, fuzzy, c-format
 msgid "recv() failed after QUIT."
 msgstr "Ungültige HTTP Antwort von Host empfangen\n"
 
-#: plugins/check_smtp.c:676
+#: plugins/check_smtp.c:696
 #, c-format
 msgid "Connection reset by peer."
 msgstr ""
 
-#: plugins/check_smtp.c:764
+#: plugins/check_smtp.c:784
 #, fuzzy
 msgid "This plugin will attempt to open an SMTP connection with the host."
 msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
 
-#: plugins/check_smtp.c:778
+#: plugins/check_smtp.c:798
 #, c-format
 msgid "    String to expect in first line of server response (default: '%s')\n"
 msgstr ""
 
-#: plugins/check_smtp.c:780
+#: plugins/check_smtp.c:800
 msgid "SMTP command (may be used repeatedly)"
 msgstr ""
 
-#: plugins/check_smtp.c:782
+#: plugins/check_smtp.c:802
 msgid "Expected response to command (may be used repeatedly)"
 msgstr ""
 
-#: plugins/check_smtp.c:784
+#: plugins/check_smtp.c:804
 msgid "FROM-address to include in MAIL command, required by Exchange 2000"
 msgstr ""
 
-#: plugins/check_smtp.c:786
+#: plugins/check_smtp.c:806
 msgid "FQDN used for HELO"
 msgstr ""
 
-#: plugins/check_smtp.c:789 plugins/check_tcp.c:633
+#: plugins/check_smtp.c:809 plugins/check_tcp.c:665
 msgid "Minimum number of days a certificate has to be valid."
 msgstr ""
 
-#: plugins/check_smtp.c:791
+#: plugins/check_smtp.c:811
 msgid "Use STARTTLS for the connection."
 msgstr ""
 
-#: plugins/check_smtp.c:795
+#: plugins/check_smtp.c:815
 msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
 msgstr ""
 
-#: plugins/check_smtp.c:797
+#: plugins/check_smtp.c:817
 msgid "SMTP AUTH username"
 msgstr ""
 
-#: plugins/check_smtp.c:799
+#: plugins/check_smtp.c:819
 msgid "SMTP AUTH password"
 msgstr ""
 
-#: plugins/check_smtp.c:809
+#: plugins/check_smtp.c:821
+msgid "Ignore failure when sending QUIT command to server"
+msgstr ""
+
+#: plugins/check_smtp.c:831
 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful"
 msgstr ""
 
-#: plugins/check_smtp.c:810
+#: plugins/check_smtp.c:832
 msgid "connects, but incorrect reponse messages from the host result in"
 msgstr ""
 
-#: plugins/check_smtp.c:811
+#: plugins/check_smtp.c:833
 msgid "STATE_WARNING return values."
 msgstr ""
 
-#: plugins/check_snmp.c:299
+#: plugins/check_snmp.c:169 plugins/check_snmp.c:582
+msgid "Cannot malloc"
+msgstr ""
+
+#: plugins/check_snmp.c:356
 #, fuzzy, c-format
 msgid "External command error: %s\n"
 msgstr "Papierfehler"
 
-#: plugins/check_snmp.c:304
+#: plugins/check_snmp.c:361
 #, c-format
 msgid "External command error with no output (return code: %d)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:410
-msgid "No valid data returned"
-msgstr ""
+#: plugins/check_snmp.c:464
+#, fuzzy, c-format
+msgid "No valid data returned (%s)\n"
+msgstr "Keine Daten empfangen %s\n"
 
-#: plugins/check_snmp.c:417
+#: plugins/check_snmp.c:475
 msgid "Time duration between plugin calls is invalid"
 msgstr ""
 
-#: plugins/check_snmp.c:513
-msgid "Cannot malloc"
-msgstr ""
-
-#: plugins/check_snmp.c:519
+#: plugins/check_snmp.c:588
 msgid "Cannot asprintf()"
 msgstr ""
 
-#: plugins/check_snmp.c:525
+#: plugins/check_snmp.c:594
 msgid "Cannot realloc()"
 msgstr ""
 
-#: plugins/check_snmp.c:541
+#: plugins/check_snmp.c:610
 msgid "No previous data to calculate rate - assume okay"
 msgstr ""
 
-#: plugins/check_snmp.c:680
+#: plugins/check_snmp.c:751
 #, fuzzy
 msgid "Retries interval must be a positive integer"
 msgstr "Time interval muss ein positiver Integer sein"
 
-#: plugins/check_snmp.c:742
+#: plugins/check_snmp.c:831
 #, fuzzy, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr "Konnte addr nicht zuweisen\n"
 
-#: plugins/check_snmp.c:754
+#: plugins/check_snmp.c:844
 #, fuzzy
 msgid "Could not reallocate labels\n"
 msgstr "Konnte·url·nicht·zuweisen\n"
 
-#: plugins/check_snmp.c:771
+#: plugins/check_snmp.c:860
 #, fuzzy, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr "Konnte·url·nicht·zuweisen\n"
 
-#: plugins/check_snmp.c:783
+#: plugins/check_snmp.c:872
 msgid "Could not realloc() units\n"
 msgstr ""
 
-#: plugins/check_snmp.c:800
+#: plugins/check_snmp.c:889
 #, fuzzy
 msgid "Rate multiplier must be a positive integer"
 msgstr "Paketgröße muss ein positiver Integer sein"
 
-#: plugins/check_snmp.c:852
+#: plugins/check_snmp.c:947
 #, fuzzy
 msgid "No host specified\n"
 msgstr ""
 "Kein Hostname angegeben\n"
 "\n"
 
-#: plugins/check_snmp.c:856
+#: plugins/check_snmp.c:951
 #, fuzzy
 msgid "No OIDs specified\n"
 msgstr ""
 "Kein Hostname angegeben\n"
 "\n"
 
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:973
 msgid "Invalid seclevel"
 msgstr ""
 
-#: plugins/check_snmp.c:885 plugins/check_snmp.c:888 plugins/check_snmp.c:906
+#: plugins/check_snmp.c:980 plugins/check_snmp.c:983 plugins/check_snmp.c:1001
 #, c-format
 msgid "Required parameter: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:927
+#: plugins/check_snmp.c:1022
 msgid "Invalid SNMP version"
 msgstr ""
 
-#: plugins/check_snmp.c:944
+#: plugins/check_snmp.c:1039
 msgid "Unbalanced quotes\n"
 msgstr ""
 
-#: plugins/check_snmp.c:993
+#: plugins/check_snmp.c:1088
 msgid "Check status of remote machines and obtain system information via SNMP"
 msgstr ""
 
-#: plugins/check_snmp.c:1006
+#: plugins/check_snmp.c:1101
 msgid "Use SNMP GETNEXT instead of SNMP GET"
 msgstr ""
 
-#: plugins/check_snmp.c:1008
+#: plugins/check_snmp.c:1103
 msgid "SNMP protocol version"
 msgstr ""
 
-#: plugins/check_snmp.c:1010
+#: plugins/check_snmp.c:1105
 msgid "SNMPv3 securityLevel"
 msgstr ""
 
-#: plugins/check_snmp.c:1012
+#: plugins/check_snmp.c:1107
 msgid "SNMPv3 auth proto"
 msgstr ""
 
-#: plugins/check_snmp.c:1014
+#: plugins/check_snmp.c:1109
 msgid "SNMPv3 priv proto (default DES)"
 msgstr ""
 
-#: plugins/check_snmp.c:1018
+#: plugins/check_snmp.c:1113
 msgid "Optional community string for SNMP communication"
 msgstr ""
 
-#: plugins/check_snmp.c:1019
+#: plugins/check_snmp.c:1114
 msgid "default is"
 msgstr ""
 
-#: plugins/check_snmp.c:1021
+#: plugins/check_snmp.c:1116
 msgid "SNMPv3 username"
 msgstr ""
 
-#: plugins/check_snmp.c:1023
+#: plugins/check_snmp.c:1118
 msgid "SNMPv3 authentication password"
 msgstr ""
 
-#: plugins/check_snmp.c:1025
+#: plugins/check_snmp.c:1120
 msgid "SNMPv3 privacy password"
 msgstr ""
 
-#: plugins/check_snmp.c:1029
+#: plugins/check_snmp.c:1124
 msgid "Object identifier(s) or SNMP variables whose value you wish to query"
 msgstr ""
 
-#: plugins/check_snmp.c:1031
+#: plugins/check_snmp.c:1126
 msgid ""
 "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
 msgstr ""
 
-#: plugins/check_snmp.c:1032
+#: plugins/check_snmp.c:1127
 msgid "for symbolic OIDs.)"
 msgstr ""
 
-#: plugins/check_snmp.c:1034
+#: plugins/check_snmp.c:1129
 msgid "Delimiter to use when parsing returned data. Default is"
 msgstr ""
 
-#: plugins/check_snmp.c:1035
+#: plugins/check_snmp.c:1130
 msgid "Any data on the right hand side of the delimiter is considered"
 msgstr ""
 
-#: plugins/check_snmp.c:1036
+#: plugins/check_snmp.c:1131
 msgid "to be the data that should be used in the evaluation."
 msgstr ""
 
-#: plugins/check_snmp.c:1040
+#: plugins/check_snmp.c:1135
 #, fuzzy
 msgid "Warning threshold range(s)"
 msgstr "Warning threshold  Integer sein"
 
-#: plugins/check_snmp.c:1042
+#: plugins/check_snmp.c:1137
 #, fuzzy
 msgid "Critical threshold range(s)"
 msgstr "Critical threshold muss ein Integer sein"
 
-#: plugins/check_snmp.c:1044
+#: plugins/check_snmp.c:1139
 msgid "Enable rate calculation. See 'Rate Calculation' below"
 msgstr ""
 
-#: plugins/check_snmp.c:1046
+#: plugins/check_snmp.c:1141
 msgid ""
 "Converts rate per second. For example, set to 60 to convert to per minute"
 msgstr ""
 
-#: plugins/check_snmp.c:1050
+#: plugins/check_snmp.c:1143
+msgid "Add/substract the specified OFFSET to numeric sensor data"
+msgstr ""
+
+#: plugins/check_snmp.c:1147
 msgid "Return OK state (for that OID) if STRING is an exact match"
 msgstr ""
 
-#: plugins/check_snmp.c:1052
+#: plugins/check_snmp.c:1149
 msgid ""
 "Return OK state (for that OID) if extended regular expression REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:1054
+#: plugins/check_snmp.c:1151
 msgid ""
 "Return OK state (for that OID) if case-insensitive extended REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:1056
+#: plugins/check_snmp.c:1153
 msgid "Invert search result (CRITICAL if found)"
 msgstr ""
 
-#: plugins/check_snmp.c:1060
+#: plugins/check_snmp.c:1157
 msgid "Prefix label for output from plugin"
 msgstr ""
 
-#: plugins/check_snmp.c:1062
+#: plugins/check_snmp.c:1159
 msgid "Units label(s) for output data (e.g., 'sec.')."
 msgstr ""
 
-#: plugins/check_snmp.c:1064
+#: plugins/check_snmp.c:1161
 msgid "Separates output on multiple OID requests"
 msgstr ""
 
-#: plugins/check_snmp.c:1068
+#: plugins/check_snmp.c:1165
 msgid "Number of retries to be used in the requests"
 msgstr ""
 
-#: plugins/check_snmp.c:1073
+#: plugins/check_snmp.c:1168
+msgid "Label performance data with OIDs instead of --label's"
+msgstr ""
+
+#: plugins/check_snmp.c:1173
 msgid ""
 "This plugin uses the 'snmpget' command included with the NET-SNMP package."
 msgstr ""
 
-#: plugins/check_snmp.c:1074
+#: plugins/check_snmp.c:1174
 msgid ""
 "if you don't have the package installed, you will need to download it from"
 msgstr ""
 
-#: plugins/check_snmp.c:1075
+#: plugins/check_snmp.c:1175
 msgid "http://net-snmp.sourceforge.net before you can use this plugin."
 msgstr ""
 
-#: plugins/check_snmp.c:1079
+#: plugins/check_snmp.c:1179
 msgid ""
-"- Multiple OIDs may be indicated by a comma or space-delimited list (lists "
-"with"
-msgstr ""
-
-#: plugins/check_snmp.c:1080
-msgid "internal spaces must be quoted). Maximum:"
+"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited  "
 msgstr ""
 
-#: plugins/check_snmp.c:1080
-msgid "OIDs."
+#: plugins/check_snmp.c:1180
+msgid "list (lists with internal spaces must be quoted)."
 msgstr ""
 
-#: plugins/check_snmp.c:1084
+#: plugins/check_snmp.c:1184
 msgid ""
 "- When checking multiple OIDs, separate ranges by commas like '-w "
 "1:10,1:,:20'"
 msgstr ""
 
-#: plugins/check_snmp.c:1085
+#: plugins/check_snmp.c:1185
 msgid "- Note that only one string and one regex may be checked at present"
 msgstr ""
 
-#: plugins/check_snmp.c:1086
+#: plugins/check_snmp.c:1186
 msgid ""
 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
 msgstr ""
 
-#: plugins/check_snmp.c:1087
+#: plugins/check_snmp.c:1187
 msgid "returned from the SNMP query is an unsigned integer."
 msgstr ""
 
-#: plugins/check_snmp.c:1090
+#: plugins/check_snmp.c:1190
 msgid "Rate Calculation:"
 msgstr ""
 
-#: plugins/check_snmp.c:1091
+#: plugins/check_snmp.c:1191
 msgid "In many places, SNMP returns counters that are only meaningful when"
 msgstr ""
 
-#: plugins/check_snmp.c:1092
+#: plugins/check_snmp.c:1192
 msgid "calculating the counter difference since the last check. check_snmp"
 msgstr ""
 
-#: plugins/check_snmp.c:1093
+#: plugins/check_snmp.c:1193
 msgid "saves the last state information in a file so that the rate per second"
 msgstr ""
 
-#: plugins/check_snmp.c:1094
+#: plugins/check_snmp.c:1194
 msgid "can be calculated. Use the --rate option to save state information."
 msgstr ""
 
-#: plugins/check_snmp.c:1095
+#: plugins/check_snmp.c:1195
 msgid ""
 "On the first run, there will be no prior state - this will return with OK."
 msgstr ""
 
-#: plugins/check_snmp.c:1096
+#: plugins/check_snmp.c:1196
 msgid "The state is uniquely determined by the arguments to the plugin, so"
 msgstr ""
 
-#: plugins/check_snmp.c:1097
+#: plugins/check_snmp.c:1197
 msgid "changing the arguments will create a new state file."
 msgstr ""
 
@@ -4547,26 +4842,26 @@ msgstr ""
 msgid "Port number must be a positive integer"
 msgstr "Port muss ein positiver Integer sein"
 
-#: plugins/check_ssh.c:228
+#: plugins/check_ssh.c:232
 #, c-format
 msgid "Server answer: %s"
 msgstr ""
 
-#: plugins/check_ssh.c:247
+#: plugins/check_ssh.c:251
 #, c-format
 msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"
 msgstr ""
 
-#: plugins/check_ssh.c:254
+#: plugins/check_ssh.c:260
 #, c-format
-msgid "SSH OK - %s (protocol %s)\n"
+msgid "SSH OK - %s (protocol %s) | %s\n"
 msgstr ""
 
-#: plugins/check_ssh.c:274
+#: plugins/check_ssh.c:281
 msgid "Try to connect to an SSH server at specified server and port"
 msgstr ""
 
-#: plugins/check_ssh.c:290
+#: plugins/check_ssh.c:297
 msgid ""
 "Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"
 msgstr ""
@@ -4659,109 +4954,108 @@ msgstr ""
 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."
 msgstr ""
 
-#: plugins/check_tcp.c:197
+#: plugins/check_tcp.c:206
 msgid "CRITICAL - Generic check_tcp called with unknown service\n"
 msgstr ""
 
-#: plugins/check_tcp.c:221
+#: plugins/check_tcp.c:230
 msgid "With UDP checks, a send/expect string must be specified."
 msgstr ""
 
-#: plugins/check_tcp.c:240
-#, c-format
-msgid "CRITICAL - Cannot retrieve server certificate.\n"
-msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
-
-#: plugins/check_tcp.c:418
+#: plugins/check_tcp.c:431
 msgid "No arguments found"
 msgstr ""
 
-#: plugins/check_tcp.c:519
+#: plugins/check_tcp.c:534
 msgid "Maxbytes must be a positive integer"
 msgstr "Maxbytes muss ein positiver Integer sein"
 
-#: plugins/check_tcp.c:537
+#: plugins/check_tcp.c:552
 msgid "Refuse must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:547
+#: plugins/check_tcp.c:562
 msgid "Mismatch must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:553
+#: plugins/check_tcp.c:568
 msgid "Delay must be a positive integer"
 msgstr "Delay muss ein positiver Integer sein"
 
-#: plugins/check_tcp.c:581
+#: plugins/check_tcp.c:613
 #, fuzzy
 msgid "You must provide a server address"
 msgstr "%s: Hostname muss angegeben werden\n"
 
-#: plugins/check_tcp.c:583
+#: plugins/check_tcp.c:615
 #, fuzzy
 msgid "Invalid hostname, address or socket"
 msgstr "Ungültige(r) Hostname/Adresse"
 
-#: plugins/check_tcp.c:597
+#: plugins/check_tcp.c:629
 #, fuzzy, c-format
 msgid ""
 "This plugin tests %s connections with the specified host (or unix socket).\n"
 "\n"
 msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
 
-#: plugins/check_tcp.c:610
+#: plugins/check_tcp.c:642
 msgid ""
 "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or "
 "quit option"
 msgstr ""
 
-#: plugins/check_tcp.c:611
+#: plugins/check_tcp.c:643
 msgid "Default: nothing added to send, \\r\\n added to end of quit"
 msgstr ""
 
-#: plugins/check_tcp.c:613
+#: plugins/check_tcp.c:645
 msgid "String to send to the server"
 msgstr ""
 
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:647
 msgid "String to expect in server response"
 msgstr ""
 
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:647
 msgid "(may be repeated)"
 msgstr ""
 
-#: plugins/check_tcp.c:617
+#: plugins/check_tcp.c:649
 msgid "All expect strings need to occur in server response. Default is any"
 msgstr ""
 
-#: plugins/check_tcp.c:619
+#: plugins/check_tcp.c:651
 msgid "String to send server to initiate a clean close of the connection"
 msgstr ""
 
-#: plugins/check_tcp.c:621
+#: plugins/check_tcp.c:653
 msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
 msgstr ""
 
-#: plugins/check_tcp.c:623
+#: plugins/check_tcp.c:655
 msgid ""
 "Accept expected string mismatches with states ok, warn, crit (default: warn)"
 msgstr ""
 
-#: plugins/check_tcp.c:625
+#: plugins/check_tcp.c:657
 #, fuzzy
 msgid "Hide output from TCP socket"
 msgstr "Konnte TCP socket nicht öffnen\n"
 
-#: plugins/check_tcp.c:627
+#: plugins/check_tcp.c:659
 msgid "Close connection once more than this number of bytes are received"
 msgstr ""
 
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:661
 msgid "Seconds to wait between sending string and polling for response"
 msgstr ""
 
-#: plugins/check_tcp.c:635
+#: plugins/check_tcp.c:666
+msgid "1st is #days for warning, 2nd is critical (if not specified - 0)."
+msgstr ""
+
+#: plugins/check_tcp.c:668
 msgid "Use SSL for the connection."
 msgstr ""
 
@@ -4826,7 +5120,6 @@ msgid "Response time (sec.) necessary to result in critical status"
 msgstr ""
 
 #: plugins/check_ups.c:144
-#, c-format
 msgid "On Battery, Low Battery"
 msgstr ""
 
@@ -4879,7 +5172,7 @@ msgid ", Unknown"
 msgstr ""
 
 #: plugins/check_ups.c:324
-#, fuzzy, c-format
+#, fuzzy
 msgid "UPS does not support any available options\n"
 msgstr "IPv6 Unterstützung nicht vorhanden"
 
@@ -4999,21 +5292,21 @@ msgstr ""
 msgid "http://www.networkupstools.org"
 msgstr ""
 
-#: plugins/check_users.c:92
+#: plugins/check_users.c:110
 #, c-format
 msgid "# users=%d"
 msgstr ""
 
-#: plugins/check_users.c:115
+#: plugins/check_users.c:133
 msgid "Unable to read output"
 msgstr ""
 
-#: plugins/check_users.c:122
+#: plugins/check_users.c:140
 #, c-format
 msgid "USERS %s - %d users currently logged in |%s\n"
 msgstr ""
 
-#: plugins/check_users.c:207
+#: plugins/check_users.c:219
 #, fuzzy
 msgid "This plugin checks the number of users currently logged in on the local"
 msgstr ""
@@ -5022,265 +5315,265 @@ msgstr ""
 "unterschritten wird.\n"
 "\n"
 
-#: plugins/check_users.c:208
+#: plugins/check_users.c:220
 msgid ""
 "system and generates an error if the number exceeds the thresholds specified."
 msgstr ""
 
-#: plugins/check_users.c:218
+#: plugins/check_users.c:230
 msgid "Set WARNING status if more than INTEGER users are logged in"
 msgstr ""
 
-#: plugins/check_users.c:220
+#: plugins/check_users.c:232
 msgid "Set CRITICAL status if more than INTEGER users are logged in"
 msgstr ""
 
-#: plugins/check_ide_smart.c:229
+#: plugins/check_ide_smart.c:256
 #, fuzzy, c-format
 msgid "CRITICAL - Couldn't open device %s: %s\n"
 msgstr "CRITICAL - Device konnte nicht geöffnet werden: %s\n"
 
-#: plugins/check_ide_smart.c:234
+#: plugins/check_ide_smart.c:261
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:295
+#: plugins/check_ide_smart.c:323 plugins/check_ide_smart.c:350
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:364
+#: plugins/check_ide_smart.c:421
 #, c-format
 msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:372
+#: plugins/check_ide_smart.c:429
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:380
+#: plugins/check_ide_smart.c:437
 #, c-format
 msgid "OK - Operational (%d/%d tests passed)\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:384
+#: plugins/check_ide_smart.c:441
 #, c-format
 msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:417
+#: plugins/check_ide_smart.c:474
 #, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:423
+#: plugins/check_ide_smart.c:480
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:429
+#: plugins/check_ide_smart.c:486
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:450
+#: plugins/check_ide_smart.c:508 plugins/check_ide_smart.c:532
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:469
+#: plugins/check_ide_smart.c:553 plugins/check_ide_smart.c:580
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:486
+#: plugins/check_ide_smart.c:599
 #, c-format
 msgid ""
 "This plugin checks a local hard drive with the (Linux specific) SMART "
 "interface [http://smartlinux.sourceforge.net/smart/index.php]."
 msgstr ""
 
-#: plugins/check_ide_smart.c:496
+#: plugins/check_ide_smart.c:609
 msgid "Select device DEVICE"
 msgstr ""
 
-#: plugins/check_ide_smart.c:497
+#: plugins/check_ide_smart.c:610
 msgid ""
 "Note: if the device is selected with this option, _no_ other options are "
 "accepted"
 msgstr ""
 
-#: plugins/check_ide_smart.c:499
+#: plugins/check_ide_smart.c:612
 msgid "Perform immediately offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:501
+#: plugins/check_ide_smart.c:614
 msgid "Returns the number of failed tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:503
+#: plugins/check_ide_smart.c:616
 msgid "Turn on automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:505
+#: plugins/check_ide_smart.c:618
 msgid "Turn off automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:507
-msgid "Output suitable for Nagios"
+#: plugins/check_ide_smart.c:620
+msgid "Output suitable for the monitoring system"
 msgstr ""
 
-#: plugins/negate.c:96
+#: plugins/negate.c:99
 #, fuzzy
 msgid "No data returned from command\n"
 msgstr "Keine Daten empfangen %s\n"
 
-#: plugins/negate.c:167
+#: plugins/negate.c:170
 msgid ""
 "Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
 "or integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:171
+#: plugins/negate.c:174
 msgid ""
-"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-"
-"3)."
+"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer "
+"(0-3)."
 msgstr ""
 
-#: plugins/negate.c:177
+#: plugins/negate.c:180
 msgid ""
 "Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:182
+#: plugins/negate.c:185
 msgid ""
 "Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:187
+#: plugins/negate.c:190
 msgid ""
 "Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:214
+#: plugins/negate.c:217
 msgid "Require path to command"
 msgstr ""
 
-#: plugins/negate.c:243
+#: plugins/negate.c:246
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL and vice-versa)."
 msgstr ""
 
-#: plugins/negate.c:244
+#: plugins/negate.c:247
 msgid "Additional switches can be used to control which state becomes what."
 msgstr ""
 
-#: plugins/negate.c:253
+#: plugins/negate.c:256
 msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status."
 msgstr ""
 
-#: plugins/negate.c:255
+#: plugins/negate.c:258
 msgid "Custom result on Negate timeouts; see below for STATUS definition\n"
 msgstr ""
 
-#: plugins/negate.c:261
+#: plugins/negate.c:264
 #, c-format
 msgid ""
 "    STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n"
 msgstr ""
 
-#: plugins/negate.c:262
+#: plugins/negate.c:265
 #, c-format
 msgid ""
 "    quotes. Numeric values are accepted. If nothing is specified, permutes\n"
 msgstr ""
 
-#: plugins/negate.c:263
+#: plugins/negate.c:266
 #, c-format
 msgid "    OK and CRITICAL.\n"
 msgstr ""
 
-#: plugins/negate.c:265
+#: plugins/negate.c:268
 #, c-format
 msgid ""
 "    Substitute output text as well. Will only substitute text in CAPITALS\n"
 msgstr ""
 
-#: plugins/negate.c:270
+#: plugins/negate.c:273
 msgid "Run check_ping and invert result. Must use full path to plugin"
 msgstr ""
 
-#: plugins/negate.c:272
+#: plugins/negate.c:275
 msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"
 msgstr ""
 
-#: plugins/negate.c:275
+#: plugins/negate.c:278
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert it."
 msgstr ""
 
-#: plugins/negate.c:276
+#: plugins/negate.c:279
 msgid "The full path of the plugin must be provided."
 msgstr ""
 
-#: plugins/negate.c:277
+#: plugins/negate.c:280
 msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL."
 msgstr ""
 
-#: plugins/negate.c:278
+#: plugins/negate.c:281
 msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK."
 msgstr ""
 
-#: plugins/negate.c:279
+#: plugins/negate.c:282
 msgid "Otherwise, the output state of the wrapped plugin is unchanged."
 msgstr ""
 
-#: plugins/negate.c:281
+#: plugins/negate.c:284
 msgid ""
 "Using timeout-result, it is possible to override the timeout behaviour or a"
 msgstr ""
 
-#: plugins/negate.c:282
+#: plugins/negate.c:285
 msgid "plugin by setting the negate timeout a bit lower."
 msgstr ""
 
-#: plugins/netutils.c:48
+#: plugins/netutils.c:49
 #, fuzzy, c-format
 msgid "%s - Socket timeout after %d seconds\n"
 msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
 
-#: plugins/netutils.c:50
+#: plugins/netutils.c:51
 #, fuzzy, c-format
 msgid "%s - Abnormal timeout after %d seconds\n"
 msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
 
-#: plugins/netutils.c:78 plugins/netutils.c:280
+#: plugins/netutils.c:79 plugins/netutils.c:281
 msgid "Send failed"
 msgstr ""
 
-#: plugins/netutils.c:95 plugins/netutils.c:295
+#: plugins/netutils.c:96 plugins/netutils.c:296
 #, fuzzy
 msgid "No data was received from host!"
 msgstr "Keine Daten empfangen %s\n"
 
-#: plugins/netutils.c:203 plugins/netutils.c:239
+#: plugins/netutils.c:204 plugins/netutils.c:240
 msgid "Socket creation failed"
 msgstr ""
 
-#: plugins/netutils.c:232
+#: plugins/netutils.c:233
 msgid "Supplied path too long unix domain socket"
 msgstr ""
 
-#: plugins/netutils.c:304
+#: plugins/netutils.c:305
 msgid "Receive failed"
 msgstr ""
 
-#: plugins/netutils.c:330 plugins-root/check_dhcp.c:1341
+#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1342
 #, fuzzy, c-format
 msgid "Invalid hostname/address - %s"
 msgstr ""
@@ -5323,18 +5616,19 @@ msgid ""
 msgstr ""
 
 #: plugins/urlize.c:169
-msgid "This plugin wraps the text output of another command (plugin)"
+msgid ""
+"This plugin wraps the text output of another command (plugin) in HTML <A>"
 msgstr ""
 
 #: plugins/urlize.c:170
 msgid ""
-"in HTML <A> tags, thus displaying the child plugin's output as a clickable "
-"link in"
+"tags, thus displaying the child plugin's output as a clickable link in "
+"compatible"
 msgstr ""
 
 #: plugins/urlize.c:171
 msgid ""
-"the Nagios status screen.  This plugin returns the status of the invoked "
+"monitoring status screen. This plugin returns the status of the invoked "
 "plugin."
 msgstr ""
 
@@ -5367,29 +5661,34 @@ msgstr ""
 msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\""
 msgstr ""
 
-#: plugins/utils.c:171
+#: plugins/utils.c:174
 #, fuzzy, c-format
 msgid "%s - Plugin timed out after %d seconds\n"
 msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
 
-#: plugins/utils.c:466
+#: plugins/utils.c:469
 #, fuzzy
 msgid "failed realloc in strpcpy\n"
 msgstr "konnte keinen Speicher für '%s' reservieren\n"
 
-#: plugins/utils.c:508
+#: plugins/utils.c:511
 #, fuzzy
 msgid "failed malloc in strscat\n"
 msgstr "konnte keinen Speicher für '%s' reservieren\n"
 
-#: plugins/utils.h:140
+#: plugins/utils.c:531
+#, fuzzy
+msgid "failed malloc in xvasprintf\n"
+msgstr "konnte keinen Speicher für '%s' reservieren\n"
+
+#: plugins/utils.h:137
 #, c-format
 msgid ""
 "       %s (-h | --help) for detailed help\n"
 "       %s (-V | --version) for version information\n"
 msgstr ""
 
-#: plugins/utils.h:144
+#: plugins/utils.h:141
 msgid ""
 "\n"
 "Options:\n"
@@ -5399,7 +5698,7 @@ msgid ""
 "    Print version information\n"
 msgstr ""
 
-#: plugins/utils.h:151
+#: plugins/utils.h:148
 #, c-format
 msgid ""
 " -H, --hostname=ADDRESS\n"
@@ -5408,7 +5707,7 @@ msgid ""
 "    Port number (default: %s)\n"
 msgstr ""
 
-#: plugins/utils.h:157
+#: plugins/utils.h:154
 msgid ""
 " -4, --use-ipv4\n"
 "    Use IPv4 connection\n"
@@ -5416,13 +5715,14 @@ msgid ""
 "    Use IPv6 connection\n"
 msgstr ""
 
-#: plugins/utils.h:163
+#: plugins/utils.h:160
 msgid ""
 " -v, --verbose\n"
-"    Show details for command-line debugging (Nagios may truncate output)\n"
+"    Show details for command-line debugging (output may be truncated by\n"
+"\t\tthe monitoring system)\n"
 msgstr ""
 
-#: plugins/utils.h:167
+#: plugins/utils.h:165
 msgid ""
 " -w, --warning=DOUBLE\n"
 "    Response time to result in warning status (seconds)\n"
@@ -5430,7 +5730,7 @@ msgid ""
 "    Response time to result in critical status (seconds)\n"
 msgstr ""
 
-#: plugins/utils.h:173
+#: plugins/utils.h:171
 msgid ""
 " -w, --warning=RANGE\n"
 "    Warning range (format: start:end). Alert if outside this range\n"
@@ -5438,41 +5738,42 @@ msgid ""
 "    Critical range\n"
 msgstr ""
 
-#: plugins/utils.h:179
+#: plugins/utils.h:177
 #, c-format
 msgid ""
 " -t, --timeout=INTEGER\n"
 "    Seconds before connection times out (default: %d)\n"
 msgstr ""
 
-#: plugins/utils.h:184
+#: plugins/utils.h:182
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
+"    Read options from an ini file. See\n"
+"    https://www.monitoring-plugins.org/doc/extra-opts.html\n"
 "    for usage and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:192
+#: plugins/utils.h:190
 msgid ""
 " See:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
-"html#THRESHOLDFORMAT\n"
+" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:197
+#: plugins/utils.h:195
 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"
+"Send email to help@monitoring-plugins.org if you have questions regarding\n"
+"use of this software. To submit patches or suggest improvements, send email\n"
+"to devel@monitoring-plugins.org\n"
 "\n"
 msgstr ""
 
-#: plugins/utils.h:202
+#: plugins/utils.h:200
 msgid ""
 "\n"
-"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
+"The Monitoring 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 ""
@@ -5503,52 +5804,52 @@ msgstr ""
 msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:383
+#: plugins-root/check_dhcp.c:388
 #, c-format
 msgid ""
 "Error: can't find unit number in interface_name (%s) - expecting TypeNumber "
 "eg lnc0.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:388 plugins-root/check_dhcp.c:400
+#: plugins-root/check_dhcp.c:393 plugins-root/check_dhcp.c:405
 #, c-format
 msgid ""
 "Error: can't read MAC address from DLPI streams interface for device %s unit "
 "%d.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:406
+#: plugins-root/check_dhcp.c:411
 #, c-format
 msgid ""
 "Error: can't get MAC address for this architecture.  Use the --mac option.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:425
+#: plugins-root/check_dhcp.c:430
 #, c-format
 msgid "Error: Cannot determine IP address of interface %s\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:433
+#: plugins-root/check_dhcp.c:438
 #, c-format
 msgid "Error: Cannot get interface IP address on this platform.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:438
+#: plugins-root/check_dhcp.c:443
 #, c-format
 msgid "Pretending to be relay client %s\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:523
+#: plugins-root/check_dhcp.c:528
 #, c-format
 msgid "DHCPDISCOVER to %s port %d\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:575
+#: plugins-root/check_dhcp.c:580
 #, c-format
 msgid "Result=ERROR\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:581
+#: plugins-root/check_dhcp.c:586
 #, c-format
 msgid "Result=OK\n"
 msgstr ""
@@ -5641,241 +5942,262 @@ msgstr ""
 msgid "Requested server address: %s\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:881
+#: plugins-root/check_dhcp.c:882
 #, c-format
 msgid "Lease Time: Infinite\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:883
+#: plugins-root/check_dhcp.c:884
 #, c-format
 msgid "Lease Time: %lu seconds\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:885
+#: plugins-root/check_dhcp.c:886
 #, c-format
 msgid "Renewal Time: Infinite\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:887
+#: plugins-root/check_dhcp.c:888
 #, c-format
 msgid "Renewal Time: %lu seconds\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:889
+#: plugins-root/check_dhcp.c:890
 #, c-format
 msgid "Rebinding Time: Infinite\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:890
+#: plugins-root/check_dhcp.c:891
 #, c-format
 msgid "Rebinding Time: %lu seconds\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:918
+#: plugins-root/check_dhcp.c:919
 #, c-format
 msgid "Added offer from server @ %s"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:919
+#: plugins-root/check_dhcp.c:920
 #, c-format
 msgid " of IP address %s\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:986
+#: plugins-root/check_dhcp.c:987
 #, c-format
 msgid "DHCP Server Match: Offerer=%s"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:987
+#: plugins-root/check_dhcp.c:988
 #, c-format
 msgid " Requested=%s"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:989
+#: plugins-root/check_dhcp.c:990
 #, c-format
 msgid " (duplicate)"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:990
+#: plugins-root/check_dhcp.c:991
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1038
+#: plugins-root/check_dhcp.c:1039
 #, c-format
 msgid "No DHCPOFFERs were received.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1042
+#: plugins-root/check_dhcp.c:1043
 #, c-format
 msgid "Received %d DHCPOFFER(s)"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1045
+#: plugins-root/check_dhcp.c:1046
 #, c-format
 msgid ", %s%d of %d requested servers responded"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1048
+#: plugins-root/check_dhcp.c:1049
 #, c-format
 msgid ", requested address (%s) was %soffered"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1048
+#: plugins-root/check_dhcp.c:1049
 msgid "not "
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1050
+#: plugins-root/check_dhcp.c:1051
 #, c-format
 msgid ", max lease time = "
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1052
+#: plugins-root/check_dhcp.c:1053
 #, c-format
 msgid "Infinity"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1233
+#: plugins-root/check_dhcp.c:1234
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1245
+#: plugins-root/check_dhcp.c:1246
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1258
+#: plugins-root/check_dhcp.c:1259
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1270
+#: plugins-root/check_dhcp.c:1271
 #, c-format
 msgid ""
 "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1294
+#: plugins-root/check_dhcp.c:1295
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1373
+#: plugins-root/check_dhcp.c:1374
 #, c-format
 msgid "Hardware address: "
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1389
+#: plugins-root/check_dhcp.c:1390
 msgid "This plugin tests the availability of DHCP servers on a network."
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1401
+#: plugins-root/check_dhcp.c:1402
 msgid "IP address of DHCP server that we must hear from"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1403
+#: plugins-root/check_dhcp.c:1404
 msgid "IP address that should be offered by at least one DHCP server"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1405
+#: plugins-root/check_dhcp.c:1406
 msgid "Seconds to wait for DHCPOFFER before timeout occurs"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1407
+#: plugins-root/check_dhcp.c:1408
 msgid "Interface to to use for listening (i.e. eth0)"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1409
+#: plugins-root/check_dhcp.c:1410
 msgid "MAC address to use in the DHCP request"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1411
+#: plugins-root/check_dhcp.c:1412
 msgid "Unicast testing: mimic a DHCP relay, requires -s"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1288
+#: plugins-root/check_icmp.c:1295
 msgid "specify a target"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1290
+#: plugins-root/check_icmp.c:1297
 #, fuzzy
 msgid "warning threshold (currently "
 msgstr "Warning threshold  Integer sein"
 
-#: plugins-root/check_icmp.c:1293
+#: plugins-root/check_icmp.c:1300
 #, fuzzy
 msgid "critical threshold (currently "
 msgstr "Critical threshold muss ein Integer sein"
 
-#: plugins-root/check_icmp.c:1296
+#: plugins-root/check_icmp.c:1303
 #, fuzzy
 msgid "specify a source IP address or device name"
 msgstr "Hostname oder Serveradresse muss angegeben werden"
 
-#: plugins-root/check_icmp.c:1298
+#: plugins-root/check_icmp.c:1305
 msgid "number of packets to send (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1301
+#: plugins-root/check_icmp.c:1308
 msgid "max packet interval (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1304
+#: plugins-root/check_icmp.c:1311
 msgid "max target interval (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1307
+#: plugins-root/check_icmp.c:1314
 msgid "number of alive hosts required for success"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1310
+#: plugins-root/check_icmp.c:1317
 msgid "TTL on outgoing packets (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1313
+#: plugins-root/check_icmp.c:1320
 msgid "timeout value (seconds, currently  "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1316
+#: plugins-root/check_icmp.c:1323
 msgid "Number of icmp data bytes to send"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1317
+#: plugins-root/check_icmp.c:1324
 msgid "Packet size will be data bytes + icmp header (currently"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1319
+#: plugins-root/check_icmp.c:1326
 msgid "verbose"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1323
+#: plugins-root/check_icmp.c:1330
 msgid "The -H switch is optional. Naming a host (or several) to check is not."
 msgstr ""
 
-#: plugins-root/check_icmp.c:1325
+#: plugins-root/check_icmp.c:1332
 msgid ""
 "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1326
+#: plugins-root/check_icmp.c:1333
 msgid "packet loss.  The default values should work well for most users."
 msgstr ""
 
-#: plugins-root/check_icmp.c:1327
+#: plugins-root/check_icmp.c:1334
 msgid ""
 "You can specify different RTA factors using the standardized abbreviations"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1328
+#: plugins-root/check_icmp.c:1335
 msgid ""
 "us (microseconds), ms (milliseconds, default) or just plain s for seconds."
 msgstr ""
 
-#: plugins-root/check_icmp.c:1334
+#: plugins-root/check_icmp.c:1341
 msgid "The -v switch can be specified several times for increased verbosity."
 msgstr ""
 
+#~ msgid "Critical threshold must be integer"
+#~ msgstr "Critical threshold muss ein Integer sein"
+
+#~ msgid "Warning threshold must be integer"
+#~ msgstr "Warning threshold  Integer sein"
+
+#, fuzzy
+#~ msgid "Critical Process Count must be an integer!"
+#~ msgstr "Critical threshold muss ein Integer sein"
+
+#, fuzzy
+#~ msgid "Warning Process Count must be an integer!"
+#~ msgstr "Warning threshold  Integer sein"
+
+#, fuzzy
+#~ msgid "CRITICAL - Cannot retrieve server certificate."
+#~ msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
+
+#~ msgid "CRITICAL - Cannot retrieve server certificate.\n"
+#~ msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
+
 #~ msgid "Invalid HTTP response received from host\n"
 #~ msgstr "Ungültige HTTP Antwort von Host empfangen\n"
 
@@ -5949,9 +6271,6 @@ msgstr ""
 #~ "%s: Unbekanntes Argument: %s\n"
 #~ "\n"
 
-#~ msgid "No data received %s\n"
-#~ msgstr "Keine Daten empfangen %s\n"
-
 #~ msgid ""
 #~ " -1, --proto1\n"
 #~ "    tell ssh to use Protocol 1\n"
diff --git a/po/fr.po b/po/fr.po
index 125b51e7..0537949f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,37 +9,38 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-07-09 19:30-0400\n"
+"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
+"POT-Creation-Date: 2014-01-19 16:30-0500\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"
+"devel@monitoring-plugins.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:87
-#: plugins/check_disk.c:192 plugins/check_dns.c:102 plugins/check_dummy.c:52
-#: plugins/check_fping.c:89 plugins/check_game.c:82 plugins/check_hpjd.c:103
-#: plugins/check_http.c:157 plugins/check_ldap.c:109 plugins/check_load.c:122
-#: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:85
-#: plugins/check_nagios.c:91 plugins/check_nt.c:126 plugins/check_ntp.c:766
-#: plugins/check_ntp_peer.c:569 plugins/check_ntp_time.c:548
+#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:88
+#: plugins/check_disk.c:194 plugins/check_dns.c:102 plugins/check_dummy.c:52
+#: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:103
+#: plugins/check_http.c:167 plugins/check_ldap.c:109 plugins/check_load.c:122
+#: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:122
+#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:770
+#: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:552
 #: 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:205 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
+#: plugins/check_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:172
+#: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144
+#: plugins/check_snmp.c:240 plugins/check_ssh.c:73 plugins/check_swap.c:110
+#: plugins/check_tcp.c:218 plugins/check_time.c:78 plugins/check_ups.c:122
+#: plugins/check_users.c:77 plugins/negate.c:214 plugins-root/check_dhcp.c:270
 msgid "Could not parse arguments"
 msgstr "Impossible de décomposer les arguments"
 
-#: plugins/check_by_ssh.c:90 plugins/check_dig.c:81 plugins/check_dns.c:95
-#: plugins/check_nagios.c:95 plugins/check_pgsql.c:160 plugins/check_ping.c:99
-#: plugins/check_procs.c:154 plugins/negate.c:76
+#: plugins/check_by_ssh.c:90 plugins/check_dig.c:82 plugins/check_dns.c:95
+#: plugins/check_nagios.c:95 plugins/check_pgsql.c:178 plugins/check_ping.c:99
+#: plugins/check_procs.c:188 plugins/check_snmp.c:336 plugins/negate.c:79
 msgid "Cannot catch SIGALRM"
 msgstr "Impossible d'obtenir le signal SIGALRM"
 
@@ -63,197 +64,205 @@ msgstr "SSH AVERTISSEMENT: impossible d'ouvrir %s\n"
 msgid "%s: Error parsing output\n"
 msgstr "%s: Erreur d'analyse du résultat\n"
 
-#: plugins/check_by_ssh.c:219 plugins/check_disk.c:525
-#: plugins/check_http.c:256 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:665
-#: plugins/check_ssh.c:138 plugins/check_tcp.c:490 plugins/check_time.c:302
-#: plugins/check_ups.c:556 plugins/negate.c:161
+#: plugins/check_by_ssh.c:220 plugins/check_disk.c:476
+#: plugins/check_http.c:278 plugins/check_ldap.c:293 plugins/check_pgsql.c:311
+#: plugins/check_procs.c:437 plugins/check_radius.c:308
+#: plugins/check_real.c:356 plugins/check_smtp.c:581 plugins/check_snmp.c:736
+#: plugins/check_ssh.c:138 plugins/check_tcp.c:505 plugins/check_time.c:302
+#: plugins/check_ups.c:556 plugins/negate.c:164
 msgid "Timeout interval must be a positive integer"
 msgstr "Le délai d'attente doit être un entier positif"
 
-#: plugins/check_by_ssh.c:229 plugins/check_pgsql.c:274
+#: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:341
 #: plugins/check_radius.c:272 plugins/check_real.c:327
-#: plugins/check_smtp.c:514 plugins/check_tcp.c:496 plugins/check_time.c:296
+#: plugins/check_smtp.c:506 plugins/check_tcp.c:511 plugins/check_time.c:296
 #: plugins/check_ups.c:518
 msgid "Port must be a positive integer"
 msgstr "Le numéro du port doit être un entier positif"
 
-#: plugins/check_by_ssh.c:290
+#: plugins/check_by_ssh.c:291
 msgid "skip-stdout argument must be an integer"
 msgstr "Le nombres de lignes à sauter (skip-stdout) doit être un entier"
 
-#: plugins/check_by_ssh.c:298
+#: plugins/check_by_ssh.c:299
 msgid "skip-stderr argument must be an integer"
 msgstr "Le nombres de lignes à sauter (skip-stderr) doit être un entier"
 
-#: plugins/check_by_ssh.c:317
+#: plugins/check_by_ssh.c:322
 #, c-format
 msgid "%s: You must provide a host name\n"
 msgstr "%s: Vous devez fournir un nom d'hôte\n"
 
-#: plugins/check_by_ssh.c:335
+#: plugins/check_by_ssh.c:340
 msgid "No remotecmd"
 msgstr "Pas de commande distante"
 
-#: plugins/check_by_ssh.c:349
+#: plugins/check_by_ssh.c:354
 #, c-format
 msgid "%s: Argument limit of %d exceeded\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:352
+#: plugins/check_by_ssh.c:357
 msgid "Can not (re)allocate 'commargv' buffer\n"
 msgstr "Impossible de réallouer le tampon 'commargv'\n"
 
-#: plugins/check_by_ssh.c:366
+#: plugins/check_by_ssh.c:371
 #, c-format
 msgid ""
 "%s: In passive mode, you must provide a service name for each command.\n"
 msgstr ""
 "%s: En mode passif, vous devez fournir un service pour chaque commande.\n"
 
-#: plugins/check_by_ssh.c:369
-#, c-format
+#: plugins/check_by_ssh.c:374
+#, fuzzy, c-format
 msgid ""
-"%s: In passive mode, you must provide the host short name from the nagios "
-"configs.\n"
+"%s: In passive mode, you must provide the host short name from the "
+"monitoring configs.\n"
 msgstr ""
 "%s: En mode passif, vous devez fournir le nom court du hôte mentionné dans "
 "la configuration de nagios.\n"
 
-#: plugins/check_by_ssh.c:383
+#: plugins/check_by_ssh.c:388
 #, c-format
 msgid "This plugin uses SSH to execute commands on a remote host"
 msgstr "Ce plugin utilise SSH pour exécuter des commandes sur un hôte distant"
 
-#: plugins/check_by_ssh.c:398
+#: plugins/check_by_ssh.c:403
 msgid "tell ssh to use Protocol 1 [optional]"
 msgstr "dire à ssh d'utiliser le protocole version 1 [optionnel]"
 
-#: plugins/check_by_ssh.c:400
+#: plugins/check_by_ssh.c:405
 msgid "tell ssh to use Protocol 2 [optional]"
 msgstr "dire à ssh d'utiliser le protocole 2 [optionnel]"
 
-#: plugins/check_by_ssh.c:402
+#: plugins/check_by_ssh.c:407
 msgid "Ignore all or (if specified) first n lines on STDOUT [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:404
+#: plugins/check_by_ssh.c:409
 msgid "Ignore all or (if specified) first n lines on STDERR [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:406
+#: plugins/check_by_ssh.c:411
 msgid ""
 "tells ssh to fork rather than create a tty [optional]. This will always "
 "return OK if ssh is executed"
 msgstr ""
 
-#: plugins/check_by_ssh.c:408
+#: plugins/check_by_ssh.c:413
 msgid "command to execute on the remote machine"
 msgstr "commande à exécuter sur la machine distante"
 
-#: plugins/check_by_ssh.c:410
+#: plugins/check_by_ssh.c:415
 msgid "SSH user name on remote host [optional]"
 msgstr "Nom d'utilisateur ssh sur la machine distante [optionnel]"
 
-#: plugins/check_by_ssh.c:412
+#: plugins/check_by_ssh.c:417
 msgid "identity of an authorized key [optional]"
 msgstr "Identité de la clé autorisée [optionnel]"
 
-#: plugins/check_by_ssh.c:414
-msgid "external command file for nagios [optional]"
+#: plugins/check_by_ssh.c:419
+#, fuzzy
+msgid "external command file for monitoring [optional]"
 msgstr "commande externe pour nagios [optionnel]"
 
-#: plugins/check_by_ssh.c:416
-msgid "list of nagios service names, separated by ':' [optional]"
+#: plugins/check_by_ssh.c:421
+#, fuzzy
+msgid "list of monitoring service names, separated by ':' [optional]"
 msgstr "liste des services nagios, séparés par ':' [optionnel] "
 
-#: plugins/check_by_ssh.c:418
-msgid "short name of host in nagios configuration [optional]"
+#: plugins/check_by_ssh.c:423
+#, fuzzy
+msgid "short name of host in the monitoring configuration [optional]"
 msgstr "nom court de l'hôte dans la configuration nagios [optionnel]"
 
-#: plugins/check_by_ssh.c:420
+#: plugins/check_by_ssh.c:425
 msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
 msgstr ""
 "appelle ssh avec '-o OPTION' (peut être utilisé plusieurs fois) [optionnel]"
 
-#: plugins/check_by_ssh.c:422
+#: plugins/check_by_ssh.c:427
+#, fuzzy
+msgid "Tell ssh to use this configfile [optional]"
+msgstr "dire à ssh d'utiliser le protocole version 1 [optionnel]"
+
+#: plugins/check_by_ssh.c:429
 msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
 msgstr ""
 "dire à ssh de supprimer les messages d'erreurs et de diagnostic [optionnel]"
 
-#: plugins/check_by_ssh.c:427
+#: plugins/check_by_ssh.c:434
 msgid "The most common mode of use is to refer to a local identity file with"
 msgstr ""
 
-#: plugins/check_by_ssh.c:428
+#: plugins/check_by_ssh.c:435
 msgid "the '-i' option. In this mode, the identity pair should have a null"
 msgstr ""
 
-#: plugins/check_by_ssh.c:429
+#: plugins/check_by_ssh.c:436
 msgid "passphrase and the public key should be listed in the authorized_keys"
 msgstr ""
 
-#: plugins/check_by_ssh.c:430
+#: plugins/check_by_ssh.c:437
 msgid "file of the remote host. Usually the key will be restricted to running"
 msgstr ""
 
-#: plugins/check_by_ssh.c:431
+#: plugins/check_by_ssh.c:438
 msgid "only one command on the remote server. If the remote SSH server tracks"
 msgstr ""
 
-#: plugins/check_by_ssh.c:432
+#: plugins/check_by_ssh.c:439
 msgid "invocation arguments, the one remote program may be an agent that can"
 msgstr ""
 
-#: plugins/check_by_ssh.c:433
+#: plugins/check_by_ssh.c:440
 msgid "execute additional commands as proxy"
 msgstr ""
 
-#: plugins/check_by_ssh.c:435
+#: plugins/check_by_ssh.c:442
 msgid "To use passive mode, provide multiple '-C' options, and provide"
 msgstr "Pour utiliser le mode passif, utilisez plusieurs fois l'option '-C',et"
 
-#: plugins/check_by_ssh.c:436
+#: plugins/check_by_ssh.c:443
 msgid ""
 "all of -O, -s, and -n options (servicelist order must match '-C'options)"
 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:261
-#: plugins/check_dig.c:342 plugins/check_disk.c:963 plugins/check_http.c:1415
-#: 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
+#: plugins/check_by_ssh.c:445 plugins/check_cluster.c:261
+#: plugins/check_dig.c:355 plugins/check_disk.c:924 plugins/check_http.c:1560
+#: plugins/check_nagios.c:312 plugins/check_ntp.c:869
+#: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:633
+#: plugins/check_procs.c:763 plugins/negate.c:271 plugins/urlize.c:180
 msgid "Examples:"
 msgstr "Exemples:"
 
-#: 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:1438
-#: 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_procs.c:760
+#: plugins/check_by_ssh.c:460 plugins/check_cluster.c:274
+#: plugins/check_dig.c:367 plugins/check_disk.c:941 plugins/check_dns.c:486
+#: plugins/check_dummy.c:122 plugins/check_fping.c:505
+#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1590
+#: plugins/check_ldap.c:451 plugins/check_load.c:334 plugins/check_mrtg.c:382
+#: plugins/check_mysql.c:569 plugins/check_nagios.c:323 plugins/check_nt.c:774
+#: plugins/check_ntp.c:888 plugins/check_ntp_peer.c:725
+#: plugins/check_ntp_time.c:642 plugins/check_nwstat.c:1685
+#: plugins/check_overcr.c:467 plugins/check_pgsql.c:578
+#: plugins/check_ping.c:603 plugins/check_procs.c:781
 #: plugins/check_radius.c:385 plugins/check_real.c:451
-#: plugins/check_smtp.c:821 plugins/check_snmp.c:1107 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
+#: plugins/check_smtp.c:843 plugins/check_snmp.c:1207 plugins/check_ssh.c:309
+#: plugins/check_swap.c:558 plugins/check_tcp.c:684 plugins/check_time.c:371
+#: plugins/check_ups.c:660 plugins/check_users.c:240
+#: plugins/check_ide_smart.c:640 plugins/negate.c:295 plugins/urlize.c:197
+#: plugins-root/check_dhcp.c:1422 plugins-root/check_icmp.c:1354
 msgid "Usage:"
 msgstr "Utilisation:"
 
 #: plugins/check_cluster.c:230
-#, c-format
-msgid "Host/Service Cluster Plugin for Nagios 2"
+#, fuzzy, c-format
+msgid "Host/Service Cluster Plugin for Monitoring"
 msgstr "Plugin de Cluster d'Hôte/Service pour Nagios 2"
 
-#: plugins/check_cluster.c:236 plugins/check_nt.c:661
+#: plugins/check_cluster.c:236 plugins/check_nt.c:676
 msgid "Options:"
 msgstr "Options:"
 
@@ -290,13 +299,13 @@ msgid "commas"
 msgstr "virgules"
 
 #: plugins/check_cluster.c:257 plugins/check_game.c:318
-#: plugins/check_http.c:1401 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:1078
-#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
-#: plugins-root/check_icmp.c:1322
+#: plugins/check_http.c:1542 plugins/check_ldap.c:438 plugins/check_mrtg.c:363
+#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:558
+#: plugins/check_nt.c:758 plugins/check_ntp.c:865 plugins/check_ntp_peer.c:696
+#: plugins/check_ntp_time.c:626 plugins/check_nwstat.c:1670
+#: plugins/check_overcr.c:456 plugins/check_snmp.c:1178
+#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:277
+#: plugins-root/check_icmp.c:1329
 msgid "Notes:"
 msgstr "Notes:"
 
@@ -309,259 +318,275 @@ msgstr ""
 msgid "state."
 msgstr ""
 
-#: plugins/check_dig.c:99 plugins/check_dig.c:101
+#: plugins/check_dig.c:100 plugins/check_dig.c:102
 #, c-format
 msgid "Looking for: '%s'\n"
 msgstr "Recherche de: '%s'\n"
 
-#: plugins/check_dig.c:108
+#: plugins/check_dig.c:109
 msgid "dig returned an error status"
 msgstr "dig à renvoyé un état d'erreur"
 
-#: plugins/check_dig.c:133
+#: plugins/check_dig.c:134
 msgid "Server not found in ANSWER SECTION"
 msgstr "Le serveur n'a pas été trouvé dans l'ANSWER SECTION"
 
-#: plugins/check_dig.c:143
+#: plugins/check_dig.c:144
 msgid "No ANSWER SECTION found"
 msgstr "Pas d' ANSWER SECTION trouvé"
 
-#: plugins/check_dig.c:170
+#: plugins/check_dig.c:171
 msgid "Probably a non-existent host/domain"
 msgstr "Probablement un hôte/domaine inexistant"
 
-#: plugins/check_dig.c:230
+#: plugins/check_dig.c:233
 #, c-format
 msgid "Port must be a positive integer - %s"
 msgstr "Le numéro du port doit être un entier positif - %s"
 
-#: plugins/check_dig.c:241
+#: plugins/check_dig.c:244
 #, c-format
 msgid "Warning interval must be a positive integer - %s"
 msgstr "Le seuil d'avertissement doit être un entier positif - %s"
 
-#: plugins/check_dig.c:249
+#: plugins/check_dig.c:252
 #, c-format
 msgid "Critical interval must be a positive integer - %s"
 msgstr "Le seuil critique doit être un entier positif - %s"
 
-#: plugins/check_dig.c:257
+#: plugins/check_dig.c:260
 #, c-format
 msgid "Timeout interval must be a positive integer - %s"
 msgstr "Le délai d'attente doit être un entier positif - %s"
 
-#: plugins/check_dig.c:316
+#: plugins/check_dig.c:325
 #, c-format
 msgid "This plugin test the DNS service on the specified host using dig"
 msgstr "Ce plugin teste le service DNS sur l'hôte spécifié en utilisant dig"
 
-#: plugins/check_dig.c:329
+#: plugins/check_dig.c:338
+msgid "Force dig to only use IPv4 query transport"
+msgstr ""
+
+#: plugins/check_dig.c:340
+msgid "Force dig to only use IPv6 query transport"
+msgstr ""
+
+#: plugins/check_dig.c:342
 msgid "Machine name to lookup"
 msgstr "Nom de machine à rechercher"
 
-#: plugins/check_dig.c:331
+#: plugins/check_dig.c:344
 msgid "Record type to lookup (default: A)"
 msgstr "Type d'enregistrement à rechercher (par défaut: A)"
 
-#: plugins/check_dig.c:333
+#: plugins/check_dig.c:346
 msgid ""
 "An address expected to be in the answer section. If not set, uses whatever"
 msgstr ""
 "Une adresse qui devrait se trouver dans la section réponce. Si omit, utilise"
 
-#: plugins/check_dig.c:334
+#: plugins/check_dig.c:347
 msgid "was in -l"
 msgstr "ce qui est passé au paramètre -l"
 
-#: plugins/check_dig.c:336
+#: plugins/check_dig.c:349
 msgid "Pass STRING as argument(s) to dig"
 msgstr ""
 
-#: plugins/check_disk.c:214
+#: plugins/check_disk.c:216
 #, c-format
 msgid "DISK %s: %s not found\n"
 msgstr "DISK %s: %s non trouvé\n"
 
-#: 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_disk.c:216 plugins/check_disk.c:956 plugins/check_dns.c:241
+#: plugins/check_dummy.c:74 plugins/check_mysql.c:299
 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168
-#: plugins/check_nagios.c:172 plugins/check_procs.c:290
+#: plugins/check_nagios.c:172 plugins/check_pgsql.c:601
+#: plugins/check_pgsql.c:618 plugins/check_pgsql.c:627
+#: plugins/check_pgsql.c:642 plugins/check_procs.c:351
 #, c-format
 msgid "CRITICAL"
 msgstr "CRITIQUE"
 
-#: plugins/check_disk.c:599
+#: plugins/check_disk.c:550
 #, c-format
 msgid "unit type %s not known\n"
 msgstr "unité de type %s inconnue\n"
 
-#: plugins/check_disk.c:602
+#: plugins/check_disk.c:553
 #, c-format
 msgid "failed allocating storage for '%s'\n"
 msgstr "Impossible d'allouer de l'espace pour '%s'\n"
 
-#: plugins/check_disk.c:626 plugins/check_disk.c:664 plugins/check_disk.c:669
-#: plugins/check_disk.c:676 plugins/check_disk.c:680 plugins/check_disk.c:720
-#: plugins/check_disk.c:726 plugins/check_disk.c:745 plugins/check_dummy.c:77
-#: plugins/check_dummy.c:80 plugins/check_procs.c:451
+#: plugins/check_disk.c:577 plugins/check_disk.c:618 plugins/check_disk.c:626
+#: plugins/check_disk.c:633 plugins/check_disk.c:637 plugins/check_disk.c:677
+#: plugins/check_disk.c:683 plugins/check_disk.c:702 plugins/check_dummy.c:77
+#: plugins/check_dummy.c:80 plugins/check_pgsql.c:643
+#: plugins/check_procs.c:506
 #, c-format
 msgid "UNKNOWN"
 msgstr "INCONNU"
 
-#: plugins/check_disk.c:626
+#: plugins/check_disk.c:577
 msgid "Must set a threshold value before using -p\n"
 msgstr ""
 
-#: plugins/check_disk.c:664
+#: plugins/check_disk.c:618
 msgid "Must set -E before selecting paths\n"
 msgstr ""
 
-#: plugins/check_disk.c:669
+#: plugins/check_disk.c:626
 msgid "Must set group value before selecting paths\n"
 msgstr ""
 
-#: plugins/check_disk.c:676
+#: plugins/check_disk.c:633
 msgid ""
 "Paths need to be selected before using -i/-I. Use -A to select all paths "
 "explicitly"
 msgstr ""
 
-#: plugins/check_disk.c:680 plugins/check_disk.c:726 plugins/check_procs.c:451
+#: plugins/check_disk.c:637 plugins/check_disk.c:683 plugins/check_procs.c:506
 msgid "Could not compile regular expression"
 msgstr "Impossible de compiler l'expression rationnelle"
 
-#: plugins/check_disk.c:720
+#: plugins/check_disk.c:677
 msgid "Must set a threshold value before using -r/-R\n"
 msgstr ""
 
-#: plugins/check_disk.c:746
+#: plugins/check_disk.c:703
 msgid "Regular expression did not match any path or disk"
 msgstr ""
 
-#: plugins/check_disk.c:792
+#: plugins/check_disk.c:749
 msgid "Unknown argument"
 msgstr "Argument inconnu"
 
-#: plugins/check_disk.c:826
+#: plugins/check_disk.c:783
 #, c-format
 msgid " for %s\n"
 msgstr " pour %s\n"
 
-#: plugins/check_disk.c:900
+#: plugins/check_disk.c:857
 msgid ""
 "This plugin checks the amount of used disk space on a mounted file system"
 msgstr "Ce plugin vérifie la place utilisé sur un système de fichier monté"
 
-#: plugins/check_disk.c:901
+#: plugins/check_disk.c:858
 msgid ""
 "and generates an alert if free space is less than one of the threshold values"
 msgstr ""
 "et génère une alerte si la place disponible est plus petite qu'un des seuils "
 "fourni"
 
-#: plugins/check_disk.c:911
+#: plugins/check_disk.c:868
 msgid "Exit with WARNING status if less than INTEGER units of disk are free"
 msgstr ""
 "Sortir avec un résultat AVERTISSEMENT si moins de X unités de disques sont "
 "libres"
 
-#: plugins/check_disk.c:913
+#: plugins/check_disk.c:870
 msgid "Exit with WARNING status if less than PERCENT of disk space is free"
 msgstr ""
 "Sortir avec un résultat AVERTISSEMENT si moins de X pour-cent du disque est "
 "libre"
 
-#: plugins/check_disk.c:915
+#: plugins/check_disk.c:872
 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free"
 msgstr ""
 "Sortir avec un résultat CRITIQUE si moins de X unités du disque sont libres"
 
-#: plugins/check_disk.c:917
-msgid "Exit with CRITCAL status if less than PERCENT of disk space is free"
+#: plugins/check_disk.c:874
+#, fuzzy
+msgid "Exit with CRITICAL status if less than PERCENT of disk space is free"
 msgstr ""
 "Sortir avec un résultat CRITIQUE si moins de X pour-cent du disque est libre"
 
-#: plugins/check_disk.c:919
+#: plugins/check_disk.c:876
 msgid "Exit with WARNING status if less than PERCENT of inode space is free"
 msgstr ""
 "Sortir avec un résultat AVERTISSEMENT si moins de X pour-cent des inodes "
 "sont libres"
 
-#: plugins/check_disk.c:921
+#: plugins/check_disk.c:878
 msgid "Exit with CRITICAL status if less than PERCENT of inode space is free"
 msgstr ""
 "Sortir avec un résultat CRITIQUE si moins de X pour-cent des inodes sont "
 "libres"
 
-#: plugins/check_disk.c:923
+#: plugins/check_disk.c:880
 msgid "Path or partition (may be repeated)"
 msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)"
 
-#: plugins/check_disk.c:925
+#: plugins/check_disk.c:882
 msgid "Ignore device (only works if -p unspecified)"
 msgstr "Ignorer le périphérique (marche seulement lorsque -p est utilisé)"
 
-#: plugins/check_disk.c:927
+#: plugins/check_disk.c:884
 msgid "Clear thresholds"
 msgstr "Effacer les seuils"
 
-#: plugins/check_disk.c:929
+#: plugins/check_disk.c:886
 msgid "For paths or partitions specified with -p, only check for exact paths"
 msgstr ""
 
-#: plugins/check_disk.c:931
+#: plugins/check_disk.c:888
 msgid "Display only devices/mountpoints with errors"
 msgstr "Afficher seulement les périphériques/point de montage avec des erreurs"
 
-#: plugins/check_disk.c:933
+#: plugins/check_disk.c:890
+msgid "Don't account root-reserved blocks into freespace in perfdata"
+msgstr ""
+
+#: plugins/check_disk.c:892
 msgid ""
 "Group paths. Thresholds apply to (free-)space of all partitions together"
 msgstr ""
 
-#: plugins/check_disk.c:935
+#: plugins/check_disk.c:894
 msgid "Same as '--units kB'"
 msgstr "Pareil à '--units kB'"
 
-#: plugins/check_disk.c:937
+#: plugins/check_disk.c:896
 msgid "Only check local filesystems"
 msgstr "Vérifier seulement les systèmes de fichiers locaux"
 
-#: plugins/check_disk.c:939
+#: plugins/check_disk.c:898
 msgid ""
 "Only check local filesystems against thresholds. Yet call stat on remote "
 "filesystems"
 msgstr ""
 
-#: plugins/check_disk.c:940
+#: plugins/check_disk.c:899
 msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)"
 msgstr ""
 
-#: plugins/check_disk.c:942
+#: plugins/check_disk.c:901
 msgid "Display the mountpoint instead of the partition"
 msgstr "Afficher le point de montage au lieu de la partition"
 
-#: plugins/check_disk.c:944
+#: plugins/check_disk.c:903
 msgid "Same as '--units MB'"
 msgstr "Pareil à '--units MB'"
 
-#: plugins/check_disk.c:946
+#: plugins/check_disk.c:905
 msgid "Explicitly select all paths. This is equivalent to -R '.*'"
 msgstr ""
 
-#: plugins/check_disk.c:948
+#: plugins/check_disk.c:907
 msgid ""
 "Case insensitive regular expression for path/partition (may be repeated)"
 msgstr ""
 "Expression rationnelle indépendante de la case pour un répertoire ou une "
 "partition (peut être utilisé plusieurs fois)"
 
-#: plugins/check_disk.c:950
+#: plugins/check_disk.c:909
 msgid "Regular expression for path or partition (may be repeated)"
 msgstr ""
 "Expression rationnelle pour un répertoire ou une partition (peut être "
 "utilisé plusieurs fois)"
 
-#: plugins/check_disk.c:952
+#: plugins/check_disk.c:911
 msgid ""
 "Regular expression to ignore selected path/partition (case insensitive) (may "
 "be repeated)"
@@ -569,51 +594,58 @@ msgstr ""
 "Expression rationnelle pour ignorer un répertoire ou une partition (peut "
 "être utilisé plusieurs fois)"
 
-#: plugins/check_disk.c:954
+#: plugins/check_disk.c:913
 msgid ""
 "Regular expression to ignore selected path or partition (may be repeated)"
 msgstr ""
 "Expression rationnelle pour ignorer un répertoire ou une partition (peut "
 "être utilisé plusieurs fois)"
 
-#: plugins/check_disk.c:957
+#: plugins/check_disk.c:916
 msgid "Choose bytes, kB, MB, GB, TB (default: MB)"
 msgstr "Choisissez octets, kb, MB, GB, TB (par défaut: MB)"
 
-#: plugins/check_disk.c:960
+#: plugins/check_disk.c:919
 msgid "Ignore all filesystems of indicated type (may be repeated)"
 msgstr ""
 "Ignorer tout les systèmes de fichiers qui correspondent au type indiqué "
 "(peut être utilisé plusieurs fois)"
 
-#: plugins/check_disk.c:965
+#: plugins/check_disk.c:921
+#, fuzzy
+msgid "Check only filesystems of indicated type (may be repeated)"
+msgstr ""
+"Ignorer tout les systèmes de fichiers qui correspondent au type indiqué "
+"(peut être utilisé plusieurs fois)"
+
+#: plugins/check_disk.c:926
 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:967
+#: plugins/check_disk.c:928
 msgid ""
 "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
 "r regex"
 msgstr ""
 
-#: plugins/check_disk.c:968
+#: plugins/check_disk.c:929
 msgid ""
 "are grouped which means the freespace thresholds are applied to all disks "
 "together"
 msgstr ""
 
-#: plugins/check_disk.c:970
+#: plugins/check_disk.c:931
 msgid ""
 "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
 "100M/50M"
 msgstr ""
 
-#: plugins/check_disk.c:996
+#: plugins/check_disk.c:957
 #, c-format
 msgid "%s %s: %s\n"
 msgstr ""
 
-#: plugins/check_disk.c:996
+#: plugins/check_disk.c:957
 msgid "is not accessible"
 msgstr ""
 
@@ -650,13 +682,15 @@ msgid "server %s is not authoritative for %s"
 msgstr "serveur %s n'est pas autoritaire pour %s"
 
 #: plugins/check_dns.c:237 plugins/check_dummy.c:68 plugins/check_nagios.c:182
-#: plugins/check_procs.c:283
+#: plugins/check_pgsql.c:638 plugins/check_procs.c:344
 #, c-format
 msgid "OK"
 msgstr "OK"
 
-#: plugins/check_dns.c:239 plugins/check_dummy.c:71 plugins/check_mysql.c:209
-#: plugins/check_nagios.c:182 plugins/check_procs.c:285
+#: plugins/check_dns.c:239 plugins/check_dummy.c:71 plugins/check_mysql.c:296
+#: plugins/check_nagios.c:182 plugins/check_pgsql.c:607
+#: plugins/check_pgsql.c:612 plugins/check_pgsql.c:640
+#: plugins/check_procs.c:346
 #, c-format
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
@@ -840,102 +874,126 @@ msgstr ""
 msgid "of the <state> argument with optional text"
 msgstr "du paramètre <state> avec un texte optionnel"
 
-#: plugins/check_fping.c:108 plugins/check_hpjd.c:128 plugins/check_ping.c:437
-#: plugins/check_swap.c:175 plugins/check_users.c:73 plugins/urlize.c:110
+#: plugins/check_fping.c:125 plugins/check_hpjd.c:128 plugins/check_ping.c:438
+#: plugins/check_swap.c:175 plugins/check_users.c:94 plugins/urlize.c:110
 #, c-format
 msgid "Could not open pipe: %s\n"
 msgstr "Impossible d'ouvrir le pipe: %s\n"
 
-#: plugins/check_fping.c:114 plugins/check_hpjd.c:134 plugins/check_load.c:153
-#: plugins/check_swap.c:181 plugins/check_users.c:79 plugins/urlize.c:116
+#: plugins/check_fping.c:131 plugins/check_hpjd.c:134 plugins/check_load.c:153
+#: plugins/check_swap.c:181 plugins/check_users.c:100 plugins/urlize.c:116
 #, c-format
 msgid "Could not open stderr for %s\n"
 msgstr "Impossible d'ouvrir la sortie d'erreur standard pour %s\n"
 
-#: plugins/check_fping.c:154
+#: plugins/check_fping.c:157
+#, fuzzy
+msgid "FPING UNKNOWN - IP address not found\n"
+msgstr "PING INCONNU - Hôte non trouvé (%s)\n"
+
+#: plugins/check_fping.c:160
+msgid "FPING UNKNOWN - invalid commandline argument\n"
+msgstr ""
+
+#: plugins/check_fping.c:163
+#, fuzzy
+msgid "FPING UNKNOWN - failed system call\n"
+msgstr "PING INCONNU - Hôte non trouvé (%s)\n"
+
+#: plugins/check_fping.c:187
 #, c-format
 msgid "FPING UNKNOW - %s not found\n"
 msgstr "PING INCONNU - Hôte non trouvé (%s)\n"
 
-#: plugins/check_fping.c:158
+#: plugins/check_fping.c:191
 #, c-format
 msgid "FPING CRITICAL - %s is unreachable\n"
 msgstr "PING CRITIQUE - Hôte inaccessible (%s)\n"
 
-#: plugins/check_fping.c:163
+#: plugins/check_fping.c:196
+#, fuzzy, c-format
+msgid "FPING UNKNOWN - %s parameter error\n"
+msgstr "PING INCONNU - Hôte non trouvé (%s)\n"
+
+#: plugins/check_fping.c:200 plugins/check_fping.c:240
 #, c-format
 msgid "FPING CRITICAL - %s is down\n"
 msgstr "FPING CRITIQUE - %s est en panne\n"
 
-#: plugins/check_fping.c:190
+#: plugins/check_fping.c:227
 #, c-format
 msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"
 msgstr "FPING %s - %s (perte=%.0f%%, rta=%f ms)|%s %s\n"
 
-#: plugins/check_fping.c:211
+#: plugins/check_fping.c:253
 #, c-format
 msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
 msgstr "FPING %s - %s (perte=%.0f%% )|%s\n"
 
-#: plugins/check_fping.c:280 plugins/check_hpjd.c:338 plugins/check_hpjd.c:361
-#: plugins/check_mysql.c:276 plugins/check_mysql.c:334 plugins/check_ntp.c:705
-#: plugins/check_ntp_peer.c:491 plugins/check_ntp_time.c:492
-#: plugins/check_pgsql.c:268 plugins/check_ping.c:295 plugins/check_ping.c:418
+#: plugins/check_fping.c:326 plugins/check_fping.c:332
+#: plugins/check_hpjd.c:338 plugins/check_hpjd.c:361 plugins/check_mysql.c:371
+#: plugins/check_mysql.c:455 plugins/check_ntp.c:709
+#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:496
+#: plugins/check_pgsql.c:335 plugins/check_ping.c:295 plugins/check_ping.c:418
 #: plugins/check_radius.c:264 plugins/check_real.c:314
-#: plugins/check_real.c:376 plugins/check_smtp.c:507 plugins/check_smtp.c:633
+#: plugins/check_real.c:376 plugins/check_smtp.c:499 plugins/check_smtp.c:641
 #: plugins/check_ssh.c:157 plugins/check_time.c:240 plugins/check_time.c:315
 #: plugins/check_ups.c:504 plugins/check_ups.c:573
 msgid "Invalid hostname/address"
 msgstr "Adresse/Nom d'hôte invalide"
 
-#: plugins/check_fping.c:314
+#: plugins/check_fping.c:345 plugins/check_ldap.c:353 plugins/check_ping.c:246
+msgid "IPv6 support not available\n"
+msgstr "Support IPv6 non disponible\n"
+
+#: plugins/check_fping.c:378
 msgid "Packet size must be a positive integer"
 msgstr "La taille du paquet doit être un entier positif"
 
-#: plugins/check_fping.c:320
+#: plugins/check_fping.c:384
 msgid "Packet count must be a positive integer"
 msgstr "Le nombre de paquets doit être un entier positif"
 
-#: plugins/check_fping.c:326
+#: plugins/check_fping.c:390
 msgid "Target timeout must be a positive integer"
 msgstr "Le seuil d'avertissement doit être un entier positif"
 
-#: plugins/check_fping.c:332
+#: plugins/check_fping.c:396
 msgid "Interval must be a positive integer"
 msgstr "Le délai d'attente doit être un entier positif"
 
-#: plugins/check_fping.c:338 plugins/check_ntp.c:729
-#: plugins/check_ntp_peer.c:518 plugins/check_ntp_time.c:519
+#: plugins/check_fping.c:402 plugins/check_ntp.c:733
+#: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:523
 #: plugins/check_radius.c:314 plugins/check_time.c:319
 msgid "Hostname was not supplied"
 msgstr "Le nom de l'hôte n'a pas été spécifié"
 
-#: plugins/check_fping.c:358
+#: plugins/check_fping.c:422
 #, c-format
 msgid "%s: Only one threshold may be packet loss (%s)\n"
 msgstr ""
 "%s: Seulement un seuil peut être utilisé pour les pertes de paquets (%s)\n"
 
-#: plugins/check_fping.c:362
+#: plugins/check_fping.c:426
 #, c-format
 msgid "%s: Only one threshold must be packet loss (%s)\n"
 msgstr ""
 "%s: Seulement un seuil doit être utilisé pour les pertes de paquets (%s)\n"
 
-#: plugins/check_fping.c:394
+#: plugins/check_fping.c:458
 msgid ""
 "This plugin will use the fping command to ping the specified host for a fast "
 "check"
 msgstr ""
 "Ce plugin va utiliser la commande fping pour pinger l'hôte de manière rapide."
 
-#: plugins/check_fping.c:396
+#: plugins/check_fping.c:460
 msgid "Note that it is necessary to set the suid flag on fping."
 msgstr ""
 "Veuillez noter qu'il est nécessaire de mettre le bit suid sur le programme "
 "fping."
 
-#: plugins/check_fping.c:406
+#: plugins/check_fping.c:472
 msgid ""
 "name or IP Address of host to ping (IP Address bypasses name lookup, "
 "reducing system load)"
@@ -943,31 +1001,39 @@ msgstr ""
 "nom ou adresse IP des hôtes à pinger (l'indication d'un adresse IP évite une "
 "recherche sur le nom, ce qui réduit la charge système)"
 
-#: plugins/check_fping.c:408 plugins/check_ping.c:573
+#: plugins/check_fping.c:474 plugins/check_ping.c:575
 msgid "warning threshold pair"
 msgstr "Valeurs pour le seuil d'avertissement"
 
-#: plugins/check_fping.c:410 plugins/check_ping.c:575
+#: plugins/check_fping.c:476 plugins/check_ping.c:577
 msgid "critical threshold pair"
 msgstr "Valeurs pour le seuil critique"
 
-#: plugins/check_fping.c:412
+#: plugins/check_fping.c:478
 msgid "size of ICMP packet"
 msgstr "taille du paquet ICMP"
 
-#: plugins/check_fping.c:414
+#: plugins/check_fping.c:480
 msgid "number of ICMP packets to send"
 msgstr "nombre de paquets ICMP à envoyer"
 
-#: plugins/check_fping.c:416
+#: plugins/check_fping.c:482
 msgid "Target timeout (ms)"
 msgstr ""
 
-#: plugins/check_fping.c:418
+#: plugins/check_fping.c:484
 msgid "Interval (ms) between sending packets"
 msgstr ""
 
-#: plugins/check_fping.c:421
+#: plugins/check_fping.c:486
+msgid "name or IP Address of sourceip"
+msgstr ""
+
+#: plugins/check_fping.c:488
+msgid "source interface name"
+msgstr ""
+
+#: plugins/check_fping.c:491
 #, c-format
 msgid ""
 "THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time "
@@ -976,17 +1042,21 @@ msgstr ""
 "Le seuil est <rta>,<pl>%% ou <rta> est le temps moyen pour l'aller retour "
 "(ms)"
 
-#: plugins/check_fping.c:422
+#: plugins/check_fping.c:492
 msgid ""
 "which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"
 msgstr ""
 "qui déclenche résultat AVERTISSEMENT ou CRITIQUE, et <pl> est le pourcentage "
 "de"
 
-#: plugins/check_fping.c:423
+#: plugins/check_fping.c:493
 msgid "packet loss to trigger an alarm state."
 msgstr "paquets perdu pour déclencher une alarme."
 
+#: plugins/check_fping.c:496
+msgid "IPv4 is used by default. Specify -6 to use IPv6."
+msgstr ""
+
 #: plugins/check_game.c:111
 #, c-format
 msgid "CRITICAL - Host type parameter incorrect!\n"
@@ -1116,463 +1186,540 @@ msgstr "Le nom de la communauté SNMP "
 msgid "(default=%s)"
 msgstr "(défaut=%s)"
 
-#: plugins/check_http.c:262
-msgid "Critical threshold must be integer"
-msgstr "le seuil critique doit être un entier positif"
-
-#: plugins/check_http.c:270
-msgid "Warning threshold must be integer"
-msgstr "Le seuil d'avertissement doit être un entier positif"
+#: plugins/check_http.c:189
+msgid "file does not exist or is not readable"
+msgstr ""
 
-#: plugins/check_http.c:296 plugins/check_tcp.c:559
+#: plugins/check_http.c:310 plugins/check_http.c:315 plugins/check_http.c:321
+#: plugins/check_smtp.c:600 plugins/check_tcp.c:576 plugins/check_tcp.c:580
+#: plugins/check_tcp.c:586
 msgid "Invalid certificate expiration period"
 msgstr "Période d'expiration du certificat invalide"
 
-#: plugins/check_http.c:305 plugins/check_tcp.c:571
+#: plugins/check_http.c:348
+msgid ""
+"Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 "
+"(SSLv3)"
+msgstr ""
+
+#: plugins/check_http.c:354 plugins/check_tcp.c:599
 msgid "Invalid option - SSL is not available"
 msgstr "Option invalide - SSL n'est pas disponible"
 
-#: plugins/check_http.c:329
+#: plugins/check_http.c:375
 msgid "Invalid onredirect option"
 msgstr ""
 
-#: plugins/check_http.c:331
+#: plugins/check_http.c:377
 #, c-format
 msgid "option f:%d \n"
 msgstr "option f:%d \n"
 
-#: plugins/check_http.c:352
+#: plugins/check_http.c:398
 msgid "Invalid port number"
 msgstr "Numéro de port invalide"
 
-#: plugins/check_http.c:400
+#: plugins/check_http.c:450
 #, c-format
 msgid "Could Not Compile Regular Expression: %s"
 msgstr "Impossible de compiler l'expression rationnelle: %s"
 
-#: plugins/check_http.c:414 plugins/check_ntp.c:718
-#: plugins/check_ntp_peer.c:507 plugins/check_ntp_time.c:508
-#: plugins/check_smtp.c:613 plugins/check_ssh.c:149 plugins/check_tcp.c:463
+#: plugins/check_http.c:464 plugins/check_ntp.c:722
+#: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:512
+#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:477
 msgid "IPv6 support not available"
 msgstr "Support IPv6 non disponible"
 
-#: plugins/check_http.c:476 plugins/check_ping.c:422
+#: plugins/check_http.c:529 plugins/check_ping.c:422
 msgid "You must specify a server address or host name"
 msgstr "Vous devez spécifier une adresse ou un nom d'hôte"
 
-#: plugins/check_http.c:609 plugins/check_http.c:777
+#: plugins/check_http.c:543
+msgid ""
+"If you use a client certificate you must also specify a private key file"
+msgstr ""
+
+#: plugins/check_http.c:667 plugins/check_http.c:835
 msgid "HTTP UNKNOWN - Memory allocation error\n"
 msgstr "HTTP INCONNU - Impossible d'allouer la mémoire\n"
 
-#: plugins/check_http.c:681
+#: plugins/check_http.c:739
 #, c-format
 msgid "%sServer date unknown, "
 msgstr "%sDate du serveur inconnue, "
 
-#: plugins/check_http.c:684
+#: plugins/check_http.c:742
 #, c-format
 msgid "%sDocument modification date unknown, "
 msgstr "%sDate de modification du document inconnue, "
 
-#: plugins/check_http.c:691
+#: plugins/check_http.c:749
 #, c-format
 msgid "%sServer date \"%100s\" unparsable, "
 msgstr "%sDate du serveur \"%100s\" illisible, "
 
-#: plugins/check_http.c:694
+#: plugins/check_http.c:752
 #, c-format
 msgid "%sDocument date \"%100s\" unparsable, "
 msgstr "%sDate du document \"%100s\" illisible, "
 
-#: plugins/check_http.c:697
+#: plugins/check_http.c:755
 #, c-format
 msgid "%sDocument is %d seconds in the future, "
 msgstr "%sLa date du document est %d secondes dans le futur, "
 
-#: plugins/check_http.c:702
+#: plugins/check_http.c:760
 #, c-format
 msgid "%sLast modified %.1f days ago, "
 msgstr "%sDernière modification %.1f jours auparavant, "
 
-#: plugins/check_http.c:705
+#: plugins/check_http.c:763
 #, c-format
 msgid "%sLast modified %d:%02d:%02d ago, "
 msgstr "%sDernière modification %d:%02d:%02d auparavant, "
 
-#: plugins/check_http.c:807
+#: plugins/check_http.c:876
 msgid "HTTP CRITICAL - Unable to open TCP socket\n"
 msgstr "HTTP CRITIQUE - Impossible d'ouvrir un socket TCP\n"
 
-#: plugins/check_http.c:910
+#: plugins/check_http.c:995
 msgid "HTTP CRITICAL - Error on receive\n"
 msgstr "HTTP CRITIQUE - Erreur dans la réception\n"
 
-#: plugins/check_http.c:920
+#: plugins/check_http.c:1005
 msgid "HTTP CRITICAL - No data received from host\n"
 msgstr "HTTP CRITIQUE - Pas de données reçues de l'hôte\n"
 
-#: plugins/check_http.c:971
+#: plugins/check_http.c:1056
 #, c-format
 msgid "Invalid HTTP response received from host: %s\n"
 msgstr "Réponse HTTP reçue de l'hôte invalide: %s\n"
 
-#: plugins/check_http.c:975
+#: plugins/check_http.c:1060
 #, c-format
 msgid "Invalid HTTP response received from host on port %d: %s\n"
 msgstr "Réponse HTTP reçue de l'hôte sur le port %d invalide: %s\n"
 
-#: plugins/check_http.c:984
+#: plugins/check_http.c:1069
 #, c-format
 msgid "Status line output matched \"%s\" - "
 msgstr "La ligne d'état correspond à \"%s\" - "
 
-#: plugins/check_http.c:995
+#: plugins/check_http.c:1080
 #, c-format
 msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
 msgstr "HTTP CRITIQUE: Ligne d'état non valide (%s)\n"
 
-#: plugins/check_http.c:1002
+#: plugins/check_http.c:1087
 #, c-format
 msgid "HTTP CRITICAL: Invalid Status (%s)\n"
 msgstr "HTTP CRITIQUE: Etat Invalide (%s)\n"
 
-#: plugins/check_http.c:1006 plugins/check_http.c:1011
-#: plugins/check_http.c:1021 plugins/check_http.c:1025
+#: plugins/check_http.c:1091 plugins/check_http.c:1096
+#: plugins/check_http.c:1106 plugins/check_http.c:1110
 #, c-format
 msgid "%s - "
 msgstr ""
 
-#: plugins/check_http.c:1045
+#: plugins/check_http.c:1129
+#, fuzzy, c-format
+msgid "%sheader '%s' not found on '%s://%s:%d%s', "
+msgstr "%schaîne non trouvée, "
+
+#: plugins/check_http.c:1141
 #, fuzzy, c-format
 msgid "%sstring '%s' not found on '%s://%s:%d%s', "
 msgstr "%schaîne non trouvée, "
 
-#: plugins/check_http.c:1058
+#: plugins/check_http.c:1154
 #, c-format
 msgid "%spattern not found, "
 msgstr "%sexpression non trouvée, "
 
-#: plugins/check_http.c:1060
+#: plugins/check_http.c:1156
 #, c-format
 msgid "%spattern found, "
 msgstr "%sexpression trouvée, "
 
-#: plugins/check_http.c:1066
+#: plugins/check_http.c:1162
 #, c-format
 msgid "%sExecute Error: %s, "
 msgstr "%sErreur d'exécution: %s, "
 
-#: plugins/check_http.c:1082
+#: plugins/check_http.c:1178
 #, c-format
 msgid "%spage size %d too large, "
 msgstr "%sla taille de la page est trop grande (%d), "
 
-#: plugins/check_http.c:1085
+#: plugins/check_http.c:1181
 #, c-format
 msgid "%spage size %d too small, "
 msgstr "%sla taille de la page est trop petite (%d), "
 
-#: plugins/check_http.c:1097
+#: plugins/check_http.c:1194
+#, fuzzy, c-format
+msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s"
+msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s"
+
+#: plugins/check_http.c:1206
 #, c-format
 msgid "%s - %d bytes in %.3f second response time %s|%s %s"
 msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s"
 
-#: plugins/check_http.c:1137
+#: plugins/check_http.c:1244
 msgid "HTTP UNKNOWN - Could not allocate addr\n"
 msgstr "HTTP INCONNU - Impossible d'allouer une adresse\n"
 
-#: plugins/check_http.c:1141 plugins/check_http.c:1172
+#: plugins/check_http.c:1248 plugins/check_http.c:1279
 msgid "HTTP UNKNOWN - Could not allocate URL\n"
 msgstr "HTTP INCONNU - Impossible d'allouer l'URL\n"
 
-#: plugins/check_http.c:1150
+#: plugins/check_http.c:1257
 #, c-format
 msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n"
 msgstr ""
 "HTTP INCONNU - Impossible de trouver l'endroit de la redirection - %s%s\n"
 
-#: plugins/check_http.c:1165
+#: plugins/check_http.c:1272
 #, c-format
 msgid "HTTP UNKNOWN - Empty redirect location%s\n"
 msgstr "HTTP INCONNU - endroit de redirection vide%s\n"
 
-#: plugins/check_http.c:1215
+#: plugins/check_http.c:1322
 #, c-format
 msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n"
 msgstr ""
 "HTTP INCONNU - Impossible de définir l'endroit de la redirection - %s%s\n"
 
-#: plugins/check_http.c:1225
+#: plugins/check_http.c:1332
 #, c-format
 msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"
 msgstr ""
-"HTTP AVERTISSEMENT - le niveau maximum de redirection %d à été dépassé - %"
-"s://%s:%d%s%s\n"
+"HTTP AVERTISSEMENT - le niveau maximum de redirection %d à été dépassé - "
+"%s://%s:%d%s%s\n"
 
-#: plugins/check_http.c:1233
+#: plugins/check_http.c:1340
 #, c-format
 msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"
 msgstr ""
-"HTTP AVERTISSEMENT - la redirection crée une boucle infinie - %s://%s:%d%s%"
-"s\n"
+"HTTP AVERTISSEMENT - la redirection crée une boucle infinie - %s://%s:%d%s"
+"%s\n"
 
-#: plugins/check_http.c:1254
+#: plugins/check_http.c:1361
 #, c-format
 msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"
 msgstr "HTTP INCONNU - Redirection à un port supérieur à %d - %s://%s:%d%s%s\n"
 
-#: plugins/check_http.c:1259
+#: plugins/check_http.c:1366
 #, c-format
 msgid "Redirection to %s://%s:%d%s\n"
 msgstr "Redirection vers %s://%s:%d%s\n"
 
-#: plugins/check_http.c:1310
+#: plugins/check_http.c:1440
 msgid "This plugin tests the HTTP service on the specified host. It can test"
 msgstr ""
 "Ce plugin teste le service HTTP sur l'hôte spécifié. Il peut tester les"
 
-#: plugins/check_http.c:1311
+#: plugins/check_http.c:1441
 msgid "normal (http) and secure (https) servers, follow redirects, search for"
 msgstr ""
 "serveurs normaux (http) et sécurisés (https), suivre les redirections, "
 "rechercher des"
 
-#: plugins/check_http.c:1312
+#: plugins/check_http.c:1442
 msgid "strings and regular expressions, check connection times, and report on"
 msgstr ""
 "chaînes de caractères et expressions rationnelles, vérifier le temps de "
 "réponse"
 
-#: plugins/check_http.c:1313
+#: plugins/check_http.c:1443
 msgid "certificate expiration times."
 msgstr "et rapporter la date d'expiration du certificat."
 
-#: plugins/check_http.c:1319
+#: plugins/check_http.c:1449
 #, c-format
 msgid "NOTE: One or both of -H and -I must be specified"
 msgstr "NOTE: les paramètres -H et -I peuvent être spécifiés"
 
-#: plugins/check_http.c:1327
+#: plugins/check_http.c:1457
 msgid "Host name argument for servers using host headers (virtual host)"
 msgstr ""
 
-#: plugins/check_http.c:1328
+#: plugins/check_http.c:1458
 msgid "Append a port to include it in the header (eg: example.com:5000)"
 msgstr ""
 
-#: plugins/check_http.c:1330
+#: plugins/check_http.c:1460
 msgid ""
 "IP address or name (use numeric address if possible to bypass DNS lookup)."
 msgstr ""
 
-#: plugins/check_http.c:1332
+#: plugins/check_http.c:1462
 msgid "Port number (default: "
 msgstr "Numéro du port (défaut: "
 
-#: plugins/check_http.c:1339
-msgid "Connect via SSL. Port defaults to 443"
+#: plugins/check_http.c:1469
+msgid ""
+"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"
+msgstr ""
+
+#: plugins/check_http.c:1470
+msgid "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)."
 msgstr ""
 
-#: plugins/check_http.c:1341
+#: plugins/check_http.c:1472
 msgid "Enable SSL/TLS hostname extension support (SNI)"
 msgstr ""
 
-#: plugins/check_http.c:1343
+#: plugins/check_http.c:1474
 msgid ""
 "Minimum number of days a certificate has to be valid. Port defaults to 443"
 msgstr ""
 "Nombre de jours minimum pour que le certificat soit valide. Port par défaut "
 "443"
 
-#: plugins/check_http.c:1344
-msgid "(when this option is used the URL is not checked.)\n"
+#: plugins/check_http.c:1475
+msgid "(when this option is used the URL is not checked.)"
+msgstr ""
+
+#: plugins/check_http.c:1477
+msgid "Name of file that contains the client certificate (PEM format)"
+msgstr ""
+
+#: plugins/check_http.c:1478
+msgid "to be used in establishing the SSL session"
+msgstr ""
+
+#: plugins/check_http.c:1480
+msgid "Name of file containing the private key (PEM format)"
+msgstr ""
+
+#: plugins/check_http.c:1481
+msgid "matching the client certificate"
 msgstr ""
 
-#: plugins/check_http.c:1348
+#: plugins/check_http.c:1485
 msgid "Comma-delimited list of strings, at least one of them is expected in"
 msgstr ""
 "Liste the chaines de charactères séparées par des virgules, au moins une "
 "d'elles"
 
-#: plugins/check_http.c:1349
+#: plugins/check_http.c:1486
 msgid "the first (status) line of the server response (default: "
 msgstr "est attendue dans la première ligne de réponse du serveur (défaut: "
 
-#: plugins/check_http.c:1351
+#: plugins/check_http.c:1488
 msgid ""
 "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"
 msgstr ""
 "Si spécifié, surpasse toute autre logique de status (ex: 3xx, 4xx, 5xx)"
 
-#: plugins/check_http.c:1353
+#: plugins/check_http.c:1490
+#, fuzzy
+msgid "String to expect in the response headers"
+msgstr "Chaîne de caractères à attendre en réponse"
+
+#: plugins/check_http.c:1492
 msgid "String to expect in the content"
 msgstr "Chaîne de caractère attendue dans le contenu"
 
-#: plugins/check_http.c:1355
+#: plugins/check_http.c:1494
 msgid "URL to GET or POST (default: /)"
 msgstr "URL pour le GET ou le POST (défaut: /)"
 
-#: plugins/check_http.c:1357
+#: plugins/check_http.c:1496
 msgid "URL encoded http POST data"
 msgstr ""
 
-#: plugins/check_http.c:1359
+#: plugins/check_http.c:1498
 msgid "Set HTTP method."
 msgstr ""
 
-#: plugins/check_http.c:1361
+#: plugins/check_http.c:1500
 msgid "Don't wait for document body: stop reading after headers."
 msgstr ""
 "Ne pas attendre pour le corps du document: arrêter de lire après les entêtes"
 
-#: plugins/check_http.c:1362
+#: plugins/check_http.c:1501
 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)"
 msgstr "(Veuillez noter qu'un HTTP GET ou POST est effectué, pas un HEAD.)"
 
-#: plugins/check_http.c:1364
+#: plugins/check_http.c:1503
 msgid "Warn if document is more than SECONDS old. the number can also be of"
 msgstr ""
 
-#: plugins/check_http.c:1365
+#: plugins/check_http.c:1504
 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."
 msgstr ""
 
-#: plugins/check_http.c:1367
+#: plugins/check_http.c:1506
 msgid "specify Content-Type header media type when POSTing\n"
 msgstr ""
 
-#: plugins/check_http.c:1370
+#: plugins/check_http.c:1509
 msgid "Allow regex to span newlines (must precede -r or -R)"
 msgstr ""
 
-#: plugins/check_http.c:1372
+#: plugins/check_http.c:1511
 msgid "Search page for regex STRING"
 msgstr ""
 
-#: plugins/check_http.c:1374
+#: plugins/check_http.c:1513
 msgid "Search page for case-insensitive regex STRING"
 msgstr ""
 
-#: plugins/check_http.c:1376
+#: plugins/check_http.c:1515
 msgid "Return CRITICAL if found, OK if not\n"
 msgstr ""
 
-#: plugins/check_http.c:1379
+#: plugins/check_http.c:1518
 msgid "Username:password on sites with basic authentication"
 msgstr ""
 
-#: plugins/check_http.c:1381
+#: plugins/check_http.c:1520
 msgid "Username:password on proxy-servers with basic authentication"
 msgstr ""
 
-#: plugins/check_http.c:1383
+#: plugins/check_http.c:1522
 msgid "String to be sent in http header as \"User Agent\""
 msgstr ""
 
-#: plugins/check_http.c:1385
+#: plugins/check_http.c:1524
 msgid ""
-" Any other tags to be sent in http header. Use multiple times for additional "
+"Any other tags to be sent in http header. Use multiple times for additional "
 "headers"
 msgstr ""
 
-#: plugins/check_http.c:1387
+#: plugins/check_http.c:1526
+msgid "Print additional performance data"
+msgstr ""
+
+#: plugins/check_http.c:1528
 msgid "Wrap output in HTML link (obsoleted by urlize)"
 msgstr ""
 
-#: plugins/check_http.c:1389
+#: plugins/check_http.c:1530
 msgid "How to handle redirected pages. sticky is like follow but stick to the"
 msgstr ""
 
-#: plugins/check_http.c:1390
-msgid "specified IP address. stickyport also ensure post stays the same."
+#: plugins/check_http.c:1531
+msgid "specified IP address. stickyport also ensures port stays the same."
 msgstr ""
 
-#: plugins/check_http.c:1392
+#: plugins/check_http.c:1533
 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)"
 msgstr ""
 
-#: plugins/check_http.c:1402
+#: plugins/check_http.c:1543
 msgid "This plugin will attempt to open an HTTP connection with the host."
 msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte."
 
-#: plugins/check_http.c:1403
+#: plugins/check_http.c:1544
 msgid ""
 "Successful connects return STATE_OK, refusals and timeouts return "
 "STATE_CRITICAL"
 msgstr ""
 
-#: plugins/check_http.c:1404
+#: plugins/check_http.c:1545
 msgid ""
 "other errors return STATE_UNKNOWN.  Successful connects, but incorrect "
 "reponse"
 msgstr ""
 
-#: plugins/check_http.c:1405
+#: plugins/check_http.c:1546
 msgid ""
 "messages from the host result in STATE_WARNING return values.  If you are"
 msgstr ""
 
-#: plugins/check_http.c:1406
+#: plugins/check_http.c:1547
 msgid ""
 "checking a virtual server that uses 'host headers' you must supply the FQDN"
 msgstr ""
 
-#: plugins/check_http.c:1407
+#: plugins/check_http.c:1548
 msgid "(fully qualified domain name) as the [host_name] argument."
 msgstr ""
 
-#: plugins/check_http.c:1411
+#: plugins/check_http.c:1552
 msgid "This plugin can also check whether an SSL enabled web server is able to"
 msgstr ""
 
-#: plugins/check_http.c:1412
+#: plugins/check_http.c:1553
 msgid "serve content (optionally within a specified time) or whether the X509 "
 msgstr ""
 
-#: plugins/check_http.c:1413
+#: plugins/check_http.c:1554
 msgid "certificate is still valid for the specified number of days."
 msgstr ""
 
-#: plugins/check_http.c:1417
+#: plugins/check_http.c:1556
+#, fuzzy
+msgid "Please note that this plugin does not check if the presented server"
+msgstr "Ce plugin vérifie le service ntp sur l'hôte"
+
+#: plugins/check_http.c:1557
+msgid "certificate matches the hostname of the server, or if the certificate"
+msgstr ""
+
+#: plugins/check_http.c:1558
+msgid "has a valid chain of trust to one of the locally installed CAs."
+msgstr ""
+
+#: plugins/check_http.c:1562
 msgid ""
 "When the 'www.verisign.com' server returns its content within 5 seconds,"
 msgstr ""
 
-#: plugins/check_http.c:1418
+#: plugins/check_http.c:1563
 msgid ""
 "a STATE_OK will be returned. When the server returns its content but exceeds"
 msgstr ""
 
-#: plugins/check_http.c:1419
+#: plugins/check_http.c:1564
 msgid ""
 "the 5-second threshold, a STATE_WARNING will be returned. When an error "
 "occurs,"
 msgstr ""
 
-#: plugins/check_http.c:1420
+#: plugins/check_http.c:1565
 msgid "a STATE_CRITICAL will be returned."
 msgstr ""
 
-#: plugins/check_http.c:1423
+#: plugins/check_http.c:1568
 msgid ""
 "When the certificate of 'www.verisign.com' is valid for more than 14 days,"
 msgstr ""
 
-#: plugins/check_http.c:1424
+#: plugins/check_http.c:1569 plugins/check_http.c:1575
 msgid ""
 "a STATE_OK is returned. When the certificate is still valid, but for less "
 "than"
 msgstr ""
 
-#: plugins/check_http.c:1425
+#: plugins/check_http.c:1570
 msgid ""
 "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
 msgstr ""
 
-#: plugins/check_http.c:1426
+#: plugins/check_http.c:1571
 msgid "the certificate is expired."
 msgstr "le certificat est expiré."
 
+#: plugins/check_http.c:1574
+msgid ""
+"When the certificate of 'www.verisign.com' is valid for more than 30 days,"
+msgstr ""
+
+#: plugins/check_http.c:1576
+msgid "30 days, but more than 14 days, a STATE_WARNING is returned."
+msgstr ""
+
+#: plugins/check_http.c:1577
+msgid ""
+"A STATE_CRITICAL will be returned when certificate expires in less than 14 "
+"days"
+msgstr ""
+
 #: plugins/check_ldap.c:133
 #, c-format
 msgid "Could not connect to the server at port %i\n"
@@ -1619,81 +1766,77 @@ msgstr "Impossible de chercher/trouver les objectclasses dans %s\n"
 msgid "LDAP %s - %.3f seconds response time|%s\n"
 msgstr "LDAP %s - %.3f secondes de temps de réponse|%s\n"
 
-#: plugins/check_ldap.c:339 plugins/check_ldap.c:346
+#: plugins/check_ldap.c:339 plugins/check_ldap.c:347
 #, c-format
 msgid "%s cannot be combined with %s"
 msgstr ""
 
-#: plugins/check_ldap.c:352 plugins/check_ping.c:246
-msgid "IPv6 support not available\n"
-msgstr "Support IPv6 non disponible\n"
-
-#: plugins/check_ldap.c:375
+#: plugins/check_ldap.c:379
 msgid "Please specify the host name\n"
 msgstr "Veuillez spécifier le nom de l'hôte\n"
 
-#: plugins/check_ldap.c:378
+#: plugins/check_ldap.c:382
 msgid "Please specify the LDAP base\n"
 msgstr "Veuillez spécifier la base LDAP\n"
 
-#: plugins/check_ldap.c:407
+#: plugins/check_ldap.c:411
 msgid "ldap attribute to search (default: \"(objectclass=*)\""
 msgstr ""
 
-#: plugins/check_ldap.c:409
+#: plugins/check_ldap.c:413
 msgid "ldap base (eg. ou=my unit, o=my org, c=at"
 msgstr ""
 
-#: plugins/check_ldap.c:411
+#: plugins/check_ldap.c:415
 msgid "ldap bind DN (if required)"
 msgstr ""
 
-#: plugins/check_ldap.c:413
+#: plugins/check_ldap.c:417
 msgid "ldap password (if required)"
 msgstr ""
 
-#: plugins/check_ldap.c:415
+#: plugins/check_ldap.c:419
 msgid "use starttls mechanism introduced in protocol version 3"
 msgstr "utiliser le fonctionnement starttls du protocole version 3"
 
-#: plugins/check_ldap.c:417
+#: plugins/check_ldap.c:421
 msgid "use ldaps (ldap v2 ssl method). this also sets the default port to"
 msgstr ""
 
-#: plugins/check_ldap.c:421
+#: plugins/check_ldap.c:425
 msgid "use ldap protocol version 2"
 msgstr "utiliser le protocole ldap version 2"
 
-#: plugins/check_ldap.c:423
+#: plugins/check_ldap.c:427
 msgid "use ldap protocol version 3"
 msgstr "utiliser le protocole ldap version 3"
 
-#: plugins/check_ldap.c:424
+#: plugins/check_ldap.c:428
 msgid "default protocol version:"
 msgstr "version du protocole par défaut:"
 
-#: plugins/check_ldap.c:435
+#: plugins/check_ldap.c:439
 msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"
 msgstr ""
 
-#: plugins/check_ldap.c:436
+#: plugins/check_ldap.c:440
 #, c-format
 msgid ""
 " implied (using default port %i) unless --port=636 is specified. In that "
 "case\n"
 msgstr ""
 
-#: plugins/check_ldap.c:437
+#: plugins/check_ldap.c:441
 msgid "'SSL on connect' will be used no matter how the plugin was called."
 msgstr ""
 
-#: plugins/check_ldap.c:438
+#: plugins/check_ldap.c:442
 msgid ""
 "This detection is deprecated, please use 'check_ldap' with the '--starttls' "
 "or '--ssl' flags"
 msgstr ""
 
-#: plugins/check_ldap.c:439
+#: plugins/check_ldap.c:443
 msgid "to define the behaviour explicitly instead."
 msgstr ""
 
@@ -1706,41 +1849,46 @@ msgstr "Le seuil d'alerte doit être un nombre à virgule flottante!\n"
 msgid "Error opening %s\n"
 msgstr "Erreur à l'ouverture de %s\n"
 
-#: plugins/check_load.c:160
+#: plugins/check_load.c:163
+#, fuzzy, c-format
+msgid "could not parse load from uptime: %s\n"
+msgstr "Lecture des arguments impossible\n"
+
+#: plugins/check_load.c:169
 #, c-format
 msgid "Error code %d returned in %s\n"
 msgstr "Le code erreur %d à été retourné par %s\n"
 
-#: plugins/check_load.c:175
+#: plugins/check_load.c:184
 #, c-format
 msgid "Error in getloadavg()\n"
 msgstr "Erreur dans la fonction getloadavg()\n"
 
-#: plugins/check_load.c:178 plugins/check_load.c:180
+#: plugins/check_load.c:187 plugins/check_load.c:189
 #, c-format
 msgid "Error processing %s\n"
 msgstr "Erreur lors de l'utilisation de %s\n"
 
-#: plugins/check_load.c:189
+#: plugins/check_load.c:198
 #, c-format
 msgid "load average: %.2f, %.2f, %.2f"
 msgstr "Charge moyenne: %.2f, %.2f, %.2f"
 
-#: plugins/check_load.c:282
+#: plugins/check_load.c:291
 #, c-format
 msgid "Critical threshold for %d-minute load average is not specified\n"
 msgstr ""
 "Le seuil critique pour la charge système après %d minutes n'est pas "
 "spécifié\n"
 
-#: plugins/check_load.c:284
+#: plugins/check_load.c:293
 #, c-format
 msgid "Warning threshold for %d-minute load average is not specified\n"
 msgstr ""
 "Le seuil d'avertissement pour la charge système après %d minutes n'est pas "
 "spécifié\n"
 
-#: plugins/check_load.c:286
+#: plugins/check_load.c:295
 #, c-format
 msgid ""
 "Parameter inconsistency: %d-minute \"warning load\" is greater than "
@@ -1749,25 +1897,25 @@ msgstr ""
 "Arguments Incorrects: %d-minute \"alerte charge système\" est plus grand que "
 "\"alerte critique charge système\"\n"
 
-#: plugins/check_load.c:302
+#: plugins/check_load.c:311
 #, c-format
 msgid "This plugin tests the current system load average."
 msgstr "Ce plugin teste la charge système actuelle."
 
-#: plugins/check_load.c:312
+#: plugins/check_load.c:321
 msgid "Exit with WARNING status if load average exceeds WLOADn"
 msgstr ""
 "Sortir avec un résultat AVERTISSEMENT si la charge moyenne dépasse WLOAD"
 
-#: plugins/check_load.c:314
+#: plugins/check_load.c:323
 msgid "Exit with CRITICAL status if load average exceed CLOADn"
 msgstr "Sortir avec un résultat CRITIQUE si la charge moyenne excède CLOAD"
 
-#: plugins/check_load.c:315
+#: plugins/check_load.c:324
 msgid "the load average format is the same used by \"uptime\" and \"w\""
 msgstr ""
 
-#: plugins/check_load.c:317
+#: plugins/check_load.c:326
 msgid "Divide the load averages by the number of CPUs (when possible)"
 msgstr ""
 
@@ -2033,96 +2181,133 @@ msgstr ""
 msgid "Usage"
 msgstr "Utilisation"
 
-#: plugins/check_mysql.c:126
+#: plugins/check_mysql.c:171
+#, fuzzy, c-format
+msgid "status store_result error: %s\n"
+msgstr "erreur slave store_result: %s\n"
+
+#: plugins/check_mysql.c:202
 #, c-format
 msgid "slave query error: %s\n"
 msgstr "erreur de requête de l'esclave: %s\n"
 
-#: plugins/check_mysql.c:133
+#: plugins/check_mysql.c:209
 #, c-format
 msgid "slave store_result error: %s\n"
 msgstr "erreur slave store_result: %s\n"
 
-#: plugins/check_mysql.c:139
+#: plugins/check_mysql.c:215
 msgid "No slaves defined"
 msgstr "Pas d'esclave spécifié"
 
-#: plugins/check_mysql.c:147
+#: plugins/check_mysql.c:223
 #, c-format
 msgid "slave fetch row error: %s\n"
 msgstr "erreur esclave lecture d'une ligne: %s\n"
 
-#: plugins/check_mysql.c:152
+#: plugins/check_mysql.c:228
 #, c-format
 msgid "Slave running: %s"
 msgstr "L'esclave fonctionne: %s"
 
-#: plugins/check_mysql.c:378
+#: plugins/check_mysql.c:505
 msgid "This program tests connections to a MySQL server"
 msgstr "Ce plugin teste une connexion vers un serveur MySQL"
 
-#: plugins/check_mysql.c:389
+#: plugins/check_mysql.c:516
 msgid "Use the specified socket (has no effect if -H is used)"
 msgstr ""
 
-#: plugins/check_mysql.c:392
+#: plugins/check_mysql.c:519
 msgid "Check database with indicated name"
 msgstr ""
 
-#: plugins/check_mysql.c:394
+#: plugins/check_mysql.c:521
+msgid "Read from the specified client options file"
+msgstr ""
+
+#: plugins/check_mysql.c:523
+msgid "Use a client options group"
+msgstr ""
+
+#: plugins/check_mysql.c:525
 msgid "Connect using the indicated username"
 msgstr ""
 
-#: plugins/check_mysql.c:396
+#: plugins/check_mysql.c:527
 msgid "Use the indicated password to authenticate the connection"
 msgstr ""
 
-#: plugins/check_mysql.c:397
+#: plugins/check_mysql.c:528
 msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"
 msgstr ""
 
-#: plugins/check_mysql.c:398
+#: plugins/check_mysql.c:529
 msgid "Your clear-text password could be visible as a process table entry"
 msgstr ""
 
-#: plugins/check_mysql.c:400
+#: plugins/check_mysql.c:531
 msgid "Check if the slave thread is running properly."
 msgstr ""
 
-#: plugins/check_mysql.c:402
+#: plugins/check_mysql.c:533
 msgid "Exit with WARNING status if slave server is more than INTEGER seconds"
 msgstr ""
 "Sortir avec un résultat AVERTISSEMENT si le serveur esclave est plus de X "
 
-#: plugins/check_mysql.c:403 plugins/check_mysql.c:406
+#: plugins/check_mysql.c:534 plugins/check_mysql.c:537
 msgid "behind master"
 msgstr "secondes en retard sur le maître"
 
-#: plugins/check_mysql.c:405
+#: plugins/check_mysql.c:536
 msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds"
 msgstr "Sortir avec un résultat CRITIQUE si le serveur esclave est plus de X "
 
-#: plugins/check_mysql.c:409
+#: plugins/check_mysql.c:539
+msgid "Use ssl encryptation"
+msgstr ""
+
+#: plugins/check_mysql.c:541
+msgid "Path to CA signing the cert"
+msgstr ""
+
+#: plugins/check_mysql.c:543
+msgid "Path to SSL certificate"
+msgstr ""
+
+#: plugins/check_mysql.c:545
+msgid "Path to private SSL key"
+msgstr ""
+
+#: plugins/check_mysql.c:547
+msgid "Path to CA directory"
+msgstr ""
+
+#: plugins/check_mysql.c:549
+msgid "List of valid SSL ciphers"
+msgstr ""
+
+#: plugins/check_mysql.c:553
 msgid ""
 "There are no required arguments. By default, the local database is checked"
 msgstr ""
 "Il n'y a pas d'arguments nécessaires. Par défaut la base de donnée locale "
 "est testée"
 
-#: plugins/check_mysql.c:410
+#: plugins/check_mysql.c:554
 msgid ""
 "using the default unix socket. You can force TCP on localhost by using an"
 msgstr ""
 
-#: plugins/check_mysql.c:411
+#: plugins/check_mysql.c:555
 msgid "IP address or FQDN ('localhost' will use the socket as well)."
 msgstr ""
 
-#: plugins/check_mysql.c:415
+#: plugins/check_mysql.c:559
 msgid "You must specify -p with an empty string to force an empty password,"
 msgstr ""
 
-#: plugins/check_mysql.c:416
+#: plugins/check_mysql.c:560
 msgid "overriding any my.cnf settings."
 msgstr ""
 
@@ -2144,7 +2329,7 @@ msgid "Cannot parse Nagios log file for valid time"
 msgstr ""
 "Impossible de trouver une date/heure valide dans le fichier de log de Nagios"
 
-#: plugins/check_nagios.c:183 plugins/check_procs.c:295
+#: plugins/check_nagios.c:183 plugins/check_procs.c:356
 #, c-format
 msgid "%d process"
 msgid_plural "%d processes"
@@ -2158,109 +2343,123 @@ msgid_plural "status log updated %d seconds ago"
 msgstr[0] "status log mis à jour %d secondes auparavant"
 msgstr[1] "status log mis à jour %d secondes auparavant"
 
-#: plugins/check_nagios.c:223 plugins/check_nagios.c:252
+#: plugins/check_nagios.c:224 plugins/check_nagios.c:253
 msgid "Expiration time must be an integer (seconds)\n"
 msgstr "Le délai d'expiration doit être un entier (en secondes)\n"
 
-#: plugins/check_nagios.c:264
+#: plugins/check_nagios.c:260
+#, fuzzy
+msgid "Timeout must be an integer (seconds)\n"
+msgstr "Le délai d'expiration doit être un entier (en secondes)\n"
+
+#: plugins/check_nagios.c:272
 msgid "You must provide the status_log\n"
 msgstr "Vous devez fournir le status_log\n"
 
-#: plugins/check_nagios.c:267
+#: plugins/check_nagios.c:275
 msgid "You must provide a process string\n"
 msgstr "Vous devez fournir un nom de processus\n"
 
-#: plugins/check_nagios.c:281
+#: plugins/check_nagios.c:289
 msgid ""
 "This plugin checks the status of the Nagios process on the local machine"
 msgstr "Ce plugin vérifie l'état du processus Nagios sur la machine locale."
 
-#: plugins/check_nagios.c:282
+#: plugins/check_nagios.c:290
 msgid ""
 "The plugin will check to make sure the Nagios status log is no older than"
 msgstr "Ce plugin vérifie que le status log de Nagios n'est pas plus vieux que"
 
-#: plugins/check_nagios.c:283
+#: plugins/check_nagios.c:291
 msgid "the number of minutes specified by the expires option."
 msgstr "le nombre de minutes spécifies par l'option expire."
 
-#: plugins/check_nagios.c:284
+#: plugins/check_nagios.c:292
 msgid ""
 "It also checks the process table for a process matching the command argument."
 msgstr ""
 
-#: plugins/check_nagios.c:294
+#: plugins/check_nagios.c:302
 msgid "Name of the log file to check"
 msgstr "Nom du fichier log à vérifier"
 
-#: plugins/check_nagios.c:296
+#: plugins/check_nagios.c:304
 msgid "Minutes aging after which logfile is considered stale"
 msgstr ""
 
-#: plugins/check_nagios.c:298
+#: plugins/check_nagios.c:306
 msgid "Substring to search for in process arguments"
 msgstr ""
 
-#: plugins/check_nt.c:141
+#: plugins/check_nagios.c:308
+msgid "Timeout for the plugin in seconds"
+msgstr ""
+
+#: plugins/check_nt.c:142
 #, c-format
 msgid "Wrong client version - running: %s, required: %s"
 msgstr "Mauvaise version du client utilisée: %s, nécessaire: %s"
 
-#: plugins/check_nt.c:152 plugins/check_nt.c:212
+#: plugins/check_nt.c:153 plugins/check_nt.c:218
 msgid "missing -l parameters"
 msgstr "Arguments -l manquants"
 
-#: plugins/check_nt.c:154
+#: plugins/check_nt.c:155
 msgid "wrong -l parameter."
 msgstr "Arguments -l erronés."
 
-#: plugins/check_nt.c:158
+#: plugins/check_nt.c:159
 msgid "CPU Load"
 msgstr "Charge CPU"
 
-#: plugins/check_nt.c:181
+#: plugins/check_nt.c:182
 #, c-format
 msgid " %lu%% (%lu min average)"
 msgstr " %lu%% (%lu moyenne minimale)"
 
-#: plugins/check_nt.c:183
+#: plugins/check_nt.c:184
 #, c-format
 msgid " '%lu min avg Load'=%lu%%;%lu;%lu;0;100"
 msgstr " '%lu Charge moyenne minimale'=%lu%%;%lu;%lu;0;100"
 
-#: plugins/check_nt.c:193
+#: plugins/check_nt.c:194
 msgid "not enough values for -l parameters"
 msgstr "pas assez de valeur pour l'argument -l"
 
-#: plugins/check_nt.c:205
+#: plugins/check_nt.c:206
 #, c-format
 msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)"
 msgstr "Système démarré - %u jour(s) %u heure(s) %u minute(s)"
 
-#: plugins/check_nt.c:214
+#: plugins/check_nt.c:220
 msgid "wrong -l argument"
 msgstr "Argument -l erroné"
 
-#: plugins/check_nt.c:230
+#: plugins/check_nt.c:236
 #, c-format
 msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"
 msgstr ""
 "%s:\\ - total: %.2f Gb - utilisé: %.2f Gb (%.0f%%) - libre %.2f Gb (%.0f%%)"
 
-#: plugins/check_nt.c:233
+#: plugins/check_nt.c:239
 #, c-format
 msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"
 msgstr "'%s:\\ Espace Utilisé'=%.2fGb;%.2f;%.2f;0.00;%.2f"
 
-#: plugins/check_nt.c:247
+#: plugins/check_nt.c:253
 msgid "Free disk space : Invalid drive"
 msgstr "Espace disque libre : Lecteur invalide"
 
-#: plugins/check_nt.c:257
+#: plugins/check_nt.c:263
 msgid "No service/process specified"
 msgstr "Pas de service/processus spécifié"
 
-#: plugins/check_nt.c:281
+#: plugins/check_nt.c:271 plugins/check_nt.c:284 plugins/check_nt.c:288
+#: plugins/check_nt.c:622
+msgid "could not fetch information from server\n"
+msgstr "Impossible d'obtenir l'information depuis le serveur\n"
+
+#: plugins/check_nt.c:296
 #, c-format
 msgid ""
 "Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"
@@ -2268,484 +2467,480 @@ msgstr ""
 "Mémoire utilisée: total:%.2f Mb - utilisée: %.2f Mb (%.0f%%) - libre: %.2f "
 "Mb (%.0f%%)"
 
-#: plugins/check_nt.c:284
+#: plugins/check_nt.c:299
 #, c-format
 msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"
 msgstr "'Mémoire utilisée'=%.2fMb;%.2f;%.2f;0.00;%.2f"
 
-#: plugins/check_nt.c:320 plugins/check_nt.c:405 plugins/check_nt.c:435
+#: plugins/check_nt.c:335 plugins/check_nt.c:420 plugins/check_nt.c:450
 msgid "No counter specified"
 msgstr "Pas de compteur spécifié"
 
-#: plugins/check_nt.c:352
+#: plugins/check_nt.c:367
 msgid "Minimum value contains non-numbers"
 msgstr "La valeur minimum contient des caractères non numériques"
 
-#: plugins/check_nt.c:356
+#: plugins/check_nt.c:371
 msgid "Maximum value contains non-numbers"
 msgstr "La valeur maximum contient des caractères non numériques"
 
-#: plugins/check_nt.c:363
+#: plugins/check_nt.c:378
 msgid "No unit counter specified"
 msgstr "Pas de compteur spécifié"
 
-#: plugins/check_nt.c:450
+#: plugins/check_nt.c:465
 msgid "Please specify a variable to check"
 msgstr "Veuillez préciser une variable a vérifier"
 
-#: plugins/check_nt.c:534
+#: plugins/check_nt.c:549
 msgid "Server port must be an integer\n"
 msgstr "Le port du serveur doit être un nombre entier\n"
 
-#: plugins/check_nt.c:588
+#: plugins/check_nt.c:603
 msgid "You must provide a server address or host name"
 msgstr "Vous devez spécifier une adresse ou un nom d'hôte"
 
-#: plugins/check_nt.c:594
+#: plugins/check_nt.c:609
 msgid "None"
 msgstr "Aucun"
 
-#: plugins/check_nt.c:607
-msgid "could not fetch information from server\n"
-msgstr "Impossible d'obtenir l'information depuis le serveur\n"
-
-#: plugins/check_nt.c:651
+#: plugins/check_nt.c:666
 msgid "This plugin collects data from the NSClient service running on a"
 msgstr ""
 "Ce plugin collecte les données depuis le service NSClient tournant sur un"
 
-#: plugins/check_nt.c:652
+#: plugins/check_nt.c:667
 msgid "Windows NT/2000/XP/2003 server."
 msgstr "Serveur Windows NT/2000/XP/2003."
 
-#: plugins/check_nt.c:663
+#: plugins/check_nt.c:678
 msgid "Name of the host to check"
 msgstr "Nom de l'hôte à vérifier"
 
-#: plugins/check_nt.c:665
+#: plugins/check_nt.c:680
 msgid "Optional port number (default: "
 msgstr "Numéro de port optionnel (défaut: "
 
-#: plugins/check_nt.c:668
+#: plugins/check_nt.c:683
 msgid "Password needed for the request"
 msgstr "Mot de passe nécessaire pour la requête"
 
-#: plugins/check_nt.c:670 plugins/check_nwstat.c:1661
+#: plugins/check_nt.c:685 plugins/check_nwstat.c:1661
 #: plugins/check_overcr.c:432
 msgid "Threshold which will result in a warning status"
 msgstr ""
 
-#: plugins/check_nt.c:672 plugins/check_nwstat.c:1663
+#: plugins/check_nt.c:687 plugins/check_nwstat.c:1663
 #: plugins/check_overcr.c:434
 msgid "Threshold which will result in a critical status"
 msgstr ""
 
-#: plugins/check_nt.c:674
+#: plugins/check_nt.c:689
 msgid "Seconds before connection attempt times out (default: "
 msgstr ""
 
-#: plugins/check_nt.c:676
+#: plugins/check_nt.c:691
 msgid "Parameters passed to specified check (see below)"
 msgstr ""
 
-#: plugins/check_nt.c:678
+#: plugins/check_nt.c:693
 msgid "Display options (currently only SHOWALL works)"
 msgstr ""
 
-#: plugins/check_nt.c:680
+#: plugins/check_nt.c:695
 msgid "Return UNKNOWN on timeouts"
 msgstr ""
 
-#: plugins/check_nt.c:683
+#: plugins/check_nt.c:698
 msgid "Print this help screen"
 msgstr "Afficher l'écran d'aide"
 
-#: plugins/check_nt.c:685
+#: plugins/check_nt.c:700
 msgid "Print version information"
 msgstr "Afficher la version"
 
-#: plugins/check_nt.c:687
+#: plugins/check_nt.c:702
 msgid "Variable to check"
 msgstr "Variable a vérifier"
 
-#: plugins/check_nt.c:688
+#: plugins/check_nt.c:703
 msgid "Valid variables are:"
 msgstr "Les variables valides sont"
 
-#: plugins/check_nt.c:690
+#: plugins/check_nt.c:705
 msgid "Get the NSClient version"
 msgstr "Obtenir la version de NSClient"
 
-#: plugins/check_nt.c:691
+#: plugins/check_nt.c:706
 msgid "If -l <version> is specified, will return warning if versions differ."
 msgstr ""
 "si l'argument -l <version> est spécifié, une alerte AVERTISSEMENT sera "
 "renvoyée, si les versions sont différentes."
 
-#: plugins/check_nt.c:693
+#: plugins/check_nt.c:708
 msgid "Average CPU load on last x minutes."
 msgstr "Moyenne de la charge CPU sur les dernières x minutes."
 
-#: plugins/check_nt.c:694
+#: plugins/check_nt.c:709
 msgid "Request a -l parameter with the following syntax:"
 msgstr "Demande un paramètre -l avec la syntaxe suivante:"
 
-#: plugins/check_nt.c:695
+#: plugins/check_nt.c:710
 msgid "-l <minutes range>,<warning threshold>,<critical threshold>."
 msgstr "-l <plage de minutes>,<seuil d'avertissement>,<seuil critique>."
 
-#: plugins/check_nt.c:696
+#: plugins/check_nt.c:711
 msgid "<minute range> should be less than 24*60."
 msgstr "<plage de minutes> devrait être inférieur à 24*60."
 
-#: plugins/check_nt.c:697
+#: plugins/check_nt.c:712
 msgid ""
 "Thresholds are percentage and up to 10 requests can be done in one shot."
 msgstr ""
 "Les seuils sonts en pourcentage et un maximum de 10 requêtes peuvent être "
 "effectuées à la fois."
 
-#: plugins/check_nt.c:700
+#: plugins/check_nt.c:715
 msgid "Get the uptime of the machine."
 msgstr "Obtenir le temps de service de la machine."
 
-#: plugins/check_nt.c:701
+#: plugins/check_nt.c:716
 msgid "No specific parameters. No warning or critical threshold"
 msgstr "Pas d'argument spécifique. Pas de seuil d'avertissement ou critique"
 
-#: plugins/check_nt.c:703
+#: plugins/check_nt.c:718
 msgid "Size and percentage of disk use."
 msgstr "Taille et pourcentage de l'utilisation disque."
 
-#: plugins/check_nt.c:704
+#: plugins/check_nt.c:719
 msgid "Request a -l parameter containing the drive letter only."
 msgstr "Demande un paramètre -l contennant uniquement la lettre du lecteur."
 
-#: plugins/check_nt.c:705 plugins/check_nt.c:708
+#: plugins/check_nt.c:720 plugins/check_nt.c:723
 msgid "Warning and critical thresholds can be specified with -w and -c."
 msgstr "Les seuils d'alerte et critiques peuvent être spécifiés avec -w et -c."
 
-#: plugins/check_nt.c:707
+#: plugins/check_nt.c:722
 msgid "Memory use."
 msgstr "Mémoire utilisée."
 
-#: plugins/check_nt.c:710
+#: plugins/check_nt.c:725
 msgid "Check the state of one or several services."
 msgstr "Vérifier l'état d'un ou plusieurs services."
 
-#: plugins/check_nt.c:711 plugins/check_nt.c:720
+#: plugins/check_nt.c:726 plugins/check_nt.c:735
 msgid "Request a -l parameters with the following syntax:"
 msgstr "Demande un paramètre -l avec la syntaxe suivante:"
 
-#: plugins/check_nt.c:712
+#: plugins/check_nt.c:727
 msgid "-l <service1>,<service2>,<service3>,..."
 msgstr "-l <service1>,<service2>,<service3>,..."
 
-#: plugins/check_nt.c:713
+#: plugins/check_nt.c:728
 msgid "You can specify -d SHOWALL in case you want to see working services"
 msgstr "Vous pouvez spécifier -d SHOWALL pour voir les services fonctionnant"
 
-#: plugins/check_nt.c:714
+#: plugins/check_nt.c:729
 msgid "in the returned string."
 msgstr "dans la chaîne de caractère renvoyée."
 
-#: plugins/check_nt.c:716
+#: plugins/check_nt.c:731
 msgid "Check if one or several process are running."
 msgstr "Vérifie si un ou plusieurs processus sont démarrés."
 
-#: plugins/check_nt.c:717
+#: plugins/check_nt.c:732
 msgid "Same syntax as SERVICESTATE."
 msgstr "Même syntaxe que SERVICESTATE."
 
-#: plugins/check_nt.c:719
+#: plugins/check_nt.c:734
 msgid "Check any performance counter of Windows NT/2000."
 msgstr "Vérifier n'importe quel compteur de performance sur Windows NT/2000."
 
-#: plugins/check_nt.c:721
+#: plugins/check_nt.c:736
 msgid "-l \"\\\\<performance object>\\\\counter\",\"<description>"
 msgstr "-l \"\\\\<catégorie>\\\\compteur\",\"<description>"
 
-#: plugins/check_nt.c:722
+#: plugins/check_nt.c:737
 msgid "The <description> parameter is optional and is given to a printf "
 msgstr "Le paramètre <description> est optionnel et est passé à la fonction "
 
-#: plugins/check_nt.c:723
+#: plugins/check_nt.c:738
 msgid "output command which requires a float parameter."
 msgstr "de sortie printf qui demande un paramètre de type float."
 
-#: plugins/check_nt.c:724
+#: plugins/check_nt.c:739
 #, c-format
 msgid "If <description> does not include \"%%\", it is used as a label."
 msgstr "Si <description> n'inclus pas \"%%\", il est utilisé comme étiquette."
 
-#: plugins/check_nt.c:725 plugins/check_nt.c:740
+#: plugins/check_nt.c:740 plugins/check_nt.c:755
 msgid "Some examples:"
 msgstr "Exemples:"
 
-#: plugins/check_nt.c:729
+#: plugins/check_nt.c:744
 msgid "Check any performance counter object of Windows NT/2000."
 msgstr "Vérifie n'importe quel compteur de performance de Windows NT/2000."
 
-#: plugins/check_nt.c:730
+#: plugins/check_nt.c:745
 msgid ""
 "Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"
 msgstr ""
 
-#: plugins/check_nt.c:731
+#: plugins/check_nt.c:746
 msgid "<counter object> is a Windows Perfmon Counter object (eg. Process),"
 msgstr ""
 
-#: plugins/check_nt.c:732
+#: plugins/check_nt.c:747
 msgid "if it is two words, it should be enclosed in quotes"
 msgstr ""
 
-#: plugins/check_nt.c:733
+#: plugins/check_nt.c:748
 msgid "The returned results will be a comma-separated list of instances on "
 msgstr ""
 
-#: plugins/check_nt.c:734
+#: plugins/check_nt.c:749
 msgid " the selected computer for that object."
 msgstr ""
 
-#: plugins/check_nt.c:735
+#: plugins/check_nt.c:750
 msgid ""
 "The purpose of this is to be run from command line to determine what "
 "instances"
 msgstr ""
 
-#: plugins/check_nt.c:736
+#: plugins/check_nt.c:751
 msgid ""
 " are available for monitoring without having to log onto the Windows server"
 msgstr ""
 
-#: plugins/check_nt.c:737
+#: plugins/check_nt.c:752
 msgid "  to run Perfmon directly."
 msgstr ""
 
-#: plugins/check_nt.c:738
-msgid "It can also be used in scripts that automatically create Nagios service"
+#: plugins/check_nt.c:753
+msgid ""
+"It can also be used in scripts that automatically create the monitoring "
+"service"
 msgstr ""
 
-#: plugins/check_nt.c:739
+#: plugins/check_nt.c:754
 msgid " configuration files."
 msgstr ""
 
-#: plugins/check_nt.c:741
+#: plugins/check_nt.c:756
 msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"
 msgstr ""
 
-#: plugins/check_nt.c:744
+#: plugins/check_nt.c:759
 msgid ""
 "- The NSClient service should be running on the server to get any information"
 msgstr ""
 "- Le service NSClient doit rouler sur le serveur pour obtenir les "
 "informations"
 
-#: plugins/check_nt.c:746
+#: plugins/check_nt.c:761
 msgid "- Critical thresholds should be lower than warning thresholds"
 msgstr ""
 "- Les seuils critiques doivent être plus bas que les seuils d'avertissement"
 
-#: plugins/check_nt.c:747
+#: plugins/check_nt.c:762
 msgid "- Default port 1248 is sometimes in use by other services. The error"
 msgstr ""
 "- Le port par défaut 1248 est parfois utilisé par d'autres services. L'erreur"
 
-#: plugins/check_nt.c:748
+#: plugins/check_nt.c:763
 msgid ""
 "output when this happens contains \"Cannot map xxxxx to protocol number\"."
 msgstr "qui en résulte contiens \"Cannot map xxxxx to protocol number\"."
 
-#: plugins/check_nt.c:749
+#: plugins/check_nt.c:764
 msgid "One fix for this is to change the port to something else on check_nt "
 msgstr ""
 "Une possibilité pour corriger ce problème est de changer le port dans "
 "check_nt "
 
-#: plugins/check_nt.c:750
+#: plugins/check_nt.c:765
 msgid "and on the client service it's connecting to."
 msgstr "et dans le service auquel il se connecte."
 
-#: plugins/check_ntp.c:803 plugins/check_ntp_peer.c:606
-#: plugins/check_ntp_time.c:567
-#, c-format
+#: plugins/check_ntp.c:807 plugins/check_ntp_peer.c:612
+#: plugins/check_ntp_time.c:571
 msgid "NTP CRITICAL:"
 msgstr "NTP CRITIQUE:"
 
-#: plugins/check_ntp.c:806 plugins/check_ntp_peer.c:609
-#: plugins/check_ntp_time.c:570
-#, c-format
+#: plugins/check_ntp.c:810 plugins/check_ntp_peer.c:615
+#: plugins/check_ntp_time.c:574
 msgid "NTP WARNING:"
 msgstr "NTP AVERTISSEMENT:"
 
-#: plugins/check_ntp.c:809 plugins/check_ntp_peer.c:612
-#: plugins/check_ntp_time.c:573
-#, c-format
+#: plugins/check_ntp.c:813 plugins/check_ntp_peer.c:618
+#: plugins/check_ntp_time.c:577
 msgid "NTP OK:"
 msgstr "NTP OK:"
 
-#: plugins/check_ntp.c:812 plugins/check_ntp_peer.c:615
-#: plugins/check_ntp_time.c:576
-#, c-format
+#: plugins/check_ntp.c:816 plugins/check_ntp_peer.c:621
+#: plugins/check_ntp_time.c:580
 msgid "NTP UNKNOWN:"
 msgstr "NTP INCONNU:"
 
-#: plugins/check_ntp.c:816 plugins/check_ntp_peer.c:624
-#: plugins/check_ntp_time.c:580
+#: plugins/check_ntp.c:820 plugins/check_ntp_peer.c:630
+#: plugins/check_ntp_time.c:584
 msgid "Offset unknown"
 msgstr "Décalage inconnu"
 
-#: plugins/check_ntp.c:819 plugins/check_ntp_peer.c:627
-#: plugins/check_ntp_time.c:583
+#: plugins/check_ntp.c:823 plugins/check_ntp_peer.c:633
+#: plugins/check_ntp_time.c:587
 msgid "Offset"
 msgstr "Décalage"
 
-#: plugins/check_ntp.c:840 plugins/check_ntp_peer.c:656
+#: plugins/check_ntp.c:844 plugins/check_ntp_peer.c:662
 msgid "This plugin checks the selected ntp server"
 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
+#: plugins/check_ntp.c:854 plugins/check_ntp_peer.c:674
+#: plugins/check_ntp_time.c:614
 msgid "Offset to result in warning status (seconds)"
 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
+#: plugins/check_ntp.c:856 plugins/check_ntp_peer.c:676
+#: plugins/check_ntp_time.c:616
 msgid "Offset to result in critical status (seconds)"
 msgstr "Décalage résultant en un état critique (secondes)"
 
-#: plugins/check_ntp.c:853 plugins/check_ntp_peer.c:675
+#: plugins/check_ntp.c:858 plugins/check_ntp_peer.c:682
 msgid "Warning threshold for jitter"
 msgstr "Seuil d'avertissement pour la variation (jitter)"
 
-#: plugins/check_ntp.c:855 plugins/check_ntp_peer.c:677
+#: plugins/check_ntp.c:860 plugins/check_ntp_peer.c:684
 msgid "Critical threshold for jitter"
 msgstr "Seuil critique pour la variation (jitter)"
 
-#: plugins/check_ntp.c:865
+#: plugins/check_ntp.c:870
 msgid "Normal offset check:"
 msgstr "Vérification normale du décalage:"
 
-#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:702
+#: plugins/check_ntp.c:873 plugins/check_ntp_peer.c:709
 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:869 plugins/check_ntp_peer.c:703
+#: plugins/check_ntp.c:874 plugins/check_ntp_peer.c:710
 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:874 plugins/check_ntp.c:881
+#: plugins/check_ntp.c:879 plugins/check_ntp.c:886
 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:875 plugins/check_ntp.c:882
+#: plugins/check_ntp.c:880 plugins/check_ntp.c:887
 msgid "check_ntp_time instead."
 msgstr "ou check_ntp_time."
 
-#: plugins/check_ntp_peer.c:619
+#: plugins/check_ntp_peer.c:625
 msgid "Server not synchronized"
 msgstr "Le serveur n'est pas synchronisé"
 
-#: plugins/check_ntp_peer.c:621
+#: plugins/check_ntp_peer.c:627
 msgid "Server has the LI_ALARM bit set"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:665
+#: plugins/check_ntp_peer.c:672
 msgid ""
 "Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"
 msgstr ""
 "Retourne INCONNU au lieu de CRITIQUE ou AVERTISSEMENT si le serveur n'est "
 "pas synchronisé"
 
-#: plugins/check_ntp_peer.c:671
-msgid "Warning threshold for stratum"
+#: plugins/check_ntp_peer.c:678
+#, fuzzy
+msgid "Warning threshold for stratum of server's synchronization peer"
 msgstr "Seuil d'avertissement pour le stratum"
 
-#: plugins/check_ntp_peer.c:673
-msgid "Critical threshold for stratum"
+#: plugins/check_ntp_peer.c:680
+#, fuzzy
+msgid "Critical threshold for stratum of server's synchronization peer"
 msgstr "Seuil critique pour le stratum"
 
-#: plugins/check_ntp_peer.c:679
+#: plugins/check_ntp_peer.c:686
 msgid "Warning threshold for number of usable time sources (\"truechimers\")"
 msgstr ""
 "Seuil d'avertissement pour le nombre de sources de temps utilisable "
 "(\"truechimers\")"
 
-#: plugins/check_ntp_peer.c:681
+#: plugins/check_ntp_peer.c:688
 msgid "Critical threshold for number of usable time sources (\"truechimers\")"
 msgstr ""
 "Seuil critique pour le nombre de sources de temps utilisable (\"truechimers"
 "\")"
 
-#: plugins/check_ntp_peer.c:686
+#: plugins/check_ntp_peer.c:693
 msgid "This plugin checks an NTP server independent of any commandline"
 msgstr "Ce plugin vérifie un serveur NTP sans recours aux programmes de"
 
-#: plugins/check_ntp_peer.c:687
+#: plugins/check_ntp_peer.c:694
 msgid "programs or external libraries."
 msgstr "la ligne de commande ou libraries externes"
 
-#: plugins/check_ntp_peer.c:690
+#: plugins/check_ntp_peer.c:697
 msgid "Use this plugin to check the health of an NTP server. It supports"
 msgstr ""
 "Utilisez ce plugin pour vérifier le service NTP sur l'hôte. Il supporte la"
 
-#: plugins/check_ntp_peer.c:691
+#: plugins/check_ntp_peer.c:698
 msgid "checking the offset with the sync peer, the jitter and stratum. This"
 msgstr ""
 "vérification du décalage avec le pair se synchronisation, la variation "
 "(jitter) et le stratum."
 
-#: plugins/check_ntp_peer.c:692
+#: plugins/check_ntp_peer.c:699
 msgid "plugin will not check the clock offset between the local host and NTP"
 msgstr ""
 "Ce plugin ne vérifie pas le décalage entre le serveur local et le serveur"
 
-#: plugins/check_ntp_peer.c:693
+#: plugins/check_ntp_peer.c:700
 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:699
+#: plugins/check_ntp_peer.c:706
 msgid "Simple NTP server check:"
 msgstr "Vérification simple du serveur NTP:"
 
-#: plugins/check_ntp_peer.c:706
+#: plugins/check_ntp_peer.c:713
 msgid "Only check the number of usable time sources (\"truechimers\"):"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:709
+#: plugins/check_ntp_peer.c:716
 msgid "Check only stratum:"
 msgstr "Vérification du stratum seulement:"
 
-#: plugins/check_ntp_time.c:598
+#: plugins/check_ntp_time.c:602
 msgid "This plugin checks the clock offset with the ntp server"
 msgstr "Ce plugin vérifie le décalage de l'horloge avec le serveur ntp"
 
-#: plugins/check_ntp_time.c:607
+#: plugins/check_ntp_time.c:612
 msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found"
 msgstr "Retourne INCONNU au lieu de CRITIQUE si le décalage est inconnu"
 
-#: plugins/check_ntp_time.c:616
+#: plugins/check_ntp_time.c:621
 msgid "This plugin checks the clock offset between the local host and a"
 msgstr "Ce plugin vérifie le décalage de l'horloge entre se serveur local et"
 
-#: plugins/check_ntp_time.c:617
+#: plugins/check_ntp_time.c:622
 msgid "remote NTP server. It is independent of any commandline programs or"
 msgstr "le serveur NTP distant. Il ne fait aucun recours aux programmes de"
 
-#: plugins/check_ntp_time.c:618
+#: plugins/check_ntp_time.c:623
 msgid "external libraries."
 msgstr "la ligne de commande ou libraries externes."
 
-#: plugins/check_ntp_time.c:622
+#: plugins/check_ntp_time.c:627
 msgid "If you'd rather want to monitor an NTP server, please use"
 msgstr "Si vous voulez plutôt surveiller un serveur NTP, veuillez"
 
-#: plugins/check_ntp_time.c:623
+#: plugins/check_ntp_time.c:628
 msgid "check_ntp_peer."
 msgstr "utiliser check_ntp_peer."
 
@@ -2825,8 +3020,8 @@ msgstr ""
 msgid ""
 "%lu MB (%lu%%) free on volume %s - total %lu MB|FreeMB%s=%lu;%lu;%lu;0;100"
 msgstr ""
-"%lu MB (%lu%%) libre sur le volume %s - total %lu MB|MBlibre%s=%lu;%lu;%"
-"lu;0;100"
+"%lu MB (%lu%%) libre sur le volume %s - total %lu MB|MBlibre%s=%lu;%lu;"
+"%lu;0;100"
 
 #: plugins/check_nwstat.c:528
 #, c-format
@@ -2847,17 +3042,14 @@ msgid "disabled"
 msgstr "désactivé"
 
 #: plugins/check_nwstat.c:560
-#, c-format
 msgid "CRITICAL - NRM Status is bad!"
 msgstr "CRITIQUE - le statut NRM est mauvais!"
 
 #: plugins/check_nwstat.c:565
-#, c-format
 msgid "Warning - NRM Status is suspect!"
 msgstr ""
 
 #: plugins/check_nwstat.c:568
-#, c-format
 msgid "OK - NRM Status is good!"
 msgstr "OK - Le status du NRM est bon!"
 
@@ -2918,12 +3110,10 @@ msgid "%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu"
 msgstr "%lu processus services actuels (%lu max)|Processus=%lu;%lu;%lu;0;%lu"
 
 #: plugins/check_nwstat.c:904
-#, c-format
 msgid "CRITICAL - Time not in sync with network!"
 msgstr "CRITIQUE - Le temps n'est pas synchronisé avec le réseau!"
 
 #: plugins/check_nwstat.c:907
-#, c-format
 msgid "OK - Time in sync with network!"
 msgstr "OK - Le temps est synchronisé avec le réseau!"
 
@@ -3327,114 +3517,225 @@ msgid ""
 "higher than the warning threshold value, EXCEPT with the uptime variable"
 msgstr "plus grand que le seuil d'alerte SAUF pour l'option uptime"
 
-#: plugins/check_pgsql.c:183
+#: plugins/check_pgsql.c:222
 #, c-format
 msgid "CRITICAL - no connection to '%s' (%s).\n"
 msgstr "CRITIQUE - pas de connexion à '%s' (%s).\n"
 
-#: plugins/check_pgsql.c:200
-#, c-format
-msgid " %s - database %s (%d sec.)|%s\n"
+#: plugins/check_pgsql.c:250
+#, fuzzy, c-format
+msgid " %s - database %s (%f sec.)|%s\n"
 msgstr " %s - base de données %s (%d sec.)|%s\n"
 
-#: plugins/check_pgsql.c:256 plugins/check_time.c:277 plugins/check_time.c:289
-#: plugins/check_users.c:166
+#: plugins/check_pgsql.c:317 plugins/check_time.c:277 plugins/check_time.c:289
+#: plugins/check_users.c:181
 msgid "Critical threshold must be a positive integer"
 msgstr "Le seuil critique doit être un entier positif"
 
-#: plugins/check_pgsql.c:262 plugins/check_time.c:258 plugins/check_time.c:282
-#: plugins/check_users.c:172 plugins/check_users.c:182
-#: plugins/check_users.c:189
+#: plugins/check_pgsql.c:323 plugins/check_time.c:258 plugins/check_time.c:282
+#: plugins/check_users.c:187 plugins/check_users.c:197
+#: plugins/check_users.c:203
 msgid "Warning threshold must be a positive integer"
 msgstr "Le seuil d'avertissement doit être un entier positif"
 
-#: plugins/check_pgsql.c:280
+#: plugins/check_pgsql.c:347
 msgid "Database name is not valid"
 msgstr "Le nom de la base de données est invalide"
 
-#: plugins/check_pgsql.c:286
+#: plugins/check_pgsql.c:353
 msgid "User name is not valid"
 msgstr "Le nom de l'utilisateur est invalide"
 
-#: plugins/check_pgsql.c:426
+#: plugins/check_pgsql.c:504
 #, c-format
 msgid "Test whether a PostgreSQL Database is accepting connections."
 msgstr "Teste si une base de données Postgresql accepte les connections."
 
-#: plugins/check_pgsql.c:440
+#: plugins/check_pgsql.c:516
 msgid "Database to check "
 msgstr ""
 
-#: plugins/check_pgsql.c:441
+#: plugins/check_pgsql.c:517
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: plugins/check_pgsql.c:443
+#: plugins/check_pgsql.c:519
 msgid "Login name of user"
 msgstr "Le nom d'un utilisateur"
 
-#: plugins/check_pgsql.c:445
+#: plugins/check_pgsql.c:521
 msgid "Password (BIG SECURITY ISSUE)"
 msgstr ""
 
-#: plugins/check_pgsql.c:454
+#: plugins/check_pgsql.c:523
+msgid "Connection parameters (keyword = value), see below"
+msgstr ""
+
+#: plugins/check_pgsql.c:530
+msgid "SQL query to run. Only first column in first row will be read"
+msgstr ""
+
+#: plugins/check_pgsql.c:532
+#, fuzzy
+msgid "SQL query value to result in warning status (double)"
+msgstr "Décalage résultant en un avertissement (secondes)"
+
+#: plugins/check_pgsql.c:534
+#, fuzzy
+msgid "SQL query value to result in critical status (double)"
+msgstr "Décalage résultant en un état critique (secondes)"
+
+#: plugins/check_pgsql.c:539
 msgid "All parameters are optional."
 msgstr ""
 
-#: plugins/check_pgsql.c:455
+#: plugins/check_pgsql.c:540
 msgid ""
 "This plugin tests a PostgreSQL DBMS to determine whether it is active and"
 msgstr ""
 
-#: plugins/check_pgsql.c:456
+#: plugins/check_pgsql.c:541
 msgid "accepting queries. In its current operation, it simply connects to the"
 msgstr ""
 
-#: plugins/check_pgsql.c:457
+#: plugins/check_pgsql.c:542
 msgid ""
 "specified database, and then disconnects. If no database is specified, it"
 msgstr ""
 
-#: plugins/check_pgsql.c:458
+#: plugins/check_pgsql.c:543
 msgid ""
 "connects to the template1 database, which is present in every functioning"
 msgstr ""
 
-#: plugins/check_pgsql.c:459
+#: plugins/check_pgsql.c:544
 msgid "PostgreSQL DBMS."
 msgstr ""
 
-#: plugins/check_pgsql.c:461
+#: plugins/check_pgsql.c:546
+msgid "If a query is specified using the -q option, it will be executed after"
+msgstr ""
+
+#: plugins/check_pgsql.c:547
+msgid "connecting to the server. The result from the query has to be numeric."
+msgstr ""
+
+#: plugins/check_pgsql.c:548
+msgid ""
+"Multiple SQL commands, separated by semicolon, are allowed but the result "
+msgstr ""
+
+#: plugins/check_pgsql.c:549
+msgid "of the last command is taken into account only. The value of the first"
+msgstr ""
+
+#: plugins/check_pgsql.c:550
+msgid "column in the first row is used as the check result."
+msgstr ""
+
+#: plugins/check_pgsql.c:552
+msgid ""
+"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"
+msgstr ""
+
+#: plugins/check_pgsql.c:553
+msgid ""
+"for details about how to access internal statistics of the database server."
+msgstr ""
+
+#: plugins/check_pgsql.c:555
+msgid ""
+"For a list of available connection parameters which may be used with the -o"
+msgstr ""
+
+#: plugins/check_pgsql.c:556
+msgid ""
+"command line option, see the documentation for PQconnectdb() in the chapter"
+msgstr ""
+
+#: plugins/check_pgsql.c:557
+msgid ""
+"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"
+msgstr ""
+
+#: plugins/check_pgsql.c:558
+msgid ""
+"used to specify a service name in pg_service.conf to be used for additional"
+msgstr ""
+
+#: plugins/check_pgsql.c:559
+msgid "connection parameters: -o 'service=<name>' or to specify the SSL mode:"
+msgstr ""
+
+#: plugins/check_pgsql.c:560
+msgid "-o 'sslmode=require'."
+msgstr ""
+
+#: plugins/check_pgsql.c:562
 msgid ""
 "The plugin will connect to a local postmaster if no host is specified. To"
 msgstr ""
 "Ce plugin va se connecter sur un postmaster local si aucun hôte n'est "
 "spécifié."
 
-#: plugins/check_pgsql.c:462
+#: plugins/check_pgsql.c:563
 msgid ""
 "connect to a remote host, be sure that the remote postmaster accepts TCP/IP"
 msgstr ""
 
-#: plugins/check_pgsql.c:463
+#: plugins/check_pgsql.c:564
 msgid "connections (start the postmaster with the -i option)."
 msgstr ""
 
-#: plugins/check_pgsql.c:465
+#: plugins/check_pgsql.c:566
 msgid ""
-"Typically, the nagios user (unless the --logname option is used) should be"
+"Typically, the monitoring user (unless the --logname option is used) should "
+"be"
 msgstr ""
 
-#: plugins/check_pgsql.c:466
+#: plugins/check_pgsql.c:567
 msgid ""
 "able to connect to the database without a password. The plugin can also send"
 msgstr ""
 
-#: plugins/check_pgsql.c:467
+#: plugins/check_pgsql.c:568
 msgid "a password, but no effort is made to obsure or encrypt the password."
 msgstr ""
 
+#: plugins/check_pgsql.c:601
+#, c-format
+msgid "QUERY %s - %s: %s.\n"
+msgstr ""
+
+#: plugins/check_pgsql.c:601
+msgid "Error with query"
+msgstr ""
+
+#: plugins/check_pgsql.c:607
+#, fuzzy
+msgid "No rows returned"
+msgstr "Pas de données valides reçues"
+
+#: plugins/check_pgsql.c:612
+#, fuzzy
+msgid "No columns returned"
+msgstr "Pas de données valides reçues"
+
+#: plugins/check_pgsql.c:618
+#, fuzzy
+msgid "No data returned"
+msgstr "Pas de données valides reçues"
+
+#: plugins/check_pgsql.c:627
+msgid "Is not a numeric"
+msgstr ""
+
+#: plugins/check_pgsql.c:644
+#, fuzzy, c-format
+msgid "'%s' returned %f"
+msgstr ". %s renvoie %s"
+
 #: plugins/check_ping.c:141
 msgid "CRITICAL - Could not interpret output from ping command\n"
 msgstr "CRITIQUE - Impossible d'interpréter le réponse de la commande ping\n"
@@ -3515,313 +3816,309 @@ msgstr "<wrta> (%f) ne peut pas être plus large que <crta> (%f)\n"
 msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
 msgstr "<wpl> (%d) ne peut pas être plus large que <cpl> (%d)\n"
 
-#: plugins/check_ping.c:441
+#: plugins/check_ping.c:442
 #, c-format
 msgid "Cannot open stderr for %s\n"
 msgstr "Impossible d'ouvrir le canal d'erreur standard pour %s\n"
 
-#: plugins/check_ping.c:490 plugins/check_ping.c:492
+#: plugins/check_ping.c:492 plugins/check_ping.c:494
 msgid "System call sent warnings to stderr "
 msgstr ""
 "Les appel système enverront leurs messages d'avertissement vers le canal "
 "d'erreur standard"
 
 #: plugins/check_ping.c:519
-#, c-format
-msgid "CRITICAL - Network Unreachable (%s)"
+#, fuzzy, c-format
+msgid "CRITICAL - Network Unreachable (%s)\n"
 msgstr "CRITIQUE - Le réseau est inaccessible (%s)"
 
 #: plugins/check_ping.c:521
-#, c-format
-msgid "CRITICAL - Host Unreachable (%s)"
+#, fuzzy, c-format
+msgid "CRITICAL - Host Unreachable (%s)\n"
 msgstr "CRITIQUE - Hôte inaccessible (%s)"
 
 #: plugins/check_ping.c:523
-#, c-format
-msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)"
+#, fuzzy, c-format
+msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"
 msgstr "CRITIQUE - Paquet ICMP incorrect: Port inaccessible (%s)"
 
 #: plugins/check_ping.c:525
-#, c-format
-msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"
+#, fuzzy, c-format
+msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"
 msgstr "CRITIQUE - Paquet ICMP incorrect: Protocole inaccessible (%s)"
 
 #: plugins/check_ping.c:527
-#, c-format
-msgid "CRITICAL - Network Prohibited (%s)"
+#, fuzzy, c-format
+msgid "CRITICAL - Network Prohibited (%s)\n"
 msgstr "CRITIQUE - L'accès au réseau est interdit (%s)"
 
 #: plugins/check_ping.c:529
-#, c-format
-msgid "CRITICAL - Host Prohibited (%s)"
+#, fuzzy, c-format
+msgid "CRITICAL - Host Prohibited (%s)\n"
 msgstr "CRITIQUE - L'accès a l'hôte est interdit (%s)"
 
 #: plugins/check_ping.c:531
-#, c-format
-msgid "CRITICAL - Packet Filtered (%s)"
+#, fuzzy, c-format
+msgid "CRITICAL - Packet Filtered (%s)\n"
 msgstr "CRITIQUE - Paquet filtré (%s)"
 
 #: plugins/check_ping.c:533
-#, c-format
-msgid "CRITICAL - Host not found (%s)"
+#, fuzzy, c-format
+msgid "CRITICAL - Host not found (%s)\n"
 msgstr "CRITIQUE - Hôte non trouvé (%s)"
 
 #: plugins/check_ping.c:535
-#, c-format
-msgid "CRITICAL - Time to live exceeded (%s)"
+#, fuzzy, c-format
+msgid "CRITICAL - Time to live exceeded (%s)\n"
 msgstr "CRITIQUE - La durée de vie du paquet est dépassée (%s)"
 
-#: plugins/check_ping.c:542
-msgid "Unable to realloc warn_text"
+#: plugins/check_ping.c:537
+#, fuzzy, c-format
+msgid "CRITICAL - Destination Unreachable (%s)\n"
+msgstr "CRITIQUE - Hôte inaccessible (%s)"
+
+#: plugins/check_ping.c:544
+#, fuzzy
+msgid "Unable to realloc warn_text\n"
 msgstr "Impossible de réattribuer le texte d'avertissement"
 
-#: plugins/check_ping.c:559
+#: plugins/check_ping.c:561
 #, c-format
 msgid "Use ping to check connection statistics for a remote host."
 msgstr ""
 "Utilise ping pour vérifier les statistiques de connections d'un hôte distant."
 
-#: plugins/check_ping.c:571
+#: plugins/check_ping.c:573
 msgid "host to ping"
 msgstr "hôte à tester"
 
-#: plugins/check_ping.c:577
+#: plugins/check_ping.c:579
 msgid "number of ICMP ECHO packets to send"
 msgstr "nombre de paquets ICMP à envoyer"
 
-#: plugins/check_ping.c:578
+#: plugins/check_ping.c:580
 #, c-format
 msgid "(Default: %d)\n"
 msgstr "(Défaut: %d)\n"
 
-#: plugins/check_ping.c:580
+#: plugins/check_ping.c:582
 msgid "show HTML in the plugin output (obsoleted by urlize)"
 msgstr ""
 
-#: plugins/check_ping.c:585
+#: plugins/check_ping.c:587
 msgid "THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"
 msgstr ""
 "Le seuil est <rta>,<pl>% où <rta> est le temps moyen pour l'aller retour (ms)"
 
-#: plugins/check_ping.c:586
+#: plugins/check_ping.c:588
 msgid "time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"
 msgstr "qui déclenche un résultat AVERTISSEMENT ou CRITIQUE, et <pl> est le "
 
-#: plugins/check_ping.c:587
+#: plugins/check_ping.c:589
 msgid "percentage of packet loss to trigger an alarm state."
 msgstr "pourcentage de paquets perdus pour déclencher une alarme."
 
-#: plugins/check_ping.c:590
+#: plugins/check_ping.c:592
 msgid ""
 "This plugin uses the ping command to probe the specified host for packet loss"
 msgstr ""
 "Ce plugin utilise la commande ping pour vérifier l'hôte spécifié pour les "
 "pertes de paquets"
 
-#: plugins/check_ping.c:591
+#: plugins/check_ping.c:593
 msgid ""
 "(percentage) and round trip average (milliseconds). It can produce HTML "
 "output"
 msgstr ""
 
-#: plugins/check_ping.c:592
+#: plugins/check_ping.c:594
 msgid ""
 "linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"
 msgstr ""
 
-#: plugins/check_ping.c:593
+#: plugins/check_ping.c:595
 msgid "the contrib area of the downloads section at http://www.nagios.org/"
 msgstr ""
 
-#: plugins/check_procs.c:159
+#: plugins/check_procs.c:193
 #, c-format
 msgid "CMD: %s\n"
 msgstr "Commande: %s\n"
 
-#: plugins/check_procs.c:164
+#: plugins/check_procs.c:198
 msgid "System call sent warnings to stderr"
 msgstr ""
 "L'appel système à retourné des avertissement vers le canal d'erreur standard"
 
-#: plugins/check_procs.c:265
+#: plugins/check_procs.c:326
 #, c-format
 msgid "Not parseable: %s"
 msgstr "Impossible de parcourir les arguments: %s"
 
-#: plugins/check_procs.c:270
+#: plugins/check_procs.c:331
 #, c-format
 msgid "Unable to read output\n"
 msgstr "Impossible de lire les données en entrée\n"
 
-#: plugins/check_procs.c:287
+#: plugins/check_procs.c:348
 #, c-format
 msgid "%d warn out of "
 msgstr "%d avertissements sur"
 
-#: plugins/check_procs.c:292
+#: plugins/check_procs.c:353
 #, c-format
 msgid "%d crit, %d warn out of "
 msgstr "%d crit, %d alertes sur "
 
-#: plugins/check_procs.c:298
+#: plugins/check_procs.c:359
 #, c-format
 msgid " with %s"
 msgstr " avec %s"
 
-#: plugins/check_procs.c:378
-msgid "Critical Process Count must be an integer!"
-msgstr "Critique Le total des processus doit être un nombre entier!"
-
-#: plugins/check_procs.c:390
-msgid "Warning Process Count must be an integer!"
-msgstr "Avertissement Le total des processus doit être un nombre entier!"
-
-#: plugins/check_procs.c:398
+#: plugins/check_procs.c:453
 msgid "Parent Process ID must be an integer!"
 msgstr "L'identifiant du processus parent doit être un entier!"
 
-#: plugins/check_procs.c:404 plugins/check_procs.c:518
+#: plugins/check_procs.c:459 plugins/check_procs.c:586
 #, c-format
 msgid "%s%sSTATE = %s"
 msgstr "%s%sETAT = %s"
 
-#: plugins/check_procs.c:413
+#: plugins/check_procs.c:468
 msgid "UID was not found"
 msgstr "L'UID n'a pas été trouvé"
 
-#: plugins/check_procs.c:419
+#: plugins/check_procs.c:474
 msgid "User name was not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
-#: plugins/check_procs.c:434
+#: plugins/check_procs.c:489
 #, c-format
 msgid "%s%scommand name '%s'"
 msgstr "%s%snom de la commande '%s'"
 
-#: plugins/check_procs.c:462
+#: plugins/check_procs.c:524
 msgid "RSS must be an integer!"
 msgstr "RSS doit être un entier!"
 
-#: plugins/check_procs.c:469
+#: plugins/check_procs.c:531
 msgid "VSZ must be an integer!"
 msgstr "VSZ doit être un entier!"
 
-#: plugins/check_procs.c:477
+#: plugins/check_procs.c:539
 msgid "PCPU must be a float!"
 msgstr "PCPU doit être un nombre en virgule flottante!"
 
-#: plugins/check_procs.c:501
+#: plugins/check_procs.c:563
 msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
 msgstr "Metric doit être l'un des PROCS, VSZ, RSS, CPU, ELAPSED!"
 
-#: plugins/check_procs.c:537
-#, c-format
-msgid "wmax (%d) cannot be greater than cmax (%d)\n"
-msgstr "wmax (%d) ne peut pas être plus grand que cmax (%d)\n"
-
-#: plugins/check_procs.c:541
-#, c-format
-msgid "wmin (%d) cannot be less than cmin (%d)\n"
-msgstr "wmin (%d) ne peut pas être plus petit que cmin (%d)\n"
-
-#: plugins/check_procs.c:678
+#: plugins/check_procs.c:694
 msgid ""
 "Checks all processes and generates WARNING or CRITICAL states if the "
 "specified"
 msgstr ""
 
-#: plugins/check_procs.c:679
+#: plugins/check_procs.c:695
 msgid ""
 "metric is outside the required threshold ranges. The metric defaults to "
 "number"
 msgstr ""
 
-#: plugins/check_procs.c:680
+#: plugins/check_procs.c:696
 msgid ""
 "of processes.  Search filters can be applied to limit the processes to check."
 msgstr ""
 
-#: plugins/check_procs.c:689
+#: plugins/check_procs.c:705
 msgid "Generate warning state if metric is outside this range"
 msgstr ""
 
-#: plugins/check_procs.c:691
+#: plugins/check_procs.c:707
 msgid "Generate critical state if metric is outside this range"
 msgstr ""
 
-#: plugins/check_procs.c:693
+#: plugins/check_procs.c:709
 msgid "Check thresholds against metric. Valid types:"
 msgstr ""
 
-#: plugins/check_procs.c:694
+#: plugins/check_procs.c:710
 msgid "PROCS   - number of processes (default)"
 msgstr "PROCS   - nombre de  processus (défaut)"
 
-#: plugins/check_procs.c:695
+#: plugins/check_procs.c:711
 msgid "VSZ     - virtual memory size"
 msgstr "VSZ     - taille mémoire virtuelle"
 
-#: plugins/check_procs.c:696
+#: plugins/check_procs.c:712
 msgid "RSS     - resident set memory size"
 msgstr ""
 
-#: plugins/check_procs.c:697
+#: plugins/check_procs.c:713
 msgid "CPU     - percentage CPU"
 msgstr "CPU     - pourcentage du processeur"
 
-#: plugins/check_procs.c:700
+#: plugins/check_procs.c:716
 msgid "ELAPSED - time elapsed in seconds"
 msgstr "ELAPSED - temps écoulé en secondes"
 
-#: plugins/check_procs.c:705
+#: plugins/check_procs.c:721
 msgid "Extra information. Up to 3 verbosity levels"
 msgstr "informations supplémentaires. Jusqu'à 3 niveaux de verbosité"
 
-#: plugins/check_procs.c:710
+#: plugins/check_procs.c:724
+msgid "Filter own process the traditional way by PID instead of /proc/pid/exe"
+msgstr ""
+
+#: plugins/check_procs.c:729
 msgid "Only scan for processes that have, in the output of `ps`, one or"
 msgstr ""
 
-#: plugins/check_procs.c:711
+#: plugins/check_procs.c:730
 msgid "more of the status flags you specify (for example R, Z, S, RS,"
 msgstr ""
 
-#: plugins/check_procs.c:712
+#: plugins/check_procs.c:731
 msgid "RSZDT, plus others based on the output of your 'ps' command)."
 msgstr ""
 
-#: plugins/check_procs.c:714
+#: plugins/check_procs.c:733
 msgid "Only scan for children of the parent process ID indicated."
 msgstr ""
 
-#: plugins/check_procs.c:716
+#: plugins/check_procs.c:735
 msgid "Only scan for processes with VSZ higher than indicated."
 msgstr ""
 
-#: plugins/check_procs.c:718
+#: plugins/check_procs.c:737
 msgid "Only scan for processes with RSS higher than indicated."
 msgstr ""
 
-#: plugins/check_procs.c:720
+#: plugins/check_procs.c:739
 msgid "Only scan for processes with PCPU higher than indicated."
 msgstr ""
 
-#: plugins/check_procs.c:722
+#: plugins/check_procs.c:741
 msgid "Only scan for processes with user name or ID indicated."
 msgstr ""
 
-#: plugins/check_procs.c:724
+#: plugins/check_procs.c:743
 msgid "Only scan for processes with args that contain STRING."
 msgstr ""
 
-#: plugins/check_procs.c:726
+#: plugins/check_procs.c:745
 msgid "Only scan for processes with args that contain the regex STRING."
 msgstr ""
 
-#: plugins/check_procs.c:728
+#: plugins/check_procs.c:747
 msgid "Only scan for exact matches of COMMAND (without path)."
 msgstr ""
 
-#: plugins/check_procs.c:730
+#: plugins/check_procs.c:749
+msgid "Only scan for non kernel threads (works on Linux only)."
+msgstr ""
+
+#: plugins/check_procs.c:751
 #, c-format
 msgid ""
 "\n"
@@ -3836,7 +4133,7 @@ msgstr ""
 "est à l'intérieur du seuil\n"
 "\n"
 
-#: plugins/check_procs.c:735
+#: plugins/check_procs.c:756
 #, c-format
 msgid ""
 "This plugin checks the number of currently running processes and\n"
@@ -3853,27 +4150,27 @@ msgstr ""
 "état actuel (ex: 'Z'), ou par le nombre de processus en cours d'exécution\n"
 "\n"
 
-#: plugins/check_procs.c:744
+#: plugins/check_procs.c:765
 msgid "Warning if not two processes with command name portsentry."
 msgstr ""
 
-#: plugins/check_procs.c:745
+#: plugins/check_procs.c:766
 msgid "Critical if < 2 or > 1024 processes"
 msgstr ""
 
-#: plugins/check_procs.c:747
+#: plugins/check_procs.c:768
 msgid "Warning alert if > 10 processes with command arguments containing"
 msgstr ""
 
-#: plugins/check_procs.c:748
+#: plugins/check_procs.c:769
 msgid "'/usr/local/bin/perl' and owned by root"
 msgstr ""
 
-#: plugins/check_procs.c:750
+#: plugins/check_procs.c:771
 msgid "Alert if VSZ of any processes over 50K or 100K"
 msgstr ""
 
-#: plugins/check_procs.c:752
+#: plugins/check_procs.c:773
 #, c-format
 msgid "Alert if CPU of any processes over 10%% or 20%%"
 msgstr ""
@@ -4004,7 +4301,7 @@ msgid ""
 msgstr ""
 
 #: plugins/check_radius.c:373
-msgid "in a process listing. This risk is exacerbated because nagios will"
+msgid "in a process listing. This risk is exacerbated because the monitor will"
 msgstr ""
 
 #: plugins/check_radius.c:374
@@ -4034,7 +4331,7 @@ msgstr "Réponses REAL invalide reçue de l'hôte"
 msgid "Invalid REAL response received from host on port %d\n"
 msgstr "Réponses REAL invalide reçue de l'hôte sur le port %d\n"
 
-#: plugins/check_real.c:184 plugins/check_tcp.c:292
+#: plugins/check_real.c:184 plugins/check_tcp.c:311
 #, c-format
 msgid "No data received from host\n"
 msgstr "Pas de données reçues de l'hôte\n"
@@ -4044,11 +4341,11 @@ msgstr "Pas de données reçues de l'hôte\n"
 msgid "REAL %s - %d second response time\n"
 msgstr "REAL %s - %d secondes de temps de réponse\n"
 
-#: plugins/check_real.c:336 plugins/check_smtp.c:576 plugins/check_ups.c:536
+#: plugins/check_real.c:336 plugins/check_ups.c:536
 msgid "Warning time must be a positive integer"
 msgstr "Le seuil d'avertissement doit être un entier positif"
 
-#: plugins/check_real.c:345 plugins/check_smtp.c:567 plugins/check_ups.c:527
+#: plugins/check_real.c:345 plugins/check_ups.c:527
 msgid "Critical time must be a positive integer"
 msgstr "Le seuil critique doit être un entier positif"
 
@@ -4074,7 +4371,7 @@ msgstr ""
 msgid "This plugin will attempt to open an RTSP connection with the host."
 msgstr "Ce plugin va essayer d'ouvrir un connexion RTSP avec l'hôte."
 
-#: plugins/check_real.c:438 plugins/check_smtp.c:808
+#: plugins/check_real.c:438 plugins/check_smtp.c:830
 msgid "Successul connects return STATE_OK, refusals and timeouts return"
 msgstr ""
 
@@ -4092,506 +4389,518 @@ msgstr ""
 msgid "values."
 msgstr ""
 
-#: plugins/check_smtp.c:146 plugins/check_swap.c:265 plugins/check_swap.c:271
+#: plugins/check_smtp.c:150 plugins/check_swap.c:265 plugins/check_swap.c:271
 #, c-format
 msgid "malloc() failed!\n"
 msgstr "l'allocation mémoire à échoué!\n"
 
-#: plugins/check_smtp.c:150
+#: plugins/check_smtp.c:154
 #, c-format
 msgid "gethostname() failed!\n"
 msgstr "La commande gethostname() à échoué\n"
 
-#: plugins/check_smtp.c:185 plugins/check_smtp.c:209
+#: plugins/check_smtp.c:189 plugins/check_smtp.c:213
 #, c-format
 msgid "recv() failed\n"
 msgstr "La commande recv() à échoué\n"
 
-#: plugins/check_smtp.c:196
+#: plugins/check_smtp.c:200
 #, c-format
 msgid "Invalid SMTP response received from host: %s\n"
 msgstr "Réponse SMTP reçue de l'hôte invalide: %s\n"
 
-#: plugins/check_smtp.c:198
+#: plugins/check_smtp.c:202
 #, c-format
 msgid "Invalid SMTP response received from host on port %d: %s\n"
 msgstr "Réponse SMTP reçue de l'hôte sur le port %d invalide: %s\n"
 
-#: plugins/check_smtp.c:219
+#: plugins/check_smtp.c:223
 #, c-format
 msgid "WARNING - TLS not supported by server\n"
 msgstr "AVERTISSEMENT: - TLS n'est pas supporté par ce serveur\n"
 
-#: plugins/check_smtp.c:231
+#: plugins/check_smtp.c:235
 #, c-format
 msgid "Server does not support STARTTLS\n"
 msgstr "Le serveur ne supporte pas STARTTLS\n"
 
-#: plugins/check_smtp.c:237
+#: plugins/check_smtp.c:241
 #, c-format
 msgid "CRITICAL - Cannot create SSL context.\n"
 msgstr "CRITIQUE - Impossible de créer le contexte SSL.\n"
 
-#: plugins/check_smtp.c:257
+#: plugins/check_smtp.c:261
 msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS."
 msgstr ""
 
-#: plugins/check_smtp.c:262
+#: plugins/check_smtp.c:266
 #, c-format
 msgid "sent %s"
 msgstr "envoyé %s"
 
-#: plugins/check_smtp.c:264
+#: plugins/check_smtp.c:268
 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
 msgstr ""
 
-#: plugins/check_smtp.c:276
-msgid "CRITICAL - Cannot retrieve server certificate."
-msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur"
-
-#: plugins/check_smtp.c:311 plugins/check_snmp.c:722
+#: plugins/check_smtp.c:303 plugins/check_snmp.c:806
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr "Impossible de compiler l'expression rationnelle"
 
-#: plugins/check_smtp.c:320
+#: plugins/check_smtp.c:312
 #, c-format
 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:453
+#: plugins/check_smtp.c:316 plugins/check_snmp.c:511
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr "Erreur d'exécution: %s\n"
 
-#: plugins/check_smtp.c:338
-#, c-format
+#: plugins/check_smtp.c:330
 msgid "no authuser specified, "
 msgstr "Pas d'utilisateur pour l'authentification spécifié, "
 
-#: plugins/check_smtp.c:343
-#, c-format
+#: plugins/check_smtp.c:335
 msgid "no authpass specified, "
 msgstr "pas de mot de passe spécifié, "
 
-#: plugins/check_smtp.c:350 plugins/check_smtp.c:372 plugins/check_smtp.c:393
-#: plugins/check_smtp.c:668
+#: plugins/check_smtp.c:342 plugins/check_smtp.c:363 plugins/check_smtp.c:383
+#: plugins/check_smtp.c:688
 #, c-format
 msgid "sent %s\n"
 msgstr "envoyé %s\n"
 
-#: plugins/check_smtp.c:353
-#, c-format
+#: plugins/check_smtp.c:345
 msgid "recv() failed after AUTH LOGIN, "
 msgstr "recv() à échoué après AUTH LOGIN, "
 
-#: plugins/check_smtp.c:358 plugins/check_smtp.c:380 plugins/check_smtp.c:401
-#: plugins/check_smtp.c:679
+#: plugins/check_smtp.c:350 plugins/check_smtp.c:371 plugins/check_smtp.c:391
+#: plugins/check_smtp.c:699
 #, c-format
 msgid "received %s\n"
 msgstr "reçu %s\n"
 
-#: plugins/check_smtp.c:362
-#, c-format
+#: plugins/check_smtp.c:354
 msgid "invalid response received after AUTH LOGIN, "
 msgstr "Réponse invalide reçue après AUTH LOGIN, "
 
-#: plugins/check_smtp.c:376
-#, c-format
+#: plugins/check_smtp.c:367
 msgid "recv() failed after sending authuser, "
 msgstr "La commande recv() a échoué après authuser, "
 
-#: plugins/check_smtp.c:384
-#, c-format
+#: plugins/check_smtp.c:375
 msgid "invalid response received after authuser, "
 msgstr "Réponse invalide reçue après authuser, "
 
-#: plugins/check_smtp.c:397
-#, c-format
+#: plugins/check_smtp.c:387
 msgid "recv() failed after sending authpass, "
 msgstr "la commande recv() à échoué après authpass, "
 
-#: plugins/check_smtp.c:405
-#, c-format
+#: plugins/check_smtp.c:395
 msgid "invalid response received after authpass, "
 msgstr "Réponse invalide reçue après authpass, "
 
-#: plugins/check_smtp.c:412
-#, c-format
+#: plugins/check_smtp.c:402
 msgid "only authtype LOGIN is supported, "
 msgstr "seul la méthode d'authentification LOGIN est supportée, "
 
-#: plugins/check_smtp.c:436
+#: plugins/check_smtp.c:426
 #, c-format
 msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n"
 msgstr "SMTP %s - %s%.3f sec. de temps de réponse%s%s|%s\n"
 
-#: plugins/check_smtp.c:543 plugins/check_smtp.c:555
+#: plugins/check_smtp.c:536 plugins/check_smtp.c:548
 #, c-format
 msgid "Could not realloc() units [%d]\n"
 msgstr "Impossible de réallouer des unités [%d]\n"
 
-#: plugins/check_smtp.c:603
+#: plugins/check_smtp.c:556
+#, fuzzy
+msgid "Critical time must be a positive"
+msgstr "Le seuil critique doit être un entier positif"
+
+#: plugins/check_smtp.c:564
+#, fuzzy
+msgid "Warning time must be a positive"
+msgstr "Le seuil d'avertissement doit être un entier positif"
+
+#: plugins/check_smtp.c:611
 msgid "SSL support not available - install OpenSSL and recompile"
 msgstr "SSL n'est pas disponible - installer OpenSSL et recompilez"
 
-#: plugins/check_smtp.c:674
+#: plugins/check_smtp.c:679 plugins/check_smtp.c:684
+#, c-format
+msgid "Connection closed by server before sending QUIT command\n"
+msgstr ""
+
+#: plugins/check_smtp.c:694
 #, c-format
 msgid "recv() failed after QUIT."
 msgstr "recv() à échoué après QUIT."
 
-#: plugins/check_smtp.c:676
+#: plugins/check_smtp.c:696
 #, c-format
 msgid "Connection reset by peer."
 msgstr ""
 
-#: plugins/check_smtp.c:764
+#: plugins/check_smtp.c:784
 msgid "This plugin will attempt to open an SMTP connection with the host."
 msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte."
 
-#: plugins/check_smtp.c:778
+#: plugins/check_smtp.c:798
 #, c-format
 msgid "    String to expect in first line of server response (default: '%s')\n"
 msgstr ""
-"   Texte attendu dans la première ligne de réponse du serveur (défaut: '%"
-"s')\n"
+"   Texte attendu dans la première ligne de réponse du serveur (défaut: "
+"'%s')\n"
 
-#: plugins/check_smtp.c:780
+#: plugins/check_smtp.c:800
 msgid "SMTP command (may be used repeatedly)"
 msgstr "Commande SMTP (peut être utilisé plusieurs fois)"
 
-#: plugins/check_smtp.c:782
+#: plugins/check_smtp.c:802
 msgid "Expected response to command (may be used repeatedly)"
 msgstr ""
 
-#: plugins/check_smtp.c:784
+#: plugins/check_smtp.c:804
 msgid "FROM-address to include in MAIL command, required by Exchange 2000"
 msgstr ""
 
-#: plugins/check_smtp.c:786
+#: plugins/check_smtp.c:806
 msgid "FQDN used for HELO"
 msgstr ""
 
-#: plugins/check_smtp.c:789 plugins/check_tcp.c:633
+#: plugins/check_smtp.c:809 plugins/check_tcp.c:665
 msgid "Minimum number of days a certificate has to be valid."
 msgstr "Nombre de jours minimum pour que le certificat soit valide."
 
-#: plugins/check_smtp.c:791
+#: plugins/check_smtp.c:811
 msgid "Use STARTTLS for the connection."
 msgstr ""
 
-#: plugins/check_smtp.c:795
+#: plugins/check_smtp.c:815
 msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
 msgstr ""
 
-#: plugins/check_smtp.c:797
+#: plugins/check_smtp.c:817
 msgid "SMTP AUTH username"
 msgstr ""
 
-#: plugins/check_smtp.c:799
+#: plugins/check_smtp.c:819
 msgid "SMTP AUTH password"
 msgstr ""
 
-#: plugins/check_smtp.c:809
+#: plugins/check_smtp.c:821
+msgid "Ignore failure when sending QUIT command to server"
+msgstr ""
+
+#: plugins/check_smtp.c:831
 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful"
 msgstr ""
 
-#: plugins/check_smtp.c:810
+#: plugins/check_smtp.c:832
 msgid "connects, but incorrect reponse messages from the host result in"
 msgstr ""
 
-#: plugins/check_smtp.c:811
+#: plugins/check_smtp.c:833
 msgid "STATE_WARNING return values."
 msgstr ""
 
-#: plugins/check_snmp.c:299
+#: plugins/check_snmp.c:169 plugins/check_snmp.c:582
+msgid "Cannot malloc"
+msgstr ""
+
+#: plugins/check_snmp.c:356
 #, c-format
 msgid "External command error: %s\n"
 msgstr "Erreur d'exécution de commande externe: %s\n"
 
-#: plugins/check_snmp.c:304
+#: plugins/check_snmp.c:361
 #, c-format
 msgid "External command error with no output (return code: %d)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:410
-msgid "No valid data returned"
+#: plugins/check_snmp.c:464
+#, fuzzy, c-format
+msgid "No valid data returned (%s)\n"
 msgstr "Pas de données valides reçues"
 
-#: plugins/check_snmp.c:417
+#: plugins/check_snmp.c:475
 msgid "Time duration between plugin calls is invalid"
 msgstr ""
 
-#: plugins/check_snmp.c:513
-msgid "Cannot malloc"
-msgstr ""
-
-#: plugins/check_snmp.c:519
+#: plugins/check_snmp.c:588
 msgid "Cannot asprintf()"
 msgstr ""
 
-#: plugins/check_snmp.c:525
+#: plugins/check_snmp.c:594
 #, fuzzy
 msgid "Cannot realloc()"
 msgstr "Impossible de réallouer des unités\n"
 
-#: plugins/check_snmp.c:541
+#: plugins/check_snmp.c:610
 msgid "No previous data to calculate rate - assume okay"
 msgstr ""
 
-#: plugins/check_snmp.c:680
+#: plugins/check_snmp.c:751
 msgid "Retries interval must be a positive integer"
 msgstr "L'intervalle pour les essais doit être un entier positif"
 
-#: plugins/check_snmp.c:742
+#: plugins/check_snmp.c:831
 #, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr "Impossible de réallouer des labels[%d]"
 
-#: plugins/check_snmp.c:754
+#: plugins/check_snmp.c:844
 msgid "Could not reallocate labels\n"
 msgstr "Impossible de réallouer des labels\n"
 
-#: plugins/check_snmp.c:771
+#: plugins/check_snmp.c:860
 #, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr "Impossible de réallouer des unités [%d]\n"
 
-#: plugins/check_snmp.c:783
+#: plugins/check_snmp.c:872
 msgid "Could not realloc() units\n"
 msgstr "Impossible de réallouer des unités\n"
 
-#: plugins/check_snmp.c:800
+#: plugins/check_snmp.c:889
 #, fuzzy
 msgid "Rate multiplier must be a positive integer"
 msgstr "La taille du paquet doit être un entier positif"
 
-#: plugins/check_snmp.c:852
+#: plugins/check_snmp.c:947
 msgid "No host specified\n"
 msgstr "Pas d'hôte spécifié\n"
 
-#: plugins/check_snmp.c:856
+#: plugins/check_snmp.c:951
 msgid "No OIDs specified\n"
 msgstr "Pas de compteur spécifié\n"
 
-#: plugins/check_snmp.c:878
+#: plugins/check_snmp.c:973
 msgid "Invalid seclevel"
 msgstr ""
 
-#: plugins/check_snmp.c:885 plugins/check_snmp.c:888 plugins/check_snmp.c:906
+#: plugins/check_snmp.c:980 plugins/check_snmp.c:983 plugins/check_snmp.c:1001
 #, c-format
 msgid "Required parameter: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:927
+#: plugins/check_snmp.c:1022
 msgid "Invalid SNMP version"
 msgstr "Version de SNMP invalide"
 
-#: plugins/check_snmp.c:944
+#: plugins/check_snmp.c:1039
 msgid "Unbalanced quotes\n"
 msgstr "Guillemets manquants\n"
 
-#: plugins/check_snmp.c:993
+#: plugins/check_snmp.c:1088
 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:1006
+#: plugins/check_snmp.c:1101
 msgid "Use SNMP GETNEXT instead of SNMP GET"
 msgstr "Utiliser SNMP GETNEXT au lieu de SNMP GET"
 
-#: plugins/check_snmp.c:1008
+#: plugins/check_snmp.c:1103
 msgid "SNMP protocol version"
 msgstr "Version du protocole SNMP"
 
-#: plugins/check_snmp.c:1010
+#: plugins/check_snmp.c:1105
 msgid "SNMPv3 securityLevel"
 msgstr "Niveau de sécurité SNMPv3 (securityLevel)"
 
-#: plugins/check_snmp.c:1012
+#: plugins/check_snmp.c:1107
 msgid "SNMPv3 auth proto"
 msgstr "Protocole d'authentification SNMPv3"
 
-#: plugins/check_snmp.c:1014
+#: plugins/check_snmp.c:1109
 msgid "SNMPv3 priv proto (default DES)"
 msgstr ""
 
-#: plugins/check_snmp.c:1018
+#: plugins/check_snmp.c:1113
 msgid "Optional community string for SNMP communication"
 msgstr "Communauté optionnelle pour la communication SNMP"
 
-#: plugins/check_snmp.c:1019
+#: plugins/check_snmp.c:1114
 msgid "default is"
 msgstr "défaut:"
 
-#: plugins/check_snmp.c:1021
+#: plugins/check_snmp.c:1116
 msgid "SNMPv3 username"
 msgstr "Nom d'utilisateur SNMPv3"
 
-#: plugins/check_snmp.c:1023
+#: plugins/check_snmp.c:1118
 msgid "SNMPv3 authentication password"
 msgstr "Mot de passe d'authentification SNMPv3"
 
-#: plugins/check_snmp.c:1025
+#: plugins/check_snmp.c:1120
 msgid "SNMPv3 privacy password"
 msgstr "Mot de passe de confidentialité SNMPv3"
 
-#: plugins/check_snmp.c:1029
+#: plugins/check_snmp.c:1124
 msgid "Object identifier(s) or SNMP variables whose value you wish to query"
 msgstr ""
 
-#: plugins/check_snmp.c:1031
+#: plugins/check_snmp.c:1126
 msgid ""
 "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
 msgstr ""
 
-#: plugins/check_snmp.c:1032
+#: plugins/check_snmp.c:1127
 msgid "for symbolic OIDs.)"
 msgstr ""
 
-#: plugins/check_snmp.c:1034
+#: plugins/check_snmp.c:1129
 msgid "Delimiter to use when parsing returned data. Default is"
 msgstr ""
 
-#: plugins/check_snmp.c:1035
+#: plugins/check_snmp.c:1130
 msgid "Any data on the right hand side of the delimiter is considered"
 msgstr ""
 
-#: plugins/check_snmp.c:1036
+#: plugins/check_snmp.c:1131
 msgid "to be the data that should be used in the evaluation."
 msgstr ""
 
-#: plugins/check_snmp.c:1040
+#: plugins/check_snmp.c:1135
 msgid "Warning threshold range(s)"
 msgstr "Valeurs pour le seuil d'avertissement"
 
-#: plugins/check_snmp.c:1042
+#: plugins/check_snmp.c:1137
 msgid "Critical threshold range(s)"
 msgstr "Valeurs pour le seuil critique"
 
-#: plugins/check_snmp.c:1044
+#: plugins/check_snmp.c:1139
 msgid "Enable rate calculation. See 'Rate Calculation' below"
 msgstr ""
 
-#: plugins/check_snmp.c:1046
+#: plugins/check_snmp.c:1141
 msgid ""
 "Converts rate per second. For example, set to 60 to convert to per minute"
 msgstr ""
 
-#: plugins/check_snmp.c:1050
+#: plugins/check_snmp.c:1143
+msgid "Add/substract the specified OFFSET to numeric sensor data"
+msgstr ""
+
+#: plugins/check_snmp.c:1147
 msgid "Return OK state (for that OID) if STRING is an exact match"
 msgstr ""
 
-#: plugins/check_snmp.c:1052
+#: plugins/check_snmp.c:1149
 msgid ""
 "Return OK state (for that OID) if extended regular expression REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:1054
+#: plugins/check_snmp.c:1151
 msgid ""
 "Return OK state (for that OID) if case-insensitive extended REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:1056
+#: plugins/check_snmp.c:1153
 msgid "Invert search result (CRITICAL if found)"
 msgstr ""
 
-#: plugins/check_snmp.c:1060
+#: plugins/check_snmp.c:1157
 msgid "Prefix label for output from plugin"
 msgstr ""
 
-#: plugins/check_snmp.c:1062
+#: plugins/check_snmp.c:1159
 msgid "Units label(s) for output data (e.g., 'sec.')."
 msgstr ""
 
-#: plugins/check_snmp.c:1064
+#: plugins/check_snmp.c:1161
 msgid "Separates output on multiple OID requests"
 msgstr ""
 
-#: plugins/check_snmp.c:1068
+#: plugins/check_snmp.c:1165
 msgid "Number of retries to be used in the requests"
 msgstr "Le nombre d'essai pour les requêtes"
 
-#: plugins/check_snmp.c:1073
+#: plugins/check_snmp.c:1168
+msgid "Label performance data with OIDs instead of --label's"
+msgstr ""
+
+#: plugins/check_snmp.c:1173
 msgid ""
 "This plugin uses the 'snmpget' command included with the NET-SNMP package."
 msgstr ""
 
-#: plugins/check_snmp.c:1074
+#: plugins/check_snmp.c:1174
 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:1075
+#: plugins/check_snmp.c:1175
 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:1079
+#: plugins/check_snmp.c:1179
+#, fuzzy
 msgid ""
-"- Multiple OIDs may be indicated by a comma or space-delimited list (lists "
-"with"
+"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited  "
 msgstr ""
 "- Des OIDs multiples peuvent être séparées par des virgules ou des espaces"
 
-#: plugins/check_snmp.c:1080
-msgid "internal spaces must be quoted). Maximum:"
+#: plugins/check_snmp.c:1180
+#, fuzzy
+msgid "list (lists with internal spaces must be quoted)."
 msgstr "(Les liste avec espaces doivent être entre guillemets). Max:"
 
-#: plugins/check_snmp.c:1080
-msgid "OIDs."
-msgstr "OIDs."
-
-#: plugins/check_snmp.c:1084
+#: plugins/check_snmp.c:1184
 msgid ""
 "- When checking multiple OIDs, separate ranges by commas like '-w "
 "1:10,1:,:20'"
 msgstr ""
 
-#: plugins/check_snmp.c:1085
+#: plugins/check_snmp.c:1185
 msgid "- Note that only one string and one regex may be checked at present"
 msgstr ""
 
-#: plugins/check_snmp.c:1086
+#: plugins/check_snmp.c:1186
 msgid ""
 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
 msgstr ""
 
-#: plugins/check_snmp.c:1087
+#: plugins/check_snmp.c:1187
 msgid "returned from the SNMP query is an unsigned integer."
 msgstr ""
 
-#: plugins/check_snmp.c:1090
+#: plugins/check_snmp.c:1190
 msgid "Rate Calculation:"
 msgstr ""
 
-#: plugins/check_snmp.c:1091
+#: plugins/check_snmp.c:1191
 msgid "In many places, SNMP returns counters that are only meaningful when"
 msgstr ""
 
-#: plugins/check_snmp.c:1092
+#: plugins/check_snmp.c:1192
 msgid "calculating the counter difference since the last check. check_snmp"
 msgstr ""
 
-#: plugins/check_snmp.c:1093
+#: plugins/check_snmp.c:1193
 msgid "saves the last state information in a file so that the rate per second"
 msgstr ""
 
-#: plugins/check_snmp.c:1094
+#: plugins/check_snmp.c:1194
 msgid "can be calculated. Use the --rate option to save state information."
 msgstr ""
 
-#: plugins/check_snmp.c:1095
+#: plugins/check_snmp.c:1195
 msgid ""
 "On the first run, there will be no prior state - this will return with OK."
 msgstr ""
 
-#: plugins/check_snmp.c:1096
+#: plugins/check_snmp.c:1196
 msgid "The state is uniquely determined by the arguments to the plugin, so"
 msgstr ""
 
-#: plugins/check_snmp.c:1097
+#: plugins/check_snmp.c:1197
 msgid "changing the arguments will create a new state file."
 msgstr ""
 
@@ -4599,27 +4908,27 @@ msgstr ""
 msgid "Port number must be a positive integer"
 msgstr "Le numéro du port doit être un nombre entier positif"
 
-#: plugins/check_ssh.c:228
+#: plugins/check_ssh.c:232
 #, c-format
 msgid "Server answer: %s"
 msgstr "Réponse du serveur: %s"
 
-#: plugins/check_ssh.c:247
+#: plugins/check_ssh.c:251
 #, c-format
 msgid "SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"
 msgstr ""
 "SSH AVERTISSEMENT - %s (protocole %s) différence de version, attendu'%s'\n"
 
-#: plugins/check_ssh.c:254
-#, c-format
-msgid "SSH OK - %s (protocol %s)\n"
+#: plugins/check_ssh.c:260
+#, fuzzy, c-format
+msgid "SSH OK - %s (protocol %s) | %s\n"
 msgstr "SSH OK - %s (protocole %s)\n"
 
-#: plugins/check_ssh.c:274
+#: plugins/check_ssh.c:281
 msgid "Try to connect to an SSH server at specified server and port"
 msgstr "Essaye de se connecter à un serveur SSH précisé à un port précis"
 
-#: plugins/check_ssh.c:290
+#: plugins/check_ssh.c:297
 msgid ""
 "Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)"
 msgstr ""
@@ -4727,51 +5036,46 @@ msgstr ""
 "Sur AIX, si -a est spécifié, le plugin utilise lsps -a, sinon il utilise "
 "lsps -s."
 
-#: plugins/check_tcp.c:197
+#: plugins/check_tcp.c:206
 msgid "CRITICAL - Generic check_tcp called with unknown service\n"
 msgstr ""
 "CRITIQUE -check_tcp version générique utilisé avec un service inconnu\n"
 
-#: plugins/check_tcp.c:221
+#: plugins/check_tcp.c:230
 msgid "With UDP checks, a send/expect string must be specified."
 msgstr ""
 "Avec la surveillance UDP, une chaîne d'envoi et un chaîne de réponse doit "
 "être spécifiée."
 
-#: plugins/check_tcp.c:240
-#, c-format
-msgid "CRITICAL - Cannot retrieve server certificate.\n"
-msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n"
-
-#: plugins/check_tcp.c:418
+#: plugins/check_tcp.c:431
 msgid "No arguments found"
 msgstr "Pas de paramètres"
 
-#: plugins/check_tcp.c:519
+#: plugins/check_tcp.c:534
 msgid "Maxbytes must be a positive integer"
 msgstr "Maxbytes doit être un entier positif"
 
-#: plugins/check_tcp.c:537
+#: plugins/check_tcp.c:552
 msgid "Refuse must be one of ok, warn, crit"
 msgstr "Refuse doit être parmis ok, warn, crit"
 
-#: plugins/check_tcp.c:547
+#: plugins/check_tcp.c:562
 msgid "Mismatch must be one of ok, warn, crit"
 msgstr "Mismatch doit être parmis ok, warn, crit"
 
-#: plugins/check_tcp.c:553
+#: plugins/check_tcp.c:568
 msgid "Delay must be a positive integer"
 msgstr "Delay doit être un entier positif"
 
-#: plugins/check_tcp.c:581
+#: plugins/check_tcp.c:613
 msgid "You must provide a server address"
 msgstr "Vous devez fournir une adresse serveur"
 
-#: plugins/check_tcp.c:583
+#: plugins/check_tcp.c:615
 msgid "Invalid hostname, address or socket"
 msgstr "Adresse/Nom/Socket invalide"
 
-#: plugins/check_tcp.c:597
+#: plugins/check_tcp.c:629
 #, c-format
 msgid ""
 "This plugin tests %s connections with the specified host (or unix socket).\n"
@@ -4780,7 +5084,7 @@ msgstr ""
 "Ce plugin teste %s connections avec l'hôte spécifié (ou socket unix).\n"
 "\n"
 
-#: plugins/check_tcp.c:610
+#: plugins/check_tcp.c:642
 msgid ""
 "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or "
 "quit option"
@@ -4788,55 +5092,59 @@ msgstr ""
 "Permet d'utiliser \\n, \\r, \\t ou \\ dans la chaîne de caractères send ou "
 "quit. Doit être placé avant ces dernières."
 
-#: plugins/check_tcp.c:611
+#: plugins/check_tcp.c:643
 msgid "Default: nothing added to send, \\r\\n added to end of quit"
 msgstr ""
 "Par défaut: Rien n'est ajouté à send, \\r\\n est ajouté à la fin de quit"
 
-#: plugins/check_tcp.c:613
+#: plugins/check_tcp.c:645
 msgid "String to send to the server"
 msgstr "Chaîne de caractères à envoyer au serveur"
 
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:647
 msgid "String to expect in server response"
 msgstr "Chaîne de caractères à attendre en réponse"
 
-#: plugins/check_tcp.c:615
+#: plugins/check_tcp.c:647
 msgid "(may be repeated)"
 msgstr "(peut être utilisé plusieurs fois)"
 
-#: plugins/check_tcp.c:617
+#: plugins/check_tcp.c:649
 msgid "All expect strings need to occur in server response. Default is any"
 msgstr ""
 "Toutes les chaînes attendus (expect) doivent être repérés dans la réponse. "
 "Par défaut, n'importe laquelle suffit."
 
-#: plugins/check_tcp.c:619
+#: plugins/check_tcp.c:651
 msgid "String to send server to initiate a clean close of the connection"
 msgstr "Chaîne de caractères à envoyer pour fermer gracieusement la connection"
 
-#: plugins/check_tcp.c:621
+#: plugins/check_tcp.c:653
 msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
 msgstr ""
 
-#: plugins/check_tcp.c:623
+#: plugins/check_tcp.c:655
 msgid ""
 "Accept expected string mismatches with states ok, warn, crit (default: warn)"
 msgstr ""
 
-#: plugins/check_tcp.c:625
+#: plugins/check_tcp.c:657
 msgid "Hide output from TCP socket"
 msgstr "Cacher la réponse provenant du socket TCP"
 
-#: plugins/check_tcp.c:627
+#: plugins/check_tcp.c:659
 msgid "Close connection once more than this number of bytes are received"
 msgstr ""
 
-#: plugins/check_tcp.c:629
+#: plugins/check_tcp.c:661
 msgid "Seconds to wait between sending string and polling for response"
 msgstr ""
 
-#: plugins/check_tcp.c:635
+#: plugins/check_tcp.c:666
+msgid "1st is #days for warning, 2nd is critical (if not specified - 0)."
+msgstr ""
+
+#: plugins/check_tcp.c:668
 msgid "Use SSL for the connection."
 msgstr ""
 
@@ -4849,8 +5157,8 @@ msgstr "TEMPS INCONNU - impossible de se connecter au serveur %s, au port %d\n"
 #, c-format
 msgid "TIME UNKNOWN - could not send UDP request to server %s, port %d\n"
 msgstr ""
-"TEMPS INCONNU - impossible d'envoyer une requête UDP au serveur %s, au port %"
-"d\n"
+"TEMPS INCONNU - impossible d'envoyer une requête UDP au serveur %s, au port "
+"%d\n"
 
 #: plugins/check_time.c:139
 #, c-format
@@ -4900,7 +5208,6 @@ msgid "Response time (sec.) necessary to result in critical status"
 msgstr ""
 
 #: plugins/check_ups.c:144
-#, c-format
 msgid "On Battery, Low Battery"
 msgstr "Sur Batterie, Batterie faible"
 
@@ -4953,7 +5260,6 @@ msgid ", Unknown"
 msgstr ", Inconnu"
 
 #: plugins/check_ups.c:324
-#, c-format
 msgid "UPS does not support any available options\n"
 msgstr "L'UPS ne supporte aucune des options disponibles\n"
 
@@ -5070,108 +5376,108 @@ msgstr ""
 msgid "http://www.networkupstools.org"
 msgstr ""
 
-#: plugins/check_users.c:92
+#: plugins/check_users.c:110
 #, c-format
 msgid "# users=%d"
 msgstr "# utilisateurs=%d"
 
-#: plugins/check_users.c:115
+#: plugins/check_users.c:133
 msgid "Unable to read output"
 msgstr "Impossible de lire les données en entrée"
 
-#: plugins/check_users.c:122
+#: plugins/check_users.c:140
 #, c-format
 msgid "USERS %s - %d users currently logged in |%s\n"
 msgstr "UTILISATEURS %s - %d utilisateurs actuellement connectés sur |%s\n"
 
-#: plugins/check_users.c:207
+#: plugins/check_users.c:219
 msgid "This plugin checks the number of users currently logged in on the local"
 msgstr ""
 "Ce plugin vérifie le nombre d'utilisateurs actuellement connecté sur le "
 "système local"
 
-#: plugins/check_users.c:208
+#: plugins/check_users.c:220
 msgid ""
 "system and generates an error if the number exceeds the thresholds specified."
 msgstr "et génère une erreur si le nombre excède le seuil spécifié."
 
-#: plugins/check_users.c:218
+#: plugins/check_users.c:230
 msgid "Set WARNING status if more than INTEGER users are logged in"
 msgstr ""
 "Sortir avec un résultat AVERTISSEMENT si plus de INTEGER utilisateurs sont "
 "connectés"
 
-#: plugins/check_users.c:220
+#: plugins/check_users.c:232
 msgid "Set CRITICAL status if more than INTEGER users are logged in"
 msgstr ""
 "Sortir avec un résultat CRITIQUE si plus de INTEGER utilisateurs sont "
 "connectés"
 
-#: plugins/check_ide_smart.c:229
+#: plugins/check_ide_smart.c:256
 #, c-format
 msgid "CRITICAL - Couldn't open device %s: %s\n"
 msgstr "Critique - Impossible d'ouvrir le périphérique %s: %s\n"
 
-#: plugins/check_ide_smart.c:234
+#: plugins/check_ide_smart.c:261
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr "CRITIQUE - SMART_CMD_ENABLE\n"
 
-#: plugins/check_ide_smart.c:295
+#: plugins/check_ide_smart.c:323 plugins/check_ide_smart.c:350
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr "CRITIQUE - SMART_READ_VALUES: %s\n"
 
-#: plugins/check_ide_smart.c:364
+#: plugins/check_ide_smart.c:421
 #, c-format
 msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
 msgstr ""
 "CRITIQUE - %d État de pré-panne %c Détecté! %d/%d les tests on échoués.\n"
 
-#: plugins/check_ide_smart.c:372
+#: plugins/check_ide_smart.c:429
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 "AVERTISSEMENT -  %d État de pré-panne %s Détecté! %d/%d les tests on "
 "échoués.\n"
 
-#: plugins/check_ide_smart.c:380
+#: plugins/check_ide_smart.c:437
 #, c-format
 msgid "OK - Operational (%d/%d tests passed)\n"
 msgstr "OK - En fonctionnement (%d/%d les tests on été réussi)\n"
 
-#: plugins/check_ide_smart.c:384
+#: plugins/check_ide_smart.c:441
 #, c-format
 msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n"
 msgstr "ERREUR - État '%d' inconnu. %d/%d les tests on réussi\n"
 
-#: plugins/check_ide_smart.c:417
+#: plugins/check_ide_smart.c:474
 #, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 "Etat Hors Ligne=%d {%s}, Hors Ligne Auto=%s, Temps avant arrêt=%d minutes\n"
 
-#: plugins/check_ide_smart.c:423
+#: plugins/check_ide_smart.c:480
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr "Capacité Hors Ligne=%d {%s %s %s}\n"
 
-#: plugins/check_ide_smart.c:429
+#: plugins/check_ide_smart.c:486
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr "Révision Smart=%d, Somme de contrôle=%d, Capacité Smart=%d {%s %s}\n"
 
-#: plugins/check_ide_smart.c:450
+#: plugins/check_ide_smart.c:508 plugins/check_ide_smart.c:532
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr "CRITIQUE - %s: %s\n"
 
-#: plugins/check_ide_smart.c:469
+#: plugins/check_ide_smart.c:553 plugins/check_ide_smart.c:580
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr "CRITIQUE - SMART_READ_THRESHOLDS: %s\n"
 
-#: plugins/check_ide_smart.c:486
+#: plugins/check_ide_smart.c:599
 #, c-format
 msgid ""
 "This plugin checks a local hard drive with the (Linux specific) SMART "
@@ -5180,41 +5486,41 @@ msgstr ""
 "Ce plugin vérifie un disque dur local à l'aide de l'interface SMART (pour "
 "Linux) [http://smartlinux.sourceforge.net/smart/index.php]."
 
-#: plugins/check_ide_smart.c:496
+#: plugins/check_ide_smart.c:609
 msgid "Select device DEVICE"
 msgstr ""
 
-#: plugins/check_ide_smart.c:497
+#: plugins/check_ide_smart.c:610
 msgid ""
 "Note: if the device is selected with this option, _no_ other options are "
 "accepted"
 msgstr ""
 
-#: plugins/check_ide_smart.c:499
+#: plugins/check_ide_smart.c:612
 msgid "Perform immediately offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:501
+#: plugins/check_ide_smart.c:614
 msgid "Returns the number of failed tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:503
+#: plugins/check_ide_smart.c:616
 msgid "Turn on automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:505
+#: plugins/check_ide_smart.c:618
 msgid "Turn off automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:507
-msgid "Output suitable for Nagios"
+#: plugins/check_ide_smart.c:620
+msgid "Output suitable for the monitoring system"
 msgstr ""
 
-#: plugins/negate.c:96
+#: plugins/negate.c:99
 msgid "No data returned from command\n"
 msgstr "Pas de données reçues de la commande\n"
 
-#: plugins/negate.c:167
+#: plugins/negate.c:170
 msgid ""
 "Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
 "or integer (0-3)."
@@ -5222,15 +5528,15 @@ msgstr ""
 "Le résultat de temps dépassé doit être un nom d'état valide (OK, WARNING, "
 "CRITICAL, UNKNOWN) ou un nombre entier (0-3)."
 
-#: plugins/negate.c:171
+#: plugins/negate.c:174
 msgid ""
-"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-"
-"3)."
+"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer "
+"(0-3)."
 msgstr ""
 "Ok doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou un "
 "nombre entier (0-3)."
 
-#: plugins/negate.c:177
+#: plugins/negate.c:180
 msgid ""
 "Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
@@ -5238,7 +5544,7 @@ msgstr ""
 "Warning doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou "
 "un nombre entier (0-3)."
 
-#: plugins/negate.c:182
+#: plugins/negate.c:185
 msgid ""
 "Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
@@ -5246,7 +5552,7 @@ msgstr ""
 "Critical doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou "
 "un nombre entier (0-3)."
 
-#: plugins/negate.c:187
+#: plugins/negate.c:190
 msgid ""
 "Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
@@ -5254,33 +5560,33 @@ msgstr ""
 "Unknown doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou "
 "un nombre entier (0-3)."
 
-#: plugins/negate.c:214
+#: plugins/negate.c:217
 msgid "Require path to command"
 msgstr "Chemin vers la commande requis"
 
-#: plugins/negate.c:243
+#: plugins/negate.c:246
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL and vice-versa)."
 msgstr ""
 "Inverse le statut d'un plugin (retourne OK pour CRITIQUE et vice-versa)."
 
-#: plugins/negate.c:244
+#: plugins/negate.c:247
 msgid "Additional switches can be used to control which state becomes what."
 msgstr ""
 "Des options additionnelles peuvent être utilisées pour contrôler quel état "
 "devient quoi."
 
-#: plugins/negate.c:253
+#: plugins/negate.c:256
 msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status."
 msgstr ""
 "Utilisez un délai de réponse plus long que celui du plugin afin de conserver "
 "les résultats CRITIQUE"
 
-#: plugins/negate.c:255
+#: plugins/negate.c:258
 msgid "Custom result on Negate timeouts; see below for STATUS definition\n"
 msgstr ""
 
-#: plugins/negate.c:261
+#: plugins/negate.c:264
 #, c-format
 msgid ""
 "    STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n"
@@ -5288,97 +5594,97 @@ msgstr ""
 "    STATUS peut être 'OK', 'WARNING', 'CRITICAL' ou 'UNKNOWN' sans les "
 "simple\n"
 
-#: plugins/negate.c:262
+#: plugins/negate.c:265
 #, c-format
 msgid ""
 "    quotes. Numeric values are accepted. If nothing is specified, permutes\n"
 msgstr "    quotes. Les valeurs numériques sont acceptées. Si rien n'est\n"
 
-#: plugins/negate.c:263
+#: plugins/negate.c:266
 #, c-format
 msgid "    OK and CRITICAL.\n"
 msgstr "    spécifié, inverse OK et CRITIQUE.\n"
 
-#: plugins/negate.c:265
+#: plugins/negate.c:268
 #, c-format
 msgid ""
 "    Substitute output text as well. Will only substitute text in CAPITALS\n"
 msgstr ""
 
-#: plugins/negate.c:270
+#: plugins/negate.c:273
 msgid "Run check_ping and invert result. Must use full path to plugin"
 msgstr ""
 "Execute check_ping et inverse le résultat. Le chemin complet du plug-in doit "
 "être spécifié"
 
-#: plugins/negate.c:272
+#: plugins/negate.c:275
 msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"
 msgstr ""
 "Ceci retournera OK au lieu de AVERTISSEMENT et INCONNU au lieu de CRITIQUE"
 
-#: plugins/negate.c:275
+#: plugins/negate.c:278
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert it."
 msgstr ""
 "Ce plugin est un adaptateur qui prends l'état d'un autre plug-in et "
 "l'inverse."
 
-#: plugins/negate.c:276
+#: plugins/negate.c:279
 msgid "The full path of the plugin must be provided."
 msgstr "Le chemin complet du plugin doit être spécifié."
 
-#: plugins/negate.c:277
+#: plugins/negate.c:280
 msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL."
 msgstr "Si le plugin executé retourne OK, l'adaptateur retournera CRITIQUE."
 
-#: plugins/negate.c:278
+#: plugins/negate.c:281
 msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK."
 msgstr "Si le plugin executé retourne CRITIQUE, l'adaptateur retournera OK."
 
-#: plugins/negate.c:279
+#: plugins/negate.c:282
 msgid "Otherwise, the output state of the wrapped plugin is unchanged."
 msgstr "Autrement, l'état du plugin executé reste inchangé."
 
-#: plugins/negate.c:281
+#: plugins/negate.c:284
 msgid ""
 "Using timeout-result, it is possible to override the timeout behaviour or a"
 msgstr ""
 
-#: plugins/negate.c:282
+#: plugins/negate.c:285
 msgid "plugin by setting the negate timeout a bit lower."
 msgstr ""
 
-#: plugins/netutils.c:48
+#: plugins/netutils.c:49
 #, c-format
 msgid "%s - Socket timeout after %d seconds\n"
 msgstr "%s - Le socket n'a pas répondu dans les %d secondes\n"
 
-#: plugins/netutils.c:50
+#: plugins/netutils.c:51
 #, c-format
 msgid "%s - Abnormal timeout after %d seconds\n"
 msgstr "%s - Dépassement anormal du temps de réponse après %d secondes\n"
 
-#: plugins/netutils.c:78 plugins/netutils.c:280
+#: plugins/netutils.c:79 plugins/netutils.c:281
 msgid "Send failed"
 msgstr "L'envoi à échoué"
 
-#: plugins/netutils.c:95 plugins/netutils.c:295
+#: plugins/netutils.c:96 plugins/netutils.c:296
 msgid "No data was received from host!"
 msgstr "Pas de données reçues de l'hôte!"
 
-#: plugins/netutils.c:203 plugins/netutils.c:239
+#: plugins/netutils.c:204 plugins/netutils.c:240
 msgid "Socket creation failed"
 msgstr "La création du socket à échoué "
 
-#: plugins/netutils.c:232
+#: plugins/netutils.c:233
 msgid "Supplied path too long unix domain socket"
 msgstr "Le chemin fourni est trop long pour un socket unix"
 
-#: plugins/netutils.c:304
+#: plugins/netutils.c:305
 msgid "Receive failed"
 msgstr "La réception à échoué"
 
-#: plugins/netutils.c:330 plugins-root/check_dhcp.c:1341
+#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1342
 #, c-format
 msgid "Invalid hostname/address - %s"
 msgstr "Adresse/Nom invalide - %s"
@@ -5420,18 +5726,22 @@ msgstr ""
 "Commande: %s</A>\n"
 
 #: plugins/urlize.c:169
-msgid "This plugin wraps the text output of another command (plugin)"
+#, fuzzy
+msgid ""
+"This plugin wraps the text output of another command (plugin) in HTML <A>"
 msgstr ""
+"Ce plugin est un adaptateur qui prends l'état d'un autre plug-in et "
+"l'inverse."
 
 #: plugins/urlize.c:170
 msgid ""
-"in HTML <A> tags, thus displaying the child plugin's output as a clickable "
-"link in"
+"tags, thus displaying the child plugin's output as a clickable link in "
+"compatible"
 msgstr ""
 
 #: plugins/urlize.c:171
 msgid ""
-"the Nagios status screen.  This plugin returns the status of the invoked "
+"monitoring status screen. This plugin returns the status of the invoked "
 "plugin."
 msgstr ""
 
@@ -5464,20 +5774,25 @@ msgstr ""
 msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\""
 msgstr ""
 
-#: plugins/utils.c:171
+#: plugins/utils.c:174
 #, c-format
 msgid "%s - Plugin timed out after %d seconds\n"
 msgstr "%s - Le plugin n'as pas répondu dans les %d secondes\n"
 
-#: plugins/utils.c:466
+#: plugins/utils.c:469
 msgid "failed realloc in strpcpy\n"
 msgstr "La fonction realloc à échoué dans strpcpy\n"
 
-#: plugins/utils.c:508
+#: plugins/utils.c:511
 msgid "failed malloc in strscat\n"
 msgstr "La fonction malloc à échoué dans strscat\n"
 
-#: plugins/utils.h:140
+#: plugins/utils.c:531
+#, fuzzy
+msgid "failed malloc in xvasprintf\n"
+msgstr "La fonction malloc à échoué dans strscat\n"
+
+#: plugins/utils.h:137
 #, c-format
 msgid ""
 "       %s (-h | --help) for detailed help\n"
@@ -5486,7 +5801,7 @@ 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
+#: plugins/utils.h:141
 msgid ""
 "\n"
 "Options:\n"
@@ -5502,7 +5817,7 @@ msgstr ""
 " -V, --version\n"
 "    Afficher les informations relative à la version\n"
 
-#: plugins/utils.h:151
+#: plugins/utils.h:148
 #, c-format
 msgid ""
 " -H, --hostname=ADDRESS\n"
@@ -5515,7 +5830,7 @@ msgstr ""
 " -%c, --port=INTEGER\n"
 "    Numéro de port (défaut: %s)\n"
 
-#: plugins/utils.h:157
+#: plugins/utils.h:154
 msgid ""
 " -4, --use-ipv4\n"
 "    Use IPv4 connection\n"
@@ -5527,16 +5842,18 @@ msgstr ""
 " -6, --use-ipv6\n"
 "    Utiliser une connection IPv6\n"
 
-#: plugins/utils.h:163
+#: plugins/utils.h:160
+#, fuzzy
 msgid ""
 " -v, --verbose\n"
-"    Show details for command-line debugging (Nagios may truncate output)\n"
+"    Show details for command-line debugging (output may be truncated by\n"
+"\t\tthe monitoring system)\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
+#: plugins/utils.h:165
 msgid ""
 " -w, --warning=DOUBLE\n"
 "    Response time to result in warning status (seconds)\n"
@@ -5548,7 +5865,7 @@ msgstr ""
 " -c, --critical=DOUBLE\n"
 "    Temps de réponse résultant en un état critique (secondes)\n"
 
-#: plugins/utils.h:173
+#: plugins/utils.h:171
 msgid ""
 " -w, --warning=RANGE\n"
 "    Warning range (format: start:end). Alert if outside this range\n"
@@ -5561,7 +5878,7 @@ msgstr ""
 " -c, --critical=RANGE\n"
 "    Seuil critique\n"
 
-#: plugins/utils.h:179
+#: plugins/utils.h:177
 #, c-format
 msgid ""
 " -t, --timeout=INTEGER\n"
@@ -5570,49 +5887,54 @@ msgstr ""
 " -t, --timeout=INTEGER\n"
 "    Délais de connection en secondes (défaut: %d)\n"
 
-#: plugins/utils.h:184
+#: plugins/utils.h:182
+#, fuzzy
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
+"    Read options from an ini file. See\n"
+"    https://www.monitoring-plugins.org/doc/extra-opts.html\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\n"
+"    Lire les options d'un fichier ini. Voir\n"
+"    https://www.monitoring-plugins.org/doc/extra-opts.html\n"
 "    pour les instructions et examples.\n"
 
-#: plugins/utils.h:192
+#: plugins/utils.h:190
+#, fuzzy
 msgid ""
 " See:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
-"html#THRESHOLDFORMAT\n"
+" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
 " Voir:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" https://www.monitoring-plugins.org/doc/guidelines.html."
 "html#THRESHOLDFORMAT\n"
 " pour le format et examples des seuils (THRESHOLD).\n"
 
-#: plugins/utils.h:197
+#: plugins/utils.h:195
+#, fuzzy
 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"
+"Send email to help@monitoring-plugins.org if you have questions regarding\n"
+"use of this software. To submit patches or suggest improvements, send email\n"
+"to devel@monitoring-plugins.org\n"
 "\n"
 msgstr ""
 "\n"
-"Envoyez un email à nagios-users@lists.sourceforge.net si vous avez des "
+"Envoyez un email à help@monitoring-plugins.org 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"
+"améliorations, envoyez un email à devel@monitoring-plugins.org\n"
 "\n"
 
-#: plugins/utils.h:202
+#: plugins/utils.h:200
+#, fuzzy
 msgid ""
 "\n"
-"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
+"The Monitoring 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 ""
@@ -5654,7 +5976,7 @@ msgstr ""
 "Erreur: Impossible d'obtenir l'adresse matérielle depuis %s erreur sysctl 2 "
 "- %s.\n"
 
-#: plugins-root/check_dhcp.c:383
+#: plugins-root/check_dhcp.c:388
 #, c-format
 msgid ""
 "Error: can't find unit number in interface_name (%s) - expecting TypeNumber "
@@ -5663,7 +5985,7 @@ msgstr ""
 "Erreur: impossible de trouver le numéro dans le nom de l'interface (%s).\n"
 "J'attendais le nom suivi du type ex lnc0.\n"
 
-#: plugins-root/check_dhcp.c:388 plugins-root/check_dhcp.c:400
+#: plugins-root/check_dhcp.c:393 plugins-root/check_dhcp.c:405
 #, c-format
 msgid ""
 "Error: can't read MAC address from DLPI streams interface for device %s unit "
@@ -5672,7 +5994,7 @@ msgstr ""
 "Erreur: impossible de lire l'adresse MAC depuis l'interface DLPI pour le \n"
 "périphérique %s numéro %d.\n"
 
-#: plugins-root/check_dhcp.c:406
+#: plugins-root/check_dhcp.c:411
 #, c-format
 msgid ""
 "Error: can't get MAC address for this architecture.  Use the --mac option.\n"
@@ -5680,32 +6002,32 @@ msgstr ""
 "Erreur: impossible d'obtenir l'adresse MAC sur cette architecture.  Utilisez "
 "l'option --mac.\n"
 
-#: plugins-root/check_dhcp.c:425
+#: plugins-root/check_dhcp.c:430
 #, c-format
 msgid "Error: Cannot determine IP address of interface %s\n"
 msgstr "Erreur: Impossible d'obtenir l'adresse IP de l'interface %s\n"
 
-#: plugins-root/check_dhcp.c:433
+#: plugins-root/check_dhcp.c:438
 #, c-format
 msgid "Error: Cannot get interface IP address on this platform.\n"
 msgstr "Erreur: Impossible d'obtenir l'adresse IP sur cette architecture.\n"
 
-#: plugins-root/check_dhcp.c:438
+#: plugins-root/check_dhcp.c:443
 #, c-format
 msgid "Pretending to be relay client %s\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:523
+#: plugins-root/check_dhcp.c:528
 #, c-format
 msgid "DHCPDISCOVER to %s port %d\n"
 msgstr "DHCPDISCOVER vers %s port %d\n"
 
-#: plugins-root/check_dhcp.c:575
+#: plugins-root/check_dhcp.c:580
 #, c-format
 msgid "Result=ERROR\n"
 msgstr "Résultat=ERREUR\n"
 
-#: plugins-root/check_dhcp.c:581
+#: plugins-root/check_dhcp.c:586
 #, c-format
 msgid "Result=OK\n"
 msgstr "Résultat=OK\n"
@@ -5809,246 +6131,273 @@ msgstr ""
 msgid "Requested server address: %s\n"
 msgstr "Adresse serveur demandée: %s\n"
 
-#: plugins-root/check_dhcp.c:881
+#: plugins-root/check_dhcp.c:882
 #, c-format
 msgid "Lease Time: Infinite\n"
 msgstr "Durée du Bail: Infini\n"
 
-#: plugins-root/check_dhcp.c:883
+#: plugins-root/check_dhcp.c:884
 #, c-format
 msgid "Lease Time: %lu seconds\n"
 msgstr "Durée du Bail: %lu secondes\n"
 
-#: plugins-root/check_dhcp.c:885
+#: plugins-root/check_dhcp.c:886
 #, c-format
 msgid "Renewal Time: Infinite\n"
 msgstr "Renouvellement du bail: Infini\n"
 
-#: plugins-root/check_dhcp.c:887
+#: plugins-root/check_dhcp.c:888
 #, c-format
 msgid "Renewal Time: %lu seconds\n"
 msgstr "Durée du renouvellement = %lu secondes\n"
 
-#: plugins-root/check_dhcp.c:889
+#: plugins-root/check_dhcp.c:890
 #, c-format
 msgid "Rebinding Time: Infinite\n"
 msgstr "Délai de nouvelle demande: Infini\n"
 
-#: plugins-root/check_dhcp.c:890
+#: plugins-root/check_dhcp.c:891
 #, c-format
 msgid "Rebinding Time: %lu seconds\n"
 msgstr "Délai de nouvelle demande: %lu secondes\n"
 
-#: plugins-root/check_dhcp.c:918
+#: plugins-root/check_dhcp.c:919
 #, c-format
 msgid "Added offer from server @ %s"
 msgstr "Rajouté offre du serveur @ %s"
 
-#: plugins-root/check_dhcp.c:919
+#: plugins-root/check_dhcp.c:920
 #, c-format
 msgid " of IP address %s\n"
 msgstr "de l'adresse IP %s\n"
 
-#: plugins-root/check_dhcp.c:986
+#: plugins-root/check_dhcp.c:987
 #, c-format
 msgid "DHCP Server Match: Offerer=%s"
 msgstr "Correspondance du serveur DHCP: Offrant=%s"
 
-#: plugins-root/check_dhcp.c:987
+#: plugins-root/check_dhcp.c:988
 #, c-format
 msgid " Requested=%s"
 msgstr " Demandé=%s"
 
-#: plugins-root/check_dhcp.c:989
+#: plugins-root/check_dhcp.c:990
 #, c-format
 msgid " (duplicate)"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:990
+#: plugins-root/check_dhcp.c:991
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1038
+#: plugins-root/check_dhcp.c:1039
 #, c-format
 msgid "No DHCPOFFERs were received.\n"
 msgstr "Pas de DHCPOFFERs reçus.\n"
 
-#: plugins-root/check_dhcp.c:1042
+#: plugins-root/check_dhcp.c:1043
 #, c-format
 msgid "Received %d DHCPOFFER(s)"
 msgstr "Reçu %d DHCPOFFER(s)"
 
-#: plugins-root/check_dhcp.c:1045
+#: plugins-root/check_dhcp.c:1046
 #, c-format
 msgid ", %s%d of %d requested servers responded"
 msgstr ", %s%d de %d serveurs ont répondus"
 
-#: plugins-root/check_dhcp.c:1048
+#: plugins-root/check_dhcp.c:1049
 #, c-format
 msgid ", requested address (%s) was %soffered"
 msgstr ", l'adresse demandée (%s) %s été offerte"
 
-#: plugins-root/check_dhcp.c:1048
+#: plugins-root/check_dhcp.c:1049
 msgid "not "
 msgstr "n'as pas"
 
-#: plugins-root/check_dhcp.c:1050
+#: plugins-root/check_dhcp.c:1051
 #, c-format
 msgid ", max lease time = "
 msgstr ", bail maximum = "
 
-#: plugins-root/check_dhcp.c:1052
+#: plugins-root/check_dhcp.c:1053
 #, c-format
 msgid "Infinity"
 msgstr "Infini"
 
-#: plugins-root/check_dhcp.c:1233
+#: plugins-root/check_dhcp.c:1234
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n"
 msgstr ""
 "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans check_ctrl: %s.\n"
 
-#: plugins-root/check_dhcp.c:1245
+#: plugins-root/check_dhcp.c:1246
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"
 msgstr ""
-"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans put_ctrl/putmsg(): %"
-"s.\n"
+"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans put_ctrl/putmsg(): "
+"%s.\n"
 
-#: plugins-root/check_dhcp.c:1258
+#: plugins-root/check_dhcp.c:1259
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"
 msgstr ""
 "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans put_both/putmsg().\n"
 
-#: plugins-root/check_dhcp.c:1270
+#: plugins-root/check_dhcp.c:1271
 #, c-format
 msgid ""
 "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"
 msgstr ""
-"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_attach_req/open(%"
-"s..): %s.\n"
+"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_attach_req/open"
+"(%s..): %s.\n"
 
-#: plugins-root/check_dhcp.c:1294
+#: plugins-root/check_dhcp.c:1295
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"
 msgstr ""
 "Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_bind/check_ctrl"
 "(): %s.\n"
 
-#: plugins-root/check_dhcp.c:1373
+#: plugins-root/check_dhcp.c:1374
 #, c-format
 msgid "Hardware address: "
 msgstr "Adresse matérielle: "
 
-#: plugins-root/check_dhcp.c:1389
+#: plugins-root/check_dhcp.c:1390
 msgid "This plugin tests the availability of DHCP servers on a network."
 msgstr "Ce plugin teste la disponibilité de serveurs DHCP dans un réseau."
 
-#: plugins-root/check_dhcp.c:1401
+#: plugins-root/check_dhcp.c:1402
 msgid "IP address of DHCP server that we must hear from"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1403
+#: plugins-root/check_dhcp.c:1404
 msgid "IP address that should be offered by at least one DHCP server"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1405
+#: plugins-root/check_dhcp.c:1406
 msgid "Seconds to wait for DHCPOFFER before timeout occurs"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1407
+#: plugins-root/check_dhcp.c:1408
 msgid "Interface to to use for listening (i.e. eth0)"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1409
+#: plugins-root/check_dhcp.c:1410
 msgid "MAC address to use in the DHCP request"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1411
+#: plugins-root/check_dhcp.c:1412
 msgid "Unicast testing: mimic a DHCP relay, requires -s"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1288
+#: plugins-root/check_icmp.c:1295
 msgid "specify a target"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1290
+#: plugins-root/check_icmp.c:1297
 msgid "warning threshold (currently "
 msgstr "Valeurs pour le seuil d'avertissement (actuellement "
 
-#: plugins-root/check_icmp.c:1293
+#: plugins-root/check_icmp.c:1300
 msgid "critical threshold (currently "
 msgstr "Valeurs pour le seuil critique (actuellement "
 
-#: plugins-root/check_icmp.c:1296
+#: plugins-root/check_icmp.c:1303
 msgid "specify a source IP address or device name"
 msgstr "spécifiez une adresse ou un nom d'hôte"
 
-#: plugins-root/check_icmp.c:1298
+#: plugins-root/check_icmp.c:1305
 msgid "number of packets to send (currently "
 msgstr "nombre de paquets à envoyer (actuellement "
 
-#: plugins-root/check_icmp.c:1301
+#: plugins-root/check_icmp.c:1308
 msgid "max packet interval (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1304
+#: plugins-root/check_icmp.c:1311
 msgid "max target interval (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1307
+#: plugins-root/check_icmp.c:1314
 msgid "number of alive hosts required for success"
 msgstr "nombre d'hôtes vivants requis pour réussite"
 
-#: plugins-root/check_icmp.c:1310
+#: plugins-root/check_icmp.c:1317
 msgid "TTL on outgoing packets (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1313
+#: plugins-root/check_icmp.c:1320
 msgid "timeout value (seconds, currently  "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1316
+#: plugins-root/check_icmp.c:1323
 msgid "Number of icmp data bytes to send"
 msgstr "Nombre de paquets ICMP à envoyer"
 
-#: plugins-root/check_icmp.c:1317
+#: plugins-root/check_icmp.c:1324
 msgid "Packet size will be data bytes + icmp header (currently"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1319
+#: plugins-root/check_icmp.c:1326
 msgid "verbose"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1323
+#: plugins-root/check_icmp.c:1330
 msgid "The -H switch is optional. Naming a host (or several) to check is not."
 msgstr ""
 
-#: plugins-root/check_icmp.c:1325
+#: plugins-root/check_icmp.c:1332
 msgid ""
 "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1326
+#: plugins-root/check_icmp.c:1333
 msgid "packet loss.  The default values should work well for most users."
 msgstr ""
 
-#: plugins-root/check_icmp.c:1327
+#: plugins-root/check_icmp.c:1334
 msgid ""
 "You can specify different RTA factors using the standardized abbreviations"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1328
+#: plugins-root/check_icmp.c:1335
 msgid ""
 "us (microseconds), ms (milliseconds, default) or just plain s for seconds."
 msgstr ""
 
-#: plugins-root/check_icmp.c:1334
+#: plugins-root/check_icmp.c:1341
 msgid "The -v switch can be specified several times for increased verbosity."
 msgstr ""
 
+#~ msgid "Critical threshold must be integer"
+#~ msgstr "le seuil critique doit être un entier positif"
+
+#~ msgid "Warning threshold must be integer"
+#~ msgstr "Le seuil d'avertissement doit être un entier positif"
+
+#~ msgid "Critical Process Count must be an integer!"
+#~ msgstr "Critique Le total des processus doit être un nombre entier!"
+
+#~ msgid "Warning Process Count must be an integer!"
+#~ msgstr "Avertissement Le total des processus doit être un nombre entier!"
+
+#~ msgid "wmax (%d) cannot be greater than cmax (%d)\n"
+#~ msgstr "wmax (%d) ne peut pas être plus grand que cmax (%d)\n"
+
+#~ msgid "wmin (%d) cannot be less than cmin (%d)\n"
+#~ msgstr "wmin (%d) ne peut pas être plus petit que cmin (%d)\n"
+
+#~ msgid "CRITICAL - Cannot retrieve server certificate."
+#~ msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur"
+
+#~ msgid "OIDs."
+#~ msgstr "OIDs."
+
+#~ msgid "CRITICAL - Cannot retrieve server certificate.\n"
+#~ msgstr "CRITIQUE - Impossible d'obtenir le certificat du serveur.\n"
+
 #~ msgid "Usage: "
 #~ msgstr "Utilisation: "
 
diff --git a/po/nagios-plugins.pot b/po/monitoring-plugins.pot
index 53ccf508..07c1b98f 100644
--- a/po/nagios-plugins.pot
+++ b/po/monitoring-plugins.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Nagios Plugin Development Group
+# Copyright (C) YEAR Monitoring Plugins Development Team
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,35 +7,36 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-02-16 17:35-0600\n"
+"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
+"POT-Creation-Date: 2014-01-19 16:30-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:87
-#: plugins/check_disk.c:190 plugins/check_dns.c:102 plugins/check_dummy.c:52
-#: plugins/check_fping.c:89 plugins/check_game.c:82 plugins/check_hpjd.c:103
-#: plugins/check_http.c:156 plugins/check_ldap.c:109 plugins/check_load.c:122
-#: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:85
-#: plugins/check_nagios.c:91 plugins/check_nt.c:126 plugins/check_ntp.c:766
-#: plugins/check_ntp_peer.c:569 plugins/check_ntp_time.c:548
+#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:88
+#: plugins/check_disk.c:194 plugins/check_dns.c:102 plugins/check_dummy.c:52
+#: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:103
+#: plugins/check_http.c:167 plugins/check_ldap.c:109 plugins/check_load.c:122
+#: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:122
+#: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:770
+#: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:552
 #: 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_pgsql.c:172 plugins/check_ping.c:95 plugins/check_procs.c:172
 #: plugins/check_radius.c:160 plugins/check_real.c:80 plugins/check_smtp.c:144
-#: plugins/check_snmp.c:204 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
+#: plugins/check_snmp.c:240 plugins/check_ssh.c:73 plugins/check_swap.c:110
+#: plugins/check_tcp.c:218 plugins/check_time.c:78 plugins/check_ups.c:122
+#: plugins/check_users.c:77 plugins/negate.c:214 plugins-root/check_dhcp.c:270
 msgid "Could not parse arguments"
 msgstr ""
 
-#: plugins/check_by_ssh.c:90 plugins/check_dig.c:81 plugins/check_dns.c:95
-#: plugins/check_nagios.c:95 plugins/check_pgsql.c:160 plugins/check_ping.c:99
-#: plugins/check_procs.c:154 plugins/negate.c:76
+#: plugins/check_by_ssh.c:90 plugins/check_dig.c:82 plugins/check_dns.c:95
+#: plugins/check_nagios.c:95 plugins/check_pgsql.c:178 plugins/check_ping.c:99
+#: plugins/check_procs.c:188 plugins/check_snmp.c:336 plugins/negate.c:79
 msgid "Cannot catch SIGALRM"
 msgstr ""
 
@@ -59,190 +60,194 @@ msgstr ""
 msgid "%s: Error parsing output\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:219 plugins/check_disk.c:467
-#: plugins/check_http.c:255 plugins/check_ldap.c:293 plugins/check_pgsql.c:250
-#: plugins/check_procs.c:366 plugins/check_radius.c:308
-#: plugins/check_real.c:356 plugins/check_smtp.c:592 plugins/check_snmp.c:661
-#: plugins/check_ssh.c:138 plugins/check_tcp.c:487 plugins/check_time.c:302
-#: plugins/check_ups.c:556 plugins/negate.c:161
+#: plugins/check_by_ssh.c:220 plugins/check_disk.c:476
+#: plugins/check_http.c:278 plugins/check_ldap.c:293 plugins/check_pgsql.c:311
+#: plugins/check_procs.c:437 plugins/check_radius.c:308
+#: plugins/check_real.c:356 plugins/check_smtp.c:581 plugins/check_snmp.c:736
+#: plugins/check_ssh.c:138 plugins/check_tcp.c:505 plugins/check_time.c:302
+#: plugins/check_ups.c:556 plugins/negate.c:164
 msgid "Timeout interval must be a positive integer"
 msgstr ""
 
-#: plugins/check_by_ssh.c:229 plugins/check_pgsql.c:274
+#: plugins/check_by_ssh.c:230 plugins/check_pgsql.c:341
 #: plugins/check_radius.c:272 plugins/check_real.c:327
-#: plugins/check_smtp.c:516 plugins/check_tcp.c:493 plugins/check_time.c:296
+#: plugins/check_smtp.c:506 plugins/check_tcp.c:511 plugins/check_time.c:296
 #: plugins/check_ups.c:518
 msgid "Port must be a positive integer"
 msgstr ""
 
-#: plugins/check_by_ssh.c:290
+#: plugins/check_by_ssh.c:291
 msgid "skip-stdout argument must be an integer"
 msgstr ""
 
-#: plugins/check_by_ssh.c:298
+#: plugins/check_by_ssh.c:299
 msgid "skip-stderr argument must be an integer"
 msgstr ""
 
-#: plugins/check_by_ssh.c:317
+#: plugins/check_by_ssh.c:322
 #, c-format
 msgid "%s: You must provide a host name\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:335
+#: plugins/check_by_ssh.c:340
 msgid "No remotecmd"
 msgstr ""
 
-#: plugins/check_by_ssh.c:349
+#: plugins/check_by_ssh.c:354
 #, c-format
 msgid "%s: Argument limit of %d exceeded\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:352
+#: plugins/check_by_ssh.c:357
 msgid "Can not (re)allocate 'commargv' buffer\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:366
+#: plugins/check_by_ssh.c:371
 #, c-format
 msgid ""
 "%s: In passive mode, you must provide a service name for each command.\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:369
+#: plugins/check_by_ssh.c:374
 #, c-format
 msgid ""
-"%s: In passive mode, you must provide the host short name from the nagios "
-"configs.\n"
+"%s: In passive mode, you must provide the host short name from the "
+"monitoring configs.\n"
 msgstr ""
 
-#: plugins/check_by_ssh.c:383
+#: plugins/check_by_ssh.c:388
 #, c-format
 msgid "This plugin uses SSH to execute commands on a remote host"
 msgstr ""
 
-#: plugins/check_by_ssh.c:398
+#: plugins/check_by_ssh.c:403
 msgid "tell ssh to use Protocol 1 [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:400
+#: plugins/check_by_ssh.c:405
 msgid "tell ssh to use Protocol 2 [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:402
+#: plugins/check_by_ssh.c:407
 msgid "Ignore all or (if specified) first n lines on STDOUT [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:404
+#: plugins/check_by_ssh.c:409
 msgid "Ignore all or (if specified) first n lines on STDERR [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:406
+#: plugins/check_by_ssh.c:411
 msgid ""
 "tells ssh to fork rather than create a tty [optional]. This will always "
 "return OK if ssh is executed"
 msgstr ""
 
-#: plugins/check_by_ssh.c:408
+#: plugins/check_by_ssh.c:413
 msgid "command to execute on the remote machine"
 msgstr ""
 
-#: plugins/check_by_ssh.c:410
+#: plugins/check_by_ssh.c:415
 msgid "SSH user name on remote host [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:412
+#: plugins/check_by_ssh.c:417
 msgid "identity of an authorized key [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:414
-msgid "external command file for nagios [optional]"
+#: plugins/check_by_ssh.c:419
+msgid "external command file for monitoring [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:416
-msgid "list of nagios service names, separated by ':' [optional]"
+#: plugins/check_by_ssh.c:421
+msgid "list of monitoring service names, separated by ':' [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:418
-msgid "short name of host in nagios configuration [optional]"
+#: plugins/check_by_ssh.c:423
+msgid "short name of host in the monitoring configuration [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:420
+#: plugins/check_by_ssh.c:425
 msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:422
+#: plugins/check_by_ssh.c:427
+msgid "Tell ssh to use this configfile [optional]"
+msgstr ""
+
+#: plugins/check_by_ssh.c:429
 msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
 msgstr ""
 
-#: plugins/check_by_ssh.c:427
+#: plugins/check_by_ssh.c:434
 msgid "The most common mode of use is to refer to a local identity file with"
 msgstr ""
 
-#: plugins/check_by_ssh.c:428
+#: plugins/check_by_ssh.c:435
 msgid "the '-i' option. In this mode, the identity pair should have a null"
 msgstr ""
 
-#: plugins/check_by_ssh.c:429
+#: plugins/check_by_ssh.c:436
 msgid "passphrase and the public key should be listed in the authorized_keys"
 msgstr ""
 
-#: plugins/check_by_ssh.c:430
+#: plugins/check_by_ssh.c:437
 msgid "file of the remote host. Usually the key will be restricted to running"
 msgstr ""
 
-#: plugins/check_by_ssh.c:431
+#: plugins/check_by_ssh.c:438
 msgid "only one command on the remote server. If the remote SSH server tracks"
 msgstr ""
 
-#: plugins/check_by_ssh.c:432
+#: plugins/check_by_ssh.c:439
 msgid "invocation arguments, the one remote program may be an agent that can"
 msgstr ""
 
-#: plugins/check_by_ssh.c:433
+#: plugins/check_by_ssh.c:440
 msgid "execute additional commands as proxy"
 msgstr ""
 
-#: plugins/check_by_ssh.c:435
+#: plugins/check_by_ssh.c:442
 msgid "To use passive mode, provide multiple '-C' options, and provide"
 msgstr ""
 
-#: plugins/check_by_ssh.c:436
+#: plugins/check_by_ssh.c:443
 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:261
-#: plugins/check_dig.c:342 plugins/check_disk.c:905 plugins/check_http.c:1403
-#: 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:751 plugins/negate.c:268 plugins/urlize.c:180
+#: plugins/check_by_ssh.c:445 plugins/check_cluster.c:261
+#: plugins/check_dig.c:355 plugins/check_disk.c:924 plugins/check_http.c:1560
+#: plugins/check_nagios.c:312 plugins/check_ntp.c:869
+#: plugins/check_ntp_peer.c:705 plugins/check_ntp_time.c:633
+#: plugins/check_procs.c:763 plugins/negate.c:271 plugins/urlize.c:180
 msgid "Examples:"
 msgstr ""
 
-#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:274
-#: plugins/check_dig.c:354 plugins/check_disk.c:922 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:1426
-#: plugins/check_ldap.c:456 plugins/check_load.c:325 plugins/check_mrtg.c:382
-#: plugins/check_mysql.c:425 plugins/check_nagios.c:313 plugins/check_nt.c:764
-#: 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_procs.c:769
+#: plugins/check_by_ssh.c:460 plugins/check_cluster.c:274
+#: plugins/check_dig.c:367 plugins/check_disk.c:941 plugins/check_dns.c:486
+#: plugins/check_dummy.c:122 plugins/check_fping.c:505
+#: plugins/check_game.c:331 plugins/check_hpjd.c:414 plugins/check_http.c:1590
+#: plugins/check_ldap.c:451 plugins/check_load.c:334 plugins/check_mrtg.c:382
+#: plugins/check_mysql.c:569 plugins/check_nagios.c:323 plugins/check_nt.c:774
+#: plugins/check_ntp.c:888 plugins/check_ntp_peer.c:725
+#: plugins/check_ntp_time.c:642 plugins/check_nwstat.c:1685
+#: plugins/check_overcr.c:467 plugins/check_pgsql.c:578
+#: plugins/check_ping.c:603 plugins/check_procs.c:781
 #: plugins/check_radius.c:385 plugins/check_real.c:451
-#: plugins/check_smtp.c:840 plugins/check_snmp.c:1103 plugins/check_ssh.c:309
-#: plugins/check_swap.c:558 plugins/check_tcp.c:648 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
+#: plugins/check_smtp.c:843 plugins/check_snmp.c:1207 plugins/check_ssh.c:309
+#: plugins/check_swap.c:558 plugins/check_tcp.c:684 plugins/check_time.c:371
+#: plugins/check_ups.c:660 plugins/check_users.c:240
+#: plugins/check_ide_smart.c:640 plugins/negate.c:295 plugins/urlize.c:197
+#: plugins-root/check_dhcp.c:1422 plugins-root/check_icmp.c:1354
 msgid "Usage:"
 msgstr ""
 
 #: plugins/check_cluster.c:230
 #, c-format
-msgid "Host/Service Cluster Plugin for Nagios 2"
+msgid "Host/Service Cluster Plugin for Monitoring"
 msgstr ""
 
-#: plugins/check_cluster.c:236 plugins/check_nt.c:666
+#: plugins/check_cluster.c:236 plugins/check_nt.c:676
 msgid "Options:"
 msgstr ""
 
@@ -279,13 +284,13 @@ msgid "commas"
 msgstr ""
 
 #: plugins/check_cluster.c:257 plugins/check_game.c:318
-#: plugins/check_http.c:1389 plugins/check_ldap.c:438 plugins/check_mrtg.c:363
-#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:414
-#: plugins/check_nt.c:748 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:1074
-#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:274
-#: plugins-root/check_icmp.c:1322
+#: plugins/check_http.c:1542 plugins/check_ldap.c:438 plugins/check_mrtg.c:363
+#: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:558
+#: plugins/check_nt.c:758 plugins/check_ntp.c:865 plugins/check_ntp_peer.c:696
+#: plugins/check_ntp_time.c:626 plugins/check_nwstat.c:1670
+#: plugins/check_overcr.c:456 plugins/check_snmp.c:1178
+#: plugins/check_swap.c:547 plugins/check_ups.c:642 plugins/negate.c:277
+#: plugins-root/check_icmp.c:1329
 msgid "Notes:"
 msgstr ""
 
@@ -298,288 +303,307 @@ msgstr ""
 msgid "state."
 msgstr ""
 
-#: plugins/check_dig.c:99 plugins/check_dig.c:101
+#: plugins/check_dig.c:100 plugins/check_dig.c:102
 #, c-format
 msgid "Looking for: '%s'\n"
 msgstr ""
 
-#: plugins/check_dig.c:108
+#: plugins/check_dig.c:109
 msgid "dig returned an error status"
 msgstr ""
 
-#: plugins/check_dig.c:133
+#: plugins/check_dig.c:134
 msgid "Server not found in ANSWER SECTION"
 msgstr ""
 
-#: plugins/check_dig.c:143
+#: plugins/check_dig.c:144
 msgid "No ANSWER SECTION found"
 msgstr ""
 
-#: plugins/check_dig.c:170
+#: plugins/check_dig.c:171
 msgid "Probably a non-existent host/domain"
 msgstr ""
 
-#: plugins/check_dig.c:230
+#: plugins/check_dig.c:233
 #, c-format
 msgid "Port must be a positive integer - %s"
 msgstr ""
 
-#: plugins/check_dig.c:241
+#: plugins/check_dig.c:244
 #, c-format
 msgid "Warning interval must be a positive integer - %s"
 msgstr ""
 
-#: plugins/check_dig.c:249
+#: plugins/check_dig.c:252
 #, c-format
 msgid "Critical interval must be a positive integer - %s"
 msgstr ""
 
-#: plugins/check_dig.c:257
+#: plugins/check_dig.c:260
 #, c-format
 msgid "Timeout interval must be a positive integer - %s"
 msgstr ""
 
-#: plugins/check_dig.c:316
+#: plugins/check_dig.c:325
 #, c-format
 msgid "This plugin test the DNS service on the specified host using dig"
 msgstr ""
 
-#: plugins/check_dig.c:329
+#: plugins/check_dig.c:338
+msgid "Force dig to only use IPv4 query transport"
+msgstr ""
+
+#: plugins/check_dig.c:340
+msgid "Force dig to only use IPv6 query transport"
+msgstr ""
+
+#: plugins/check_dig.c:342
 msgid "Machine name to lookup"
 msgstr ""
 
-#: plugins/check_dig.c:331
+#: plugins/check_dig.c:344
 msgid "Record type to lookup (default: A)"
 msgstr ""
 
-#: plugins/check_dig.c:333
+#: plugins/check_dig.c:346
 msgid ""
 "An address expected to be in the answer section. If not set, uses whatever"
 msgstr ""
 
-#: plugins/check_dig.c:334
+#: plugins/check_dig.c:347
 msgid "was in -l"
 msgstr ""
 
-#: plugins/check_dig.c:336
+#: plugins/check_dig.c:349
 msgid "Pass STRING as argument(s) to dig"
 msgstr ""
 
-#: plugins/check_disk.c:212
+#: plugins/check_disk.c:216
 #, c-format
 msgid "DISK %s: %s not found\n"
 msgstr ""
 
-#: plugins/check_disk.c:212 plugins/check_disk.c:937 plugins/check_dns.c:241
-#: plugins/check_dummy.c:74 plugins/check_mysql.c:212
+#: plugins/check_disk.c:216 plugins/check_disk.c:956 plugins/check_dns.c:241
+#: plugins/check_dummy.c:74 plugins/check_mysql.c:299
 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168
-#: plugins/check_nagios.c:172 plugins/check_procs.c:290
+#: plugins/check_nagios.c:172 plugins/check_pgsql.c:601
+#: plugins/check_pgsql.c:618 plugins/check_pgsql.c:627
+#: plugins/check_pgsql.c:642 plugins/check_procs.c:351
 #, c-format
 msgid "CRITICAL"
 msgstr ""
 
-#: plugins/check_disk.c:541
+#: plugins/check_disk.c:550
 #, c-format
 msgid "unit type %s not known\n"
 msgstr ""
 
-#: plugins/check_disk.c:544
+#: plugins/check_disk.c:553
 #, c-format
 msgid "failed allocating storage for '%s'\n"
 msgstr ""
 
-#: plugins/check_disk.c:568 plugins/check_disk.c:606 plugins/check_disk.c:611
-#: plugins/check_disk.c:618 plugins/check_disk.c:622 plugins/check_disk.c:662
-#: plugins/check_disk.c:668 plugins/check_disk.c:687 plugins/check_dummy.c:77
-#: plugins/check_dummy.c:80 plugins/check_procs.c:453
+#: plugins/check_disk.c:577 plugins/check_disk.c:618 plugins/check_disk.c:626
+#: plugins/check_disk.c:633 plugins/check_disk.c:637 plugins/check_disk.c:677
+#: plugins/check_disk.c:683 plugins/check_disk.c:702 plugins/check_dummy.c:77
+#: plugins/check_dummy.c:80 plugins/check_pgsql.c:643
+#: plugins/check_procs.c:506
 #, c-format
 msgid "UNKNOWN"
 msgstr ""
 
-#: plugins/check_disk.c:568
+#: plugins/check_disk.c:577
 msgid "Must set a threshold value before using -p\n"
 msgstr ""
 
-#: plugins/check_disk.c:606
+#: plugins/check_disk.c:618
 msgid "Must set -E before selecting paths\n"
 msgstr ""
 
-#: plugins/check_disk.c:611
+#: plugins/check_disk.c:626
 msgid "Must set group value before selecting paths\n"
 msgstr ""
 
-#: plugins/check_disk.c:618
+#: plugins/check_disk.c:633
 msgid ""
 "Paths need to be selected before using -i/-I. Use -A to select all paths "
 "explicitly"
 msgstr ""
 
-#: plugins/check_disk.c:622 plugins/check_disk.c:668 plugins/check_procs.c:453
+#: plugins/check_disk.c:637 plugins/check_disk.c:683 plugins/check_procs.c:506
 msgid "Could not compile regular expression"
 msgstr ""
 
-#: plugins/check_disk.c:662
+#: plugins/check_disk.c:677
 msgid "Must set a threshold value before using -r/-R\n"
 msgstr ""
 
-#: plugins/check_disk.c:688
+#: plugins/check_disk.c:703
 msgid "Regular expression did not match any path or disk"
 msgstr ""
 
-#: plugins/check_disk.c:734
+#: plugins/check_disk.c:749
 msgid "Unknown argument"
 msgstr ""
 
-#: plugins/check_disk.c:768
+#: plugins/check_disk.c:783
 #, c-format
 msgid " for %s\n"
 msgstr ""
 
-#: plugins/check_disk.c:842
+#: plugins/check_disk.c:857
 msgid ""
 "This plugin checks the amount of used disk space on a mounted file system"
 msgstr ""
 
-#: plugins/check_disk.c:843
+#: plugins/check_disk.c:858
 msgid ""
 "and generates an alert if free space is less than one of the threshold values"
 msgstr ""
 
-#: plugins/check_disk.c:853
+#: plugins/check_disk.c:868
 msgid "Exit with WARNING status if less than INTEGER units of disk are free"
 msgstr ""
 
-#: plugins/check_disk.c:855
+#: plugins/check_disk.c:870
 msgid "Exit with WARNING status if less than PERCENT of disk space is free"
 msgstr ""
 
-#: plugins/check_disk.c:857
+#: plugins/check_disk.c:872
 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free"
 msgstr ""
 
-#: plugins/check_disk.c:859
-msgid "Exit with CRITCAL status if less than PERCENT of disk space is free"
+#: plugins/check_disk.c:874
+msgid "Exit with CRITICAL status if less than PERCENT of disk space is free"
 msgstr ""
 
-#: plugins/check_disk.c:861
+#: plugins/check_disk.c:876
 msgid "Exit with WARNING status if less than PERCENT of inode space is free"
 msgstr ""
 
-#: plugins/check_disk.c:863
+#: plugins/check_disk.c:878
 msgid "Exit with CRITICAL status if less than PERCENT of inode space is free"
 msgstr ""
 
-#: plugins/check_disk.c:865
+#: plugins/check_disk.c:880
 msgid "Path or partition (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:867
+#: plugins/check_disk.c:882
 msgid "Ignore device (only works if -p unspecified)"
 msgstr ""
 
-#: plugins/check_disk.c:869
+#: plugins/check_disk.c:884
 msgid "Clear thresholds"
 msgstr ""
 
-#: plugins/check_disk.c:871
+#: plugins/check_disk.c:886
 msgid "For paths or partitions specified with -p, only check for exact paths"
 msgstr ""
 
-#: plugins/check_disk.c:873
+#: plugins/check_disk.c:888
 msgid "Display only devices/mountpoints with errors"
 msgstr ""
 
-#: plugins/check_disk.c:875
+#: plugins/check_disk.c:890
+msgid "Don't account root-reserved blocks into freespace in perfdata"
+msgstr ""
+
+#: plugins/check_disk.c:892
 msgid ""
 "Group paths. Thresholds apply to (free-)space of all partitions together"
 msgstr ""
 
-#: plugins/check_disk.c:877
+#: plugins/check_disk.c:894
 msgid "Same as '--units kB'"
 msgstr ""
 
-#: plugins/check_disk.c:879
+#: plugins/check_disk.c:896
 msgid "Only check local filesystems"
 msgstr ""
 
-#: plugins/check_disk.c:881
+#: plugins/check_disk.c:898
 msgid ""
 "Only check local filesystems against thresholds. Yet call stat on remote "
 "filesystems"
 msgstr ""
 
-#: plugins/check_disk.c:882
+#: plugins/check_disk.c:899
 msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)"
 msgstr ""
 
-#: plugins/check_disk.c:884
+#: plugins/check_disk.c:901
 msgid "Display the mountpoint instead of the partition"
 msgstr ""
 
-#: plugins/check_disk.c:886
+#: plugins/check_disk.c:903
 msgid "Same as '--units MB'"
 msgstr ""
 
-#: plugins/check_disk.c:888
+#: plugins/check_disk.c:905
 msgid "Explicitly select all paths. This is equivalent to -R '.*'"
 msgstr ""
 
-#: plugins/check_disk.c:890
+#: plugins/check_disk.c:907
 msgid ""
 "Case insensitive regular expression for path/partition (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:892
+#: plugins/check_disk.c:909
 msgid "Regular expression for path or partition (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:894
+#: plugins/check_disk.c:911
 msgid ""
 "Regular expression to ignore selected path/partition (case insensitive) (may "
 "be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:896
+#: plugins/check_disk.c:913
 msgid ""
 "Regular expression to ignore selected path or partition (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:899
+#: plugins/check_disk.c:916
 msgid "Choose bytes, kB, MB, GB, TB (default: MB)"
 msgstr ""
 
-#: plugins/check_disk.c:902
+#: plugins/check_disk.c:919
 msgid "Ignore all filesystems of indicated type (may be repeated)"
 msgstr ""
 
-#: plugins/check_disk.c:907
+#: plugins/check_disk.c:921
+msgid "Check only filesystems of indicated type (may be repeated)"
+msgstr ""
+
+#: plugins/check_disk.c:926
 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"
 msgstr ""
 
-#: plugins/check_disk.c:909
+#: plugins/check_disk.c:928
 msgid ""
 "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
 "r regex"
 msgstr ""
 
-#: plugins/check_disk.c:910
+#: plugins/check_disk.c:929
 msgid ""
 "are grouped which means the freespace thresholds are applied to all disks "
 "together"
 msgstr ""
 
-#: plugins/check_disk.c:912
+#: plugins/check_disk.c:931
 msgid ""
 "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
 "100M/50M"
 msgstr ""
 
-#: plugins/check_disk.c:938
+#: plugins/check_disk.c:957
 #, c-format
 msgid "%s %s: %s\n"
 msgstr ""
 
-#: plugins/check_disk.c:938
+#: plugins/check_disk.c:957
 msgid "is not accessible"
 msgstr ""
 
@@ -616,13 +640,15 @@ msgid "server %s is not authoritative for %s"
 msgstr ""
 
 #: plugins/check_dns.c:237 plugins/check_dummy.c:68 plugins/check_nagios.c:182
-#: plugins/check_procs.c:283
+#: plugins/check_pgsql.c:638 plugins/check_procs.c:344
 #, c-format
 msgid "OK"
 msgstr ""
 
-#: plugins/check_dns.c:239 plugins/check_dummy.c:71 plugins/check_mysql.c:209
-#: plugins/check_nagios.c:182 plugins/check_procs.c:285
+#: plugins/check_dns.c:239 plugins/check_dummy.c:71 plugins/check_mysql.c:296
+#: plugins/check_nagios.c:182 plugins/check_pgsql.c:607
+#: plugins/check_pgsql.c:612 plugins/check_pgsql.c:640
+#: plugins/check_procs.c:346
 #, c-format
 msgid "WARNING"
 msgstr ""
@@ -789,142 +815,176 @@ msgstr ""
 msgid "of the <state> argument with optional text"
 msgstr ""
 
-#: plugins/check_fping.c:108 plugins/check_hpjd.c:128 plugins/check_ping.c:437
-#: plugins/check_swap.c:175 plugins/check_users.c:73 plugins/urlize.c:110
+#: plugins/check_fping.c:125 plugins/check_hpjd.c:128 plugins/check_ping.c:438
+#: plugins/check_swap.c:175 plugins/check_users.c:94 plugins/urlize.c:110
 #, c-format
 msgid "Could not open pipe: %s\n"
 msgstr ""
 
-#: plugins/check_fping.c:114 plugins/check_hpjd.c:134 plugins/check_load.c:153
-#: plugins/check_swap.c:181 plugins/check_users.c:79 plugins/urlize.c:116
+#: plugins/check_fping.c:131 plugins/check_hpjd.c:134 plugins/check_load.c:153
+#: plugins/check_swap.c:181 plugins/check_users.c:100 plugins/urlize.c:116
 #, c-format
 msgid "Could not open stderr for %s\n"
 msgstr ""
 
-#: plugins/check_fping.c:154
+#: plugins/check_fping.c:157
+msgid "FPING UNKNOWN - IP address not found\n"
+msgstr ""
+
+#: plugins/check_fping.c:160
+msgid "FPING UNKNOWN - invalid commandline argument\n"
+msgstr ""
+
+#: plugins/check_fping.c:163
+msgid "FPING UNKNOWN - failed system call\n"
+msgstr ""
+
+#: plugins/check_fping.c:187
 #, c-format
 msgid "FPING UNKNOW - %s not found\n"
 msgstr ""
 
-#: plugins/check_fping.c:158
+#: plugins/check_fping.c:191
 #, c-format
 msgid "FPING CRITICAL - %s is unreachable\n"
 msgstr ""
 
-#: plugins/check_fping.c:163
+#: plugins/check_fping.c:196
+#, c-format
+msgid "FPING UNKNOWN - %s parameter error\n"
+msgstr ""
+
+#: plugins/check_fping.c:200 plugins/check_fping.c:240
 #, c-format
 msgid "FPING CRITICAL - %s is down\n"
 msgstr ""
 
-#: plugins/check_fping.c:190
+#: plugins/check_fping.c:227
 #, c-format
 msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"
 msgstr ""
 
-#: plugins/check_fping.c:211
+#: plugins/check_fping.c:253
 #, c-format
 msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
 msgstr ""
 
-#: plugins/check_fping.c:280 plugins/check_hpjd.c:338 plugins/check_hpjd.c:361
-#: plugins/check_mysql.c:276 plugins/check_mysql.c:334 plugins/check_ntp.c:705
-#: plugins/check_ntp_peer.c:491 plugins/check_ntp_time.c:492
-#: plugins/check_pgsql.c:268 plugins/check_ping.c:295 plugins/check_ping.c:418
+#: plugins/check_fping.c:326 plugins/check_fping.c:332
+#: plugins/check_hpjd.c:338 plugins/check_hpjd.c:361 plugins/check_mysql.c:371
+#: plugins/check_mysql.c:455 plugins/check_ntp.c:709
+#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:496
+#: plugins/check_pgsql.c:335 plugins/check_ping.c:295 plugins/check_ping.c:418
 #: plugins/check_radius.c:264 plugins/check_real.c:314
-#: plugins/check_real.c:376 plugins/check_smtp.c:509 plugins/check_smtp.c:638
+#: plugins/check_real.c:376 plugins/check_smtp.c:499 plugins/check_smtp.c:641
 #: plugins/check_ssh.c:157 plugins/check_time.c:240 plugins/check_time.c:315
 #: plugins/check_ups.c:504 plugins/check_ups.c:573
 msgid "Invalid hostname/address"
 msgstr ""
 
-#: plugins/check_fping.c:314
+#: plugins/check_fping.c:345 plugins/check_ldap.c:353 plugins/check_ping.c:246
+msgid "IPv6 support not available\n"
+msgstr ""
+
+#: plugins/check_fping.c:378
 msgid "Packet size must be a positive integer"
 msgstr ""
 
-#: plugins/check_fping.c:320
+#: plugins/check_fping.c:384
 msgid "Packet count must be a positive integer"
 msgstr ""
 
-#: plugins/check_fping.c:326
+#: plugins/check_fping.c:390
 msgid "Target timeout must be a positive integer"
 msgstr ""
 
-#: plugins/check_fping.c:332
+#: plugins/check_fping.c:396
 msgid "Interval must be a positive integer"
 msgstr ""
 
-#: plugins/check_fping.c:338 plugins/check_ntp.c:729
-#: plugins/check_ntp_peer.c:518 plugins/check_ntp_time.c:519
+#: plugins/check_fping.c:402 plugins/check_ntp.c:733
+#: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:523
 #: plugins/check_radius.c:314 plugins/check_time.c:319
 msgid "Hostname was not supplied"
 msgstr ""
 
-#: plugins/check_fping.c:358
+#: plugins/check_fping.c:422
 #, c-format
 msgid "%s: Only one threshold may be packet loss (%s)\n"
 msgstr ""
 
-#: plugins/check_fping.c:362
+#: plugins/check_fping.c:426
 #, c-format
 msgid "%s: Only one threshold must be packet loss (%s)\n"
 msgstr ""
 
-#: plugins/check_fping.c:394
+#: plugins/check_fping.c:458
 msgid ""
 "This plugin will use the fping command to ping the specified host for a fast "
 "check"
 msgstr ""
 
-#: plugins/check_fping.c:396
+#: plugins/check_fping.c:460
 msgid "Note that it is necessary to set the suid flag on fping."
 msgstr ""
 
-#: plugins/check_fping.c:406
+#: plugins/check_fping.c:472
 msgid ""
 "name or IP Address of host to ping (IP Address bypasses name lookup, "
 "reducing system load)"
 msgstr ""
 
-#: plugins/check_fping.c:408 plugins/check_ping.c:573
+#: plugins/check_fping.c:474 plugins/check_ping.c:575
 msgid "warning threshold pair"
 msgstr ""
 
-#: plugins/check_fping.c:410 plugins/check_ping.c:575
+#: plugins/check_fping.c:476 plugins/check_ping.c:577
 msgid "critical threshold pair"
 msgstr ""
 
-#: plugins/check_fping.c:412
+#: plugins/check_fping.c:478
 msgid "size of ICMP packet"
 msgstr ""
 
-#: plugins/check_fping.c:414
+#: plugins/check_fping.c:480
 msgid "number of ICMP packets to send"
 msgstr ""
 
-#: plugins/check_fping.c:416
+#: plugins/check_fping.c:482
 msgid "Target timeout (ms)"
 msgstr ""
 
-#: plugins/check_fping.c:418
+#: plugins/check_fping.c:484
 msgid "Interval (ms) between sending packets"
 msgstr ""
 
-#: plugins/check_fping.c:421
+#: plugins/check_fping.c:486
+msgid "name or IP Address of sourceip"
+msgstr ""
+
+#: plugins/check_fping.c:488
+msgid "source interface name"
+msgstr ""
+
+#: plugins/check_fping.c:491
 #, c-format
 msgid ""
 "THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time "
 "(ms)"
 msgstr ""
 
-#: plugins/check_fping.c:422
+#: plugins/check_fping.c:492
 msgid ""
 "which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"
 msgstr ""
 
-#: plugins/check_fping.c:423
+#: plugins/check_fping.c:493
 msgid "packet loss to trigger an alarm state."
 msgstr ""
 
+#: plugins/check_fping.c:496
+msgid "IPv4 is used by default. Specify -6 to use IPv6."
+msgstr ""
+
 #: plugins/check_game.c:111
 #, c-format
 msgid "CRITICAL - Host type parameter incorrect!\n"
@@ -1049,438 +1109,521 @@ msgstr ""
 msgid "(default=%s)"
 msgstr ""
 
-#: plugins/check_http.c:285 plugins/check_tcp.c:556
+#: plugins/check_http.c:189
+msgid "file does not exist or is not readable"
+msgstr ""
+
+#: plugins/check_http.c:310 plugins/check_http.c:315 plugins/check_http.c:321
+#: plugins/check_smtp.c:600 plugins/check_tcp.c:576 plugins/check_tcp.c:580
+#: plugins/check_tcp.c:586
 msgid "Invalid certificate expiration period"
 msgstr ""
 
-#: plugins/check_http.c:294 plugins/check_tcp.c:568
+#: plugins/check_http.c:348
+msgid ""
+"Invalid option - Valid values for SSL Version are 1 (TLSv1), 2 (SSLv2) or 3 "
+"(SSLv3)"
+msgstr ""
+
+#: plugins/check_http.c:354 plugins/check_tcp.c:599
 msgid "Invalid option - SSL is not available"
 msgstr ""
 
-#: plugins/check_http.c:318
+#: plugins/check_http.c:375
 msgid "Invalid onredirect option"
 msgstr ""
 
-#: plugins/check_http.c:320
+#: plugins/check_http.c:377
 #, c-format
 msgid "option f:%d \n"
 msgstr ""
 
-#: plugins/check_http.c:341
+#: plugins/check_http.c:398
 msgid "Invalid port number"
 msgstr ""
 
-#: plugins/check_http.c:389
+#: plugins/check_http.c:450
 #, c-format
 msgid "Could Not Compile Regular Expression: %s"
 msgstr ""
 
-#: plugins/check_http.c:403 plugins/check_ntp.c:718
-#: plugins/check_ntp_peer.c:507 plugins/check_ntp_time.c:508
-#: plugins/check_smtp.c:618 plugins/check_ssh.c:149 plugins/check_tcp.c:460
+#: plugins/check_http.c:464 plugins/check_ntp.c:722
+#: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:512
+#: plugins/check_smtp.c:621 plugins/check_ssh.c:149 plugins/check_tcp.c:477
 msgid "IPv6 support not available"
 msgstr ""
 
-#: plugins/check_http.c:465 plugins/check_ping.c:422
+#: plugins/check_http.c:529 plugins/check_ping.c:422
 msgid "You must specify a server address or host name"
 msgstr ""
 
-#: plugins/check_http.c:600 plugins/check_http.c:768
+#: plugins/check_http.c:543
+msgid ""
+"If you use a client certificate you must also specify a private key file"
+msgstr ""
+
+#: plugins/check_http.c:667 plugins/check_http.c:835
 msgid "HTTP UNKNOWN - Memory allocation error\n"
 msgstr ""
 
-#: plugins/check_http.c:672
+#: plugins/check_http.c:739
 #, c-format
 msgid "%sServer date unknown, "
 msgstr ""
 
-#: plugins/check_http.c:675
+#: plugins/check_http.c:742
 #, c-format
 msgid "%sDocument modification date unknown, "
 msgstr ""
 
-#: plugins/check_http.c:682
+#: plugins/check_http.c:749
 #, c-format
 msgid "%sServer date \"%100s\" unparsable, "
 msgstr ""
 
-#: plugins/check_http.c:685
+#: plugins/check_http.c:752
 #, c-format
 msgid "%sDocument date \"%100s\" unparsable, "
 msgstr ""
 
-#: plugins/check_http.c:688
+#: plugins/check_http.c:755
 #, c-format
 msgid "%sDocument is %d seconds in the future, "
 msgstr ""
 
-#: plugins/check_http.c:693
+#: plugins/check_http.c:760
 #, c-format
 msgid "%sLast modified %.1f days ago, "
 msgstr ""
 
-#: plugins/check_http.c:696
+#: plugins/check_http.c:763
 #, c-format
 msgid "%sLast modified %d:%02d:%02d ago, "
 msgstr ""
 
-#: plugins/check_http.c:798
+#: plugins/check_http.c:876
 msgid "HTTP CRITICAL - Unable to open TCP socket\n"
 msgstr ""
 
-#: plugins/check_http.c:901
+#: plugins/check_http.c:995
 msgid "HTTP CRITICAL - Error on receive\n"
 msgstr ""
 
-#: plugins/check_http.c:911
+#: plugins/check_http.c:1005
 msgid "HTTP CRITICAL - No data received from host\n"
 msgstr ""
 
-#: plugins/check_http.c:962
+#: plugins/check_http.c:1056
 #, c-format
 msgid "Invalid HTTP response received from host: %s\n"
 msgstr ""
 
-#: plugins/check_http.c:966
+#: plugins/check_http.c:1060
 #, c-format
 msgid "Invalid HTTP response received from host on port %d: %s\n"
 msgstr ""
 
-#: plugins/check_http.c:975
+#: plugins/check_http.c:1069
 #, c-format
 msgid "Status line output matched \"%s\" - "
 msgstr ""
 
-#: plugins/check_http.c:986
+#: plugins/check_http.c:1080
 #, c-format
 msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
 msgstr ""
 
-#: plugins/check_http.c:993
+#: plugins/check_http.c:1087
 #, c-format
 msgid "HTTP CRITICAL: Invalid Status (%s)\n"
 msgstr ""
 
-#: plugins/check_http.c:997 plugins/check_http.c:1002
-#: plugins/check_http.c:1012 plugins/check_http.c:1016
+#: plugins/check_http.c:1091 plugins/check_http.c:1096
+#: plugins/check_http.c:1106 plugins/check_http.c:1110
 #, c-format
 msgid "%s - "
 msgstr ""
 
-#: plugins/check_http.c:1036
+#: plugins/check_http.c:1129
+#, c-format
+msgid "%sheader '%s' not found on '%s://%s:%d%s', "
+msgstr ""
+
+#: plugins/check_http.c:1141
 #, c-format
 msgid "%sstring '%s' not found on '%s://%s:%d%s', "
 msgstr ""
 
-#: plugins/check_http.c:1049
+#: plugins/check_http.c:1154
 #, c-format
 msgid "%spattern not found, "
 msgstr ""
 
-#: plugins/check_http.c:1051
+#: plugins/check_http.c:1156
 #, c-format
 msgid "%spattern found, "
 msgstr ""
 
-#: plugins/check_http.c:1057
+#: plugins/check_http.c:1162
 #, c-format
 msgid "%sExecute Error: %s, "
 msgstr ""
 
-#: plugins/check_http.c:1073
+#: plugins/check_http.c:1178
 #, c-format
 msgid "%spage size %d too large, "
 msgstr ""
 
-#: plugins/check_http.c:1076
+#: plugins/check_http.c:1181
 #, c-format
 msgid "%spage size %d too small, "
 msgstr ""
 
-#: plugins/check_http.c:1088
+#: plugins/check_http.c:1194
+#, c-format
+msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s"
+msgstr ""
+
+#: plugins/check_http.c:1206
 #, c-format
 msgid "%s - %d bytes in %.3f second response time %s|%s %s"
 msgstr ""
 
-#: plugins/check_http.c:1125
+#: plugins/check_http.c:1244
 msgid "HTTP UNKNOWN - Could not allocate addr\n"
 msgstr ""
 
-#: plugins/check_http.c:1129 plugins/check_http.c:1160
+#: plugins/check_http.c:1248 plugins/check_http.c:1279
 msgid "HTTP UNKNOWN - Could not allocate URL\n"
 msgstr ""
 
-#: plugins/check_http.c:1138
+#: plugins/check_http.c:1257
 #, c-format
 msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1153
+#: plugins/check_http.c:1272
 #, c-format
 msgid "HTTP UNKNOWN - Empty redirect location%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1203
+#: plugins/check_http.c:1322
 #, c-format
 msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1213
+#: plugins/check_http.c:1332
 #, c-format
 msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1221
+#: plugins/check_http.c:1340
 #, c-format
 msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1242
+#: plugins/check_http.c:1361
 #, c-format
 msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1247
+#: plugins/check_http.c:1366
 #, c-format
 msgid "Redirection to %s://%s:%d%s\n"
 msgstr ""
 
-#: plugins/check_http.c:1298
+#: plugins/check_http.c:1440
 msgid "This plugin tests the HTTP service on the specified host. It can test"
 msgstr ""
 
-#: plugins/check_http.c:1299
+#: plugins/check_http.c:1441
 msgid "normal (http) and secure (https) servers, follow redirects, search for"
 msgstr ""
 
-#: plugins/check_http.c:1300
+#: plugins/check_http.c:1442
 msgid "strings and regular expressions, check connection times, and report on"
 msgstr ""
 
-#: plugins/check_http.c:1301
+#: plugins/check_http.c:1443
 msgid "certificate expiration times."
 msgstr ""
 
-#: plugins/check_http.c:1307
+#: plugins/check_http.c:1449
 #, c-format
 msgid "NOTE: One or both of -H and -I must be specified"
 msgstr ""
 
-#: plugins/check_http.c:1315
+#: plugins/check_http.c:1457
 msgid "Host name argument for servers using host headers (virtual host)"
 msgstr ""
 
-#: plugins/check_http.c:1316
+#: plugins/check_http.c:1458
 msgid "Append a port to include it in the header (eg: example.com:5000)"
 msgstr ""
 
-#: plugins/check_http.c:1318
+#: plugins/check_http.c:1460
 msgid ""
 "IP address or name (use numeric address if possible to bypass DNS lookup)."
 msgstr ""
 
-#: plugins/check_http.c:1320
+#: plugins/check_http.c:1462
 msgid "Port number (default: "
 msgstr ""
 
-#: plugins/check_http.c:1327
-msgid "Connect via SSL. Port defaults to 443"
+#: plugins/check_http.c:1469
+msgid ""
+"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"
 msgstr ""
 
-#: plugins/check_http.c:1329
+#: plugins/check_http.c:1470
+msgid "auto-negotiation (1 = TLSv1, 2 = SSLv2, 3 = SSLv3)."
+msgstr ""
+
+#: plugins/check_http.c:1472
 msgid "Enable SSL/TLS hostname extension support (SNI)"
 msgstr ""
 
-#: plugins/check_http.c:1331
+#: plugins/check_http.c:1474
 msgid ""
 "Minimum number of days a certificate has to be valid. Port defaults to 443"
 msgstr ""
 
-#: plugins/check_http.c:1332
-msgid "(when this option is used the URL is not checked.)\n"
+#: plugins/check_http.c:1475
+msgid "(when this option is used the URL is not checked.)"
+msgstr ""
+
+#: plugins/check_http.c:1477
+msgid "Name of file that contains the client certificate (PEM format)"
+msgstr ""
+
+#: plugins/check_http.c:1478
+msgid "to be used in establishing the SSL session"
 msgstr ""
 
-#: plugins/check_http.c:1336
+#: plugins/check_http.c:1480
+msgid "Name of file containing the private key (PEM format)"
+msgstr ""
+
+#: plugins/check_http.c:1481
+msgid "matching the client certificate"
+msgstr ""
+
+#: plugins/check_http.c:1485
 msgid "Comma-delimited list of strings, at least one of them is expected in"
 msgstr ""
 
-#: plugins/check_http.c:1337
+#: plugins/check_http.c:1486
 msgid "the first (status) line of the server response (default: "
 msgstr ""
 
-#: plugins/check_http.c:1339
+#: plugins/check_http.c:1488
 msgid ""
 "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"
 msgstr ""
 
-#: plugins/check_http.c:1341
+#: plugins/check_http.c:1490
+msgid "String to expect in the response headers"
+msgstr ""
+
+#: plugins/check_http.c:1492
 msgid "String to expect in the content"
 msgstr ""
 
-#: plugins/check_http.c:1343
+#: plugins/check_http.c:1494
 msgid "URL to GET or POST (default: /)"
 msgstr ""
 
-#: plugins/check_http.c:1345
+#: plugins/check_http.c:1496
 msgid "URL encoded http POST data"
 msgstr ""
 
-#: plugins/check_http.c:1347
+#: plugins/check_http.c:1498
 msgid "Set HTTP method."
 msgstr ""
 
-#: plugins/check_http.c:1349
+#: plugins/check_http.c:1500
 msgid "Don't wait for document body: stop reading after headers."
 msgstr ""
 
-#: plugins/check_http.c:1350
+#: plugins/check_http.c:1501
 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)"
 msgstr ""
 
-#: plugins/check_http.c:1352
+#: plugins/check_http.c:1503
 msgid "Warn if document is more than SECONDS old. the number can also be of"
 msgstr ""
 
-#: plugins/check_http.c:1353
+#: plugins/check_http.c:1504
 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."
 msgstr ""
 
-#: plugins/check_http.c:1355
+#: plugins/check_http.c:1506
 msgid "specify Content-Type header media type when POSTing\n"
 msgstr ""
 
-#: plugins/check_http.c:1358
+#: plugins/check_http.c:1509
 msgid "Allow regex to span newlines (must precede -r or -R)"
 msgstr ""
 
-#: plugins/check_http.c:1360
+#: plugins/check_http.c:1511
 msgid "Search page for regex STRING"
 msgstr ""
 
-#: plugins/check_http.c:1362
+#: plugins/check_http.c:1513
 msgid "Search page for case-insensitive regex STRING"
 msgstr ""
 
-#: plugins/check_http.c:1364
+#: plugins/check_http.c:1515
 msgid "Return CRITICAL if found, OK if not\n"
 msgstr ""
 
-#: plugins/check_http.c:1367
+#: plugins/check_http.c:1518
 msgid "Username:password on sites with basic authentication"
 msgstr ""
 
-#: plugins/check_http.c:1369
+#: plugins/check_http.c:1520
 msgid "Username:password on proxy-servers with basic authentication"
 msgstr ""
 
-#: plugins/check_http.c:1371
+#: plugins/check_http.c:1522
 msgid "String to be sent in http header as \"User Agent\""
 msgstr ""
 
-#: plugins/check_http.c:1373
+#: plugins/check_http.c:1524
 msgid ""
 "Any other tags to be sent in http header. Use multiple times for additional "
 "headers"
 msgstr ""
 
-#: plugins/check_http.c:1375
+#: plugins/check_http.c:1526
+msgid "Print additional performance data"
+msgstr ""
+
+#: plugins/check_http.c:1528
 msgid "Wrap output in HTML link (obsoleted by urlize)"
 msgstr ""
 
-#: plugins/check_http.c:1377
+#: plugins/check_http.c:1530
 msgid "How to handle redirected pages. sticky is like follow but stick to the"
 msgstr ""
 
-#: plugins/check_http.c:1378
+#: plugins/check_http.c:1531
 msgid "specified IP address. stickyport also ensures port stays the same."
 msgstr ""
 
-#: plugins/check_http.c:1380
+#: plugins/check_http.c:1533
 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)"
 msgstr ""
 
-#: plugins/check_http.c:1390
+#: plugins/check_http.c:1543
 msgid "This plugin will attempt to open an HTTP connection with the host."
 msgstr ""
 
-#: plugins/check_http.c:1391
+#: plugins/check_http.c:1544
 msgid ""
 "Successful connects return STATE_OK, refusals and timeouts return "
 "STATE_CRITICAL"
 msgstr ""
 
-#: plugins/check_http.c:1392
+#: plugins/check_http.c:1545
 msgid ""
 "other errors return STATE_UNKNOWN.  Successful connects, but incorrect "
 "reponse"
 msgstr ""
 
-#: plugins/check_http.c:1393
+#: plugins/check_http.c:1546
 msgid ""
 "messages from the host result in STATE_WARNING return values.  If you are"
 msgstr ""
 
-#: plugins/check_http.c:1394
+#: plugins/check_http.c:1547
 msgid ""
 "checking a virtual server that uses 'host headers' you must supply the FQDN"
 msgstr ""
 
-#: plugins/check_http.c:1395
+#: plugins/check_http.c:1548
 msgid "(fully qualified domain name) as the [host_name] argument."
 msgstr ""
 
-#: plugins/check_http.c:1399
+#: plugins/check_http.c:1552
 msgid "This plugin can also check whether an SSL enabled web server is able to"
 msgstr ""
 
-#: plugins/check_http.c:1400
+#: plugins/check_http.c:1553
 msgid "serve content (optionally within a specified time) or whether the X509 "
 msgstr ""
 
-#: plugins/check_http.c:1401
+#: plugins/check_http.c:1554
 msgid "certificate is still valid for the specified number of days."
 msgstr ""
 
-#: plugins/check_http.c:1405
+#: plugins/check_http.c:1556
+msgid "Please note that this plugin does not check if the presented server"
+msgstr ""
+
+#: plugins/check_http.c:1557
+msgid "certificate matches the hostname of the server, or if the certificate"
+msgstr ""
+
+#: plugins/check_http.c:1558
+msgid "has a valid chain of trust to one of the locally installed CAs."
+msgstr ""
+
+#: plugins/check_http.c:1562
 msgid ""
 "When the 'www.verisign.com' server returns its content within 5 seconds,"
 msgstr ""
 
-#: plugins/check_http.c:1406
+#: plugins/check_http.c:1563
 msgid ""
 "a STATE_OK will be returned. When the server returns its content but exceeds"
 msgstr ""
 
-#: plugins/check_http.c:1407
+#: plugins/check_http.c:1564
 msgid ""
 "the 5-second threshold, a STATE_WARNING will be returned. When an error "
 "occurs,"
 msgstr ""
 
-#: plugins/check_http.c:1408
+#: plugins/check_http.c:1565
 msgid "a STATE_CRITICAL will be returned."
 msgstr ""
 
-#: plugins/check_http.c:1411
+#: plugins/check_http.c:1568
 msgid ""
 "When the certificate of 'www.verisign.com' is valid for more than 14 days,"
 msgstr ""
 
-#: plugins/check_http.c:1412
+#: plugins/check_http.c:1569 plugins/check_http.c:1575
 msgid ""
 "a STATE_OK is returned. When the certificate is still valid, but for less "
 "than"
 msgstr ""
 
-#: plugins/check_http.c:1413
+#: plugins/check_http.c:1570
 msgid ""
 "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
 msgstr ""
 
-#: plugins/check_http.c:1414
+#: plugins/check_http.c:1571
 msgid "the certificate is expired."
 msgstr ""
 
+#: plugins/check_http.c:1574
+msgid ""
+"When the certificate of 'www.verisign.com' is valid for more than 30 days,"
+msgstr ""
+
+#: plugins/check_http.c:1576
+msgid "30 days, but more than 14 days, a STATE_WARNING is returned."
+msgstr ""
+
+#: plugins/check_http.c:1577
+msgid ""
+"A STATE_CRITICAL will be returned when certificate expires in less than 14 "
+"days"
+msgstr ""
+
 #: plugins/check_ldap.c:133
 #, c-format
 msgid "Could not connect to the server at port %i\n"
@@ -1531,10 +1674,6 @@ msgstr ""
 msgid "%s cannot be combined with %s"
 msgstr ""
 
-#: plugins/check_ldap.c:353 plugins/check_ping.c:246
-msgid "IPv6 support not available\n"
-msgstr ""
-
 #: plugins/check_ldap.c:379
 msgid "Please specify the host name\n"
 msgstr ""
@@ -1613,61 +1752,66 @@ msgstr ""
 msgid "Error opening %s\n"
 msgstr ""
 
-#: plugins/check_load.c:160
+#: plugins/check_load.c:163
+#, c-format
+msgid "could not parse load from uptime: %s\n"
+msgstr ""
+
+#: plugins/check_load.c:169
 #, c-format
 msgid "Error code %d returned in %s\n"
 msgstr ""
 
-#: plugins/check_load.c:175
+#: plugins/check_load.c:184
 #, c-format
 msgid "Error in getloadavg()\n"
 msgstr ""
 
-#: plugins/check_load.c:178 plugins/check_load.c:180
+#: plugins/check_load.c:187 plugins/check_load.c:189
 #, c-format
 msgid "Error processing %s\n"
 msgstr ""
 
-#: plugins/check_load.c:189
+#: plugins/check_load.c:198
 #, c-format
 msgid "load average: %.2f, %.2f, %.2f"
 msgstr ""
 
-#: plugins/check_load.c:282
+#: plugins/check_load.c:291
 #, c-format
 msgid "Critical threshold for %d-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:284
+#: plugins/check_load.c:293
 #, c-format
 msgid "Warning threshold for %d-minute load average is not specified\n"
 msgstr ""
 
-#: plugins/check_load.c:286
+#: plugins/check_load.c:295
 #, c-format
 msgid ""
 "Parameter inconsistency: %d-minute \"warning load\" is greater than "
 "\"critical load\"\n"
 msgstr ""
 
-#: plugins/check_load.c:302
+#: plugins/check_load.c:311
 #, c-format
 msgid "This plugin tests the current system load average."
 msgstr ""
 
-#: plugins/check_load.c:312
+#: plugins/check_load.c:321
 msgid "Exit with WARNING status if load average exceeds WLOADn"
 msgstr ""
 
-#: plugins/check_load.c:314
+#: plugins/check_load.c:323
 msgid "Exit with CRITICAL status if load average exceed CLOADn"
 msgstr ""
 
-#: plugins/check_load.c:315
+#: plugins/check_load.c:324
 msgid "the load average format is the same used by \"uptime\" and \"w\""
 msgstr ""
 
-#: plugins/check_load.c:317
+#: plugins/check_load.c:326
 msgid "Divide the load averages by the number of CPUs (when possible)"
 msgstr ""
 
@@ -1928,93 +2072,130 @@ msgstr ""
 msgid "Usage"
 msgstr ""
 
-#: plugins/check_mysql.c:126
+#: plugins/check_mysql.c:171
+#, c-format
+msgid "status store_result error: %s\n"
+msgstr ""
+
+#: plugins/check_mysql.c:202
 #, c-format
 msgid "slave query error: %s\n"
 msgstr ""
 
-#: plugins/check_mysql.c:133
+#: plugins/check_mysql.c:209
 #, c-format
 msgid "slave store_result error: %s\n"
 msgstr ""
 
-#: plugins/check_mysql.c:139
+#: plugins/check_mysql.c:215
 msgid "No slaves defined"
 msgstr ""
 
-#: plugins/check_mysql.c:147
+#: plugins/check_mysql.c:223
 #, c-format
 msgid "slave fetch row error: %s\n"
 msgstr ""
 
-#: plugins/check_mysql.c:152
+#: plugins/check_mysql.c:228
 #, c-format
 msgid "Slave running: %s"
 msgstr ""
 
-#: plugins/check_mysql.c:378
+#: plugins/check_mysql.c:505
 msgid "This program tests connections to a MySQL server"
 msgstr ""
 
-#: plugins/check_mysql.c:389
+#: plugins/check_mysql.c:516
 msgid "Use the specified socket (has no effect if -H is used)"
 msgstr ""
 
-#: plugins/check_mysql.c:392
+#: plugins/check_mysql.c:519
 msgid "Check database with indicated name"
 msgstr ""
 
-#: plugins/check_mysql.c:394
+#: plugins/check_mysql.c:521
+msgid "Read from the specified client options file"
+msgstr ""
+
+#: plugins/check_mysql.c:523
+msgid "Use a client options group"
+msgstr ""
+
+#: plugins/check_mysql.c:525
 msgid "Connect using the indicated username"
 msgstr ""
 
-#: plugins/check_mysql.c:396
+#: plugins/check_mysql.c:527
 msgid "Use the indicated password to authenticate the connection"
 msgstr ""
 
-#: plugins/check_mysql.c:397
+#: plugins/check_mysql.c:528
 msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"
 msgstr ""
 
-#: plugins/check_mysql.c:398
+#: plugins/check_mysql.c:529
 msgid "Your clear-text password could be visible as a process table entry"
 msgstr ""
 
-#: plugins/check_mysql.c:400
+#: plugins/check_mysql.c:531
 msgid "Check if the slave thread is running properly."
 msgstr ""
 
-#: plugins/check_mysql.c:402
+#: plugins/check_mysql.c:533
 msgid "Exit with WARNING status if slave server is more than INTEGER seconds"
 msgstr ""
 
-#: plugins/check_mysql.c:403 plugins/check_mysql.c:406
+#: plugins/check_mysql.c:534 plugins/check_mysql.c:537
 msgid "behind master"
 msgstr ""
 
-#: plugins/check_mysql.c:405
+#: plugins/check_mysql.c:536
 msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds"
 msgstr ""
 
-#: plugins/check_mysql.c:409
+#: plugins/check_mysql.c:539
+msgid "Use ssl encryptation"
+msgstr ""
+
+#: plugins/check_mysql.c:541
+msgid "Path to CA signing the cert"
+msgstr ""
+
+#: plugins/check_mysql.c:543
+msgid "Path to SSL certificate"
+msgstr ""
+
+#: plugins/check_mysql.c:545
+msgid "Path to private SSL key"
+msgstr ""
+
+#: plugins/check_mysql.c:547
+msgid "Path to CA directory"
+msgstr ""
+
+#: plugins/check_mysql.c:549
+msgid "List of valid SSL ciphers"
+msgstr ""
+
+#: plugins/check_mysql.c:553
 msgid ""
 "There are no required arguments. By default, the local database is checked"
 msgstr ""
 
-#: plugins/check_mysql.c:410
+#: plugins/check_mysql.c:554
 msgid ""
 "using the default unix socket. You can force TCP on localhost by using an"
 msgstr ""
 
-#: plugins/check_mysql.c:411
+#: plugins/check_mysql.c:555
 msgid "IP address or FQDN ('localhost' will use the socket as well)."
 msgstr ""
 
-#: plugins/check_mysql.c:415
+#: plugins/check_mysql.c:559
 msgid "You must specify -p with an empty string to force an empty password,"
 msgstr ""
 
-#: plugins/check_mysql.c:416
+#: plugins/check_mysql.c:560
 msgid "overriding any my.cnf settings."
 msgstr ""
 
@@ -2035,7 +2216,7 @@ msgstr ""
 msgid "Cannot parse Nagios log file for valid time"
 msgstr ""
 
-#: plugins/check_nagios.c:183 plugins/check_procs.c:295
+#: plugins/check_nagios.c:183 plugins/check_procs.c:356
 #, c-format
 msgid "%d process"
 msgid_plural "%d processes"
@@ -2049,567 +2230,574 @@ msgid_plural "status log updated %d seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/check_nagios.c:223 plugins/check_nagios.c:252
+#: plugins/check_nagios.c:224 plugins/check_nagios.c:253
 msgid "Expiration time must be an integer (seconds)\n"
 msgstr ""
 
-#: plugins/check_nagios.c:264
+#: plugins/check_nagios.c:260
+msgid "Timeout must be an integer (seconds)\n"
+msgstr ""
+
+#: plugins/check_nagios.c:272
 msgid "You must provide the status_log\n"
 msgstr ""
 
-#: plugins/check_nagios.c:267
+#: plugins/check_nagios.c:275
 msgid "You must provide a process string\n"
 msgstr ""
 
-#: plugins/check_nagios.c:281
+#: plugins/check_nagios.c:289
 msgid ""
 "This plugin checks the status of the Nagios process on the local machine"
 msgstr ""
 
-#: plugins/check_nagios.c:282
+#: plugins/check_nagios.c:290
 msgid ""
 "The plugin will check to make sure the Nagios status log is no older than"
 msgstr ""
 
-#: plugins/check_nagios.c:283
+#: plugins/check_nagios.c:291
 msgid "the number of minutes specified by the expires option."
 msgstr ""
 
-#: plugins/check_nagios.c:284
+#: plugins/check_nagios.c:292
 msgid ""
 "It also checks the process table for a process matching the command argument."
 msgstr ""
 
-#: plugins/check_nagios.c:294
+#: plugins/check_nagios.c:302
 msgid "Name of the log file to check"
 msgstr ""
 
-#: plugins/check_nagios.c:296
+#: plugins/check_nagios.c:304
 msgid "Minutes aging after which logfile is considered stale"
 msgstr ""
 
-#: plugins/check_nagios.c:298
+#: plugins/check_nagios.c:306
 msgid "Substring to search for in process arguments"
 msgstr ""
 
-#: plugins/check_nt.c:141
+#: plugins/check_nagios.c:308
+msgid "Timeout for the plugin in seconds"
+msgstr ""
+
+#: plugins/check_nt.c:142
 #, c-format
 msgid "Wrong client version - running: %s, required: %s"
 msgstr ""
 
-#: plugins/check_nt.c:152 plugins/check_nt.c:217
+#: plugins/check_nt.c:153 plugins/check_nt.c:218
 msgid "missing -l parameters"
 msgstr ""
 
-#: plugins/check_nt.c:154
+#: plugins/check_nt.c:155
 msgid "wrong -l parameter."
 msgstr ""
 
-#: plugins/check_nt.c:158
+#: plugins/check_nt.c:159
 msgid "CPU Load"
 msgstr ""
 
-#: plugins/check_nt.c:181
+#: plugins/check_nt.c:182
 #, c-format
 msgid " %lu%% (%lu min average)"
 msgstr ""
 
-#: plugins/check_nt.c:183
+#: plugins/check_nt.c:184
 #, c-format
 msgid " '%lu min avg Load'=%lu%%;%lu;%lu;0;100"
 msgstr ""
 
-#: plugins/check_nt.c:193
+#: plugins/check_nt.c:194
 msgid "not enough values for -l parameters"
 msgstr ""
 
-#: plugins/check_nt.c:205
+#: plugins/check_nt.c:206
 #, c-format
 msgid "System Uptime - %u day(s) %u hour(s) %u minute(s)"
 msgstr ""
 
-#: plugins/check_nt.c:219
+#: plugins/check_nt.c:220
 msgid "wrong -l argument"
 msgstr ""
 
-#: plugins/check_nt.c:235
+#: plugins/check_nt.c:236
 #, c-format
 msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"
 msgstr ""
 
-#: plugins/check_nt.c:238
+#: plugins/check_nt.c:239
 #, c-format
 msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"
 msgstr ""
 
-#: plugins/check_nt.c:252
+#: plugins/check_nt.c:253
 msgid "Free disk space : Invalid drive"
 msgstr ""
 
-#: plugins/check_nt.c:262
+#: plugins/check_nt.c:263
 msgid "No service/process specified"
 msgstr ""
 
-#: plugins/check_nt.c:286
+#: plugins/check_nt.c:271 plugins/check_nt.c:284 plugins/check_nt.c:288
+#: plugins/check_nt.c:622
+msgid "could not fetch information from server\n"
+msgstr ""
+
+#: plugins/check_nt.c:296
 #, c-format
 msgid ""
 "Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"
 msgstr ""
 
-#: plugins/check_nt.c:289
+#: plugins/check_nt.c:299
 #, c-format
 msgid "'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"
 msgstr ""
 
-#: plugins/check_nt.c:325 plugins/check_nt.c:410 plugins/check_nt.c:440
+#: plugins/check_nt.c:335 plugins/check_nt.c:420 plugins/check_nt.c:450
 msgid "No counter specified"
 msgstr ""
 
-#: plugins/check_nt.c:357
+#: plugins/check_nt.c:367
 msgid "Minimum value contains non-numbers"
 msgstr ""
 
-#: plugins/check_nt.c:361
+#: plugins/check_nt.c:371
 msgid "Maximum value contains non-numbers"
 msgstr ""
 
-#: plugins/check_nt.c:368
+#: plugins/check_nt.c:378
 msgid "No unit counter specified"
 msgstr ""
 
-#: plugins/check_nt.c:455
+#: plugins/check_nt.c:465
 msgid "Please specify a variable to check"
 msgstr ""
 
-#: plugins/check_nt.c:539
+#: plugins/check_nt.c:549
 msgid "Server port must be an integer\n"
 msgstr ""
 
-#: plugins/check_nt.c:593
+#: plugins/check_nt.c:603
 msgid "You must provide a server address or host name"
 msgstr ""
 
-#: plugins/check_nt.c:599
+#: plugins/check_nt.c:609
 msgid "None"
 msgstr ""
 
-#: plugins/check_nt.c:612
-msgid "could not fetch information from server\n"
-msgstr ""
-
-#: plugins/check_nt.c:656
+#: plugins/check_nt.c:666
 msgid "This plugin collects data from the NSClient service running on a"
 msgstr ""
 
-#: plugins/check_nt.c:657
+#: plugins/check_nt.c:667
 msgid "Windows NT/2000/XP/2003 server."
 msgstr ""
 
-#: plugins/check_nt.c:668
+#: plugins/check_nt.c:678
 msgid "Name of the host to check"
 msgstr ""
 
-#: plugins/check_nt.c:670
+#: plugins/check_nt.c:680
 msgid "Optional port number (default: "
 msgstr ""
 
-#: plugins/check_nt.c:673
+#: plugins/check_nt.c:683
 msgid "Password needed for the request"
 msgstr ""
 
-#: plugins/check_nt.c:675 plugins/check_nwstat.c:1661
+#: plugins/check_nt.c:685 plugins/check_nwstat.c:1661
 #: plugins/check_overcr.c:432
 msgid "Threshold which will result in a warning status"
 msgstr ""
 
-#: plugins/check_nt.c:677 plugins/check_nwstat.c:1663
+#: plugins/check_nt.c:687 plugins/check_nwstat.c:1663
 #: plugins/check_overcr.c:434
 msgid "Threshold which will result in a critical status"
 msgstr ""
 
-#: plugins/check_nt.c:679
+#: plugins/check_nt.c:689
 msgid "Seconds before connection attempt times out (default: "
 msgstr ""
 
-#: plugins/check_nt.c:681
+#: plugins/check_nt.c:691
 msgid "Parameters passed to specified check (see below)"
 msgstr ""
 
-#: plugins/check_nt.c:683
+#: plugins/check_nt.c:693
 msgid "Display options (currently only SHOWALL works)"
 msgstr ""
 
-#: plugins/check_nt.c:685
+#: plugins/check_nt.c:695
 msgid "Return UNKNOWN on timeouts"
 msgstr ""
 
-#: plugins/check_nt.c:688
+#: plugins/check_nt.c:698
 msgid "Print this help screen"
 msgstr ""
 
-#: plugins/check_nt.c:690
+#: plugins/check_nt.c:700
 msgid "Print version information"
 msgstr ""
 
-#: plugins/check_nt.c:692
+#: plugins/check_nt.c:702
 msgid "Variable to check"
 msgstr ""
 
-#: plugins/check_nt.c:693
+#: plugins/check_nt.c:703
 msgid "Valid variables are:"
 msgstr ""
 
-#: plugins/check_nt.c:695
+#: plugins/check_nt.c:705
 msgid "Get the NSClient version"
 msgstr ""
 
-#: plugins/check_nt.c:696
+#: plugins/check_nt.c:706
 msgid "If -l <version> is specified, will return warning if versions differ."
 msgstr ""
 
-#: plugins/check_nt.c:698
+#: plugins/check_nt.c:708
 msgid "Average CPU load on last x minutes."
 msgstr ""
 
-#: plugins/check_nt.c:699
+#: plugins/check_nt.c:709
 msgid "Request a -l parameter with the following syntax:"
 msgstr ""
 
-#: plugins/check_nt.c:700
+#: plugins/check_nt.c:710
 msgid "-l <minutes range>,<warning threshold>,<critical threshold>."
 msgstr ""
 
-#: plugins/check_nt.c:701
+#: plugins/check_nt.c:711
 msgid "<minute range> should be less than 24*60."
 msgstr ""
 
-#: plugins/check_nt.c:702
+#: plugins/check_nt.c:712
 msgid ""
 "Thresholds are percentage and up to 10 requests can be done in one shot."
 msgstr ""
 
-#: plugins/check_nt.c:705
+#: plugins/check_nt.c:715
 msgid "Get the uptime of the machine."
 msgstr ""
 
-#: plugins/check_nt.c:706
+#: plugins/check_nt.c:716
 msgid "No specific parameters. No warning or critical threshold"
 msgstr ""
 
-#: plugins/check_nt.c:708
+#: plugins/check_nt.c:718
 msgid "Size and percentage of disk use."
 msgstr ""
 
-#: plugins/check_nt.c:709
+#: plugins/check_nt.c:719
 msgid "Request a -l parameter containing the drive letter only."
 msgstr ""
 
-#: plugins/check_nt.c:710 plugins/check_nt.c:713
+#: plugins/check_nt.c:720 plugins/check_nt.c:723
 msgid "Warning and critical thresholds can be specified with -w and -c."
 msgstr ""
 
-#: plugins/check_nt.c:712
+#: plugins/check_nt.c:722
 msgid "Memory use."
 msgstr ""
 
-#: plugins/check_nt.c:715
+#: plugins/check_nt.c:725
 msgid "Check the state of one or several services."
 msgstr ""
 
-#: plugins/check_nt.c:716 plugins/check_nt.c:725
+#: plugins/check_nt.c:726 plugins/check_nt.c:735
 msgid "Request a -l parameters with the following syntax:"
 msgstr ""
 
-#: plugins/check_nt.c:717
+#: plugins/check_nt.c:727
 msgid "-l <service1>,<service2>,<service3>,..."
 msgstr ""
 
-#: plugins/check_nt.c:718
+#: plugins/check_nt.c:728
 msgid "You can specify -d SHOWALL in case you want to see working services"
 msgstr ""
 
-#: plugins/check_nt.c:719
+#: plugins/check_nt.c:729
 msgid "in the returned string."
 msgstr ""
 
-#: plugins/check_nt.c:721
+#: plugins/check_nt.c:731
 msgid "Check if one or several process are running."
 msgstr ""
 
-#: plugins/check_nt.c:722
+#: plugins/check_nt.c:732
 msgid "Same syntax as SERVICESTATE."
 msgstr ""
 
-#: plugins/check_nt.c:724
+#: plugins/check_nt.c:734
 msgid "Check any performance counter of Windows NT/2000."
 msgstr ""
 
-#: plugins/check_nt.c:726
+#: plugins/check_nt.c:736
 msgid "-l \"\\\\<performance object>\\\\counter\",\"<description>"
 msgstr ""
 
-#: plugins/check_nt.c:727
+#: plugins/check_nt.c:737
 msgid "The <description> parameter is optional and is given to a printf "
 msgstr ""
 
-#: plugins/check_nt.c:728
+#: plugins/check_nt.c:738
 msgid "output command which requires a float parameter."
 msgstr ""
 
-#: plugins/check_nt.c:729
+#: plugins/check_nt.c:739
 #, c-format
 msgid "If <description> does not include \"%%\", it is used as a label."
 msgstr ""
 
-#: plugins/check_nt.c:730 plugins/check_nt.c:745
+#: plugins/check_nt.c:740 plugins/check_nt.c:755
 msgid "Some examples:"
 msgstr ""
 
-#: plugins/check_nt.c:734
+#: plugins/check_nt.c:744
 msgid "Check any performance counter object of Windows NT/2000."
 msgstr ""
 
-#: plugins/check_nt.c:735
+#: plugins/check_nt.c:745
 msgid ""
 "Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"
 msgstr ""
 
-#: plugins/check_nt.c:736
+#: plugins/check_nt.c:746
 msgid "<counter object> is a Windows Perfmon Counter object (eg. Process),"
 msgstr ""
 
-#: plugins/check_nt.c:737
+#: plugins/check_nt.c:747
 msgid "if it is two words, it should be enclosed in quotes"
 msgstr ""
 
-#: plugins/check_nt.c:738
+#: plugins/check_nt.c:748
 msgid "The returned results will be a comma-separated list of instances on "
 msgstr ""
 
-#: plugins/check_nt.c:739
+#: plugins/check_nt.c:749
 msgid " the selected computer for that object."
 msgstr ""
 
-#: plugins/check_nt.c:740
+#: plugins/check_nt.c:750
 msgid ""
 "The purpose of this is to be run from command line to determine what "
 "instances"
 msgstr ""
 
-#: plugins/check_nt.c:741
+#: plugins/check_nt.c:751
 msgid ""
 " are available for monitoring without having to log onto the Windows server"
 msgstr ""
 
-#: plugins/check_nt.c:742
+#: plugins/check_nt.c:752
 msgid "  to run Perfmon directly."
 msgstr ""
 
-#: plugins/check_nt.c:743
-msgid "It can also be used in scripts that automatically create Nagios service"
+#: plugins/check_nt.c:753
+msgid ""
+"It can also be used in scripts that automatically create the monitoring "
+"service"
 msgstr ""
 
-#: plugins/check_nt.c:744
+#: plugins/check_nt.c:754
 msgid " configuration files."
 msgstr ""
 
-#: plugins/check_nt.c:746
+#: plugins/check_nt.c:756
 msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"
 msgstr ""
 
-#: plugins/check_nt.c:749
+#: plugins/check_nt.c:759
 msgid ""
 "- The NSClient service should be running on the server to get any information"
 msgstr ""
 
-#: plugins/check_nt.c:751
+#: plugins/check_nt.c:761
 msgid "- Critical thresholds should be lower than warning thresholds"
 msgstr ""
 
-#: plugins/check_nt.c:752
+#: plugins/check_nt.c:762
 msgid "- Default port 1248 is sometimes in use by other services. The error"
 msgstr ""
 
-#: plugins/check_nt.c:753
+#: plugins/check_nt.c:763
 msgid ""
 "output when this happens contains \"Cannot map xxxxx to protocol number\"."
 msgstr ""
 
-#: plugins/check_nt.c:754
+#: plugins/check_nt.c:764
 msgid "One fix for this is to change the port to something else on check_nt "
 msgstr ""
 
-#: plugins/check_nt.c:755
+#: plugins/check_nt.c:765
 msgid "and on the client service it's connecting to."
 msgstr ""
 
-#: plugins/check_ntp.c:803 plugins/check_ntp_peer.c:606
-#: plugins/check_ntp_time.c:567
-#, c-format
+#: plugins/check_ntp.c:807 plugins/check_ntp_peer.c:612
+#: plugins/check_ntp_time.c:571
 msgid "NTP CRITICAL:"
 msgstr ""
 
-#: plugins/check_ntp.c:806 plugins/check_ntp_peer.c:609
-#: plugins/check_ntp_time.c:570
-#, c-format
+#: plugins/check_ntp.c:810 plugins/check_ntp_peer.c:615
+#: plugins/check_ntp_time.c:574
 msgid "NTP WARNING:"
 msgstr ""
 
-#: plugins/check_ntp.c:809 plugins/check_ntp_peer.c:612
-#: plugins/check_ntp_time.c:573
-#, c-format
+#: plugins/check_ntp.c:813 plugins/check_ntp_peer.c:618
+#: plugins/check_ntp_time.c:577
 msgid "NTP OK:"
 msgstr ""
 
-#: plugins/check_ntp.c:812 plugins/check_ntp_peer.c:615
-#: plugins/check_ntp_time.c:576
-#, c-format
+#: plugins/check_ntp.c:816 plugins/check_ntp_peer.c:621
+#: plugins/check_ntp_time.c:580
 msgid "NTP UNKNOWN:"
 msgstr ""
 
-#: plugins/check_ntp.c:816 plugins/check_ntp_peer.c:624
-#: plugins/check_ntp_time.c:580
+#: plugins/check_ntp.c:820 plugins/check_ntp_peer.c:630
+#: plugins/check_ntp_time.c:584
 msgid "Offset unknown"
 msgstr ""
 
-#: plugins/check_ntp.c:819 plugins/check_ntp_peer.c:627
-#: plugins/check_ntp_time.c:583
+#: plugins/check_ntp.c:823 plugins/check_ntp_peer.c:633
+#: plugins/check_ntp_time.c:587
 msgid "Offset"
 msgstr ""
 
-#: plugins/check_ntp.c:840 plugins/check_ntp_peer.c:656
+#: plugins/check_ntp.c:844 plugins/check_ntp_peer.c:662
 msgid "This plugin checks the selected ntp server"
 msgstr ""
 
-#: plugins/check_ntp.c:849 plugins/check_ntp_peer.c:667
-#: plugins/check_ntp_time.c:609
+#: plugins/check_ntp.c:854 plugins/check_ntp_peer.c:674
+#: plugins/check_ntp_time.c:614
 msgid "Offset to result in warning status (seconds)"
 msgstr ""
 
-#: plugins/check_ntp.c:851 plugins/check_ntp_peer.c:669
-#: plugins/check_ntp_time.c:611
+#: plugins/check_ntp.c:856 plugins/check_ntp_peer.c:676
+#: plugins/check_ntp_time.c:616
 msgid "Offset to result in critical status (seconds)"
 msgstr ""
 
-#: plugins/check_ntp.c:853 plugins/check_ntp_peer.c:675
+#: plugins/check_ntp.c:858 plugins/check_ntp_peer.c:682
 msgid "Warning threshold for jitter"
 msgstr ""
 
-#: plugins/check_ntp.c:855 plugins/check_ntp_peer.c:677
+#: plugins/check_ntp.c:860 plugins/check_ntp_peer.c:684
 msgid "Critical threshold for jitter"
 msgstr ""
 
-#: plugins/check_ntp.c:865
+#: plugins/check_ntp.c:870
 msgid "Normal offset check:"
 msgstr ""
 
-#: plugins/check_ntp.c:868 plugins/check_ntp_peer.c:702
+#: plugins/check_ntp.c:873 plugins/check_ntp_peer.c:709
 msgid ""
 "Check jitter too, avoiding critical notifications if jitter isn't available"
 msgstr ""
 
-#: plugins/check_ntp.c:869 plugins/check_ntp_peer.c:703
+#: plugins/check_ntp.c:874 plugins/check_ntp_peer.c:710
 msgid "(See Notes above for more details on thresholds formats):"
 msgstr ""
 
-#: plugins/check_ntp.c:874 plugins/check_ntp.c:881
+#: plugins/check_ntp.c:879 plugins/check_ntp.c:886
 msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or"
 msgstr ""
 
-#: plugins/check_ntp.c:875 plugins/check_ntp.c:882
+#: plugins/check_ntp.c:880 plugins/check_ntp.c:887
 msgid "check_ntp_time instead."
 msgstr ""
 
-#: plugins/check_ntp_peer.c:619
+#: plugins/check_ntp_peer.c:625
 msgid "Server not synchronized"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:621
+#: plugins/check_ntp_peer.c:627
 msgid "Server has the LI_ALARM bit set"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:665
+#: plugins/check_ntp_peer.c:672
 msgid ""
 "Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:671
-msgid "Warning threshold for stratum"
+#: plugins/check_ntp_peer.c:678
+msgid "Warning threshold for stratum of server's synchronization peer"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:673
-msgid "Critical threshold for stratum"
+#: plugins/check_ntp_peer.c:680
+msgid "Critical threshold for stratum of server's synchronization peer"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:679
+#: plugins/check_ntp_peer.c:686
 msgid "Warning threshold for number of usable time sources (\"truechimers\")"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:681
+#: plugins/check_ntp_peer.c:688
 msgid "Critical threshold for number of usable time sources (\"truechimers\")"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:686
+#: plugins/check_ntp_peer.c:693
 msgid "This plugin checks an NTP server independent of any commandline"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:687
+#: plugins/check_ntp_peer.c:694
 msgid "programs or external libraries."
 msgstr ""
 
-#: plugins/check_ntp_peer.c:690
+#: plugins/check_ntp_peer.c:697
 msgid "Use this plugin to check the health of an NTP server. It supports"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:691
+#: plugins/check_ntp_peer.c:698
 msgid "checking the offset with the sync peer, the jitter and stratum. This"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:692
+#: plugins/check_ntp_peer.c:699
 msgid "plugin will not check the clock offset between the local host and NTP"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:693
+#: plugins/check_ntp_peer.c:700
 msgid "server; please use check_ntp_time for that purpose."
 msgstr ""
 
-#: plugins/check_ntp_peer.c:699
+#: plugins/check_ntp_peer.c:706
 msgid "Simple NTP server check:"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:706
+#: plugins/check_ntp_peer.c:713
 msgid "Only check the number of usable time sources (\"truechimers\"):"
 msgstr ""
 
-#: plugins/check_ntp_peer.c:709
+#: plugins/check_ntp_peer.c:716
 msgid "Check only stratum:"
 msgstr ""
 
-#: plugins/check_ntp_time.c:598
+#: plugins/check_ntp_time.c:602
 msgid "This plugin checks the clock offset with the ntp server"
 msgstr ""
 
-#: plugins/check_ntp_time.c:607
+#: plugins/check_ntp_time.c:612
 msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found"
 msgstr ""
 
-#: plugins/check_ntp_time.c:616
+#: plugins/check_ntp_time.c:621
 msgid "This plugin checks the clock offset between the local host and a"
 msgstr ""
 
-#: plugins/check_ntp_time.c:617
+#: plugins/check_ntp_time.c:622
 msgid "remote NTP server. It is independent of any commandline programs or"
 msgstr ""
 
-#: plugins/check_ntp_time.c:618
+#: plugins/check_ntp_time.c:623
 msgid "external libraries."
 msgstr ""
 
-#: plugins/check_ntp_time.c:622
+#: plugins/check_ntp_time.c:627
 msgid "If you'd rather want to monitor an NTP server, please use"
 msgstr ""
 
-#: plugins/check_ntp_time.c:623
+#: plugins/check_ntp_time.c:628
 msgid "check_ntp_peer."
 msgstr ""
 
@@ -2708,17 +2896,14 @@ msgid "disabled"
 msgstr ""
 
 #: plugins/check_nwstat.c:560
-#, c-format
 msgid "CRITICAL - NRM Status is bad!"
 msgstr ""
 
 #: plugins/check_nwstat.c:565
-#, c-format
 msgid "Warning - NRM Status is suspect!"
 msgstr ""
 
 #: plugins/check_nwstat.c:568
-#, c-format
 msgid "OK - NRM Status is good!"
 msgstr ""
 
@@ -2778,12 +2963,10 @@ msgid "%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu"
 msgstr ""
 
 #: plugins/check_nwstat.c:904
-#, c-format
 msgid "CRITICAL - Time not in sync with network!"
 msgstr ""
 
 #: plugins/check_nwstat.c:907
-#, c-format
 msgid "OK - Time in sync with network!"
 msgstr ""
 
@@ -3184,112 +3367,218 @@ msgid ""
 "higher than the warning threshold value, EXCEPT with the uptime variable"
 msgstr ""
 
-#: plugins/check_pgsql.c:183
+#: plugins/check_pgsql.c:222
 #, c-format
 msgid "CRITICAL - no connection to '%s' (%s).\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:200
+#: plugins/check_pgsql.c:250
 #, c-format
-msgid " %s - database %s (%d sec.)|%s\n"
+msgid " %s - database %s (%f sec.)|%s\n"
 msgstr ""
 
-#: plugins/check_pgsql.c:256 plugins/check_time.c:277 plugins/check_time.c:289
-#: plugins/check_users.c:166
+#: plugins/check_pgsql.c:317 plugins/check_time.c:277 plugins/check_time.c:289
+#: plugins/check_users.c:181
 msgid "Critical threshold must be a positive integer"
 msgstr ""
 
-#: plugins/check_pgsql.c:262 plugins/check_time.c:258 plugins/check_time.c:282
-#: plugins/check_users.c:172 plugins/check_users.c:182
-#: plugins/check_users.c:189
+#: plugins/check_pgsql.c:323 plugins/check_time.c:258 plugins/check_time.c:282
+#: plugins/check_users.c:187 plugins/check_users.c:197
+#: plugins/check_users.c:203
 msgid "Warning threshold must be a positive integer"
 msgstr ""
 
-#: plugins/check_pgsql.c:280
+#: plugins/check_pgsql.c:347
 msgid "Database name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:286
+#: plugins/check_pgsql.c:353
 msgid "User name is not valid"
 msgstr ""
 
-#: plugins/check_pgsql.c:426
+#: plugins/check_pgsql.c:504
 #, c-format
 msgid "Test whether a PostgreSQL Database is accepting connections."
 msgstr ""
 
-#: plugins/check_pgsql.c:440
+#: plugins/check_pgsql.c:516
 msgid "Database to check "
 msgstr ""
 
-#: plugins/check_pgsql.c:441
+#: plugins/check_pgsql.c:517
 #, c-format
 msgid "(default: %s)"
 msgstr ""
 
-#: plugins/check_pgsql.c:443
+#: plugins/check_pgsql.c:519
 msgid "Login name of user"
 msgstr ""
 
-#: plugins/check_pgsql.c:445
+#: plugins/check_pgsql.c:521
 msgid "Password (BIG SECURITY ISSUE)"
 msgstr ""
 
-#: plugins/check_pgsql.c:454
+#: plugins/check_pgsql.c:523
+msgid "Connection parameters (keyword = value), see below"
+msgstr ""
+
+#: plugins/check_pgsql.c:530
+msgid "SQL query to run. Only first column in first row will be read"
+msgstr ""
+
+#: plugins/check_pgsql.c:532
+msgid "SQL query value to result in warning status (double)"
+msgstr ""
+
+#: plugins/check_pgsql.c:534
+msgid "SQL query value to result in critical status (double)"
+msgstr ""
+
+#: plugins/check_pgsql.c:539
 msgid "All parameters are optional."
 msgstr ""
 
-#: plugins/check_pgsql.c:455
+#: plugins/check_pgsql.c:540
 msgid ""
 "This plugin tests a PostgreSQL DBMS to determine whether it is active and"
 msgstr ""
 
-#: plugins/check_pgsql.c:456
+#: plugins/check_pgsql.c:541
 msgid "accepting queries. In its current operation, it simply connects to the"
 msgstr ""
 
-#: plugins/check_pgsql.c:457
+#: plugins/check_pgsql.c:542
 msgid ""
 "specified database, and then disconnects. If no database is specified, it"
 msgstr ""
 
-#: plugins/check_pgsql.c:458
+#: plugins/check_pgsql.c:543
 msgid ""
 "connects to the template1 database, which is present in every functioning"
 msgstr ""
 
-#: plugins/check_pgsql.c:459
+#: plugins/check_pgsql.c:544
 msgid "PostgreSQL DBMS."
 msgstr ""
 
-#: plugins/check_pgsql.c:461
+#: plugins/check_pgsql.c:546
+msgid "If a query is specified using the -q option, it will be executed after"
+msgstr ""
+
+#: plugins/check_pgsql.c:547
+msgid "connecting to the server. The result from the query has to be numeric."
+msgstr ""
+
+#: plugins/check_pgsql.c:548
+msgid ""
+"Multiple SQL commands, separated by semicolon, are allowed but the result "
+msgstr ""
+
+#: plugins/check_pgsql.c:549
+msgid "of the last command is taken into account only. The value of the first"
+msgstr ""
+
+#: plugins/check_pgsql.c:550
+msgid "column in the first row is used as the check result."
+msgstr ""
+
+#: plugins/check_pgsql.c:552
+msgid ""
+"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"
+msgstr ""
+
+#: plugins/check_pgsql.c:553
+msgid ""
+"for details about how to access internal statistics of the database server."
+msgstr ""
+
+#: plugins/check_pgsql.c:555
+msgid ""
+"For a list of available connection parameters which may be used with the -o"
+msgstr ""
+
+#: plugins/check_pgsql.c:556
+msgid ""
+"command line option, see the documentation for PQconnectdb() in the chapter"
+msgstr ""
+
+#: plugins/check_pgsql.c:557
+msgid ""
+"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"
+msgstr ""
+
+#: plugins/check_pgsql.c:558
+msgid ""
+"used to specify a service name in pg_service.conf to be used for additional"
+msgstr ""
+
+#: plugins/check_pgsql.c:559
+msgid "connection parameters: -o 'service=<name>' or to specify the SSL mode:"
+msgstr ""
+
+#: plugins/check_pgsql.c:560
+msgid "-o 'sslmode=require'."
+msgstr ""
+
+#: plugins/check_pgsql.c:562
 msgid ""
 "The plugin will connect to a local postmaster if no host is specified. To"
 msgstr ""
 
-#: plugins/check_pgsql.c:462
+#: plugins/check_pgsql.c:563
 msgid ""
 "connect to a remote host, be sure that the remote postmaster accepts TCP/IP"
 msgstr ""
 
-#: plugins/check_pgsql.c:463
+#: plugins/check_pgsql.c:564
 msgid "connections (start the postmaster with the -i option)."
 msgstr ""
 
-#: plugins/check_pgsql.c:465
+#: plugins/check_pgsql.c:566
 msgid ""
-"Typically, the nagios user (unless the --logname option is used) should be"
+"Typically, the monitoring user (unless the --logname option is used) should "
+"be"
 msgstr ""
 
-#: plugins/check_pgsql.c:466
+#: plugins/check_pgsql.c:567
 msgid ""
 "able to connect to the database without a password. The plugin can also send"
 msgstr ""
 
-#: plugins/check_pgsql.c:467
+#: plugins/check_pgsql.c:568
 msgid "a password, but no effort is made to obsure or encrypt the password."
 msgstr ""
 
+#: plugins/check_pgsql.c:601
+#, c-format
+msgid "QUERY %s - %s: %s.\n"
+msgstr ""
+
+#: plugins/check_pgsql.c:601
+msgid "Error with query"
+msgstr ""
+
+#: plugins/check_pgsql.c:607
+msgid "No rows returned"
+msgstr ""
+
+#: plugins/check_pgsql.c:612
+msgid "No columns returned"
+msgstr ""
+
+#: plugins/check_pgsql.c:618
+msgid "No data returned"
+msgstr ""
+
+#: plugins/check_pgsql.c:627
+msgid "Is not a numeric"
+msgstr ""
+
+#: plugins/check_pgsql.c:644
+#, c-format
+msgid "'%s' returned %f"
+msgstr ""
+
 #: plugins/check_ping.c:141
 msgid "CRITICAL - Could not interpret output from ping command\n"
 msgstr ""
@@ -3370,306 +3659,301 @@ msgstr ""
 msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
 msgstr ""
 
-#: plugins/check_ping.c:441
+#: plugins/check_ping.c:442
 #, c-format
 msgid "Cannot open stderr for %s\n"
 msgstr ""
 
-#: plugins/check_ping.c:490 plugins/check_ping.c:492
+#: plugins/check_ping.c:492 plugins/check_ping.c:494
 msgid "System call sent warnings to stderr "
 msgstr ""
 
 #: plugins/check_ping.c:519
 #, c-format
-msgid "CRITICAL - Network Unreachable (%s)"
+msgid "CRITICAL - Network Unreachable (%s)\n"
 msgstr ""
 
 #: plugins/check_ping.c:521
 #, c-format
-msgid "CRITICAL - Host Unreachable (%s)"
+msgid "CRITICAL - Host Unreachable (%s)\n"
 msgstr ""
 
 #: plugins/check_ping.c:523
 #, c-format
-msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)"
+msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"
 msgstr ""
 
 #: plugins/check_ping.c:525
 #, c-format
-msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)"
+msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"
 msgstr ""
 
 #: plugins/check_ping.c:527
 #, c-format
-msgid "CRITICAL - Network Prohibited (%s)"
+msgid "CRITICAL - Network Prohibited (%s)\n"
 msgstr ""
 
 #: plugins/check_ping.c:529
 #, c-format
-msgid "CRITICAL - Host Prohibited (%s)"
+msgid "CRITICAL - Host Prohibited (%s)\n"
 msgstr ""
 
 #: plugins/check_ping.c:531
 #, c-format
-msgid "CRITICAL - Packet Filtered (%s)"
+msgid "CRITICAL - Packet Filtered (%s)\n"
 msgstr ""
 
 #: plugins/check_ping.c:533
 #, c-format
-msgid "CRITICAL - Host not found (%s)"
+msgid "CRITICAL - Host not found (%s)\n"
 msgstr ""
 
 #: plugins/check_ping.c:535
 #, c-format
-msgid "CRITICAL - Time to live exceeded (%s)"
+msgid "CRITICAL - Time to live exceeded (%s)\n"
 msgstr ""
 
-#: plugins/check_ping.c:542
-msgid "Unable to realloc warn_text"
+#: plugins/check_ping.c:537
+#, c-format
+msgid "CRITICAL - Destination Unreachable (%s)\n"
 msgstr ""
 
-#: plugins/check_ping.c:559
+#: plugins/check_ping.c:544
+msgid "Unable to realloc warn_text\n"
+msgstr ""
+
+#: plugins/check_ping.c:561
 #, c-format
 msgid "Use ping to check connection statistics for a remote host."
 msgstr ""
 
-#: plugins/check_ping.c:571
+#: plugins/check_ping.c:573
 msgid "host to ping"
 msgstr ""
 
-#: plugins/check_ping.c:577
+#: plugins/check_ping.c:579
 msgid "number of ICMP ECHO packets to send"
 msgstr ""
 
-#: plugins/check_ping.c:578
+#: plugins/check_ping.c:580
 #, c-format
 msgid "(Default: %d)\n"
 msgstr ""
 
-#: plugins/check_ping.c:580
+#: plugins/check_ping.c:582
 msgid "show HTML in the plugin output (obsoleted by urlize)"
 msgstr ""
 
-#: plugins/check_ping.c:585
+#: plugins/check_ping.c:587
 msgid "THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"
 msgstr ""
 
-#: plugins/check_ping.c:586
+#: plugins/check_ping.c:588
 msgid "time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"
 msgstr ""
 
-#: plugins/check_ping.c:587
+#: plugins/check_ping.c:589
 msgid "percentage of packet loss to trigger an alarm state."
 msgstr ""
 
-#: plugins/check_ping.c:590
+#: plugins/check_ping.c:592
 msgid ""
 "This plugin uses the ping command to probe the specified host for packet loss"
 msgstr ""
 
-#: plugins/check_ping.c:591
+#: plugins/check_ping.c:593
 msgid ""
 "(percentage) and round trip average (milliseconds). It can produce HTML "
 "output"
 msgstr ""
 
-#: plugins/check_ping.c:592
+#: plugins/check_ping.c:594
 msgid ""
 "linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"
 msgstr ""
 
-#: plugins/check_ping.c:593
+#: plugins/check_ping.c:595
 msgid "the contrib area of the downloads section at http://www.nagios.org/"
 msgstr ""
 
-#: plugins/check_procs.c:159
+#: plugins/check_procs.c:193
 #, c-format
 msgid "CMD: %s\n"
 msgstr ""
 
-#: plugins/check_procs.c:164
+#: plugins/check_procs.c:198
 msgid "System call sent warnings to stderr"
 msgstr ""
 
-#: plugins/check_procs.c:265
+#: plugins/check_procs.c:326
 #, c-format
 msgid "Not parseable: %s"
 msgstr ""
 
-#: plugins/check_procs.c:270
+#: plugins/check_procs.c:331
 #, c-format
 msgid "Unable to read output\n"
 msgstr ""
 
-#: plugins/check_procs.c:287
+#: plugins/check_procs.c:348
 #, c-format
 msgid "%d warn out of "
 msgstr ""
 
-#: plugins/check_procs.c:292
+#: plugins/check_procs.c:353
 #, c-format
 msgid "%d crit, %d warn out of "
 msgstr ""
 
-#: plugins/check_procs.c:298
+#: plugins/check_procs.c:359
 #, c-format
 msgid " with %s"
 msgstr ""
 
-#: plugins/check_procs.c:380
-msgid "Critical Process Count must be an integer!"
-msgstr ""
-
-#: plugins/check_procs.c:392
-msgid "Warning Process Count must be an integer!"
-msgstr ""
-
-#: plugins/check_procs.c:400
+#: plugins/check_procs.c:453
 msgid "Parent Process ID must be an integer!"
 msgstr ""
 
-#: plugins/check_procs.c:406 plugins/check_procs.c:527
+#: plugins/check_procs.c:459 plugins/check_procs.c:586
 #, c-format
 msgid "%s%sSTATE = %s"
 msgstr ""
 
-#: plugins/check_procs.c:415
+#: plugins/check_procs.c:468
 msgid "UID was not found"
 msgstr ""
 
-#: plugins/check_procs.c:421
+#: plugins/check_procs.c:474
 msgid "User name was not found"
 msgstr ""
 
-#: plugins/check_procs.c:436
+#: plugins/check_procs.c:489
 #, c-format
 msgid "%s%scommand name '%s'"
 msgstr ""
 
-#: plugins/check_procs.c:471
+#: plugins/check_procs.c:524
 msgid "RSS must be an integer!"
 msgstr ""
 
-#: plugins/check_procs.c:478
+#: plugins/check_procs.c:531
 msgid "VSZ must be an integer!"
 msgstr ""
 
-#: plugins/check_procs.c:486
+#: plugins/check_procs.c:539
 msgid "PCPU must be a float!"
 msgstr ""
 
-#: plugins/check_procs.c:510
+#: plugins/check_procs.c:563
 msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
 msgstr ""
 
-#: plugins/check_procs.c:546
-#, c-format
-msgid "wmax (%d) cannot be greater than cmax (%d)\n"
-msgstr ""
-
-#: plugins/check_procs.c:550
-#, c-format
-msgid "wmin (%d) cannot be less than cmin (%d)\n"
-msgstr ""
-
-#: plugins/check_procs.c:687
+#: plugins/check_procs.c:694
 msgid ""
 "Checks all processes and generates WARNING or CRITICAL states if the "
 "specified"
 msgstr ""
 
-#: plugins/check_procs.c:688
+#: plugins/check_procs.c:695
 msgid ""
 "metric is outside the required threshold ranges. The metric defaults to "
 "number"
 msgstr ""
 
-#: plugins/check_procs.c:689
+#: plugins/check_procs.c:696
 msgid ""
 "of processes.  Search filters can be applied to limit the processes to check."
 msgstr ""
 
-#: plugins/check_procs.c:698
+#: plugins/check_procs.c:705
 msgid "Generate warning state if metric is outside this range"
 msgstr ""
 
-#: plugins/check_procs.c:700
+#: plugins/check_procs.c:707
 msgid "Generate critical state if metric is outside this range"
 msgstr ""
 
-#: plugins/check_procs.c:702
+#: plugins/check_procs.c:709
 msgid "Check thresholds against metric. Valid types:"
 msgstr ""
 
-#: plugins/check_procs.c:703
+#: plugins/check_procs.c:710
 msgid "PROCS   - number of processes (default)"
 msgstr ""
 
-#: plugins/check_procs.c:704
+#: plugins/check_procs.c:711
 msgid "VSZ     - virtual memory size"
 msgstr ""
 
-#: plugins/check_procs.c:705
+#: plugins/check_procs.c:712
 msgid "RSS     - resident set memory size"
 msgstr ""
 
-#: plugins/check_procs.c:706
+#: plugins/check_procs.c:713
 msgid "CPU     - percentage CPU"
 msgstr ""
 
-#: plugins/check_procs.c:709
+#: plugins/check_procs.c:716
 msgid "ELAPSED - time elapsed in seconds"
 msgstr ""
 
-#: plugins/check_procs.c:714
+#: plugins/check_procs.c:721
 msgid "Extra information. Up to 3 verbosity levels"
 msgstr ""
 
-#: plugins/check_procs.c:719
+#: plugins/check_procs.c:724
+msgid "Filter own process the traditional way by PID instead of /proc/pid/exe"
+msgstr ""
+
+#: plugins/check_procs.c:729
 msgid "Only scan for processes that have, in the output of `ps`, one or"
 msgstr ""
 
-#: plugins/check_procs.c:720
+#: plugins/check_procs.c:730
 msgid "more of the status flags you specify (for example R, Z, S, RS,"
 msgstr ""
 
-#: plugins/check_procs.c:721
+#: plugins/check_procs.c:731
 msgid "RSZDT, plus others based on the output of your 'ps' command)."
 msgstr ""
 
-#: plugins/check_procs.c:723
+#: plugins/check_procs.c:733
 msgid "Only scan for children of the parent process ID indicated."
 msgstr ""
 
-#: plugins/check_procs.c:725
+#: plugins/check_procs.c:735
 msgid "Only scan for processes with VSZ higher than indicated."
 msgstr ""
 
-#: plugins/check_procs.c:727
+#: plugins/check_procs.c:737
 msgid "Only scan for processes with RSS higher than indicated."
 msgstr ""
 
-#: plugins/check_procs.c:729
+#: plugins/check_procs.c:739
 msgid "Only scan for processes with PCPU higher than indicated."
 msgstr ""
 
-#: plugins/check_procs.c:731
+#: plugins/check_procs.c:741
 msgid "Only scan for processes with user name or ID indicated."
 msgstr ""
 
-#: plugins/check_procs.c:733
+#: plugins/check_procs.c:743
 msgid "Only scan for processes with args that contain STRING."
 msgstr ""
 
-#: plugins/check_procs.c:735
+#: plugins/check_procs.c:745
 msgid "Only scan for processes with args that contain the regex STRING."
 msgstr ""
 
-#: plugins/check_procs.c:737
+#: plugins/check_procs.c:747
 msgid "Only scan for exact matches of COMMAND (without path)."
 msgstr ""
 
-#: plugins/check_procs.c:739
+#: plugins/check_procs.c:749
+msgid "Only scan for non kernel threads (works on Linux only)."
+msgstr ""
+
+#: plugins/check_procs.c:751
 #, c-format
 msgid ""
 "\n"
@@ -3679,7 +3963,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:744
+#: plugins/check_procs.c:756
 #, c-format
 msgid ""
 "This plugin checks the number of currently running processes and\n"
@@ -3690,27 +3974,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: plugins/check_procs.c:753
+#: plugins/check_procs.c:765
 msgid "Warning if not two processes with command name portsentry."
 msgstr ""
 
-#: plugins/check_procs.c:754
+#: plugins/check_procs.c:766
 msgid "Critical if < 2 or > 1024 processes"
 msgstr ""
 
-#: plugins/check_procs.c:756
+#: plugins/check_procs.c:768
 msgid "Warning alert if > 10 processes with command arguments containing"
 msgstr ""
 
-#: plugins/check_procs.c:757
+#: plugins/check_procs.c:769
 msgid "'/usr/local/bin/perl' and owned by root"
 msgstr ""
 
-#: plugins/check_procs.c:759
+#: plugins/check_procs.c:771
 msgid "Alert if VSZ of any processes over 50K or 100K"
 msgstr ""
 
-#: plugins/check_procs.c:761
+#: plugins/check_procs.c:773
 #, c-format
 msgid "Alert if CPU of any processes over 10%% or 20%%"
 msgstr ""
@@ -3839,7 +4123,7 @@ msgid ""
 msgstr ""
 
 #: plugins/check_radius.c:373
-msgid "in a process listing. This risk is exacerbated because nagios will"
+msgid "in a process listing. This risk is exacerbated because the monitor will"
 msgstr ""
 
 #: plugins/check_radius.c:374
@@ -3869,7 +4153,7 @@ msgstr ""
 msgid "Invalid REAL response received from host on port %d\n"
 msgstr ""
 
-#: plugins/check_real.c:184 plugins/check_tcp.c:289
+#: plugins/check_real.c:184 plugins/check_tcp.c:311
 #, c-format
 msgid "No data received from host\n"
 msgstr ""
@@ -3879,11 +4163,11 @@ msgstr ""
 msgid "REAL %s - %d second response time\n"
 msgstr ""
 
-#: plugins/check_real.c:336 plugins/check_smtp.c:578 plugins/check_ups.c:536
+#: plugins/check_real.c:336 plugins/check_ups.c:536
 msgid "Warning time must be a positive integer"
 msgstr ""
 
-#: plugins/check_real.c:345 plugins/check_smtp.c:569 plugins/check_ups.c:527
+#: plugins/check_real.c:345 plugins/check_ups.c:527
 msgid "Critical time must be a positive integer"
 msgstr ""
 
@@ -3908,7 +4192,7 @@ msgstr ""
 msgid "This plugin will attempt to open an RTSP connection with the host."
 msgstr ""
 
-#: plugins/check_real.c:438 plugins/check_smtp.c:827
+#: plugins/check_real.c:438 plugins/check_smtp.c:830
 msgid "Successul connects return STATE_OK, refusals and timeouts return"
 msgstr ""
 
@@ -3979,450 +4263,453 @@ msgstr ""
 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
 msgstr ""
 
-#: plugins/check_smtp.c:312 plugins/check_snmp.c:718
+#: plugins/check_smtp.c:303 plugins/check_snmp.c:806
 #, c-format
 msgid "Could Not Compile Regular Expression"
 msgstr ""
 
-#: plugins/check_smtp.c:321
+#: plugins/check_smtp.c:312
 #, c-format
 msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
 msgstr ""
 
-#: plugins/check_smtp.c:325 plugins/check_snmp.c:449
+#: plugins/check_smtp.c:316 plugins/check_snmp.c:511
 #, c-format
 msgid "Execute Error: %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:339
-#, c-format
+#: plugins/check_smtp.c:330
 msgid "no authuser specified, "
 msgstr ""
 
-#: plugins/check_smtp.c:344
-#, c-format
+#: plugins/check_smtp.c:335
 msgid "no authpass specified, "
 msgstr ""
 
-#: plugins/check_smtp.c:351 plugins/check_smtp.c:373 plugins/check_smtp.c:394
-#: plugins/check_smtp.c:685
+#: plugins/check_smtp.c:342 plugins/check_smtp.c:363 plugins/check_smtp.c:383
+#: plugins/check_smtp.c:688
 #, c-format
 msgid "sent %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:354
-#, c-format
+#: plugins/check_smtp.c:345
 msgid "recv() failed after AUTH LOGIN, "
 msgstr ""
 
-#: plugins/check_smtp.c:359 plugins/check_smtp.c:381 plugins/check_smtp.c:402
-#: plugins/check_smtp.c:696
+#: plugins/check_smtp.c:350 plugins/check_smtp.c:371 plugins/check_smtp.c:391
+#: plugins/check_smtp.c:699
 #, c-format
 msgid "received %s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:363
-#, c-format
+#: plugins/check_smtp.c:354
 msgid "invalid response received after AUTH LOGIN, "
 msgstr ""
 
-#: plugins/check_smtp.c:377
-#, c-format
+#: plugins/check_smtp.c:367
 msgid "recv() failed after sending authuser, "
 msgstr ""
 
-#: plugins/check_smtp.c:385
-#, c-format
+#: plugins/check_smtp.c:375
 msgid "invalid response received after authuser, "
 msgstr ""
 
-#: plugins/check_smtp.c:398
-#, c-format
+#: plugins/check_smtp.c:387
 msgid "recv() failed after sending authpass, "
 msgstr ""
 
-#: plugins/check_smtp.c:406
-#, c-format
+#: plugins/check_smtp.c:395
 msgid "invalid response received after authpass, "
 msgstr ""
 
-#: plugins/check_smtp.c:413
-#, c-format
+#: plugins/check_smtp.c:402
 msgid "only authtype LOGIN is supported, "
 msgstr ""
 
-#: plugins/check_smtp.c:437
+#: plugins/check_smtp.c:426
 #, c-format
 msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n"
 msgstr ""
 
-#: plugins/check_smtp.c:545 plugins/check_smtp.c:557
+#: plugins/check_smtp.c:536 plugins/check_smtp.c:548
 #, c-format
 msgid "Could not realloc() units [%d]\n"
 msgstr ""
 
-#: plugins/check_smtp.c:608
+#: plugins/check_smtp.c:556
+msgid "Critical time must be a positive"
+msgstr ""
+
+#: plugins/check_smtp.c:564
+msgid "Warning time must be a positive"
+msgstr ""
+
+#: plugins/check_smtp.c:611
 msgid "SSL support not available - install OpenSSL and recompile"
 msgstr ""
 
-#: plugins/check_smtp.c:676 plugins/check_smtp.c:681
+#: plugins/check_smtp.c:679 plugins/check_smtp.c:684
 #, c-format
 msgid "Connection closed by server before sending QUIT command\n"
 msgstr ""
 
-#: plugins/check_smtp.c:691
+#: plugins/check_smtp.c:694
 #, c-format
 msgid "recv() failed after QUIT."
 msgstr ""
 
-#: plugins/check_smtp.c:693
+#: plugins/check_smtp.c:696
 #, c-format
 msgid "Connection reset by peer."
 msgstr ""
 
-#: plugins/check_smtp.c:781
+#: plugins/check_smtp.c:784
 msgid "This plugin will attempt to open an SMTP connection with the host."
 msgstr ""
 
-#: plugins/check_smtp.c:795
+#: plugins/check_smtp.c:798
 #, c-format
 msgid "    String to expect in first line of server response (default: '%s')\n"
 msgstr ""
 
-#: plugins/check_smtp.c:797
+#: plugins/check_smtp.c:800
 msgid "SMTP command (may be used repeatedly)"
 msgstr ""
 
-#: plugins/check_smtp.c:799
+#: plugins/check_smtp.c:802
 msgid "Expected response to command (may be used repeatedly)"
 msgstr ""
 
-#: plugins/check_smtp.c:801
+#: plugins/check_smtp.c:804
 msgid "FROM-address to include in MAIL command, required by Exchange 2000"
 msgstr ""
 
-#: plugins/check_smtp.c:803
+#: plugins/check_smtp.c:806
 msgid "FQDN used for HELO"
 msgstr ""
 
-#: plugins/check_smtp.c:806 plugins/check_tcp.c:630
+#: plugins/check_smtp.c:809 plugins/check_tcp.c:665
 msgid "Minimum number of days a certificate has to be valid."
 msgstr ""
 
-#: plugins/check_smtp.c:808
+#: plugins/check_smtp.c:811
 msgid "Use STARTTLS for the connection."
 msgstr ""
 
-#: plugins/check_smtp.c:812
+#: plugins/check_smtp.c:815
 msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
 msgstr ""
 
-#: plugins/check_smtp.c:814
+#: plugins/check_smtp.c:817
 msgid "SMTP AUTH username"
 msgstr ""
 
-#: plugins/check_smtp.c:816
+#: plugins/check_smtp.c:819
 msgid "SMTP AUTH password"
 msgstr ""
 
-#: plugins/check_smtp.c:818
+#: plugins/check_smtp.c:821
 msgid "Ignore failure when sending QUIT command to server"
 msgstr ""
 
-#: plugins/check_smtp.c:828
+#: plugins/check_smtp.c:831
 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful"
 msgstr ""
 
-#: plugins/check_smtp.c:829
+#: plugins/check_smtp.c:832
 msgid "connects, but incorrect reponse messages from the host result in"
 msgstr ""
 
-#: plugins/check_smtp.c:830
+#: plugins/check_smtp.c:833
 msgid "STATE_WARNING return values."
 msgstr ""
 
-#: plugins/check_snmp.c:298
+#: plugins/check_snmp.c:169 plugins/check_snmp.c:582
+msgid "Cannot malloc"
+msgstr ""
+
+#: plugins/check_snmp.c:356
 #, c-format
 msgid "External command error: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:303
+#: plugins/check_snmp.c:361
 #, c-format
 msgid "External command error with no output (return code: %d)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:406
-msgid "No valid data returned"
+#: plugins/check_snmp.c:464
+#, c-format
+msgid "No valid data returned (%s)\n"
 msgstr ""
 
-#: plugins/check_snmp.c:413
+#: plugins/check_snmp.c:475
 msgid "Time duration between plugin calls is invalid"
 msgstr ""
 
-#: plugins/check_snmp.c:509
-msgid "Cannot malloc"
-msgstr ""
-
-#: plugins/check_snmp.c:515
+#: plugins/check_snmp.c:588
 msgid "Cannot asprintf()"
 msgstr ""
 
-#: plugins/check_snmp.c:521
+#: plugins/check_snmp.c:594
 msgid "Cannot realloc()"
 msgstr ""
 
-#: plugins/check_snmp.c:537
+#: plugins/check_snmp.c:610
 msgid "No previous data to calculate rate - assume okay"
 msgstr ""
 
-#: plugins/check_snmp.c:676
+#: plugins/check_snmp.c:751
 msgid "Retries interval must be a positive integer"
 msgstr ""
 
-#: plugins/check_snmp.c:738
+#: plugins/check_snmp.c:831
 #, c-format
 msgid "Could not reallocate labels[%d]"
 msgstr ""
 
-#: plugins/check_snmp.c:750
+#: plugins/check_snmp.c:844
 msgid "Could not reallocate labels\n"
 msgstr ""
 
-#: plugins/check_snmp.c:767
+#: plugins/check_snmp.c:860
 #, c-format
 msgid "Could not reallocate units [%d]\n"
 msgstr ""
 
-#: plugins/check_snmp.c:779
+#: plugins/check_snmp.c:872
 msgid "Could not realloc() units\n"
 msgstr ""
 
-#: plugins/check_snmp.c:796
+#: plugins/check_snmp.c:889
 msgid "Rate multiplier must be a positive integer"
 msgstr ""
 
-#: plugins/check_snmp.c:848
+#: plugins/check_snmp.c:947
 msgid "No host specified\n"
 msgstr ""
 
-#: plugins/check_snmp.c:852
+#: plugins/check_snmp.c:951
 msgid "No OIDs specified\n"
 msgstr ""
 
-#: plugins/check_snmp.c:874
+#: plugins/check_snmp.c:973
 msgid "Invalid seclevel"
 msgstr ""
 
-#: plugins/check_snmp.c:881 plugins/check_snmp.c:884 plugins/check_snmp.c:902
+#: plugins/check_snmp.c:980 plugins/check_snmp.c:983 plugins/check_snmp.c:1001
 #, c-format
 msgid "Required parameter: %s\n"
 msgstr ""
 
-#: plugins/check_snmp.c:923
+#: plugins/check_snmp.c:1022
 msgid "Invalid SNMP version"
 msgstr ""
 
-#: plugins/check_snmp.c:940
+#: plugins/check_snmp.c:1039
 msgid "Unbalanced quotes\n"
 msgstr ""
 
-#: plugins/check_snmp.c:989
+#: plugins/check_snmp.c:1088
 msgid "Check status of remote machines and obtain system information via SNMP"
 msgstr ""
 
-#: plugins/check_snmp.c:1002
+#: plugins/check_snmp.c:1101
 msgid "Use SNMP GETNEXT instead of SNMP GET"
 msgstr ""
 
-#: plugins/check_snmp.c:1004
+#: plugins/check_snmp.c:1103
 msgid "SNMP protocol version"
 msgstr ""
 
-#: plugins/check_snmp.c:1006
+#: plugins/check_snmp.c:1105
 msgid "SNMPv3 securityLevel"
 msgstr ""
 
-#: plugins/check_snmp.c:1008
+#: plugins/check_snmp.c:1107
 msgid "SNMPv3 auth proto"
 msgstr ""
 
-#: plugins/check_snmp.c:1010
+#: plugins/check_snmp.c:1109
 msgid "SNMPv3 priv proto (default DES)"
 msgstr ""
 
-#: plugins/check_snmp.c:1014
+#: plugins/check_snmp.c:1113
 msgid "Optional community string for SNMP communication"
 msgstr ""
 
-#: plugins/check_snmp.c:1015
+#: plugins/check_snmp.c:1114
 msgid "default is"
 msgstr ""
 
-#: plugins/check_snmp.c:1017
+#: plugins/check_snmp.c:1116
 msgid "SNMPv3 username"
 msgstr ""
 
-#: plugins/check_snmp.c:1019
+#: plugins/check_snmp.c:1118
 msgid "SNMPv3 authentication password"
 msgstr ""
 
-#: plugins/check_snmp.c:1021
+#: plugins/check_snmp.c:1120
 msgid "SNMPv3 privacy password"
 msgstr ""
 
-#: plugins/check_snmp.c:1025
+#: plugins/check_snmp.c:1124
 msgid "Object identifier(s) or SNMP variables whose value you wish to query"
 msgstr ""
 
-#: plugins/check_snmp.c:1027
+#: plugins/check_snmp.c:1126
 msgid ""
 "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
 msgstr ""
 
-#: plugins/check_snmp.c:1028
+#: plugins/check_snmp.c:1127
 msgid "for symbolic OIDs.)"
 msgstr ""
 
-#: plugins/check_snmp.c:1030
+#: plugins/check_snmp.c:1129
 msgid "Delimiter to use when parsing returned data. Default is"
 msgstr ""
 
-#: plugins/check_snmp.c:1031
+#: plugins/check_snmp.c:1130
 msgid "Any data on the right hand side of the delimiter is considered"
 msgstr ""
 
-#: plugins/check_snmp.c:1032
+#: plugins/check_snmp.c:1131
 msgid "to be the data that should be used in the evaluation."
 msgstr ""
 
-#: plugins/check_snmp.c:1036
+#: plugins/check_snmp.c:1135
 msgid "Warning threshold range(s)"
 msgstr ""
 
-#: plugins/check_snmp.c:1038
+#: plugins/check_snmp.c:1137
 msgid "Critical threshold range(s)"
 msgstr ""
 
-#: plugins/check_snmp.c:1040
+#: plugins/check_snmp.c:1139
 msgid "Enable rate calculation. See 'Rate Calculation' below"
 msgstr ""
 
-#: plugins/check_snmp.c:1042
+#: plugins/check_snmp.c:1141
 msgid ""
 "Converts rate per second. For example, set to 60 to convert to per minute"
 msgstr ""
 
-#: plugins/check_snmp.c:1046
+#: plugins/check_snmp.c:1143
+msgid "Add/substract the specified OFFSET to numeric sensor data"
+msgstr ""
+
+#: plugins/check_snmp.c:1147
 msgid "Return OK state (for that OID) if STRING is an exact match"
 msgstr ""
 
-#: plugins/check_snmp.c:1048
+#: plugins/check_snmp.c:1149
 msgid ""
 "Return OK state (for that OID) if extended regular expression REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:1050
+#: plugins/check_snmp.c:1151
 msgid ""
 "Return OK state (for that OID) if case-insensitive extended REGEX matches"
 msgstr ""
 
-#: plugins/check_snmp.c:1052
+#: plugins/check_snmp.c:1153
 msgid "Invert search result (CRITICAL if found)"
 msgstr ""
 
-#: plugins/check_snmp.c:1056
+#: plugins/check_snmp.c:1157
 msgid "Prefix label for output from plugin"
 msgstr ""
 
-#: plugins/check_snmp.c:1058
+#: plugins/check_snmp.c:1159
 msgid "Units label(s) for output data (e.g., 'sec.')."
 msgstr ""
 
-#: plugins/check_snmp.c:1060
+#: plugins/check_snmp.c:1161
 msgid "Separates output on multiple OID requests"
 msgstr ""
 
-#: plugins/check_snmp.c:1064
+#: plugins/check_snmp.c:1165
 msgid "Number of retries to be used in the requests"
 msgstr ""
 
-#: plugins/check_snmp.c:1069
+#: plugins/check_snmp.c:1168
+msgid "Label performance data with OIDs instead of --label's"
+msgstr ""
+
+#: plugins/check_snmp.c:1173
 msgid ""
 "This plugin uses the 'snmpget' command included with the NET-SNMP package."
 msgstr ""
 
-#: plugins/check_snmp.c:1070
+#: plugins/check_snmp.c:1174
 msgid ""
 "if you don't have the package installed, you will need to download it from"
 msgstr ""
 
-#: plugins/check_snmp.c:1071
+#: plugins/check_snmp.c:1175
 msgid "http://net-snmp.sourceforge.net before you can use this plugin."
 msgstr ""
 
-#: plugins/check_snmp.c:1075
+#: plugins/check_snmp.c:1179
 msgid ""
-"- Multiple OIDs may be indicated by a comma or space-delimited list (lists "
-"with"
+"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited  "
 msgstr ""
 
-#: plugins/check_snmp.c:1076
-msgid "internal spaces must be quoted). Maximum:"
+#: plugins/check_snmp.c:1180
+msgid "list (lists with internal spaces must be quoted)."
 msgstr ""
 
-#: plugins/check_snmp.c:1076
-msgid "OIDs."
-msgstr ""
-
-#: plugins/check_snmp.c:1080
+#: plugins/check_snmp.c:1184
 msgid ""
 "- When checking multiple OIDs, separate ranges by commas like '-w "
 "1:10,1:,:20'"
 msgstr ""
 
-#: plugins/check_snmp.c:1081
+#: plugins/check_snmp.c:1185
 msgid "- Note that only one string and one regex may be checked at present"
 msgstr ""
 
-#: plugins/check_snmp.c:1082
+#: plugins/check_snmp.c:1186
 msgid ""
 "- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
 msgstr ""
 
-#: plugins/check_snmp.c:1083
+#: plugins/check_snmp.c:1187
 msgid "returned from the SNMP query is an unsigned integer."
 msgstr ""
 
-#: plugins/check_snmp.c:1086
+#: plugins/check_snmp.c:1190
 msgid "Rate Calculation:"
 msgstr ""
 
-#: plugins/check_snmp.c:1087
+#: plugins/check_snmp.c:1191
 msgid "In many places, SNMP returns counters that are only meaningful when"
 msgstr ""
 
-#: plugins/check_snmp.c:1088
+#: plugins/check_snmp.c:1192
 msgid "calculating the counter difference since the last check. check_snmp"
 msgstr ""
 
-#: plugins/check_snmp.c:1089
+#: plugins/check_snmp.c:1193
 msgid "saves the last state information in a file so that the rate per second"
 msgstr ""
 
-#: plugins/check_snmp.c:1090
+#: plugins/check_snmp.c:1194
 msgid "can be calculated. Use the --rate option to save state information."
 msgstr ""
 
-#: plugins/check_snmp.c:1091
+#: plugins/check_snmp.c:1195
 msgid ""
 "On the first run, there will be no prior state - this will return with OK."
 msgstr ""
 
-#: plugins/check_snmp.c:1092
+#: plugins/check_snmp.c:1196
 msgid "The state is uniquely determined by the arguments to the plugin, so"
 msgstr ""
 
-#: plugins/check_snmp.c:1093
+#: plugins/check_snmp.c:1197
 msgid "changing the arguments will create a new state file."
 msgstr ""
 
@@ -4541,101 +4828,105 @@ msgstr ""
 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."
 msgstr ""
 
-#: plugins/check_tcp.c:197
+#: plugins/check_tcp.c:206
 msgid "CRITICAL - Generic check_tcp called with unknown service\n"
 msgstr ""
 
-#: plugins/check_tcp.c:221
+#: plugins/check_tcp.c:230
 msgid "With UDP checks, a send/expect string must be specified."
 msgstr ""
 
-#: plugins/check_tcp.c:415
+#: plugins/check_tcp.c:431
 msgid "No arguments found"
 msgstr ""
 
-#: plugins/check_tcp.c:516
+#: plugins/check_tcp.c:534
 msgid "Maxbytes must be a positive integer"
 msgstr ""
 
-#: plugins/check_tcp.c:534
+#: plugins/check_tcp.c:552
 msgid "Refuse must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:544
+#: plugins/check_tcp.c:562
 msgid "Mismatch must be one of ok, warn, crit"
 msgstr ""
 
-#: plugins/check_tcp.c:550
+#: plugins/check_tcp.c:568
 msgid "Delay must be a positive integer"
 msgstr ""
 
-#: plugins/check_tcp.c:578
+#: plugins/check_tcp.c:613
 msgid "You must provide a server address"
 msgstr ""
 
-#: plugins/check_tcp.c:580
+#: plugins/check_tcp.c:615
 msgid "Invalid hostname, address or socket"
 msgstr ""
 
-#: plugins/check_tcp.c:594
+#: plugins/check_tcp.c:629
 #, c-format
 msgid ""
 "This plugin tests %s connections with the specified host (or unix socket).\n"
 "\n"
 msgstr ""
 
-#: plugins/check_tcp.c:607
+#: plugins/check_tcp.c:642
 msgid ""
 "Can use \\n, \\r, \\t or \\ in send or quit string. Must come before send or "
 "quit option"
 msgstr ""
 
-#: plugins/check_tcp.c:608
+#: plugins/check_tcp.c:643
 msgid "Default: nothing added to send, \\r\\n added to end of quit"
 msgstr ""
 
-#: plugins/check_tcp.c:610
+#: plugins/check_tcp.c:645
 msgid "String to send to the server"
 msgstr ""
 
-#: plugins/check_tcp.c:612
+#: plugins/check_tcp.c:647
 msgid "String to expect in server response"
 msgstr ""
 
-#: plugins/check_tcp.c:612
+#: plugins/check_tcp.c:647
 msgid "(may be repeated)"
 msgstr ""
 
-#: plugins/check_tcp.c:614
+#: plugins/check_tcp.c:649
 msgid "All expect strings need to occur in server response. Default is any"
 msgstr ""
 
-#: plugins/check_tcp.c:616
+#: plugins/check_tcp.c:651
 msgid "String to send server to initiate a clean close of the connection"
 msgstr ""
 
-#: plugins/check_tcp.c:618
+#: plugins/check_tcp.c:653
 msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
 msgstr ""
 
-#: plugins/check_tcp.c:620
+#: plugins/check_tcp.c:655
 msgid ""
 "Accept expected string mismatches with states ok, warn, crit (default: warn)"
 msgstr ""
 
-#: plugins/check_tcp.c:622
+#: plugins/check_tcp.c:657
 msgid "Hide output from TCP socket"
 msgstr ""
 
-#: plugins/check_tcp.c:624
+#: plugins/check_tcp.c:659
 msgid "Close connection once more than this number of bytes are received"
 msgstr ""
 
-#: plugins/check_tcp.c:626
+#: plugins/check_tcp.c:661
 msgid "Seconds to wait between sending string and polling for response"
 msgstr ""
 
-#: plugins/check_tcp.c:632
+#: plugins/check_tcp.c:666
+msgid "1st is #days for warning, 2nd is critical (if not specified - 0)."
+msgstr ""
+
+#: plugins/check_tcp.c:668
 msgid "Use SSL for the connection."
 msgstr ""
 
@@ -4697,7 +4988,6 @@ msgid "Response time (sec.) necessary to result in critical status"
 msgstr ""
 
 #: plugins/check_ups.c:144
-#, c-format
 msgid "On Battery, Low Battery"
 msgstr ""
 
@@ -4750,7 +5040,6 @@ msgid ", Unknown"
 msgstr ""
 
 #: plugins/check_ups.c:324
-#, c-format
 msgid "UPS does not support any available options\n"
 msgstr ""
 
@@ -4865,281 +5154,281 @@ msgstr ""
 msgid "http://www.networkupstools.org"
 msgstr ""
 
-#: plugins/check_users.c:92
+#: plugins/check_users.c:110
 #, c-format
 msgid "# users=%d"
 msgstr ""
 
-#: plugins/check_users.c:115
+#: plugins/check_users.c:133
 msgid "Unable to read output"
 msgstr ""
 
-#: plugins/check_users.c:122
+#: plugins/check_users.c:140
 #, c-format
 msgid "USERS %s - %d users currently logged in |%s\n"
 msgstr ""
 
-#: plugins/check_users.c:207
+#: plugins/check_users.c:219
 msgid "This plugin checks the number of users currently logged in on the local"
 msgstr ""
 
-#: plugins/check_users.c:208
+#: plugins/check_users.c:220
 msgid ""
 "system and generates an error if the number exceeds the thresholds specified."
 msgstr ""
 
-#: plugins/check_users.c:218
+#: plugins/check_users.c:230
 msgid "Set WARNING status if more than INTEGER users are logged in"
 msgstr ""
 
-#: plugins/check_users.c:220
+#: plugins/check_users.c:232
 msgid "Set CRITICAL status if more than INTEGER users are logged in"
 msgstr ""
 
-#: plugins/check_ide_smart.c:229
+#: plugins/check_ide_smart.c:256
 #, c-format
 msgid "CRITICAL - Couldn't open device %s: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:234
+#: plugins/check_ide_smart.c:261
 #, c-format
 msgid "CRITICAL - SMART_CMD_ENABLE\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:295
+#: plugins/check_ide_smart.c:323 plugins/check_ide_smart.c:350
 #, c-format
 msgid "CRITICAL - SMART_READ_VALUES: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:364
+#: plugins/check_ide_smart.c:421
 #, c-format
 msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:372
+#: plugins/check_ide_smart.c:429
 #, c-format
 msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:380
+#: plugins/check_ide_smart.c:437
 #, c-format
 msgid "OK - Operational (%d/%d tests passed)\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:384
+#: plugins/check_ide_smart.c:441
 #, c-format
 msgid "ERROR - Status '%d' unkown. %d/%d tests passed\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:417
+#: plugins/check_ide_smart.c:474
 #, c-format
 msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:423
+#: plugins/check_ide_smart.c:480
 #, c-format
 msgid "OffLineCapability=%d {%s %s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:429
+#: plugins/check_ide_smart.c:486
 #, c-format
 msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:450
+#: plugins/check_ide_smart.c:508 plugins/check_ide_smart.c:532
 #, c-format
 msgid "CRITICAL - %s: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:469
+#: plugins/check_ide_smart.c:553 plugins/check_ide_smart.c:580
 #, c-format
 msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
 msgstr ""
 
-#: plugins/check_ide_smart.c:486
+#: plugins/check_ide_smart.c:599
 #, c-format
 msgid ""
 "This plugin checks a local hard drive with the (Linux specific) SMART "
 "interface [http://smartlinux.sourceforge.net/smart/index.php]."
 msgstr ""
 
-#: plugins/check_ide_smart.c:496
+#: plugins/check_ide_smart.c:609
 msgid "Select device DEVICE"
 msgstr ""
 
-#: plugins/check_ide_smart.c:497
+#: plugins/check_ide_smart.c:610
 msgid ""
 "Note: if the device is selected with this option, _no_ other options are "
 "accepted"
 msgstr ""
 
-#: plugins/check_ide_smart.c:499
+#: plugins/check_ide_smart.c:612
 msgid "Perform immediately offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:501
+#: plugins/check_ide_smart.c:614
 msgid "Returns the number of failed tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:503
+#: plugins/check_ide_smart.c:616
 msgid "Turn on automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:505
+#: plugins/check_ide_smart.c:618
 msgid "Turn off automatic offline tests"
 msgstr ""
 
-#: plugins/check_ide_smart.c:507
-msgid "Output suitable for Nagios"
+#: plugins/check_ide_smart.c:620
+msgid "Output suitable for the monitoring system"
 msgstr ""
 
-#: plugins/negate.c:96
+#: plugins/negate.c:99
 msgid "No data returned from command\n"
 msgstr ""
 
-#: plugins/negate.c:167
+#: plugins/negate.c:170
 msgid ""
 "Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
 "or integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:171
+#: plugins/negate.c:174
 msgid ""
-"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-"
-"3)."
+"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer "
+"(0-3)."
 msgstr ""
 
-#: plugins/negate.c:177
+#: plugins/negate.c:180
 msgid ""
 "Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:182
+#: plugins/negate.c:185
 msgid ""
 "Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:187
+#: plugins/negate.c:190
 msgid ""
 "Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
 "integer (0-3)."
 msgstr ""
 
-#: plugins/negate.c:214
+#: plugins/negate.c:217
 msgid "Require path to command"
 msgstr ""
 
-#: plugins/negate.c:243
+#: plugins/negate.c:246
 msgid ""
 "Negates the status of a plugin (returns OK for CRITICAL and vice-versa)."
 msgstr ""
 
-#: plugins/negate.c:244
+#: plugins/negate.c:247
 msgid "Additional switches can be used to control which state becomes what."
 msgstr ""
 
-#: plugins/negate.c:253
+#: plugins/negate.c:256
 msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status."
 msgstr ""
 
-#: plugins/negate.c:255
+#: plugins/negate.c:258
 msgid "Custom result on Negate timeouts; see below for STATUS definition\n"
 msgstr ""
 
-#: plugins/negate.c:261
+#: plugins/negate.c:264
 #, c-format
 msgid ""
 "    STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n"
 msgstr ""
 
-#: plugins/negate.c:262
+#: plugins/negate.c:265
 #, c-format
 msgid ""
 "    quotes. Numeric values are accepted. If nothing is specified, permutes\n"
 msgstr ""
 
-#: plugins/negate.c:263
+#: plugins/negate.c:266
 #, c-format
 msgid "    OK and CRITICAL.\n"
 msgstr ""
 
-#: plugins/negate.c:265
+#: plugins/negate.c:268
 #, c-format
 msgid ""
 "    Substitute output text as well. Will only substitute text in CAPITALS\n"
 msgstr ""
 
-#: plugins/negate.c:270
+#: plugins/negate.c:273
 msgid "Run check_ping and invert result. Must use full path to plugin"
 msgstr ""
 
-#: plugins/negate.c:272
+#: plugins/negate.c:275
 msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"
 msgstr ""
 
-#: plugins/negate.c:275
+#: plugins/negate.c:278
 msgid ""
 "This plugin is a wrapper to take the output of another plugin and invert it."
 msgstr ""
 
-#: plugins/negate.c:276
+#: plugins/negate.c:279
 msgid "The full path of the plugin must be provided."
 msgstr ""
 
-#: plugins/negate.c:277
+#: plugins/negate.c:280
 msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL."
 msgstr ""
 
-#: plugins/negate.c:278
+#: plugins/negate.c:281
 msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK."
 msgstr ""
 
-#: plugins/negate.c:279
+#: plugins/negate.c:282
 msgid "Otherwise, the output state of the wrapped plugin is unchanged."
 msgstr ""
 
-#: plugins/negate.c:281
+#: plugins/negate.c:284
 msgid ""
 "Using timeout-result, it is possible to override the timeout behaviour or a"
 msgstr ""
 
-#: plugins/negate.c:282
+#: plugins/negate.c:285
 msgid "plugin by setting the negate timeout a bit lower."
 msgstr ""
 
-#: plugins/netutils.c:48
+#: plugins/netutils.c:49
 #, c-format
 msgid "%s - Socket timeout after %d seconds\n"
 msgstr ""
 
-#: plugins/netutils.c:50
+#: plugins/netutils.c:51
 #, c-format
 msgid "%s - Abnormal timeout after %d seconds\n"
 msgstr ""
 
-#: plugins/netutils.c:78 plugins/netutils.c:280
+#: plugins/netutils.c:79 plugins/netutils.c:281
 msgid "Send failed"
 msgstr ""
 
-#: plugins/netutils.c:95 plugins/netutils.c:295
+#: plugins/netutils.c:96 plugins/netutils.c:296
 msgid "No data was received from host!"
 msgstr ""
 
-#: plugins/netutils.c:203 plugins/netutils.c:239
+#: plugins/netutils.c:204 plugins/netutils.c:240
 msgid "Socket creation failed"
 msgstr ""
 
-#: plugins/netutils.c:232
+#: plugins/netutils.c:233
 msgid "Supplied path too long unix domain socket"
 msgstr ""
 
-#: plugins/netutils.c:304
+#: plugins/netutils.c:305
 msgid "Receive failed"
 msgstr ""
 
-#: plugins/netutils.c:330 plugins-root/check_dhcp.c:1341
+#: plugins/netutils.c:331 plugins-root/check_dhcp.c:1342
 #, c-format
 msgid "Invalid hostname/address - %s"
 msgstr ""
@@ -5177,18 +5466,19 @@ msgid ""
 msgstr ""
 
 #: plugins/urlize.c:169
-msgid "This plugin wraps the text output of another command (plugin)"
+msgid ""
+"This plugin wraps the text output of another command (plugin) in HTML <A>"
 msgstr ""
 
 #: plugins/urlize.c:170
 msgid ""
-"in HTML <A> tags, thus displaying the child plugin's output as a clickable "
-"link in"
+"tags, thus displaying the child plugin's output as a clickable link in "
+"compatible"
 msgstr ""
 
 #: plugins/urlize.c:171
 msgid ""
-"the Nagios status screen.  This plugin returns the status of the invoked "
+"monitoring status screen. This plugin returns the status of the invoked "
 "plugin."
 msgstr ""
 
@@ -5221,27 +5511,31 @@ msgstr ""
 msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\""
 msgstr ""
 
-#: plugins/utils.c:171
+#: plugins/utils.c:174
 #, c-format
 msgid "%s - Plugin timed out after %d seconds\n"
 msgstr ""
 
-#: plugins/utils.c:466
+#: plugins/utils.c:469
 msgid "failed realloc in strpcpy\n"
 msgstr ""
 
-#: plugins/utils.c:508
+#: plugins/utils.c:511
 msgid "failed malloc in strscat\n"
 msgstr ""
 
-#: plugins/utils.h:140
+#: plugins/utils.c:531
+msgid "failed malloc in xvasprintf\n"
+msgstr ""
+
+#: plugins/utils.h:137
 #, c-format
 msgid ""
 "       %s (-h | --help) for detailed help\n"
 "       %s (-V | --version) for version information\n"
 msgstr ""
 
-#: plugins/utils.h:144
+#: plugins/utils.h:141
 msgid ""
 "\n"
 "Options:\n"
@@ -5251,7 +5545,7 @@ msgid ""
 "    Print version information\n"
 msgstr ""
 
-#: plugins/utils.h:151
+#: plugins/utils.h:148
 #, c-format
 msgid ""
 " -H, --hostname=ADDRESS\n"
@@ -5260,7 +5554,7 @@ msgid ""
 "    Port number (default: %s)\n"
 msgstr ""
 
-#: plugins/utils.h:157
+#: plugins/utils.h:154
 msgid ""
 " -4, --use-ipv4\n"
 "    Use IPv4 connection\n"
@@ -5268,13 +5562,14 @@ msgid ""
 "    Use IPv6 connection\n"
 msgstr ""
 
-#: plugins/utils.h:163
+#: plugins/utils.h:160
 msgid ""
 " -v, --verbose\n"
-"    Show details for command-line debugging (Nagios may truncate output)\n"
+"    Show details for command-line debugging (output may be truncated by\n"
+"\t\tthe monitoring system)\n"
 msgstr ""
 
-#: plugins/utils.h:167
+#: plugins/utils.h:165
 msgid ""
 " -w, --warning=DOUBLE\n"
 "    Response time to result in warning status (seconds)\n"
@@ -5282,7 +5577,7 @@ msgid ""
 "    Response time to result in critical status (seconds)\n"
 msgstr ""
 
-#: plugins/utils.h:173
+#: plugins/utils.h:171
 msgid ""
 " -w, --warning=RANGE\n"
 "    Warning range (format: start:end). Alert if outside this range\n"
@@ -5290,41 +5585,42 @@ msgid ""
 "    Critical range\n"
 msgstr ""
 
-#: plugins/utils.h:179
+#: plugins/utils.h:177
 #, c-format
 msgid ""
 " -t, --timeout=INTEGER\n"
 "    Seconds before connection times out (default: %d)\n"
 msgstr ""
 
-#: plugins/utils.h:184
+#: plugins/utils.h:182
 msgid ""
 " --extra-opts=[section][@file]\n"
-"    Read options from an ini file. See http://nagiosplugins.org/extra-opts\n"
+"    Read options from an ini file. See\n"
+"    https://www.monitoring-plugins.org/doc/extra-opts.html\n"
 "    for usage and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:192
+#: plugins/utils.h:190
 msgid ""
 " See:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
-"html#THRESHOLDFORMAT\n"
+" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
 
-#: plugins/utils.h:197
+#: plugins/utils.h:195
 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"
+"Send email to help@monitoring-plugins.org if you have questions regarding\n"
+"use of this software. To submit patches or suggest improvements, send email\n"
+"to devel@monitoring-plugins.org\n"
 "\n"
 msgstr ""
 
-#: plugins/utils.h:202
+#: plugins/utils.h:200
 msgid ""
 "\n"
-"The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n"
+"The Monitoring 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 ""
@@ -5355,52 +5651,52 @@ msgstr ""
 msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:383
+#: plugins-root/check_dhcp.c:388
 #, c-format
 msgid ""
 "Error: can't find unit number in interface_name (%s) - expecting TypeNumber "
 "eg lnc0.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:388 plugins-root/check_dhcp.c:400
+#: plugins-root/check_dhcp.c:393 plugins-root/check_dhcp.c:405
 #, c-format
 msgid ""
 "Error: can't read MAC address from DLPI streams interface for device %s unit "
 "%d.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:406
+#: plugins-root/check_dhcp.c:411
 #, c-format
 msgid ""
 "Error: can't get MAC address for this architecture.  Use the --mac option.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:425
+#: plugins-root/check_dhcp.c:430
 #, c-format
 msgid "Error: Cannot determine IP address of interface %s\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:433
+#: plugins-root/check_dhcp.c:438
 #, c-format
 msgid "Error: Cannot get interface IP address on this platform.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:438
+#: plugins-root/check_dhcp.c:443
 #, c-format
 msgid "Pretending to be relay client %s\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:523
+#: plugins-root/check_dhcp.c:528
 #, c-format
 msgid "DHCPDISCOVER to %s port %d\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:575
+#: plugins-root/check_dhcp.c:580
 #, c-format
 msgid "Result=ERROR\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:581
+#: plugins-root/check_dhcp.c:586
 #, c-format
 msgid "Result=OK\n"
 msgstr ""
@@ -5493,234 +5789,234 @@ msgstr ""
 msgid "Requested server address: %s\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:881
+#: plugins-root/check_dhcp.c:882
 #, c-format
 msgid "Lease Time: Infinite\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:883
+#: plugins-root/check_dhcp.c:884
 #, c-format
 msgid "Lease Time: %lu seconds\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:885
+#: plugins-root/check_dhcp.c:886
 #, c-format
 msgid "Renewal Time: Infinite\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:887
+#: plugins-root/check_dhcp.c:888
 #, c-format
 msgid "Renewal Time: %lu seconds\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:889
+#: plugins-root/check_dhcp.c:890
 #, c-format
 msgid "Rebinding Time: Infinite\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:890
+#: plugins-root/check_dhcp.c:891
 #, c-format
 msgid "Rebinding Time: %lu seconds\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:918
+#: plugins-root/check_dhcp.c:919
 #, c-format
 msgid "Added offer from server @ %s"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:919
+#: plugins-root/check_dhcp.c:920
 #, c-format
 msgid " of IP address %s\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:986
+#: plugins-root/check_dhcp.c:987
 #, c-format
 msgid "DHCP Server Match: Offerer=%s"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:987
+#: plugins-root/check_dhcp.c:988
 #, c-format
 msgid " Requested=%s"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:989
+#: plugins-root/check_dhcp.c:990
 #, c-format
 msgid " (duplicate)"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:990
+#: plugins-root/check_dhcp.c:991
 #, c-format
 msgid "\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1038
+#: plugins-root/check_dhcp.c:1039
 #, c-format
 msgid "No DHCPOFFERs were received.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1042
+#: plugins-root/check_dhcp.c:1043
 #, c-format
 msgid "Received %d DHCPOFFER(s)"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1045
+#: plugins-root/check_dhcp.c:1046
 #, c-format
 msgid ", %s%d of %d requested servers responded"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1048
+#: plugins-root/check_dhcp.c:1049
 #, c-format
 msgid ", requested address (%s) was %soffered"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1048
+#: plugins-root/check_dhcp.c:1049
 msgid "not "
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1050
+#: plugins-root/check_dhcp.c:1051
 #, c-format
 msgid ", max lease time = "
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1052
+#: plugins-root/check_dhcp.c:1053
 #, c-format
 msgid "Infinity"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1233
+#: plugins-root/check_dhcp.c:1234
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1245
+#: plugins-root/check_dhcp.c:1246
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1258
+#: plugins-root/check_dhcp.c:1259
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1270
+#: plugins-root/check_dhcp.c:1271
 #, c-format
 msgid ""
 "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1294
+#: plugins-root/check_dhcp.c:1295
 #, c-format
 msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1373
+#: plugins-root/check_dhcp.c:1374
 #, c-format
 msgid "Hardware address: "
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1389
+#: plugins-root/check_dhcp.c:1390
 msgid "This plugin tests the availability of DHCP servers on a network."
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1401
+#: plugins-root/check_dhcp.c:1402
 msgid "IP address of DHCP server that we must hear from"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1403
+#: plugins-root/check_dhcp.c:1404
 msgid "IP address that should be offered by at least one DHCP server"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1405
+#: plugins-root/check_dhcp.c:1406
 msgid "Seconds to wait for DHCPOFFER before timeout occurs"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1407
+#: plugins-root/check_dhcp.c:1408
 msgid "Interface to to use for listening (i.e. eth0)"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1409
+#: plugins-root/check_dhcp.c:1410
 msgid "MAC address to use in the DHCP request"
 msgstr ""
 
-#: plugins-root/check_dhcp.c:1411
+#: plugins-root/check_dhcp.c:1412
 msgid "Unicast testing: mimic a DHCP relay, requires -s"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1288
+#: plugins-root/check_icmp.c:1295
 msgid "specify a target"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1290
+#: plugins-root/check_icmp.c:1297
 msgid "warning threshold (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1293
+#: plugins-root/check_icmp.c:1300
 msgid "critical threshold (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1296
+#: plugins-root/check_icmp.c:1303
 msgid "specify a source IP address or device name"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1298
+#: plugins-root/check_icmp.c:1305
 msgid "number of packets to send (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1301
+#: plugins-root/check_icmp.c:1308
 msgid "max packet interval (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1304
+#: plugins-root/check_icmp.c:1311
 msgid "max target interval (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1307
+#: plugins-root/check_icmp.c:1314
 msgid "number of alive hosts required for success"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1310
+#: plugins-root/check_icmp.c:1317
 msgid "TTL on outgoing packets (currently "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1313
+#: plugins-root/check_icmp.c:1320
 msgid "timeout value (seconds, currently  "
 msgstr ""
 
-#: plugins-root/check_icmp.c:1316
+#: plugins-root/check_icmp.c:1323
 msgid "Number of icmp data bytes to send"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1317
+#: plugins-root/check_icmp.c:1324
 msgid "Packet size will be data bytes + icmp header (currently"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1319
+#: plugins-root/check_icmp.c:1326
 msgid "verbose"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1323
+#: plugins-root/check_icmp.c:1330
 msgid "The -H switch is optional. Naming a host (or several) to check is not."
 msgstr ""
 
-#: plugins-root/check_icmp.c:1325
+#: plugins-root/check_icmp.c:1332
 msgid ""
 "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1326
+#: plugins-root/check_icmp.c:1333
 msgid "packet loss.  The default values should work well for most users."
 msgstr ""
 
-#: plugins-root/check_icmp.c:1327
+#: plugins-root/check_icmp.c:1334
 msgid ""
 "You can specify different RTA factors using the standardized abbreviations"
 msgstr ""
 
-#: plugins-root/check_icmp.c:1328
+#: plugins-root/check_icmp.c:1335
 msgid ""
 "us (microseconds), ms (milliseconds, default) or just plain s for seconds."
 msgstr ""
 
-#: plugins-root/check_icmp.c:1334
+#: plugins-root/check_icmp.c:1341
 msgid "The -v switch can be specified several times for increased verbosity."
 msgstr ""
diff --git a/test.pl.in b/test.pl.in
index 85ac19da..01a97ec0 100755
--- a/test.pl.in
+++ b/test.pl.in
@@ -9,9 +9,9 @@ use Getopt::Long;
 
 use NPTest qw(DetermineTestHarnessDirectory TestsFrom);
 
-my $tstdir;
+my @tstdir;
 
-if ( ! GetOptions( "testdir:s" => \$tstdir ) )
+if ( ! GetOptions( "testdir:s" => \@tstdir ) )
 {
   print "Usage: ${0} [--testdir=<directory>] [<test_harness.t> ...]\n";
   exit 1;
@@ -25,15 +25,18 @@ if ( scalar( @ARGV ) )
 }
 else
 {
-  my $directory = DetermineTestHarnessDirectory( $tstdir );
+  my @directory = DetermineTestHarnessDirectory( @tstdir );
 
-  if ( !defined( $directory ) )
+  if ( @directory == 0 )
   {
     print STDERR "$0: Unable to determine the test harness directory - ABORTING\n";
     exit 2;
   }
 
-  @tests = TestsFrom( $directory, 1 );
+  for my $d ( @directory )
+  {
+    push (@tests, TestsFrom( $d, 1 ));
+  }
 }
 
 if ( ! scalar( @tests ) )
diff --git a/tools/distclean b/tools/distclean
index f4ec20bd..961cc801 100755
--- a/tools/distclean
+++ b/tools/distclean
@@ -6,7 +6,7 @@
 # Please run this script from the top-level directory.
 
 if [ ! -f tools/distclean ]; then
-  echo "Please run this script from the top-level directory of Nagios-plugins."
+  echo "Please run this script from the top-level directory of Monitoring Plugins."
   exit 1
 fi
 
diff --git a/tools/generate-change-log b/tools/generate-change-log
index 03321fd8..3a6b38e7 100755
--- a/tools/generate-change-log
+++ b/tools/generate-change-log
@@ -1,10 +1,10 @@
 #!/usr/bin/env perl
 #
-# Copyright (c) 2013 Nagios Plugins Development Team
+# Copyright (c) 2013 Monitoring Plugins Development Team
 #
 # Originally written by Holger Weiss <holger@zedat.fu-berlin.de>.
 #
-# This file is free software; the Nagios Plugins Development Team gives
+# This file is free software; the Monitoring Plugins Development Team gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 #
diff --git a/tools/git-notify b/tools/git-notify
index 85142965..ff59d39d 100755
--- a/tools/git-notify
+++ b/tools/git-notify
@@ -3,7 +3,7 @@
 # Tool to send git commit notifications
 #
 # Copyright 2005 Alexandre Julliard
-# Copyright 2009 Nagios Plugins Development Team
+# Copyright 2009 Monitoring Plugins Development Team
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
diff --git a/tools/git-post-receive-hook b/tools/git-post-receive-hook
index db9ad9ef..c822a63b 100755
--- a/tools/git-post-receive-hook
+++ b/tools/git-post-receive-hook
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 prefix="${0%/*}/notifications"  # $GIT_DIR/hooks/notifications
-recipient='Nagios Plugin Commits <nagiosplug-checkins@lists.sourceforge.net>'
+recipient='Monitoring Plugins Commits <commits@monitoring-plugins.org>'
 maxcommits=100
 maxdiffsize=$((300 * 1024))
-project='nagiosplug'
-gitweburl='http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug'
+project='monitoring-plugins'
+gitweburl='https://github.com/monitoring-plugins/monitoring-plugins'
 gitnotify="$prefix/git-notify.pl"
 statefile="$prefix/git-notify.dat"
 
diff --git a/tools/tango b/tools/tango
index 7f418d73..2737166e 100755
--- a/tools/tango
+++ b/tools/tango
@@ -14,9 +14,9 @@ my $REVISION = '$Revision$ ';
 $REVISION =~ s/^\$Revision: //;
 $REVISION =~ s/ \$ $//;
 
-my $PACKAGE = 'Nagios Plugins';
+my $PACKAGE = 'Monitoring Plugins';
 my $RELEASE = '1.3';
-my $WARRANTY = "The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n";
+my $WARRANTY = "The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n";
 
 my $version = undef;
 my $help = undef;
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
index 12528d9b..48836b1e 100755
--- a/tools/tinderbox_build
+++ b/tools/tinderbox_build
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # tinderbox_build.pl
-# This script builds the nagiosplugins and then sends
+# This script builds the monitoringplugins and then sends
 # logs back to the master tinderbox server
 #
 # This script is based on mozilla-unix.pl which comes with tinderbox2
@@ -34,7 +34,7 @@ my $ReportStatus = 0;  # Do not send results to server
 my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com';
 
 # These shouldn't really need to be changed
-my $BuildTree = 'nagiosplug';
+my $BuildTree = 'monitoringplug';
 my $BuildName = '';
 my $ConfigureArgs = $ENV{CONFIGURE_ARGS};
 
@@ -81,7 +81,7 @@ sub BuildIt {
         chdir("$StartDir");
 
         my $StartTime = time;
-        if (-e (my $file = "nagios-plugins.spec")) {
+        if (-e (my $file = "monitoring-plugins.spec")) {
                 open F, $file;
                 while (<F>) {
                         if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {