111 files changed, 5359 insertions, 19319 deletions

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..c7f0b5e
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,10 @@
+BasedOnStyle: LLVM
+UseTab: ForContinuationAndIndentation
+IndentWidth: 4
+TabWidth: 4
+AllowShortIfStatementsOnASingleLine: false
+BreakBeforeBraces: Attach
+AlignConsecutiveMacros: true
+ColumnLimit: 180
+IndentPPDirectives: AfterHash
+SortIncludes: Never
diff --git a/.github/mock.sh b/.github/mock.sh
new file mode 100755
index 0000000..7fbe690
--- /dev/null
+++ b/.github/mock.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -x
+
+export DEBIAN_FRONTEND=noninteractive
+
+BASE_PATH="/src"
+
+ls -la ${BASE_PATH}/.github/os_detect.sh
+. ${BASE_PATH}/.github/os_detect.sh
+
+SRCRPM_DIR="/tmp/result-srcrpm"
+RPM_DIR="/tmp/result-rpm"
+SPEC_DIR="${BASE_PATH}/.github/"
+SOURCE_DIR="."
+SPEC_FILE="${SPEC_DIR}monitoring-plugins.spec"
+
+cd ${BASE_PATH}
+
+dnf -y --setopt="tsflags=nodocs" update && \
+  if [ ${distro_id} != "fedora" ]; then dnf -y --setopt="tsflags=nodocs" install epel-release; else platform_id="$(echo ${platform_id} | sed s/^f/fc/)"; fi && \
+  case ${distro_id} in
+    ol)
+      case ${platform_id} in
+        el9)
+          dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/mock/mock-stable/repo/epel-9/group_mock-mock-stable-epel-9.repo
+          ;;
+        el8)
+          dnf config-manager --add-repo https://copr.fedorainfracloud.org/coprs/g/mock/mock-stable/repo/epel-8/group_mock-mock-stable-epel-8.repo
+          ;;
+      esac
+      ;;
+  esac
+  dnf -y --setopt="tsflags=nodocs" install mock rpm-build git-core && \
+  usermod -a -G mock $(whoami)
+SRC_RPM="monitoring-plugins-*-1.${platform_id}.src.rpm"
+if command -v git > /dev/null 2>&1; then
+  git config --global --add safe.directory ${BASE_PATH}
+  SHA="$(git rev-parse HEAD)"
+  sed "s/^%global commit.*/%global commit ${SHA}/" ${SPEC_FILE} > ${SPEC_DIR}monitoring-plugins-git.spec
+  sed -i "s/^%global fromgit.*/%global fromgit 1/" ${SPEC_DIR}monitoring-plugins-git.spec
+  SPEC_FILE="${SPEC_DIR}monitoring-plugins-git.spec"
+  SRC_RPM="monitoring-plugins-*git.$(echo ${SHA:0:7})*.${platform_id}.src.rpm"
+fi
+mkdir -p "${SRCRPM_DIR}" "${RPM_DIR}"
+#rpmbuild --undefine=_disable_source_fetch --define "_sourcedir ${SOURCE_DIR}" -ba ${SPEC_FILE}
+dnf -y --setopt="tsflags=nodocs" install rpmdevtools && spectool -g -C ${SOURCE_DIR} ${SPEC_FILE} && \
+mock --dnf --clean --spec ${SPEC_FILE} --sources=${SOURCE_DIR} --result=${SRCRPM_DIR} --build || { cat ${SRCRPM_DIR}/{root,build}.log; exit 1; }
+mock --dnf --clean --sources=${SOURCE_DIR} --result=${RPM_DIR} --rebuild ${SRCRPM_DIR}/${SRC_RPM} || { cat ${RPM_DIR}/{root,build}.log; exit 1; }
+ls -la ${SOURCE_DIR} ${SRCRPM_DIR} ${RPM_DIR}
diff --git a/.github/monitoring-plugins.spec b/.github/monitoring-plugins.spec
new file mode 100644
index 0000000..5cae3e5
--- /dev/null
+++ b/.github/monitoring-plugins.spec
@@ -0,0 +1,975 @@
+%global upstream_name monitoring-plugins
+%global version 2.3.3
+%global plugindir %{_libdir}/monitoring/plugins
+%global commit 72dd0a308130b9778828d143d1b9d9906218d6ac
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global fromgit 0
+
+%define _unpackaged_files_terminate_build 0
+
+Name:           %{upstream_name}
+Version:        %{version}
+Summary:        Monitoring Plugins from the Monitoring Plugins Team
+
+License:        GPLv3
+URL:            https://www.monitoring-plugins.org
+## When using checkouts from git, use the following
+%if 0%{?fromgit}
+Release:        git.%{?shortcommit}.1%{?dist}
+Source0:        https://github.com/monitoring-plugins/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+%else
+Release:        1%{?dist}
+Source0:        https://www.monitoring-plugins.org/download/monitoring-plugins-%{version}.tar.gz
+%endif
+Conflicts:      nagios-plugins
+
+
+
+
+##### BUILD REQUIREMENTS #####
+# Needed for the git code
+%if 0%{?fromgit}
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  gettext-devel
+%endif
+### General build requirements
+BuildRequires: gcc
+BuildRequires: make
+BuildRequires: automake
+
+### Check Plugin specific build requirements
+# check_by_ssh
+BuildRequires: openssh-clients
+
+# check_curl
+BuildRequires: libcurl-devel >= 7.15.2
+BuildRequires: openssl-devel
+BuildRequires: uriparser-devel >= 0.7.5
+
+# check_dbi
+%if 0%{?rhel} != 9
+BuildRequires: libdbi-devel
+%endif
+
+# check_dig check_dns
+BuildRequires: bind-utils
+
+# check_disk_smb
+%if 0%{?rhel} == 7
+BuildRequires: samba-client
+%endif
+
+# check_fping
+BuildRequires: fping
+
+# check_game
+%if 0%{?rhel} != 8
+BuildRequires: qstat
+%endif
+
+# check_hpjd
+BuildRequires: net-snmp-utils
+
+# check_ldap check_ldaps
+BuildRequires: openldap-devel
+
+# check_load
+BuildRequires: procps-ng
+
+# check_mysql check_mysql_query
+%if 0%{?rhel} == 7
+BuildRequires: mariadb-devel
+%endif
+
+# check_pgsql
+BuildRequires: postgresql-devel
+
+# check_radius
+BuildRequires: radcli-devel
+
+%description
+Common files for Monitoring Plugins
+
+%files
+%{plugindir}/negate
+%{plugindir}/urlize
+%{plugindir}/utils.pm
+%{plugindir}/utils.sh
+%doc ABOUT-NLS
+%doc ACKNOWLEDGEMENTS
+%doc AUTHORS
+%doc CODING
+%doc FAQ
+%doc NEWS
+%doc README
+%doc REQUIREMENTS
+%doc SUPPORT
+%license COPYING
+
+
+
+
+##### ACTUAL BUILD #####
+%prep
+%if 0%{?fromgit}
+%autosetup -n %{upstream_name}-%{commit}
+%else
+%autosetup -n %{upstream_name}-%{version}
+%endif
+
+
+%build
+%if 0%{?fromgit}
+./tools/setup
+%endif
+%configure \
+    --prefix=%{_prefix} \
+    --libexecdir=%{plugindir} \
+    --with-openssl=/usr \
+    --with-ping-command="/usr/bin/ping -4 -n -U -w %d -c %d %s" \
+    --with-ping6-command="/usr/bin/ping -6 -n -U -w %d -c %d %s"
+%make_build
+
+%if 0%{?fromgit}
+make THANKS
+%endif
+
+%install
+%make_install
+%{__make} install-root DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+
+
+
+
+##### SUB PACKAGES #####
+# all
+%package all
+Summary: Monitoring Plugins - All Check Plugins
+Requires: %{name}
+Requires: %{name}-apt
+Requires: %{name}-breeze
+Requires: %{name}-by_ssh
+Requires: %{name}-cluster
+Requires: %{name}-curl
+%if 0%{?rhel} != 9
+Requires: %{name}-dbi
+%endif
+Requires: %{name}-dhcp
+Requires: %{name}-dig
+Requires: %{name}-disk
+%if 0%{?rhel} == 7
+Requires: %{name}-disk_smb
+%endif
+Requires: %{name}-dns
+Requires: %{name}-dummy
+Requires: %{name}-file_age
+Requires: %{name}-flexlm
+Requires: %{name}-fping
+%if 0%{?rhel} != 8
+Requires: %{name}-game
+%endif
+Requires: %{name}-hpjd
+Requires: %{name}-http
+Requires: %{name}-icmp
+Requires: %{name}-ide_smart
+Requires: %{name}-ifoperstatus
+Requires: %{name}-ifstatus
+Requires: %{name}-ircd
+Requires: %{name}-ldap
+Requires: %{name}-load
+Requires: %{name}-log
+Requires: %{name}-mailq
+Requires: %{name}-mrtg
+Requires: %{name}-mrtgtraf
+%if 0%{?rhel} == 7
+Requires: %{name}-mysql
+Requires: %{name}-mysql_query
+%endif
+Requires: %{name}-nagios
+Requires: %{name}-nt
+Requires: %{name}-ntp
+Requires: %{name}-ntp_peer
+Requires: %{name}-ntp_time
+Requires: %{name}-nwstat
+Requires: %{name}-oracle
+Requires: %{name}-overcr
+Requires: %{name}-pgsql
+Requires: %{name}-ping
+Requires: %{name}-procs
+Requires: %{name}-radius
+Requires: %{name}-real
+Requires: %{name}-rpc
+Requires: %{name}-sensors
+Requires: %{name}-smtp
+Requires: %{name}-snmp
+Requires: %{name}-ssh
+Requires: %{name}-swap
+Requires: %{name}-tcp
+Requires: %{name}-time
+Requires: %{name}-ups
+Requires: %{name}-uptime
+Requires: %{name}-users
+Requires: %{name}-wave
+
+%description all
+Meta package that requires all the check plugins of the Monitoring Plugins
+
+%files all
+
+
+
+# check_apt
+%package apt
+Summary: Monitoring Plugins - check_apt
+Requires: %{name} = %{version}-%{release}
+
+%description apt
+Provides check_apt of the Monitoring Plugins.
+
+%files apt
+%{plugindir}/check_apt
+
+
+
+# check_breeze
+%package breeze
+Summary: Monitoring Plugins - check_breeze
+Requires: %{name} = %{version}-%{release}
+
+%description breeze
+Provides check_breeze of the Monitoring Plugins.
+
+%files breeze
+%{plugindir}/check_breeze
+
+
+
+# check_by_ssh
+%package by_ssh
+Summary: Monitoring Plugins - check_by_ssh
+Requires: %{name} = %{version}-%{release}
+
+%description by_ssh
+Provides check_by_ssh of the Monitoring Plugins.
+
+%files by_ssh
+%{plugindir}/check_by_ssh
+
+
+
+# check_cluster
+%package cluster
+Summary: Monitoring Plugins - check_cluster
+Requires: %{name} = %{version}-%{release}
+
+%description cluster
+Provides check_cluster of the Monitoring Plugins.
+
+%files cluster
+%{plugindir}/check_cluster
+
+
+
+# check_curl
+%package curl
+Summary: Monitoring Plugins - check_curl
+Requires: %{name} = %{version}-%{release}
+
+%description curl
+Provides check_curl of the Monitoring Plugins.
+
+%files curl
+%{plugindir}/check_curl
+
+
+
+# check_dbi
+%if 0%{?rhel} != 9
+%package dbi
+Summary: Monitoring Plugins - check_dbi
+Requires: %{name} = %{version}-%{release}
+
+%description dbi
+Provides check_dbi of the Monitoring Plugins.
+
+%files dbi
+%{plugindir}/check_dbi
+%endif
+
+
+
+# check_dhcp
+%package dhcp
+Summary: Monitoring Plugins - check_dhcp
+Requires: %{name} = %{version}-%{release}
+
+%description dhcp
+Provides check_dhcp of the Monitoring Plugins.
+
+%files dhcp
+%{plugindir}/check_dhcp
+
+
+
+# check_dig
+%package dig
+Summary: Monitoring Plugins - check_dig
+Requires: %{name} = %{version}-%{release}
+Requires: bind-utils
+
+%description dig
+Provides check_dig of the Monitoring Plugins.
+
+%files dig
+%{plugindir}/check_dig
+
+
+
+# check_disk
+%package disk
+Summary: Monitoring Plugins - check_disk
+Requires: %{name} = %{version}-%{release}
+
+%description disk
+Provides check_disk of the Monitoring Plugins.
+
+%files disk
+%{plugindir}/check_disk
+
+
+
+# check_disk_smb
+%if 0%{?rhel} == 7
+%package disk_smb
+Summary:  Monitoring Plugins - check_disk_smb
+Requires: %{name} = %{version}-%{release}
+Requires: samba-client
+
+%description disk_smb
+Provides check_disk_smb of the Monitoring Plugins.
+
+%files disk_smb
+%{plugindir}/check_disk_smb
+%endif
+
+
+
+# check_dns
+%package dns
+Summary:  Monitoring Plugins - check_dns
+Requires: %{name} = %{version}-%{release}
+Requires: bind-utils
+
+%description dns
+Provides check_dns of the Monitoring Plugins.
+
+%files dns
+%{plugindir}/check_dns
+
+
+
+# check_dummy
+%package dummy
+Summary:  Monitoring Plugins - check_dummy
+Requires: %{name} = %{version}-%{release}
+
+%description dummy
+Provides check_dummy of the Monitoring Plugins.
+
+%files dummy
+%{plugindir}/check_dummy
+
+
+
+# check_file_age
+%package file_age
+Summary:  Monitoring Plugins - check_file_age
+Requires: %{name} = %{version}-%{release}
+
+%description file_age
+Provides check_file_age of the Monitoring Plugins.
+
+%files file_age
+%{plugindir}/check_file_age
+
+
+
+# check_flexlm
+%package flexlm
+Summary:  Monitoring Plugins - check_flexlm
+Requires: %{name} = %{version}-%{release}
+
+%description flexlm
+Provides check_flexlm of the Monitoring Plugins.
+
+%files flexlm
+%{plugindir}/check_flexlm
+
+
+
+# check_fping
+%package fping
+Summary:  Monitoring Plugins - check_fping
+Requires: %{name} = %{version}-%{release}
+Requires: fping
+
+%description fping
+Provides check_fping of the Monitoring Plugins.
+
+%files fping
+%{plugindir}/check_fping
+
+
+
+# check_game
+%if 0%{?rhel} != 8
+%package game
+Summary:  Monitoring Plugins - check_fping
+Requires: %{name} = %{version}-%{release}
+Requires: qstat
+
+%description game
+Provides check_game of the Monitoring Plugins.
+
+%files game
+%{plugindir}/check_game
+%endif
+
+
+
+# check_hpjd
+%package hpjd
+Summary:  Monitoring Plugins - check_hpjd
+Requires: %{name} = %{version}-%{release}
+
+%description hpjd
+Provides check_hpjd of the Monitoring Plugins.
+
+%files hpjd
+%{plugindir}/check_hpjd
+
+
+
+# check_http
+%package http
+Summary:  Monitoring Plugins - check_http
+Requires: %{name} = %{version}-%{release}
+
+%description http
+Provides check_http of the Monitoring Plugins.
+
+%files http
+%{plugindir}/check_http
+
+
+
+# check_icmp
+%package icmp
+Summary:  Monitoring Plugins - check_icmp
+Requires: %{name} = %{version}-%{release}
+
+%description icmp
+Provides check_icmp of the Monitoring Plugins.
+
+%files icmp
+%{plugindir}/check_icmp
+
+
+
+# check_ide_smart
+%package ide_smart
+Summary:  Monitoring Plugins - check_ide_smart
+Requires: %{name} = %{version}-%{release}
+
+%description ide_smart
+Provides check_ide_smart of the Monitoring Plugins.
+
+%files ide_smart
+%{plugindir}/check_ide_smart
+
+
+
+# check_ifoperstatus
+%package ifoperstatus
+Summary:  Monitoring Plugins - check_ifoperstatus
+Requires: %{name} = %{version}-%{release}
+Requires: perl(Net::SNMP)
+
+%description ifoperstatus
+Provides check_ifoperstatus of the Monitoring Plugins.
+
+%files ifoperstatus
+%{plugindir}/check_ifoperstatus
+
+
+
+# check_ifstatus
+%package ifstatus
+Summary:  Monitoring Plugins - check_ifstatus
+Requires: %{name} = %{version}-%{release}
+
+%description ifstatus
+Provides check_ifstatus of the Monitoring Plugins.
+
+%files ifstatus
+%{plugindir}/check_ifstatus
+
+
+
+# check_ircd
+%package ircd
+Summary:  Monitoring Plugins - check_ircd
+Requires: %{name} = %{version}-%{release}
+
+%description ircd
+Provides check_ircd of the Monitoring Plugins.
+
+%files ircd
+%{plugindir}/check_ircd
+
+
+
+# check_ldap
+%package ldap
+Summary:  Monitoring Plugins - check_ldap
+Requires: %{name} = %{version}-%{release}
+
+%description ldap
+Provides check_ldap of the Monitoring Plugins.
+
+%files ldap
+%{plugindir}/check_ldap
+%{plugindir}/check_ldaps
+
+
+
+# check_load
+%package load
+Summary:  Monitoring Plugins - check_load
+Requires: %{name} = %{version}-%{release}
+Requires: procps-ng
+
+%description load
+Provides check_load of the Monitoring Plugins.
+
+%files load
+%{plugindir}/check_load
+
+
+
+# check_log
+%package log
+Summary:  Monitoring Plugins - check_log
+Requires: %{name} = %{version}-%{release}
+
+%description log
+Provides check_log of the Monitoring Plugins.
+
+%files log
+%{plugindir}/check_log
+
+
+
+# check_mailq
+%package mailq
+Summary:  Monitoring Plugins - check_mailq
+Requires: %{name} = %{version}-%{release}
+
+%description mailq
+Provides check_mailq of the Monitoring Plugins.
+
+%files mailq
+%{plugindir}/check_mailq
+
+
+
+# check_mrtg
+%package mrtg
+Summary:  Monitoring Plugins - check_mrtg
+Requires: %{name} = %{version}-%{release}
+
+%description mrtg
+Provides check_mrtg of the Monitoring Plugins.
+
+%files mrtg
+%{plugindir}/check_mrtg
+
+
+
+# check_mrtgtraf
+%package mrtgtraf
+Summary:  Monitoring Plugins - check_mrtgtraf
+Requires: %{name} = %{version}-%{release}
+
+%description mrtgtraf
+Provides check_mrtgtraf of the Monitoring Plugins.
+
+%files mrtgtraf
+%{plugindir}/check_mrtgtraf
+
+
+
+%if 0%{?rhel} == 7
+# check_mysql
+%package mysql
+Summary:  Monitoring Plugins - check_mysql
+Requires: %{name} = %{version}-%{release}
+
+%description mysql
+Provides check_mysql of the Monitoring Plugins.
+
+%files mysql
+%{plugindir}/check_mysql
+
+
+
+# check_mysql_query
+%package mysql_query
+Summary:  Monitoring Plugins - check_mysql_query
+Requires: %{name} = %{version}-%{release}
+
+%description mysql_query
+Provides check_mysql_query of the Monitoring Plugins.
+
+%files mysql_query
+%{plugindir}/check_mysql_query
+%endif
+
+
+
+# check_nagios
+%package nagios
+Summary:  Monitoring Plugins - check_nagios
+Requires: %{name} = %{version}-%{release}
+
+%description nagios
+Provides check_nagios of the Monitoring Plugins.
+
+%files nagios
+%{plugindir}/check_nagios
+
+
+
+# check_nt
+%package nt
+Summary:  Monitoring Plugins - check_nt
+Requires: %{name} = %{version}-%{release}
+
+%description nt
+Provides check_nt of the Monitoring Plugins.
+
+%files nt
+%{plugindir}/check_nt
+
+
+
+# check_ntp
+%package ntp
+Summary:  Monitoring Plugins - check_ntp
+Requires: %{name} = %{version}-%{release}
+
+%description ntp
+Provides check_ntp of the Monitoring Plugins.
+
+%files ntp
+%{plugindir}/check_ntp
+
+
+
+# check_ntp_peer
+%package ntp_peer
+Summary:  Monitoring Plugins - check_ntp_peer
+Requires: %{name} = %{version}-%{release}
+
+%description ntp_peer
+Provides check_ntp_peer of the Monitoring Plugins.
+
+%files ntp_peer
+%{plugindir}/check_ntp_peer
+
+
+
+# check_ntp_time
+%package ntp_time
+Summary:  Monitoring Plugins - check_ntp_time
+Requires: %{name} = %{version}-%{release}
+
+%description ntp_time
+Provides check_ntp_time of the Monitoring Plugins.
+
+%files ntp_time
+%{plugindir}/check_ntp_time
+
+
+
+# check_nwstat
+%package nwstat
+Summary:  Monitoring Plugins - check_nwstat
+Requires: %{name} = %{version}-%{release}
+
+%description nwstat
+Provides check_nwstat of the Monitoring Plugins.
+
+%files nwstat
+%{plugindir}/check_nwstat
+
+
+
+# check_oracle
+%package oracle
+Summary:  Monitoring Plugins - check_oracle
+Requires: %{name} = %{version}-%{release}
+
+%description oracle
+Provides check_oracle of the Monitoring Plugins.
+
+%files oracle
+%{plugindir}/check_oracle
+
+
+
+# check_overcr
+%package overcr
+Summary:  Monitoring Plugins - check_overcr
+Requires: %{name} = %{version}-%{release}
+
+%description overcr
+Provides check_overcr of the Monitoring Plugins.
+
+%files overcr
+%{plugindir}/check_overcr
+
+
+
+# check_pgsql
+%package pgsql
+Summary:  Monitoring Plugins - check_pgsql
+Requires: %{name} = %{version}-%{release}
+
+%description pgsql
+Provides check_pgsql of the Monitoring Plugins.
+
+%files pgsql
+%{plugindir}/check_pgsql
+
+
+
+# check_ping
+%package ping
+Summary:  Monitoring Plugins - check_ping
+Requires: %{name} = %{version}-%{release}
+
+%description ping
+Provides check_ping of the Monitoring Plugins.
+
+%files ping
+%{plugindir}/check_ping
+
+
+
+# check_procs
+%package procs
+Summary:  Monitoring Plugins - check_procs
+Requires: %{name} = %{version}-%{release}
+
+%description procs
+Provides check_procs of the Monitoring Plugins.
+
+%files procs
+%{plugindir}/check_procs
+
+
+
+# check_radius
+%package radius
+Summary:  Monitoring Plugins - check_radius
+Requires: %{name} = %{version}-%{release}
+
+%description radius
+Provides check_radius of the Monitoring Plugins.
+
+%files radius
+%{plugindir}/check_radius
+
+
+
+# check_real
+%package real
+Summary:  Monitoring Plugins - check_real
+Requires: %{name} = %{version}-%{release}
+
+%description real
+Provides check_real of the Monitoring Plugins.
+
+%files real
+%{plugindir}/check_real
+
+
+
+# check_rpc
+%package rpc
+Summary:  Monitoring Plugins - check_rpc
+Requires: %{name} = %{version}-%{release}
+
+%description rpc
+Provides check_rpc of the Monitoring Plugins.
+
+%files rpc
+%{plugindir}/check_rpc
+
+
+
+# check_sensors
+%package sensors
+Summary:  Monitoring Plugins - check_sensors
+Requires: %{name} = %{version}-%{release}
+Requires: lm_sensors
+
+%description sensors
+Provides check_sensors of the Monitoring Plugins.
+
+%files sensors
+%{plugindir}/check_sensors
+
+
+
+# check_smtp
+%package smtp
+Summary:  Monitoring Plugins - check_smtp
+Requires: %{name} = %{version}-%{release}
+
+%description smtp
+Provides check_smtp of the Monitoring Plugins.
+
+%files smtp
+%{plugindir}/check_smtp
+
+
+
+# check_snmp
+%package snmp
+Summary:  Monitoring Plugins - check_snmp
+Requires: %{name} = %{version}-%{release}
+Requires: net-snmp
+
+%description snmp
+Provides check_snmp of the Monitoring Plugins.
+
+%files snmp
+%{plugindir}/check_snmp
+
+
+
+# check_ssh
+%package ssh
+Summary:  Monitoring Plugins - check_ssh
+Requires: %{name} = %{version}-%{release}
+
+%description ssh
+Provides check_ssh of the Monitoring Plugins.
+
+%files ssh
+%{plugindir}/check_ssh
+
+
+
+# check_swap
+%package swap
+Summary:  Monitoring Plugins - check_swap
+Requires: %{name} = %{version}-%{release}
+
+%description swap
+Provides check_swap of the Monitoring Plugins.
+
+%files swap
+%{plugindir}/check_swap
+
+
+
+# check_tcp
+%package tcp
+Summary:  Monitoring Plugins - check_tcp
+Requires: %{name} = %{version}-%{release}
+
+%description tcp
+Provides check_tcp of the Monitoring Plugins.
+
+%files tcp
+%{plugindir}/check_clamd
+%{plugindir}/check_ftp
+%{plugindir}/check_imap
+%{plugindir}/check_jabber
+%{plugindir}/check_nntp
+%{plugindir}/check_nntps
+%{plugindir}/check_pop
+%{plugindir}/check_simap
+%{plugindir}/check_spop
+%{plugindir}/check_ssmtp
+%{plugindir}/check_tcp
+%{plugindir}/check_udp
+
+
+
+# check_time
+%package time
+Summary:  Monitoring Plugins - check_time
+Requires: %{name} = %{version}-%{release}
+
+%description time
+Provides check_time of the Monitoring Plugins.
+
+%files time
+%{plugindir}/check_time
+
+
+
+# check_ups
+%package ups
+Summary:  Monitoring Plugins - check_ups
+Requires: %{name} = %{version}-%{release}
+
+%description ups
+Provides check_ups of the Monitoring Plugins.
+
+%files ups
+%{plugindir}/check_ups
+
+
+
+# check_uptime
+%package uptime
+Summary:  Monitoring Plugins - check_uptime
+Requires: %{name} = %{version}-%{release}
+
+%description uptime
+Provides check_uptime of the Monitoring Plugins.
+
+%files uptime
+%{plugindir}/check_uptime
+
+
+
+# check_users
+%package users
+Summary:  Monitoring Plugins - check_users
+Requires: %{name} = %{version}-%{release}
+
+%description users
+Provides check_users of the Monitoring Plugins.
+
+%files users
+%{plugindir}/check_users
+
+
+
+# check_wave
+%package wave
+Summary:  Monitoring Plugins - check_wave
+Requires: %{name} = %{version}-%{release}
+
+%description wave
+Provides check_wave of the Monitoring Plugins.
+
+%files wave
+%{plugindir}/check_wave
diff --git a/.github/os_detect.sh b/.github/os_detect.sh
new file mode 100644
index 0000000..ee9c145
--- /dev/null
+++ b/.github/os_detect.sh
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+# workaround for really bare-bones Archlinux containers:
+if [ -x "$(command -v pacman)" ]; then
+    pacman --noconfirm -Sy
+    pacman --noconfirm -S grep gawk sed
+fi
+
+os_release_file=
+if [ -s "/etc/os-release" ]; then
+  os_release_file="/etc/os-release"
+elif [ -s "/usr/lib/os-release" ]; then
+  os_release_file="/usr/lib/os-release"
+else
+  echo >&2 "Cannot find an os-release file ..."
+  return 1
+fi
+export distro_id=$(grep '^ID=' $os_release_file|awk -F = '{print $2}'|sed 's/\"//g')
+export platform_id=$(grep '^PLATFORM_ID=' /etc/os-release|awk -F = '{print $2}'|sed 's/\"//g'| cut -d":" -f2)
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index dcf778b..3f4674a 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -64,13 +64,9 @@ apt-get -y install perl \
         iproute2
 
 # remove ipv6 interface from hosts
-if [ $(ip addr show | grep "inet6 ::1" | wc -l) -eq "0" ]; then
-    sed '/^::1/d' /etc/hosts > /tmp/hosts
-    cp -f /tmp/hosts /etc/hosts
-fi
-
+sed '/^::1/d' /etc/hosts > /tmp/hosts
+cp -f /tmp/hosts /etc/hosts
 ip addr show
-
 cat /etc/hosts
 
 # apache
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0317c8c..c402e0c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,4 +70,4 @@ jobs:
           make
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
new file mode 100644
index 0000000..72f7c7e
--- /dev/null
+++ b/.github/workflows/spellcheck.yml
@@ -0,0 +1,27 @@
+---
+name: Spellcheck
+
+on:
+  # Run for pushes on any branch
+  push:
+    branches:
+      - '*'
+  # Run for any PRs
+  pull_request:
+
+jobs:
+  codespell:
+    name: codespell
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Codespell
+        uses: codespell-project/actions-codespell@v2
+        with:
+          skip: "./.git,./.gitignore,./ABOUT-NLS,./gl,./tools/squid.conf,./build-aux/ltmain.sh,THANKS.in"
+          ignore_words_list: allright,gord,didi,hda,nd,alis,clen,scrit,ser,fot,te,parm,isnt,consol,oneliners,esponse,slac
+          check_filenames: true
+          check_hidden: true
diff --git a/.github/workflows/test-next.yml b/.github/workflows/test-next.yml
new file mode 100644
index 0000000..8124075
--- /dev/null
+++ b/.github/workflows/test-next.yml
@@ -0,0 +1,78 @@
+---
+name: Tests Debian:Testing and Fedora:Rawhide
+
+on:
+  workflow_dispatch: {}
+  push:
+    branches-ignore:
+      - '*'
+  schedule:
+    # Run every week on Monday at 9:00 AM (UTC)
+    - cron: '0 9 * * 1'
+
+jobs:
+  full-test:
+    name: Running unit and integrationt tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        distro:
+          - 'debian:testing'
+        include:
+          - distro: 'debian:testing'
+            prepare: .github/prepare_debian.sh
+    steps:
+      - name: Git clone repository
+        uses: actions/checkout@v4
+      - name: Run the tests on ${{ matrix.distro }}
+        run: |
+          docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
+          docker run \
+              -e NPTEST_ACCEPTDEFAULT=1 \
+              -e NPTEST_CACHE="/src/.github/NPTest.cache" \
+              -w /src -v ${PWD}:/src \
+              --tmpfs /media/ramdisk1 \
+              -v /var/run/utmp:/var/run/utmp \
+              --mount source=tmp-vol,destination=/src,target=/media/ramdisk2 \
+              ${{ matrix.distro }} \
+              /bin/sh -c '${{ matrix.prepare }} && \
+                tools/setup && \
+                ./configure --enable-libtap  --with-ipv6=no && \
+                make && \
+                make test && \
+                make dist && \
+                tar zxf monitoring-plugins-*.tar.gz && \
+                cd monitoring-plugins-*/ && \
+                ./configure && \
+                make'
+          docker container prune -f
+          docker volume prune -f
+
+  build-test:
+    name: Running rpm build test on ${{ matrix.distro }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {"distro": "fedora:rawhide", "build": ".github/mock.sh"}
+    steps:
+      - name: Git clone repository
+        uses: actions/checkout@v4
+      - name: Run the tests on ${{ matrix.distro }}
+        run: |
+          docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
+          docker run \
+              --privileged=true \
+              -e NPTEST_ACCEPTDEFAULT=1 \
+              -e NPTEST_CACHE="/src/.github/NPTest.cache" \
+              -w /src -v ${PWD}:/src \
+              --tmpfs /media/ramdisk1 \
+              -v /var/run/utmp:/var/run/utmp \
+              --mount source=tmp-vol,destination=/src,target=/media/ramdisk2 \
+              ${{ matrix.distro }} \
+              /bin/sh -c '${{ matrix.build }} && \
+                ls -la'
+          docker container prune -f
+          docker volume prune -f
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 77b09f4..77ca658 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,65 +1,27 @@
 ---
-name: Test
+name: Tests
 
 on:
   push:
     branches:
       - '*'
-  # Run test for any PRs
   pull_request:
 
 jobs:
-  codespell:
-    name: codespell
-    strategy:
-      fail-fast: false
+  full-test:
+    name: Running unit and integrationt tests
     runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Codespell
-        uses: codespell-project/actions-codespell@v2
-        with:
-          skip: "./.git,./.gitignore,./ABOUT-NLS,*.po,./gl,./po,./tools/squid.conf,./build-aux/ltmain.sh"
-          ignore_words_list: allright,gord,didi,hda,nd,alis,clen,scrit,ser,fot,te,parm,isnt,consol,oneliners
-          check_filenames: true
-          check_hidden: true
-#  super-linter:
-#    name: super-linter
-#    strategy:
-#      fail-fast: false
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#      - name: Lint Code Base
-#        uses: github/super-linter@v5.0.0
-#        env:
-#          DEFAULT_BRANCH: master
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#  macos:
-#    ...
-  linux:
-    needs:
-      - codespell
-#      - super-linter
-    runs-on: ubuntu-latest
-    name: Running tests on ${{ matrix.distro }}
     strategy:
       fail-fast: false
       matrix:
         distro:
-          - 'debian:testing'
-          #...
+          - 'debian:stable'
         include:
-          - distro: 'debian:testing'
+          - distro: 'debian:stable'
             prepare: .github/prepare_debian.sh
-          #...
     steps:
       - name: Git clone repository
         uses: actions/checkout@v4
-      #- name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate
-      #  uses: mxschmitt/action-tmate@v3
       - name: Run the tests on ${{ matrix.distro }}
         run: |
           docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
@@ -74,11 +36,43 @@ jobs:
               /bin/sh -c '${{ matrix.prepare }} && \
                 tools/setup && \
                 ./configure --enable-libtap  --with-ipv6=no && \
-                set -x && \
-                tmp_dir=$(mktemp -d -t test-XXXX) && cp -a po/ $tmp_dir/  && \
-                cd po && make update-po && cd .. && \
-                diff -Nur $tmp_dir/po/*.po po/*.po | tee -a /tmp/po.diff && diff -Nur $tmp_dir/po/*.pot po/*.pot | tee -a /tmp/po.diff && if [ $(wc -l /tmp/po.diff | cut -f 1 -d" ") -gt 0 ]; then echo "Error: Translations needs to be updated with make update-po!" && exit 1; fi && \ 
                 make && \
-                make test'
+                make test && \
+                make dist && \
+                tar zxf monitoring-plugins-*.tar.gz && \
+                cd monitoring-plugins-*/ && \
+                ./configure && \
+                make'
+          docker container prune -f
+          docker volume prune -f
+
+  build-test:
+    name: Running rpm build test on ${{ matrix.distro }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {"distro": "fedora:latest", "build": ".github/mock.sh"}
+          - {"distro": "rockylinux:8", "build": ".github/mock.sh"}
+          - {"distro": "almalinux:9", "build": ".github/mock.sh"}
+#          - {"distro": "oraclelinux:9", "build": ".github/mock.sh"}
+    steps:
+      - name: Git clone repository
+        uses: actions/checkout@v4
+      - name: Run the tests on ${{ matrix.distro }}
+        run: |
+          docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
+          docker run \
+              --privileged=true \
+              -e NPTEST_ACCEPTDEFAULT=1 \
+              -e NPTEST_CACHE="/src/.github/NPTest.cache" \
+              -w /src -v ${PWD}:/src \
+              --tmpfs /media/ramdisk1 \
+              -v /var/run/utmp:/var/run/utmp \
+              --mount source=tmp-vol,destination=/src,target=/media/ramdisk2 \
+              ${{ matrix.distro }} \
+              /bin/sh -c '${{ matrix.build }} && \
+                ls -la'
           docker container prune -f
           docker volume prune -f
diff --git a/.gitignore b/.gitignore
index 02ca61e..6f903d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,7 +94,7 @@ NP-VERSION-FILE
 /gl/limits.h
 /gl/malloc/dynarray-skeleton.gl.h
 /gl/malloc/dynarray.gl.h
-/gl/stdckdint.
+/gl/stdckdint.h
 
 # /lib/
 /lib/.deps
diff --git a/CODING b/CODING
index 74438e7..d0673e7 100644
--- a/CODING
+++ b/CODING
@@ -7,33 +7,20 @@ readability in a wide range of environments.
 
 1. C Language Programming
 
-All code should comply with the requirements of the Free Software
+All code should comply with most of the requirements of the Free Software
 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
+https://www.gnu.org/prep/standards/standards.html ).
+We also follow most of the FSF guidelines, with the huge and explicit
+exception of the style guidelines.
+Developers may suggest deviations from the FSF
 style recommendations, which will be considered by open discussion on
-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
-exceptions are as follows:
-
-a) leading white space for a statement should be formatted as tabs,
-with one tab for each code indentation level.
-
-b) in statement continuation lines, format whitespace up to the column
-starting the statement as tabs, format the rest as spaces (this
-results in code that is legible regardless of tab-width setting).
-
-c) with the exception of the above, tabs should generally be avoided
-
-d) when tab width is 2 spaces, line-length should not exceed 80
-characters
-
-e) The opening brace of an if or while block is on the same line as
-the end of the conditional expression (the '-br' option).
+the Monitoring Plugins devel mailing list or the Github Pull Request.
+Any such deviations should be
+applied to the entire code base to ensure consistency.
 
+The style guideline is the following:
+Whatever clang-format does with the configuration file available (.clang-format)
+Apart from that, code should naturally be readable and easy to understand.
 
 2. Perl Language Programming
 
diff --git a/Makefile.am b/Makefile.am
index df1bcbb..5959f70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
+SUBDIRS = gl tap lib plugins plugins-scripts plugins-root @PERLMODS_DIR@
 
 EXTRA_DIST = config.rpath \
         ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ NEWS \
diff --git a/NEWS b/NEWS
index 9ec3c5e..fd43fd3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,98 @@
 This file documents the major additions and syntax changes between releases.
 
+2.4.0 25th Jul 2024
+        FIXES
+        * check_dbi: Compiler warning for uninitialized variable
+        * check_curl: Initialize pointer before usage
+        * check_ntp: Initialize intermediate results in any case
+        * Fixes for -Wsign-compare
+        * check_tcp: Fixes an error with using the wrong type for a variable
+        * check_mailq: exit on empty strings and exit early
+        * check_users: Change option for sanity checking arguments to avoid segfault
+        * check_users: Update help to properly show that thresholds are ranges
+        * check_users: fix segfault
+        * check_dbi: Fix compiler warning for uninitialized variable
+        * check_curl: Initialize pointer before usage
+        * check_ntp: Initialize intermediate results in any case
+        * Fix logic in is_uint64_t to fix type-limit warning
+        * check_ntp_peer: Fixes for Wmaybe-unitialized and some restructuring
+        * check_dns: Remove unused variable
+        * check_disk: fix ignore-missing in combination with includes
+        * check_procs: ignore our own children
+        * Prevent -lcrypto from showing up in Makefile dependencies
+        * Change irritating NULL assignment
+        * check_http: Remove self assignment of a variable and add some comments
+        * check_snmp: Remove unused variable
+        * check_dhcp: Make implicit conversion explicit to dismiss warning
+        * Ini Parser: Avoid freeing symbols from text section
+        * check_icmp: keep performance data order in case of none-reachable hosts
+        * check_swap: Change another fake boolean to a real one
+        * check_swap: Rename type since *_t is reserved for C standard types
+        * check_ssh: Fix a typo in "remote-protocol parameter
+        * check_ssh: Handle non-alpha software versions
+        * check_ssh: properly parse a delayed version control string
+        * check_disk: Fail on missing arguments for --warning and --critical and fix a test case
+        * check_disk: Use new test function for percentage expressions
+        * check_load: remove unused code
+        * check_curl/check_http: clarified format of POST data
+
+        ENHANCEMENTS
+        * Use C99 booleans
+        * check_mailq: remove trailing whitespaces
+        * check_mailq: unify tabs/spaces
+        * check_oracle: Shellcheck fixes
+        * check_ups: output ups.realpower if supported
+        * check_disk: add -n short option for --ignore-missing
+        * check_procs: Improve help text, mentioning excluded processes
+        * check_procs: Generalise wording, remove mentioning of nrpe
+        * check_curl: add haproxy protocol option
+        * Improve negate plugin helptext
+        * check_disk: increase alert precision
+        * check_ircd: IPv6 support
+        * check_nwstat: adds percentage used space
+        * Add new test function for percentage expressions
+        * check_swap: Possibility to run check_swap without thresholds
+        * check_ups: additional alarm conditions
+        * check_http/check_curl: added a --regex-state option to change the state of a regex check
+
+2.3.5 18th Oct 2023
+        FIXES
+        * Include maxfd.h in lib Makefile
+
+2.3.4 18th Oct 2023
+        ENHANCEMENTS
+        * check_curl: added --cookie-jar and doing proper cleanup of libcurl
+        * check_curl: Include all IPs from getaddrinfo() in curl DNS cache
+        * check_dhcp: Add dhcp rogue detection
+        * check_disk: add ignore-missing option to return OK for missing fs
+        * check_disk_smb: allow checking 0-sized resource (ex. IPC$)
+        * check_disk: The options to include or exclude specific file systems now allow the usage of regex(7)
+        * check_icmp: Add support to Jitter, MOS and Score
+        * check_mysql: Detect running mysqldump and handle it more gracefully
+        * check_procs: Implement --exclude-process to exclude specific processes
+        * check_smtp: add new longoption --tls
+        * check_smtp: Add option to prefix PROXY header
+        * check_smtp: Add support for SMTP over TLS
+        * check_smtp: Add support for SNI
+        * check_snmp: Implement option to ignore mib file parsing errors
+        * check_users: prefer systemd-logind over utmp
+
+        FIXES
+        * check_disk: Display SI units correctly
+        * check_ircd: use pack_sockaddr_in rather than hand-rolled
+        * check_log/check_oracle/check_sensors: fixed the outputs of the help functionality
+        * check_mysql: Add mysql_close to avoid spamming the server logs
+        * check_smtp: add missing -r option in usage
+        * check_snmp: disable multiplier when unused
+        * check_wave: Use compile time determined path to snmpget
+        
+        GENERAL
+        * Sync with the Gnulib code 668c0b8ffa
+        * Set autoconf prerequisite version to 2.64
+        * Remove sha1 and use sha256 in some parts of the plugin structure
+        * A lot of compiler warnings were fixed
+        * Some code was refactored a little bit
+
 2.3.3 2nd Feb 2023
         ENHANCEMENTS
         using PRId64 and PRIu64 instead of %ld directly
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN
index c353b1d..e16f37d 100755
--- a/NP-VERSION-GEN
+++ b/NP-VERSION-GEN
@@ -6,7 +6,7 @@
 SRC_ROOT=`dirname $0`
 
 NPVF=NP-VERSION-FILE
-DEF_VER=2.3git
+DEF_VER=2.4git
 
 LF='
 '
diff --git a/THANKS.in b/THANKS.in
index b132744..66397ad 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -406,3 +406,23 @@ Wolfgang Nieder
 andrew bezella
 Lorenz Gruenwald
 John Morrissey
+Ralph Gottschalkson
+Arkadiusz Miśkiewicz
+Björn Berg
+Franz Schwartau
+Gerardo Malazdrewicz
+Kristian Schuster
+Patrick Cervicek
+Patrick Uiterwijk
+Platon Pronko
+Stefan Taferner
+Stuart Henderson
+Thoralf Rickert-Wendt
+Thorsten Kukuk
+Matthias Döhler
+Emmanuel Riviere
+Eric Knibbe
+Eunice Remoquillo
+Louis Sautier
+Sven Hartge
+Alvar Penning
diff --git a/configure.ac b/configure.ac
index a294b00..8594238 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.64)
-AC_INIT(monitoring-plugins,2.3git)
+AC_INIT(monitoring-plugins,2.4git)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile])
 AC_CONFIG_AUX_DIR(build-aux)
@@ -621,7 +621,6 @@ AC_C_CONST
 AC_STRUCT_TM
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
 
 AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[
 AC_TRY_LINK([#include <stdarg.h>
@@ -645,12 +644,16 @@ AC_TRY_COMPILE([#include <sys/time.h>],
                [struct timeval *tv;
                 struct timezone *tz;],
                AC_DEFINE(HAVE_STRUCT_TIMEVAL,1,[Define if we have a timeval structure])
-               AC_TRY_COMPILE([#include <sys/time.h>],
-                              [struct timeval *tv;
-                               struct timezone *tz;
-                               gettimeofday(tv, tz);],
-                              AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define if gettimeofday is found]),
-                              AC_DEFINE(NEED_GETTIMEOFDAY,1,[Define if gettimeofday is needed])))
+                           FOUND_STRUCT_TIMEVAL="yes")
+
+if test x"$FOUND_STRUCT_TIMEVAL" = x"yes"; then
+        AC_TRY_COMPILE([#include <sys/time.h>],
+                          [struct timeval *tv;
+                           struct timezone *tz;
+                           gettimeofday(tv, tz);],
+                          AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define if gettimeofday is found]),
+                          AC_DEFINE(NEED_GETTIMEOFDAY,1,[Define if gettimeofday is needed]))
+fi
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(memmove select socket strdup strstr strtol strtoul floor)
@@ -1921,7 +1924,6 @@ AC_OUTPUT(
   perlmods/Makefile
   test.pl
   pkg/solaris/pkginfo
-  po/Makefile.in
 )
 
 
diff --git a/doc/RELEASING.md b/doc/RELEASING.md
index 432b1da..e1f3bf7 100644
--- a/doc/RELEASING.md
+++ b/doc/RELEASING.md
@@ -2,7 +2,7 @@ Releasing a New Monitoring Plugins Version
 ==========================================
 
 Throughout this document, it is assumed that the current Monitoring
-Plugins version is 2.3.3, and that we're about to publish version 2.4.
+Plugins version is 2.4.0, and that we're about to publish version 2.5.
 It is also assumed that the official repository on GitHub is tracked
 using the remote name `monitoring-plugins` (rather than `origin`).
 
@@ -11,14 +11,14 @@ Before you start
 
 - Check Github Actions status.
 - Update local Git repository to the current `master` tip.  For a
-  maintenance release (e.g., version 2.3.4), update to the current
-  `maint-2.3` tip, instead.
+  maintenance release (e.g., version 2.4.1), update to the current
+  `maint-2.4` tip, instead.
 
 Prepare and commit files
 ------------------------
 
 - Update `configure.ac` and `NP-VERSION-GEN` with new version.
-- Update `NEWS` from `git log --reverse v2.3.3..` output, and specify
+- Update `NEWS` from `git log --reverse v2.4.0..` output, and specify
   the release version/date.
 - Update `AUTHORS` if there are new team members.
 - Update `THANKS.in` using `tools/update-thanks`.
@@ -29,27 +29,27 @@ Prepare and commit files
 Create annotated tag
 --------------------
 
-    git tag -a -m 'Monitoring Plugins 2.4' v2.4
+    git tag -a -m 'Monitoring Plugins 2.5' v2.5
 
 Push the code and tag to GitHub
 -------------------------------
 
     git push monitoring-plugins master
-    git push monitoring-plugins v2.4
+    git push monitoring-plugins v2.5
 
 Create new maintenance branch
 -----------------------------
 
 _Only necessary when creating a feature release._
 
-    git checkout -b maint-2.4 v2.4
-    git push -u monitoring-plugins maint-2.4
+    git checkout -b maint-2.5 v2.5
+    git push -u monitoring-plugins maint-2.5
 
 Checkout new version
 --------------------
 
     rm -rf /tmp/plugins
-    git archive --prefix=tmp/plugins/ v2.4 | (cd /; tar -xf -)
+    git archive --prefix=tmp/plugins/ v2.5 | (cd /; tar -xf -)
 
 Build the tarball
 -----------------
@@ -62,26 +62,26 @@ Build the tarball
 Upload tarball to web site
 --------------------------
 
-    scp monitoring-plugins-2.4.tar.gz \
+    scp monitoring-plugins-2.5.tar.gz \
         plugins@orwell.monitoring-plugins.org:web/download/
 
 Generate SHA1 checksum file on web site
 ---------------------------------------
 
     ssh plugins@orwell.monitoring-plugins.org \
-        '(cd web/download; $HOME/bin/create-checksum monitoring-plugins-2.4.tar.gz)'
+        '(cd web/download; $HOME/bin/create-checksum monitoring-plugins-2.5.tar.gz)'
 
 Announce new release
 --------------------
 
 - In the site.git repository:
 
-    - Create `web/input/news/release-2-4.md`.
+    - Create `web/input/news/release-2.5.md`.
     - Update the `plugins_release` version in `web/macros.py`.
     - Commit and push the result:
 
-            git add web/input/news/release-2-4.md
-            git commit web/input/news/release-2-4.md web/macros.py
+            git add web/input/news/release-2.5.md
+            git commit web/input/news/release-2.5.md web/macros.py
             git push origin master
 
 - Post an announcement on (at least) the following mailing lists:
@@ -93,6 +93,6 @@ Announce new release
 
 If you want to mention the number of contributors in the announcement:
 
-    git shortlog -s v2.3.3..v2.4 | wc -l
+    git shortlog -s v2.4.0..v2.5 | wc -l
 
 <!-- vim:set filetype=markdown textwidth=72: -->
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 37c963e..0afa733 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -14,15 +14,8 @@
     <pubdate>2013</pubdate>
     <title>Monitoring Plugins Development Guidelines</title>
 
-    <revhistory>
-       <revision>
-          <revnumber>1796</revnumber>
-          <date>2007-09-24 14:51:07 -0400 (Mon, 24 Sep 2007)</date>
-       </revision>
-    </revhistory>
-
         <copyright>
-                <year>2000 - 2013</year>
+                <year>2000 - 2024</year>
                 <holder>Monitoring Plugins Development Team</holder>
         </copyright>
 
@@ -34,7 +27,7 @@
     the plugin developers and encourage the standardization of the
     different kind of plugins: C, shell, perl, python, etc.</para>
 
-        <para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2013
+        <para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2024
         (Monitoring Plugins Team)</para>
 
         <para>Permission is granted to make and distribute verbatim
@@ -383,13 +376,6 @@
                 <para>It is up to third party programs to convert the Monitoring Plugins
                 performance data into graphs.</para>
                 </section>
-
-        <section><title>Translations</title>
-        <para>If possible, use translation tools for all output to respect the user's language
-                settings. See <xref linkend="translationsdevelopers"> for guidelines
-                for the core plugins.
-        </para>
-        </section>
 </section>
 
 <section id="SysCmdAuxFiles"><title>System Commands and Auxiliary Files</title>
@@ -727,19 +713,18 @@ setup the tests. Run "make test" to run all the tests.
 </section>
 <section id="CodingGuidelines"><title>Coding guidelines</title>
         <para>See <ulink url="http://www.gnu.org/prep/standards_toc.html">GNU
-        Coding standards</ulink> for general guidelines.</para>
+        Coding standards</ulink> for general guidelines.
+        Some parts of the guidelines (namely and explicitly the coding style)
+        are not seen as best practice by us.</para>
         <section><title>C coding</title>
 
-        <para>Variables should be declared at the beginning of code blocks and
-        not inline because of portability with older compilers.</para>
-
         <para>You should use the type "bool" and its values
         "true" and "false" instead of the "int" type for booleans.
         </para>
         </section>
 
         <section><title>Crediting sources</title>
-        <para>If you have copied a routine from another source, make sure the licence
+        <para>If you have copied a routine from another source, make sure the license
         from your source allows this. Add a comment referencing the ACKNOWLEDGEMENTS
         file, where you can put more detail about the source.</para>
         <para>For contributed code, do not add any named credits in the source code
@@ -756,32 +741,6 @@ setup the tests. Run "make test" to run all the tests.
         <para>All commits will be written to a ChangeLog at release time.
         </para>
         </section>
-
-        <section id="translationsdevelopers"><title>Translations for developers</title>
-        <para>To make the job easier for translators, please follow these guidelines:</para>
-        <orderedlist>
-          <listitem><para>
-            Before creating new strings, check the po/monitoring-plugins.pot file to
-            see if a similar string
-            already exists
-          </para></listitem>
-          <listitem><para>
-            For help texts, break into individual options so that these can be reused
-            between plugins
-          </para></listitem>
-          <listitem><para>Try to avoid linefeeds unless you are working on a block of text</para></listitem>
-          <listitem><para>Short help is not translated</para></listitem>
-          <listitem><para>Long help has options in English language, but text translated</para></listitem>
-          <listitem><para>"Copyright" kept in English</para></listitem>
-          <listitem><para>Copyright holder names kept in original text</para></listitem>
-          <listitem><para>Debugging output does not need to be translated</para></listitem>
-        </orderedlist>
-        </section>
-
-        <section><title>Translations for translators</title>
-        <para>To create an up to date list of translatable strings, run: tools/gen_locale.sh</para>
-        </section>
-
 </section>
 
 <section id="SubmittingChanges"><title>Submission of new plugins and patches</title>
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 01d73a6..dc3ee89 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,8 +7,8 @@ noinst_LIBRARIES = libmonitoringplug.a
 AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
         -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-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
+libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c maxfd.c
+EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h maxfd.h
 
 if USE_PARSE_INI
 libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c
diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index f4d5e66..771621d 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -1,23 +1,23 @@
 /*****************************************************************************
-* 
+*
 * Monitoring Plugins extra_opts library
-* 
+*
 * License: GPL
 * 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
 * the Free Software Foundation, either version 3 of the License, 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 "common.h"
@@ -26,15 +26,14 @@
 #include "extra_opts.h"
 
 /* FIXME: copied from utils.h; we should move a bunch of libs! */
-int
-is_option2 (char *str)
+bool is_option2 (char *str)
 {
         if (!str)
-                return FALSE;
+                return false;
         else if (strspn (str, "-") == 1 || strspn (str, "-") == 2)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
 /* this is the externally visible function used by plugins */
@@ -93,14 +92,14 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name){
                         /* append the list to extra_args */
                         if(extra_args==NULL){
                                 extra_args=ea1;
-                                while(ea1=ea1->next) ea_num++;
+                                while((ea1 = ea1->next)) ea_num++;
                         }else{
                                 ea_tmp=extra_args;
                                 while(ea_tmp->next) {
                                         ea_tmp=ea_tmp->next;
                                 }
                                 ea_tmp->next=ea1;
-                                while(ea1=ea1->next) ea_num++;
+                                while((ea1 = ea1->next)) ea_num++;
                         }
                         ea1=ea_tmp=NULL;
                 }
diff --git a/lib/maxfd.c b/lib/maxfd.c
new file mode 100644
index 0000000..529b356
--- /dev/null
+++ b/lib/maxfd.c
@@ -0,0 +1,26 @@
+#include "./maxfd.h"
+#include <errno.h>
+
+long mp_open_max (void) {
+        long maxfd = 0L;
+        /* Try sysconf(_SC_OPEN_MAX) first, as it can be higher than OPEN_MAX.
+         * If that fails and the macro isn't defined, we fall back to an educated
+         * guess. There's no guarantee that our guess is adequate and the program
+         * will die with SIGSEGV if it isn't and the upper boundary is breached. */
+
+#ifdef _SC_OPEN_MAX
+        errno = 0;
+        if ((maxfd = sysconf (_SC_OPEN_MAX)) < 0) {
+                if (errno == 0)
+                        maxfd = DEFAULT_MAXFD;   /* it's indeterminate */
+                else
+                        die (STATE_UNKNOWN, _("sysconf error for _SC_OPEN_MAX\n"));
+        }
+#elif defined(OPEN_MAX)
+        return OPEN_MAX
+#else   /* sysconf macro unavailable, so guess (may be wildly inaccurate) */
+        return DEFAULT_MAXFD;
+#endif
+
+        return(maxfd);
+}
diff --git a/lib/maxfd.h b/lib/maxfd.h
new file mode 100644
index 0000000..45218d0
--- /dev/null
+++ b/lib/maxfd.h
@@ -0,0 +1,9 @@
+#ifndef _MAXFD_
+#define _MAXFD_
+
+#define DEFAULT_MAXFD  256   /* fallback value if no max open files value is set */
+#define MAXFD_LIMIT   8192   /* upper limit of open files */
+
+long mp_open_max (void);
+
+#endif // _MAXFD_
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 547af43..09c0dc4 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
-* 
+*
 * Monitoring Plugins parse_ini library
-* 
+*
 * License: GPL
 * 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
 * the Free Software Foundation, either version 3 of the License, 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 "common.h"
@@ -36,6 +36,7 @@
  */
 typedef struct {
         char *file;
+        bool file_string_on_heap;
         char *stanza;
 } np_ini_info;
 
@@ -95,16 +96,22 @@ parse_locator(const char *locator, const char *def_stanza, np_ini_info *i)
                 i->stanza = malloc(sizeof(char) * (stanza_len + 1));
                 strncpy(i->stanza, locator, stanza_len);
                 i->stanza[stanza_len] = '\0';
-        } else  /* otherwise we use the default stanza */
+        } else  {/* otherwise we use the default stanza */
                 i->stanza = strdup(def_stanza);
+        }
 
         if (i->stanza == NULL)
                 die(STATE_UNKNOWN, _("malloc() failed!\n"));
 
         /* check whether there's an @file part */
-        i->file = stanza_len == locator_len
-            ? default_file()
-            : strdup(&(locator[stanza_len + 1]));
+        if (stanza_len == locator_len) {
+            i->file = default_file();
+                i->file_string_on_heap = false;
+        } else {
+                i->file = strdup(&(locator[stanza_len + 1]));
+                i->file_string_on_heap = true;
+        }
+
         if (i->file == NULL || i->file[0] == '\0')
                 die(STATE_UNKNOWN,
                     _("Cannot find config file in any standard location.\n"));
@@ -131,12 +138,15 @@ np_get_defaults(const char *locator, const char *default_section)
         if (inifile == NULL)
                 die(STATE_UNKNOWN, _("Can't read config file: %s\n"),
                     strerror(errno));
-        if (read_defaults(inifile, i.stanza, &defaults) == FALSE)
+        if (!read_defaults(inifile, i.stanza, &defaults))
                 die(STATE_UNKNOWN,
                     _("Invalid section '%s' in config file '%s'\n"), i.stanza,
                     i.file);
 
-        free(i.file);
+        if (i.file_string_on_heap) {
+                free(i.file);
+        }
+
         if (inifile != stdin)
                 fclose(inifile);
         free(i.stanza);
@@ -157,7 +167,8 @@ np_get_defaults(const char *locator, const char *default_section)
 static int
 read_defaults(FILE *f, const char *stanza, np_arg_list **opts)
 {
-        int c, status = FALSE;
+        int c = 0;
+        bool status = false;
         size_t i, stanza_len;
         enum { NOSTANZA, WRONGSTANZA, RIGHTSTANZA } stanzastate = NOSTANZA;
 
@@ -219,7 +230,7 @@ read_defaults(FILE *f, const char *stanza, np_arg_list **opts)
                                         die(STATE_UNKNOWN, "%s\n",
                                             _("Config file error"));
                                 }
-                                status = TRUE;
+                                status = true;
                                 break;
                         }
                         break;
@@ -357,14 +368,18 @@ add_option(FILE *f, np_arg_list **optlst)
 static char *
 default_file(void)
 {
-        char **p, *ini_file;
+        char  *ini_file;
 
         if ((ini_file = getenv("MP_CONFIG_FILE")) != NULL ||
-            (ini_file = default_file_in_path()) != NULL)
+            (ini_file = default_file_in_path()) != NULL) {
                 return ini_file;
-        for (p = default_ini_path_names; *p != NULL; p++)
-                if (access(*p, F_OK) == 0)
+        }
+
+        for (char **p = default_ini_path_names; *p != NULL; p++) {
+                if (access(*p, F_OK) == 0) {
                         return *p;
+                }
+        }
         return NULL;
 }
 
diff --git a/lib/tests/test_base64.c b/lib/tests/test_base64.c
index 5103d10..05dd794 100644
--- a/lib/tests/test_base64.c
+++ b/lib/tests/test_base64.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * 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 of the License, 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 "common.h"
diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index 4bb60aa..02ae11f 100644
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * 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 of the License, 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 "common.h"
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
index 9bd68c7..e283fe2 100644
--- a/lib/tests/test_disk.c
+++ b/lib/tests/test_disk.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * 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 of the License, 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 "common.h"
@@ -44,19 +44,19 @@ main (int argc, char **argv)
 
         plan_tests(33);
 
-        ok( np_find_name(exclude_filesystem, "/var/log") == FALSE, "/var/log not in list");
+        ok( np_find_name(exclude_filesystem, "/var/log") == false, "/var/log not in list");
         np_add_name(&exclude_filesystem, "/var/log");
-        ok( np_find_name(exclude_filesystem, "/var/log") == TRUE, "is in list now");
-        ok( np_find_name(exclude_filesystem, "/home") == FALSE, "/home not in list");
+        ok( np_find_name(exclude_filesystem, "/var/log") == true, "is in list now");
+        ok( np_find_name(exclude_filesystem, "/home") == false, "/home not in list");
         np_add_name(&exclude_filesystem, "/home");
-        ok( np_find_name(exclude_filesystem, "/home") == TRUE, "is in list now");
-        ok( np_find_name(exclude_filesystem, "/var/log") == TRUE, "/var/log still in list");
+        ok( np_find_name(exclude_filesystem, "/home") == true, "is in list now");
+        ok( np_find_name(exclude_filesystem, "/var/log") == true, "/var/log still in list");
 
-        ok( np_find_name(exclude_fstype, "iso9660") == FALSE, "iso9660 not in list");
+        ok( np_find_name(exclude_fstype, "iso9660") == false, "iso9660 not in list");
         np_add_name(&exclude_fstype, "iso9660");
-        ok( np_find_name(exclude_fstype, "iso9660") == TRUE, "is in list now");
+        ok( np_find_name(exclude_fstype, "iso9660") == true, "is in list now");
 
-        ok( np_find_name(exclude_filesystem, "iso9660") == FALSE, "Make sure no clashing in variables");
+        ok( np_find_name(exclude_filesystem, "iso9660") == false, "Make sure no clashing in variables");
 
         /*
         for (temp_name = exclude_filesystem; temp_name; temp_name = temp_name->next) {
@@ -120,7 +120,7 @@ main (int argc, char **argv)
         np_add_parameter(&paths, "/home/tonvoon");
         np_add_parameter(&paths, "/dev/c2t0d0s0");
 
-        np_set_best_match(paths, dummy_mount_list, FALSE);
+        np_set_best_match(paths, dummy_mount_list, false);
         for (p = paths; p; p = p->name_next) {
                 struct mount_entry *temp_me;
                 temp_me = p->best_match;
@@ -144,7 +144,7 @@ main (int argc, char **argv)
         np_add_parameter(&paths, "/home/tonvoon");
         np_add_parameter(&paths, "/home");
 
-        np_set_best_match(paths, dummy_mount_list, TRUE);
+        np_set_best_match(paths, dummy_mount_list, true);
         for (p = paths; p; p = p->name_next) {
                 if (! strcmp(p->name, "/home/groups")) {
                         ok( ! p->best_match , "/home/groups correctly not found");
@@ -167,7 +167,7 @@ main (int argc, char **argv)
         }
         ok(found == 0, "first element successfully deleted");
         found = 0;
-        
+
         p=paths;
         while (p) {
                 if (! strcmp(p->name, "/tmp"))
@@ -203,9 +203,9 @@ main (int argc, char **argv)
 }
 
 
-void 
+void
 np_test_mount_entry_regex (struct mount_entry *dummy_mount_list, char *regstr, int cflags, int expect, char *desc)
-{       
+{
         int matches = 0;
         regex_t re;
         struct mount_entry *me;
@@ -214,7 +214,7 @@ np_test_mount_entry_regex (struct mount_entry *dummy_mount_list, char *regstr, i
                         if(np_regex_match_mount_entry(me,&re))
                                 matches++;
                 }
-                ok( matches == expect, 
+                ok( matches == expect,
                     "%s '%s' matched %i/3 entries. ok: %i/3",
                     desc, regstr, expect, matches);
 
diff --git a/lib/tests/test_ini1.c b/lib/tests/test_ini1.c
index 77f8854..6843bac 100644
--- a/lib/tests/test_ini1.c
+++ b/lib/tests/test_ini1.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * 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 of the License, 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 "common.h"
diff --git a/lib/tests/test_ini3.c b/lib/tests/test_ini3.c
index 814b3ec..8a2a041 100644
--- a/lib/tests/test_ini3.c
+++ b/lib/tests/test_ini3.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * 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 of the License, 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 "parse_ini.h"
diff --git a/lib/tests/test_opts2.c b/lib/tests/test_opts2.c
index c3d2067..780220e 100644
--- a/lib/tests/test_opts2.c
+++ b/lib/tests/test_opts2.c
@@ -12,7 +12,7 @@
 *
 * 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 "common.h"
diff --git a/lib/tests/test_tcp.c b/lib/tests/test_tcp.c
index 114252b..1954b0f 100644
--- a/lib/tests/test_tcp.c
+++ b/lib/tests/test_tcp.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * 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 of the License, 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 "common.h"
@@ -33,7 +33,7 @@ main(void)
         server_expect[0] = strdup("AA");
         server_expect[1] = strdup("bb");
         server_expect[2] = strdup("CC");
-        
+
         ok(np_expect_match("AA bb CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_SUCCESS,
            "Test matching any string at the beginning (first expect string)");
         ok(np_expect_match("bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_SUCCESS,
@@ -52,7 +52,7 @@ main(void)
            "Test not matching all strings");
         ok(np_expect_match("XX XX", server_expect, server_expect_count, NP_MATCH_ALL) == NP_MATCH_RETRY,
            "Test not matching any string (testing all)");
-         
+
 
         return exit_status();
 }
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 7b10494..01afacd 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-* 
+*
 * 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 of the License, 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 "common.h"
@@ -62,99 +62,99 @@ main (int argc, char **argv)
         range = parse_range_string("6");
         ok( range != NULL, "'6' is valid range");
         ok( range->start == 0, "Start correct");
-        ok( range->start_infinity == FALSE, "Not using negative infinity");
+        ok( range->start_infinity == false, "Not using negative infinity");
         ok( range->end == 6, "End correct");
-        ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("1:12%%");
         ok( range != NULL, "'1:12%%' is valid - percentages are ignored");
         ok( range->start == 1, "Start correct");
-        ok( range->start_infinity == FALSE, "Not using negative infinity");
+        ok( range->start_infinity == false, "Not using negative infinity");
         ok( range->end == 12, "End correct");
-        ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("-7:23");
         ok( range != NULL, "'-7:23' is valid range");
         ok( range->start == -7, "Start correct");
-        ok( range->start_infinity == FALSE, "Not using negative infinity");
+        ok( range->start_infinity == false, "Not using negative infinity");
         ok( range->end == 23, "End correct");
-        ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string(":5.75");
         ok( range != NULL, "':5.75' is valid range");
         ok( range->start == 0, "Start correct");
-        ok( range->start_infinity == FALSE, "Not using negative infinity");
+        ok( range->start_infinity == false, "Not using negative infinity");
         ok( range->end == 5.75, "End correct");
-        ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("~:-95.99");
         ok( range != NULL, "~:-95.99' is valid range");
-        ok( range->start_infinity == TRUE, "Using negative infinity");
+        ok( range->start_infinity == true, "Using negative infinity");
         ok( range->end == -95.99, "End correct (with rounding errors)");
-        ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("12345678901234567890:");
         temp = atof("12345678901234567890");            /* Can't just use this because number too large */
         ok( range != NULL, "'12345678901234567890:' is valid range");
         ok( range->start == temp, "Start correct");
-        ok( range->start_infinity == FALSE, "Not using negative infinity");
-        ok( range->end_infinity == TRUE, "Using infinity");
+        ok( range->start_infinity == false, "Not using negative infinity");
+        ok( range->end_infinity == true, "Using infinity");
         /* Cannot do a "-1" on temp, as it appears to be same value */
-        ok( check_range(temp/1.1, range) == TRUE, "12345678901234567890/1.1 - alert");
-        ok( check_range(temp, range) == FALSE, "12345678901234567890 - no alert");
-        ok( check_range(temp*2, range) == FALSE, "12345678901234567890*2 - no alert");
+        ok( check_range(temp/1.1, range) == true, "12345678901234567890/1.1 - alert");
+        ok( check_range(temp, range) == false, "12345678901234567890 - no alert");
+        ok( check_range(temp*2, range) == false, "12345678901234567890*2 - no alert");
         free(range);
 
         range = parse_range_string("~:0");
         ok( range != NULL, "'~:0' is valid range");
-        ok( range->start_infinity == TRUE, "Using negative infinity");
+        ok( range->start_infinity == true, "Using negative infinity");
         ok( range->end == 0, "End correct");
-        ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( range->end_infinity == false, "Not using infinity");
         ok( range->alert_on == OUTSIDE, "Will alert on outside of this range");
-        ok( check_range(0.5, range) == TRUE, "0.5 - alert");
-        ok( check_range(-10, range) == FALSE, "-10 - no alert");
-        ok( check_range(0, range)   == FALSE, "0 - no alert");
+        ok( check_range(0.5, range) == true, "0.5 - alert");
+        ok( check_range(-10, range) == false, "-10 - no alert");
+        ok( check_range(0, range)   == false, "0 - no alert");
         free(range);
-        
+
         range = parse_range_string("@0:657.8210567");
         ok( range != 0, "@0:657.8210567' is a valid range");
         ok( range->start == 0, "Start correct");
-        ok( range->start_infinity == FALSE, "Not using negative infinity");
+        ok( range->start_infinity == false, "Not using negative infinity");
         ok( range->end == 657.8210567, "End correct");
-        ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( range->end_infinity == false, "Not using infinity");
         ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
-        ok( check_range(32.88, range) == TRUE, "32.88 - alert");
-        ok( check_range(-2, range)    == FALSE, "-2 - no alert");
-        ok( check_range(657.8210567, range) == TRUE, "657.8210567 - alert");
-        ok( check_range(0, range)     == TRUE, "0 - alert");
+        ok( check_range(32.88, range) == true, "32.88 - alert");
+        ok( check_range(-2, range)    == false, "-2 - no alert");
+        ok( check_range(657.8210567, range) == true, "657.8210567 - alert");
+        ok( check_range(0, range)     == true, "0 - alert");
         free(range);
 
         range = parse_range_string("@1:1");
         ok( range != NULL, "'@1:1' is a valid range");
         ok( range->start == 1, "Start correct");
-        ok( range->start_infinity == FALSE, "Not using negative infinity");
+        ok( range->start_infinity == false, "Not using negative infinity");
         ok( range->end == 1, "End correct");
-        ok( range->end_infinity == FALSE, "Not using infinity");
+        ok( range->end_infinity == false, "Not using infinity");
         ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
-        ok( check_range(0.5, range) == FALSE, "0.5 - no alert");
-        ok( check_range(1, range) == TRUE, "1 - alert");
-        ok( check_range(5.2, range) == FALSE, "5.2 - no alert");
+        ok( check_range(0.5, range) == false, "0.5 - no alert");
+        ok( check_range(1, range) == true, "1 - alert");
+        ok( check_range(5.2, range) == false, "5.2 - no alert");
         free(range);
 
         range = parse_range_string("1:1");
         ok( range != NULL, "'1:1' is a valid range");
         ok( range->start == 1, "Start correct");
-        ok( range->start_infinity == FALSE, "Not using negative infinity");
+        ok( range->start_infinity == false, "Not using negative infinity");
         ok( range->end == 1, "End correct");
-        ok( range->end_infinity == FALSE, "Not using infinity");
-        ok( check_range(0.5, range) == TRUE, "0.5 - alert");
-        ok( check_range(1, range) == FALSE, "1 - no alert");
-        ok( check_range(5.2, range) == TRUE, "5.2 - alert");
+        ok( range->end_infinity == false, "Not using infinity");
+        ok( check_range(0.5, range) == true, "0.5 - alert");
+        ok( check_range(1, range) == false, "1 - no alert");
+        ok( check_range(5.2, range) == true, "5.2 - alert");
         free(range);
 
         range = parse_range_string("2:1");
@@ -377,13 +377,13 @@ main (int argc, char **argv)
 
 /*
         temp_fp = fopen("var/statefile", "r");
-        if (temp_fp==NULL) 
+        if (temp_fp==NULL)
                 printf("Error opening. errno=%d\n", errno);
         printf("temp_fp=%s\n", temp_fp);
-        ok( _np_state_read_file(temp_fp) == TRUE, "Can read state file" );
+        ok( _np_state_read_file(temp_fp) == true, "Can read state file" );
         fclose(temp_fp);
 */
-        
+
         temp_state_key->_filename="var/statefile";
         temp_state_data = np_state_read();
         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");
@@ -446,20 +446,20 @@ main (int argc, char **argv)
         /* 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_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 */
         /*
         temp_state_key->_filename="/dev/do/not/expect/to/be/able/to/write";
         np_state_write_string(0, "Bad file");
         */
-        
+
 
         np_cleanup();
 
         ok(this_monitoring_plugin==NULL, "Free'd this_monitoring_plugin");
 
-        ok(mp_suid() == FALSE, "Test aren't suid");
+        ok(mp_suid() == false, "Test aren't suid");
 
         /* base states with random case */
         char *states[] = {
@@ -508,4 +508,3 @@ main (int argc, char **argv)
 
         return exit_status();
 }
-
diff --git a/lib/utils_base.c b/lib/utils_base.c
index c458cf6..f8592f4 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -6,21 +6,21 @@
 * Copyright (c) 2006 Monitoring Plugins Development Team
 *
 * Library of useful functions for plugins
-* 
+*
 *
 * 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 of the License, 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/>.
-* 
+*
 *
 *****************************************************************************/
 
@@ -37,10 +37,10 @@
 
 monitoring_plugin *this_monitoring_plugin=NULL;
 
-unsigned int timeout_state = STATE_CRITICAL;
+int timeout_state = STATE_CRITICAL;
 unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
 
-int _np_state_read_file(FILE *);
+bool _np_state_read_file(FILE *);
 
 void np_init( char *plugin_name, int argc, char **argv ) {
         if (this_monitoring_plugin==NULL) {
@@ -105,12 +105,12 @@ die (int result, const char *fmt, ...)
 
 void set_range_start (range *this, double value) {
         this->start = value;
-        this->start_infinity = FALSE;
+        this->start_infinity = false;
 }
 
 void set_range_end (range *this, double value) {
         this->end = value;
-        this->end_infinity = FALSE;
+        this->end_infinity = false;
 }
 
 range
@@ -124,9 +124,9 @@ range
 
         /* Set defaults */
         temp_range->start = 0;
-        temp_range->start_infinity = FALSE;
+        temp_range->start_infinity = false;
         temp_range->end = 0;
-        temp_range->end_infinity = TRUE;
+        temp_range->end_infinity = true;
         temp_range->alert_on = OUTSIDE;
         temp_range->text = strdup(str);
 
@@ -138,7 +138,7 @@ range
         end_str = index(str, ':');
         if (end_str != NULL) {
                 if (str[0] == '~') {
-                        temp_range->start_infinity = TRUE;
+                        temp_range->start_infinity = true;
                 } else {
                         start = strtod(str, NULL);      /* Will stop at the ':' */
                         set_range_start(temp_range, start);
@@ -152,8 +152,8 @@ range
                 set_range_end(temp_range, end);
         }
 
-        if (temp_range->start_infinity == TRUE ||
-                temp_range->end_infinity == TRUE ||
+        if (temp_range->start_infinity == true ||
+                temp_range->end_infinity == true ||
                 temp_range->start <= temp_range->end) {
                 return temp_range;
         }
@@ -223,31 +223,30 @@ void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
         printf("\n");
 }
 
-/* Returns TRUE if alert should be raised based on the range */
-int
-check_range(double value, range *my_range)
+/* Returns true if alert should be raised based on the range */
+bool check_range(double value, range *my_range)
 {
-        int no = FALSE;
-        int yes = TRUE;
+        bool no = false;
+        bool yes = true;
 
         if (my_range->alert_on == INSIDE) {
-                no = TRUE;
-                yes = FALSE;
+                no = true;
+                yes = false;
         }
 
-        if (my_range->end_infinity == FALSE && my_range->start_infinity == FALSE) {
+        if (my_range->end_infinity == false && my_range->start_infinity == false) {
                 if ((my_range->start <= value) && (value <= my_range->end)) {
                         return no;
                 } else {
                         return yes;
                 }
-        } else if (my_range->start_infinity == FALSE && my_range->end_infinity == TRUE) {
+        } else if (my_range->start_infinity == false && my_range->end_infinity == true) {
                 if (my_range->start <= value) {
                         return no;
                 } else {
                         return yes;
                 }
-        } else if (my_range->start_infinity == TRUE && my_range->end_infinity == FALSE) {
+        } else if (my_range->start_infinity == true && my_range->end_infinity == false) {
                 if (value <= my_range->end) {
                         return no;
                 } else {
@@ -263,12 +262,12 @@ int
 get_status(double value, thresholds *my_thresholds)
 {
         if (my_thresholds->critical != NULL) {
-                if (check_range(value, my_thresholds->critical) == TRUE) {
+                if (check_range(value, my_thresholds->critical) == true) {
                         return STATE_CRITICAL;
                 }
         }
         if (my_thresholds->warning != NULL) {
-                if (check_range(value, my_thresholds->warning) == TRUE) {
+                if (check_range(value, my_thresholds->warning) == true) {
                         return STATE_WARNING;
                 }
         }
@@ -332,7 +331,7 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
                                 /* strip leading spaces */
                                 for (; isspace(varlist[0]); varlist++);
 
-                                if (tmp = index(varlist, sep)) {
+                                if ((tmp = index(varlist, sep))) {
                                         /* Value is delimited by a comma */
                                         if (tmp-varlist == 0) continue;
                                         value = (char *)calloc(1, tmp-varlist+1);
@@ -348,7 +347,7 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
                                 break;
                         }
                 }
-                if (tmp = index(varlist, sep)) {
+                if ((tmp = index(varlist, sep))) {
                         /* More keys, keep going... */
                         varlist = tmp + 1;
                 } else {
@@ -402,26 +401,45 @@ int mp_translate_state (char *state_text) {
  * parse of argv, so that uniqueness in parameters are reflected there.
  */
 char *_np_state_generate_key() {
-        struct sha256_ctx ctx;
         int i;
         char **argv = this_monitoring_plugin->argv;
-        unsigned char result[20];
         char keyname[41];
         char *p=NULL;
 
-        sha256_init_ctx(&ctx);
-        
+        unsigned char result[256];
+
+#ifdef USE_OPENSSL
+        /*
+         * This code path is chosen if openssl is available (which should be the most common
+         * scenario). Alternatively, the gnulib implementation/
+         *
+         */
+        EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+
+        EVP_DigestInit(ctx, EVP_sha256());
+
+        for(i=0; i<this_monitoring_plugin->argc; i++) {
+                EVP_DigestUpdate(ctx, argv[i], strlen(argv[i]));
+        }
+
+        EVP_DigestFinal(ctx, result, NULL);
+#else
+
+        struct sha256_ctx ctx;
+
         for(i=0; i<this_monitoring_plugin->argc; i++) {
                 sha256_process_bytes(argv[i], strlen(argv[i]), &ctx);
         }
 
-        sha256_finish_ctx(&ctx, &result);
-        
+        sha256_finish_ctx(&ctx, result);
+#endif // FOUNDOPENSSL
+
         for (i=0; i<20; ++i) {
                 sprintf(&keyname[2*i], "%02x", result[i]);
         }
+
         keyname[40]='\0';
-        
+
         p = strdup(keyname);
         if(p==NULL) {
                 die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
@@ -446,7 +464,7 @@ char* _np_state_calculate_location_prefix(){
 
         /* Do not allow passing MP_STATE_PATH in setuid plugins
          * for security reasons */
-        if (mp_suid() == FALSE) {
+        if (!mp_suid()) {
                 env_dir = getenv("MP_STATE_PATH");
                 if(env_dir && env_dir[0] != '\0')
                         return env_dir;
@@ -522,7 +540,7 @@ void np_enable_state(char *keyname, int expected_data_version) {
 state_data *np_state_read() {
         state_data *this_state_data=NULL;
         FILE *statefile;
-        int rc = FALSE;
+        bool rc = false;
 
         if(this_monitoring_plugin==NULL)
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
@@ -544,7 +562,7 @@ state_data *np_state_read() {
                 fclose(statefile);
         }
 
-        if(rc==FALSE) {
+        if(!rc) {
                 _cleanup_state_data();
         }
 
@@ -554,8 +572,8 @@ state_data *np_state_read() {
 /*
  * Read the state file
  */
-int _np_state_read_file(FILE *f) {
-        int status=FALSE;
+bool _np_state_read_file(FILE *f) {
+        bool status = false;
         size_t pos;
         char *line;
         int i;
@@ -609,7 +627,7 @@ int _np_state_read_file(FILE *f) {
                                 if(this_monitoring_plugin->state->state_data->data==NULL)
                                         die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
                                 expected=STATE_DATA_END;
-                                status=TRUE;
+                                status=true;
                                 break;
                         case STATE_DATA_END:
                                 ;
@@ -621,10 +639,10 @@ int _np_state_read_file(FILE *f) {
 }
 
 /*
- * If time=NULL, use current time. Create state file, with state format 
- * version, default text. Writes version, time, and data. Avoid locking 
- * problems - use mv to write and then swap. Possible loss of state data if 
- * two things writing to same key at same time. 
+ * If time=NULL, use current time. Create state file, with state format
+ * version, default text. Writes version, time, and data. Avoid locking
+ * problems - use mv to write and then swap. Possible loss of state data if
+ * two things writing to same key at same time.
  * Will die with UNKNOWN if errors
  */
 void np_state_write_string(time_t data_time, char *data_string) {
@@ -639,7 +657,7 @@ void np_state_write_string(time_t data_time, char *data_string) {
                 time(&current_time);
         else
                 current_time=data_time;
-        
+
         /* If file doesn't currently exist, create directories */
         if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
                 result = asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
@@ -678,15 +696,15 @@ void np_state_write_string(time_t data_time, char *data_string) {
                 np_free(temp_file);
                 die(STATE_UNKNOWN, _("Unable to open temporary state file"));
         }
-        
+
         fprintf(fp,"# NP State file\n");
         fprintf(fp,"%d\n",NP_STATE_FORMAT_VERSION);
         fprintf(fp,"%d\n",this_monitoring_plugin->state->data_version);
         fprintf(fp,"%lu\n",current_time);
         fprintf(fp,"%s\n",data_string);
-        
+
         fchmod(fd, S_IRUSR | S_IWUSR | S_IRGRP);
-        
+
         fflush(fp);
 
         result=fclose(fp);
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 5906550..9d4dffe 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -2,9 +2,11 @@
 #define _UTILS_BASE_
 /* Header file for Monitoring Plugins utils_base.c */
 
-#include "sha256.h"
+#ifndef USE_OPENSSL
+# include "sha256.h"
+#endif
 
-/* This file holds header information for thresholds - use this in preference to 
+/* This file holds header information for thresholds - use this in preference to
    individual plugin logic */
 
 /* This has not been merged with utils.h because of problems with
@@ -19,7 +21,7 @@
 
 typedef struct range_struct {
         double  start;
-        int     start_infinity;         /* FALSE (default) or TRUE */
+        bool start_infinity;
         double  end;
         int     end_infinity;
         int     alert_on;               /* OUTSIDE (default) or INSIDE */
@@ -59,11 +61,11 @@ range *parse_range_string (char *);
 int _set_thresholds(thresholds **, char *, char *);
 void set_thresholds(thresholds **, char *, char *);
 void print_thresholds(const char *, thresholds *);
-int check_range(double, range *);
+bool check_range(double, range *);
 int get_status(double, thresholds *);
 
 /* Handle timeouts */
-extern unsigned int timeout_state;
+extern int timeout_state;
 extern unsigned int timeout_interval;
 
 /* All possible characters in a threshold range */
@@ -77,7 +79,7 @@ void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3)))
 #define NP_RANGE_UNPARSEABLE 1
 #define NP_WARN_WITHIN_CRIT 2
 
-/* a simple check to see if we're running as root.  
+/* a simple check to see if we're running as root.
  * returns zero on failure, nonzero on success */
 int np_check_if_root(void);
 
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 34fb390..7957ec1 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -18,18 +18,18 @@
 * Care has been taken to make sure the functions are async-safe. The one
 * function which isn't is cmd_init() which it doesn't make sense to
 * call twice anyway, so the api as a whole should be considered async-safe.
-* 
-* 
+*
+*
 * 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 of the License, 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/>.
 *
@@ -42,7 +42,20 @@
 #include "common.h"
 #include "utils.h"
 #include "utils_cmd.h"
+/* This variable must be global, since there's no way the caller
+ * can forcibly slay a dead or ungainly running program otherwise.
+ * Multithreading apps and plugins can initialize it (via CMD_INIT)
+ * in an async safe manner PRIOR to calling cmd_run() or cmd_run_array()
+ * for the first time.
+ *
+ * The check for initialized values is atomic and can
+ * occur in any number of threads simultaneously. */
+static pid_t *_cmd_pids = NULL;
+
 #include "utils_base.h"
+
+#include "./maxfd.h"
+
 #include <fcntl.h>
 
 #ifdef HAVE_SYS_WAIT_H
@@ -86,13 +99,7 @@ extern void die (int, const char *, ...)
 void
 cmd_init (void)
 {
-#ifndef maxfd
-        if (!maxfd && (maxfd = sysconf (_SC_OPEN_MAX)) < 0) {
-                /* possibly log or emit a warning here, since there's no
-                 * guarantee that our guess at maxfd will be adequate */
-                maxfd = DEFAULT_MAXFD;
-        }
-#endif
+        long maxfd = mp_open_max();
 
         /* if maxfd is unnaturally high, we force it to a lower value
          * ( e.g. on SunOS, when ulimit is set to unlimited: 2147483647 this would cause
@@ -148,6 +155,7 @@ _cmd_open (char *const *argv, int *pfd, int *pfderr)
                 /* close all descriptors in _cmd_pids[]
                  * This is executed in a separate address space (pure child),
                  * so we don't have to worry about async safety */
+                long maxfd = mp_open_max();
                 for (i = 0; i < maxfd; i++)
                         if (_cmd_pids[i] > 0)
                                 close (i);
@@ -174,6 +182,7 @@ _cmd_close (int fd)
         pid_t pid;
 
         /* make sure the provided fd was opened */
+        long maxfd = mp_open_max();
         if (fd < 0 || fd > maxfd || !_cmd_pids || (pid = _cmd_pids[fd]) == 0)
                 return -1;
 
@@ -265,7 +274,6 @@ _cmd_fetch_output (int fd, output * op, int flags)
 int
 cmd_run (const char *cmdstring, output * out, output * err, int flags)
 {
-        int fd, pfd_out[2], pfd_err[2];
         int i = 0, argc;
         size_t cmdlen;
         char **argv = NULL;
@@ -369,10 +377,10 @@ cmd_file_read ( char *filename, output *out, int flags)
         if ((fd = open(filename, O_RDONLY)) == -1) {
                 die( STATE_UNKNOWN, _("Error opening %s: %s"), filename, strerror(errno) );
         }
-        
+
         if(out)
                 out->lines = _cmd_fetch_output (fd, out, flags);
-        
+
         if (close(fd) == -1)
                 die( STATE_UNKNOWN, _("Error closing %s: %s"), filename, strerror(errno) );
 
@@ -382,12 +390,12 @@ cmd_file_read ( char *filename, output *out, int flags)
 void
 timeout_alarm_handler (int signo)
 {
-        size_t i;
         if (signo == SIGALRM) {
                 printf (_("%s - Plugin timed out after %d seconds\n"),
                                                 state_text(timeout_state), timeout_interval);
 
-                if(_cmd_pids) for(i = 0; i < maxfd; i++) {
+                long maxfd = mp_open_max();
+                if(_cmd_pids) for(long int i = 0; i < maxfd; i++) {
                         if(_cmd_pids[i] != 0) kill(_cmd_pids[i], SIGKILL);
                 }
 
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index 6f3aeb8..061f5d4 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -1,10 +1,10 @@
 #ifndef _UTILS_CMD_
 #define _UTILS_CMD_
 
-/* 
+/*
  * Header file for Monitoring Plugins utils_cmd.c
- * 
- * 
+ *
+ *
  */
 
 /** types **/
@@ -32,17 +32,8 @@ void cmd_init (void);
 #define CMD_NO_ARRAYS 0x01   /* don't populate arrays at all */
 #define CMD_NO_ASSOC 0x02    /* output.line won't point to buf */
 
-/* This variable must be global, since there's no way the caller
- * can forcibly slay a dead or ungainly running program otherwise.
- * Multithreading apps and plugins can initialize it (via CMD_INIT)
- * in an async safe manner PRIOR to calling cmd_run() or cmd_run_array()
- * for the first time.
- *
- * The check for initialized values is atomic and can
- * occur in any number of threads simultaneously. */
-static pid_t *_cmd_pids = NULL;
 
-RETSIGTYPE timeout_alarm_handler (int);
+void timeout_alarm_handler (int);
 
 
 #endif /* _UTILS_CMD_ */
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index 582d3ea..483be06 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -1,34 +1,35 @@
 /*****************************************************************************
-* 
+*
 * Library for check_disk
-* 
+*
 * License: GPL
 * Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
+*
 * Description:
-* 
+*
 * This file contains utilities for check_disk. These are tested by libtap
-* 
-* 
+*
+*
 * 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 of the License, 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 "common.h"
 #include "utils_disk.h"
 #include "gl/fsusage.h"
+#include <string.h>
 
 void
 np_add_name (struct name_list **list, const char *name)
@@ -40,6 +41,42 @@ np_add_name (struct name_list **list, const char *name)
   *list = new_entry;
 }
 
+/* @brief Initialises a new regex at the begin of list via regcomp(3)
+ *
+ * @details if the regex fails to compile the error code of regcomp(3) is returned
+ *                                      and list is not modified, otherwise list is modified to point to the new
+ *                                      element
+ * @param list Pointer to a linked list of regex_list elements
+ * @param regex the string containing the regex which should be inserted into the list
+ * @param clags the cflags parameter for regcomp(3)
+ */
+int
+np_add_regex (struct regex_list **list, const char *regex, int cflags)
+{
+  struct regex_list *new_entry = (struct regex_list *) malloc (sizeof *new_entry);
+
+        if (new_entry == NULL) {
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
+                                strerror(errno));
+        }
+
+  int regcomp_result = regcomp(&new_entry->regex, regex, cflags);
+
+        if (!regcomp_result) {
+                // regcomp succeeded
+                new_entry->next = *list;
+                *list = new_entry;
+
+                return 0;
+        } else {
+                // regcomp failed
+                free(new_entry);
+
+                return regcomp_result;
+        }
+
+}
+
 /* Initialises a new parameter at the end of list */
 struct parameter_list *
 np_add_parameter(struct parameter_list **list, const char *name)
@@ -61,7 +98,7 @@ np_add_parameter(struct parameter_list **list, const char *name)
   new_path->freeinodes_percent = NULL;
   new_path->group = NULL;
   new_path->dfree_pct = -1;
-  new_path->dused_pct = -1; 
+  new_path->dused_pct = -1;
   new_path->total = 0;
   new_path->available = 0;
   new_path->available_to_root = 0;
@@ -133,9 +170,7 @@ np_find_parameter(struct parameter_list *list, const char *name)
   return NULL;
 }
 
-void
-np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, int exact)
-{
+void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, bool exact) {
   struct parameter_list *d;
   for (d = desired; d; d= d->name_next) {
     if (! d->best_match) {
@@ -158,9 +193,9 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
       if (! best_match) {
         for (me = mount_list; me; me = me->me_next) {
           size_t len = strlen (me->me_mountdir);
-          if ((exact == FALSE && (best_match_len <= len && len <= name_len &&
+          if ((!exact && (best_match_len <= len && len <= name_len &&
              (len == 1 || strncmp (me->me_mountdir, d->name, len) == 0)))
-             || (exact == TRUE && strcmp(me->me_mountdir, d->name)==0))
+             || (exact && strcmp(me->me_mountdir, d->name)==0))
           {
             if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) >= 0) {
               best_match = me;
@@ -179,43 +214,57 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
   }
 }
 
-/* Returns TRUE if name is in list */
-int
-np_find_name (struct name_list *list, const char *name)
-{
+/* Returns true if name is in list */
+bool np_find_name (struct name_list *list, const char *name) {
   const struct name_list *n;
 
   if (list == NULL || name == NULL) {
-    return FALSE;
+    return false;
   }
   for (n = list; n; n = n->next) {
     if (!strcmp(name, n->name)) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
-int
-np_seen_name(struct name_list *list, const char *name)
-{
+/* Returns true if name is in list */
+bool np_find_regmatch (struct regex_list *list, const char *name) {
+  int len;
+  regmatch_t m;
+
+  if (name == NULL) {
+    return false;
+  }
+
+  len = strlen(name);
+
+  for (; list; list = list->next) {
+    /* Emulate a full match as if surrounded with ^( )$
+       by checking whether the match spans the whole name */
+    if (!regexec(&list->regex, name, 1, &m, 0) && m.rm_so == 0 && m.rm_eo == len) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+bool np_seen_name(struct name_list *list, const char *name) {
   const struct name_list *s;
   for (s = list; s; s=s->next) {
     if (!strcmp(s->name, name)) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
-int
-np_regex_match_mount_entry (struct mount_entry* me, regex_t* re)
-{
+bool np_regex_match_mount_entry (struct mount_entry* me, regex_t* re) {
   if (regexec(re, me->me_devname, (size_t) 0, NULL, 0) == 0 ||
       regexec(re, me->me_mountdir, (size_t) 0, NULL, 0) == 0 ) {
-    return TRUE;
-  } else {
-    return FALSE;
+    return true;
   }
+        return false;
 }
-
diff --git a/lib/utils_disk.h b/lib/utils_disk.h
index 3b5a45f..5b2caf2 100644
--- a/lib/utils_disk.h
+++ b/lib/utils_disk.h
@@ -10,6 +10,12 @@ struct name_list
   struct name_list *next;
 };
 
+struct regex_list
+{
+  regex_t regex;
+  struct regex_list *next;
+};
+
 struct parameter_list
 {
   char *name;
@@ -33,12 +39,14 @@ struct parameter_list
 };
 
 void np_add_name (struct name_list **list, const char *name);
-int np_find_name (struct name_list *list, const char *name);
-int np_seen_name (struct name_list *list, const char *name);
+bool np_find_name (struct name_list *list, const char *name);
+bool np_seen_name (struct name_list *list, const char *name);
+int np_add_regex (struct regex_list **list, const char *regex, int cflags);
+bool np_find_regmatch (struct regex_list *list, const char *name);
 struct parameter_list *np_add_parameter(struct parameter_list **list, const char *name);
 struct parameter_list *np_find_parameter(struct parameter_list *list, const char *name);
 struct parameter_list *np_del_parameter(struct parameter_list *item, struct parameter_list *prev);
-  
+
 int search_parameter_list (struct parameter_list *list, const char *name);
-void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, int exact);
-int np_regex_match_mount_entry (struct mount_entry* me, regex_t* re);
+void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, bool exact);
+bool np_regex_match_mount_entry (struct mount_entry* me, regex_t* re);
diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index b37c446..23ee4a9 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -1,29 +1,29 @@
 /*****************************************************************************
-* 
+*
 * Library for check_tcp
-* 
+*
 * License: GPL
 * Copyright (c) 1999-2013 Monitoring Plugins Development Team
-* 
+*
 * Description:
-* 
+*
 * This file contains utilities for check_tcp. These are tested by libtap
-* 
-* 
+*
+*
 * 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 of the License, 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 "common.h"
diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4
index 9f533ea..9fe38ac 100644
--- a/m4/np_mysqlclient.m4
+++ b/m4/np_mysqlclient.m4
@@ -13,7 +13,7 @@ dnl   np_mysql_libs    = flags for libs,    from mysql_config --libs
 dnl   np_mysql_cflags  = flags for cflags,  from mysql_config --cflags
 dnl Also sets in config.h:
 dnl   HAVE_MYSQLCLIENT
-dnl Copile your code with:
+dnl Compile your code with:
 dnl   $(CC) $(np_mysql_include) code.c $(np_mysql_libs)
 
 AC_DEFUN([np_mysqlclient],
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 40aa020..a80229e 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/libmonitoringplug.a ../gl/libgnu.a $(LIB_CRYPTO)
+BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
@@ -80,8 +80,8 @@ install-exec-local: $(noinst_PROGRAMS)
 
 ##############################################################################
 # the actual targets
-check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS)
-check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
+check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) $(LIB_CRYPTO)
+check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) $(LIB_CRYPTO)
 
 # -m64 needed at compiler and linker phase
 pst3_CFLAGS = @PST3CFLAGS@
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 2d22619..4b8f5e2 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -1,40 +1,40 @@
 /*****************************************************************************
-* 
-* Monitoring check_dhcp plugin
-* 
-* License: GPL
-* Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2001-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_dhcp plugin
-* 
-* This plugin tests the availability of DHCP servers on a network.
-* 
-* Unicast mode was originally implemented by Heiti of Boras Kommun with
-* general improvements as well as usability fixes and "forward"-porting by
-* Andreas Ericsson of OP5 AB.
-* 
-* 
-* 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 of the License, 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/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_dhcp plugin
+ *
+ * License: GPL
+ * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 2001-2007 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_dhcp plugin
+ *
+ * This plugin tests the availability of DHCP servers on a network.
+ *
+ * Unicast mode was originally implemented by Heiti of Boras Kommun with
+ * general improvements as well as usability fixes and "forward"-porting by
+ * Andreas Ericsson of OP5 AB.
+ *
+ *
+ * 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 of the License, 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/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_dhcp";
-const char *copyright = "2001-2007";
+const char *copyright = "2001-2023";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -57,9 +57,10 @@ const char *email = "devel@monitoring-plugins.org";
 #include <netinet/in.h>
 #include <net/if.h>
 #include <arpa/inet.h>
+
 #if HAVE_SYS_SOCKIO_H
 #include <sys/sockio.h>
-#endif
+#endif // HAVE_SYS_SOCKIO_H
 
 #if defined( __linux__ )
 
@@ -98,10 +99,6 @@ static struct strbuf dat = {AREA_SZ, 0, (char *)dat_area};
 #define GOT_INTR 4
 #define GOT_ERR 128
 
-#define u_int8_t         uint8_t
-#define u_int16_t       uint16_t
-#define u_int32_t       uint32_t
-
 static int get_msg(int);
 static int check_ctrl(int);
 static int put_ctrl(int, int, int);
@@ -110,7 +107,7 @@ static int dl_open(const char *, int, int *);
 static int dl_bind(int, int, u_char *);
 long mac_addr_dlpi( const char *, int, u_char *);
 
-#endif
+#endif // __sun__ || __solaris__ || __hpux
 
 
 
@@ -119,9 +116,6 @@ long mac_addr_dlpi( const char *, int, u_char *);
 #define OK                0
 #define ERROR             -1
 
-#define FALSE             0
-#define TRUE              1
-
 
 /**** DHCP definitions ****/
 
@@ -132,39 +126,40 @@ long mac_addr_dlpi( const char *, int, u_char *);
 
 
 typedef struct dhcp_packet_struct{
-        u_int8_t  op;                   /* packet type */
-        u_int8_t  htype;                /* type of hardware address for this machine (Ethernet, etc) */
-        u_int8_t  hlen;                 /* length of hardware address (of this machine) */
-        u_int8_t  hops;                 /* hops */
-        u_int32_t xid;                  /* random transaction id number - chosen by this machine */
-        u_int16_t secs;                 /* seconds used in timing */
-        u_int16_t flags;                /* flags */
-        struct in_addr ciaddr;          /* IP address of this machine (if we already have one) */
-        struct in_addr yiaddr;          /* IP address of this machine (offered by the DHCP server) */
-        struct in_addr siaddr;          /* IP address of next server */
-        struct in_addr giaddr;          /* IP address of DHCP relay */
-        unsigned char chaddr [MAX_DHCP_CHADDR_LENGTH];      /* hardware address of this machine */
-        char sname [MAX_DHCP_SNAME_LENGTH];    /* name of DHCP server */
-        char file [MAX_DHCP_FILE_LENGTH];      /* boot file name (used for diskless booting?) */
+        uint8_t  op;                   /* packet type */
+        uint8_t  htype;                /* type of hardware address for this machine (Ethernet, etc) */
+        uint8_t  hlen;                 /* length of hardware address (of this machine) */
+        uint8_t  hops;                 /* hops */
+        uint32_t xid;                  /* random transaction id number - chosen by this machine */
+        uint16_t secs;                 /* seconds used in timing */
+        uint16_t flags;                /* flags */
+        struct in_addr ciaddr;          /* IP address of this machine (if we already have one) */
+        struct in_addr yiaddr;          /* IP address of this machine (offered by the DHCP server) */
+        struct in_addr siaddr;          /* IP address of next server */
+        struct in_addr giaddr;          /* IP address of DHCP relay */
+        unsigned char chaddr [MAX_DHCP_CHADDR_LENGTH];      /* hardware address of this machine */
+        char sname [MAX_DHCP_SNAME_LENGTH];    /* name of DHCP server */
+        char file [MAX_DHCP_FILE_LENGTH];      /* boot file name (used for diskless booting?) */
         char options[MAX_DHCP_OPTIONS_LENGTH];  /* options */
-        }dhcp_packet;
+}dhcp_packet;
 
 
 typedef struct dhcp_offer_struct{
         struct in_addr server_address;   /* address of DHCP server that sent this offer */
         struct in_addr offered_address;  /* the IP address that was offered to us */
-        u_int32_t lease_time;            /* lease time in seconds */
-        u_int32_t renewal_time;          /* renewal time in seconds */
-        u_int32_t rebinding_time;        /* rebinding time in seconds */
+        uint32_t lease_time;            /* lease time in seconds */
+        uint32_t renewal_time;          /* renewal time in seconds */
+        uint32_t rebinding_time;        /* rebinding time in seconds */
+        bool desired;                 /* is this offer desired (necessary in exclusive mode) */
         struct dhcp_offer_struct *next;
-        }dhcp_offer;
+}dhcp_offer;
 
 
 typedef struct requested_server_struct{
         struct in_addr server_address;
-        int answered;
+        bool answered;
         struct requested_server_struct *next;
-        }requested_server;
+}requested_server;
 
 
 #define BOOTREQUEST     1
@@ -198,7 +193,8 @@ typedef struct requested_server_struct{
 #define ETHERNET_HARDWARE_ADDRESS            1     /* used in htype field of dhcp packet */
 #define ETHERNET_HARDWARE_ADDRESS_LENGTH     6     /* length of Ethernet hardware addresses */
 
-u_int8_t unicast = 0;        /* unicast mode: mimic a DHCP relay */
+bool unicast = false;        /* unicast mode: mimic a DHCP relay */
+bool exclusive = false;      /* exclusive mode aka "rogue DHCP server detection" */
 struct in_addr my_ip;        /* our address (required for relay) */
 struct in_addr dhcp_ip;      /* server to query (if in unicast mode) */
 unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH]="";
@@ -206,11 +202,11 @@ unsigned char *user_specified_mac=NULL;
 
 char network_interface_name[IFNAMSIZ]="eth0";
 
-u_int32_t packet_xid=0;
+uint32_t packet_xid=0;
 
-u_int32_t dhcp_lease_time=0;
-u_int32_t dhcp_renewal_time=0;
-u_int32_t dhcp_rebinding_time=0;
+uint32_t dhcp_lease_time=0;
+uint32_t dhcp_renewal_time=0;
+uint32_t dhcp_rebinding_time=0;
 
 int dhcpoffer_timeout=2;
 
@@ -221,8 +217,8 @@ int valid_responses=0;     /* number of valid DHCPOFFERs we received */
 int requested_servers=0;
 int requested_responses=0;
 
-int request_specific_address=FALSE;
-int received_requested_address=FALSE;
+bool request_specific_address=false;
+bool received_requested_address=false;
 int verbose=0;
 struct in_addr requested_address;
 
@@ -268,7 +264,7 @@ int main(int argc, char **argv){
 
         if(process_arguments(argc,argv)!=OK){
                 usage4 (_("Could not parse arguments"));
-                }
+        }
 
         /* create socket for DHCP communications */
         dhcp_socket=create_dhcp_socket();
@@ -299,7 +295,7 @@ int main(int argc, char **argv){
         free_requested_server_list();
 
         return result;
-        }
+}
 
 
 
@@ -314,83 +310,83 @@ int get_hardware_address(int sock,char *interface_name){
 
         /* try and grab hardware address of requested interface */
         if(ioctl(sock,SIOCGIFHWADDR,&ifr)<0){
-                printf(_("Error: Could not get hardware address of interface '%s'\n"),interface_name);
+                printf(_("Error: Could not get hardware address of interface '%s'\n"),interface_name);
                 exit(STATE_UNKNOWN);
-                }
+        }
 
         memcpy(&client_hardware_address[0],&ifr.ifr_hwaddr.sa_data,6);
 
 #elif defined(__bsd__)
-                                                /* King 2004    see ACKNOWLEDGEMENTS */
-
-        size_t                  len;
-        int                     mib[6];
-        char                    *buf;
-        unsigned char           *ptr;
-        struct if_msghdr        *ifm;
-        struct sockaddr_dl      *sdl;
-
-        mib[0] = CTL_NET;
-        mib[1] = AF_ROUTE;
-        mib[2] = 0;
-        mib[3] = AF_LINK;
-        mib[4] = NET_RT_IFLIST;
-
-        if((mib[5] = if_nametoindex(interface_name)) == 0){
-                printf(_("Error: if_nametoindex error - %s.\n"), strerror(errno));
-                exit(STATE_UNKNOWN);
-                }
+        /* King 2004    see ACKNOWLEDGEMENTS */
+
+        size_t                  len;
+        int                     mib[6];
+        char                    *buf;
+        unsigned char           *ptr;
+        struct if_msghdr        *ifm;
+        struct sockaddr_dl      *sdl;
+
+        mib[0] = CTL_NET;
+        mib[1] = AF_ROUTE;
+        mib[2] = 0;
+        mib[3] = AF_LINK;
+        mib[4] = NET_RT_IFLIST;
+
+        if((mib[5] = if_nametoindex(interface_name)) == 0){
+                printf(_("Error: if_nametoindex error - %s.\n"), strerror(errno));
+                exit(STATE_UNKNOWN);
+        }
 
-        if(sysctl(mib, 6, NULL, &len, NULL, 0) < 0){
-                printf(_("Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n"), interface_name, strerror(errno));
-                exit(STATE_UNKNOWN);
-                }
+        if(sysctl(mib, 6, NULL, &len, NULL, 0) < 0){
+                printf(_("Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n"), interface_name, strerror(errno));
+                exit(STATE_UNKNOWN);
+        }
 
-        if((buf = malloc(len)) == NULL){
-                printf(_("Error: Couldn't get hardware address from interface %s. malloc error - %s.\n"), interface_name, strerror(errno));
-                exit(4);
-                }
+        if((buf = malloc(len)) == NULL){
+                printf(_("Error: Couldn't get hardware address from interface %s. malloc error - %s.\n"), interface_name, strerror(errno));
+                exit(4);
+        }
 
-        if(sysctl(mib, 6, buf, &len, NULL, 0) < 0){
-                printf(_("Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"), interface_name, strerror(errno));
-                exit(STATE_UNKNOWN);
-                }
+        if(sysctl(mib, 6, buf, &len, NULL, 0) < 0){
+                printf(_("Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"), interface_name, strerror(errno));
+                exit(STATE_UNKNOWN);
+        }
 
-        ifm = (struct if_msghdr *)buf;
-        sdl = (struct sockaddr_dl *)(ifm + 1);
-        ptr = (unsigned char *)LLADDR(sdl);
-        memcpy(&client_hardware_address[0], ptr, 6) ;
-                                                /* King 2004 */
+        ifm = (struct if_msghdr *)buf;
+        sdl = (struct sockaddr_dl *)(ifm + 1);
+        ptr = (unsigned char *)LLADDR(sdl);
+        memcpy(&client_hardware_address[0], ptr, 6) ;
+        /* King 2004 */
 
 #elif defined(__sun__) || defined(__solaris__)
 
-                                                /* Kompf 2000-2003      see ACKNOWLEDGEMENTS */
+        /* Kompf 2000-2003      see ACKNOWLEDGEMENTS */
         long stat;
         char dev[20] = "/dev/";
         char *p;
         int unit;
 
-    /* get last number from interfacename, eg lnc0, e1000g0*/
-    int i;
-    p = interface_name + strlen(interface_name) -1;
+        /* get last number from interfacename, eg lnc0, e1000g0*/
+        int i;
+        p = interface_name + strlen(interface_name) -1;
         for(i = strlen(interface_name) -1; i > 0; p--) {
                 if(isalpha(*p))
-            break;
-    }
-    p++;
+                        break;
+        }
+        p++;
         if( p != interface_name ){
                 unit = atoi(p) ;
                 strncat(dev, interface_name, 6) ;
-                }
+        }
         else{
                 printf(_("Error: can't find unit number in interface_name (%s) - expecting TypeNumber eg lnc0.\n"), interface_name);
                 exit(STATE_UNKNOWN);
-                }
+        }
         stat = mac_addr_dlpi(dev, unit, client_hardware_address);
         if(stat != 0){
                 printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"), dev, unit);
                 exit(STATE_UNKNOWN);
-                }
+        }
 
 #elif defined(__hpux__)
 
@@ -402,8 +398,8 @@ int get_hardware_address(int sock,char *interface_name){
         if(stat != 0){
                 printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"), dev, unit);
                 exit(STATE_UNKNOWN);
-                }
-                                                /* Kompf 2000-2003 */
+        }
+        /* Kompf 2000-2003 */
 
 #else
         printf(_("Error: can't get MAC address for this architecture.  Use the --mac option.\n"));
@@ -414,7 +410,7 @@ int get_hardware_address(int sock,char *interface_name){
                 print_hardware_address(client_hardware_address);
 
         return OK;
-        }
+}
 
 /* determines IP address of the client interface */
 int get_ip_address(int sock,char *interface_name){
@@ -426,9 +422,9 @@ int get_ip_address(int sock,char *interface_name){
 
         if(ioctl(sock,SIOCGIFADDR,&ifr)<0){
                 printf(_("Error: Cannot determine IP address of interface %s\n"),
-                        interface_name);
+                                interface_name);
                 exit(STATE_UNKNOWN);
-                }
+        }
 
         my_ip=((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr;
 
@@ -441,13 +437,13 @@ int get_ip_address(int sock,char *interface_name){
                 printf(_("Pretending to be relay client %s\n"),inet_ntoa(my_ip));
 
         return OK;
-        }
+}
 
 /* sends a DHCPDISCOVER broadcast message in an attempt to find DHCP servers */
 int send_dhcp_discover(int sock){
         dhcp_packet discover_packet;
         struct sockaddr_in sockaddr_broadcast;
-    unsigned short opts;
+        unsigned short opts;
 
 
         /* clear the packet data structure */
@@ -488,20 +484,20 @@ int send_dhcp_discover(int sock){
         discover_packet.options[2]='\x53';
         discover_packet.options[3]='\x63';
 
-    opts = 4;
+        opts = 4;
         /* DHCP message type is embedded in options field */
         discover_packet.options[opts++]=DHCP_OPTION_MESSAGE_TYPE;    /* DHCP message type option identifier */
         discover_packet.options[opts++]='\x01';               /* DHCP message option length in bytes */
         discover_packet.options[opts++]=DHCPDISCOVER;
 
         /* the IP address we're requesting */
-        if(request_specific_address==TRUE){
+        if(request_specific_address){
                 discover_packet.options[opts++]=DHCP_OPTION_REQUESTED_ADDRESS;
                 discover_packet.options[opts++]='\x04';
                 memcpy(&discover_packet.options[opts],&requested_address,sizeof(requested_address));
                 opts += sizeof(requested_address);
-                }
-        discover_packet.options[opts++]=DHCP_OPTION_END;
+        }
+        discover_packet.options[opts++]= (char)DHCP_OPTION_END;
 
         /* unicast fields */
         if(unicast)
@@ -511,8 +507,8 @@ int send_dhcp_discover(int sock){
         discover_packet.hops = unicast ? 1 : 0;
 
         /* send the DHCPDISCOVER packet to broadcast address */
-        sockaddr_broadcast.sin_family=AF_INET;
-        sockaddr_broadcast.sin_port=htons(DHCP_SERVER_PORT);
+        sockaddr_broadcast.sin_family=AF_INET;
+        sockaddr_broadcast.sin_port=htons(DHCP_SERVER_PORT);
         sockaddr_broadcast.sin_addr.s_addr = unicast ? dhcp_ip.s_addr : INADDR_BROADCAST;
         bzero(&sockaddr_broadcast.sin_zero,sizeof(sockaddr_broadcast.sin_zero));
 
@@ -524,7 +520,7 @@ int send_dhcp_discover(int sock){
                 printf("DHCDISCOVER yiaddr:  %s\n",inet_ntoa(discover_packet.yiaddr));
                 printf("DHCDISCOVER siaddr:  %s\n",inet_ntoa(discover_packet.siaddr));
                 printf("DHCDISCOVER giaddr:  %s\n",inet_ntoa(discover_packet.giaddr));
-                }
+        }
 
         /* send the DHCPDISCOVER packet out */
         send_dhcp_packet(&discover_packet,sizeof(discover_packet),sock,&sockaddr_broadcast);
@@ -533,7 +529,7 @@ int send_dhcp_discover(int sock){
                 printf("\n\n");
 
         return OK;
-        }
+}
 
 
 
@@ -573,13 +569,13 @@ int get_dhcp_offer(int sock){
                                 printf(_("Result=ERROR\n"));
 
                         continue;
-                        }
+                }
                 else{
                         if(verbose)
                                 printf(_("Result=OK\n"));
 
                         responses++;
-                        }
+                }
 
                 /* The "source" is either a server or a relay. */
                 /* Save a copy of "source" into "via" even if it's via itself */
@@ -589,7 +585,7 @@ int get_dhcp_offer(int sock){
                         printf(_("DHCPOFFER from IP address %s"),inet_ntoa(source.sin_addr));
                         printf(_(" via %s\n"),inet_ntoa(via.sin_addr));
                         printf("DHCPOFFER XID: %u (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid));
-                        }
+                }
 
                 /* check packet xid to see if its the same as the one we used in the discover packet */
                 if(ntohl(offer_packet.xid)!=packet_xid){
@@ -597,7 +593,7 @@ int get_dhcp_offer(int sock){
                                 printf(_("DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"),ntohl(offer_packet.xid),packet_xid);
 
                         continue;
-                        }
+                }
 
                 /* check hardware address */
                 result=OK;
@@ -610,7 +606,7 @@ int get_dhcp_offer(int sock){
 
                         if(offer_packet.chaddr[x]!=client_hardware_address[x])
                                 result=ERROR;
-                        }
+                }
                 if(verbose)
                         printf("\n");
 
@@ -619,27 +615,27 @@ int get_dhcp_offer(int sock){
                                 printf(_("DHCPOFFER hardware address did not match our own - ignoring packet\n"));
 
                         continue;
-                        }
+                }
 
                 if(verbose){
                         printf("DHCPOFFER ciaddr: %s\n",inet_ntoa(offer_packet.ciaddr));
                         printf("DHCPOFFER yiaddr: %s\n",inet_ntoa(offer_packet.yiaddr));
                         printf("DHCPOFFER siaddr: %s\n",inet_ntoa(offer_packet.siaddr));
                         printf("DHCPOFFER giaddr: %s\n",inet_ntoa(offer_packet.giaddr));
-                        }
+                }
 
                 add_dhcp_offer(source.sin_addr,&offer_packet);
 
                 valid_responses++;
-                }
+        }
 
         if(verbose){
                 printf(_("Total responses seen on the wire: %d\n"),responses);
                 printf(_("Valid responses for this machine: %d\n"),valid_responses);
-                }
+        }
 
         return OK;
-        }
+}
 
 
 
@@ -656,14 +652,14 @@ int send_dhcp_packet(void *buffer, int buffer_size, int sock, struct sockaddr_in
                 return ERROR;
 
         return OK;
-        }
+}
 
 
 
 /* receives a DHCP packet */
 int receive_dhcp_packet(void *buffer, int buffer_size, int sock, int timeout, struct sockaddr_in *address){
-        struct timeval tv;
-        fd_set readfds;
+        struct timeval tv;
+        fd_set readfds;
         fd_set oobfds;
         int recv_result;
         socklen_t address_size;
@@ -671,88 +667,88 @@ int receive_dhcp_packet(void *buffer, int buffer_size, int sock, int timeout, st
         int nfound;
 
 
-        /* wait for data to arrive (up time timeout) */
-        tv.tv_sec=timeout;
-        tv.tv_usec=0;
-        FD_ZERO(&readfds);
-        FD_ZERO(&oobfds);
-        FD_SET(sock,&readfds);
-        FD_SET(sock,&oobfds);
-        nfound = select(sock+1,&readfds,NULL,&oobfds,&tv);
+        /* wait for data to arrive (up time timeout) */
+        tv.tv_sec=timeout;
+        tv.tv_usec=0;
+        FD_ZERO(&readfds);
+        FD_ZERO(&oobfds);
+        FD_SET(sock,&readfds);
+        FD_SET(sock,&oobfds);
+        nfound = select(sock+1,&readfds,NULL,&oobfds,&tv);
 
-        /* make sure some data has arrived */
-        if(!FD_ISSET(sock,&readfds)){
+        /* make sure some data has arrived */
+        if(!FD_ISSET(sock,&readfds)){
                 if(verbose)
-                        printf(_("No (more) data received (nfound: %d)\n"), nfound);
-                return ERROR;
-                }
+                        printf(_("No (more) data received (nfound: %d)\n"), nfound);
+                return ERROR;
+        }
 
-        else{
+        else{
                 bzero(&source_address,sizeof(source_address));
                 address_size=sizeof(source_address);
-                recv_result=recvfrom(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)&source_address,&address_size);
+                recv_result=recvfrom(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)&source_address,&address_size);
                 if(verbose)
                         printf("recv_result: %d\n",recv_result);
 
-                if(recv_result==-1){
+                if(recv_result==-1){
                         if(verbose){
                                 printf(_("recvfrom() failed, "));
                                 printf("errno: (%d) -> %s\n",errno,strerror(errno));
-                                }
-                        return ERROR;
-                        }
+                        }
+                        return ERROR;
+                }
                 else{
                         if(verbose){
                                 printf(_("receive_dhcp_packet() result: %d\n"),recv_result);
                                 printf(_("receive_dhcp_packet() source: %s\n"),inet_ntoa(source_address.sin_addr));
-                                }
+                        }
 
                         memcpy(address,&source_address,sizeof(source_address));
                         return OK;
-                        }
-                }
+                }
+        }
 
         return OK;
-        }
+}
 
 
 /* creates a socket for DHCP communication */
 int create_dhcp_socket(void){
-        struct sockaddr_in myname;
+        struct sockaddr_in myname;
         struct ifreq interface;
-        int sock;
-        int flag=1;
+        int sock;
+        int flag=1;
 
-        /* Set up the address we're going to bind to. */
+        /* Set up the address we're going to bind to. */
         bzero(&myname,sizeof(myname));
-        myname.sin_family=AF_INET;
-        /* listen to DHCP server port if we're in unicast mode */
-        myname.sin_port = htons(unicast ? DHCP_SERVER_PORT : DHCP_CLIENT_PORT);
-        myname.sin_addr.s_addr = unicast ? my_ip.s_addr : INADDR_ANY;
-        bzero(&myname.sin_zero,sizeof(myname.sin_zero));
+        myname.sin_family=AF_INET;
+        /* listen to DHCP server port if we're in unicast mode */
+        myname.sin_port = htons(unicast ? DHCP_SERVER_PORT : DHCP_CLIENT_PORT);
+        myname.sin_addr.s_addr = unicast ? my_ip.s_addr : INADDR_ANY;
+        bzero(&myname.sin_zero,sizeof(myname.sin_zero));
 
-        /* create a socket for DHCP communications */
+        /* create a socket for DHCP communications */
         sock=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
-        if(sock<0){
+        if(sock<0){
                 printf(_("Error: Could not create socket!\n"));
                 exit(STATE_UNKNOWN);
-                }
+        }
 
         if(verbose)
                 printf("DHCP socket: %d\n",sock);
 
-        /* set the reuse address flag so we don't get errors when restarting */
-        flag=1;
-        if(setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(char *)&flag,sizeof(flag))<0){
+        /* set the reuse address flag so we don't get errors when restarting */
+        flag=1;
+        if(setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(char *)&flag,sizeof(flag))<0){
                 printf(_("Error: Could not set reuse address option on DHCP socket!\n"));
                 exit(STATE_UNKNOWN);
-                }
+        }
 
-        /* set the broadcast option - we need this to listen to DHCP broadcast messages */
-        if(!unicast && setsockopt(sock,SOL_SOCKET,SO_BROADCAST,(char *)&flag,sizeof flag)<0){
+        /* set the broadcast option - we need this to listen to DHCP broadcast messages */
+        if(!unicast && setsockopt(sock,SOL_SOCKET,SO_BROADCAST,(char *)&flag,sizeof flag)<0){
                 printf(_("Error: Could not set broadcast option on DHCP socket!\n"));
                 exit(STATE_UNKNOWN);
-                }
+        }
 
         /* bind socket to interface */
 #if defined(__linux__)
@@ -761,21 +757,21 @@ int create_dhcp_socket(void){
         if(setsockopt(sock,SOL_SOCKET,SO_BINDTODEVICE,(char *)&interface,sizeof(interface))<0){
                 printf(_("Error: Could not bind socket to interface %s.  Check your privileges...\n"),network_interface_name);
                 exit(STATE_UNKNOWN);
-                }
+        }
 
 #else
         strncpy(interface.ifr_name,network_interface_name,IFNAMSIZ-1);
         interface.ifr_name[IFNAMSIZ-1]='\0';
 #endif
 
-        /* bind the socket */
-        if(bind(sock,(struct sockaddr *)&myname,sizeof(myname))<0){
+        /* bind the socket */
+        if(bind(sock,(struct sockaddr *)&myname,sizeof(myname))<0){
                 printf(_("Error: Could not bind to DHCP socket (port %d)!  Check your privileges...\n"),DHCP_CLIENT_PORT);
                 exit(STATE_UNKNOWN);
-                }
+        }
 
-        return sock;
-        }
+        return sock;
+}
 
 
 /* closes DHCP socket */
@@ -784,7 +780,7 @@ int close_dhcp_socket(int sock){
         close(sock);
 
         return OK;
-        }
+}
 
 
 /* adds a requested server address to list in memory */
@@ -796,7 +792,7 @@ int add_requested_server(struct in_addr server_address){
                 return ERROR;
 
         new_server->server_address=server_address;
-        new_server->answered=FALSE;
+        new_server->answered=false;
 
         new_server->next=requested_server_list;
         requested_server_list=new_server;
@@ -807,7 +803,7 @@ int add_requested_server(struct in_addr server_address){
                 printf(_("Requested server address: %s\n"),inet_ntoa(new_server->server_address));
 
         return OK;
-        }
+}
 
 
 
@@ -840,29 +836,29 @@ int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){
 
                 /* get option data */
                 switch(option_type){
-                case DHCP_OPTION_LEASE_TIME:
-                        memcpy(&dhcp_lease_time, &offer_packet->options[x],sizeof(dhcp_lease_time));
-                        dhcp_lease_time = ntohl(dhcp_lease_time);
-                        break;
-                case DHCP_OPTION_RENEWAL_TIME:
-                        memcpy(&dhcp_renewal_time, &offer_packet->options[x],sizeof(dhcp_renewal_time));
-                        dhcp_renewal_time = ntohl(dhcp_renewal_time);
-                        break;
-                case DHCP_OPTION_REBINDING_TIME:
-                        memcpy(&dhcp_rebinding_time, &offer_packet->options[x],sizeof(dhcp_rebinding_time));
-                        dhcp_rebinding_time = ntohl(dhcp_rebinding_time);
-                        break;
-                case DHCP_OPTION_SERVER_IDENTIFIER:
-                        memcpy(&serv_ident.s_addr, &offer_packet->options[x],sizeof(serv_ident.s_addr));
-                        break;
-                        }
+                        case DHCP_OPTION_LEASE_TIME:
+                                memcpy(&dhcp_lease_time, &offer_packet->options[x],sizeof(dhcp_lease_time));
+                                dhcp_lease_time = ntohl(dhcp_lease_time);
+                                break;
+                        case DHCP_OPTION_RENEWAL_TIME:
+                                memcpy(&dhcp_renewal_time, &offer_packet->options[x],sizeof(dhcp_renewal_time));
+                                dhcp_renewal_time = ntohl(dhcp_renewal_time);
+                                break;
+                        case DHCP_OPTION_REBINDING_TIME:
+                                memcpy(&dhcp_rebinding_time, &offer_packet->options[x],sizeof(dhcp_rebinding_time));
+                                dhcp_rebinding_time = ntohl(dhcp_rebinding_time);
+                                break;
+                        case DHCP_OPTION_SERVER_IDENTIFIER:
+                                memcpy(&serv_ident.s_addr, &offer_packet->options[x],sizeof(serv_ident.s_addr));
+                                break;
+                }
 
                 /* skip option data we're ignoring */
                 if(option_type==0) /* "pad" option, see RFC 2132 (3.1) */
                         x+=1;
                 else
                         x+=option_length;
-                }
+        }
 
         if(verbose){
                 if(dhcp_lease_time==DHCP_INFINITE_TIME)
@@ -876,7 +872,7 @@ int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){
                 if(dhcp_rebinding_time==DHCP_INFINITE_TIME)
                         printf(_("Rebinding Time: Infinite\n"));
                 printf(_("Rebinding Time: %lu seconds\n"),(unsigned long)dhcp_rebinding_time);
-                }
+        }
 
         new_offer=(dhcp_offer *)malloc(sizeof(dhcp_offer));
 
@@ -900,19 +896,20 @@ int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){
         new_offer->lease_time=dhcp_lease_time;
         new_offer->renewal_time=dhcp_renewal_time;
         new_offer->rebinding_time=dhcp_rebinding_time;
+        new_offer->desired=false; /* exclusive mode: we'll check that in get_results */
 
 
         if(verbose){
                 printf(_("Added offer from server @ %s"),inet_ntoa(new_offer->server_address));
                 printf(_(" of IP address %s\n"),inet_ntoa(new_offer->offered_address));
-                }
+        }
 
         /* add new offer to head of list */
         new_offer->next=dhcp_offer_list;
         dhcp_offer_list=new_offer;
 
         return OK;
-        }
+}
 
 
 /* frees memory allocated to DHCP OFFER list */
@@ -923,10 +920,10 @@ int free_dhcp_offer_list(void){
         for(this_offer=dhcp_offer_list;this_offer!=NULL;this_offer=next_offer){
                 next_offer=this_offer->next;
                 free(this_offer);
-                }
+        }
 
         return OK;
-        }
+}
 
 
 /* frees memory allocated to requested server list */
@@ -937,20 +934,20 @@ int free_requested_server_list(void){
         for(this_server=requested_server_list;this_server!=NULL;this_server=next_server){
                 next_server=this_server->next;
                 free(this_server);
-                }
+        }
 
         return OK;
-        }
+}
 
 
 /* gets state and plugin output to return */
 int get_results(void){
-        dhcp_offer *temp_offer;
+        dhcp_offer *temp_offer, *undesired_offer=NULL;
         requested_server *temp_server;
         int result;
-        u_int32_t max_lease_time=0;
+        uint32_t max_lease_time=0;
 
-        received_requested_address=FALSE;
+        received_requested_address=false;
 
         /* checks responses from requested servers */
         requested_responses=0;
@@ -966,7 +963,7 @@ int get_results(void){
 
                                 /* see if we got the address we requested */
                                 if(!memcmp(&requested_address,&temp_offer->offered_address,sizeof(requested_address)))
-                                        received_requested_address=TRUE;
+                                        received_requested_address=true;
 
                                 /* see if the servers we wanted a response from talked to us or not */
                                 if(!memcmp(&temp_offer->server_address,&temp_server->server_address,sizeof(temp_server->server_address))){
@@ -976,16 +973,24 @@ int get_results(void){
                                                 if(temp_server->answered)
                                                         printf(_(" (duplicate)"));
                                                 printf(_("\n"));
-                                                }
-                                        if(temp_server->answered == FALSE){
+                                        }
+                                        if(!temp_server->answered){
                                                 requested_responses++;
-                                                temp_server->answered=TRUE;
-                                                }
-                                        }
-                                }
-                        }
+                                                temp_server->answered=true;
+                                                temp_offer->desired=true;
+                                        }
+                                }
+                        }
+                }
 
-                }
+                /* exclusive mode: check for undesired offers */
+                for(temp_offer=dhcp_offer_list;temp_offer!=NULL;temp_offer=temp_offer->next) {
+                        if (!temp_offer->desired) {
+                                undesired_offer=temp_offer; /* Checks only for the first undesired offer */
+                                break; /* no further checks needed */
+                        }
+                }
+        }
 
         /* else check and see if we got our requested address from any server */
         else{
@@ -998,9 +1003,9 @@ int get_results(void){
 
                         /* see if we got the address we requested */
                         if(!memcmp(&requested_address,&temp_offer->offered_address,sizeof(requested_address)))
-                                received_requested_address=TRUE;
-                        }
-                }
+                                received_requested_address=true;
+                }
+        }
 
         result=STATE_OK;
         if(valid_responses==0)
@@ -1009,9 +1014,12 @@ int get_results(void){
                 result=STATE_CRITICAL;
         else if(requested_responses<requested_servers)
                 result=STATE_WARNING;
-        else if(request_specific_address==TRUE && received_requested_address==FALSE)
+        else if(request_specific_address && !received_requested_address)
                 result=STATE_WARNING;
 
+        if(exclusive && undesired_offer)
+                result=STATE_CRITICAL;
+
         if(result==0)               /* garrett honeycutt 2005 */
                 printf("OK: ");
         else if(result==1)
@@ -1025,15 +1033,22 @@ int get_results(void){
         if(dhcp_offer_list==NULL){
                 printf(_("No DHCPOFFERs were received.\n"));
                 return result;
-                }
+        }
 
         printf(_("Received %d DHCPOFFER(s)"),valid_responses);
 
+
+        if(exclusive && undesired_offer){
+                printf(_(", Rogue DHCP Server detected! Server %s"),inet_ntoa(undesired_offer->server_address));
+                printf(_(" offered %s \n"),inet_ntoa(undesired_offer->offered_address));
+                return result;
+        }
+
         if(requested_servers>0)
                 printf(_(", %s%d of %d requested servers responded"),((requested_responses<requested_servers) && requested_responses>0)?"only ":"",requested_responses,requested_servers);
 
-        if(request_specific_address==TRUE)
-                printf(_(", requested address (%s) was %soffered"),inet_ntoa(requested_address),(received_requested_address==TRUE)?"":_("not "));
+        if(request_specific_address)
+                printf(_(", requested address (%s) was %soffered"),inet_ntoa(requested_address),(received_requested_address)?"":_("not "));
 
         printf(_(", max lease time = "));
         if(max_lease_time==DHCP_INFINITE_TIME)
@@ -1044,17 +1059,15 @@ int get_results(void){
         printf(".\n");
 
         return result;
-        }
+}
 
 
 /* process command-line arguments */
 int process_arguments(int argc, char **argv){
-        int arg_index;
-
         if(argc<1)
                 return ERROR;
 
-        arg_index = call_getopt(argc,argv);
+        call_getopt(argc,argv);
         return validate_arguments(argc);
 }
 
@@ -1071,87 +1084,89 @@ int call_getopt(int argc, char **argv){
                 {"interface",      required_argument,0,'i'},
                 {"mac",            required_argument,0,'m'},
                 {"unicast",        no_argument,      0,'u'},
+                {"exclusive",      no_argument,      0,'x'},
                 {"verbose",        no_argument,      0,'v'},
                 {"version",        no_argument,      0,'V'},
                 {"help",           no_argument,      0,'h'},
                 {0,0,0,0}
         };
 
-        while(1){
-                int c=0;
-
-                c=getopt_long(argc,argv,"+hVvt:s:r:t:i:m:u",long_options,&option_index);
+        int c=0;
+        while(true){
+                c=getopt_long(argc,argv,"+hVvxt:s:r:t:i:m:u",long_options,&option_index);
 
                 if(c==-1||c==EOF||c==1)
                         break;
 
                 switch(c){
 
-                case 's': /* DHCP server address */
-                        resolve_host(optarg,&dhcp_ip);
-                        add_requested_server(dhcp_ip);
-                        break;
-
-                case 'r': /* address we are requested from DHCP servers */
-                        resolve_host(optarg,&requested_address);
-                        request_specific_address=TRUE;
-                        break;
-
-                case 't': /* timeout */
-
-                        /*
-                        if(is_intnonneg(optarg))
-                        */
-                        if(atoi(optarg)>0)
-                                dhcpoffer_timeout=atoi(optarg);
-                        /*
-                        else
-                                usage("Time interval must be a nonnegative integer\n");
-                        */
-                        break;
-
-                case 'm': /* MAC address */
-
-                        if((user_specified_mac=mac_aton(optarg)) == NULL)
-                                usage("Cannot parse MAC address.\n");
-                        if(verbose)
-                                print_hardware_address(user_specified_mac);
-
-                        break;
-
-                case 'i': /* interface name */
-
-                        strncpy(network_interface_name,optarg,sizeof(network_interface_name)-1);
-                        network_interface_name[sizeof(network_interface_name)-1]='\x0';
-
-                        break;
-
-                case 'u': /* unicast testing */
-                        unicast=1;
-                        break;
-
-                case 'V': /* version */
-                        print_revision(progname, NP_VERSION);
-                        exit(STATE_UNKNOWN);
-
-                case 'h': /* help */
-                        print_help();
-                        exit(STATE_UNKNOWN);
-
-                case 'v': /* verbose */
-                        verbose=1;
-                        break;
-
-                case '?': /* help */
-                        usage5 ();
-                        break;
-
-                default:
-                        break;
-                        }
-                }
+                        case 's': /* DHCP server address */
+                                resolve_host(optarg,&dhcp_ip);
+                                add_requested_server(dhcp_ip);
+                                break;
+
+                        case 'r': /* address we are requested from DHCP servers */
+                                resolve_host(optarg,&requested_address);
+                                request_specific_address=true;
+                                break;
+
+                        case 't': /* timeout */
+
+                                /*
+                                         if(is_intnonneg(optarg))
+                                         */
+                                if(atoi(optarg)>0)
+                                        dhcpoffer_timeout=atoi(optarg);
+                                /*
+                                         else
+                                         usage("Time interval must be a nonnegative integer\n");
+                                         */
+                                break;
+
+                        case 'm': /* MAC address */
+
+                                if((user_specified_mac=mac_aton(optarg)) == NULL)
+                                        usage("Cannot parse MAC address.\n");
+                                if(verbose)
+                                        print_hardware_address(user_specified_mac);
+
+                                break;
+
+                        case 'i': /* interface name */
+
+                                strncpy(network_interface_name,optarg,sizeof(network_interface_name)-1);
+                                network_interface_name[sizeof(network_interface_name)-1]='\x0';
+
+                                break;
+
+                        case 'u': /* unicast testing */
+                                unicast=true;
+                                break;
+                        case 'x': /* exclusive testing aka "rogue DHCP server detection" */
+                                exclusive=true;
+                                break;
+
+                        case 'V': /* version */
+                                print_revision(progname, NP_VERSION);
+                                exit(STATE_UNKNOWN);
+
+                        case 'h': /* help */
+                                print_help();
+                                exit(STATE_UNKNOWN);
+
+                        case 'v': /* verbose */
+                                verbose=1;
+                                break;
+                        case '?': /* help */
+                                usage5 ();
+                                break;
+
+                        default:
+                                break;
+                }
+        }
         return optind;
-        }
+}
 
 
 int validate_arguments(int argc){
@@ -1178,21 +1193,21 @@ static int get_msg(int fd){
         if(res < 0){
                 if(errno == EINTR){
                         return(GOT_INTR);
-                        }
+                }
                 else{
                         printf("%s\n", "get_msg FAILED.");
                         return(GOT_ERR);
-                        }
                 }
+        }
         if(ctl.len > 0){
                 ret |= GOT_CTRL;
-                }
+        }
         if(dat.len > 0){
                 ret |= GOT_DATA;
-                }
+        }
 
         return(ret);
-        }
+}
 
 /* verify that dl_primitive in ctl_area = prim */
 static int check_ctrl(int prim){
@@ -1201,10 +1216,10 @@ static int check_ctrl(int prim){
         if(err_ack->dl_primitive != prim){
                 printf(_("Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n"), strerror(errno));
                 exit(STATE_UNKNOWN);
-                }
+        }
 
         return 0;
-        }
+}
 
 /* put a control message on a stream */
 static int put_ctrl(int fd, int len, int pri){
@@ -1213,10 +1228,10 @@ static int put_ctrl(int fd, int len, int pri){
         if(putmsg(fd, &ctl, 0, pri) < 0){
                 printf(_("Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"), strerror(errno));
                 exit(STATE_UNKNOWN);
-                }
+        }
 
         return  0;
-        }
+}
 
 /* put a control + data message on a stream */
 static int put_both(int fd, int clen, int dlen, int pri){
@@ -1226,10 +1241,10 @@ static int put_both(int fd, int clen, int dlen, int pri){
         if(putmsg(fd, &ctl, &dat, pri) < 0){
                 printf(_("Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"), strerror(errno));
                 exit(STATE_UNKNOWN);
-                }
+        }
 
         return  0;
-        }
+}
 
 /* open file descriptor and attach */
 static int dl_open(const char *dev, int unit, int *fd){
@@ -1238,13 +1253,13 @@ static int dl_open(const char *dev, int unit, int *fd){
         if((*fd = open(dev, O_RDWR)) == -1){
                 printf(_("Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"), dev, strerror(errno));
                 exit(STATE_UNKNOWN);
-                }
+        }
         attach_req->dl_primitive = DL_ATTACH_REQ;
         attach_req->dl_ppa = unit;
         put_ctrl(*fd, sizeof(dl_attach_req_t), 0);
         get_msg(*fd);
         return check_ctrl(DL_OK_ACK);
-        }
+}
 
 /* send DL_BIND_REQ */
 static int dl_bind(int fd, int sap, u_char *addr){
@@ -1262,12 +1277,12 @@ static int dl_bind(int fd, int sap, u_char *addr){
         if (GOT_ERR == check_ctrl(DL_BIND_ACK)){
                 printf(_("Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"), strerror(errno));
                 exit(STATE_UNKNOWN);
-                }
+        }
         bcopy((u_char *)bind_ack + bind_ack->dl_addr_offset, addr,
-              bind_ack->dl_addr_length);
+                        bind_ack->dl_addr_length);
 
         return 0;
-        }
+}
 
 /***********************************************************************
  * interface:
@@ -1286,15 +1301,15 @@ long mac_addr_dlpi( const char *dev, int unit, u_char  *addr){
         u_char mac_addr[25];
 
         if(GOT_ERR != dl_open(dev, unit, &fd)){
-                if(GOT_ERR != dl_bind(fd, INSAP, mac_addr)){
-                        bcopy( mac_addr, addr, 6);
-                        return 0;
-                        }
+                if(GOT_ERR != dl_bind(fd, INSAP, mac_addr)){
+                        bcopy( mac_addr, addr, 6);
+                        return 0;
                 }
-        close(fd);
+        }
+        close(fd);
 
         return -1;
-        }
+}
 
 /* Kompf 2000-2003 */
 #endif
@@ -1311,7 +1326,7 @@ void resolve_host(const char *in,struct in_addr *out){
 
         memcpy(out,&((struct sockaddr_in *)ai->ai_addr)->sin_addr,sizeof(*out));
         freeaddrinfo(ai);
-        }
+}
 
 
 /* parse MAC address string, return 6 bytes (unterminated) or NULL */
@@ -1330,10 +1345,10 @@ unsigned char *mac_aton(const char *string){
                 result[j]=strtol(tmp,(char **)NULL,16);
                 i++;
                 j++;
-                }
+        }
 
         return (j==6) ? result : NULL;
-        }
+}
 
 
 void print_hardware_address(const unsigned char *address){
@@ -1344,7 +1359,7 @@ void print_hardware_address(const unsigned char *address){
                 printf("%2.2x:", address[i]);
         printf("%2.2x", address[i]);
         putchar('\n');
-        }
+}
 
 
 /* print usage help */
@@ -1357,7 +1372,7 @@ void print_help(void){
 
         printf("%s\n", _("This plugin tests the availability of DHCP servers on a network."));
 
-  printf ("\n\n");
+        printf ("\n\n");
 
         print_usage();
 
@@ -1367,32 +1382,31 @@ void print_help(void){
         printf (UT_VERBOSE);
 
         printf (" %s\n", "-s, --serverip=IPADDRESS");
-  printf ("    %s\n", _("IP address of DHCP server that we must hear from"));
-  printf (" %s\n", "-r, --requestedip=IPADDRESS");
-  printf ("    %s\n", _("IP address that should be offered by at least one DHCP server"));
-  printf (" %s\n", "-t, --timeout=INTEGER");
-  printf ("    %s\n", _("Seconds to wait for DHCPOFFER before timeout occurs"));
-  printf (" %s\n", "-i, --interface=STRING");
-  printf ("    %s\n", _("Interface to to use for listening (i.e. eth0)"));
-  printf (" %s\n", "-m, --mac=STRING");
-  printf ("    %s\n", _("MAC address to use in the DHCP request"));
-  printf (" %s\n", "-u, --unicast");
-  printf ("    %s\n", _("Unicast testing: mimic a DHCP relay, requires -s"));
-
-  printf (UT_SUPPORT);
+        printf ("    %s\n", _("IP address of DHCP server that we must hear from"));
+        printf (" %s\n", "-r, --requestedip=IPADDRESS");
+        printf ("    %s\n", _("IP address that should be offered by at least one DHCP server"));
+        printf (" %s\n", "-t, --timeout=INTEGER");
+        printf ("    %s\n", _("Seconds to wait for DHCPOFFER before timeout occurs"));
+        printf (" %s\n", "-i, --interface=STRING");
+        printf ("    %s\n", _("Interface to to use for listening (i.e. eth0)"));
+        printf (" %s\n", "-m, --mac=STRING");
+        printf ("    %s\n", _("MAC address to use in the DHCP request"));
+        printf (" %s\n", "-u, --unicast");
+        printf ("    %s\n", _("Unicast testing: mimic a DHCP relay, requires -s"));
+        printf (" %s\n", "-x, --exclusive");
+        printf ("    %s\n", _("Only requested DHCP server may response (rogue DHCP server detection), requires -s"));
+
+        printf (UT_SUPPORT);
         return;
-        }
+}
 
 
 void
 print_usage(void){
 
-  printf ("%s\n", _("Usage:"));
-  printf (" %s [-v] [-u] [-s serverip] [-r requestedip] [-t timeout]\n",progname);
-  printf ("                  [-i interface] [-m mac]\n");
+        printf ("%s\n", _("Usage:"));
+        printf (" %s [-v] [-u] [-x] [-s serverip] [-r requestedip] [-t timeout]\n",progname);
+        printf ("                  [-i interface] [-m mac]\n");
 
         return;
-        }
-
-
-
+}
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index 1d47e9f..f788d42 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -43,7 +43,7 @@ const char *copyright = "2005-2008";
 const char *email = "devel@monitoring-plugins.org";
 
 /** Monitoring Plugins basic includes */
-#include "common.h"
+#include "../plugins/common.h"
 #include "netutils.h"
 #include "utils.h"
 
@@ -109,18 +109,35 @@ typedef struct rta_host {
         unsigned char icmp_type, icmp_code; /* type and code from errors */
         unsigned short flags;        /* control/status flags */
         double rta;                  /* measured RTA */
+        int rta_status;              // check result for RTA checks
         double rtmax;                /* max rtt */
         double rtmin;                /* min rtt */
+        double jitter;               /* measured jitter */
+        int jitter_status;           // check result for Jitter checks
+        double jitter_max;           /* jitter rtt maximum */
+        double jitter_min;           /* jitter rtt minimum */
+        double EffectiveLatency;
+        double mos;                  /* Mean opnion score */
+        int mos_status;              // check result for MOS checks
+        double  score;               /* score */
+        int score_status;            // check result for score checks
+        u_int last_tdiff;
+        u_int last_icmp_seq;         /* Last ICMP_SEQ to check out of order pkts */
         unsigned char pl;            /* measured packet loss */
+        int pl_status;               // check result for packet loss checks
         struct rta_host *next;       /* linked list */
+        int order_status;            // check result for packet order checks
 } rta_host;
 
 #define FLAG_LOST_CAUSE 0x01  /* decidedly dead target. */
 
 /* threshold structure. all values are maximum allowed, exclusive */
 typedef struct threshold {
-        unsigned char pl;    /* max allowed packet loss in percent */
-        unsigned int rta;  /* roundtrip time average, microseconds */
+        unsigned char pl;                       /* max allowed packet loss in percent */
+        unsigned int rta;                       /* roundtrip time average, microseconds */
+        double jitter;  /* jitter time average, microseconds */
+        double mos;                     /* MOS */
+        double score;           /* Score */
 } threshold;
 
 /* the data structure */
@@ -159,6 +176,16 @@ typedef union icmp_packet {
 #define MODE_ALL 2
 #define MODE_ICMP 3
 
+enum enum_threshold_mode {
+        const_rta_mode,
+        const_packet_loss_mode,
+        const_jitter_mode,
+        const_mos_mode,
+        const_score_mode
+};
+
+typedef enum enum_threshold_mode threshold_mode;
+
 /* the different ping types we can do
  * TODO: investigate ARP ping as well */
 #define HAVE_ICMP 1
@@ -188,6 +215,8 @@ static int wait_for_reply(int, u_int);
 static int recvfrom_wto(int, void *, unsigned int, struct sockaddr *, u_int *, struct timeval*);
 static int send_icmp_ping(int, struct rta_host *);
 static int get_threshold(char *str, threshold *th);
+static bool get_threshold2(char *str, size_t length, threshold *, threshold *, threshold_mode mode);
+static bool parse_threshold2_helper(char *s, size_t length, threshold *thr, threshold_mode mode);
 static void run_checks(void);
 static void set_source_ip(char *);
 static int add_target(char *);
@@ -199,13 +228,28 @@ static void finish(int);
 static void crash(const char *, ...);
 
 /** external **/
-extern int optind, opterr, optopt;
+extern int optind;
 extern char *optarg;
 extern char **environ;
 
 /** global variables **/
 static struct rta_host **table, *cursor, *list;
-static threshold crit = {80, 500000}, warn = {40, 200000};
+
+static threshold crit = {
+        .pl = 80,
+        .rta = 500000,
+        .jitter = 0.0,
+        .mos = 0.0,
+        .score = 0.0
+};
+static threshold warn = {
+        .pl = 40,
+        .rta = 200000,
+        .jitter = 0.0,
+        .mos = 0.0,
+        .score = 0.0
+};
+
 static int mode, protocols, sockets, debug = 0, timeout = 10;
 static unsigned short icmp_data_size = DEFAULT_PING_DATA_SIZE;
 static unsigned short icmp_pkt_size = DEFAULT_PING_DATA_SIZE + ICMP_MINLEN;
@@ -224,6 +268,12 @@ static unsigned int warn_down = 1, crit_down = 1; /* host down threshold values
 static int min_hosts_alive = -1;
 float pkt_backoff_factor = 1.5;
 float target_backoff_factor = 1.5;
+bool rta_mode=false;
+bool pl_mode=false;
+bool jitter_mode=false;
+bool score_mode=false;
+bool mos_mode=false;
+bool order_mode=false;
 
 /** code start **/
 static void
@@ -393,12 +443,14 @@ main(int argc, char **argv)
         int icmp_sockerrno, udp_sockerrno, tcp_sockerrno;
         int result;
         struct rta_host *host;
+#ifdef HAVE_SIGACTION
+        struct sigaction sig_action;
+#endif
 #ifdef SO_TIMESTAMP
         int on = 1;
 #endif
         char *source_ip = NULL;
-        char * opts_str = "vhVw:c:n:p:t:H:s:i:b:I:l:m:64";
-
+        char * opts_str = "vhVw:c:n:p:t:H:s:i:b:I:l:m:P:R:J:S:M:O64";
         setlocale (LC_ALL, "");
         bindtextdomain (PACKAGE, LOCALEDIR);
         textdomain (PACKAGE);
@@ -407,7 +459,7 @@ main(int argc, char **argv)
          * that before pointer magic (esp. on network data) */
         icmp_sockerrno = udp_sockerrno = tcp_sockerrno = sockets = 0;
 
-        address_family = -1;
+        address_family = -1;
         int icmp_proto = IPPROTO_ICMP;
 
         /* get calling name the old-fashioned way for portability instead
@@ -422,10 +474,19 @@ main(int argc, char **argv)
         table = NULL;
 
         mode = MODE_RTA;
+        /* Default critical thresholds */
         crit.rta = 500000;
         crit.pl = 80;
+        crit.jitter = 50;
+        crit.mos= 3;
+        crit.score=70;
+        /* Default warning thresholds */
         warn.rta = 200000;
         warn.pl = 40;
+        warn.jitter = 40;
+        warn.mos= 3.5;
+        warn.score=80;
+
         protocols = HAVE_ICMP | HAVE_UDP | HAVE_TCP;
         pkt_interval = 80000;  /* 80 msec packet interval by default */
         packets = 5;
@@ -481,7 +542,8 @@ main(int argc, char **argv)
         /* Reset argument scanning */
         optind = 1;
 
-        unsigned short size;
+        unsigned long size;
+        bool err;
         /* parse the arguments */
         for(i = 1; i < argc; i++) {
                 while((arg = getopt(argc, argv, opts_str)) != EOF) {
@@ -490,7 +552,7 @@ main(int argc, char **argv)
                                 debug++;
                                 break;
                         case 'b':
-                                size = (unsigned short)strtol(optarg,NULL,0);
+                                size = strtol(optarg,NULL,0);
                                 if (size >= (sizeof(struct icmp) + sizeof(struct icmp_ping_data)) &&
                                     size < MAX_PING_DATA) {
                                         icmp_data_size = size;
@@ -545,6 +607,49 @@ main(int argc, char **argv)
                                 print_help ();
                                 exit (STATE_UNKNOWN);
                                 break;
+                        case 'R': /* RTA mode */
+                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_rta_mode);
+                                if (!err) {
+                                                crash("Failed to parse RTA threshold");
+                                }
+
+                                rta_mode=true;
+                                break;
+                        case 'P': /* packet loss mode */
+                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_packet_loss_mode);
+                                if (!err) {
+                                                crash("Failed to parse packet loss threshold");
+                                }
+
+                                pl_mode=true;
+                                break;
+                        case 'J': /* jitter mode */
+                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_jitter_mode);
+                                if (!err) {
+                                                crash("Failed to parse jitter threshold");
+                                }
+
+                                jitter_mode=true;
+                                break;
+                        case 'M': /* MOS mode */
+                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_mos_mode);
+                                if (!err) {
+                                                crash("Failed to parse MOS threshold");
+                                }
+
+                                mos_mode=true;
+                                break;
+                        case 'S': /* score mode */
+                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_score_mode);
+                                if (!err) {
+                                                crash("Failed to parse score threshold");
+                                }
+
+                                score_mode=true;
+                                break;
+                        case 'O': /* out of order mode */
+                                order_mode=true;
+                                break;
                         }
                 }
         }
@@ -565,10 +670,10 @@ main(int argc, char **argv)
                 add_target(*argv);
                 argv++;
         }
+
         if(!targets) {
                 errno = 0;
                 crash("No hosts to check");
-                exit(3);
         }
 
         // add_target might change address_family
@@ -631,11 +736,25 @@ main(int argc, char **argv)
         if(warn.pl > crit.pl) warn.pl = crit.pl;
         if(warn.rta > crit.rta) warn.rta = crit.rta;
         if(warn_down > crit_down) crit_down = warn_down;
-
+        if(warn.jitter > crit.jitter) crit.jitter = warn.jitter;
+        if(warn.mos < crit.mos) warn.mos = crit.mos;
+        if(warn.score < crit.score) warn.score = crit.score;
+
+#ifdef HAVE_SIGACTION
+        sig_action.sa_sigaction = NULL;
+        sig_action.sa_handler = finish;
+        sigfillset(&sig_action.sa_mask);
+        sig_action.sa_flags = SA_NODEFER|SA_RESTART;
+        sigaction(SIGINT, &sig_action, NULL);
+        sigaction(SIGHUP, &sig_action, NULL);
+        sigaction(SIGTERM, &sig_action, NULL);
+        sigaction(SIGALRM, &sig_action, NULL);
+#else /* HAVE_SIGACTION */
         signal(SIGINT, finish);
         signal(SIGHUP, finish);
         signal(SIGTERM, finish);
         signal(SIGALRM, finish);
+#endif /* HAVE_SIGACTION */
         if(debug) printf("Setting alarm timeout to %u seconds\n", timeout);
         alarm(timeout);
 
@@ -685,7 +804,11 @@ main(int argc, char **argv)
         }
 
         host = list;
-        table = (struct rta_host**)malloc(sizeof(struct rta_host **) * targets);
+        table = malloc(sizeof(struct rta_host *) * targets);
+        if(!table) {
+                crash("main(): malloc failed for host table");
+        }
+
         i = 0;
         while(host) {
                 host->id = i*packets;
@@ -772,6 +895,7 @@ wait_for_reply(int sock, u_int t)
         struct icmp_ping_data data;
         struct timeval wait_start, now;
         u_int tdiff, i, per_pkt_wait;
+        double jitter_tmp;
 
         if (!(packet.buf = malloc(icmp_pkt_size))) {
                 crash("send_icmp_ping(): failed to malloc %d bytes for send buffer",
@@ -890,12 +1014,44 @@ wait_for_reply(int sock, u_int t)
 
                 tdiff = get_timevaldiff(&data.stime, &now);
 
+                if (host->last_tdiff>0) {
+                        /* Calculate jitter */
+                        if (host->last_tdiff > tdiff) {
+                                jitter_tmp = host->last_tdiff - tdiff;
+                        } else {
+                                jitter_tmp = tdiff - host->last_tdiff;
+                        }
+
+                        if (host->jitter==0) {
+                                host->jitter=jitter_tmp;
+                                host->jitter_max=jitter_tmp;
+                                host->jitter_min=jitter_tmp;
+                        } else {
+                                host->jitter+=jitter_tmp;
+
+                                if (jitter_tmp < host->jitter_min) {
+                                        host->jitter_min=jitter_tmp;
+                                }
+
+                                if (jitter_tmp > host->jitter_max) {
+                                        host->jitter_max=jitter_tmp;
+                                }
+                        }
+
+                        /* Check if packets in order */
+                        if (host->last_icmp_seq >= packet.icp->icmp_seq)
+                                host->order_status=STATE_CRITICAL;
+                }
+                host->last_tdiff=tdiff;
+
+                host->last_icmp_seq=packet.icp->icmp_seq;
+
                 host->time_waited += tdiff;
                 host->icmp_recv++;
                 icmp_recv++;
-                if (tdiff > host->rtmax)
+                if (tdiff > (unsigned int)host->rtmax)
                         host->rtmax = tdiff;
-                if (tdiff < host->rtmin)
+                if (tdiff < (unsigned int)host->rtmin)
                         host->rtmin = tdiff;
 
                 if(debug) {
@@ -1056,7 +1212,9 @@ recvfrom_wto(int sock, void *buf, unsigned int len, struct sockaddr *saddr,
         int n, ret;
         struct timeval to, then, now;
         fd_set rd, wr;
+#ifdef HAVE_MSGHDR_MSG_CONTROL
         char ans_data[4096];
+#endif // HAVE_MSGHDR_MSG_CONTROL
         struct msghdr hdr;
         struct iovec iov;
 #ifdef SO_TIMESTAMP
@@ -1094,8 +1252,10 @@ recvfrom_wto(int sock, void *buf, unsigned int len, struct sockaddr *saddr,
         hdr.msg_namelen = slen;
         hdr.msg_iov = &iov;
         hdr.msg_iovlen = 1;
+#ifdef HAVE_MSGHDR_MSG_CONTROL
         hdr.msg_control = ans_data;
         hdr.msg_controllen = sizeof(ans_data);
+#endif
 
         ret = recvmsg(sock, &hdr, 0);
 #ifdef SO_TIMESTAMP
@@ -1125,6 +1285,8 @@ finish(int sig)
         {"OK", "WARNING", "CRITICAL", "UNKNOWN", "DEPENDENT"};
         int hosts_ok = 0;
         int hosts_warn = 0;
+        int this_status;
+        double R;
 
         alarm(0);
         if(debug > 1) printf("finish(%d) called\n", sig);
@@ -1140,9 +1302,12 @@ finish(int sig)
         }
 
         /* iterate thrice to calculate values, give output, and print perfparse */
+        status=STATE_OK;
         host = list;
 
         while(host) {
+                this_status = STATE_OK;
+
                 if(!host->icmp_recv) {
                         /* rta 0 is ofcourse not entirely correct, but will still show up
                          * conspicuously as missing entries in perfparse and cacti */
@@ -1151,26 +1316,138 @@ finish(int sig)
                         status = STATE_CRITICAL;
                         /* up the down counter if not already counted */
                         if(!(host->flags & FLAG_LOST_CAUSE) && targets_alive) targets_down++;
-                }
-                else {
+                } else {
                         pl = ((host->icmp_sent - host->icmp_recv) * 100) / host->icmp_sent;
                         rta = (double)host->time_waited / host->icmp_recv;
                 }
+
+                if (host->icmp_recv>1) {
+                        /*
+                         * This algorithm is probably pretty much blindly copied from
+                         * locations like this one: https://www.slac.stanford.edu/comp/net/wan-mon/tutorial.html#mos
+                         * It calculates a MOS value (range of 1 to 5, where 1 is bad and 5 really good).
+                         * According to some quick research MOS originates from the Audio/Video transport network area.
+                         * Whether it can and should be computed from ICMP data, I can not say.
+                         *
+                         * Anyway the basic idea is to map a value "R" with a range of 0-100 to the MOS value
+                         *
+                         * MOS stands likely for Mean Opinion Score ( https://en.wikipedia.org/wiki/Mean_Opinion_Score )
+                         *
+                         * More links:
+                         * - https://confluence.slac.stanford.edu/display/IEPM/MOS
+                         */
+                        host->jitter=(host->jitter / (host->icmp_recv - 1)/1000);
+
+                        /*
+                         * Take the average round trip latency (in milliseconds), add
+                         * round trip jitter, but double the impact to latency
+                         * then add 10 for protocol latencies (in milliseconds).
+                         */
+                        host->EffectiveLatency = (rta/1000) + host->jitter * 2 + 10;
+
+                        if (host->EffectiveLatency < 160) {
+                           R = 93.2 - (host->EffectiveLatency / 40);
+                        } else {
+                           R = 93.2 - ((host->EffectiveLatency - 120) / 10);
+                        }
+
+                        // Now, let us deduct 2.5 R values per percentage of packet loss (i.e. a
+                        // loss of 5% will be entered as 5).
+                        R = R - (pl * 2.5);
+
+                        if (R < 0) {
+                                R = 0;
+                        }
+
+                        host->score = R;
+                        host->mos= 1 + ((0.035) * R) + ((.000007) * R * (R-60) * (100-R));
+                } else {
+                        host->jitter=0;
+                        host->jitter_min=0;
+                        host->jitter_max=0;
+                        host->mos=0;
+                }
+
                 host->pl = pl;
                 host->rta = rta;
-                if(pl >= crit.pl || rta >= crit.rta) {
-                        status = STATE_CRITICAL;
+
+                /* if no new mode selected, use old schema */
+                if (!rta_mode && !pl_mode && !jitter_mode && !score_mode && !mos_mode && !order_mode) {
+                        rta_mode = true;
+                        pl_mode = true;
                 }
-                else if(!status && (pl >= warn.pl || rta >= warn.rta)) {
-                        status = STATE_WARNING;
-                        hosts_warn++;
+
+                /* Check which mode is on and do the warn / Crit stuff */
+                if (rta_mode) {
+                        if(rta >= crit.rta) {
+                                this_status = STATE_CRITICAL;
+                                status = STATE_CRITICAL;
+                                host->rta_status=STATE_CRITICAL;
+                        } else if(status!=STATE_CRITICAL && (rta >= warn.rta)) {
+                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
+                                status = STATE_WARNING;
+                                host->rta_status=STATE_WARNING;
+                        }
+                }
+
+                if (pl_mode) {
+                        if(pl >= crit.pl) {
+                                this_status = STATE_CRITICAL;
+                                status = STATE_CRITICAL;
+                                host->pl_status=STATE_CRITICAL;
+                        } else if(status!=STATE_CRITICAL && (pl >= warn.pl)) {
+                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
+                                status = STATE_WARNING;
+                                host->pl_status=STATE_WARNING;
+                        }
+                }
+
+                if (jitter_mode) {
+                        if(host->jitter >= crit.jitter) {
+                                this_status = STATE_CRITICAL;
+                                status = STATE_CRITICAL;
+                                host->jitter_status=STATE_CRITICAL;
+                        } else if(status!=STATE_CRITICAL && (host->jitter >= warn.jitter)) {
+                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
+                                status = STATE_WARNING;
+                                host->jitter_status=STATE_WARNING;
+                        }
+                }
+
+                if (mos_mode) {
+                        if(host->mos <= crit.mos) {
+                                this_status = STATE_CRITICAL;
+                                status = STATE_CRITICAL;
+                                host->mos_status=STATE_CRITICAL;
+                        } else if(status!=STATE_CRITICAL && (host->mos <= warn.mos)) {
+                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
+                                status = STATE_WARNING;
+                                host->mos_status=STATE_WARNING;
+                        }
+                }
+
+                if (score_mode) {
+                        if(host->score <= crit.score) {
+                                this_status = STATE_CRITICAL;
+                                status = STATE_CRITICAL;
+                                host->score_status=STATE_CRITICAL;
+                        } else if(status!=STATE_CRITICAL && (host->score <= warn.score)) {
+                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
+                                status = STATE_WARNING;
+                                host->score_status=STATE_WARNING;
+                        }
                 }
-                else {
+
+                if (this_status == STATE_WARNING) {
+                        hosts_warn++;
+                } else if (this_status == STATE_OK) {
                         hosts_ok++;
                 }
 
                 host = host->next;
         }
+
+
         /* this is inevitable */
         if(!targets_alive) status = STATE_CRITICAL;
         if(min_hosts_alive > -1) {
@@ -1181,6 +1458,7 @@ finish(int sig)
 
         host = list;
         while(host) {
+
                 if(debug) puts("");
                 if(i) {
                         if(i < targets) printf(" :: ");
@@ -1189,6 +1467,8 @@ finish(int sig)
                 i++;
                 if(!host->icmp_recv) {
                         status = STATE_CRITICAL;
+                        host->rtmin=0;
+                        host->jitter_min=0;
                         if(host->flags & FLAG_LOST_CAUSE) {
                                 char address[INET6_ADDRSTRLEN];
                                 parse_address(&host->error_addr, address, sizeof(address));
@@ -1197,31 +1477,137 @@ finish(int sig)
                                            get_icmp_error_msg(host->icmp_type, host->icmp_code),
                                            address,
                                            100);
-                        }
-                        else { /* not marked as lost cause, so we have no flags for it */
+                        } else { /* not marked as lost cause, so we have no flags for it */
                                 printf("%s: rta nan, lost 100%%", host->name);
                         }
+                } else {        /* !icmp_recv */
+                        printf("%s", host->name);
+                        /* rta text output */
+                        if (rta_mode) {
+                                if (status == STATE_OK)
+                                        printf(" rta %0.3fms", host->rta / 1000);
+                                else if (status==STATE_WARNING && host->rta_status==status)
+                                        printf(" rta %0.3fms > %0.3fms", (float)host->rta / 1000, (float)warn.rta/1000);
+                                else if (status==STATE_CRITICAL && host->rta_status==status)
+                                        printf(" rta %0.3fms > %0.3fms", (float)host->rta / 1000, (float)crit.rta/1000);
+                        }
+                        /* pl text output */
+                        if (pl_mode) {
+                                if (status == STATE_OK)
+                                        printf(" lost %u%%", host->pl);
+                                else if (status==STATE_WARNING && host->pl_status==status)
+                                        printf(" lost %u%% > %u%%", host->pl, warn.pl);
+                                else if (status==STATE_CRITICAL && host->pl_status==status)
+                                        printf(" lost %u%% > %u%%", host->pl, crit.pl);
+                        }
+                        /* jitter text output */
+                        if (jitter_mode) {
+                                if (status == STATE_OK)
+                                        printf(" jitter %0.3fms", (float)host->jitter);
+                                else if (status==STATE_WARNING && host->jitter_status==status)
+                                        printf(" jitter %0.3fms > %0.3fms", (float)host->jitter, warn.jitter);
+                                else if (status==STATE_CRITICAL && host->jitter_status==status)
+                                        printf(" jitter %0.3fms > %0.3fms", (float)host->jitter, crit.jitter);
+                        }
+                        /* mos text output */
+                        if (mos_mode) {
+                                if (status == STATE_OK)
+                                        printf(" MOS %0.1f", (float)host->mos);
+                                else if (status==STATE_WARNING && host->mos_status==status)
+                                        printf(" MOS %0.1f < %0.1f", (float)host->mos, (float)warn.mos);
+                                else if (status==STATE_CRITICAL && host->mos_status==status)
+                                        printf(" MOS %0.1f < %0.1f", (float)host->mos, (float)crit.mos);
+                        }
+                        /* score text output */
+                        if (score_mode) {
+                                if (status == STATE_OK)
+                                        printf(" Score %u", (int)host->score);
+                                else if (status==STATE_WARNING && host->score_status==status )
+                                        printf(" Score %u < %u", (int)host->score, (int)warn.score);
+                                else if (status==STATE_CRITICAL && host->score_status==status )
+                                        printf(" Score %u < %u", (int)host->score, (int)crit.score);
+                        }
+                        /* order statis text output */
+                        if (order_mode) {
+                                if (status == STATE_OK)
+                                        printf(" Packets in order");
+                                else if (status==STATE_CRITICAL && host->order_status==status)
+                                        printf(" Packets out of order");
+                        }
                 }
-                else {  /* !icmp_recv */
-                        printf("%s: rta %0.3fms, lost %u%%",
-                                   host->name, host->rta / 1000, host->pl);
-                }
-
                 host = host->next;
         }
 
         /* iterate once more for pretty perfparse output */
-        printf("|");
+        if (!(!rta_mode && !pl_mode && !jitter_mode && !score_mode && !mos_mode && order_mode)) {
+                        printf("|");
+        }
         i = 0;
         host = list;
         while(host) {
                 if(debug) puts("");
-                printf("%srta=%0.3fms;%0.3f;%0.3f;0; %spl=%u%%;%u;%u;; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",
-                           (targets > 1) ? host->name : "",
-                           host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000,
-                           (targets > 1) ? host->name : "", host->pl, warn.pl, crit.pl,
-                           (targets > 1) ? host->name : "", (float)host->rtmax / 1000,
-                           (targets > 1) ? host->name : "", (host->rtmin < INFINITY) ? (float)host->rtmin / 1000 : (float)0);
+
+                if (rta_mode) {
+                        if (host->pl<100) {
+                                printf("%srta=%0.3fms;%0.3f;%0.3f;0; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",
+                                        (targets > 1) ? host->name : "",
+                                        host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000,
+                                        (targets > 1) ? host->name : "", (float)host->rtmax / 1000,
+                                        (targets > 1) ? host->name : "", (host->rtmin < INFINITY) ? (float)host->rtmin / 1000 : (float)0);
+                        } else {
+                                printf("%srta=U;;;; %srtmax=U;;;; %srtmin=U;;;; ",
+                                        (targets > 1) ? host->name : "",
+                                        (targets > 1) ? host->name : "",
+                                        (targets > 1) ? host->name : "");
+                        }
+                }
+
+                if (pl_mode) {
+                        printf("%spl=%u%%;%u;%u;0;100 ", (targets > 1) ? host->name : "", host->pl, warn.pl, crit.pl);
+                }
+
+                if (jitter_mode) {
+                        if (host->pl<100) {
+                                printf("%sjitter_avg=%0.3fms;%0.3f;%0.3f;0; %sjitter_max=%0.3fms;;;; %sjitter_min=%0.3fms;;;; ",
+                                        (targets > 1) ? host->name : "",
+                                        (float)host->jitter,
+                                        (float)warn.jitter,
+                                        (float)crit.jitter,
+                                        (targets > 1) ? host->name : "",
+                                        (float)host->jitter_max / 1000, (targets > 1) ? host->name : "",
+                                        (float)host->jitter_min / 1000
+                                );
+                        } else {
+                                printf("%sjitter_avg=U;;;; %sjitter_max=U;;;; %sjitter_min=U;;;; ",
+                                        (targets > 1) ? host->name : "",
+                                        (targets > 1) ? host->name : "",
+                                        (targets > 1) ? host->name : "");
+                        }
+                }
+
+                if (mos_mode) {
+                        if (host->pl<100) {
+                                printf("%smos=%0.1f;%0.1f;%0.1f;0;5 ",
+                                        (targets > 1) ? host->name : "",
+                                        (float)host->mos,
+                                        (float)warn.mos,
+                                        (float)crit.mos);
+                        } else {
+                                printf("%smos=U;;;; ", (targets > 1) ? host->name : "");
+                        }
+                }
+
+                if (score_mode) {
+                        if (host->pl<100) {
+                                printf("%sscore=%u;%u;%u;0;100 ",
+                                        (targets > 1) ? host->name : "",
+                                        (int)host->score,
+                                        (int)warn.score,
+                                        (int)crit.score);
+                        } else {
+                                printf("%sscore=U;;;; ", (targets > 1) ? host->name : "");
+                        }
+                }
 
                 host = host->next;
         }
@@ -1312,6 +1698,7 @@ add_target_ip(char *arg, struct sockaddr_storage *in)
         /* set the values. use calling name for output */
         host->name = strdup(arg);
 
+
         /* fill out the sockaddr_storage struct */
         if(address_family == AF_INET) {
                 host_sin = (struct sockaddr_in *)&host->saddr_in;
@@ -1324,7 +1711,22 @@ add_target_ip(char *arg, struct sockaddr_storage *in)
                 memcpy(host_sin6->sin6_addr.s6_addr, sin6->sin6_addr.s6_addr, sizeof host_sin6->sin6_addr.s6_addr);
         }
 
+        /* fill out the sockaddr_in struct */
         host->rtmin = INFINITY;
+        host->rtmax = 0;
+        host->jitter=0;
+        host->jitter_max=0;
+        host->jitter_min=INFINITY;
+        host->last_tdiff=0;
+        host->order_status=STATE_OK;
+        host->last_icmp_seq=0;
+        host->rta_status=0;
+        host->pl_status=0;
+        host->jitter_status=0;
+        host->mos_status=0;
+        host->score_status=0;
+        host->pl_status=0;
+
 
         if(!list) list = cursor = host;
         else cursor->next = host;
@@ -1408,7 +1810,7 @@ add_target(char *arg)
                 }
                 break;
         }
-        freeaddrinfo(res);
+        freeaddrinfo(res);
 
         return 0;
 }
@@ -1472,7 +1874,7 @@ get_timevar(const char *str)
 
         /* unit might be given as ms|m (millisec),
          * us|u (microsec) or just plain s, for seconds */
-        u = p = '\0';
+        p = '\0';
         u = str[len - 1];
         if(len >= 2 && !isdigit((int)str[len - 2])) p = str[len - 2];
         if(p && u == 's') u = p;
@@ -1530,6 +1932,81 @@ get_threshold(char *str, threshold *th)
         return 0;
 }
 
+/*
+ * This functions receives a pointer to a string which should contain a threshold for the
+ * rta, packet_loss, jitter, mos or score mode in the form number,number[m|%]* assigns the
+ * parsed number to the corresponding threshold variable.
+ * @param[in,out] str String containing the given threshold values
+ * @param[in] length strlen(str)
+ * @param[out] warn Pointer to the warn threshold struct to which the values should be assigned
+ * @param[out] crit Pointer to the crit threshold struct to which the values should be assigned
+ * @param[in] mode Determines whether this a threshold for rta, packet_loss, jitter, mos or score (exclusively)
+ */
+static bool get_threshold2(char *str, size_t length, threshold *warn, threshold *crit, threshold_mode mode) {
+        if (!str || !length || !warn || !crit) return false;
+
+
+        // p points to the last char in str
+        char *p = &str[length - 1];
+
+        // first_iteration is bof-stop on stupid libc's
+        bool first_iteration = true;
+
+        while(p != &str[0]) {
+                if( (*p == 'm') || (*p == '%') ) {
+                        *p = '\0';
+                } else if(*p == ',' && !first_iteration) {
+                        *p = '\0';      /* reset it so get_timevar(str) works nicely later */
+
+                        char *start_of_value = p + 1;
+
+                        if (!parse_threshold2_helper(start_of_value, strlen(start_of_value), crit, mode)){
+                                return false;
+                        }
+
+                }
+                first_iteration = false;
+                p--;
+        }
+
+        return parse_threshold2_helper(p, strlen(p), warn, mode);
+}
+
+static bool parse_threshold2_helper(char *s, size_t length, threshold *thr, threshold_mode mode) {
+        char *resultChecker = {0};
+
+        switch (mode) {
+                case const_rta_mode:
+                        thr->rta = strtod(s, &resultChecker) * 1000;
+                        break;
+                case const_packet_loss_mode:
+                        thr->pl = (unsigned char)strtoul(s, &resultChecker, 0);
+                        break;
+                case const_jitter_mode:
+                        thr->jitter = strtod(s, &resultChecker);
+
+                        break;
+                case const_mos_mode:
+                        thr->mos = strtod(s, &resultChecker);
+                        break;
+                case const_score_mode:
+                        thr->score = strtod(s, &resultChecker);
+                        break;
+        }
+
+        if (resultChecker == s) {
+                // Failed to parse
+                return false;
+        }
+
+        if (resultChecker != (s + length)) {
+                // Trailing symbols
+                return false;
+        }
+
+        return true;
+}
+
 unsigned short
 icmp_checksum(uint16_t *p, size_t n)
 {
@@ -1555,74 +2032,91 @@ icmp_checksum(uint16_t *p, size_t n)
 void
 print_help(void)
 {
-
-  /*print_revision (progname);*/ /* FIXME: Why? */
-
-  printf ("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n");
-  printf (COPYRIGHT, copyright, email);
-
-  printf ("\n\n");
-
-  print_usage ();
-
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
-
-  printf (" %s\n", "-H");
-  printf ("    %s\n", _("specify a target"));
-  printf (" %s\n", "[-4|-6]");
-  printf ("    %s\n", _("Use IPv4 (default) or IPv6 to communicate with the targets"));
-  printf (" %s\n", "-w");
-  printf ("    %s", _("warning threshold (currently "));
-  printf ("%0.3fms,%u%%)\n", (float)warn.rta / 1000, warn.pl);
-  printf (" %s\n", "-c");
-  printf ("    %s", _("critical threshold (currently "));
-  printf ("%0.3fms,%u%%)\n", (float)crit.rta / 1000, crit.pl);
-  printf (" %s\n", "-s");
-  printf ("    %s\n", _("specify a source IP address or device name"));
-  printf (" %s\n", "-n");
-  printf ("    %s", _("number of packets to send (currently "));
-  printf ("%u)\n",packets);
-  printf (" %s\n", "-i");
-  printf ("    %s", _("max packet interval (currently "));
-  printf ("%0.3fms)\n",(float)pkt_interval / 1000);
-  printf (" %s\n", "-I");
-  printf ("    %s", _("max target interval (currently "));
-  printf ("%0.3fms)\n", (float)target_interval / 1000);
-  printf (" %s\n", "-m");
-  printf ("    %s",_("number of alive hosts required for success"));
-  printf ("\n");
-  printf (" %s\n", "-l");
-  printf ("    %s", _("TTL on outgoing packets (currently "));
-  printf ("%u)\n", ttl);
-  printf (" %s\n", "-t");
-  printf ("    %s",_("timeout value (seconds, currently  "));
-  printf ("%u)\n", timeout);
-  printf (" %s\n", "-b");
-  printf ("    %s\n", _("Number of icmp data bytes to send"));
-  printf ("    %s %u + %d)\n", _("Packet size will be data bytes + icmp header (currently"),icmp_data_size, ICMP_MINLEN);
-  printf (" %s\n", "-v");
-  printf ("    %s\n", _("verbose"));
-
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("The -H switch is optional. Naming a host (or several) to check is not."));
-  printf ("\n");
-  printf (" %s\n", _("Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"));
-  printf (" %s\n", _("packet loss.  The default values should work well for most users."));
-  printf (" %s\n", _("You can specify different RTA factors using the standardized abbreviations"));
-  printf (" %s\n", _("us (microseconds), ms (milliseconds, default) or just plain s for seconds."));
-/* -d not yet implemented */
-/*  printf ("%s\n", _("Threshold format for -d is warn,crit.  12,14 means WARNING if >= 12 hops"));
-  printf ("%s\n", _("are spent and CRITICAL if >= 14 hops are spent."));
-  printf ("%s\n\n", _("NOTE: Some systems decrease TTL when forming ICMP_ECHOREPLY, others do not."));*/
-  printf ("\n");
-  printf (" %s\n", _("The -v switch can be specified several times for increased verbosity."));
-/*  printf ("%s\n", _("Long options are currently unsupported."));
-  printf ("%s\n", _("Options marked with * require an argument"));
-*/
-
-  printf (UT_SUPPORT);
+        /*print_revision (progname);*/ /* FIXME: Why? */
+        printf ("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n");
+
+        printf (COPYRIGHT, copyright, email);
+
+        printf ("\n\n");
+
+        print_usage ();
+
+        printf (UT_HELP_VRSN);
+        printf (UT_EXTRA_OPTS);
+
+        printf (" %s\n", "-H");
+        printf ("    %s\n", _("specify a target"));
+        printf (" %s\n", "[-4|-6]");
+        printf ("    %s\n", _("Use IPv4 (default) or IPv6 to communicate with the targets"));
+        printf (" %s\n", "-w");
+        printf ("    %s", _("warning threshold (currently "));
+        printf ("%0.3fms,%u%%)\n", (float)warn.rta / 1000, warn.pl);
+        printf (" %s\n", "-c");
+        printf ("    %s", _("critical threshold (currently "));
+        printf ("%0.3fms,%u%%)\n", (float)crit.rta / 1000, crit.pl);
+
+        printf (" %s\n", "-R");
+        printf ("    %s\n", _("RTA, round trip average,  mode  warning,critical, ex. 100ms,200ms unit in ms"));
+        printf (" %s\n", "-P");
+        printf ("    %s\n", _("packet loss mode, ex. 40%,50% , unit in %"));
+        printf (" %s\n", "-J");
+        printf ("    %s\n", _("jitter mode  warning,critical, ex. 40.000ms,50.000ms , unit in ms "));
+        printf (" %s\n", "-M");
+        printf ("    %s\n", _("MOS mode, between 0 and 4.4  warning,critical, ex. 3.5,3.0"));
+        printf (" %s\n", "-S");
+        printf ("    %s\n", _("score  mode, max value 100  warning,critical, ex. 80,70 "));
+        printf (" %s\n", "-O");
+        printf ("    %s\n", _("detect out of order ICMP packts "));
+        printf (" %s\n", "-H");
+        printf ("    %s\n", _("specify a target"));
+        printf (" %s\n", "-s");
+        printf ("    %s\n", _("specify a source IP address or device name"));
+        printf (" %s\n", "-n");
+        printf ("    %s", _("number of packets to send (currently "));
+        printf ("%u)\n",packets);
+        printf (" %s\n", "-p");
+        printf ("    %s", _("number of packets to send (currently "));
+        printf ("%u)\n",packets);
+        printf (" %s\n", "-i");
+        printf ("    %s", _("max packet interval (currently "));
+        printf ("%0.3fms)\n",(float)pkt_interval / 1000);
+        printf (" %s\n", "-I");
+        printf ("    %s", _("max target interval (currently "));
+        printf ("%0.3fms)\n", (float)target_interval / 1000);
+        printf (" %s\n", "-m");
+        printf ("    %s",_("number of alive hosts required for success"));
+        printf ("\n");
+        printf (" %s\n", "-l");
+        printf ("    %s", _("TTL on outgoing packets (currently "));
+        printf ("%u)\n", ttl);
+        printf (" %s\n", "-t");
+        printf ("    %s",_("timeout value (seconds, currently  "));
+        printf ("%u)\n", timeout);
+        printf (" %s\n", "-b");
+        printf ("    %s\n", _("Number of icmp data bytes to send"));
+        printf ("    %s %u + %d)\n", _("Packet size will be data bytes + icmp header (currently"),icmp_data_size, ICMP_MINLEN);
+        printf (" %s\n", "-v");
+        printf ("    %s\n", _("verbose"));
+        printf ("\n");
+        printf ("%s\n", _("Notes:"));
+        printf (" %s\n", _("If none of R,P,J,M,S or O is specified, default behavior is -R -P"));
+        printf (" %s\n", _("The -H switch is optional. Naming a host (or several) to check is not."));
+        printf ("\n");
+        printf (" %s\n", _("Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"));
+        printf (" %s\n", _("packet loss.  The default values should work well for most users."));
+        printf (" %s\n", _("You can specify different RTA factors using the standardized abbreviations"));
+        printf (" %s\n", _("us (microseconds), ms (milliseconds, default) or just plain s for seconds."));
+        /* -d not yet implemented */
+        /*  printf ("%s\n", _("Threshold format for -d is warn,crit.  12,14 means WARNING if >= 12 hops"));
+                        printf ("%s\n", _("are spent and CRITICAL if >= 14 hops are spent."));
+                        printf ("%s\n\n", _("NOTE: Some systems decrease TTL when forming ICMP_ECHOREPLY, others do not."));*/
+        printf ("\n");
+        printf (" %s\n", _("The -v switch can be specified several times for increased verbosity."));
+        /*  printf ("%s\n", _("Long options are currently unsupported."));
+                        printf ("%s\n", _("Options marked with * require an argument"));
+                        */
+
+        printf (UT_SUPPORT);
 }
 
 
@@ -1630,6 +2124,6 @@ print_help(void)
 void
 print_usage (void)
 {
-  printf ("%s\n", _("Usage:"));
-  printf(" %s [options] [-H] host1 host2 hostN\n", progname);
+        printf ("%s\n", _("Usage:"));
+        printf(" %s [options] [-H] host1 host2 hostN\n", progname);
 }
diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t
index 96addd3..de1d88d 100644
--- a/plugins-root/t/check_icmp.t
+++ b/plugins-root/t/check_icmp.t
@@ -12,14 +12,14 @@ my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO",
         "no" );
 
 if ($allow_sudo eq "yes" or $> == 0) {
-        plan tests => 20;
+        plan tests => 40;
 } else {
         plan skip_all => "Need sudo to test check_icmp";
 }
 my $sudo = $> == 0 ? '' : 'sudo';
 
-my $successOutput = '/OK - .*?: rta (?:[\d\.]+ms)|(?:nan), lost \d+%/';
-my $failureOutput = '/(WARNING|CRITICAL) - .*?: rta [\d\.]+ms, lost \d%/';
+my $successOutput = '/OK - .*? rta (?:[\d\.]+ms)|(?:nan), lost \d+%/';
+my $failureOutput = '/(WARNING|CRITICAL) - .*? rta (?:[\d\.]+ms > [\d\.]+ms|nan)/';
 
 my $host_responsive    = getTestParameter( "NP_HOST_RESPONSIVE",
                                 "The hostname of system responsive to network requests",
@@ -54,10 +54,11 @@ is( $res->return_code, 2, "Syntax ok, with forced critical" );
 like( $res->output, $failureOutput, "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100%"
+        "$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -t 2"
         );
 is( $res->return_code, 2, "Timeout - host nonresponsive" );
-like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" );
+like( $res->output, '/pl=100%/', "Error contains 'pl=100%' string (for 100% packet loss)" );
+like( $res->output, '/rta=U/', "Error contains 'rta=U' string" );
 
 $res = NPTest->testCmd(
         "$sudo ./check_icmp -w 10000ms,100% -c 10000ms,100%"
@@ -66,13 +67,13 @@ is( $res->return_code, 3, "No hostname" );
 like( $res->output, '/No hosts to check/', "Output with appropriate error message");
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 0"
+        "$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 0 -t 2"
         );
 is( $res->return_code, 0, "One host nonresponsive - zero required" );
 like( $res->output, $successOutput, "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 1"
+        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 1 -t 2"
         );
 is( $res->return_code, 0, "One of two host nonresponsive - one required" );
 like( $res->output, $successOutput, "Output OK" );
@@ -94,3 +95,49 @@ $res = NPTest->testCmd(
         );
 is( $res->return_code, 0, "Try max packet size" );
 like( $res->output, $successOutput, "Output OK - Didn't overflow" );
+
+$res = NPTest->testCmd(
+        "$sudo ./check_icmp -H $host_responsive -R 100,100 -n 1 -t 2"
+        );
+is( $res->return_code, 0, "rta works" );
+like( $res->output, $successOutput, "Output OK" );
+$res = NPTest->testCmd(
+        "$sudo ./check_icmp -H $host_responsive -P 80,90 -n 1 -t 2"
+        );
+is( $res->return_code, 0, "pl works" );
+like( $res->output, '/lost 0%/', "Output OK" );
+
+$res = NPTest->testCmd(
+        "$sudo ./check_icmp -H $host_responsive -J 80,90 -t 2"
+        );
+is( $res->return_code, 0, "jitter works" );
+like( $res->output, '/jitter \d/', "Output OK" );
+
+$res = NPTest->testCmd(
+        "$sudo ./check_icmp -H $host_responsive -M 4,3 -t 2"
+        );
+is( $res->return_code, 0, "mos works" );
+like( $res->output, '/MOS \d/', "Output OK" );
+
+$res = NPTest->testCmd(
+        "$sudo ./check_icmp -H $host_responsive -S 80,70 -t 2"
+        );
+is( $res->return_code, 0, "score works" );
+like( $res->output, '/Score \d/', "Output OK" );
+
+$res = NPTest->testCmd(
+        "$sudo ./check_icmp -H $host_responsive -O -t 2"
+        );
+is( $res->return_code, 0, "order works" );
+like( $res->output, '/Packets in order/', "Output OK" );
+
+$res = NPTest->testCmd(
+        "$sudo ./check_icmp -H $host_responsive -O -S 80,70 -M 4,3 -J 80,90 -P 80,90 -R 100,100 -t 2"
+        );
+is( $res->return_code, 0, "order works" );
+like( $res->output, '/Packets in order/', "Output OK" );
+like( $res->output, '/Score \d/', "Output OK" );
+like( $res->output, '/MOS \d/', "Output OK" );
+like( $res->output, '/jitter \d/', "Output OK" );
+like( $res->output, '/lost 0%/', "Output OK" );
+like( $res->output, $successOutput, "Output OK" );
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index f4d33a7..eda8dd4 100644
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -226,7 +226,8 @@ if (/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/) {
         my ($total_bytes) = $1 * $2;
         my ($occupied_bytes) = $1 * $2 - $avail_bytes;
         my ($avail) = $avail_bytes/1024;
-        my ($capper) = int(($3/$1)*100);
+        my ($capper);
+        if ($1!=0) { $capper = int(($3/$1)*100) } else { $capper=100 };
         my ($mountpt) = "\\\\$host\\$share";
 
         # TODO : why is the kB the standard unit for args ?
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index 84f2022..15a7080 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -40,15 +40,16 @@
 
 # ----------------------------------------------------------------[ Require ]--
 
-require 5.004;
+require 5.14.0;
 
 # -------------------------------------------------------------------[ Uses ]--
 
-use Socket;
 use strict;
+use IO::Socket::IP;
 use Getopt::Long;
-use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $verbose);
+use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $opt_4 $opt_6 $verbose);
 use vars qw($PROGNAME);
+use vars qw($ClientSocket);
 use FindBin;
 use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
@@ -58,7 +59,6 @@ use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 sub print_help ();
 sub print_usage ();
 sub connection ($$$$);
-sub bindRemote ($$);
 
 # -------------------------------------------------------------[ Environment ]--
 
@@ -104,7 +104,7 @@ sub connection ($$$$)
                 $answer = "Server $in_remotehost has less than 0 users! Something is Really WRONG!\n";
         }
         
-        print ClientSocket "quit\n";
+        print $ClientSocket "quit\n";
         print $answer;
         exit $ERRORS{$state};
 }
@@ -112,7 +112,7 @@ sub connection ($$$$)
 # ------------------------------------------------------------[ print_usage ]--
 
 sub print_usage () {
-        print "Usage: $PROGNAME -H <host> [-w <warn>] [-c <crit>] [-p <port>]\n";
+        print "Usage: $PROGNAME -H <host> [-w <warn>] [-c <crit>] [-p <port>] [ -4|-6 ]\n";
 }
 
 # -------------------------------------------------------------[ print_help ]--
@@ -135,35 +135,15 @@ Perl Check IRCD plugin for monitoring
    Number of connected users which generates a critical state (Default: 100)
 -p, --port=INTEGER
    Port that the ircd daemon is running on <host> (Default: 6667)
+-4, --use-ipv4
+   Use IPv4 connection
+-6, --use-ipv6
+   Use IPv6 connection
 -v, --verbose
    Print extra debugging information
 ";
 }
 
-# -------------------------------------------------------------[ bindRemote ]--
-
-sub bindRemote ($$)
-{
-        my ($in_remotehost, $in_remoteport) = @_;
-        my $proto = getprotobyname('tcp');
-        my $sockaddr;
-        my $that;
-        my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost);
-
-        if (!socket(ClientSocket,AF_INET, SOCK_STREAM, $proto)) {
-            print "IRCD UNKNOWN: Could not start socket ($!)\n";
-            exit $ERRORS{"UNKNOWN"};
-        }
-        $sockaddr = 'S n a4 x8';
-        $that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
-        if (!connect(ClientSocket, $that)) { 
-            print "IRCD UNKNOWN: Could not connect socket ($!)\n";
-            exit $ERRORS{"UNKNOWN"};
-        }
-        select(ClientSocket); $| = 1; select(STDOUT);
-        return \*ClientSocket;
-}
-
 # ===================================================================[ MAIN ]==
 
 MAIN:
@@ -179,6 +159,8 @@ MAIN:
                 "w=i" => \$opt_w,  "warning=i"  => \$opt_w,
                 "c=i" => \$opt_c,  "critical=i" => \$opt_c,
                 "p=i" => \$opt_p,  "port=i"     => \$opt_p,
+                "4"   => \$opt_4,  "use-ipv4"   => \$opt_4,
+                "6"   => \$opt_6,  "use-ipv6"   => \$opt_6,
                 "H=s" => \$opt_H,  "hostname=s" => \$opt_H);
 
         if ($opt_V) {
@@ -189,7 +171,7 @@ MAIN:
         if ($opt_h) {print_help(); exit $ERRORS{'UNKNOWN'};}
 
         ($opt_H) || ($opt_H = shift @ARGV) || usage("Host name/address not specified\n");
-        my $remotehost = $1 if ($opt_H =~ /([-.A-Za-z0-9]+)/);
+        my $remotehost = $1 if ($opt_H =~ /([-.:%A-Za-z0-9]+)/);
         ($remotehost) || usage("Invalid host: $opt_H\n");
 
         ($opt_w) || ($opt_w = shift @ARGV) || ($opt_w = 50);
@@ -214,21 +196,28 @@ MAIN:
         
         alarm($TIMEOUT);
 
-        my ($name, $alias, $proto) = getprotobyname('tcp');
-
         print "MAIN(debug): binding to remote host: $remotehost -> $remoteport\n" if $verbose;
-        my $ClientSocket = &bindRemote($remotehost,$remoteport);
+        $ClientSocket = IO::Socket::IP->new(
+                PeerHost    => $remotehost,
+                PeerService => $remoteport,
+                Family      => $opt_4 ? AF_INET : $opt_6 ? AF_INET6 : undef,
+                Type        => SOCK_STREAM,
+        );
+        if (!$ClientSocket) {
+                print "IRCD UNKNOWN: Could not start socket ($!)\n";
+                exit $ERRORS{"UNKNOWN"};
+        }
         
-        print ClientSocket "NICK $NICK\nUSER $USER_INFO\n";
+        print $ClientSocket "NICK $NICK\nUSER $USER_INFO\n";
         
-        while (<ClientSocket>) {
+        while (<$ClientSocket>) {
                 print "MAIN(debug): default var = $_\n" if $verbose;
 
                 # DALnet,LagNet,UnderNet etc. Require this!
                 # Replies with a PONG when presented with a PING query.
                 # If a server doesn't require it, it will be ignored.
         
-                if (m/^PING (.*)/) {print ClientSocket "PONG $1\n";}
+                if (m/^PING (.*)/) {print $ClientSocket "PONG $1\n";}
         
                 alarm(0);
         
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index 49156af..f143c6f 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -1,7 +1,7 @@
 #!@PERL@ -w
 
 # check_mailq - check to see how many messages are in the smtp queue awating
-#   transmittal.  
+#   transmittal.
 #
 # Initial version support sendmail's mailq command
 #  Support for multiple sendmail queues (Carlos Canau)
@@ -29,8 +29,8 @@ use POSIX;
 use strict;
 use Getopt::Long;
 use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t $opt_s $opt_d
-                                        $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq $mailq_args
-                                        @lines %srcdomains %dstdomains);
+            $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq $mailq_args
+            @lines %srcdomains %dstdomains);
 use FindBin;
 use lib "$FindBin::Bin";
 use utils qw(%ERRORS &print_revision &support &usage );
@@ -42,10 +42,10 @@ sub print_usage ();
 sub process_arguments ();
 
 $ENV{'PATH'}='@TRUSTED_PATH@';
-$ENV{'BASH_ENV'}=''; 
+$ENV{'BASH_ENV'}='';
 $ENV{'ENV'}='';
 $PROGNAME = "check_mailq";
-$mailq = 'sendmail';    # default
+$mailq = 'sendmail';    # default
 $msg_q = 0 ;
 $msg_p = 0 ;
 # If appended, must start with a space
@@ -55,50 +55,49 @@ $state = $ERRORS{'UNKNOWN'};
 Getopt::Long::Configure('bundling');
 $status = process_arguments();
 if ($status){
-        print "ERROR: processing arguments\n";
-        exit $ERRORS{"UNKNOWN"};
+    print "ERROR: processing arguments\n";
+    exit $ERRORS{"UNKNOWN"};
 }
 
 if ($opt_s) {
-        if (defined $utils::PATH_TO_SUDO && -x $utils::PATH_TO_SUDO) {
-                $sudo = $utils::PATH_TO_SUDO;
-        } else {
-                print "ERROR: Cannot execute sudo\n";
-                exit $ERRORS{'UNKNOWN'};
-        }
+    if (defined $utils::PATH_TO_SUDO && -x $utils::PATH_TO_SUDO) {
+        $sudo = $utils::PATH_TO_SUDO;
+    } else {
+        print "ERROR: Cannot execute sudo\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
 } else {
-        $sudo = "";
+    $sudo = "";
 }
 
 if ($opt_d) {
-        $mailq_args = $mailq_args . ' -C ' . $opt_d;
+    $mailq_args = $mailq_args . ' -C ' . $opt_d;
 }
 
 $SIG{'ALRM'} = sub {
-        print ("ERROR: timed out waiting for $utils::PATH_TO_MAILQ \n");
-        exit $ERRORS{"WARNING"};
+    print ("ERROR: timed out waiting for $utils::PATH_TO_MAILQ \n");
+    exit $ERRORS{"WARNING"};
 };
 alarm($opt_t);
 
 # switch based on MTA
 
 if ($mailq eq "sendmail") {
-
-        ## open mailq 
-        if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
-                if (! open (MAILQ, "$sudo $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'};
-        }
+    if( ! $utils::PATH_TO_MAILQ) {
+        print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    if ( ! -x $utils::PATH_TO_MAILQ) {
+        print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    ## open mailq
+    if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) {
+        print "ERROR: could not open $sudo $utils::PATH_TO_MAILQ \n";
+        exit $ERRORS{'UNKNOWN'};
+    }
 #  single queue empty
 ##/var/spool/mqueue is empty
 #  single queue: 1
@@ -168,213 +167,207 @@ if ($mailq eq "sendmail") {
 ## /var/spool/mqueue is empty
 ##                 Total requests: 0
 
-        my $this_msg_q = 0;
-        while (<MAILQ>) {
-        
-                # match email addr on queue listing
-                if ( (/<.*@.*\.(\w+\.\w+)>/) || (/<.*@(\w+\.\w+)>/) ) {
-                        my $domain = $1;
-                        if (/^\w+/) {
-                        print "$utils::PATH_TO_MAILQ = srcdomain = $domain \n" if $verbose ;
-                    $srcdomains{$domain} ++;
-                        }
-                        next;
-                }
-        
-                #
-                # ...
-                # sendmail considers a message with more than one destiny, say N, to the same MX 
-                # to have N messages in queue.
-                # we will only consider one in this code
-                if (( /\s\(reply:\sread\serror\sfrom\s.*\.(\w+\.\w+)\.$/ ) || ( /\s\(reply:\sread\serror\sfrom\s(\w+\.\w+)\.$/ ) ||
-                        ( /\s\(timeout\swriting\smessage\sto\s.*\.(\w+\.\w+)\.:/ ) || ( /\s\(timeout\swriting\smessage\sto\s(\w+\.\w+)\.:/ ) ||
-                        ( /\s\(host\smap:\slookup\s\(.*\.(\w+\.\w+)\):/ ) || ( /\s\(host\smap:\slookup\s\((\w+\.\w+)\):/ ) || 
-                        ( /\s\(Deferred:\s.*\s.*\.(\w+\.\w+)\.\)/ ) || ( /\s\(Deferred:\s.*\s(\w+\.\w+)\.\)/ ) ) {
-        
-                        print "$utils::PATH_TO_MAILQ = dstdomain = $1 \n" if $verbose ;
-                        $dstdomains{$1} ++;
-                }
-        
-                if (/\s+\(I\/O\serror\)/) {
-                        print "$utils::PATH_TO_MAILQ = dstdomain = UNKNOWN \n" if $verbose ;
-                        $dstdomains{'UNKNOWN'} ++;
-                }
-
-                # Finally look at the overall queue length
-                #
-                if (/mqueue/) {
-                        print "$utils::PATH_TO_MAILQ = $_ "if $verbose ;
-                        if (/ \((\d+) request/) {
-                #
-                    # single queue: first line
-                    # multi queue: one for each queue. overwrite on multi queue below
-                  $this_msg_q = $1 ;
-                  $msg_q += $1 ;
-                        }
-                } elsif (/^\s+Total\sRequests:\s(\d+)$/i) {
-                        if ($this_msg_q) {
-                                $this_msg_q = 0 ;
-                        } else {
-                                print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ;
-                                #
-                                # multi queue: last line
-                                $msg_q += $1 ;
-                        }
-                }
-        
-        }
-        
-
-        ## close mailq
-
-        close (MAILQ); 
-
-        if ( $? ) {
-                print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/;
-                exit $ERRORS{CRITICAL};
-        }
-
-        ## shut off the alarm
-        alarm(0);
-
-
-
-        ## now check the queue length(s)
-
-        if ($msg_q == 0) {
-                $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 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'};
-                }
-
-                # check for domain specific queue lengths if requested
-                if (defined $opt_W) {
-                
-                        # Apply threshold to queue lengths FROM domain
-                        my @srckeys = sort { $srcdomains{$b} <=> $srcdomains{$a} } keys %srcdomains;
-          my $srcmaxkey = $srckeys[0];
-        print "src max is $srcmaxkey with $srcdomains{$srcmaxkey} messages\n" if $verbose;
-                
-                        if ($srcdomains{$srcmaxkey} >= $opt_W && $srcdomains{$srcmaxkey} < $opt_C) {
-                                if ($state == $ERRORS{'OK'}) {
-                                        $msg = "WARNING: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
-                                        $state = $ERRORS{'WARNING'};
-                                } elsif (($state == $ERRORS{'WARNING'}) || ($state == $ERRORS{'CRITICAL'})){
-                        $msg .= " -and- $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
-                                } else {
-                                        $msg = "WARNING: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
-                                        $state = $ERRORS{'WARNING'};
-                                }
-          } elsif ($srcdomains{$srcmaxkey} >= $opt_C) {
-                                if ($state == $ERRORS{'OK'}) {
-                                        $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold C = $opt_C)";
-                                        $state = $ERRORS{'CRITICAL'};
-                                } elsif ($state == $ERRORS{'WARNING'}) {
-                                        $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold C = $opt_C) -and- " . $msg;
-                                        $msg =~ s/WARNING: //;
-                                } elsif ($state == $ERRORS{'CRITICAL'}) {
-                                        $msg .= " -and- $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
-                                } else {
-                                        $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
-                                        $state = $ERRORS{'CRITICAL'};
-                                }
-            } else {
-                                if ($srcdomains{$srcmaxkey} > 0) {
-                                        $msg .= " $srcdomains{$srcmaxkey} msgs. FROM $srcmaxkey is below threshold ($opt_W/$opt_C)";
-                                }
-                        }
-
-                        # Apply threshold to queue lengths TO domain
-                        my @dstkeys = sort { $dstdomains{$b} <=> $dstdomains{$a} } keys %dstdomains;
-            my $dstmaxkey = $dstkeys[0];
-          print "dst max is $dstmaxkey with $dstdomains{$dstmaxkey} messages\n" if $verbose;
-                
-                        if ($dstdomains{$dstmaxkey} >= $opt_W && $dstdomains{$dstmaxkey} < $opt_C) {
-                                if ($state == $ERRORS{'OK'}) {
-                                        $msg = "WARNING: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
-                                        $state = $ERRORS{'WARNING'};
-                                } elsif (($state == $ERRORS{'WARNING'}) || ($state == $ERRORS{'CRITICAL'})){
-                                        $msg .= " -and- $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
-                                } else {
-                                        $msg = "WARNING: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
-                                        $state = $ERRORS{'WARNING'};
-                                }
-                        } elsif ($dstdomains{$dstmaxkey} >= $opt_C) {
-                                if ($state == $ERRORS{'OK'}) {
-                                        $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold C = $opt_C)";
-                                        $state = $ERRORS{'CRITICAL'};
-                                } elsif ($state == $ERRORS{'WARNING'}) {
-                                        $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold C = $opt_C) -and- " . $msg;
-                                        $msg =~ s/WARNING: //;
-                                } elsif ($state == $ERRORS{'CRITICAL'}) {
-                                        $msg .= " -and- $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
-                                } else {
-                                        $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
-                                        $state = $ERRORS{'CRITICAL'};
-                                }
-                        } else {
-                                if ($dstdomains{$dstmaxkey} > 0) {
-                                        $msg .= " $dstdomains{$dstmaxkey} msgs. TO $dstmaxkey is below threshold ($opt_W/$opt_C)";
-                                }
-                        }
-
-                } # End of queue length thresholds
-
-        }
+    my $this_msg_q = 0;
+    while (<MAILQ>) {
+
+        # match email addr on queue listing
+        if ( (/<.*@.*\.(\w+\.\w+)>/) || (/<.*@(\w+\.\w+)>/) ) {
+            my $domain = $1;
+            if (/^\w+/) {
+              print "$utils::PATH_TO_MAILQ = srcdomain = $domain \n" if $verbose ;
+            $srcdomains{$domain} ++;
+            }
+            next;
+        }
 
-} # end of ($mailq eq "sendmail")
-elsif ( $mailq eq "postfix" ) {
+        #
+        # ...
+        # sendmail considers a message with more than one destiny, say N, to the same MX
+        # to have N messages in queue.
+        # we will only consider one in this code
+        if (( /\s\(reply:\sread\serror\sfrom\s.*\.(\w+\.\w+)\.$/ ) || ( /\s\(reply:\sread\serror\sfrom\s(\w+\.\w+)\.$/ ) ||
+            ( /\s\(timeout\swriting\smessage\sto\s.*\.(\w+\.\w+)\.:/ ) || ( /\s\(timeout\swriting\smessage\sto\s(\w+\.\w+)\.:/ ) ||
+            ( /\s\(host\smap:\slookup\s\(.*\.(\w+\.\w+)\):/ ) || ( /\s\(host\smap:\slookup\s\((\w+\.\w+)\):/ ) ||
+            ( /\s\(Deferred:\s.*\s.*\.(\w+\.\w+)\.\)/ ) || ( /\s\(Deferred:\s.*\s(\w+\.\w+)\.\)/ ) ) {
+
+            print "$utils::PATH_TO_MAILQ = dstdomain = $1 \n" if $verbose ;
+            $dstdomains{$1} ++;
+        }
 
-     ## open mailq
-        if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
-                if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ$mailq_args | " ) ) {
-                        print "ERROR: could not open $utils::PATH_TO_MAILQ$mailq_args \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'};
+        if (/\s+\(I\/O\serror\)/) {
+            print "$utils::PATH_TO_MAILQ = dstdomain = UNKNOWN \n" if $verbose ;
+            $dstdomains{'UNKNOWN'} ++;
         }
 
+        # Finally look at the overall queue length
+        #
+        if (/mqueue/) {
+            print "$utils::PATH_TO_MAILQ = $_ "if $verbose ;
+            if (/ \((\d+) request/) {
+            #
+            # single queue: first line
+            # multi queue: one for each queue. overwrite on multi queue below
+          $this_msg_q = $1 ;
+            $msg_q += $1 ;
+            }
+        } elsif (/^\s+Total\sRequests:\s(\d+)$/i) {
+            if ($this_msg_q) {
+                $this_msg_q = 0 ;
+            } else {
+                print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ;
+                #
+                # multi queue: last line
+                $msg_q += $1 ;
+            }
+        }
 
-        @lines = reverse <MAILQ>;
+    }
+
+    ## close mailq
+    close (MAILQ);
+
+    if ( $? ) {
+        print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/;
+        exit $ERRORS{CRITICAL};
+    }
+
+    ## shut off the alarm
+    alarm(0);
+
+    ## now check the queue length(s)
+
+    if ($msg_q == 0) {
+        $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 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'};
+        }
 
-        # close qmail-qstat
-        close MAILQ;
+        # check for domain specific queue lengths if requested
+        if (defined $opt_W) {
+
+            # Apply threshold to queue lengths FROM domain
+            my @srckeys = sort { $srcdomains{$b} <=> $srcdomains{$a} } keys %srcdomains;
+            my $srcmaxkey = $srckeys[0];
+            print "src max is $srcmaxkey with $srcdomains{$srcmaxkey} messages\n" if $verbose;
+
+            if ($srcdomains{$srcmaxkey} >= $opt_W && $srcdomains{$srcmaxkey} < $opt_C) {
+                if ($state == $ERRORS{'OK'}) {
+                    $msg = "WARNING: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
+                    $state = $ERRORS{'WARNING'};
+                } elsif (($state == $ERRORS{'WARNING'}) || ($state == $ERRORS{'CRITICAL'})){
+                $msg .= " -and- $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
+                } else {
+                    $msg = "WARNING: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
+                    $state = $ERRORS{'WARNING'};
+                }
+            } elsif ($srcdomains{$srcmaxkey} >= $opt_C) {
+                if ($state == $ERRORS{'OK'}) {
+                    $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold C = $opt_C)";
+                    $state = $ERRORS{'CRITICAL'};
+                } elsif ($state == $ERRORS{'WARNING'}) {
+                    $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold C = $opt_C) -and- " . $msg;
+                    $msg =~ s/WARNING: //;
+                } elsif ($state == $ERRORS{'CRITICAL'}) {
+                    $msg .= " -and- $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
+                } else {
+                    $msg = "CRITICAL: $srcdomains{$srcmaxkey} messages in queue FROM $srcmaxkey (threshold W = $opt_W)";
+                    $state = $ERRORS{'CRITICAL'};
+                }
+            } else {
+                if ($srcdomains{$srcmaxkey} > 0) {
+                    $msg .= " $srcdomains{$srcmaxkey} msgs. FROM $srcmaxkey is below threshold ($opt_W/$opt_C)";
+                }
+            }
+
+            # Apply threshold to queue lengths TO domain
+            my @dstkeys = sort { $dstdomains{$b} <=> $dstdomains{$a} } keys %dstdomains;
+            my $dstmaxkey = $dstkeys[0];
+            print "dst max is $dstmaxkey with $dstdomains{$dstmaxkey} messages\n" if $verbose;
+
+            if ($dstdomains{$dstmaxkey} >= $opt_W && $dstdomains{$dstmaxkey} < $opt_C) {
+                if ($state == $ERRORS{'OK'}) {
+                    $msg = "WARNING: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
+                    $state = $ERRORS{'WARNING'};
+                } elsif (($state == $ERRORS{'WARNING'}) || ($state == $ERRORS{'CRITICAL'})){
+                    $msg .= " -and- $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
+                } else {
+                    $msg = "WARNING: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
+                    $state = $ERRORS{'WARNING'};
+                }
+            } elsif ($dstdomains{$dstmaxkey} >= $opt_C) {
+                if ($state == $ERRORS{'OK'}) {
+                    $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold C = $opt_C)";
+                    $state = $ERRORS{'CRITICAL'};
+                } elsif ($state == $ERRORS{'WARNING'}) {
+                    $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold C = $opt_C) -and- " . $msg;
+                    $msg =~ s/WARNING: //;
+                } elsif ($state == $ERRORS{'CRITICAL'}) {
+                    $msg .= " -and- $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
+                } else {
+                    $msg = "CRITICAL: $dstdomains{$dstmaxkey} messages in queue TO $dstmaxkey (threshold W = $opt_W)";
+                    $state = $ERRORS{'CRITICAL'};
+                }
+            } else {
+                if ($dstdomains{$dstmaxkey} > 0) {
+                    $msg .= " $dstdomains{$dstmaxkey} msgs. TO $dstmaxkey is below threshold ($opt_W/$opt_C)";
+                }
+            }
 
-        if ( $? ) {
-                print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ$mailq_args",$/;
-                exit $ERRORS{CRITICAL};
-        }
+        } # End of queue length thresholds
 
-        ## shut off the alarm
-        alarm(0);
+    }
 
-        # check queue length
-        if ($lines[0]=~/Kbytes in (\d+)/) {
-                $msg_q = $1 ;
-        }elsif ($lines[0]=~/Mail queue is empty/) {
-                $msg_q = 0;
+} # end of ($mailq eq "sendmail")
+elsif ( $mailq eq "postfix" ) {
+    if( ! $utils::PATH_TO_MAILQ ) {
+        print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    if ( ! -x $utils::PATH_TO_MAILQ) {
+        print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    ## open mailq
+    if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ$mailq_args | " ) ) {
+        print "ERROR: could not open $utils::PATH_TO_MAILQ$mailq_args \n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    @lines = reverse <MAILQ>;
+
+    # close qmail-qstat
+    close MAILQ;
+
+    if ( $? ) {
+    print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ$mailq_args",$/;
+    exit $ERRORS{CRITICAL};
+    }
+
+    ## shut off the alarm
+    alarm(0);
+
+    # check queue length
+    if ($lines[0]=~/Kbytes in (\d+)/) {
+        $msg_q = $1 ;
+    }elsif ($lines[0]=~/Mail queue is empty/) {
+        $msg_q = 0;
         }else{
-                print "Couldn't match $utils::PATH_TO_MAILQ$mailq_args output\n";
-                exit   $ERRORS{'UNKNOWN'};
+            print "Couldn't match $utils::PATH_TO_MAILQ$mailq_args output\n";
+            exit   $ERRORS{'UNKNOWN'};
         }
 
         # check messages not processed
@@ -390,194 +383,193 @@ elsif ( $mailq eq "postfix" ) {
                 $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 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'};
-                }
-
-                # check messages not yet preprocessed (only compare is $opt_W and $opt_C
-                # are defined)
-
-                #if (defined $opt_W) {
-                #        $msg .= "[Preprocessed = $msg_p]";
-                #        if ($msg_p >= $opt_W && $msg_p < $opt_C ) {
-                #                $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"}  ;
-                #        }elsif ($msg_p >= $opt_C ) {
-                #                $state = $ERRORS{"CRITICAL"} ;
-                #        }
-                #}
+            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 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'};
+            }
+
+            # check messages not yet preprocessed (only compare is $opt_W and $opt_C
+            # are defined)
+
+            #if (defined $opt_W) {
+            #        $msg .= "[Preprocessed = $msg_p]";
+            #        if ($msg_p >= $opt_W && $msg_p < $opt_C ) {
+            #                $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"}  ;
+            #        }elsif ($msg_p >= $opt_C ) {
+            #                $state = $ERRORS{"CRITICAL"} ;
+            #        }
+            #}
         }
 } # end of ($mailq eq "postfix")
 elsif ( $mailq eq "qmail" ) {
+    if ( ! $utils::PATH_TO_QMAIL_QSTAT ) {
+        print "ERROR: \$utils::PATH_TO_QMAIL_QSTAT is not defined\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    if ( ! -x $utils::PATH_TO_QMAIL_QSTAT) {
+        print "ERROR: $utils::PATH_TO_QMAIL_QSTAT is not executable by (uid $>:gid($)))\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    # open qmail-qstat
+    if (! open (MAILQ, "$sudo $utils::PATH_TO_QMAIL_QSTAT | " ) ) {
+        print "ERROR: could not open $utils::PATH_TO_QMAIL_QSTAT \n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    @lines = <MAILQ>;
+
+    # close qmail-qstat
+    close MAILQ;
+
+    if ( $? ) {
+        print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/;
+        exit $ERRORS{CRITICAL};
+    }
+
+    ## shut off the alarm
+    alarm(0);
+
+    # check queue length
+    if ($lines[0]=~/^messages in queue: (\d+)/) {
+        $msg_q = $1 ;
+    }else{
+        print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n";
+        exit   $ERRORS{'UNKNOWN'};
+    }
+
+    # check messages not processed
+    if ($lines[1]=~/^messages in queue but not yet preprocessed: (\d+)/) {
+        my $msg_p = $1;
+    }else{
+        print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n";
+        exit  $ERRORS{'UNKNOWN'};
+    }
+
+
+    # check queue length(s)
+    if ($msg_q == 0){
+        $msg = "OK: qmail-qstat 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 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'};
+        }
+
+        # check messages not yet preprocessed (only compare is $opt_W and $opt_C
+        # are defined)
+
+        if (defined $opt_W) {
+            $msg .= "[Preprocessed = $msg_p]";
+            if ($msg_p >= $opt_W && $msg_p < $opt_C ) {
+                $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"}  ;
+            }elsif ($msg_p >= $opt_C ) {
+                $state = $ERRORS{"CRITICAL"} ;
+            }
+        }
+    }
 
-        # open qmail-qstat 
-        if ( defined $utils::PATH_TO_QMAIL_QSTAT && -x $utils::PATH_TO_QMAIL_QSTAT ) {
-                if (! open (MAILQ, "$sudo $utils::PATH_TO_QMAIL_QSTAT | " ) ) {
-                        print "ERROR: could not open $utils::PATH_TO_QMAIL_QSTAT \n";
-                        exit $ERRORS{'UNKNOWN'};
-                }
-        }elsif( defined $utils::PATH_TO_QMAIL_QSTAT){
-                unless (-x $utils::PATH_TO_QMAIL_QSTAT) {
-                        print "ERROR: $utils::PATH_TO_QMAIL_QSTAT is not executable by (uid $>:gid($)))\n";
-                        exit $ERRORS{'UNKNOWN'};
-                }
-        } else {
-                print "ERROR: \$utils::PATH_TO_QMAIL_QSTAT is not defined\n";
-                exit $ERRORS{'UNKNOWN'};
-        }
-
-        @lines = <MAILQ>;
-
-        # close qmail-qstat
-        close MAILQ;
-
-        if ( $? ) {
-                print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/;
-                exit $ERRORS{CRITICAL};
-        }
-
-        ## shut off the alarm
-        alarm(0);
-
-        # check queue length
-        if ($lines[0]=~/^messages in queue: (\d+)/) {
-                $msg_q = $1 ;
-        }else{
-                print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n";
-                exit   $ERRORS{'UNKNOWN'};
-        }
-
-        # check messages not processed
-        if ($lines[1]=~/^messages in queue but not yet preprocessed: (\d+)/) {
-                my $msg_p = $1;
-        }else{
-                print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n";
-                exit  $ERRORS{'UNKNOWN'};
-        }
-
-
-        # check queue length(s)
-        if ($msg_q == 0){
-                $msg = "OK: qmail-qstat 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 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'};
-                }
-
-                # check messages not yet preprocessed (only compare is $opt_W and $opt_C
-                # are defined)
-                
-                if (defined $opt_W) {
-                        $msg .= "[Preprocessed = $msg_p]";
-                        if ($msg_p >= $opt_W && $msg_p < $opt_C ) {
-                                $state = $state == $ERRORS{"CRITICAL"} ? $ERRORS{"CRITICAL"} : $ERRORS{"WARNING"}  ;
-                        }elsif ($msg_p >= $opt_C ) {
-                                $state = $ERRORS{"CRITICAL"} ;
-                        }
-                }
-        }                               
-                
 
 
 } # end of ($mailq eq "qmail")
 elsif ( $mailq eq "exim" ) {
-        ## open mailq 
-        if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
-                if (! open (MAILQ, "$sudo $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>) {
-            #22m  1.7K 19aEEr-0007hx-Dy <> *** frozen ***
+    if ( ! $utils::PATH_TO_MAILQ  ) {
+        print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    if ( ! -x $utils::PATH_TO_MAILQ) {
+        print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    ## open mailq
+    if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) {
+        print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    while (<MAILQ>) {
+        #22m  1.7K 19aEEr-0007hx-Dy <> *** frozen ***
             #root@exlixams.glups.fr
 
-            if (/\s[\w\d]{6}-[\w\d]{6}-[\w\d]{2}\s/) { # message id 19aEEr-0007hx-Dy
-                $msg_q++ ;
-            }
-        }
-        close(MAILQ) ;
-
-        if ( $? ) {
-                print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/;
-                exit $ERRORS{CRITICAL};
-        }
-        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'};
-        }
+        if (/\s[\w\d]{6}-[\w\d]{6}-[\w\d]{2}\s/) { # message id 19aEEr-0007hx-Dy
+        $msg_q++ ;
+        }
+    }
+    close(MAILQ) ;
+
+    if ( $? ) {
+        print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/;
+        exit $ERRORS{CRITICAL};
+    }
+    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 "exim")
 
 elsif ( $mailq eq "nullmailer" ) {
-        ## open mailq
-        if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) {
-                if (! open (MAILQ, "$sudo $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>) {
-            #2022-08-25 01:30:40 502 bytes from <user@example.com>
-
-            if (/^\d{4}-\d{2}-\d{2}\s+\d{2}\:\d{2}\:\d{2}\s+\d+\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'};
-        }
+    if( ! $utils::PATH_TO_MAILQ) {
+        print "ERROR: \$utils::PATH_TO_MAILQ is not defined\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    if ( ! -x $utils::PATH_TO_MAILQ) {
+        print "ERROR: $utils::PATH_TO_MAILQ is not executable by (uid $>:gid($)))\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    ## open mailq
+    if ( ! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) {
+        print "ERROR: could not open $utils::PATH_TO_MAILQ \n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    while (<MAILQ>) {
+        #2022-08-25 01:30:40 502 bytes from <user@example.com>
+
+        if (/^\d{4}-\d{2}-\d{2}\s+\d{2}\:\d{2}\:\d{2}\s+\d+\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
@@ -590,130 +582,130 @@ exit $state;
 
 
 sub process_arguments(){
-        GetOptions
-                ("V"   => \$opt_V, "version"    => \$opt_V,
-                 "v"   => \$opt_v, "verbose"    => \$opt_v,
-                 "h"   => \$opt_h, "help"       => \$opt_h,
-                 "M:s" => \$opt_M, "mailserver:s" => \$opt_M, # mailserver (default     sendmail)
-                 "w=i" => \$opt_w, "warning=i"  => \$opt_w,   # warning if above this number
-                 "c=i" => \$opt_c, "critical=i" => \$opt_c,   # critical if above this number
-                 "W=i" => \$opt_W, "warning-domain=i"  => \$opt_W,   # Warning if above this number
-                 "C=i" => \$opt_C, "critical-domain=i" => \$opt_C,   # Critical if above this number
-                 "t=i" => \$opt_t, "timeout=i"  => \$opt_t,
-                 "s"   => \$opt_s, "sudo"       => \$opt_s,
-                 "d:s" => \$opt_d, "configdir:s" => \$opt_d,
-                 );
-
-        if ($opt_V) {
-                print_revision($PROGNAME,'@NP_VERSION@');
-                exit $ERRORS{'UNKNOWN'};
-        }
-
-        if ($opt_h) {
-                print_help();
-                exit $ERRORS{'UNKNOWN'};
-        }
-
-        if (defined $opt_v ){
-                $verbose = $opt_v;
-        }
-
-        unless (defined $opt_t) {
-                $opt_t = $utils::TIMEOUT ;      # default timeout
-        }
-
-        unless (  defined $opt_w &&  defined $opt_c ) {
-                print_usage();
-                exit $ERRORS{'UNKNOWN'};
-        }
-
-        if ( $opt_w >= $opt_c) {
-                print "Warning (-w) cannot be greater than Critical (-c)!\n";
-                exit $ERRORS{'UNKNOWN'};
-        }
-
-        if (defined $opt_W && ! defined !$opt_C) {
-                print "Need -C if using -W\n";
-                exit $ERRORS{'UNKNOWN'};
-        }elsif(defined $opt_W && defined $opt_C) {
-                if ($opt_W >= $opt_C) {
-                        print "Warning (-W) cannot be greater than Critical (-C)!\n";
-                        exit $ERRORS{'UNKNOWN'};
-                }
-        }
-
-        if (defined $opt_M) {
-                if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) {
-                        $mailq = $opt_M ;
-                }elsif( $opt_M eq ''){
-                        $mailq = 'sendmail';
-                }else{
-                        print "-M: $opt_M is not supported\n";
-                        exit $ERRORS{'UNKNOWN'};
-                }
-        }else{
-                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'};
+    GetOptions
+        ("V"   => \$opt_V, "version"    => \$opt_V,
+         "v"   => \$opt_v, "verbose"    => \$opt_v,
+         "h"   => \$opt_h, "help"       => \$opt_h,
+         "M:s" => \$opt_M, "mailserver:s" => \$opt_M, # mailserver (default    sendmail)
+         "w=i" => \$opt_w, "warning=i"  => \$opt_w,   # warning if above this number
+         "c=i" => \$opt_c, "critical=i" => \$opt_c,   # critical if above this number
+         "W=i" => \$opt_W, "warning-domain=i"  => \$opt_W,   # Warning if above this number
+         "C=i" => \$opt_C, "critical-domain=i" => \$opt_C,   # Critical if above this number
+         "t=i" => \$opt_t, "timeout=i"  => \$opt_t,
+         "s"   => \$opt_s, "sudo"       => \$opt_s,
+         "d:s" => \$opt_d, "configdir:s" => \$opt_d,
+         );
+
+    if ($opt_V) {
+        print_revision($PROGNAME,'@NP_VERSION@');
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    if ($opt_h) {
+        print_help();
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    if (defined $opt_v ){
+        $verbose = $opt_v;
+    }
+
+    unless (defined $opt_t) {
+        $opt_t = $utils::TIMEOUT ;    # default timeout
+    }
+
+    unless (  defined $opt_w &&  defined $opt_c ) {
+        print_usage();
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    if ( $opt_w >= $opt_c) {
+        print "Warning (-w) cannot be greater than Critical (-c)!\n";
+        exit $ERRORS{'UNKNOWN'};
+    }
+
+    if (defined $opt_W && ! defined !$opt_C) {
+        print "Need -C if using -W\n";
+        exit $ERRORS{'UNKNOWN'};
+    }elsif(defined $opt_W && defined $opt_C) {
+        if ($opt_W >= $opt_C) {
+            print "Warning (-W) cannot be greater than Critical (-C)!\n";
+            exit $ERRORS{'UNKNOWN'};
+        }
+    }
+
+    if (defined $opt_M) {
+        if ($opt_M =~ /^(sendmail|qmail|postfix|exim|nullmailer)$/) {
+            $mailq = $opt_M ;
+        }elsif( $opt_M eq ''){
+            $mailq = 'sendmail';
+        }else{
+            print "-M: $opt_M is not supported\n";
+            exit $ERRORS{'UNKNOWN'};
+        }
+    }else{
+        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'};
 }
 
 sub print_usage () {
-        print "Usage: $PROGNAME -w <warn> -c <crit> [-W <warn>] [-C <crit>] [-M <MTA>] [-t <timeout>] [-s] [-d <CONFIGDIR>] [-v]\n";
+    print "Usage: $PROGNAME -w <warn> -c <crit> [-W <warn>] [-C <crit>] [-M <MTA>] [-t <timeout>] [-s] [-d <CONFIGDIR>] [-v]\n";
 }
 
 sub print_help () {
-        print_revision($PROGNAME,'@NP_VERSION@');
-        print "Copyright (c) 2002 Subhendu Ghosh/Carlos Canau/Benjamin Schmid\n";
-        print "\n";
-        print_usage();
-        print "\n";
-        print "   Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n";
-        print "   Feedback/patches to support non-sendmail mailqueue welcome\n\n";
-        print "-w (--warning)   = Min. number of messages in queue to generate warning\n";
-        print "-c (--critical)  = Min. number of messages in queue to generate critical alert ( w < c )\n";
-        print "-W (--warning-domain)  = Min. number of messages for same domain in queue to generate warning\n";
-        print "-C (--critical-domain) = 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 | nullmailer ] (default = autodetect)\n";
-        print "-s (--sudo)      = Use sudo to call the mailq command\n";
-        print "-d (--configdir) = Config file or directory\n";
-        print "-h (--help)\n";
-        print "-V (--version)\n";
-        print "-v (--verbose)         = debugging output\n";
-        print "\n\n";
-        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";
-        print "";
-        print "\n\n";
-        support();
+    print_revision($PROGNAME,'@NP_VERSION@');
+    print "Copyright (c) 2002 Subhendu Ghosh/Carlos Canau/Benjamin Schmid\n";
+    print "\n";
+    print_usage();
+    print "\n";
+    print "   Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n";
+    print "   Feedback/patches to support non-sendmail mailqueue welcome\n\n";
+    print "-w (--warning)   = Min. number of messages in queue to generate warning\n";
+    print "-c (--critical)  = Min. number of messages in queue to generate critical alert ( w < c )\n";
+    print "-W (--warning-domain)  = Min. number of messages for same domain in queue to generate warning\n";
+    print "-C (--critical-domain) = 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 | nullmailer ] (default = autodetect)\n";
+    print "-s (--sudo)      = Use sudo to call the mailq command\n";
+    print "-d (--configdir) = Config file or directory\n";
+    print "-h (--help)\n";
+    print "-V (--version)\n";
+    print "-v (--verbose)         = debugging output\n";
+    print "\n\n";
+    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";
+    print "";
+    print "\n\n";
+    support();
 }
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index 5998138..db824be 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -47,7 +47,7 @@ print_help() {
   echo "--cache"
   echo "   Check local database for library and buffer cache hit ratios"
   echo "       --->  Requires Oracle user/password and SID specified."
-  echo "                --->  Requires select on v_$sysstat and v_$librarycache"
+  echo "                --->  Requires select on v_\$sysstat and v_\$librarycache"
   echo "--tablespace"
   echo "   Check local database for tablespace capacity in ORACLE_SID"
   echo "       --->  Requires Oracle user/password specified."
@@ -109,14 +109,14 @@ if [ -z "$ORACLE_HOME" ] ; then
     for oratab in /var/opt/oracle/oratab /etc/oratab
     do
     [ ! -f $oratab ] && continue
-    ORACLE_HOME=`IFS=:
-        while read -r SID ORACLE_HOME junk;
+    ORACLE_HOME=$(IFS=:
+        while read -r SID ORACLE_HOME _;
         do
             if [ "$SID" = "$2" ] || [ "$SID" = "*" ] ; then
                 echo "$ORACLE_HOME";
                 exit;
             fi;
-        done < $oratab`
+        done < $oratab)
     [ -n "$ORACLE_HOME" ] && break
     done
 fi
@@ -209,7 +209,7 @@ case "$cmd" in
         echo "UNKNOWN - Warning level is less then Crit"
         exit "$STATE_UNKNOWN"
     fi
-    result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF
+    result=$(sqlplus -s "${3}"/"${4}"@"${2}" << EOF
 set pagesize 0
 set numf '9999999.99'
 select (1-(pr.value/(dbg.value+cg.value)))*100
@@ -217,7 +217,8 @@ from v\\$sysstat pr, v\\$sysstat dbg, v\\$sysstat cg
 where pr.name='physical reads'
 and dbg.name='db block gets'
 and cg.name='consistent gets';
-EOF`
+EOF
+)
 
     if echo "$result" | grep -q 'ORA-' ; then
         error=$(echo "$result" | grep "ORA-" | head -1)
@@ -227,12 +228,13 @@ EOF`
 
     buf_hr=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}')
     buf_hrx=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}')
-    result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF
+    result=$(sqlplus -s "${3}"/"${4}"@"${2}" << EOF
 set pagesize 0
 set numf '9999999.99'
 select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100
 from v\\$librarycache lc;
-EOF`
+EOF
+)
 
     if echo "$result" | grep -q 'ORA-' ; then
         error=$(echo "$result" | grep "ORA-" | head -1)
@@ -260,7 +262,7 @@ EOF`
         echo "UNKNOWN - Warning level is more then Crit"
         exit "$STATE_UNKNOWN"
     fi
-    result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF
+    result=$(sqlplus -s "${3}"/"${4}"@"${2}" << EOF
 set pagesize 0
 set numf '9999999.99'
 select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc
@@ -271,7 +273,8 @@ LEFT OUTER JOIN
 ( select tablespace_name,sum(bytes)/1024/1024 free
 from dba_free_space group by tablespace_name) B
 ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${5}';
-EOF`
+EOF
+)
 
     if echo "$result" | grep -q 'ORA-' ; then
         error=$(echo "$result" | grep "ORA-" | head -1)
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index fa982ae..5c0f6e2 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -94,7 +94,7 @@ static int stderr_warning = 0;   /* if a cmd issued output on stderr */
 static int exec_warning = 0;     /* if a cmd exited non-zero */
 
 int main (int argc, char **argv) {
-        int result=STATE_UNKNOWN, packages_available=0, sec_count=0, i=0;
+        int result=STATE_UNKNOWN, packages_available=0, sec_count=0;
         char **packages_list=NULL, **secpackages_list=NULL;
 
         /* Parse extra opts if any */
@@ -142,10 +142,11 @@ int main (int argc, char **argv) {
                 qsort(secpackages_list, sec_count, sizeof(char*), cmpstringp);
                 qsort(packages_list, packages_available-sec_count, sizeof(char*), cmpstringp);
 
-                for(i = 0; i < sec_count; i++)
+                for(int i = 0; i < sec_count; i++)
                         printf("%s (security)\n", secpackages_list[i]);
+
                 if (only_critical == false) {
-                        for(i = 0; i < packages_available - sec_count; i++)
+                        for(int i = 0; i < packages_available - sec_count; i++)
                                 printf("%s\n", packages_list[i]);
                 }
         }
@@ -251,7 +252,7 @@ int process_arguments (int argc, char **argv) {
 
 /* run an apt-get upgrade */
 int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkglist){
-        int i=0, result=STATE_UNKNOWN, regres=0, pc=0, spc=0;
+        int result=STATE_UNKNOWN, regres=0, pc=0, spc=0;
         struct output chld_out, chld_err;
         regex_t ireg, ereg, sreg;
         char *cmdline=NULL, rerrbuf[64];
@@ -320,7 +321,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg
          * we may need to switch to the --print-uris output format,
          * in which case the logic here will slightly change.
          */
-        for(i = 0; i < chld_out.lines; i++) {
+        for(size_t i = 0; i < chld_out.lines; i++) {
                 if(verbose){
                         printf("%s\n", chld_out.line[i]);
                 }
@@ -353,7 +354,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg
                 stderr_warning=1;
                 result = max_state(result, STATE_WARNING);
                 if(verbose){
-                        for(i = 0; i < chld_err.lines; i++) {
+                        for(size_t i = 0; i < chld_err.lines; i++) {
                                 fprintf(stderr, "%s\n", chld_err.line[i]);
                         }
                 }
@@ -367,7 +368,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg
 
 /* run an apt-get update (needs root) */
 int run_update(void){
-        int i=0, result=STATE_UNKNOWN;
+        int result=STATE_UNKNOWN;
         struct output chld_out, chld_err;
         char *cmdline;
 
@@ -385,7 +386,7 @@ int run_update(void){
         }
 
         if(verbose){
-                for(i = 0; i < chld_out.lines; i++) {
+                for(size_t i = 0; i < chld_out.lines; i++) {
                         printf("%s\n", chld_out.line[i]);
                 }
         }
@@ -395,7 +396,7 @@ int run_update(void){
                 stderr_warning=1;
                 result = max_state(result, STATE_WARNING);
                 if(verbose){
-                        for(i = 0; i < chld_err.lines; i++) {
+                        for(size_t i = 0; i < chld_err.lines; i++) {
                                 fprintf(stderr, "%s\n", chld_err.line[i]);
                         }
                 }
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 1ad547e..2a23b39 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -50,7 +50,7 @@ unsigned int services = 0;
 int skip_stdout = 0;
 int skip_stderr = 0;
 int warn_on_stderr = 0;
-bool unknown_timeout = FALSE;
+bool unknown_timeout = false;
 char *remotecmd = NULL;
 char **commargv = NULL;
 int commargc = 0;
@@ -58,8 +58,8 @@ char *hostname = NULL;
 char *outputfile = NULL;
 char *host_shortname = NULL;
 char **service;
-int passive = FALSE;
-int verbose = FALSE;
+bool passive = false;
+bool verbose = false;
 
 int
 main (int argc, char **argv)
@@ -68,7 +68,6 @@ main (int argc, char **argv)
         char *status_text;
         int cresult;
         int result = STATE_UNKNOWN;
-        int i;
         time_t local_time;
         FILE *fp = NULL;
         output chld_out, chld_err;
@@ -96,7 +95,7 @@ main (int argc, char **argv)
         /* run the command */
         if (verbose) {
                 printf ("Command: %s\n", commargv[0]);
-                for (i=1; i<commargc; i++)
+                for (int i = 1; i < commargc; i++)
                         printf ("Argument %i: %s\n", i, commargv[i]);
         }
 
@@ -110,9 +109,9 @@ main (int argc, char **argv)
         }
 
         if (verbose) {
-                for(i = 0; i < chld_out.lines; i++)
+                for(size_t i = 0; i < chld_out.lines; i++)
                         printf("stdout: %s\n", chld_out.line[i]);
-                for(i = 0; i < chld_err.lines; i++)
+                for(size_t i = 0; i < chld_err.lines; i++)
                         printf("stderr: %s\n", chld_err.line[i]);
         }
 
@@ -122,7 +121,7 @@ main (int argc, char **argv)
                 skip_stderr = chld_err.lines;
 
         /* UNKNOWN or worse if (non-skipped) output found on stderr */
-        if(chld_err.lines > skip_stderr) {
+        if(chld_err.lines > (size_t)skip_stderr) {
                 printf (_("Remote command execution failed: %s\n"),
                         chld_err.line[skip_stderr]);
                 if ( warn_on_stderr ) 
@@ -134,8 +133,8 @@ main (int argc, char **argv)
         /* this is simple if we're not supposed to be passive.
          * Wrap up quickly and keep the tricks below */
         if(!passive) {
-                if (chld_out.lines > skip_stdout)
-                        for (i = skip_stdout; i < chld_out.lines; i++)
+                if (chld_out.lines > (size_t)skip_stdout)
+                        for (size_t i = skip_stdout; i < chld_out.lines; i++)
                                 puts (chld_out.line[i]);
                 else
                         printf (_("%s - check_by_ssh: Remote command '%s' returned status %d\n"),
@@ -156,7 +155,7 @@ main (int argc, char **argv)
 
         local_time = time (NULL);
         commands = 0;
-        for(i = skip_stdout; i < chld_out.lines; i++) {
+        for(size_t i = skip_stdout; i < chld_out.lines; i++) {
                 status_text = chld_out.line[i++];
                 if (i == chld_out.lines || strstr (chld_out.line[i], "STATUS CODE: ") == NULL)
                         die (STATE_UNKNOWN, _("%s: Error parsing output\n"), progname);
@@ -235,7 +234,7 @@ process_arguments (int argc, char **argv)
                         print_help ();
                         exit (STATE_UNKNOWN);
                 case 'v':                                                                       /* help */
-                        verbose = TRUE;
+                        verbose = true;
                         break;
                 case 't':                                                                       /* timeout period */
                         if (!is_integer (optarg))
@@ -244,7 +243,7 @@ process_arguments (int argc, char **argv)
                                 timeout_interval = atoi (optarg);
                         break;
                 case 'U':
-                        unknown_timeout = TRUE;
+                        unknown_timeout = true;
                         break;
                 case 'H':                                                                       /* host */
                         hostname = optarg;
@@ -257,7 +256,7 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'O':                                                                       /* output file */
                         outputfile = optarg;
-                        passive = TRUE;
+                        passive = true;
                         break;
                 case 's':                                                                       /* description of service to check */
                         p1 = optarg;
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index d0871c4..d3bddac 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -134,6 +134,7 @@ char regexp[MAX_RE_SIZE];
 int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
 int errcode;
 bool invert_regex = false;
+int state_regex = STATE_CRITICAL;
 
 char *server_address = NULL;
 char *host_name = NULL;
@@ -213,6 +214,7 @@ char *client_privkey = NULL;
 char *ca_cert = NULL;
 bool verify_peer_and_host = false;
 bool is_openssl_callback = false;
+bool add_sslctx_verify_fun = false;
 #if defined(HAVE_SSL) && defined(USE_OPENSSL)
 X509 *cert = NULL;
 #endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */
@@ -223,6 +225,7 @@ curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
 int curl_http_version = CURL_HTTP_VERSION_NONE;
 bool automatic_decompression = false;
 char *cookie_jar_file = NULL;
+bool haproxy_protocol = false;
 
 bool process_arguments (int, char**);
 void handle_curl_option_return_code (CURLcode res, const char* option);
@@ -239,10 +242,10 @@ void print_help (void);
 void print_usage (void);
 void print_curl_version (void);
 int curlhelp_initwritebuffer (curlhelp_write_curlbuf*);
-int curlhelp_buffer_write_callback (void*, size_t , size_t , void*);
+size_t curlhelp_buffer_write_callback(void*, size_t , size_t , void*);
 void curlhelp_freewritebuffer (curlhelp_write_curlbuf*);
 int curlhelp_initreadbuffer (curlhelp_read_curlbuf *, const char *, size_t);
-int curlhelp_buffer_read_callback (void *, size_t , size_t , void *);
+size_t curlhelp_buffer_read_callback(void *, size_t , size_t , void *);
 void curlhelp_freereadbuffer (curlhelp_read_curlbuf *);
 curlhelp_ssl_library curlhelp_get_ssl_library ();
 const char* curlhelp_get_ssl_library_string (curlhelp_ssl_library);
@@ -297,7 +300,7 @@ main (int argc, char **argv)
 
 int verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)
 {
-        (void) preverify_ok;
+  (void) preverify_ok;
   /* TODO: we get all certificates of the chain, so which ones
    * should we test?
    * TODO: is the last certificate always the server certificate?
@@ -322,9 +325,18 @@ int verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)
 
 CURLcode sslctxfun(CURL *curl, SSL_CTX *sslctx, void *parm)
 {
-        (void) curl; // ignore unused parameter
-        (void) parm; // ignore unused parameter
-  SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, verify_callback);
+  (void) curl; // ignore unused parameter
+  (void) parm; // ignore unused parameter
+  if(add_sslctx_verify_fun) {
+    SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, verify_callback);
+  }
+
+  // workaround for issue:
+  // OpenSSL SSL_read: error:0A000126:SSL routines::unexpected eof while reading, errno 0
+  // see discussion https://github.com/openssl/openssl/discussions/22690
+#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
+  SSL_CTX_set_options(sslctx, SSL_OP_IGNORE_UNEXPECTED_EOF);
+#endif
 
   return CURLE_OK;
 }
@@ -395,7 +407,7 @@ lookup_host (const char *host, char *buf, size_t buflen)
   char addrstr[100];
   size_t addrstr_len;
   int errcode;
-  void *ptr;
+  void *ptr = { 0 };
   size_t buflen_remaining = buflen - 1;
 
   memset (&hints, 0, sizeof (hints));
@@ -466,6 +478,7 @@ int
 check_http (void)
 {
   int result = STATE_OK;
+  int result_ssl = STATE_OK;
   int page_len = 0;
   int i;
   char *force_host_header = NULL;
@@ -485,7 +498,7 @@ check_http (void)
 
   /* register cleanup function to shut down libcurl properly */
   atexit (cleanup);
-  
+
   if (verbose >= 1)
     handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_VERBOSE, 1), "CURLOPT_VERBOSE");
 
@@ -520,6 +533,11 @@ check_http (void)
   handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, socket_timeout), "CURLOPT_CONNECTTIMEOUT");
   handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_TIMEOUT, socket_timeout), "CURLOPT_TIMEOUT");
 
+  /* enable haproxy protocol */
+  if (haproxy_protocol) {
+    handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HAPROXYPROTOCOL, 1L), "CURLOPT_HAPROXYPROTOCOL");
+  }
+
   // fill dns resolve cache to make curl connect to the given server_address instead of the host_name, only required for ssl, because we use the host_name later on to make SNI happy
   if(use_ssl && host_name != NULL) {
       if ( (res=lookup_host (server_address, addrstr, DEFAULT_BUFFER_SIZE/2)) != 0) {
@@ -670,9 +688,8 @@ check_http (void)
          * OpenSSL-style libraries only!) */
 #ifdef USE_OPENSSL
         /* libcurl and monitoring plugins built with OpenSSL, good */
-        handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION");
+        add_sslctx_verify_fun = true;
         is_openssl_callback = true;
-#else /* USE_OPENSSL */
 #endif /* USE_OPENSSL */
         /* libcurl is built with OpenSSL, monitoring plugins, so falling
          * back to manually extracting certificate information */
@@ -705,12 +722,18 @@ check_http (void)
 #else /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
     /* old libcurl, our only hope is OpenSSL, otherwise we are out of luck */
     if (ssl_library == CURLHELP_SSL_LIBRARY_OPENSSL || ssl_library == CURLHELP_SSL_LIBRARY_LIBRESSL)
-      handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION");
+      add_sslctx_verify_fun = true;
     else
       die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (no CURLOPT_SSL_CTX_FUNCTION, no OpenSSL library or libcurl too old and has no CURLOPT_CERTINFO)\n");
 #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
   }
 
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 10, 6) /* required for CURLOPT_SSL_CTX_FUNCTION */
+  // ssl ctx function is not available with all ssl backends
+  if (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, NULL) != CURLE_UNKNOWN_OPTION)
+    handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION");
+#endif
+
 #endif /* LIBCURL_FEATURE_SSL */
 
   /* set default or user-given user agent identification */
@@ -805,7 +828,7 @@ check_http (void)
       handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_INFILESIZE, (curl_off_t)strlen (http_post_data)), "CURLOPT_INFILESIZE");
     }
   }
-  
+
   /* cookie handling */
   if (cookie_jar_file != NULL) {
     handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEJAR, cookie_jar_file), "CURLOPT_COOKIEJAR");
@@ -845,9 +868,9 @@ check_http (void)
         /* check certificate with OpenSSL functions, curl has been built against OpenSSL
          * and we actually have OpenSSL in the monitoring tools
          */
-        result = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
+        result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
         if (!continue_after_check_cert) {
-          return result;
+          return result_ssl;
         }
 #else /* USE_OPENSSL */
         die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates - OpenSSL callback used and not linked against OpenSSL\n");
@@ -891,17 +914,17 @@ GOT_FIRST_CERT:
                                                 die (STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
           }
           BIO_free (cert_BIO);
-          result = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
+          result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
           if (!continue_after_check_cert) {
-            return result;
+            return result_ssl;
           }
 #else /* USE_OPENSSL */
           /* We assume we don't have OpenSSL and np_net_ssl_check_certificate at our disposal,
            * so we use the libcurl CURLINFO data
            */
-          result = net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn, days_till_exp_crit);
+          result_ssl = net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn, days_till_exp_crit);
           if (!continue_after_check_cert) {
-            return result;
+            return result_ssl;
           }
 #endif /* USE_OPENSSL */
         } else {
@@ -1127,7 +1150,7 @@ GOT_FIRST_CERT:
                                 strcpy(msg, tmp);
 
                         }
-                        result = STATE_CRITICAL;
+                        result = state_regex;
                 } else {
                         regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
 
@@ -1167,9 +1190,9 @@ GOT_FIRST_CERT:
       else
         msg[strlen(msg)-3] = '\0';
     }
-  
+
   /* TODO: separate _() msg and status code: die (result, "HTTP %s: %s\n", state_text(result), msg); */
-  die (result, "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s",
+  die (max_state_alt(result, result_ssl), "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s",
     state_text(result), string_statuscode (status_line.http_major, status_line.http_minor),
     status_line.http_code, status_line.msg,
     strlen(msg) > 0 ? " - " : "",
@@ -1179,23 +1202,23 @@ GOT_FIRST_CERT:
     (show_body ? body_buf.buf : ""),
     (show_body ? "\n" : "") );
 
-  return result;
+  return max_state_alt(result, result_ssl);
 }
 
 int
 uri_strcmp (const UriTextRangeA range, const char* s)
 {
   if (!range.first) return -1;
-  if (range.afterLast - range.first < strlen (s)) return -1;
-  return strncmp (s, range.first, min( range.afterLast - range.first, strlen (s)));
+  if ( (size_t)(range.afterLast - range.first) < strlen (s) ) return -1;
+  return strncmp (s, range.first, min( (size_t)(range.afterLast - range.first), strlen (s)));
 }
 
 char*
 uri_string (const UriTextRangeA range, char* buf, size_t buflen)
 {
   if (!range.first) return "(null)";
-  strncpy (buf, range.first, max (buflen-1, range.afterLast - range.first));
-  buf[max (buflen-1, range.afterLast - range.first)] = '\0';
+  strncpy (buf, range.first, max (buflen-1, (size_t)(range.afterLast - range.first)));
+  buf[max (buflen-1, (size_t)(range.afterLast - range.first))] = '\0';
   buf[range.afterLast - range.first] = '\0';
   return buf;
 }
@@ -1218,6 +1241,10 @@ redir (curlhelp_write_curlbuf* header_buf)
     &status_line.http_major, &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen,
     headers, &nof_headers, 0);
 
+        if (res == -1) {
+                die (STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
+        }
+
   location = get_header_value (headers, nof_headers, "location");
 
   if (verbose >= 2)
@@ -1274,10 +1301,12 @@ redir (curlhelp_write_curlbuf* header_buf)
     }
   }
 
-  if (!uri_strcmp (uri.scheme, "https"))
-    use_ssl = true;
-  else
-    use_ssl = false;
+  if (uri.scheme.first) {
+    if (!uri_strcmp (uri.scheme, "https"))
+      use_ssl = true;
+    else
+      use_ssl = false;
+  }
 
   /* we do a sloppy test here only, because uriparser would have failed
    * above, if the port would be invalid, we just check for MAX_PORT
@@ -1295,10 +1324,13 @@ redir (curlhelp_write_curlbuf* header_buf)
          MAX_PORT, location, display_html ? "</A>" : "");
 
   /* by RFC 7231 relative URLs in Location should be taken relative to
-   * the original URL, so wy try to form a new absolute URL here
+   * the original URL, so we try to form a new absolute URL here
    */
   if (!uri.scheme.first && !uri.hostText.first) {
     new_host = strdup (host_name ? host_name : server_address);
+    new_port = server_port;
+    if(use_ssl)
+      uri_string (uri.scheme, "https", DEFAULT_BUFFER_SIZE);
   } else {
     new_host = strdup (uri_string (uri.hostText, buf, DEFAULT_BUFFER_SIZE));
   }
@@ -1380,7 +1412,9 @@ process_arguments (int argc, char **argv)
     CA_CERT_OPTION,
     HTTP_VERSION_OPTION,
     AUTOMATIC_DECOMPRESSION,
-    COOKIE_JAR
+    COOKIE_JAR,
+    HAPROXY_PROTOCOL,
+    STATE_REGEX
   };
 
   int option = 0;
@@ -1419,6 +1453,7 @@ process_arguments (int argc, char **argv)
     {"content-type", required_argument, 0, 'T'},
     {"pagesize", required_argument, 0, 'm'},
     {"invert-regex", no_argument, NULL, INVERT_REGEX},
+    {"state-regex", required_argument, 0, STATE_REGEX},
     {"use-ipv4", no_argument, 0, '4'},
     {"use-ipv6", no_argument, 0, '6'},
     {"extended-perfdata", no_argument, 0, 'E'},
@@ -1427,6 +1462,7 @@ process_arguments (int argc, char **argv)
     {"http-version", required_argument, 0, HTTP_VERSION_OPTION},
     {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION},
     {"cookie-jar", required_argument, 0, COOKIE_JAR},
+    {"haproxy-protocol", no_argument, 0, HAPROXY_PROTOCOL},
     {0, 0, 0, 0}
   };
 
@@ -1694,7 +1730,7 @@ process_arguments (int argc, char **argv)
       else {
         max_depth = atoi (optarg);
       }
-      break;    
+      break;
     case 'f': /* onredirect */
       if (!strcmp (optarg, "ok"))
         onredirect = STATE_OK;
@@ -1753,6 +1789,13 @@ process_arguments (int argc, char **argv)
     case INVERT_REGEX:
       invert_regex = true;
       break;
+    case STATE_REGEX:
+      if (!strcasecmp (optarg, "critical"))
+        state_regex = STATE_CRITICAL;
+      else if (!strcasecmp (optarg, "warning"))
+        state_regex = STATE_WARNING;
+      else usage2 (_("Invalid state-regex option"), optarg);
+      break;
     case '4':
       address_family = AF_INET;
       break;
@@ -1837,6 +1880,9 @@ process_arguments (int argc, char **argv)
     case COOKIE_JAR:
       cookie_jar_file = optarg;
       break;
+    case HAPROXY_PROTOCOL:
+      haproxy_protocol = true;
+      break;
     case '?':
       /* print short usage statement if args not parsable */
       usage5 ();
@@ -1977,8 +2023,11 @@ print_help (void)
   printf ("    %s\n", _("Note: SNI is not supported in libcurl before 7.18.1"));
 #endif
   printf (" %s\n", "-C, --certificate=INTEGER[,INTEGER]");
-  printf ("    %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
-  printf ("    %s\n", _("(when this option is used the URL is not checked by default. You can use"));
+  printf ("    %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443."));
+  printf ("    %s\n", _("A STATE_WARNING is returned if the certificate has a validity less than the"));
+  printf ("    %s\n", _("first agument's value. If there is a second argument and the certificate's"));
+  printf ("    %s\n", _("validity is less than its value, a STATE_CRITICAL is returned."));
+  printf ("    %s\n", _("(When this option is used the URL is not checked by default. You can use"));
   printf ("    %s\n", _(" --continue-after-certificate to override this behavior)"));
   printf (" %s\n", "--continue-after-certificate");
   printf ("    %s\n", _("Allows the HTTP check to continue after performing the certificate check."));
@@ -2007,7 +2056,7 @@ print_help (void)
   printf (" %s\n", "-u, --url=PATH");
   printf ("    %s\n", _("URL to GET or POST (default: /)"));
   printf (" %s\n", "-P, --post=STRING");
-  printf ("    %s\n", _("URL encoded http POST data"));
+  printf ("    %s\n", _("URL decoded http POST data"));
   printf (" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT)");
   printf ("    %s\n", _("Set HTTP method."));
   printf (" %s\n", "-N, --no-body");
@@ -2025,7 +2074,10 @@ print_help (void)
   printf (" %s\n", "-R, --eregi=STRING");
   printf ("    %s\n", _("Search page for case-insensitive regex STRING"));
   printf (" %s\n", "--invert-regex");
-  printf ("    %s\n", _("Return CRITICAL if found, OK if not\n"));
+  printf ("    %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)"));
+  printf ("    %s\n", _("can be changed with --state--regex)"));
+  printf (" %s\n", "--state-regex=STATE");
+  printf ("    %s\n", _("Return STATE if regex is found, OK if not. STATE can be one of \"critical\",\"warning\""));
   printf (" %s\n", "-a, --authorization=AUTH_PAIR");
   printf ("    %s\n", _("Username:password on sites with basic authentication"));
   printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR");
@@ -2056,7 +2108,9 @@ print_help (void)
   printf ("    %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)"));
   printf (" %s\n", "--enable-automatic-decompression");
   printf ("    %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING)."));
-  printf (" %s\n", "---cookie-jar=FILE");
+  printf(" %s\n", "--haproxy-protocol");
+  printf("    %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL)."));
+  printf (" %s\n", "--cookie-jar=FILE");
   printf ("    %s\n", _("Store cookies in the cookie jar and send them out when requested."));
   printf ("\n");
 
@@ -2140,7 +2194,7 @@ print_usage (void)
   printf ("       [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport|curl>]\n");
   printf ("       [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
   printf ("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
-  printf ("       [-A string] [-k string] [-S <version>] [--sni]\n");
+  printf ("       [-A string] [-k string] [-S <version>] [--sni] [--haproxy-protocol]\n");
   printf ("       [-T <content-type>] [-j method]\n");
   printf ("       [--http-version=<version>] [--enable-automatic-decompression]\n");
   printf ("       [--cookie-jar=<cookie jar file>\n");
@@ -2151,8 +2205,6 @@ print_usage (void)
   printf ("%s\n", _("In the first form, make an HTTP request."));
   printf ("%s\n\n", _("In the second form, connect to the server and check the TLS certificate."));
 #endif
-  printf ("%s\n", _("WARNING: check_curl is experimental. Please use"));
-  printf ("%s\n\n", _("check_http if you need a stable version."));
 }
 
 void
@@ -2171,8 +2223,7 @@ curlhelp_initwritebuffer (curlhelp_write_curlbuf *buf)
   return 0;
 }
 
-int
-curlhelp_buffer_write_callback (void *buffer, size_t size, size_t nmemb, void *stream)
+size_t curlhelp_buffer_write_callback (void *buffer, size_t size, size_t nmemb, void *stream)
 {
   curlhelp_write_curlbuf *buf = (curlhelp_write_curlbuf *)stream;
 
@@ -2192,8 +2243,7 @@ curlhelp_buffer_write_callback (void *buffer, size_t size, size_t nmemb, void *s
   return (int)(size * nmemb);
 }
 
-int
-curlhelp_buffer_read_callback (void *buffer, size_t size, size_t nmemb, void *stream)
+size_t curlhelp_buffer_read_callback(void *buffer, size_t size, size_t nmemb, void *stream)
 {
   curlhelp_read_curlbuf *buf = (curlhelp_read_curlbuf *)stream;
 
@@ -2366,8 +2416,7 @@ remove_newlines (char *s)
 char *
 get_header_value (const struct phr_header* headers, const size_t nof_headers, const char* header)
 {
-  int i;
-  for( i = 0; i < nof_headers; i++ ) {
+  for(size_t i = 0; i < nof_headers; i++ ) {
     if(headers[i].name != NULL && strncasecmp( header, headers[i].name, max( headers[i].name_len, 4 ) ) == 0 ) {
       return strndup( headers[i].value, headers[i].value_len );
     }
@@ -2390,6 +2439,10 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA
     &status_line.http_major, &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen,
     headers, &nof_headers, 0);
 
+        if (res == -1) {
+                die (STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
+        }
+
   server_date = get_header_value (headers, nof_headers, "date");
   document_date = get_header_value (headers, nof_headers, "last-modified");
 
@@ -2465,9 +2518,7 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA
 int
 get_content_length (const curlhelp_write_curlbuf* header_buf, const curlhelp_write_curlbuf* body_buf)
 {
-  const char *s;
-  int content_length = 0;
-  char *copy;
+  size_t content_length = 0;
   struct phr_header headers[255];
   size_t nof_headers = 255;
   size_t msglen;
@@ -2478,6 +2529,10 @@ get_content_length (const curlhelp_write_curlbuf* header_buf, const curlhelp_wri
     &status_line.http_major, &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen,
     headers, &nof_headers, 0);
 
+        if (res == -1) {
+                die (STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
+        }
+
   content_length_s = get_header_value (headers, nof_headers, "content-length");
   if (!content_length_s) {
     return header_buf->buflen + body_buf->buflen;
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c
index c24ca24..29c8520 100644
--- a/plugins/check_dbi.c
+++ b/plugins/check_dbi.c
@@ -141,7 +141,7 @@ main (int argc, char **argv)
         if (verbose > 2)
                 printf ("Initializing DBI\n");
 
-        dbi_inst *instance_p;
+        dbi_inst *instance_p = { 0 };
 
         if (dbi_initialize_r(NULL, instance_p) < 0) {
                 printf ("UNKNOWN - failed to initialize DBI; possibly you don't have any drivers installed.\n");
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 5d85ae2..be7a610 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -56,7 +56,7 @@ char *expected_address = NULL;
 char *dns_server = NULL;
 char *dig_args = "";
 char *query_transport = "";
-int verbose = FALSE;
+bool verbose = false;
 int server_port = DEFAULT_PORT;
 int number_tries = DEFAULT_TRIES;
 double warning_interval = UNDEFINED;
@@ -176,11 +176,11 @@ main (int argc, char **argv)
           state_text (result), elapsed_time,
           msg ? msg : _("Probably a non-existent host/domain"),
           fperfdata("time", elapsed_time, "s",
-                    (warning_interval>UNDEFINED?TRUE:FALSE),
+                    (warning_interval>UNDEFINED ? true:false),
                     warning_interval,
-                    (critical_interval>UNDEFINED?TRUE:FALSE),
+                    (critical_interval>UNDEFINED ? true:false),
             critical_interval,
-            TRUE, 0, FALSE, 0));
+            true, 0, false, 0));
   return result;
 }
 
@@ -270,7 +270,7 @@ process_arguments (int argc, char **argv)
       dig_args = strdup(optarg);
       break;
     case 'v':                 /* verbose */
-      verbose = TRUE;
+      verbose = true;
       break;
     case 'T':
       record_type = optarg;
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 05e5502..b3dd301 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -46,7 +46,7 @@ const char *email = "devel@monitoring-plugins.org";
 #include <stdarg.h>
 #include "fsusage.h"
 #include "mountlist.h"
-#include "intprops.h"    /* necessary for TYPE_MAXIMUM */
+#include <float.h>
 #if HAVE_LIMITS_H
 # include <limits.h>
 #endif
@@ -93,11 +93,11 @@ static int stat_remote_fs = 0;
 
 /* Linked list of filesystem types to omit.
    If the list is empty, don't exclude any types.  */
-static struct name_list *fs_exclude_list;
+static struct regex_list *fs_exclude_list = NULL;
 
 /* Linked list of filesystem types to check.
    If the list is empty, include all types.  */
-static struct name_list *fs_include_list;
+static struct regex_list *fs_include_list;
 
 static struct name_list *dp_exclude_list;
 
@@ -112,52 +112,48 @@ enum
 {
   SYNC_OPTION = CHAR_MAX + 1,
   NO_SYNC_OPTION,
-  BLOCK_SIZE_OPTION,
-  IGNORE_MISSING
+  BLOCK_SIZE_OPTION
 };
 
 #ifdef _AIX
 #pragma alloca
 #endif
 
-int process_arguments (int, char **);
-void print_path (const char *mypath);
-void set_all_thresholds (struct parameter_list *path);
-int validate_arguments (uintmax_t, uintmax_t, double, double, double, double, char *);
-void print_help (void);
+static int process_arguments (int, char **);
+static void set_all_thresholds (struct parameter_list *path);
+static void print_help (void);
 void print_usage (void);
-double calculate_percent(uintmax_t, uintmax_t);
-bool stat_path (struct parameter_list *p);
-void get_stats (struct parameter_list *p, struct fs_usage *fsp);
-void get_path_stats (struct parameter_list *p, struct fs_usage *fsp);
-
-char *exclude_device;
-char *units;
-uintmax_t mult = 1024 * 1024;
-int verbose = 0;
-int erronly = FALSE;
-int display_mntp = FALSE;
-int exact_match = FALSE;
-bool ignore_missing = false;
-int freespace_ignore_reserved = FALSE;
-int display_inodes_perfdata = FALSE;
-char *warn_freespace_units = NULL;
-char *crit_freespace_units = NULL;
-char *warn_freespace_percent = NULL;
-char *crit_freespace_percent = NULL;
-char *warn_usedspace_units = NULL;
-char *crit_usedspace_units = NULL;
-char *warn_usedspace_percent = NULL;
-char *crit_usedspace_percent = NULL;
-char *warn_usedinodes_percent = NULL;
-char *crit_usedinodes_percent = NULL;
-char *warn_freeinodes_percent = NULL;
-char *crit_freeinodes_percent = NULL;
-int path_selected = FALSE;
-bool path_ignored = false;
-char *group = NULL;
-struct stat *stat_buf;
-struct name_list *seen = NULL;
+static double calculate_percent(uintmax_t, uintmax_t);
+static bool stat_path (struct parameter_list *p);
+static void get_stats (struct parameter_list *p, struct fs_usage *fsp);
+static void get_path_stats (struct parameter_list *p, struct fs_usage *fsp);
+
+static char *units;
+static uintmax_t mult = 1024 * 1024;
+static int verbose = 0;
+static bool erronly = false;
+static bool display_mntp = false;
+static bool exact_match = false;
+static bool ignore_missing = false;
+static bool freespace_ignore_reserved = false;
+static bool display_inodes_perfdata = false;
+static char *warn_freespace_units = NULL;
+static char *crit_freespace_units = NULL;
+static char *warn_freespace_percent = NULL;
+static char *crit_freespace_percent = NULL;
+static char *warn_usedspace_units = NULL;
+static char *crit_usedspace_units = NULL;
+static char *warn_usedspace_percent = NULL;
+static char *crit_usedspace_percent = NULL;
+static char *warn_usedinodes_percent = NULL;
+static char *crit_usedinodes_percent = NULL;
+static char *warn_freeinodes_percent = NULL;
+static char *crit_freeinodes_percent = NULL;
+static bool path_selected = false;
+static bool path_ignored = false;
+static char *group = NULL;
+static struct stat *stat_buf;
+static struct name_list *seen = NULL;
 
 
 int
@@ -205,7 +201,7 @@ main (int argc, char **argv)
   /* If a list of paths has not been selected, find entire
      mount list and create list of paths
    */
-  if (path_selected == FALSE && path_ignored == false) {
+  if (path_selected == false && path_ignored == false) {
     for (me = mount_list; me; me = me->me_next) {
       if (! (path = np_find_parameter(path_select_list, me->me_mountdir))) {
         path = np_add_parameter(&path_select_list, me->me_mountdir);
@@ -300,7 +296,7 @@ main (int argc, char **argv)
       } else if (me->me_dummy && !show_all_fs) {
         continue;
       /* Skip excluded fstypes */
-      } else if (fs_exclude_list && np_find_name (fs_exclude_list, me->me_type)) {
+      } else if (fs_exclude_list && np_find_regmatch (fs_exclude_list, me->me_type)) {
         continue;
       /* Skip excluded fs's */
       } else if (dp_exclude_list &&
@@ -308,7 +304,7 @@ main (int argc, char **argv)
                 np_find_name (dp_exclude_list, me->me_mountdir))) {
         continue;
       /* Skip not included fstypes */
-      } else if (fs_include_list && !np_find_name (fs_include_list, me->me_type)) {
+      } else if (fs_include_list && !np_find_regmatch(fs_include_list, me->me_type)) {
         continue;
       }
     }
@@ -326,7 +322,7 @@ main (int argc, char **argv)
       get_stats (path, &fsp);
 
       if (verbose >= 3) {
-        printf ("For %s, used_pct=%g free_pct=%g used_units=%lu free_units=%lu total_units=%lu used_inodes_pct=%g free_inodes_pct=%g fsp.fsu_blocksize=%lu mult=%lu\n",
+        printf ("For %s, used_pct=%f free_pct=%f used_units=%lu free_units=%lu total_units=%lu used_inodes_pct=%f free_inodes_pct=%f fsp.fsu_blocksize=%lu mult=%lu\n",
                 me->me_mountdir,
                 path->dused_pct,
                 path->dfree_pct,
@@ -396,10 +392,10 @@ main (int argc, char **argv)
               perfdata_uint64 (
                   (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
                   path->dused_units * mult, "B",
-                  (warning_high_tide == UINT64_MAX ? FALSE : TRUE), warning_high_tide,
-                  (critical_high_tide == UINT64_MAX ? FALSE : TRUE), critical_high_tide,
-                  TRUE, 0,
-                  TRUE, path->dtotal_units * mult));
+                  (warning_high_tide == UINT64_MAX ? false : true), warning_high_tide,
+                  (critical_high_tide == UINT64_MAX ? false : true), critical_high_tide,
+                  true, 0,
+                  true, path->dtotal_units * mult));
 
       if (display_inodes_perfdata) {
         /* *_high_tide must be reinitialized at each run */
@@ -418,10 +414,10 @@ main (int argc, char **argv)
         xasprintf (&perf, "%s %s", perf,
                 perfdata_uint64 (perf_ilabel,
                     path->inodes_used, "",
-                    (warning_high_tide != UINT64_MAX ? TRUE : FALSE), warning_high_tide,
-                    (critical_high_tide != UINT64_MAX ? TRUE : FALSE), critical_high_tide,
-                    TRUE, 0,
-                    TRUE, path->inodes_total));
+                    (warning_high_tide != UINT64_MAX ? true : false), warning_high_tide,
+                    (critical_high_tide != UINT64_MAX ? true : false), critical_high_tide,
+                    true, 0,
+                    true, path->inodes_total));
       }
 
       if (disk_result==STATE_OK && erronly && !verbose)
@@ -432,7 +428,7 @@ main (int argc, char **argv)
           } else {
                   xasprintf(&flag_header, "");
           }
-          xasprintf (&output, "%s%s %s %llu%s (%.0f%%",
+          xasprintf (&output, "%s%s %s %llu%s (%.1f%%",
                           output, flag_header,
                           (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
                           path->dfree_units,
@@ -452,7 +448,7 @@ main (int argc, char **argv)
 
   if (strcmp(output, "") == 0 && ! erronly) {
     preamble = "";
-    xasprintf (&output, " - No disks were found for provided parameters;");
+    xasprintf (&output, " - No disks were found for provided parameters");
   }
 
   printf ("DISK %s%s%s%s%s|%s\n", state_text (result), ((erronly && result==STATE_OK)) ? "" : preamble, output, (strcmp(ignored, "") == 0) ? "" : ignored_preamble, ignored, perf);
@@ -462,24 +458,8 @@ main (int argc, char **argv)
 
 double calculate_percent(uintmax_t value, uintmax_t total) {
   double pct = -1;
-  /* I don't understand the below, but it is taken from coreutils' df */
-  /* Seems to be calculating pct, in the best possible way */
-  if (value <= TYPE_MAXIMUM(uintmax_t) / 100
-    && total != 0) {
-    uintmax_t u100 = value * 100;
-    pct = u100 / total + (u100 % total != 0);
-  } else {
-    /* Possible rounding errors - see coreutils' df for more explanation */
-    double u = value;
-    double t = total;
-    if (t) {
-      long int lipct = pct = u * 100 / t;
-      double ipct = lipct;
-
-      /* Like 'pct = ceil (dpct);', but without ceil - from coreutils again */
-      if (ipct - 1 < pct && pct <= ipct + 1)
-        pct = ipct + (ipct < pct);
-    }
+  if(value <= DBL_MAX && total != 0) {
+    pct = (double)value / total * 100.0;
   }
   return pct;
 }
@@ -524,7 +504,7 @@ process_arguments (int argc, char **argv)
     {"ignore-ereg-partition", required_argument, 0, 'i'},
     {"ignore-eregi-path", required_argument, 0, 'I'},
     {"ignore-eregi-partition", required_argument, 0, 'I'},
-    {"ignore-missing", no_argument, 0, IGNORE_MISSING},
+    {"ignore-missing", no_argument, 0, 'n'},
     {"local", no_argument, 0, 'l'},
     {"stat-remote-fs", no_argument, 0, 'L'},
     {"iperfdata", no_argument, 0, 'P'},
@@ -543,14 +523,14 @@ process_arguments (int argc, char **argv)
   if (argc < 2)
     return ERROR;
 
-  np_add_name(&fs_exclude_list, "iso9660");
+  np_add_regex(&fs_exclude_list, "iso9660", REG_EXTENDED);
 
   for (c = 1; c < argc; c++)
     if (strcmp ("-to", argv[c]) == 0)
       strcpy (argv[c], "-t");
 
   while (1) {
-    c = getopt_long (argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEA", longopts, &option);
+    c = getopt_long (argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEAn", longopts, &option);
 
     if (c == -1 || c == EOF)
       break;
@@ -567,6 +547,10 @@ process_arguments (int argc, char **argv)
 
     /* See comments for 'c' */
     case 'w':                 /* warning threshold */
+                        if (!is_percentage_expression(optarg) && !is_numeric(optarg)) {
+                                        die(STATE_UNKNOWN, "Argument for --warning invalid or missing: %s\n", optarg);
+                        }
+
       if (strstr(optarg, "%")) {
         if (*optarg == '@') {
           warn_freespace_percent = optarg;
@@ -588,6 +572,10 @@ process_arguments (int argc, char **argv)
        force @ at the beginning of the range, so that it is backwards compatible
     */
     case 'c':                 /* critical threshold */
+                        if (!is_percentage_expression(optarg) && !is_numeric(optarg)) {
+                                        die(STATE_UNKNOWN, "Argument for --critical invalid or missing: %s\n", optarg);
+                        }
+
       if (strstr(optarg, "%")) {
         if (*optarg == '@') {
           crit_freespace_percent = optarg;
@@ -710,34 +698,42 @@ process_arguments (int argc, char **argv)
       mount_list = read_file_system_list (0);
       np_set_best_match(se, mount_list, exact_match);
 
-      path_selected = TRUE;
+      path_selected = true;
       break;
     case 'x':                 /* exclude path or partition */
       np_add_name(&dp_exclude_list, optarg);
       break;
     case 'X':                 /* exclude file system type */
-      np_add_name(&fs_exclude_list, optarg);
+      err = np_add_regex(&fs_exclude_list, optarg, REG_EXTENDED);
+      if (err != 0) {
+        regerror (err, &fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
+        die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+      }
       break;
     case 'N':                 /* include file system type */
-      np_add_name(&fs_include_list, optarg);
+      err = np_add_regex(&fs_include_list, optarg, REG_EXTENDED);
+      if (err != 0) {
+        regerror (err, &fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
+        die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+      }
       break;
     case 'v':                 /* verbose */
       verbose++;
       break;
     case 'q':                 /* TODO: this function should eventually go away (removed 2007-09-20) */
       /* verbose--; **replaced by line below**. -q was only a broken way of implementing -e */
-      erronly = TRUE;
+      erronly = true;
       break;
     case 'e':
-      erronly = TRUE;
+      erronly = true;
       break;
     case 'E':
       if (path_selected)
         die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set -E before selecting paths\n"));
-      exact_match = TRUE;
+      exact_match = true;
       break;
     case 'f':
-      freespace_ignore_reserved = TRUE;
+      freespace_ignore_reserved = true;
       break;
     case 'g':
       if (path_selected)
@@ -784,7 +780,7 @@ process_arguments (int argc, char **argv)
       cflags = default_cflags;
       break;
 
-    case IGNORE_MISSING:
+    case 'n':
       ignore_missing = true;
       break;
     case 'A':
@@ -798,7 +794,7 @@ process_arguments (int argc, char **argv)
              crit_freespace_percent || warn_usedspace_units || crit_usedspace_units ||
              warn_usedspace_percent || crit_usedspace_percent || warn_usedinodes_percent ||
              crit_usedinodes_percent || warn_freeinodes_percent || crit_freeinodes_percent )) {
-        die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -r/-R\n"));
+        die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--all)\n"));
       }
 
       err = regcomp(&re, optarg, cflags);
@@ -809,7 +805,7 @@ process_arguments (int argc, char **argv)
 
       for (me = mount_list; me; me = me->me_next) {
         if (np_regex_match_mount_entry(me, &re)) {
-          fnd = TRUE;
+          fnd = true;
           if (verbose >= 3)
             printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir, optarg);
 
@@ -824,24 +820,24 @@ process_arguments (int argc, char **argv)
 
       if (!fnd && ignore_missing == true) {
         path_ignored = true;
-        /* path_selected = TRUE;*/
+        path_selected = true;
         break;
       } else if (!fnd)
         die (STATE_UNKNOWN, "DISK %s: %s - %s\n",_("UNKNOWN"),
             _("Regular expression did not match any path or disk"), optarg);
 
-      fnd = FALSE;
-      path_selected = TRUE;
+      fnd = false;
+      path_selected = true;
       np_set_best_match(path_select_list, mount_list, exact_match);
       cflags = default_cflags;
 
       break;
     case 'M': /* display mountpoint */
-      display_mntp = TRUE;
+      display_mntp = true;
       break;
     case 'C':
        /* add all mount entries to path_select list if no partitions have been explicitly defined using -p */
-       if (path_selected == FALSE) {
+       if (path_selected == false) {
          struct parameter_list *path;
          for (me = mount_list; me; me = me->me_next) {
            if (! (path = np_find_parameter(path_select_list, me->me_mountdir)))
@@ -864,7 +860,7 @@ process_arguments (int argc, char **argv)
       warn_freeinodes_percent = NULL;
       crit_freeinodes_percent = NULL;
 
-      path_selected = FALSE;
+      path_selected = false;
       group = NULL;
       break;
     case 'V':                 /* version */
@@ -888,7 +884,7 @@ process_arguments (int argc, char **argv)
 
   if (argc > c) {
     se = np_add_parameter(&path_select_list, strdup(argv[c++]));
-    path_selected = TRUE;
+    path_selected = true;
     set_all_thresholds(se);
   }
 
@@ -897,21 +893,9 @@ process_arguments (int argc, char **argv)
     mult = (uintmax_t)1024 * 1024;
   }
 
-  return TRUE;
-}
-
-
-
-void
-print_path (const char *mypath)
-{
-  if (mypath == NULL)
-    printf ("\n");
-  else
-    printf (_(" for %s\n"), mypath);
+  return true;
 }
 
-
 void
 set_all_thresholds (struct parameter_list *path)
 {
@@ -996,25 +980,33 @@ 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 (" %s\n", "--ignore-missing");
+  printf (" %s\n", "-n, --ignore-missing");
   printf ("    %s\n", _("Return OK if no filesystem matches, filesystem does not exist or is inaccessible."));
   printf ("    %s\n", _("(Provide this option before -p / -r / --ereg-path if used)"));
   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);
-  printf (" %s\n", "-X, --exclude-type=TYPE");
-  printf ("    %s\n", _("Ignore all filesystems of indicated type (may be repeated)"));
-  printf (" %s\n", "-N, --include-type=TYPE");
-  printf ("    %s\n", _("Check only filesystems of indicated type (may be repeated)"));
+  printf (" %s\n", "-X, --exclude-type=TYPE_REGEX");
+  printf ("    %s\n", _("Ignore all filesystems of types matching given regex(7) (may be repeated)"));
+  printf (" %s\n", "-N, --include-type=TYPE_REGEX");
+  printf ("    %s\n", _("Check only filesystems where the type matches this given regex(7) (may be repeated)"));
+
+  printf ("\n");
+  printf ("%s\n", _("General usage hints:"));
+  printf (" %s\n", _("- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the same as"));
+  printf ("   %s\n", _("\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"."));
+  printf (" %s\n", _("- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} {thresholds b} ...\""));
+
+
 
   printf ("\n");
   printf ("%s\n", _("Examples:"));
   printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /");
-  printf ("    %s\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"));
+  printf ("    %s\n\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"));
   printf (" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -g sidDATA -r '^/oracle/SID/data.*$'");
   printf ("    %s\n", _("Checks all filesystems not matching -r at 100M and 50M. The fs matching the -r regex"));
-  printf ("    %s\n", _("are grouped which means the freespace thresholds are applied to all disks together"));
+  printf ("    %s\n\n", _("are grouped which means the freespace thresholds are applied to all disks together"));
   printf (" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -p /foo -C -w 5% -c 3% -p /bar");
   printf ("    %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M"));
 
@@ -1027,9 +1019,9 @@ void
 print_usage (void)
 {
   printf ("%s\n", _("Usage:"));
-  printf (" %s {-w absolute_limit |-w  percentage_limit% | -W inode_percentage_limit } {-c absolute_limit|-c percentage_limit% | -K inode_percentage_limit } {-p path | -x device}\n", progname);
+  printf (" %s {-w absolute_limit |-w  percentage_limit%% | -W inode_percentage_limit } {-c absolute_limit|-c percentage_limit%% | -K inode_percentage_limit } {-p path | -x device}\n", progname);
   printf ("[-C] [-E] [-e] [-f] [-g group ] [-k] [-l] [-M] [-m] [-R path ] [-r path ]\n");
-  printf ("[-t timeout] [-u unit] [-v] [-X type] [-N type]\n");
+  printf ("[-t timeout] [-u unit] [-v] [-X type_regex] [-N type]\n");
 }
 
 bool
@@ -1115,7 +1107,7 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) {
   }
   /* finally calculate percentages for either plain FS or summed up group */
   p->dused_pct = calculate_percent( p->used, p->used + p->available );    /* used + available can never be > uintmax */
-  p->dfree_pct = 100 - p->dused_pct;
+  p->dfree_pct = 100.0 - p->dused_pct;
   p->dused_inodes_percent = calculate_percent(p->inodes_total - p->inodes_free, p->inodes_total);
   p->dfree_inodes_percent = 100 - p->dused_inodes_percent;
 
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 7ffce98..468bc95 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -41,8 +41,8 @@ const char *email = "devel@monitoring-plugins.org";
 
 int process_arguments (int, char **);
 int validate_arguments (void);
-int error_scan (char *, int *);
-int ip_match_cidr(const char *, const char *);
+int error_scan (char *, bool *);
+bool ip_match_cidr(const char *, const char *);
 unsigned long ip2long(const char *);
 void print_help (void);
 void print_usage (void);
@@ -51,13 +51,13 @@ void print_usage (void);
 char query_address[ADDRESS_LENGTH] = "";
 char dns_server[ADDRESS_LENGTH] = "";
 char ptr_server[ADDRESS_LENGTH] = "";
-int verbose = FALSE;
+bool verbose = false;
 char **expected_address = NULL;
 int expected_address_cnt = 0;
-int expect_nxdomain = FALSE;
+bool expect_nxdomain = false;
 
-int expect_authority = FALSE;
-int all_match = FALSE;
+bool expect_authority = false;
+bool all_match = false;
 thresholds *time_thresholds = NULL;
 
 static int
@@ -80,15 +80,14 @@ main (int argc, char **argv)
   int n_addresses = 0;
   char *msg = NULL;
   char *temp_buffer = NULL;
-  int non_authoritative = FALSE;
+  bool non_authoritative = false;
   int result = STATE_UNKNOWN;
   double elapsed_time;
   long microsec;
   struct timeval tv;
-  int parse_address = FALSE; /* This flag scans for Address: but only after Name: */
+  bool parse_address = false; /* This flag scans for Address: but only after Name: */
   output chld_out, chld_err;
-  size_t i;
-  int is_nxdomain = FALSE;
+  bool is_nxdomain = false;
 
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
@@ -122,7 +121,7 @@ main (int argc, char **argv)
   }
 
   /* scan stdout */
-  for(i = 0; i < chld_out.lines; i++) {
+  for(size_t i = 0; i < chld_out.lines; i++) {
     if (addresses == NULL)
       addresses = malloc(sizeof(*addresses)*10);
     else if (!(n_addresses % 10))
@@ -164,8 +163,8 @@ main (int argc, char **argv)
 
     /* the server is responding, we just got the host name... */
     if (strstr (chld_out.line[i], "Name:"))
-      parse_address = TRUE;
-    else if (parse_address == TRUE && (strstr (chld_out.line[i], "Address:") ||
+      parse_address = true;
+    else if (parse_address && (strstr (chld_out.line[i], "Address:") ||
              strstr (chld_out.line[i], "Addresses:"))) {
       temp_buffer = index (chld_out.line[i], ':');
       temp_buffer++;
@@ -184,7 +183,7 @@ main (int argc, char **argv)
       addresses[n_addresses++] = strdup(temp_buffer);
     }
     else if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
-      non_authoritative = TRUE;
+      non_authoritative = true;
     }
 
 
@@ -197,7 +196,7 @@ main (int argc, char **argv)
   }
 
   /* scan stderr */
-  for(i = 0; i < chld_err.lines; i++) {
+  for(size_t i = 0; i < chld_err.lines; i++) {
     if (verbose)
       puts(chld_err.line[i]);
 
@@ -241,7 +240,7 @@ main (int argc, char **argv)
     unsigned long expect_match = (1 << expected_address_cnt) - 1;
     unsigned long addr_match = (1 << n_addresses) - 1;
 
-    for (i=0; i<expected_address_cnt; i++) {
+    for (int i=0; i<expected_address_cnt; i++) {
       int j;
       /* check if we get a match on 'raw' ip or cidr */
       for (j=0; j<n_addresses; j++) {
@@ -298,21 +297,21 @@ main (int argc, char **argv)
     printf (_(". %s returns %s"), query_address, address);
     if ((time_thresholds->warning != NULL) && (time_thresholds->critical != NULL)) {
       printf ("|%s\n", fperfdata ("time", elapsed_time, "s",
-                                  TRUE, time_thresholds->warning->end,
-                                  TRUE, time_thresholds->critical->end,
-                                  TRUE, 0, FALSE, 0));
+                                  true, time_thresholds->warning->end,
+                                  true, time_thresholds->critical->end,
+                                  true, 0, false, 0));
     } else if ((time_thresholds->warning == NULL) && (time_thresholds->critical != NULL)) {
       printf ("|%s\n", fperfdata ("time", elapsed_time, "s",
-                                  FALSE, 0,
-                                  TRUE, time_thresholds->critical->end,
-                                  TRUE, 0, FALSE, 0));
+                                  false, 0,
+                                  true, time_thresholds->critical->end,
+                                  true, 0, false, 0));
     } else if ((time_thresholds->warning != NULL) && (time_thresholds->critical == NULL)) {
       printf ("|%s\n", fperfdata ("time", elapsed_time, "s",
-                                  TRUE, time_thresholds->warning->end,
-                                  FALSE, 0,
-                                  TRUE, 0, FALSE, 0));
+                                  true, time_thresholds->warning->end,
+                                  false, 0,
+                                  true, 0, false, 0));
     } else
-      printf ("|%s\n", fperfdata ("time", elapsed_time, "s", FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
+      printf ("|%s\n", fperfdata ("time", elapsed_time, "s", false, 0, false, 0, true, 0, false, 0));
   }
   else if (result == STATE_WARNING)
     printf (_("DNS WARNING - %s\n"),
@@ -327,15 +326,14 @@ main (int argc, char **argv)
   return result;
 }
 
-int
-ip_match_cidr(const char *addr, const char *cidr_ro)
-{
+bool ip_match_cidr(const char *addr, const char *cidr_ro) {
   char *subnet, *mask_c, *cidr = strdup(cidr_ro);
   int mask;
   subnet = strtok(cidr, "/");
   mask_c = strtok(NULL, "\0");
-  if (!subnet || !mask_c)
-    return FALSE;
+  if (!subnet || !mask_c) {
+    return false;
+        }
   mask = atoi(mask_c);
 
   /* https://www.cryptobells.com/verifying-ips-in-a-subnet-in-php/ */
@@ -355,14 +353,14 @@ ip2long(const char* src) {
 }
 
 int
-error_scan (char *input_buffer, int *is_nxdomain)
+error_scan (char *input_buffer, bool *is_nxdomain)
 {
 
   const int nxdomain = strstr (input_buffer, "Non-existent") ||
                        strstr (input_buffer, "** server can't find") ||
                        strstr (input_buffer, "** Can't find") ||
                        strstr (input_buffer, "NXDOMAIN");
-  if (nxdomain) *is_nxdomain = TRUE;
+  if (nxdomain) *is_nxdomain = true;
 
   /* the DNS lookup timed out */
   if (strstr (input_buffer, _("Note: nslookup is deprecated and may be removed from future releases.")) ||
@@ -461,7 +459,7 @@ process_arguments (int argc, char **argv)
       print_revision (progname, NP_VERSION);
       exit (STATE_UNKNOWN);
     case 'v': /* version */
-      verbose = TRUE;
+      verbose = true;
       break;
     case 't': /* timeout period */
       timeout_interval = atoi (optarg);
@@ -508,13 +506,13 @@ process_arguments (int argc, char **argv)
       }
       break;
     case 'n': /* expect NXDOMAIN */
-      expect_nxdomain = TRUE;
+      expect_nxdomain = true;
       break;
     case 'A': /* expect authority */
-      expect_authority = TRUE;
+      expect_authority = true;
       break;
     case 'L': /* all must match */
-      all_match = TRUE;
+      all_match = true;
       break;
     case 'w':
       warning = optarg;
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 23a9e99..70d6f9f 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -59,16 +59,16 @@ int packet_size = PACKET_SIZE;
 int packet_count = PACKET_COUNT;
 int target_timeout = 0;
 int packet_interval = 0;
-int verbose = FALSE;
+bool verbose = false;
 int cpl;
 int wpl;
 double crta;
 double wrta;
-int cpl_p = FALSE;
-int wpl_p = FALSE;
-bool alive_p = FALSE;
-int crta_p = FALSE;
-int wrta_p = FALSE;
+bool cpl_p = false;
+bool wpl_p = false;
+bool alive_p = false;
+bool crta_p = false;
+bool wrta_p = false;
 
 int
 main (int argc, char **argv)
@@ -194,8 +194,8 @@ int textscan (char *buf) {
          _("FPING %s - %s (rta=%f ms)|%s\n"),
          state_text (STATE_OK), server_name,rta,
                  /* No loss since we only waited for the first reply
-         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100), */
-         fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, TRUE, 0, FALSE, 0));
+         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100), */
+         fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, true, 0, false, 0));
   }
 
   if (strstr (buf, "not found")) {
@@ -228,21 +228,21 @@ int textscan (char *buf) {
     rtastr = 1 + index (rtastr, '/');
     loss = strtod (losstr, NULL);
     rta = strtod (rtastr, NULL);
-    if (cpl_p == TRUE && loss > cpl)
+    if (cpl_p && loss > cpl)
       status = STATE_CRITICAL;
-    else if (crta_p == TRUE  && rta > crta)
+    else if (crta_p && rta > crta)
       status = STATE_CRITICAL;
-    else if (wpl_p == TRUE && loss > wpl)
+    else if (wpl_p && loss > wpl)
       status = STATE_WARNING;
-    else if (wrta_p == TRUE && rta > wrta)
+    else if (wrta_p && rta > wrta)
       status = STATE_WARNING;
     else
       status = STATE_OK;
     die (status,
           _("FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"),
          state_text (status), server_name, loss, rta,
-         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100),
-         fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, TRUE, 0, FALSE, 0));
+         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100),
+         fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, true, 0, false, 0));
 
   }
   else if(strstr (buf, "xmt/rcv/%loss") ) {
@@ -258,16 +258,16 @@ int textscan (char *buf) {
     loss = strtod (losstr, NULL);
     if (atoi(losstr) == 100)
       status = STATE_CRITICAL;
-    else if (cpl_p == TRUE && loss > cpl)
+    else if (cpl_p && loss > cpl)
       status = STATE_CRITICAL;
-    else if (wpl_p == TRUE && loss > wpl)
+    else if (wpl_p && loss > wpl)
       status = STATE_WARNING;
     else
       status = STATE_OK;
     /* loss=%.0f%%;%d;%d;0;100 */
     die (status, _("FPING %s - %s (loss=%.0f%% )|%s\n"),
          state_text (status), server_name, loss ,
-         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100));
+         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100));
 
   }
   else {
@@ -329,7 +329,7 @@ process_arguments (int argc, char **argv)
     case '?':                 /* print short usage statement if args not parsable */
       usage5 ();
     case 'a':                 /* host alive mode */
-      alive_p = TRUE;
+      alive_p = true;
       break;
     case 'h':                 /* help */
       print_help ();
@@ -338,16 +338,16 @@ process_arguments (int argc, char **argv)
       print_revision (progname, NP_VERSION);
       exit (STATE_UNKNOWN);
     case 'v':                 /* verbose mode */
-      verbose = TRUE;
+      verbose = true;
       break;
     case 'H':                 /* hostname */
-      if (is_host (optarg) == FALSE) {
+      if (is_host (optarg) == false) {
         usage2 (_("Invalid hostname/address"), optarg);
       }
       server_name = strscpy (server_name, optarg);
       break;
     case 'S':                 /* sourceip */
-      if (is_host (optarg) == FALSE) {
+      if (is_host (optarg) == false) {
         usage2 (_("Invalid hostname/address"), optarg);
       }
       sourceip = strscpy (sourceip, optarg);
@@ -369,12 +369,12 @@ process_arguments (int argc, char **argv)
       get_threshold (optarg, rv);
       if (rv[RTA]) {
         crta = strtod (rv[RTA], NULL);
-        crta_p = TRUE;
+        crta_p = true;
         rv[RTA] = NULL;
       }
       if (rv[PL]) {
         cpl = atoi (rv[PL]);
-        cpl_p = TRUE;
+        cpl_p = true;
         rv[PL] = NULL;
       }
       break;
@@ -382,12 +382,12 @@ process_arguments (int argc, char **argv)
       get_threshold (optarg, rv);
       if (rv[RTA]) {
         wrta = strtod (rv[RTA], NULL);
-        wrta_p = TRUE;
+        wrta_p = true;
         rv[RTA] = NULL;
       }
       if (rv[PL]) {
         wpl = atoi (rv[PL]);
-        wpl_p = TRUE;
+        wpl_p = true;
         rv[PL] = NULL;
       }
       break;
diff --git a/plugins/check_game.c b/plugins/check_game.c
index a534b69..ca12697 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -53,7 +53,7 @@ char *server_ip;
 char *game_type;
 int port = 0;
 
-int verbose;
+bool verbose = false;
 
 int qstat_game_players_max = -1;
 int qstat_game_players = -1;
@@ -90,7 +90,7 @@ main (int argc, char **argv)
   if (port)
     xasprintf (&command_line, "%s:%-d", command_line, port);
 
-  if (verbose > 0)
+  if (verbose)
     printf ("%s\n", command_line);
 
   /* run the command. historically, this plugin ignores output on stderr,
@@ -142,11 +142,11 @@ main (int argc, char **argv)
             ret[qstat_map_field],
             ret[qstat_ping_field],
             perfdata ("players", atol(ret[qstat_game_players]), "",
-                      FALSE, 0, FALSE, 0,
-                      TRUE, 0, TRUE, atol(ret[qstat_game_players_max])),
+                      false, 0, false, 0,
+                      true, 0, true, atol(ret[qstat_game_players_max])),
             fperfdata ("ping", strtod(ret[qstat_ping_field], NULL), "",
-                      FALSE, 0, FALSE, 0,
-                      TRUE, 0, FALSE, 0));
+                      false, 0, false, 0,
+                      true, 0, false, 0));
   }
 
   return result;
@@ -201,7 +201,7 @@ process_arguments (int argc, char **argv)
       print_revision (progname, NP_VERSION);
       exit (STATE_UNKNOWN);
     case 'v': /* version */
-      verbose = TRUE;
+      verbose = true;
       break;
     case 't': /* timeout period */
       timeout_interval = atoi (optarg);
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 718c8ee..cdf768c 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -85,6 +85,7 @@ char errbuf[MAX_INPUT_BUFFER];
 int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
 int errcode;
 int invert_regex = 0;
+int state_regex = STATE_CRITICAL;
 
 struct timeval tv;
 struct timeval tv_temp;
@@ -210,7 +211,8 @@ bool process_arguments (int argc, char **argv)
     INVERT_REGEX = CHAR_MAX + 1,
     SNI_OPTION,
     MAX_REDIRS_OPTION,
-    CONTINUE_AFTER_CHECK_CERT
+    CONTINUE_AFTER_CHECK_CERT,
+    STATE_REGEX
   };
 
   int option = 0;
@@ -246,6 +248,7 @@ bool process_arguments (int argc, char **argv)
     {"content-type", required_argument, 0, 'T'},
     {"pagesize", required_argument, 0, 'm'},
     {"invert-regex", no_argument, NULL, INVERT_REGEX},
+    {"state-regex", required_argument, 0, STATE_REGEX},
     {"use-ipv4", no_argument, 0, '4'},
     {"use-ipv6", no_argument, 0, '6'},
     {"extended-perfdata", no_argument, 0, 'E'},
@@ -471,10 +474,9 @@ bool process_arguments (int argc, char **argv)
         free(http_method);
       http_method = strdup (optarg);
       char *tmp;
-      if ((tmp = strstr(http_method, ":")) > 0) {
-        tmp[0] = '\0';
-        http_method = http_method;
-        http_method_proxy = ++tmp;
+      if ((tmp = strstr(http_method, ":")) != NULL) {
+        tmp[0] = '\0'; // set the ":" in the middle to 0
+        http_method_proxy = ++tmp; // this points to the second part
       }
       break;
     case 'd': /* string or substring */
@@ -512,6 +514,13 @@ bool process_arguments (int argc, char **argv)
     case INVERT_REGEX:
       invert_regex = 1;
       break;
+    case STATE_REGEX:
+      if (!strcmp (optarg, "critical"))
+        state_regex = STATE_CRITICAL;
+      else if (!strcmp (optarg, "warning"))
+        state_regex = STATE_WARNING;
+      else usage2 (_("Invalid state-regex option"), optarg);
+      break;
     case '4':
       address_family = AF_INET;
       break;
@@ -1094,7 +1103,7 @@ check_http (void)
       microsec_firstbyte = deltime (tv_temp);
       elapsed_time_firstbyte = (double)microsec_firstbyte / 1.0e6;
     }
-    while (pos = memchr(buffer, '\0', i)) {
+    while ((pos = memchr(buffer, '\0', i))) {
       /* replace nul character with a blank */
       *pos = ' ';
     }
@@ -1318,7 +1327,7 @@ check_http (void)
         xasprintf (&msg, _("%spattern not found, "), msg);
       else
         xasprintf (&msg, _("%spattern found, "), msg);
-      result = STATE_CRITICAL;
+      result = state_regex;
     }
     else {
       /* FIXME: Shouldn't that be UNKNOWN? */
@@ -1775,7 +1784,7 @@ print_help (void)
   printf (" %s\n", "-u, --url=PATH");
   printf ("    %s\n", _("URL to GET or POST (default: /)"));
   printf (" %s\n", "-P, --post=STRING");
-  printf ("    %s\n", _("URL encoded http POST data"));
+  printf ("    %s\n", _("URL decoded http POST data"));
   printf (" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT, CONNECT:POST)");
   printf ("    %s\n", _("Set HTTP method."));
   printf (" %s\n", "-N, --no-body");
@@ -1794,7 +1803,10 @@ print_help (void)
   printf (" %s\n", "-R, --eregi=STRING");
   printf ("    %s\n", _("Search page for case-insensitive regex STRING"));
   printf (" %s\n", "--invert-regex");
-  printf ("    %s\n", _("Return CRITICAL if found, OK if not\n"));
+  printf ("    %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)"));
+  printf ("    %s\n", _("can be changed with --state--regex)"));
+  printf (" %s\n", "--regex-state=STATE");
+  printf ("    %s\n", _("Return STATE if regex is found, OK if not\n"));
 
   printf (" %s\n", "-a, --authorization=AUTH_PAIR");
   printf ("    %s\n", _("Username:password on sites with basic authentication"));
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 0160d98..3872e34 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -73,10 +73,6 @@ void print_usage (void);
         
 #define NR_ATTRIBUTES   30
         
-#ifndef TRUE
-#define TRUE 1
-#endif  /*  */
-        
 #define PREFAILURE 2
 #define ADVISORY 1
 #define OPERATIONAL 0
@@ -169,9 +165,9 @@ int smart_read_values (int, values_t *);
 int nagios (values_t *, thresholds_t *);
 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_cmd_simple (int, enum SmartCommand, __u8, bool);
 int smart_read_thresholds (int, thresholds_t *);
-int verbose = FALSE;
+bool verbose = false;
 
 int
 main (int argc, char *argv[]) 
@@ -203,7 +199,7 @@ main (int argc, char *argv[])
         bindtextdomain (PACKAGE, LOCALEDIR);
         textdomain (PACKAGE);
 
-        while (1) {
+        while (true) {
                 
                 o = getopt_long (argc, argv, "+d:iq10nhVv", longopts, &longindex);
 
@@ -229,7 +225,7 @@ main (int argc, char *argv[])
                         fprintf (stderr, "%s\n", _("default and will be removed from future releases."));
                         break;
                 case 'v': /* verbose */
-                        verbose = TRUE;
+                        verbose = true;
                         break;
                 case 'h':
                         print_help ();
@@ -258,7 +254,7 @@ main (int argc, char *argv[])
                 return STATE_CRITICAL;
         }
 
-        if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, FALSE)) {
+        if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, false)) {
                 printf (_("CRITICAL - SMART_CMD_ENABLE\n"));
                 return STATE_CRITICAL;
         }
@@ -447,9 +443,7 @@ print_values (values_t * p, thresholds_t * t)
 }
 
 
-int
-smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, char show_error) 
-{
+int smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, bool show_error) {
         int e = STATE_UNKNOWN;
 #ifdef __linux__
         __u8 args[4];
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index a1bfe1b..868ffc1 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -71,9 +71,9 @@ thresholds *entries_thresholds = NULL;
 struct timeval tv;
 char* warn_entries = NULL;
 char* crit_entries = NULL;
-int starttls = FALSE;
-int ssl_on_connect = FALSE;
-int verbose = 0;
+bool starttls = false;
+bool ssl_on_connect = false;
+bool verbose = false;
 
 /* for ldap tls */
 
@@ -97,9 +97,6 @@ main (int argc, char *argv[])
         int tls;
         int version=3;
 
-        /* for entry counting */
-
-        LDAPMessage *next_entry;
         int status_entries = STATE_OK;
         int num_entries = 0;
 
@@ -118,7 +115,7 @@ main (int argc, char *argv[])
                 usage4 (_("Could not parse arguments"));
 
         if (strstr(argv[0],"check_ldaps") && ! starttls && ! ssl_on_connect)
-                starttls = TRUE;
+                starttls = true;
 
         /* initialize alarm signal handling */
         signal (SIGALRM, socket_timeout_alarm_handler);
@@ -256,11 +253,11 @@ main (int argc, char *argv[])
                         fperfdata ("time", elapsed_time, "s",
                                 (int)warn_time, warn_time,
                                 (int)crit_time, crit_time,
-                                TRUE, 0, FALSE, 0),
+                                true, 0, false, 0),
                         sperfdata ("entries", (double)num_entries, "",
                                 warn_entries,
                                 crit_entries,
-                                TRUE, 0.0, FALSE, 0.0));
+                                true, 0.0, false, 0.0));
         } else {
                 printf (_("LDAP %s - %.3f seconds response time|%s\n"),
                         state_text (status),
@@ -268,7 +265,7 @@ main (int argc, char *argv[])
                         fperfdata ("time", elapsed_time, "s",
                                 (int)warn_time, warn_time,
                                 (int)crit_time, crit_time,
-                                TRUE, 0, FALSE, 0));
+                                true, 0, false, 0));
         }
 
         return status;
@@ -316,7 +313,7 @@ process_arguments (int argc, char **argv)
                         strcpy (argv[c], "-t");
         }
 
-        while (1) {
+        while (true) {
                 c = getopt_long (argc, argv, "hvV234TS6t:c:w:H:b:p:a:D:P:C:W:", longopts, &option);
 
                 if (c == -1 || c == EOF)
@@ -377,17 +374,17 @@ process_arguments (int argc, char **argv)
                         address_family = AF_INET;
                         break;
                 case 'v':
-                        verbose++;
+                        verbose = true;
                         break;
                 case 'T':
                         if (! ssl_on_connect)
-                                starttls = TRUE;
+                                starttls = true;
                         else
                                 usage_va(_("%s cannot be combined with %s"), "-T/--starttls", "-S/--ssl");
                         break;
                 case 'S':
                         if (! starttls) {
-                                ssl_on_connect = TRUE;
+                                ssl_on_connect = true;
                                 if (ld_port == -1)
                                         ld_port = LDAPS_PORT;
                         } else
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 313df8a..1431d13 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -110,10 +110,6 @@ main (int argc, char **argv)
         double la[3] = { 0.0, 0.0, 0.0 };       /* NetBSD complains about uninitialized arrays */
 #ifndef HAVE_GETLOADAVG
         char input_buffer[MAX_INPUT_BUFFER];
-# ifdef HAVE_PROC_LOADAVG
-        FILE *fp;
-        char *str, *next;
-# endif
 #endif
 
         setlocale (LC_ALL, "");
@@ -132,23 +128,6 @@ main (int argc, char **argv)
         if (result != 3)
                 return STATE_UNKNOWN;
 #else
-# ifdef HAVE_PROC_LOADAVG
-        fp = fopen (PROC_LOADAVG, "r");
-        if (fp == NULL) {
-                printf (_("Error opening %s\n"), PROC_LOADAVG);
-                return STATE_UNKNOWN;
-        }
-
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
-                str = (char *)input_buffer;
-                for(i = 0; i < 3; i++) {
-                        la[i] = strtod(str, &next);
-                        str = next;
-                }
-        }
-
-        fclose (fp);
-# else
         child_process = spopen (PATH_TO_UPTIME);
         if (child_process == NULL) {
                 printf (_("Error opening %s\n"), PATH_TO_UPTIME);
@@ -175,18 +154,13 @@ main (int argc, char **argv)
                 printf (_("Error code %d returned in %s\n"), result, PATH_TO_UPTIME);
                 return STATE_UNKNOWN;
         }
-# endif
 #endif
 
         if ((la[0] < 0.0) || (la[1] < 0.0) || (la[2] < 0.0)) {
 #ifdef HAVE_GETLOADAVG
                 printf (_("Error in getloadavg()\n"));
 #else
-# ifdef HAVE_PROC_LOADAVG
-                printf (_("Error processing %s\n"), PROC_LOADAVG);
-# else
                 printf (_("Error processing %s\n"), PATH_TO_UPTIME);
-# endif
 #endif
                 return STATE_UNKNOWN;
         }
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 1fda549..826b77e 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -43,7 +43,7 @@ void print_usage (void);
 
 char *log_file = NULL;
 int expire_minutes = 0;
-int use_average = TRUE;
+bool use_average = true;
 int variable_number = -1;
 unsigned long value_warning_threshold = 0L;
 unsigned long value_critical_threshold = 0L;
@@ -138,7 +138,7 @@ main (int argc, char **argv)
         }
 
         /* else check the incoming/outgoing rates */
-        if (use_average == TRUE)
+        if (use_average)
                 rate = average_value_rate;
         else
                 rate = maximum_value_rate;
@@ -149,7 +149,7 @@ main (int argc, char **argv)
                 result = STATE_WARNING;
 
         printf("%s. %s = %lu %s|%s\n",
-               (use_average == TRUE) ? _("Avg") : _("Max"),
+               (use_average) ? _("Avg") : _("Max"),
                label, rate, units,
                perfdata(label, (long) rate, units,
                         (int) value_warning_threshold, (long) value_warning_threshold,
@@ -211,9 +211,9 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'a':                                                                       /* port */
                         if (!strcmp (optarg, "MAX"))
-                                use_average = FALSE;
+                                use_average = false;
                         else
-                                use_average = TRUE;
+                                use_average = true;
                         break;
                 case 'v':
                         variable_number = atoi (optarg);
@@ -258,11 +258,11 @@ process_arguments (int argc, char **argv)
         }
 
         if (argc > c && strcmp (argv[c], "MAX") == 0) {
-                use_average = FALSE;
+                use_average = false;
                 c++;
         }
         else if (argc > c && strcmp (argv[c], "AVG") == 0) {
-                use_average = TRUE;
+                use_average = true;
                 c++;
         }
 
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index eb66f62..bd25d47 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -43,7 +43,7 @@ void print_usage(void);
 
 char *log_file = NULL;
 int expire_minutes = -1;
-int use_average = TRUE;
+bool use_average = true;
 unsigned long incoming_warning_threshold = 0L;
 unsigned long incoming_critical_threshold = 0L;
 unsigned long outgoing_warning_threshold = 0L;
@@ -137,7 +137,7 @@ main (int argc, char **argv)
                      (int) ((current_time - timestamp) / 60));
 
         /* else check the incoming/outgoing rates */
-        if (use_average == TRUE) {
+        if (use_average) {
                 incoming_rate = average_incoming_rate;
                 outgoing_rate = average_outgoing_rate;
         }
@@ -192,17 +192,17 @@ main (int argc, char **argv)
         }
 
         xasprintf (&error_message, _("%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"),
-                  (use_average == TRUE) ? _("Avg") : _("Max"), adjusted_incoming_rate,
-                  incoming_speed_rating, (use_average == TRUE) ? _("Avg") : _("Max"),
+                  (use_average) ? _("Avg") : _("Max"), adjusted_incoming_rate,
+                  incoming_speed_rating, (use_average) ? _("Avg") : _("Max"),
                   adjusted_outgoing_rate, outgoing_speed_rating,
                   fperfdata("in", adjusted_incoming_rate, incoming_speed_rating,
                            (int)incoming_warning_threshold, incoming_warning_threshold,
                            (int)incoming_critical_threshold, incoming_critical_threshold,
-                           TRUE, 0, FALSE, 0),
+                           true, 0, false, 0),
                   fperfdata("out", adjusted_outgoing_rate, outgoing_speed_rating,
                            (int)outgoing_warning_threshold, outgoing_warning_threshold,
                            (int)outgoing_critical_threshold, outgoing_critical_threshold,
-                           TRUE, 0, FALSE, 0));
+                           true, 0, false, 0));
 
         printf (_("Traffic %s - %s\n"), state_text(result), error_message);
 
@@ -256,9 +256,9 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'a':                                                                       /* aggregation (AVE or MAX) */
                         if (!strcmp (optarg, "MAX"))
-                                use_average = FALSE;
+                                use_average = false;
                         else
-                                use_average = TRUE;
+                                use_average = true;
                         break;
                 case 'c':                                                                       /* warning threshold */
                         sscanf (optarg, "%lu,%lu", &incoming_critical_threshold,
@@ -289,11 +289,11 @@ process_arguments (int argc, char **argv)
         }
 
         if (argc > c && strcmp (argv[c], "MAX") == 0) {
-                use_average = FALSE;
+                use_average = false;
                 c++;
         }
         else if (argc > c && strcmp (argv[c], "AVG") == 0) {
-                use_average = TRUE;
+                use_average = true;
                 c++;
         }
 
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 7d85554..15ec04c 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -59,8 +59,8 @@ bool ssl = false;
 char *opt_file = NULL;
 char *opt_group = NULL;
 unsigned int db_port = MYSQL_PORT;
-int check_slave = 0, warn_sec = 0, crit_sec = 0;
-int ignore_auth = 0;
+bool check_slave = false;
+bool ignore_auth = false;
 int verbose = 0;
 
 static double warning_time = 0;
@@ -113,7 +113,7 @@ main (int argc, char **argv)
         char slaveresult[SLAVERESULTSIZE] = { 0 };
         char* perf;
 
-        perf = strdup ("");
+        perf = strdup ("");
 
         setlocale (LC_ALL, "");
         bindtextdomain (PACKAGE, LOCALEDIR);
@@ -193,14 +193,14 @@ main (int argc, char **argv)
                         for(i = 0; i < LENGTH_METRIC_UNIT; i++) {
                                 if (strcmp(row[0], metric_unit[i]) == 0) {
                                         xasprintf(&perf, "%s%s ", perf, perfdata(metric_unit[i],
-                                                atol(row[1]), "", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0));
+                                                atol(row[1]), "", false, 0, false, 0, false, 0, false, 0));
                                         continue;
                                 }
                         }
                         for(i = 0; i < LENGTH_METRIC_COUNTER; i++) {
                                 if (strcmp(row[0], metric_counter[i]) == 0) {
                                         xasprintf(&perf, "%s%s ", perf, perfdata(metric_counter[i],
-                                                atol(row[1]), "c", FALSE, 0, FALSE, 0, FALSE, 0, FALSE, 0));
+                                                atol(row[1]), "c", false, 0, false, 0, false, 0, false, 0));
                                         continue;
                                 }
                         }
@@ -322,10 +322,10 @@ main (int argc, char **argv)
                                 status = get_status(value, my_threshold);
 
                                 xasprintf (&perf, "%s %s", perf, fperfdata ("seconds behind master", value, "s",
-                                        TRUE, (double) warning_time,
-                                        TRUE, (double) critical_time,
-                                        FALSE, 0,
-                                        FALSE, 0));
+                                                        true, (double) warning_time,
+                                                        true, (double) critical_time,
+                                                        false, 0,
+                                                        false, 0));
 
                                 if (status == STATE_WARNING) {
                                         printf("SLOW_SLAVE %s: %s|%s\n", _("WARNING"), slaveresult, perf);
@@ -456,10 +456,10 @@ process_arguments (int argc, char **argv)
                         db_port = atoi (optarg);
                         break;
                 case 'S':
-                        check_slave = 1;                                                        /* check-slave */
+                        check_slave = true;                                                     /* check-slave */
                         break;
                 case 'n':
-                        ignore_auth = 1;                                                        /* ignore-auth */
+                        ignore_auth = true;                                                     /* ignore-auth */
                         break;
                 case 'w':
                         warning = optarg;
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index ac2fb15..842b7a2 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -162,10 +162,10 @@ main (int argc, char **argv)
         }
         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)
+                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");
 
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index d73d83c..19c050d 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -67,17 +67,17 @@ char *req_password=NULL;
 unsigned long lvalue_list[MAX_VALUE_LIST];
 unsigned long warning_value=0L;
 unsigned long critical_value=0L;
-int check_warning_value=FALSE;
-int check_critical_value=FALSE;
+bool check_warning_value=false;
+bool check_critical_value=false;
 enum checkvars vars_to_check = CHECK_NONE;
-int show_all=FALSE;
+bool show_all = false;
 
 char recv_buffer[MAX_INPUT_BUFFER];
 
 void fetch_data (const char* address, int port, const char* sendb);
 int process_arguments(int, char **);
 void preparelist(char *string);
-int strtoularray(unsigned long *array, char *string, const char *delim);
+bool strtoularray(unsigned long *array, char *string, const char *delim);
 void print_help(void);
 void print_usage(void);
 
@@ -113,8 +113,8 @@ int main(int argc, char **argv){
         int uphours=0;
         int upminutes=0;
 
-        int isPercent = FALSE;
-        int allRight = FALSE;
+        bool isPercent = false;
+        bool allRight = false;
 
         setlocale (LC_ALL, "");
         bindtextdomain (PACKAGE, LOCALEDIR);
@@ -151,7 +151,7 @@ int main(int argc, char **argv){
 
                 if (value_list==NULL)
                         output_message = strdup (_("missing -l parameters"));
-                else if (strtoularray(lvalue_list,value_list,",")==FALSE)
+                else if (! strtoularray(lvalue_list,value_list,","))
                         output_message = strdup (_("wrong -l parameter."));
                 else {
                         /* -l parameters is present with only integers */
@@ -224,9 +224,9 @@ int main(int argc, char **argv){
 
                         xasprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"),updays, uphours, upminutes, uptime);
 
-                        if (check_critical_value==TRUE && uptime <= critical_value)
+                        if (check_critical_value && uptime <= critical_value)
                                 return_code=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && uptime <= warning_value)
+                        else if (check_warning_value && uptime <= warning_value)
                                 return_code=STATE_WARNING;
                         else
                                 return_code=STATE_OK;
@@ -261,9 +261,9 @@ int main(int argc, char **argv){
                                   (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
                                   critical_used_space / 1073741824, total_disk_space / 1073741824);
 
-                                if(check_critical_value==TRUE && percent_used_space >= critical_value)
+                                if(check_critical_value && percent_used_space >= critical_value)
                                         return_code=STATE_CRITICAL;
-                                else if (check_warning_value==TRUE && percent_used_space >= warning_value)
+                                else if (check_warning_value && percent_used_space >= warning_value)
                                         return_code=STATE_WARNING;
                                 else
                                         return_code=STATE_OK;
@@ -285,7 +285,7 @@ int main(int argc, char **argv){
                 else {
                         preparelist(value_list);                /* replace , between services with & to send the request */
                         xasprintf(&send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6,
-                                                         (show_all==TRUE) ? "ShowAll" : "ShowFail",value_list);
+                                                         (show_all) ? "ShowAll" : "ShowFail",value_list);
                         fetch_data (server_address, server_port, send_buffer);
                         numstr = strtok(recv_buffer,"&");
                         if (numstr == NULL)
@@ -321,9 +321,9 @@ int main(int argc, char **argv){
                   warning_used_space / 1048567, critical_used_space / 1048567, mem_commitLimit / 1048567);
 
                 return_code=STATE_OK;
-                if(check_critical_value==TRUE && percent_used_space >= critical_value)
+                if(check_critical_value && percent_used_space >= critical_value)
                         return_code=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && percent_used_space >= warning_value)
+                else if (check_warning_value && percent_used_space >= warning_value)
                         return_code=STATE_WARNING;
 
                 break;
@@ -371,7 +371,7 @@ int main(int argc, char **argv){
                         else if (isPercent)
                         {
                                 counter_unit = strdup ("%");
-                                allRight = TRUE;
+                                allRight = true;
                         }
 
                         if ((counter_unit != NULL) && (!allRight))
@@ -391,7 +391,7 @@ int main(int argc, char **argv){
                                         if ((fmaxval == 0) && (maxval == errcvt))
                                                 output_message = strdup (_("Maximum value contains non-numbers"));
                                         else
-                                                allRight = TRUE;        /* Everything is OK. */
+                                                allRight = true;        /* Everything is OK. */
 
                                 }
                         }
@@ -418,9 +418,9 @@ int main(int argc, char **argv){
 
                 if (critical_value > warning_value)
                 {                       /* Normal thresholds */
-                        if (check_critical_value == TRUE && counter_value >= critical_value)
+                        if (check_critical_value && counter_value >= critical_value)
                                 return_code = STATE_CRITICAL;
-                        else if (check_warning_value == TRUE && counter_value >= warning_value)
+                        else if (check_warning_value  && counter_value >= warning_value)
                                 return_code = STATE_WARNING;
                         else
                                 return_code = STATE_OK;
@@ -428,9 +428,9 @@ int main(int argc, char **argv){
                 else
                 {                       /* inverse thresholds */
                         return_code = STATE_OK;
-                        if (check_critical_value == TRUE && counter_value <= critical_value)
+                        if (check_critical_value && counter_value <= critical_value)
                                 return_code = STATE_CRITICAL;
-                        else if (check_warning_value == TRUE && counter_value <= warning_value)
+                        else if (check_warning_value && counter_value <= warning_value)
                                 return_code = STATE_WARNING;
                 }
         break;
@@ -448,17 +448,17 @@ int main(int argc, char **argv){
                         output_message = strdup (description);
 
                         if (critical_value > warning_value) {        /* Normal thresholds */
-                                if(check_critical_value==TRUE && age_in_minutes >= critical_value)
+                                if(check_critical_value && age_in_minutes >= critical_value)
                                         return_code=STATE_CRITICAL;
-                                else if (check_warning_value==TRUE && age_in_minutes >= warning_value)
+                                else if (check_warning_value && age_in_minutes >= warning_value)
                                         return_code=STATE_WARNING;
                                 else
                                         return_code=STATE_OK;
                         }
                         else {                                       /* inverse thresholds */
-                                if(check_critical_value==TRUE && age_in_minutes <= critical_value)
+                                if(check_critical_value && age_in_minutes <= critical_value)
                                         return_code=STATE_CRITICAL;
-                                else if (check_warning_value==TRUE && age_in_minutes <= warning_value)
+                                else if (check_warning_value && age_in_minutes <= warning_value)
                                         return_code=STATE_WARNING;
                                 else
                                         return_code=STATE_OK;
@@ -600,15 +600,15 @@ int process_arguments(int argc, char **argv){
                                 break;
                         case 'w': /* warning threshold */
                                 warning_value=strtoul(optarg,NULL,10);
-                                check_warning_value=TRUE;
+                                check_warning_value=true;
                                 break;
                         case 'c': /* critical threshold */
                                 critical_value=strtoul(optarg,NULL,10);
-                                check_critical_value=TRUE;
+                                check_critical_value=true;
                                 break;
                         case 'd': /* Display select for services */
                                 if (!strcmp(optarg,"SHOWALL"))
-                                        show_all = TRUE;
+                                        show_all = true;
                                 break;
                         case 'u':
                                 socket_timeout_state=STATE_UNKNOWN;
@@ -646,7 +646,7 @@ void fetch_data (const char *address, int port, const char *sendb) {
                 die (STATE_UNKNOWN, "NSClient - %s\n",recv_buffer);
 }
 
-int strtoularray(unsigned long *array, char *string, const char *delim) {
+bool strtoularray(unsigned long *array, char *string, const char *delim) {
         /* split a <delim> delimited string into a long array */
         int idx=0;
         char *t1;
@@ -660,9 +660,9 @@ int strtoularray(unsigned long *array, char *string, const char *delim) {
                         array[idx]=strtoul(t1,NULL,10);
                         idx++;
                 } else
-                        return FALSE;
+                        return false;
         }
-        return TRUE;
+        return true;
 }
 
 void preparelist(char *string) {
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 3614650..61b2d69 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -40,10 +40,10 @@ const char *email = "devel@monitoring-plugins.org";
 
 static char *server_address=NULL;
 static int verbose=0;
-static short do_offset=0;
+static bool do_offset = false;
 static char *owarn="60";
 static char *ocrit="120";
-static short do_jitter=0;
+static bool do_jitter = false;
 static char *jwarn="5000";
 static char *jcrit="10000";
 
@@ -486,7 +486,7 @@ double offset_request(const char *host, int *status){
         }
 
         /* cleanup */
-        /* FIXME: Not closing the socket to avoid re-use of the local port
+        /* FIXME: Not closing the socket to avoid reuse of the local port
          * which can cause old NTP packets to be read instead of NTP control
          * packets in jitter_request(). THERE MUST BE ANOTHER WAY...
          * for(j=0; j<num_hosts; j++){ close(socklist[j]); } */
@@ -513,7 +513,8 @@ setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){
 
 /* XXX handle responses with the error bit set */
 double jitter_request(int *status){
-        int conn=-1, i, npeers=0, num_candidates=0, syncsource_found=0;
+        int conn=-1, i, npeers=0, num_candidates=0;
+        bool syncsource_found = false;
         int run=0, min_peer_sel=PEER_INCLUDED, num_selected=0, num_valid=0;
         int peers_size=0, peer_offset=0;
         ntp_assoc_status_pair *peers=NULL;
@@ -570,7 +571,7 @@ double jitter_request(int *status){
                 if (PEER_SEL(peers[i].status) >= PEER_INCLUDED){
                         num_candidates++;
                         if(PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE){
-                                syncsource_found=1;
+                                syncsource_found = true;
                                 min_peer_sel=PEER_SYNCSOURCE;
                         }
                 }
@@ -699,23 +700,23 @@ int process_arguments(int argc, char **argv){
                         verbose++;
                         break;
                 case 'w':
-                        do_offset=1;
+                        do_offset = true;
                         owarn = optarg;
                         break;
                 case 'c':
-                        do_offset=1;
+                        do_offset = true;
                         ocrit = optarg;
                         break;
                 case 'j':
-                        do_jitter=1;
+                        do_jitter = true;
                         jwarn = optarg;
                         break;
                 case 'k':
-                        do_jitter=1;
+                        do_jitter = true;
                         jcrit = optarg;
                         break;
                 case 'H':
-                        if(is_host(optarg) == FALSE)
+                        if(!is_host(optarg))
                                 usage2(_("Invalid hostname/address"), optarg);
                         server_address = strdup(optarg);
                         break;
@@ -749,9 +750,9 @@ int process_arguments(int argc, char **argv){
 char *perfd_offset (double offset)
 {
         return fperfdata ("offset", offset, "s",
-                TRUE, offset_thresholds->warning->end,
-                TRUE, offset_thresholds->critical->end,
-                FALSE, 0, FALSE, 0);
+                true, offset_thresholds->warning->end,
+                true, offset_thresholds->critical->end,
+                false, 0, false, 0);
 }
 
 char *perfd_jitter (double jitter)
@@ -759,7 +760,7 @@ char *perfd_jitter (double jitter)
         return fperfdata ("jitter", jitter, "s",
                 do_jitter, jitter_thresholds->warning->end,
                 do_jitter, jitter_thresholds->critical->end,
-                TRUE, 0, FALSE, 0);
+                true, 0, false, 0);
 }
 
 int main(int argc, char *argv[]){
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 49cb100..464a9e1 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -46,21 +46,20 @@ const char *email = "devel@monitoring-plugins.org";
 static char *server_address=NULL;
 static int port=123;
 static int verbose=0;
-static int quiet=0;
-static short do_offset=0;
+static bool quiet = false;
 static char *owarn="60";
 static char *ocrit="120";
-static short do_stratum=0;
+static bool do_stratum = false;
 static char *swarn="-1:16";
 static char *scrit="-1:16";
-static short do_jitter=0;
+static bool do_jitter = false;
 static char *jwarn="-1:5000";
 static char *jcrit="-1:10000";
-static short do_truechimers=0;
+static bool do_truechimers = false;
 static char *twarn="0:";
 static char *tcrit="0:";
-static int syncsource_found=0;
-static int li_alarm=0;
+static bool syncsource_found = false;
+static bool li_alarm = false;
 
 int process_arguments (int, char **);
 thresholds *offset_thresholds = NULL;
@@ -254,7 +253,7 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                                 die(STATE_CRITICAL, "NTP CRITICAL: Invalid packet received from NTP server\n");
                 } while (!(req.op&OP_READSTAT && ntohs(req.seq) == 1));
 
-                if (LI(req.flags) == LI_ALARM) li_alarm = 1;
+                if (LI(req.flags) == LI_ALARM) li_alarm = true;
                 /* Each peer identifier is 4 bytes in the data section, which
                  * we represent as a ntp_assoc_status_pair datatype.
                  */
@@ -276,7 +275,7 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                         if(PEER_SEL(peers[i].status) >= PEER_INCLUDED){
                                 num_candidates++;
                                 if(PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE){
-                                        syncsource_found=1;
+                                        syncsource_found = true;
                                         min_peer_sel=PEER_SYNCSOURCE;
                                 }
                         }
@@ -440,7 +439,7 @@ int process_arguments(int argc, char **argv){
         if (argc < 2)
                 usage ("\n");
 
-        while (1) {
+        while (true) {
                 c = getopt_long (argc, argv, "Vhv46qw:c:W:C:j:k:m:n:t:H:p:", longopts, &option);
                 if (c == -1 || c == EOF || c == 1)
                         break;
@@ -458,42 +457,40 @@ int process_arguments(int argc, char **argv){
                         verbose++;
                         break;
                 case 'q':
-                        quiet = 1;
+                        quiet = true;
                         break;
                 case 'w':
-                        do_offset=1;
                         owarn = optarg;
                         break;
                 case 'c':
-                        do_offset=1;
                         ocrit = optarg;
                         break;
                 case 'W':
-                        do_stratum=1;
+                        do_stratum = true;
                         swarn = optarg;
                         break;
                 case 'C':
-                        do_stratum=1;
+                        do_stratum = true;
                         scrit = optarg;
                         break;
                 case 'j':
-                        do_jitter=1;
+                        do_jitter = true;
                         jwarn = optarg;
                         break;
                 case 'k':
-                        do_jitter=1;
+                        do_jitter = true;
                         jcrit = optarg;
                         break;
                 case 'm':
-                        do_truechimers=1;
+                        do_truechimers = true;
                         twarn = optarg;
                         break;
                 case 'n':
-                        do_truechimers=1;
+                        do_truechimers = true;
                         tcrit = optarg;
                         break;
                 case 'H':
-                        if(is_host(optarg) == FALSE)
+                        if(!is_host(optarg))
                                 usage2(_("Invalid hostname/address"), optarg);
                         server_address = strdup(optarg);
                         break;
@@ -530,9 +527,9 @@ int process_arguments(int argc, char **argv){
 char *perfd_offset (double offset)
 {
         return fperfdata ("offset", offset, "s",
-                TRUE, offset_thresholds->warning->end,
-                TRUE, offset_thresholds->critical->end,
-                FALSE, 0, FALSE, 0);
+                true, offset_thresholds->warning->end,
+                true, offset_thresholds->critical->end,
+                false, 0, false, 0);
 }
 
 char *perfd_jitter (double jitter)
@@ -540,7 +537,7 @@ char *perfd_jitter (double jitter)
         return fperfdata ("jitter", jitter, "",
                 do_jitter, jitter_thresholds->warning->end,
                 do_jitter, jitter_thresholds->critical->end,
-                TRUE, 0, FALSE, 0);
+                true, 0, false, 0);
 }
 
 char *perfd_stratum (int stratum)
@@ -548,7 +545,7 @@ char *perfd_stratum (int stratum)
         return perfdata ("stratum", stratum, "",
                 do_stratum, (int)stratum_thresholds->warning->end,
                 do_stratum, (int)stratum_thresholds->critical->end,
-                TRUE, 0, TRUE, 16);
+                true, 0, true, 16);
 }
 
 char *perfd_truechimers (int num_truechimers)
@@ -556,11 +553,11 @@ char *perfd_truechimers (int num_truechimers)
         return perfdata ("truechimers", num_truechimers, "",
                 do_truechimers, (int)truechimer_thresholds->warning->end,
                 do_truechimers, (int)truechimer_thresholds->critical->end,
-                TRUE, 0, FALSE, 0);
+                true, 0, false, 0);
 }
 
 int main(int argc, char *argv[]){
-        int result, offset_result, stratum, num_truechimers, oresult, jresult, sresult, tresult;
+        int result, offset_result, stratum, num_truechimers;
         double offset=0, jitter=0;
         char *result_line, *perfdata_line;
 
@@ -590,25 +587,35 @@ int main(int argc, char *argv[]){
 
         if(offset_result == STATE_UNKNOWN) {
                 /* if there's no sync peer (this overrides ntp_request output): */
-                result = (quiet == 1 ? STATE_UNKNOWN : STATE_CRITICAL);
+                result = (quiet ? STATE_UNKNOWN : STATE_CRITICAL);
         } else {
                 /* Be quiet if there's no candidates either */
-                if (quiet == 1 && result == STATE_WARNING)
+                if (quiet && result == STATE_WARNING)
                         result = STATE_UNKNOWN;
                 result = max_state_alt(result, get_status(fabs(offset), offset_thresholds));
         }
-        oresult = result;
+
+        int oresult = result;
+
+
+        int tresult = STATE_UNKNOWN;
         
         if(do_truechimers) {
                 tresult = get_status(num_truechimers, truechimer_thresholds);
                 result = max_state_alt(result, tresult);
         }
 
+
+        int sresult = STATE_UNKNOWN;
+
         if(do_stratum) {
                 sresult = get_status(stratum, stratum_thresholds);
                 result = max_state_alt(result, sresult);
         }
 
+
+        int jresult = STATE_UNKNOWN;
+
         if(do_jitter) {
                 jresult = get_status(jitter, jitter_thresholds);
                 result = max_state_alt(result, jresult);
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index 46cc604..b2e1655 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -45,7 +45,7 @@ const char *email = "devel@monitoring-plugins.org";
 static char *server_address=NULL;
 static char *port="123";
 static int verbose=0;
-static int quiet=0;
+static bool quiet = false;
 static char *owarn="60";
 static char *ocrit="120";
 static int time_offset=0;
@@ -485,7 +485,7 @@ int process_arguments(int argc, char **argv){
                         verbose++;
                         break;
                 case 'q':
-                        quiet = 1;
+                        quiet = true;
                         break;
                 case 'w':
                         owarn = optarg;
@@ -494,7 +494,7 @@ int process_arguments(int argc, char **argv){
                         ocrit = optarg;
                         break;
                 case 'H':
-                        if(is_host(optarg) == FALSE)
+                        if(!is_host(optarg))
                                 usage2(_("Invalid hostname/address"), optarg);
                         server_address = strdup(optarg);
                         break;
@@ -531,12 +531,11 @@ int process_arguments(int argc, char **argv){
         return 0;
 }
 
-char *perfd_offset (double offset)
-{
+char *perfd_offset (double offset) {
         return fperfdata ("offset", offset, "s",
-                TRUE, offset_thresholds->warning->end,
-                TRUE, offset_thresholds->critical->end,
-                FALSE, 0, FALSE, 0);
+                true, offset_thresholds->warning->end,
+                true, offset_thresholds->critical->end,
+                false, 0, false, 0);
 }
 
 int main(int argc, char *argv[]){
@@ -566,7 +565,7 @@ int main(int argc, char *argv[]){
 
         offset = offset_request(server_address, &offset_result);
         if (offset_result == STATE_UNKNOWN) {
-                result = (quiet == 1 ? STATE_UNKNOWN : STATE_CRITICAL);
+                result = ( (!quiet) ? STATE_UNKNOWN : STATE_CRITICAL);
         } else {
                 result = get_status(fabs(offset), offset_thresholds);
         }
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 3c9d23e..10c493b 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -46,6 +46,7 @@ enum checkvar {
         VPF,        /* check % free space on volume */
         VMF,        /* check MB free space on volume */
         VMU,        /* check MB used space on volume */
+        VPU,        /* check % used space on volume */
         VMP,        /* check MB purgeable space on volume */
         VKF,        /* check KB free space on volume */
         LTCH,       /* check long-term cache hit percentage */
@@ -104,9 +105,9 @@ char *nss7_name=NULL;
 int server_port=PORT;
 unsigned long warning_value=0L;
 unsigned long critical_value=0L;
-int check_warning_value=FALSE;
-int check_critical_value=FALSE;
-int check_netware_version=FALSE;
+bool check_warning_value = false;
+bool check_critical_value = false;
+bool check_netware_version = false;
 enum checkvar vars_to_check = NONE;
 int sap_number=-1;
 
@@ -146,6 +147,8 @@ main(int argc, char **argv) {
         unsigned long nss6_value=0L;
         unsigned long nss7_value=0L;
         unsigned long total_disk_space=0L;
+        unsigned long used_disk_space=0L;
+        unsigned long percent_used_disk_space=0L;
         unsigned long purgeable_disk_space=0L;
         unsigned long non_purgeable_disk_space=0L;
         unsigned long percent_free_space=0;
@@ -182,7 +185,7 @@ main(int argc, char **argv) {
         my_tcp_connect (server_address, server_port, &sd);
 
         /* get OS version string */
-        if (check_netware_version==TRUE) {
+        if (check_netware_version) {
                 send_buffer = strdup ("S19\r\n");
                 result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
                 if (result!=STATE_OK)
@@ -231,9 +234,9 @@ main(int argc, char **argv) {
                 recv_buffer[strlen(recv_buffer)-1]=0;
                 sprintf(uptime,_("Up %s,"),recv_buffer);
 
-                if (check_critical_value==TRUE && utilization >= critical_value)
+                if (check_critical_value && utilization >= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && utilization >= warning_value)
+                else if (check_warning_value && utilization >= warning_value)
                         result=STATE_WARNING;
 
                 xasprintf (&output_message,
@@ -259,9 +262,9 @@ main(int argc, char **argv) {
                         return result;
                 current_connections=strtoul(recv_buffer,NULL,10);
 
-                if (check_critical_value==TRUE && current_connections >= critical_value)
+                if (check_critical_value && current_connections >= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && current_connections >= warning_value)
+                else if (check_warning_value && current_connections >= warning_value)
                         result=STATE_WARNING;
 
                 xasprintf (&output_message,
@@ -284,9 +287,9 @@ main(int argc, char **argv) {
                         return result;
                 cache_hits=atoi(recv_buffer);
 
-                if (check_critical_value==TRUE && cache_hits <= critical_value)
+                if (check_critical_value && cache_hits <= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && cache_hits <= warning_value)
+                else if (check_warning_value && cache_hits <= warning_value)
                         result=STATE_WARNING;
 
                 xasprintf (&output_message,
@@ -306,9 +309,9 @@ main(int argc, char **argv) {
                         return result;
                 cache_buffers=strtoul(recv_buffer,NULL,10);
 
-                if (check_critical_value==TRUE && cache_buffers <= critical_value)
+                if (check_critical_value && cache_buffers <= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && cache_buffers <= warning_value)
+                else if (check_warning_value && cache_buffers <= warning_value)
                         result=STATE_WARNING;
 
                 xasprintf (&output_message,
@@ -331,9 +334,9 @@ main(int argc, char **argv) {
                         return result;
                 cache_buffers=strtoul(recv_buffer,NULL,10);
 
-                if (check_critical_value==TRUE && cache_buffers >= critical_value)
+                if (check_critical_value && cache_buffers >= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && cache_buffers >= warning_value)
+                else if (check_warning_value && cache_buffers >= warning_value)
                         result=STATE_WARNING;
 
                 xasprintf (&output_message,
@@ -356,9 +359,9 @@ main(int argc, char **argv) {
                         return result;
                 lru_time=strtoul(recv_buffer,NULL,10);
 
-                if (check_critical_value==TRUE && lru_time <= critical_value)
+                if (check_critical_value && lru_time <= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && lru_time <= warning_value)
+                else if (check_warning_value && lru_time <= warning_value)
                         result=STATE_WARNING;
 
                 xasprintf (&output_message,
@@ -383,9 +386,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         free_disk_space=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && free_disk_space <= critical_value)
+                        if (check_critical_value && free_disk_space <= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && free_disk_space <= warning_value)
+                        else if (check_warning_value && free_disk_space <= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;"),
@@ -411,9 +414,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         free_disk_space=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && free_disk_space <= critical_value)
+                        if (check_critical_value && free_disk_space <= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && free_disk_space <= warning_value)
+                        else if (check_warning_value && free_disk_space <= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;"),
@@ -438,9 +441,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         free_disk_space=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && free_disk_space <= critical_value)
+                        if (check_critical_value && free_disk_space <= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && free_disk_space <= warning_value)
+                        else if (check_warning_value && free_disk_space <= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;"),
@@ -452,7 +455,50 @@ main(int argc, char **argv) {
                                  warning_value,
                                  critical_value);
                 }
+                /* check % used space on volume */
+        } else if (vars_to_check==VPU) {
+                close(sd);
+                my_tcp_connect (server_address, server_port, &sd);
+
+                asprintf (&send_buffer,"VMU%s\r\n",volume_name);
+                result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+
+                if (result!=STATE_OK)
+                        return result;
+
+                if (!strcmp(recv_buffer,"-1\n")) {
+                        asprintf (&output_message,_("CRITICAL - Volume '%s' does not exist!"),volume_name);
+                        result=STATE_CRITICAL;
+
+                } else {
+                        used_disk_space=strtoul(recv_buffer,NULL,10);
+                        close(sd);
+                        my_tcp_connect (server_address, server_port, &sd);
+                        /* get total volume in MB */
+                        asprintf (&send_buffer,"VMS%s\r\n",volume_name);
+                        result=send_tcp_request(sd,send_buffer,recv_buffer,sizeof(recv_buffer));
+                        if (result!=STATE_OK)
+                                return result;
+                        total_disk_space=strtoul(recv_buffer,NULL,10);
+                        /* calculate percent used on volume */
+                        percent_used_disk_space=(unsigned long)(((double)used_disk_space/(double)total_disk_space)*100.0);
 
+                        if (check_critical_value && percent_used_disk_space >= critical_value)
+                                result=STATE_CRITICAL;
+                        else if (check_warning_value && percent_used_disk_space >= warning_value)
+                                result=STATE_WARNING;
+
+                        asprintf (&output_message,_("%lu MB (%lu%%) used on volume %s - total %lu MB|Used space in percent on %s=%lu;%lu;%lu;0;100"),
+                                used_disk_space,
+                                percent_used_disk_space,
+                                volume_name,
+                                total_disk_space,
+                                volume_name,
+                                percent_used_disk_space,
+                                warning_value,
+                                critical_value
+                                );
+                }
 
                 /* check % free space on volume */
         } else if (vars_to_check==VPF) {
@@ -485,9 +531,9 @@ main(int argc, char **argv) {
 
                         percent_free_space=(unsigned long)(((double)free_disk_space/(double)total_disk_space)*100.0);
 
-                        if (check_critical_value==TRUE && percent_free_space <= critical_value)
+                        if (check_critical_value && percent_free_space <= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && percent_free_space <= warning_value)
+                        else if (check_warning_value && percent_free_space <= warning_value)
                                 result=STATE_WARNING;
                         free_disk_space/=1024;
                         total_disk_space/=1024;
@@ -596,14 +642,14 @@ main(int argc, char **argv) {
                 percent_used_packet_receive_buffers=(unsigned long)(((double)used_packet_receive_buffers/(double)max_packet_receive_buffers)*100.0);
 
                 if (vars_to_check==UPRB) {
-                        if (check_critical_value==TRUE && used_packet_receive_buffers >= critical_value)
+                        if (check_critical_value && used_packet_receive_buffers >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && used_packet_receive_buffers >= warning_value)
+                        else if (check_warning_value && used_packet_receive_buffers >= warning_value)
                                 result=STATE_WARNING;
                 } else {
-                        if (check_critical_value==TRUE && percent_used_packet_receive_buffers >= critical_value)
+                        if (check_critical_value && percent_used_packet_receive_buffers >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && percent_used_packet_receive_buffers >= warning_value)
+                        else if (check_warning_value && percent_used_packet_receive_buffers >= warning_value)
                                 result=STATE_WARNING;
                 }
 
@@ -625,9 +671,9 @@ main(int argc, char **argv) {
 
                 sap_entries=atoi(recv_buffer);
 
-                if (check_critical_value==TRUE && sap_entries >= critical_value)
+                if (check_critical_value && sap_entries >= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && sap_entries >= warning_value)
+                else if (check_warning_value && sap_entries >= warning_value)
                         result=STATE_WARNING;
 
                 if (sap_number==-1)
@@ -651,9 +697,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 } else {
                         purgeable_disk_space=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && purgeable_disk_space >= critical_value)
+                        if (check_critical_value && purgeable_disk_space >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && purgeable_disk_space >= warning_value)
+                        else if (check_warning_value && purgeable_disk_space >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,_("%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"),
                                  (result==STATE_OK)?"":_("Only "),
@@ -677,9 +723,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 } else {
                         purgeable_disk_space=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && purgeable_disk_space >= critical_value)
+                        if (check_critical_value && purgeable_disk_space >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && purgeable_disk_space >= warning_value)
+                        else if (check_warning_value && purgeable_disk_space >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,_("%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"),
                                  (result==STATE_OK)?"":_("Only "),
@@ -722,9 +768,9 @@ main(int argc, char **argv) {
 
                         percent_purgeable_space=(unsigned long)(((double)purgeable_disk_space/(double)total_disk_space)*100.0);
 
-                        if (check_critical_value==TRUE && percent_purgeable_space >= critical_value)
+                        if (check_critical_value && percent_purgeable_space >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && percent_purgeable_space >= warning_value)
+                        else if (check_warning_value && percent_purgeable_space >= warning_value)
                                 result=STATE_WARNING;
                         purgeable_disk_space/=1024;
                         xasprintf (&output_message,_("%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100"),
@@ -754,9 +800,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 } else {
                         non_purgeable_disk_space=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && non_purgeable_disk_space >= critical_value)
+                        if (check_critical_value && non_purgeable_disk_space >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && non_purgeable_disk_space >= warning_value)
+                        else if (check_warning_value && non_purgeable_disk_space >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,_("%s%lu KB not yet purgeable on volume %s"),(result==STATE_OK)?"":_("Only "),non_purgeable_disk_space,volume_name);
                 }
@@ -792,9 +838,9 @@ main(int argc, char **argv) {
 
                         percent_non_purgeable_space=(unsigned long)(((double)non_purgeable_disk_space/(double)total_disk_space)*100.0);
 
-                        if (check_critical_value==TRUE && percent_non_purgeable_space >= critical_value)
+                        if (check_critical_value && percent_non_purgeable_space >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && percent_non_purgeable_space >= warning_value)
+                        else if (check_warning_value && percent_non_purgeable_space >= warning_value)
                                 result=STATE_WARNING;
                         purgeable_disk_space/=1024;
                         xasprintf (&output_message,_("%lu MB (%lu%%) not yet purgeable on volume %s"),non_purgeable_disk_space,percent_non_purgeable_space,volume_name);
@@ -813,9 +859,9 @@ main(int argc, char **argv) {
 
                 open_files=atoi(recv_buffer);
 
-                if (check_critical_value==TRUE && open_files >= critical_value)
+                if (check_critical_value && open_files >= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && open_files >= warning_value)
+                else if (check_warning_value && open_files >= warning_value)
                         result=STATE_WARNING;
 
                 xasprintf (&output_message,_("%lu open files|Openfiles=%lu;%lu;%lu;0,0"),
@@ -838,9 +884,9 @@ main(int argc, char **argv) {
 
                 abended_threads=atoi(recv_buffer);
 
-                if (check_critical_value==TRUE && abended_threads >= critical_value)
+                if (check_critical_value && abended_threads >= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && abended_threads >= warning_value)
+                else if (check_warning_value && abended_threads >= warning_value)
                         result=STATE_WARNING;
 
                 xasprintf (&output_message,_("%lu abended threads|Abends=%lu;%lu;%lu;;"),
@@ -872,9 +918,9 @@ main(int argc, char **argv) {
 
                 current_service_processes=atoi(recv_buffer);
 
-                if (check_critical_value==TRUE && current_service_processes >= critical_value)
+                if (check_critical_value && current_service_processes >= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && current_service_processes >= warning_value)
+                else if (check_warning_value && current_service_processes >= warning_value)
                         result=STATE_WARNING;
 
                 xasprintf (&output_message,
@@ -923,9 +969,9 @@ main(int argc, char **argv) {
                         return result;
                 lru_time=strtoul(recv_buffer,NULL,10);
 
-                if (check_critical_value==TRUE && lru_time <= critical_value)
+                if (check_critical_value && lru_time <= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && lru_time <= warning_value)
+                else if (check_warning_value && lru_time <= warning_value)
                         result=STATE_WARNING;
                 xasprintf (&output_message,_("LRU sitting time = %lu seconds"),lru_time);
 
@@ -942,9 +988,9 @@ main(int argc, char **argv) {
                         return result;
                 dirty_cache_buffers=atoi(recv_buffer);
 
-                if (check_critical_value==TRUE && dirty_cache_buffers <= critical_value)
+                if (check_critical_value && dirty_cache_buffers <= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && dirty_cache_buffers <= warning_value)
+                else if (check_warning_value && dirty_cache_buffers <= warning_value)
                         result=STATE_WARNING;
                 xasprintf (&output_message,_("Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100"),
                                 dirty_cache_buffers,
@@ -964,9 +1010,9 @@ main(int argc, char **argv) {
                         return result;
                 total_cache_buffers=atoi(recv_buffer);
 
-                if (check_critical_value==TRUE && total_cache_buffers <= critical_value)
+                if (check_critical_value && total_cache_buffers <= critical_value)
                         result=STATE_CRITICAL;
-                else if (check_warning_value==TRUE && total_cache_buffers <= warning_value)
+                else if (check_warning_value && total_cache_buffers <= warning_value)
                         result=STATE_WARNING;
                 xasprintf (&output_message,_("Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100"),
                                 total_cache_buffers,
@@ -1034,9 +1080,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nrmp_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nrmp_value <= critical_value)
+                        if (check_critical_value && nrmp_value <= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nrmp_value <= warning_value)
+                        else if (check_warning_value && nrmp_value <= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1060,9 +1106,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nrmm_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nrmm_value <= critical_value)
+                        if (check_critical_value && nrmm_value <= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nrmm_value <= warning_value)
+                        else if (check_warning_value && nrmm_value <= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1086,9 +1132,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nrms_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nrms_value >= critical_value)
+                        if (check_critical_value && nrms_value >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nrms_value >= warning_value)
+                        else if (check_warning_value && nrms_value >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1112,9 +1158,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nss1_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nss1_value >= critical_value)
+                        if (check_critical_value && nss1_value >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nss1_value >= warning_value)
+                        else if (check_warning_value && nss1_value >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1138,9 +1184,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nss2_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nss2_value >= critical_value)
+                        if (check_critical_value && nss2_value >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nss2_value >= warning_value)
+                        else if (check_warning_value && nss2_value >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1164,9 +1210,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nss3_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nss3_value >= critical_value)
+                        if (check_critical_value && nss3_value >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nss3_value >= warning_value)
+                        else if (check_warning_value && nss3_value >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1190,9 +1236,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nss4_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nss4_value >= critical_value)
+                        if (check_critical_value && nss4_value >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nss4_value >= warning_value)
+                        else if (check_warning_value && nss4_value >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1216,9 +1262,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nss5_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nss5_value >= critical_value)
+                        if (check_critical_value && nss5_value >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nss5_value >= warning_value)
+                        else if (check_warning_value && nss5_value >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1242,9 +1288,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nss6_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nss6_value >= critical_value)
+                        if (check_critical_value && nss6_value >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nss6_value >= warning_value)
+                        else if (check_warning_value && nss6_value >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1268,9 +1314,9 @@ main(int argc, char **argv) {
                         result=STATE_CRITICAL;
                 }       else {
                         nss7_value=strtoul(recv_buffer,NULL,10);
-                        if (check_critical_value==TRUE && nss7_value >= critical_value)
+                        if (check_critical_value && nss7_value >= critical_value)
                                 result=STATE_CRITICAL;
-                        else if (check_warning_value==TRUE && nss7_value >= warning_value)
+                        else if (check_warning_value && nss7_value >= warning_value)
                                 result=STATE_WARNING;
                         xasprintf (&output_message,
                                   _("%s is  %lu|%s=%lu;%lu;%lu;;"),
@@ -1362,7 +1408,7 @@ int process_arguments(int argc, char **argv) {
                                 server_address=optarg;
                                 break;
                         case 'o': /* display nos version */
-                                check_netware_version=TRUE;
+                                check_netware_version = true;
                                 break;
                         case 'p': /* port */
                                 if (is_intnonneg(optarg))
@@ -1450,6 +1496,12 @@ int process_arguments(int argc, char **argv) {
                                         if (!strcmp(volume_name,""))
                                                 volume_name = strdup ("SYS");
                                 }
+                                else if (strncmp(optarg,"VPU",3)==0) {
+                                        vars_to_check=VPU;
+                                        volume_name = strdup (optarg+3);
+                                        if (!strcmp(volume_name,""))
+                                                volume_name = strdup ("SYS");
+                                }
                                 else if (strncmp(optarg,"VPP",3)==0) {
                                         vars_to_check=VPP;
                                         volume_name = strdup (optarg+3);
@@ -1569,11 +1621,11 @@ int process_arguments(int argc, char **argv) {
                                 break;
                         case 'w': /* warning threshold */
                                 warning_value=strtoul(optarg,NULL,10);
-                                check_warning_value=TRUE;
+                                check_warning_value = true;
                                 break;
                         case 'c': /* critical threshold */
                                 critical_value=strtoul(optarg,NULL,10);
-                                check_critical_value=TRUE;
+                                check_critical_value = true;
                                 break;
                         case 't': /* timeout */
                                 socket_timeout=atoi(optarg);
@@ -1626,6 +1678,7 @@ void print_help(void)
         printf ("    %s\n", _("OFILES    = number of open files"));
   printf ("    %s\n", _("    VMF<vol>  = MB of free space on Volume <vol>"));
   printf ("    %s\n", _("    VMU<vol>  = MB used space on Volume <vol>"));
+  printf ("    %s\n", _("    VPU<vol>  = percent used space on Volume <vol>"));
   printf ("    %s\n", _("    VMP<vol>  = MB of purgeable space on Volume <vol>"));
   printf ("    %s\n", _("    VPF<vol>  = percent free space on volume <vol>"));
   printf ("    %s\n", _("    VKF<vol>  = KB of free space on volume <vol>"));
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 9a4d25f..5165c82 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -56,15 +56,15 @@ char *server_address = NULL;
 int server_port = PORT;
 double warning_value = 0L;
 double critical_value = 0L;
-int check_warning_value = FALSE;
-int check_critical_value = FALSE;
+bool check_warning_value = false;
+bool check_critical_value = false;
 enum checkvar vars_to_check = NONE;
 int cmd_timeout = 1;
 
 int netstat_port = 0;
 char *disk_name = NULL;
 char *process_name = NULL;
-        char send_buffer[MAX_INPUT_BUFFER];
+char send_buffer[MAX_INPUT_BUFFER];
 
 int process_arguments (int, char **);
 void print_usage (void);
@@ -77,7 +77,7 @@ main (int argc, char **argv)
         char recv_buffer[MAX_INPUT_BUFFER];
         char temp_buffer[MAX_INPUT_BUFFER];
         char *temp_ptr = NULL;
-        int found_disk = FALSE;
+        bool found_disk = false;
         unsigned long percent_used_disk_space = 100;
         double load;
         double load_1min;
@@ -155,9 +155,9 @@ main (int argc, char **argv)
                         break;
                 }
 
-                if (check_critical_value == TRUE && (load >= critical_value))
+                if (check_critical_value && (load >= critical_value))
                         result = STATE_CRITICAL;
-                else if (check_warning_value == TRUE && (load >= warning_value))
+                else if (check_warning_value && (load >= warning_value))
                         result = STATE_WARNING;
 
                 die (result,
@@ -178,7 +178,7 @@ main (int argc, char **argv)
                      temp_ptr = (char *) strtok (NULL, " ")) {
 
                         if (!strcmp (temp_ptr, disk_name)) {
-                                found_disk = TRUE;
+                                found_disk = true;
                                 temp_ptr = (char *) strtok (NULL, "%");
                                 if (temp_ptr == NULL)
                                         die (STATE_CRITICAL, _("Invalid response from server\n"));
@@ -191,14 +191,14 @@ main (int argc, char **argv)
                 }
 
                 /* error if we couldn't find the info for the disk */
-                if (found_disk == FALSE)
+                if (!found_disk)
                         die (STATE_CRITICAL,
                                    "CRITICAL - Disk '%s' non-existent or not mounted",
                                    disk_name);
 
-                if (check_critical_value == TRUE && (percent_used_disk_space >= critical_value))
+                if (check_critical_value && (percent_used_disk_space >= critical_value))
                         result = STATE_CRITICAL;
-                else if (check_warning_value == TRUE && (percent_used_disk_space >= warning_value))
+                else if (check_warning_value && (percent_used_disk_space >= warning_value))
                         result = STATE_WARNING;
 
                 die (result, "Disk %s - %lu%% used on %s", state_text(result), percent_used_disk_space, disk_name);
@@ -212,9 +212,9 @@ main (int argc, char **argv)
                 else
                         port_connections = strtod (recv_buffer, NULL);
 
-                if (check_critical_value == TRUE && (port_connections >= critical_value))
+                if (check_critical_value && (port_connections >= critical_value))
                         result = STATE_CRITICAL;
-                else if (check_warning_value == TRUE && (port_connections >= warning_value))
+                else if (check_warning_value && (port_connections >= warning_value))
                         result = STATE_WARNING;
 
                 die (result,
@@ -241,9 +241,9 @@ main (int argc, char **argv)
                 else
                         processes = strtod (temp_ptr, NULL);
 
-                if (check_critical_value == TRUE && (processes >= critical_value))
+                if (check_critical_value && (processes >= critical_value))
                         result = STATE_CRITICAL;
-                else if (check_warning_value == TRUE && (processes >= warning_value))
+                else if (check_warning_value && (processes >= warning_value))
                         result = STATE_WARNING;
 
                 die (result,
@@ -262,9 +262,9 @@ main (int argc, char **argv)
                 uptime_raw_hours = strtod (recv_buffer, NULL);
                 uptime_raw_minutes = (unsigned long) (uptime_raw_hours * 60.0);
 
-                if (check_critical_value == TRUE && (uptime_raw_minutes <= critical_value))
+                if (check_critical_value && (uptime_raw_minutes <= critical_value))
                         result = STATE_CRITICAL;
-                else if (check_warning_value == TRUE && (uptime_raw_minutes <= warning_value))
+                else if (check_warning_value && (uptime_raw_minutes <= warning_value))
                         result = STATE_WARNING;
 
                 uptime_days = uptime_raw_minutes / 1440;
@@ -388,11 +388,11 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'w':                                                                       /* warning threshold */
                         warning_value = strtoul (optarg, NULL, 10);
-                        check_warning_value = TRUE;
+                        check_warning_value = true;
                         break;
                 case 'c':                                                                       /* critical threshold */
                         critical_value = strtoul (optarg, NULL, 10);
-                        check_critical_value = TRUE;
+                        check_critical_value = true;
                         break;
                 case 't':                                                                       /* timeout */
                         socket_timeout = atoi (optarg);
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 6199033..94d589e 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -69,7 +69,7 @@ int process_arguments (int, char **);
 int validate_arguments (void);
 void print_usage (void);
 void print_help (void);
-int is_pg_logname (char *);
+bool is_pg_logname (char *);
 int do_query (PGconn *, char *);
 
 char *pghost = NULL;                                            /* host name of the backend server */
@@ -252,7 +252,7 @@ main (int argc, char **argv)
         printf (_(" %s - database %s (%f sec.)|%s\n"),
                 state_text(status), dbName, elapsed_time,
                 fperfdata("time", elapsed_time, "s",
-                         !!(twarn > 0.0), twarn, !!(tcrit > 0.0), tcrit, TRUE, 0, FALSE,0));
+                         !!(twarn > 0.0), twarn, !!(tcrit > 0.0), tcrit, true, 0, false,0));
 
         if (pgquery)
                 query_status = do_query (conn, pgquery);
@@ -393,7 +393,7 @@ process_arguments (int argc, char **argv)
 
 <para>&PROTO_validate_arguments;</para>
 
-<para>Given a database name, this function returns TRUE if the string
+<para>Given a database name, this function returns true if the string
 is a valid PostgreSQL database name, and returns false if it is
 not.</para>
 
@@ -424,7 +424,7 @@ function prototype
 
 <para>&PROTO_is_pg_logname;</para>
 
-<para>Given a username, this function returns TRUE if the string is a
+<para>Given a username, this function returns true if the string is a
 valid PostgreSQL username, and returns false if it is not. Valid PostgreSQL
 usernames are less than &NAMEDATALEN; characters long and consist of
 letters, numbers, dashes, and underscores, plus possibly some other
@@ -439,12 +439,10 @@ should be added.</para>
 
 
 
-int
-is_pg_logname (char *username)
-{
+bool is_pg_logname (char *username) {
         if (strlen (username) > NAMEDATALEN - 1)
-                return (FALSE);
-        return (TRUE);
+                return (false);
+        return (true);
 }
 
 /******************************************************************************
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 741f732..6e162e6 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -55,7 +55,7 @@ int error_scan (char buf[MAX_INPUT_BUFFER], const char *addr);
 void print_usage (void);
 void print_help (void);
 
-int display_html = FALSE;
+bool display_html = false;
 int wpl = UNKNOWN_PACKET_LOSS;
 int cpl = UNKNOWN_PACKET_LOSS;
 float wrta = UNKNOWN_TRIP_TIME;
@@ -153,7 +153,7 @@ main (int argc, char **argv)
                 if (n_addresses > 1 && this_result != STATE_UNKNOWN)
                         die (STATE_OK, "%s is alive\n", addresses[i]);
 
-                if (display_html == TRUE)
+                if (display_html == true)
                         printf ("<A HREF='%s/traceroute.cgi?%s'>", CGIURL, addresses[i]);
                 if (pl == 100)
                         printf (_("PING %s - %sPacket loss = %d%%"), state_text (this_result), warn_text,
@@ -161,22 +161,22 @@ main (int argc, char **argv)
                 else
                         printf (_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"),
                                                         state_text (this_result), warn_text, pl, rta);
-                if (display_html == TRUE)
+                if (display_html == true)
                         printf ("</A>");
 
                 /* Print performance data */
                 if (pl != 100) {
                         printf("|%s", fperfdata ("rta", (double) rta, "ms",
-                                                                          wrta>0?TRUE:FALSE, wrta,
-                                                                          crta>0?TRUE:FALSE, crta,
-                                                                          TRUE, 0, FALSE, 0));
+                                                                          wrta>0?true:false, wrta,
+                                                                          crta>0?true:false, crta,
+                                                                          true, 0, false, 0));
                 } else {
                         printf("| rta=U;%f;%f;;", wrta, crta);
                 }
                 printf(" %s\n", perfdata ("pl", (long) pl, "%",
-                                          wpl>0?TRUE:FALSE, wpl,
-                                          cpl>0?TRUE:FALSE, cpl,
-                                          TRUE, 0, FALSE, 0));
+                                          wpl>0?true:false, wpl,
+                                          cpl>0?true:false, cpl,
+                                          true, 0, false, 0));
 
                 if (verbose >= 2)
                         printf ("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
@@ -278,10 +278,10 @@ process_arguments (int argc, char **argv)
                                 usage2 (_("<max_packets> (%s) must be a non-negative number\n"), optarg);
                         break;
                 case 'n':       /* no HTML */
-                        display_html = FALSE;
+                        display_html = false;
                         break;
                 case 'L':       /* show HTML */
-                        display_html = TRUE;
+                        display_html = true;
                         break;
                 case 'c':
                         get_threshold (optarg, &crta, &cpl);
@@ -297,7 +297,7 @@ process_arguments (int argc, char **argv)
                 return validate_arguments ();
 
         if (addresses[0] == NULL) {
-                if (is_host (argv[c]) == FALSE) {
+                if (!is_host (argv[c])) {
                         usage2 (_("Invalid hostname/address"), argv[c]);
                 } else {
                         addresses[0] = argv[c++];
@@ -308,7 +308,7 @@ process_arguments (int argc, char **argv)
         }
 
         if (wpl == UNKNOWN_PACKET_LOSS) {
-                if (is_intpercent (argv[c]) == FALSE) {
+                if (!is_intpercent (argv[c])) {
                         printf (_("<wpl> (%s) must be an integer percentage\n"), argv[c]);
                         return ERROR;
                 } else {
@@ -319,7 +319,7 @@ process_arguments (int argc, char **argv)
         }
 
         if (cpl == UNKNOWN_PACKET_LOSS) {
-                if (is_intpercent (argv[c]) == FALSE) {
+                if (!is_intpercent (argv[c])) {
                         printf (_("<cpl> (%s) must be an integer percentage\n"), argv[c]);
                         return ERROR;
                 } else {
@@ -420,7 +420,7 @@ validate_arguments ()
                 timeout_interval = (int)max_seconds;
 
         for (i=0; i<n_addresses; i++) {
-                if (is_host(addresses[i]) == FALSE)
+                if (!is_host(addresses[i]))
                         usage2 (_("Invalid hostname/address"), addresses[i]);
         }
 
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index c17c699..1fcbd98 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -14,6 +14,9 @@
 * defaults to number of processes.  Search filters can be applied to limit
 * the processes to check.
 *
+* The parent process, check_procs itself and any child process of 
+* check_procs (ps) are excluded from any checks to prevent false positives.
+*
 *
 * 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
@@ -153,7 +156,7 @@ main (int argc, char **argv)
         int expected_cols = PS_COLS - 1;
         int warn = 0; /* number of processes in warn state */
         int crit = 0; /* number of processes in crit state */
-        int i = 0, j = 0;
+        int i = 0;
         int result = STATE_UNKNOWN;
         int ret = 0;
         output chld_out, chld_err;
@@ -207,7 +210,7 @@ main (int argc, char **argv)
         }
 
         /* flush first line: j starts at 1 */
-        for (j = 1; j < chld_out.lines; j++) {
+        for (size_t j = 1; j < chld_out.lines; j++) {
                 input_line = chld_out.line[j];
 
                 if (verbose >= 3)
@@ -241,8 +244,9 @@ main (int argc, char **argv)
 
                         /* Ignore self */
                         if ((usepid && mypid == procpid) ||
-                                (!usepid && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino) ||
-                                 (ret == -1 && errno == ENOENT))) {
+                                ( ((!usepid) && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino)) ||
+                                 (ret == -1 && errno == ENOENT))
+                                ) {
                                 if (verbose >= 3)
                                          printf("not considering - is myself or gone\n");
                                 continue;
@@ -254,6 +258,13 @@ main (int argc, char **argv)
                                 continue;
                         }
 
+                        /* Ignore our own children */
+                        if (procppid == mypid) {
+                                if (verbose >= 3)
+                                         printf("not considering - is our child\n");
+                                continue;
+                        }
+
                         /* Ignore excluded processes by name */
                         if(options & EXCLUDE_PROGS) {
                           int found = 0;
@@ -727,18 +738,23 @@ convert_to_seconds(char *etime) {
 void
 print_help (void)
 {
-        print_revision (progname, NP_VERSION);
+  print_revision (progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
+  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+  printf (COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("Checks all processes and generates WARNING or CRITICAL states if the specified"));
+  printf ("%s\n", _("Checks all processes and generates WARNING or CRITICAL states if the specified"));
   printf ("%s\n", _("metric is outside the required threshold ranges. The metric defaults to number"));
   printf ("%s\n", _("of processes.  Search filters can be applied to limit the processes to check."));
 
   printf ("\n\n");
 
-        print_usage ();
+  printf ("%s\n", _("The parent process, check_procs itself and any child process of check_procs (ps)"));
+  printf ("%s\n", _("are excluded from any checks to prevent false positives."));
+
+  printf ("\n\n");
+
+  print_usage ();
 
   printf (UT_HELP_VRSN);
   printf (UT_EXTRA_OPTS);
@@ -754,11 +770,11 @@ print_help (void)
   printf ("  %s\n", _("CPU     - percentage CPU"));
 /* only linux etime is support currently */
 #if defined( __linux__ )
-        printf ("  %s\n", _("ELAPSED - time elapsed in seconds"));
+  printf ("  %s\n", _("ELAPSED - time elapsed in seconds"));
 #endif /* defined(__linux__) */
-        printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+  printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (" %s\n", "-v, --verbose");
+  printf (" %s\n", "-v, --verbose");
   printf ("    %s\n", _("Extra information. Up to 3 verbosity levels"));
 
   printf (" %s\n", "-T, --traditional");
@@ -776,7 +792,7 @@ print_help (void)
   printf ("   %s\n", _("Only scan for processes with VSZ higher than indicated."));
   printf (" %s\n", "-r, --rss=RSS");
   printf ("   %s\n", _("Only scan for processes with RSS higher than indicated."));
-        printf (" %s\n", "-P, --pcpu=PCPU");
+  printf (" %s\n", "-P, --pcpu=PCPU");
   printf ("   %s\n", _("Only scan for processes with PCPU higher than indicated."));
   printf (" %s\n", "-u, --user=USER");
   printf ("   %s\n", _("Only scan for processes with user name or ID indicated."));
@@ -791,19 +807,19 @@ print_help (void)
   printf (" %s\n", "-k, --no-kthreads");
   printf ("   %s\n", _("Only scan for non kernel threads (works on Linux only)."));
 
-        printf(_("\n\
+  printf(_("\n\
 RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n\
 specified 'max:min', a warning status will be generated if the\n\
 count is inside the specified range\n\n"));
 
-        printf(_("\
+  printf(_("\
 This plugin checks the number of currently running processes and\n\
 generates WARNING or CRITICAL states if the process count is outside\n\
 the specified threshold ranges. The process count can be filtered by\n\
 process owner, parent process PID, current state (e.g., 'Z'), or may\n\
 be the total number of running processes\n\n"));
 
-        printf ("%s\n", _("Examples:"));
+  printf ("%s\n", _("Examples:"));
   printf (" %s\n", "check_procs -w 2:2 -c 2:1024 -C portsentry");
   printf ("  %s\n", _("Warning if not two processes with command name portsentry."));
   printf ("  %s\n\n", _("Critical if < 2 or > 1024 processes"));
@@ -820,14 +836,14 @@ be the total number of running processes\n\n"));
   printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
   printf ("  %s\n", _("Alert if CPU of any processes over 10\% or 20\%"));
 
-        printf (UT_SUPPORT);
+  printf (UT_SUPPORT);
 }
 
 void
 print_usage (void)
 {
   printf ("%s\n", _("Usage:"));
-        printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname);
+  printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname);
   printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n");
   printf (" [-C command] [-X process_to_exclude] [-k] [-t timeout] [-v]\n");
 }
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index b1b4938..6b32710 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -93,7 +93,7 @@ char *expect = NULL;
 char *config_file = NULL;
 unsigned short port = PW_AUTH_UDP_PORT;
 int retries = 1;
-int verbose = FALSE;
+bool verbose = false;
 
 /******************************************************************************
 
@@ -272,10 +272,10 @@ process_arguments (int argc, char **argv)
                         print_revision (progname, NP_VERSION);
                         exit (STATE_UNKNOWN);
                 case 'v':                                                                       /* verbose mode */
-                        verbose = TRUE;
+                        verbose = true;
                         break;
                 case 'H':                                                                       /* hostname */
-                        if (is_host (optarg) == FALSE) {
+                        if (!is_host (optarg)) {
                                 usage2 (_("Invalid hostname/address"), optarg);
                         }
                         server = optarg;
diff --git a/plugins/check_real.c b/plugins/check_real.c
index fbdb70f..15e035b 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -54,10 +54,10 @@ char *host_name;
 char *server_url = NULL;
 char *server_expect;
 int warning_time = 0;
-int check_warning_time = FALSE;
+bool check_warning_time = false;
 int critical_time = 0;
-int check_critical_time = FALSE;
-int verbose = FALSE;
+bool check_critical_time = false;
+bool verbose = false;
 
 
 
@@ -238,9 +238,9 @@ main (int argc, char **argv)
         /* Return results */
         if (result == STATE_OK) {
 
-                if (check_critical_time == TRUE
+                if (check_critical_time
                                 && (end_time - start_time) > critical_time) result = STATE_CRITICAL;
-                else if (check_warning_time == TRUE
+                else if (check_warning_time
                                                  && (end_time - start_time) > warning_time) result =
                                 STATE_WARNING;
 
@@ -331,7 +331,7 @@ process_arguments (int argc, char **argv)
                 case 'w':                                                                       /* warning time threshold */
                         if (is_intnonneg (optarg)) {
                                 warning_time = atoi (optarg);
-                                check_warning_time = TRUE;
+                                check_warning_time = true;
                         }
                         else {
                                 usage4 (_("Warning time must be a positive integer"));
@@ -340,14 +340,14 @@ process_arguments (int argc, char **argv)
                 case 'c':                                                                       /* critical time threshold */
                         if (is_intnonneg (optarg)) {
                                 critical_time = atoi (optarg);
-                                check_critical_time = TRUE;
+                                check_critical_time = true;
                         }
                         else {
                                 usage4 (_("Critical time must be a positive integer"));
                         }
                         break;
                 case 'v':                                                                       /* verbose */
-                        verbose = TRUE;
+                        verbose = true;
                         break;
                 case 't':                                                                       /* timeout */
                         if (is_intnonneg (optarg)) {
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index fc0ae2c..986c3e1 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -40,7 +40,7 @@ const char *email = "devel@monitoring-plugins.org";
 #include <ctype.h>
 
 #ifdef HAVE_SSL
-int check_cert = FALSE;
+bool check_cert = false;
 int days_till_exp_warn, days_till_exp_crit;
 #  define my_recv(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
 #  define my_send(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
@@ -100,17 +100,17 @@ char *authtype = NULL;
 char *authuser = NULL;
 char *authpass = NULL;
 double warning_time = 0;
-int check_warning_time = FALSE;
+bool check_warning_time = false;
 double critical_time = 0;
-int check_critical_time = FALSE;
+bool check_critical_time = false;
 int verbose = 0;
-int use_ssl = FALSE;
-int use_starttls = FALSE;
-int use_sni = FALSE;
-short use_proxy_prefix = FALSE;
-short use_ehlo = FALSE;
-short use_lhlo = FALSE;
-short ssl_established = 0;
+bool use_ssl = false;
+bool use_starttls = false;
+bool use_sni = false;
+bool use_proxy_prefix = false;
+bool use_ehlo = false;
+bool use_lhlo = false;
+bool ssl_established = false;
 char *localhostname = NULL;
 int sd;
 char buffer[MAX_INPUT_BUFFER];
@@ -118,13 +118,13 @@ enum {
   TCP_PROTOCOL = 1,
   UDP_PROTOCOL = 2,
 };
-int ignore_send_quit_failure = FALSE;
+bool ignore_send_quit_failure = false;
 
 
 int
 main (int argc, char **argv)
 {
-        short supports_tls=FALSE;
+        bool supports_tls = false;
         int n = 0;
         double elapsed_time;
         long microsec;
@@ -230,7 +230,7 @@ main (int argc, char **argv)
                 } else if(use_ehlo || use_lhlo){
                         if(strstr(buffer, "250 STARTTLS") != NULL ||
                            strstr(buffer, "250-STARTTLS") != NULL){
-                                supports_tls=TRUE;
+                                supports_tls=true;
                         }
                 }
 
@@ -466,7 +466,7 @@ main (int argc, char **argv)
                         fperfdata ("time", elapsed_time, "s",
                                 (int)check_warning_time, warning_time,
                                 (int)check_critical_time, critical_time,
-                                TRUE, 0, FALSE, 0));
+                                true, 0, false, 0));
 
         return result;
 }
@@ -480,6 +480,8 @@ process_arguments (int argc, char **argv)
         int c;
         char* temp;
 
+        bool implicit_tls = false;
+
         enum {
           SNI_OPTION
         };
@@ -560,7 +562,7 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'A':
                         authtype = optarg;
-                        use_ehlo = TRUE;
+                        use_ehlo = true;
                         break;
                 case 'U':
                         authuser = optarg;
@@ -600,7 +602,7 @@ process_arguments (int argc, char **argv)
                                 usage4 (_("Critical time must be a positive"));
                         else {
                                 critical_time = strtod (optarg, NULL);
-                                check_critical_time = TRUE;
+                                check_critical_time = true;
                         }
                         break;
                 case 'w':                                                                       /* warning time threshold */
@@ -608,14 +610,14 @@ process_arguments (int argc, char **argv)
                                 usage4 (_("Warning time must be a positive"));
                         else {
                                 warning_time = strtod (optarg, NULL);
-                                check_warning_time = TRUE;
+                                check_warning_time = true;
                         }
                         break;
                 case 'v':                                                                       /* verbose */
                         verbose++;
                         break;
                 case 'q':
-                        ignore_send_quit_failure++;             /* ignore problem sending QUIT */
+                        ignore_send_quit_failure = true;             /* ignore problem sending QUIT */
                         break;
                 case 't':                                                                       /* timeout */
                         if (is_intnonneg (optarg)) {
@@ -645,33 +647,35 @@ process_arguments (int argc, char **argv)
                                 usage2 ("Invalid certificate expiration period", optarg);
                             days_till_exp_warn = atoi (optarg);
                         }
-                        check_cert = TRUE;
-                        ignore_send_quit_failure = TRUE;
+                        check_cert = true;
+                        ignore_send_quit_failure = true;
 #else
                         usage (_("SSL support not available - install OpenSSL and recompile"));
 #endif
+                        implicit_tls = true;
+                        // fallthrough
                 case 's':
                 /* ssl */
-                        use_ssl = TRUE;
+                        use_ssl = true;
                         server_port = SMTPS_PORT;
                         break;
                 case 'S':
                 /* starttls */
-                        use_starttls = TRUE;
-                        use_ehlo = TRUE;
+                        use_starttls = true;
+                        use_ehlo = true;
                         break;
                 case SNI_OPTION:
 #ifdef HAVE_SSL
-                        use_sni = TRUE;
+                        use_sni = true;
 #else
                         usage (_("SSL support not available - install OpenSSL and recompile"));
 #endif
                         break;
                 case 'r':
-                        use_proxy_prefix = TRUE;
+                        use_proxy_prefix = true;
                         break;
                 case 'L':
-                        use_lhlo = TRUE;
+                        use_lhlo = true;
                         break;
                 case '4':
                         address_family = AF_INET;
@@ -717,7 +721,12 @@ process_arguments (int argc, char **argv)
                 from_arg = strdup(" ");
 
         if (use_starttls && use_ssl) {
-                usage4 (_("Set either -s/--ssl/--tls or -S/--starttls"));
+                if (implicit_tls) {
+                        use_ssl = false;
+                        server_port = SMTP_PORT;
+                } else {
+                        usage4 (_("Set either -s/--ssl/--tls or -S/--starttls"));
+                }
         }
 
         if (server_port_option != 0) {
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 56a586a..90a0402 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -55,8 +55,6 @@ const char *email = "devel@monitoring-plugins.org";
 #define CRIT_STRING 2
 #define CRIT_REGEX 4
 #define WARN_PRESENT 8
-#define WARN_STRING 16
-#define WARN_REGEX 32
 
 #define OID_COUNT_STEP 8
 
@@ -86,82 +84,82 @@ const char *email = "devel@monitoring-plugins.org";
 
 
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-char *thisarg (char *str);
-char *nextarg (char *str);
+static int process_arguments (int, char **);
+static int validate_arguments (void);
+static char *thisarg (char *str);
+static char *nextarg (char *str);
 void print_usage (void);
-void print_help (void);
-char *multiply (char *str);
+static void print_help (void);
+static char *multiply (char *str);
 
 #include "regex.h"
-char regex_expect[MAX_INPUT_BUFFER] = "";
-regex_t preg;
-regmatch_t pmatch[10];
-char errbuf[MAX_INPUT_BUFFER] = "";
-char perfstr[MAX_INPUT_BUFFER] = "| ";
-int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
-int eflags = 0;
-int errcode, excode;
-
-char *server_address = NULL;
-char *community = NULL;
-char **contextargs = NULL;
-char *context = NULL;
-char **authpriv = NULL;
-char *proto = NULL;
-char *seclevel = NULL;
-char *secname = NULL;
-char *authproto = NULL;
-char *privproto = NULL;
-char *authpasswd = NULL;
-char *privpasswd = NULL;
-int nulloid = STATE_UNKNOWN;
-char **oids = NULL;
-size_t oids_size = 0;
-char *label;
-char *units;
-char *port;
-char *snmpcmd;
-char string_value[MAX_INPUT_BUFFER] = "";
-int  invert_search=0;
-char **labels = NULL;
-char **unitv = NULL;
-size_t nlabels = 0;
-size_t labels_size = OID_COUNT_STEP;
-size_t nunits = 0;
-size_t unitv_size = OID_COUNT_STEP;
-int numoids = 0;
-int numauthpriv = 0;
-int numcontext = 0;
-int verbose = 0;
-int usesnmpgetnext = FALSE;
-char *warning_thresholds = NULL;
-char *critical_thresholds = NULL;
-thresholds **thlds;
-size_t thlds_size = OID_COUNT_STEP;
-double *response_value;
-size_t response_size = OID_COUNT_STEP;
-int retries = 0;
-int *eval_method;
-size_t eval_size = OID_COUNT_STEP;
-char *delimiter;
-char *output_delim;
-char *miblist = NULL;
-int needmibs = FALSE;
-int calculate_rate = 0;
-double offset = 0.0;
-int rate_multiplier = 1;
-state_data *previous_state;
-double *previous_value;
-size_t previous_size = OID_COUNT_STEP;
-int perf_labels = 1;
-char* ip_version = "";
-double multiplier = 1.0;
-char *fmtstr = "";
-bool fmtstr_set = false;
-char buffer[DEFAULT_BUFFER_SIZE];
-bool ignore_mib_parsing_errors = false;
+static char regex_expect[MAX_INPUT_BUFFER] = "";
+static regex_t preg;
+static regmatch_t pmatch[10];
+static char errbuf[MAX_INPUT_BUFFER] = "";
+static char perfstr[MAX_INPUT_BUFFER] = "| ";
+static int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+static int eflags = 0;
+static int errcode, excode;
+
+static char *server_address = NULL;
+static char *community = NULL;
+static char **contextargs = NULL;
+static char *context = NULL;
+static char **authpriv = NULL;
+static char *proto = NULL;
+static char *seclevel = NULL;
+static char *secname = NULL;
+static char *authproto = NULL;
+static char *privproto = NULL;
+static char *authpasswd = NULL;
+static char *privpasswd = NULL;
+static int nulloid = STATE_UNKNOWN;
+static char **oids = NULL;
+static size_t oids_size = 0;
+static char *label;
+static char *units;
+static char *port;
+static char *snmpcmd;
+static char string_value[MAX_INPUT_BUFFER] = "";
+static int  invert_search=0;
+static char **labels = NULL;
+static char **unitv = NULL;
+static size_t nlabels = 0;
+static size_t labels_size = OID_COUNT_STEP;
+static size_t nunits = 0;
+static size_t unitv_size = OID_COUNT_STEP;
+static size_t numoids = 0;
+static int numauthpriv = 0;
+static int numcontext = 0;
+static int verbose = 0;
+static bool usesnmpgetnext = false;
+static char *warning_thresholds = NULL;
+static char *critical_thresholds = NULL;
+static thresholds **thlds;
+static size_t thlds_size = OID_COUNT_STEP;
+static double *response_value;
+static size_t response_size = OID_COUNT_STEP;
+static int retries = 0;
+static int *eval_method;
+static size_t eval_size = OID_COUNT_STEP;
+static char *delimiter;
+static char *output_delim;
+static char *miblist = NULL;
+static bool needmibs = false;
+static int calculate_rate = 0;
+static double offset = 0.0;
+static int rate_multiplier = 1;
+static state_data *previous_state;
+static double *previous_value;
+static size_t previous_size = OID_COUNT_STEP;
+static int perf_labels = 1;
+static char* ip_version = "";
+static double multiplier = 1.0;
+static char *fmtstr = "";
+static bool fmtstr_set = false;
+static char buffer[DEFAULT_BUFFER_SIZE];
+static bool ignore_mib_parsing_errors = false;
 
 static char *fix_snmp_range(char *th)
 {
@@ -187,7 +185,8 @@ static char *fix_snmp_range(char *th)
 int
 main (int argc, char **argv)
 {
-        int i, len, line, total_oids;
+        int len, total_oids;
+        size_t line;
         unsigned int bk_count = 0, dq_count = 0;
         int iresult = STATE_UNKNOWN;
         int result = STATE_UNKNOWN;
@@ -253,14 +252,16 @@ main (int argc, char **argv)
         if(calculate_rate) {
                 if (!strcmp(label, "SNMP"))
                         label = strdup("SNMP RATE");
-                i=0;
+
+                size_t i = 0;
+
                 previous_state = np_state_read();
                 if(previous_state!=NULL) {
                         /* Split colon separated values */
                         previous_string = strdup((char *) previous_state->data);
                         while((ap = strsep(&previous_string, ":")) != NULL) {
                                 if(verbose>2)
-                                        printf("State for %d=%s\n", i, ap);
+                                        printf("State for %zd=%s\n", i, ap);
                                 while (i >= previous_size) {
                                         previous_size += OID_COUNT_STEP;
                                         previous_value = realloc(previous_value, previous_size * sizeof(*previous_value));
@@ -273,7 +274,7 @@ main (int argc, char **argv)
         /* Populate the thresholds */
         th_warn=warning_thresholds;
         th_crit=critical_thresholds;
-        for (i=0; i<numoids; i++) {
+        for (size_t i = 0; i < numoids; i++) {
                 char *w = th_warn ? strndup(th_warn, strcspn(th_warn, ",")) : NULL;
                 char *c = th_crit ? strndup(th_crit, strcspn(th_crit, ",")) : NULL;
                 /* translate "2:1" to "@1:2" for backwards compatibility */
@@ -302,7 +303,7 @@ main (int argc, char **argv)
         }
 
         /* Create the command array to execute */
-        if(usesnmpgetnext == TRUE) {
+        if(usesnmpgetnext) {
                 snmpcmd = strdup (PATH_TO_SNMPGETNEXT);
         }else{
                 snmpcmd = strdup (PATH_TO_SNMPGET);
@@ -333,11 +334,11 @@ main (int argc, char **argv)
         }
 
 
-        for (i = 0; i < numcontext; i++) {
+        for (int i = 0; i < numcontext; i++) {
                 command_line[index++] = contextargs[i];
         }
 
-        for (i = 0; i < numauthpriv; i++) {
+        for (int i = 0; i < numauthpriv; i++) {
                 command_line[index++] = authpriv[i];
         }
 
@@ -348,7 +349,7 @@ main (int argc, char **argv)
          server_address,
          port);
 
-        for (i = 0; i < numoids; i++) {
+        for (size_t i = 0; i < numoids; i++) {
                 command_line[index++] = oids[i];
                 xasprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);
         }
@@ -382,7 +383,7 @@ main (int argc, char **argv)
         if (external_error) {
                 if (chld_err.lines > 0) {
                         printf (_("External command error: %s\n"), chld_err.line[0]);
-                        for (i = 1; i < chld_err.lines; i++) {
+                        for (size_t i = 1; i < chld_err.lines; i++) {
                                 printf ("%s\n", chld_err.line[i]);
                         }
                 } else {
@@ -392,12 +393,14 @@ main (int argc, char **argv)
         }
 
         if (verbose) {
-                for (i = 0; i < chld_out.lines; i++) {
+                for (size_t i = 0; i < chld_out.lines; i++) {
                         printf ("%s\n", chld_out.line[i]);
                 }
         }
 
-        for (line=0, i=0; line < chld_out.lines && i < numoids ; line++, i++) {
+        line = 0;
+        total_oids = 0;
+        for (size_t i = 0; line < chld_out.lines && i < numoids ; line++, i++, total_oids++) {
                 if(calculate_rate)
                         conv = "%.10g";
                 else
@@ -410,7 +413,7 @@ main (int argc, char **argv)
                         break;
 
                 if (verbose > 2) {
-                        printf("Processing oid %i (line %i)\n  oidname: %s\n  response: %s\n", i+1, line+1, oidname, response);
+                        printf("Processing oid %zi (line %zi)\n  oidname: %s\n  response: %s\n", i+1, line+1, oidname, response);
                 }
 
                 /* Clean up type array - Sol10 does not necessarily zero it out */
@@ -634,7 +637,6 @@ main (int argc, char **argv)
                         strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
                 }
         }
-        total_oids=i;
 
         /* Save state data, as all data collected now */
         if(calculate_rate) {
@@ -644,7 +646,7 @@ main (int argc, char **argv)
                         die(STATE_UNKNOWN, _("Cannot malloc"));
 
                 current_length=0;
-                for(i=0; i<total_oids; i++) {
+                for(int i = 0; i < total_oids; i++) {
                         xasprintf(&temp_string,"%.0f",response_value[i]);
                         if(temp_string==NULL)
                                 die(STATE_UNKNOWN,_("Cannot asprintf()"));
@@ -687,7 +689,7 @@ process_arguments (int argc, char **argv)
 {
         char *ptr;
         int c = 1;
-        int j = 0, jj = 0, ii = 0;
+        size_t j = 0, jj = 0;
 
         int option = 0;
         static struct option longopts[] = {
@@ -777,7 +779,7 @@ process_arguments (int argc, char **argv)
                         miblist = optarg;
                         break;
                 case 'n':       /* usesnmpgetnext */
-                        usesnmpgetnext = TRUE;
+                        usesnmpgetnext = true;
                         break;
                 case 'P':       /* SNMP protocol version */
                         proto = optarg;
@@ -831,7 +833,7 @@ process_arguments (int argc, char **argv)
                                          * so we have a mib variable, rather than just an SNMP OID,
                                          * so we have to actually read the mib files
                                          */
-                                        needmibs = TRUE;
+                                        needmibs = true;
                         }
                         for (ptr = strtok(optarg, ", "); ptr != NULL; ptr = strtok(NULL, ", "), j++) {
                                 while (j >= oids_size) {
@@ -843,7 +845,6 @@ process_arguments (int argc, char **argv)
                         numoids = j;
                         if (c == 'E' || c == 'e') {
                                 jj++;
-                                ii++;
                                 while (j+1 >= eval_size) {
                                         eval_size += OID_COUNT_STEP;
                                         eval_method = realloc(eval_method, eval_size * sizeof(*eval_method));
@@ -870,7 +871,6 @@ process_arguments (int argc, char **argv)
                                 memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8);
                         }
                         eval_method[jj++] = CRIT_STRING;
-                        ii++;
                         break;
                 case 'R':                                                                       /* regex */
                         cflags = REG_ICASE;
@@ -891,7 +891,6 @@ process_arguments (int argc, char **argv)
                                 memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8);
                         }
                         eval_method[jj++] = CRIT_REGEX;
-                        ii++;
                         break;
 
         /* Format */
@@ -1029,12 +1028,12 @@ selected.</para>
 
 
 
-int
+static int
 validate_arguments ()
 {
         /* check whether to load locally installed MIBS (CPU/disk intensive) */
         if (miblist == NULL) {
-                if ( needmibs == TRUE ) {
+                if (needmibs) {
                         miblist = strdup (DEFAULT_MIBLIST);
                 }else{
                         miblist = "";                   /* don't read any mib files for numeric oids */
@@ -1138,7 +1137,7 @@ validate_arguments ()
 /* trim leading whitespace
          if there is a leading quote, make sure it balances */
 
-char *
+static char *
 thisarg (char *str)
 {
         str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
@@ -1155,7 +1154,7 @@ thisarg (char *str)
          set the trailing quote to '\x0'
          if the string continues, advance beyond the comma */
 
-char *
+static char *
 nextarg (char *str)
 {
         if (str[0] == '\'') {
@@ -1187,7 +1186,7 @@ nextarg (char *str)
 
 
 /* multiply result (values 0 < n < 1 work as divider) */
-char *
+static char *
 multiply (char *str)
 {
         char *endptr;
@@ -1224,7 +1223,7 @@ multiply (char *str)
 }
 
 
-void
+static void
 print_help (void)
 {
         print_revision (progname, NP_VERSION);
@@ -1252,10 +1251,12 @@ print_help (void)
         printf ("    %s\n", _("SNMPv3 context"));
         printf (" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
         printf ("    %s\n", _("SNMPv3 securityLevel"));
-        printf (" %s\n", "-a, --authproto=[MD5|SHA]");
-        printf ("    %s\n", _("SNMPv3 auth proto"));
-        printf (" %s\n", "-x, --privproto=[DES|AES]");
-        printf ("    %s\n", _("SNMPv3 priv proto (default DES)"));
+        printf (" %s\n", "-a, --authproto=AUTHENTICATION_PROTOCOL");
+        printf ("    %s\n", _("SNMPv3 authentication protocol (default MD5), available options depend on the specific version of the net-snmp tools"));
+        printf ("    %s\n", _("if < 5.8 SHA (1) and MD5 should be available, if >= 5.8 additionally SHA-224, SHA-256, SHA-384 and SHA-512"));
+        printf (" %s\n", "-x, --privproto=PRIVACY_PROTOCOL");
+        printf ("    %s\n", _("SNMPv3 privacy protocol (default DES), available options depend on the specific version of the net-snmp tools"));
+        printf ("    %s\n", _("if < 5.8 DES and AES should be available, if >= 5.8 additionally AES-192 and AES-256"));
 
         /* Authentication Tokens*/
         printf (" %s\n", "-C, --community=STRING");
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 8ccbd5a..34ef37b 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -1,39 +1,39 @@
 /*****************************************************************************
-* 
+*
 * Monitoring check_ssh plugin
-* 
+*
 * License: GPL
 * Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
+*
 * Description:
-* 
+*
 * This file contains the check_ssh plugin
-* 
+*
 * Try to connect to an SSH server at specified server and port
-* 
-* 
+*
+*
 * 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 of the License, 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/>.
-* 
-* 
+*
+*
 *****************************************************************************/
 
 const char *progname = "check_ssh";
 const char *copyright = "2000-2007";
 const char *email = "devel@monitoring-plugins.org";
 
-#include "common.h"
-#include "netutils.h"
+#include "./common.h"
+#include "./netutils.h"
 #include "utils.h"
 
 #ifndef MSG_DONTWAIT
@@ -47,7 +47,7 @@ int port = -1;
 char *server_name = NULL;
 char *remote_version = NULL;
 char *remote_protocol = NULL;
-int verbose = FALSE;
+bool verbose = false;
 
 int process_arguments (int, char **);
 int validate_arguments (void);
@@ -57,7 +57,6 @@ void print_usage (void);
 int ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol);
 
 
-
 int
 main (int argc, char **argv)
 {
@@ -106,7 +105,7 @@ process_arguments (int argc, char **argv)
                 {"timeout", required_argument, 0, 't'},
                 {"verbose", no_argument, 0, 'v'},
                 {"remote-version", required_argument, 0, 'r'},
-                {"remote-protcol", required_argument, 0, 'P'},
+                {"remote-protocol", required_argument, 0, 'P'},
                 {0, 0, 0, 0}
         };
 
@@ -133,7 +132,7 @@ process_arguments (int argc, char **argv)
                         print_help ();
                         exit (STATE_UNKNOWN);
                 case 'v':                                                                       /* verbose */
-                        verbose = TRUE;
+                        verbose = true;
                         break;
                 case 't':                                                                       /* timeout period */
                         if (!is_integer (optarg))
@@ -158,7 +157,7 @@ process_arguments (int argc, char **argv)
                         remote_protocol = optarg;
                         break;
                 case 'H':                                                                       /* host */
-                        if (is_host (optarg) == FALSE)
+                        if (!is_host (optarg))
                                 usage2 (_("Invalid hostname/address"), optarg);
                         server_name = optarg;
                         break;
@@ -215,7 +214,9 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol
 {
         int sd;
         int result;
-        char *output = NULL;
+        int len = 0;
+        ssize_t recv_ret = 0;
+        char *version_control_string = NULL;
         char *buffer = NULL;
         char *ssh_proto = NULL;
         char *ssh_server = NULL;
@@ -230,52 +231,126 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol
         if (result != STATE_OK)
                 return result;
 
-        output = (char *) malloc (BUFF_SZ + 1);
-        memset (output, 0, BUFF_SZ + 1);
-        recv (sd, output, BUFF_SZ, 0);
-        if (strncmp (output, "SSH", 3)) {
-                printf (_("Server answer: %s"), output);
-                close(sd);
+        char *output = (char *) calloc (BUFF_SZ + 1, sizeof(char));
+
+        unsigned int iteration = 0;
+        ssize_t byte_offset = 0;
+
+        while ((version_control_string == NULL) && (recv_ret = recv(sd, output+byte_offset, BUFF_SZ - byte_offset, 0) > 0)) {
+
+                if (strchr(output, '\n')) { /* we've got at least one full line, start parsing*/
+                        byte_offset = 0;
+
+                        char *index = NULL;
+                        while ((index = strchr(output+byte_offset, '\n')) != NULL) {
+                                /*Partition the buffer so that this line is a separate string,
+                                 * by replacing the newline with NUL*/
+                                output[(index - output)] = '\0';
+                                len = strlen(output + byte_offset);
+
+                                if ((len >= 4) && (strncmp (output+byte_offset, "SSH-", 4) == 0)) {
+                                        /*if the string starts with SSH-, this _should_ be a valid version control string*/
+                                                version_control_string = output+byte_offset;
+                                                break;
+                                }
+
+                                /*the start of the next line (if one exists) will be after the current one (+ NUL)*/
+                                byte_offset += (len + 1);
+                        }
+
+                        if(version_control_string == NULL) {
+                                /* move unconsumed data to beginning of buffer, null rest */
+                                memmove((void *)output, (void *)output+byte_offset+1, BUFF_SZ - len+1);
+                                memset(output+byte_offset+1, 0, BUFF_SZ-byte_offset+1);
+
+                                /*start reading from end of current line chunk on next recv*/
+                                byte_offset = strlen(output);
+                        }
+                } else {
+                        byte_offset += recv_ret;
+                }
+        }
+
+        if (recv_ret < 0) {
+                printf("SSH CRITICAL - %s", strerror(errno));
+                exit(STATE_CRITICAL);
+        }
+
+        if (version_control_string == NULL) {
+                printf("SSH CRITICAL - No version control string received");
+                exit(STATE_CRITICAL);
+        }
+        /*
+         * "When the connection has been established, both sides MUST send an
+         * identification string.  This identification string MUST be
+         *
+         * SSH-protoversion-softwareversion SP comments CR LF"
+         *              - RFC 4253:4.2
+         */
+        strip (version_control_string);
+        if (verbose)
+                printf ("%s\n", version_control_string);
+        ssh_proto = version_control_string + 4;
+
+        /*
+         * We assume the protoversion is of the form Major.Minor, although
+         * this is not _strictly_ required. See
+         *
+         * "Both the 'protoversion' and 'softwareversion' strings MUST consist of
+         * printable US-ASCII characters, with the exception of whitespace
+         * characters and the minus sign (-)"
+         *              - RFC 4253:4.2
+         * and,
+         *
+         * "As stated earlier, the 'protoversion' specified for this protocol is
+         * "2.0".  Earlier versions of this protocol have not been formally
+         * documented, but it is widely known that they use 'protoversion' of
+         * "1.x" (e.g., "1.5" or "1.3")."
+         *              - RFC 4253:5
+         */
+        ssh_server = ssh_proto + strspn (ssh_proto, "0123456789.") + 1; /* (+1 for the '-' separating protoversion from softwareversion) */
+
+        /* If there's a space in the version string, whatever's after the space is a comment
+         * (which is NOT part of the server name/version)*/
+        char *tmp = strchr(ssh_server, ' ');
+        if (tmp) {
+                ssh_server[tmp - ssh_server] = '\0';
+        }
+        if (strlen(ssh_proto) == 0 || strlen(ssh_server) == 0) {
+                printf(_("SSH CRITICAL - Invalid protocol version control string %s\n"), version_control_string);
                 exit (STATE_CRITICAL);
         }
-        else {
-                strip (output);
-                if (verbose)
-                        printf ("%s\n", output);
-                ssh_proto = output + 4;
-                ssh_server = ssh_proto + strspn (ssh_proto, "-0123456789. ");
-                ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0;
-
-                xasprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no);
-                send (sd, buffer, strlen (buffer), MSG_DONTWAIT);
-                if (verbose)
-                        printf ("%s\n", buffer);
-
-                if (remote_version && strcmp(remote_version, ssh_server)) {
-                        printf
-                                (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"),
-                                 ssh_server, ssh_proto, remote_version);
-                        close(sd);
-                        exit (STATE_CRITICAL);
-                }
+        ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0;
 
-                if (remote_protocol && strcmp(remote_protocol, ssh_proto)) {
-                        printf
-                                (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"),
-                                 ssh_server, ssh_proto, remote_protocol);
-                        close(sd);
-                        exit (STATE_CRITICAL);
-                }
+        xasprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no);
+        send (sd, buffer, strlen (buffer), MSG_DONTWAIT);
+        if (verbose)
+                printf ("%s\n", buffer);
 
-                elapsed_time = (double)deltime(tv) / 1.0e6;
+        if (remote_version && strcmp(remote_version, ssh_server)) {
+                printf
+                        (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"),
+                         ssh_server, ssh_proto, remote_version);
+                close(sd);
+                exit (STATE_CRITICAL);
+        }
 
+        if (remote_protocol && strcmp(remote_protocol, ssh_proto)) {
                 printf
-                        (_("SSH OK - %s (protocol %s) | %s\n"),
-                         ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
-                         FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));
+                        (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s' | %s\n"),
+                         ssh_server, ssh_proto, remote_protocol, fperfdata("time", elapsed_time, "s",
+                         false, 0, false, 0, true, 0, true, (int)socket_timeout));
                 close(sd);
-                exit (STATE_OK);
+                exit (STATE_CRITICAL);
         }
+        elapsed_time = (double)deltime(tv) / 1.0e6;
+
+        printf
+                (_("SSH OK - %s (protocol %s) | %s\n"),
+                 ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
+                         false, 0, false, 0, true, 0, true, (int)socket_timeout));
+        close(sd);
+        exit (STATE_OK);
 }
 
 
@@ -293,7 +368,7 @@ print_help (void)
 
         printf ("%s\n", _("Try to connect to an SSH server at specified server and port"));
 
-  printf ("\n\n");
+        printf ("\n\n");
 
         print_usage ();
 
@@ -307,10 +382,10 @@ print_help (void)
         printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf (" %s\n", "-r, --remote-version=STRING");
-  printf ("    %s\n", _("Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
+        printf ("    %s\n", _("Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
 
         printf (" %s\n", "-P, --remote-protocol=STRING");
-  printf ("    %s\n", _("Alert if protocol doesn't match expected protocol version (ex: 2.0)"));
+        printf ("    %s\n", _("Alert if protocol doesn't match expected protocol version (ex: 2.0)"));
 
         printf (UT_VERBOSE);
 
@@ -322,7 +397,7 @@ print_help (void)
 void
 print_usage (void)
 {
-  printf ("%s\n", _("Usage:"));
+        printf ("%s\n", _("Usage:"));
         printf ("%s  [-4|-6] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
 }
 
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index cd965e3..e7ee785 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -4,7 +4,7 @@
 *
 * License: GPL
 * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
+* Copyright (c) 2000-2024 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -28,7 +28,7 @@
 *****************************************************************************/
 
 const char *progname = "check_swap";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -52,9 +52,9 @@ const char *email = "devel@monitoring-plugins.org";
 #endif
 
 typedef struct {
-        int is_percentage;
+        bool is_percentage;
         uint64_t value;
-} threshold_t;
+} threshold;
 
 int check_swap (float free_swap_mb, float total_swap_mb);
 int process_arguments (int argc, char **argv);
@@ -62,10 +62,10 @@ int validate_arguments (void);
 void print_usage (void);
 void print_help (void);
 
-threshold_t warn;
-threshold_t crit;
+threshold warn;
+threshold crit;
 int verbose;
-int allswaps;
+bool allswaps = false;
 int no_swap_state = STATE_CRITICAL;
 
 int
@@ -383,10 +383,10 @@ main (int argc, char **argv)
         if (crit.is_percentage) crit_print = crit.value * (total_swap_mb *1024 *1024/100);
 
         puts (perfdata_uint64 ("swap", free_swap_mb *1024 *1024, "B",
-                        TRUE, warn_print,
-                        TRUE, crit_print,
-                        TRUE, 0,
-                        TRUE, (long) total_swap_mb * 1024 * 1024));
+                        true, warn_print,
+                        true, crit_print,
+                        true, 0,
+                        true, (long) total_swap_mb * 1024 * 1024));
 
         return result;
 }
@@ -399,28 +399,30 @@ check_swap(float free_swap_mb, float total_swap_mb)
         if (!total_swap_mb) return no_swap_state;
 
         uint64_t free_swap = free_swap_mb * (1024 * 1024);              /* Convert back to bytes as warn and crit specified in bytes */
-
-        if (!crit.is_percentage && crit.value >= free_swap) return STATE_CRITICAL;
-        if (!warn.is_percentage && warn.value >= free_swap) return STATE_WARNING;
-
-
         uint64_t usage_percentage = ((total_swap_mb - free_swap_mb) / total_swap_mb) * 100;
 
-        if (crit.is_percentage &&
-                        crit.value != 0 &&
-                        usage_percentage >= (100 - crit.value))
-        {
-                        return STATE_CRITICAL;
-        }
-
-        if (warn.is_percentage &&
-                        warn.value != 0 &&
-                        usage_percentage >= (100 - warn.value))
-        {
-                        return STATE_WARNING;
-        }
-
-        return STATE_OK;
+        if (warn.value || crit.value) {                                 /* Thresholds defined */
+                if (!crit.is_percentage && crit.value >= free_swap) return STATE_CRITICAL;
+                if (!warn.is_percentage && warn.value >= free_swap) return STATE_WARNING;
+
+                if (crit.is_percentage &&
+                                crit.value != 0 &&
+                                usage_percentage >= (100 - crit.value))
+                {
+                                return STATE_CRITICAL;
+                }
+
+                if (warn.is_percentage &&
+                                warn.value != 0 &&
+                                usage_percentage >= (100 - warn.value))
+                {
+                                return STATE_WARNING;
+                }
+
+                return STATE_OK;
+        } else {                                                        /* Without thresholds */
+                return STATE_OK;
+        }
 }
 
 
@@ -443,9 +445,6 @@ process_arguments (int argc, char **argv)
                 {0, 0, 0, 0}
         };
 
-        if (argc < 2)
-                return ERROR;
-
         while (1) {
                 c = getopt_long (argc, argv, "+?Vvhac:w:n:", longopts, &option);
 
@@ -465,7 +464,7 @@ process_arguments (int argc, char **argv)
 
                                 if (optarg[length - 1] == '%') {
                                         /* It's percentage */
-                                        warn.is_percentage = 1;
+                                        warn.is_percentage = true;
                                         optarg[length - 1] = '\0';
                                         if (is_uint64(optarg, &warn.value)) {
                                                 if (warn.value > 100) {
@@ -475,7 +474,7 @@ process_arguments (int argc, char **argv)
                                         break;
                                 } else {
                                         /* It's Bytes */
-                                        warn.is_percentage = 0;
+                                        warn.is_percentage = false;
                                         if (is_uint64(optarg, &warn.value)) {
                                                 break;
                                         } else {
@@ -495,7 +494,7 @@ process_arguments (int argc, char **argv)
 
                                 if (optarg[length - 1] == '%') {
                                         /* It's percentage */
-                                        crit.is_percentage = 1;
+                                        crit.is_percentage = true;
                                         optarg[length - 1] = '\0';
                                         if (is_uint64(optarg, &crit.value)) {
                                                 if (crit.value> 100) {
@@ -505,7 +504,7 @@ process_arguments (int argc, char **argv)
                                         break;
                                 } else {
                                         /* It's Bytes */
-                                        crit.is_percentage = 0;
+                                        crit.is_percentage = false;
                                         if (is_uint64(optarg, &crit.value)) {
                                                 break;
                                         } else {
@@ -514,7 +513,7 @@ process_arguments (int argc, char **argv)
                                 }
                           }
                 case 'a':                                                                       /* all swap */
-                        allswaps = TRUE;
+                        allswaps = true;
                         break;
                 case 'n':
                         if ((no_swap_state = mp_translate_state(optarg)) == ERROR) {
@@ -547,10 +546,7 @@ process_arguments (int argc, char **argv)
 int
 validate_arguments (void)
 {
-        if (warn.value == 0 && crit.value == 0) {
-                return ERROR;
-        }
-        else if ((warn.is_percentage == crit.is_percentage) && (warn.value < crit.value)) {
+        if ((warn.is_percentage == crit.is_percentage) && (warn.value < crit.value)) {
                 /* This is NOT triggered if warn and crit are different units, e.g warn is percentage
                  * and crit is absolute. We cannot determine the condition at this point since we
                  * dont know the value of total swap yet
@@ -595,6 +591,7 @@ print_help (void)
         printf ("\n");
         printf ("%s\n", _("Notes:"));
         printf (" %s\n", _("Both INTEGER and PERCENT thresholds can be specified, they are all checked."));
+        printf (" %s\n", _("Without thresholds, the plugin shows free swap space and performance data, but always returns OK."));
         printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
 
         printf (UT_SUPPORT);
@@ -605,6 +602,6 @@ void
 print_usage (void)
 {
         printf ("%s\n", _("Usage:"));
-        printf (" %s [-av] -w <percent_free>%% -c <percent_free>%%\n",progname);
-        printf ("  -w <bytes_free> -c <bytes_free> [-n <state>]\n");
+        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 1d307cf..01dd35e 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -41,7 +41,7 @@ const char *email = "devel@monitoring-plugins.org";
 #include <sys/select.h>
 
 #ifdef HAVE_SSL
-static int check_cert = FALSE;
+static bool check_cert = false;
 static int days_till_exp_warn, days_till_exp_crit;
 # define my_recv(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
 # define my_send(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
@@ -65,12 +65,12 @@ static int READ_TIMEOUT = 2;
 
 static int server_port = 0;
 static char *server_address = NULL;
-static int host_specified = FALSE;
+static bool host_specified = false;
 static char *server_send = NULL;
 static char *server_quit = NULL;
 static char **server_expect;
 static size_t server_expect_count = 0;
-static size_t maxbytes = 0;
+static ssize_t maxbytes = 0;
 static char **warn_codes = NULL;
 static size_t warn_codes_count = 0;
 static char **crit_codes = NULL;
@@ -88,7 +88,7 @@ static int match_flags = NP_MATCH_EXACT;
 
 #ifdef HAVE_SSL
 static char *sni = NULL;
-static int sni_specified = FALSE;
+static bool sni_specified = false;
 #endif
 
 #define FLAG_SSL 0x01
@@ -102,11 +102,9 @@ int
 main (int argc, char **argv)
 {
         int result = STATE_UNKNOWN;
-        int i;
         char *status = NULL;
         struct timeval tv;
         struct timeval timeout;
-        size_t len;
         int match = -1;
         fd_set rfds;
 
@@ -121,10 +119,10 @@ main (int argc, char **argv)
         if(progname != NULL) progname++;
         else progname = argv[0];
 
-        len = strlen(progname);
-        if(len > 6 && !memcmp(progname, "check_", 6)) {
+        size_t prog_name_len = strlen(progname);
+        if(prog_name_len > 6 && !memcmp(progname, "check_", 6)) {
                 SERVICE = strdup(progname + 6);
-                for(i = 0; i < len - 6; i++)
+                for(size_t i = 0; i < prog_name_len - 6; i++)
                         SERVICE[i] = toupper(SERVICE[i]);
         }
 
@@ -247,7 +245,7 @@ main (int argc, char **argv)
 #ifdef HAVE_SSL
         if (flags & FLAG_SSL){
                 result = np_net_ssl_init_with_hostname(sd, (sni_specified ? sni : NULL));
-                if (result == STATE_OK && check_cert == TRUE) {
+                if (result == STATE_OK && check_cert) {
                         result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
                 }
         }
@@ -275,19 +273,21 @@ main (int argc, char **argv)
                         printf("Quit string: %s\n", server_quit);
                 }
                 printf("server_expect_count: %d\n", (int)server_expect_count);
-                for(i = 0; i < server_expect_count; i++)
-                        printf("\t%d: %s\n", i, server_expect[i]);
+                for(size_t i = 0; i < server_expect_count; i++)
+                        printf("\t%zd: %s\n", i, server_expect[i]);
         }
 
         /* if(len) later on, we know we have a non-NULL response */
-        len = 0;
+        ssize_t len = 0;
+
         if (server_expect_count) {
+                ssize_t received = 0;
 
                 /* watch for the expect string */
-                while ((i = my_recv(buffer, sizeof(buffer))) > 0) {
-                        status = realloc(status, len + i + 1);
-                        memcpy(&status[len], buffer, i);
-                        len += i;
+                while ((received = my_recv(buffer, sizeof(buffer))) > 0) {
+                        status = realloc(status, len + received + 1);
+                        memcpy(&status[len], buffer, received);
+                        len += received;
                         status[len] = '\0';
 
                         /* stop reading if user-forced */
@@ -307,6 +307,7 @@ main (int argc, char **argv)
                         if(select(sd + 1, &rfds, NULL, NULL, &timeout) <= 0)
                                 break;
                 }
+
                 if (match == NP_MATCH_RETRY)
                         match = NP_MATCH_FAILURE;
 
@@ -378,18 +379,18 @@ main (int argc, char **argv)
         if(match == NP_MATCH_FAILURE)
                 printf ("|%s",
                                 fperfdata ("time", elapsed_time, "s",
-                                (flags & FLAG_TIME_WARN ? TRUE : FALSE), 0,
-                                (flags & FLAG_TIME_CRIT ? TRUE : FALSE), 0,
-                                TRUE, 0,
-                                TRUE, socket_timeout)
+                                (flags & FLAG_TIME_WARN ? true : false), 0,
+                                (flags & FLAG_TIME_CRIT ? true : false), 0,
+                                true, 0,
+                                true, socket_timeout)
                         );
         else
                 printf("|%s",
                                 fperfdata ("time", elapsed_time, "s",
-                                (flags & FLAG_TIME_WARN ? TRUE : FALSE), warning_time,
-                                (flags & FLAG_TIME_CRIT ? TRUE : FALSE), critical_time,
-                                TRUE, 0,
-                                TRUE, socket_timeout)
+                                (flags & FLAG_TIME_WARN ? true : false), warning_time,
+                                (flags & FLAG_TIME_CRIT ? true : false), critical_time,
+                                true, 0,
+                                true, socket_timeout)
                         );
 
         putchar('\n');
@@ -399,11 +400,9 @@ main (int argc, char **argv)
 
 
 /* process command-line arguments */
-static int
-process_arguments (int argc, char **argv)
-{
+static int process_arguments (int argc, char **argv) {
         int c;
-        int escape = 0;
+        bool escape = false;
         char *temp;
 
         enum {
@@ -492,7 +491,7 @@ process_arguments (int argc, char **argv)
 #endif
                         break;
                 case 'H':                 /* hostname */
-                        host_specified = TRUE;
+                        host_specified = true;
                         server_address = optarg;
                         break;
                 case 'c':                 /* critical */
@@ -527,7 +526,7 @@ process_arguments (int argc, char **argv)
                                 server_port = atoi (optarg);
                         break;
                 case 'E':
-                        escape = 1;
+                        escape = true;
                         break;
                 case 's':
                         if (escape)
@@ -601,7 +600,7 @@ process_arguments (int argc, char **argv)
                                 usage2 (_("Invalid certificate expiration period"), optarg);
                             days_till_exp_warn = atoi (optarg);
                         }
-                        check_cert = TRUE;
+                        check_cert = true;
                         flags |= FLAG_SSL;
                         break;
 #  endif /* USE_OPENSSL */
@@ -617,7 +616,7 @@ process_arguments (int argc, char **argv)
                 case SNI_OPTION:
 #ifdef HAVE_SSL
                         flags |= FLAG_SSL;
-                        sni_specified = TRUE;
+                        sni_specified = true;
                         sni = optarg;
 #else
                         die (STATE_UNKNOWN, _("Invalid option - SSL is not available"));
@@ -630,15 +629,15 @@ process_arguments (int argc, char **argv)
         }
 
         c = optind;
-        if(host_specified == FALSE && c < argc)
+        if(!host_specified && c < argc)
                 server_address = strdup (argv[c++]);
 
         if (server_address == NULL)
                 usage4 (_("You must provide a server address"));
-        else if (server_address[0] != '/' && is_host (server_address) == FALSE)
+        else if (server_address[0] != '/' && !is_host(server_address))
                 die (STATE_CRITICAL, "%s %s - %s: %s\n", SERVICE, state_text(STATE_CRITICAL), _("Invalid hostname, address or socket"), server_address);
 
-        return TRUE;
+        return OK;
 }
 
 
diff --git a/plugins/check_time.c b/plugins/check_time.c
index baf8c59..f50ea42 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -45,16 +45,16 @@ enum {
 uint32_t raw_server_time;
 unsigned long server_time, diff_time;
 int warning_time = 0;
-int check_warning_time = FALSE;
+bool check_warning_time = false;
 int critical_time = 0;
-int check_critical_time = FALSE;
+bool check_critical_time = false;
 unsigned long warning_diff = 0;
-int check_warning_diff = FALSE;
+bool check_warning_diff = false;
 unsigned long critical_diff = 0;
-int check_critical_diff = FALSE;
+bool check_critical_diff = false;
 int server_port = TIME_PORT;
 char *server_address = NULL;
-int use_udp = FALSE;
+bool use_udp = false;
 
 int process_arguments (int, char **);
 void print_help (void);
@@ -92,9 +92,9 @@ main (int argc, char **argv)
         }
 
         if (result != STATE_OK) {
-                if (check_critical_time == TRUE)
+                if (check_critical_time)
                         result = STATE_CRITICAL;
-                else if (check_warning_time == TRUE)
+                else if (check_warning_time)
                         result = STATE_WARNING;
                 else
                         result = STATE_UNKNOWN;
@@ -105,9 +105,9 @@ main (int argc, char **argv)
 
         if (use_udp) {
                 if (send (sd, "", 0, 0) < 0) {
-                        if (check_critical_time == TRUE)
+                        if (check_critical_time)
                                 result = STATE_CRITICAL;
-                        else if (check_warning_time == TRUE)
+                        else if (check_warning_time)
                                 result = STATE_WARNING;
                         else
                                 result = STATE_UNKNOWN;
@@ -129,9 +129,9 @@ main (int argc, char **argv)
 
         /* return a WARNING status if we couldn't read any data */
         if (result <= 0) {
-                if (check_critical_time == TRUE)
+                if (check_critical_time)
                         result = STATE_CRITICAL;
-                else if (check_warning_time == TRUE)
+                else if (check_warning_time)
                         result = STATE_WARNING;
                 else
                         result = STATE_UNKNOWN;
@@ -143,9 +143,9 @@ main (int argc, char **argv)
         result = STATE_OK;
 
         conntime = (end_time - start_time);
-        if (check_critical_time == TRUE && conntime > critical_time)
+        if (check_critical_time&& conntime > critical_time)
                 result = STATE_CRITICAL;
-        else if (check_warning_time == TRUE && conntime > warning_time)
+        else if (check_warning_time && conntime > warning_time)
                 result = STATE_WARNING;
 
         if (result != STATE_OK)
@@ -154,7 +154,7 @@ main (int argc, char **argv)
                      perfdata ("time", (long)conntime, "s",
                                check_warning_time, (long)warning_time,
                                check_critical_time, (long)critical_time,
-                               TRUE, 0, FALSE, 0));
+                               true, 0, false, 0));
 
         server_time = ntohl (raw_server_time) - UNIX_EPOCH;
         if (server_time > (unsigned long)end_time)
@@ -162,9 +162,9 @@ main (int argc, char **argv)
         else
                 diff_time = (unsigned long)end_time - server_time;
 
-        if (check_critical_diff == TRUE && diff_time > critical_diff)
+        if (check_critical_diff&& diff_time > critical_diff)
                 result = STATE_CRITICAL;
-        else if (check_warning_diff == TRUE && diff_time > warning_diff)
+        else if (check_warning_diff&& diff_time > warning_diff)
                 result = STATE_WARNING;
 
         printf (_("TIME %s - %lu second time difference|%s %s\n"),
@@ -172,11 +172,11 @@ main (int argc, char **argv)
                 perfdata ("time", (long)conntime, "s",
                           check_warning_time, (long)warning_time,
                           check_critical_time, (long)critical_time,
-                          TRUE, 0, FALSE, 0),
+                          true, 0, false, 0),
                 perfdata ("offset", diff_time, "s",
                           check_warning_diff, warning_diff,
                           check_critical_diff, critical_diff,
-                          TRUE, 0, FALSE, 0));
+                          true, 0, false, 0));
         return result;
 }
 
@@ -219,7 +219,7 @@ process_arguments (int argc, char **argv)
                         strcpy (argv[c], "-C");
         }
 
-        while (1) {
+        while (true) {
                 c = getopt_long (argc, argv, "hVH:w:c:W:C:p:t:u", longopts,
                                                                          &option);
 
@@ -236,19 +236,19 @@ process_arguments (int argc, char **argv)
                         print_revision (progname, NP_VERSION);
                         exit (STATE_UNKNOWN);
                 case 'H':                                                                       /* hostname */
-                        if (is_host (optarg) == FALSE)
+                        if (!is_host (optarg))
                                 usage2 (_("Invalid hostname/address"), optarg);
                         server_address = optarg;
                         break;
                 case 'w':                                                                       /* warning-variance */
                         if (is_intnonneg (optarg)) {
                                 warning_diff = strtoul (optarg, NULL, 10);
-                                check_warning_diff = TRUE;
+                                check_warning_diff = true;
                         }
                         else if (strspn (optarg, "0123456789:,") > 0) {
                                 if (sscanf (optarg, "%lu%*[:,]%d", &warning_diff, &warning_time) == 2) {
-                                        check_warning_diff = TRUE;
-                                        check_warning_time = TRUE;
+                                        check_warning_diff = true;
+                                        check_warning_time = true;
                                 }
                                 else {
                                         usage4 (_("Warning thresholds must be a positive integer"));
@@ -261,13 +261,13 @@ process_arguments (int argc, char **argv)
                 case 'c':                                                                       /* critical-variance */
                         if (is_intnonneg (optarg)) {
                                 critical_diff = strtoul (optarg, NULL, 10);
-                                check_critical_diff = TRUE;
+                                check_critical_diff = true;
                         }
                         else if (strspn (optarg, "0123456789:,") > 0) {
                                 if (sscanf (optarg, "%lu%*[:,]%d", &critical_diff, &critical_time) ==
                                                 2) {
-                                        check_critical_diff = TRUE;
-                                        check_critical_time = TRUE;
+                                        check_critical_diff = true;
+                                        check_critical_time = true;
                                 }
                                 else {
                                         usage4 (_("Critical thresholds must be a positive integer"));
@@ -282,14 +282,14 @@ process_arguments (int argc, char **argv)
                                 usage4 (_("Warning threshold must be a positive integer"));
                         else
                                 warning_time = atoi (optarg);
-                        check_warning_time = TRUE;
+                        check_warning_time = true;
                         break;
                 case 'C':                                                                       /* critical-connect */
                         if (!is_intnonneg (optarg))
                                 usage4 (_("Critical threshold must be a positive integer"));
                         else
                                 critical_time = atoi (optarg);
-                        check_critical_time = TRUE;
+                        check_critical_time = true;
                         break;
                 case 'p':                                                                       /* port */
                         if (!is_intnonneg (optarg))
@@ -304,14 +304,14 @@ process_arguments (int argc, char **argv)
                                 socket_timeout = atoi (optarg);
                         break;
                 case 'u':                                                                       /* udp */
-                        use_udp = TRUE;
+                        use_udp = true;
                 }
         }
 
         c = optind;
         if (server_address == NULL) {
                 if (argc > c) {
-                        if (is_host (argv[c]) == FALSE)
+                        if (!is_host (argv[c]))
                                 usage2 (_("Invalid hostname/address"), optarg);
                         server_address = argv[c];
                 }
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 68737c4..380ff3b 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -1,665 +1,746 @@
 /*****************************************************************************
-* 
-* 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 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* 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.
-* 
-* 
-* 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 of the License, 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/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * 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-2023 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * 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.
+ *
+ *
+ * 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 of the License, 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/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_ups";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2023";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
 
-enum {
-        PORT = 3493
-};
-
-#define CHECK_NONE       0
-
-#define UPS_NONE     0   /* no supported options */
-#define UPS_UTILITY  1   /* supports utility line voltage */
-#define UPS_BATTPCT  2   /* supports percent battery remaining */
-#define UPS_STATUS   4   /* supports UPS status */
-#define UPS_TEMP     8   /* supports UPS temperature */
-#define UPS_LOADPCT     16   /* supports load percent */
-
-#define UPSSTATUS_NONE       0
-#define UPSSTATUS_OFF        1
-#define UPSSTATUS_OL         2
-#define UPSSTATUS_OB         4
-#define UPSSTATUS_LB         8
-#define UPSSTATUS_CAL       16
-#define UPSSTATUS_RB        32  /*Replace Battery */
-#define UPSSTATUS_BYPASS    64
-#define UPSSTATUS_OVER     128
-#define UPSSTATUS_TRIM     256
-#define UPSSTATUS_BOOST    512
+enum { PORT = 3493 };
+
+#define UPS_NONE      0  /* no supported options */
+#define UPS_UTILITY   1  /* supports utility line    */
+#define UPS_BATTPCT   2  /* supports percent battery remaining */
+#define UPS_STATUS    4  /* supports UPS status */
+#define UPS_TEMP      8  /* supports UPS temperature */
+#define UPS_LOADPCT   16 /* supports load percent */
+#define UPS_REALPOWER 32 /* supports real power */
+
+#define UPSSTATUS_NONE    0
+#define UPSSTATUS_OFF     1
+#define UPSSTATUS_OL      2
+#define UPSSTATUS_OB      4
+#define UPSSTATUS_LB      8
+#define UPSSTATUS_CAL     16
+#define UPSSTATUS_RB      32 /*Replace Battery */
+#define UPSSTATUS_BYPASS  64
+#define UPSSTATUS_OVER    128
+#define UPSSTATUS_TRIM    256
+#define UPSSTATUS_BOOST   512
 #define UPSSTATUS_CHRG    1024
 #define UPSSTATUS_DISCHRG 2048
-#define UPSSTATUS_UNKNOWN  4096
-
-enum { NOSUCHVAR = ERROR-1 };
-
-int server_port = PORT;
-char *server_address;
-char *ups_name = NULL;
-double warning_value = 0.0;
-double critical_value = 0.0;
-int check_warn = FALSE;
-int check_crit = FALSE;
-int check_variable = UPS_NONE;
-int supported_options = UPS_NONE;
-int status = UPSSTATUS_NONE;
-
-double ups_utility_voltage = 0.0;
-double ups_battery_percent = 0.0;
-double ups_load_percent = 0.0;
-double ups_temperature = 0.0;
-char *ups_status;
-int temp_output_c = 0;
-
-int determine_status (void);
-int get_ups_variable (const char *, char *);
-
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-
-int
-main (int argc, char **argv)
-{
-        int result = STATE_UNKNOWN;
-        char *message;
+#define UPSSTATUS_UNKNOWN 4096
+#define UPSSTATUS_ALARM   8192
+
+enum { NOSUCHVAR = ERROR - 1 };
+
+typedef struct ups_config {
+        unsigned int server_port;
+        char *server_address;
+        char *ups_name;
+        double warning_value;
+        double critical_value;
+        bool check_warn;
+        bool check_crit;
+        int check_variable;
+        int status;
+        bool temp_output_c;
+} ups_config;
+
+ups_config ups_config_init(void) {
+        ups_config tmp = {0};
+        tmp.server_port = PORT;
+        tmp.server_address = NULL;
+        tmp.ups_name = NULL;
+        tmp.check_variable = UPS_NONE;
+        tmp.status = UPSSTATUS_NONE;
+
+        return tmp;
+}
+
+// Forward declarations
+int determine_status(ups_config *, int *supported_options);
+int get_ups_variable(const char *, char *, const ups_config config);
+
+int process_arguments(int, char **, ups_config *);
+int validate_arguments(ups_config);
+void print_help(void);
+void print_usage(void);
+
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        char *ups_status;
+        ups_status = strdup("N/A");
+
         char *data;
-        char *tunits;
-        char temp_buffer[MAX_INPUT_BUFFER];
-        double ups_utility_deviation = 0.0;
-        int res;
+        data = strdup("");
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        char *message;
+        message = strdup("");
 
-        ups_status = strdup ("N/A");
-        data = strdup ("");
-        message = strdup ("");
+        // Exit result
+        int result = STATE_UNKNOWN;
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        // Config from commandline
+        ups_config config = ups_config_init();
+
+        if (process_arguments(argc, argv, &config) == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
+        alarm(socket_timeout);
+
+        int supported_options = UPS_NONE;
 
         /* get the ups status if possible */
-        if (determine_status () != OK)
+        if (determine_status(&config, &supported_options) != OK) {
                 return STATE_CRITICAL;
+        }
+
+
         if (supported_options & UPS_STATUS) {
 
-                ups_status = strdup ("");
+                ups_status = strdup("");
+
                 result = STATE_OK;
 
-                if (status & UPSSTATUS_OFF) {
-                        xasprintf (&ups_status, "Off");
+                if (config.status & UPSSTATUS_OFF) {
+                        xasprintf(&ups_status, "Off");
                         result = STATE_CRITICAL;
-                }
-                else if ((status & (UPSSTATUS_OB | UPSSTATUS_LB)) ==
-                                                 (UPSSTATUS_OB | UPSSTATUS_LB)) {
-                        xasprintf (&ups_status, _("On Battery, Low Battery"));
+                } else if ((config.status & (UPSSTATUS_OB | UPSSTATUS_LB)) ==
+                                   (UPSSTATUS_OB | UPSSTATUS_LB)) {
+                        xasprintf(&ups_status, _("On Battery, Low Battery"));
                         result = STATE_CRITICAL;
-                }
-                else {
-                        if (status & UPSSTATUS_OL) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _("Online"));
+                } else {
+                        if (config.status & UPSSTATUS_OL) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _("Online"));
                         }
-                        if (status & UPSSTATUS_OB) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _("On Battery"));
-                                result = STATE_WARNING;
+                        if (config.status & UPSSTATUS_OB) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _("On Battery"));
+                                result = max_state(result, STATE_WARNING);
                         }
-                        if (status & UPSSTATUS_LB) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", Low Battery"));
-                                result = STATE_WARNING;
+                        if (config.status & UPSSTATUS_LB) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", Low Battery"));
+                                result = max_state(result, STATE_WARNING);
                         }
-                        if (status & UPSSTATUS_CAL) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", Calibrating"));
+                        if (config.status & UPSSTATUS_CAL) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", Calibrating"));
                         }
-                        if (status & UPSSTATUS_RB) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", Replace Battery"));
-                                result = STATE_WARNING;
+                        if (config.status & UPSSTATUS_RB) {
+                                xasprintf(&ups_status, "%s%s", ups_status,
+                                                  _(", Replace Battery"));
+                                result = max_state(result, STATE_WARNING);
                         }
-                        if (status & UPSSTATUS_BYPASS) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", On Bypass"));
+                        if (config.status & UPSSTATUS_BYPASS) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", On Bypass"));
+                                // Bypassing the battery is likely a bad thing
+                                result = STATE_CRITICAL;
+                        }
+                        if (config.status & UPSSTATUS_OVER) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", Overload"));
+                                result = max_state(result, STATE_WARNING);
                         }
-                        if (status & UPSSTATUS_OVER) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", Overload"));
+                        if (config.status & UPSSTATUS_TRIM) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", Trimming"));
                         }
-                        if (status & UPSSTATUS_TRIM) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", Trimming"));
+                        if (config.status & UPSSTATUS_BOOST) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", Boosting"));
                         }
-                        if (status & UPSSTATUS_BOOST) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", Boosting"));
+                        if (config.status & UPSSTATUS_CHRG) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", Charging"));
                         }
-                        if (status & UPSSTATUS_CHRG) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", Charging"));
+                        if (config.status & UPSSTATUS_DISCHRG) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", Discharging"));
+                                result = max_state(result, STATE_WARNING);
                         }
-                        if (status & UPSSTATUS_DISCHRG) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", Discharging"));
+                        if (config.status & UPSSTATUS_ALARM) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", ALARM"));
+                                result = STATE_CRITICAL;
                         }
-                        if (status & UPSSTATUS_UNKNOWN) {
-                                xasprintf (&ups_status, "%s%s", ups_status, _(", Unknown"));
+                        if (config.status & UPSSTATUS_UNKNOWN) {
+                                xasprintf(&ups_status, "%s%s", ups_status, _(", Unknown"));
                         }
                 }
-                xasprintf (&message, "%sStatus=%s ", message, ups_status);
+                xasprintf(&message, "%sStatus=%s ", message, ups_status);
         }
 
+        int res;
+        char temp_buffer[MAX_INPUT_BUFFER];
+
         /* get the ups utility voltage if possible */
-        res=get_ups_variable ("input.voltage", temp_buffer);
-        if (res == NOSUCHVAR) supported_options &= ~UPS_UTILITY;
-        else if (res != OK)
+        res = get_ups_variable("input.voltage", temp_buffer, config);
+        if (res == NOSUCHVAR) {
+                supported_options &= ~UPS_UTILITY;
+        } else if (res != OK) {
                 return STATE_CRITICAL;
-        else {
+        } else {
                 supported_options |= UPS_UTILITY;
 
-                ups_utility_voltage = atof (temp_buffer);
-                xasprintf (&message, "%sUtility=%3.1fV ", message, ups_utility_voltage);
+                double ups_utility_voltage = 0.0;
+                ups_utility_voltage = atof(temp_buffer);
+                xasprintf(&message, "%sUtility=%3.1fV ", message, ups_utility_voltage);
+
+                double ups_utility_deviation = 0.0;
 
-                if (ups_utility_voltage > 120.0)
+                if (ups_utility_voltage > 120.0) {
                         ups_utility_deviation = 120.0 - ups_utility_voltage;
-                else
+                } else {
                         ups_utility_deviation = ups_utility_voltage - 120.0;
+                }
 
-                if (check_variable == UPS_UTILITY) {
-                        if (check_crit==TRUE && ups_utility_deviation>=critical_value) {
+                if (config.check_variable == UPS_UTILITY) {
+                        if (config.check_crit &&
+                                ups_utility_deviation >= config.critical_value) {
                                 result = STATE_CRITICAL;
+                        } else if (config.check_warn &&
+                                           ups_utility_deviation >= config.warning_value) {
+                                result = max_state(result, STATE_WARNING);
                         }
-                        else if (check_warn==TRUE && ups_utility_deviation>=warning_value) {
-                                result = max_state (result, STATE_WARNING);
-                        }
-                        xasprintf (&data, "%s",
-                                  perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
-                                            check_warn, (long)(1000*warning_value),
-                                            check_crit, (long)(1000*critical_value),
-                                            TRUE, 0, FALSE, 0));
+                        xasprintf(&data, "%s",
+                                          perfdata("voltage", (long)(1000 * ups_utility_voltage),
+                                                           "mV", config.check_warn,
+                                                           (long)(1000 * config.warning_value),
+                                                           config.check_crit,
+                                                           (long)(1000 * config.critical_value), true, 0,
+                                                           false, 0));
                 } else {
-                        xasprintf (&data, "%s",
-                                  perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV",
-                                            FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
+                        xasprintf(&data, "%s",
+                                          perfdata("voltage", (long)(1000 * ups_utility_voltage),
+                                                           "mV", false, 0, false, 0, true, 0, false, 0));
                 }
         }
 
         /* get the ups battery percent if possible */
-        res=get_ups_variable ("battery.charge", temp_buffer);
-        if (res == NOSUCHVAR) supported_options &= ~UPS_BATTPCT;
-        else if ( res != OK)
+        res = get_ups_variable("battery.charge", temp_buffer, config);
+        if (res == NOSUCHVAR) {
+                supported_options &= ~UPS_BATTPCT;
+        } else if (res != OK) {
                 return STATE_CRITICAL;
-        else {
+        } else {
                 supported_options |= UPS_BATTPCT;
-                ups_battery_percent = atof (temp_buffer);
-                xasprintf (&message, "%sBatt=%3.1f%% ", message, ups_battery_percent);
 
-                if (check_variable == UPS_BATTPCT) {
-                        if (check_crit==TRUE && ups_battery_percent <= critical_value) {
+                double ups_battery_percent = 0.0;
+                ups_battery_percent = atof(temp_buffer);
+                xasprintf(&message, "%sBatt=%3.1f%% ", message, ups_battery_percent);
+
+                if (config.check_variable == UPS_BATTPCT) {
+                        if (config.check_crit &&
+                                ups_battery_percent <= config.critical_value) {
                                 result = STATE_CRITICAL;
+                        } else if (config.check_warn &&
+                                           ups_battery_percent <= config.warning_value) {
+                                result = max_state(result, STATE_WARNING);
                         }
-                        else if (check_warn==TRUE && ups_battery_percent<=warning_value) {
-                                result = max_state (result, STATE_WARNING);
-                        }
-                        xasprintf (&data, "%s %s", data,
-                                  perfdata ("battery", (long)ups_battery_percent, "%",
-                                            check_warn, (long)(warning_value),
-                                            check_crit, (long)(critical_value),
-                                            TRUE, 0, TRUE, 100));
+                        xasprintf(&data, "%s %s", data,
+                                          perfdata("battery", (long)ups_battery_percent, "%",
+                                                           config.check_warn, (long)(config.warning_value),
+                                                           config.check_crit, (long)(config.critical_value),
+                                                           true, 0, true, 100));
                 } else {
-                        xasprintf (&data, "%s %s", data,
-                                  perfdata ("battery", (long)ups_battery_percent, "%",
-                                            FALSE, 0, FALSE, 0, TRUE, 0, TRUE, 100));
+                        xasprintf(&data, "%s %s", data,
+                                          perfdata("battery", (long)ups_battery_percent, "%", false,
+                                                           0, false, 0, true, 0, true, 100));
                 }
         }
 
         /* get the ups load percent if possible */
-        res=get_ups_variable ("ups.load", temp_buffer);
-        if ( res == NOSUCHVAR ) supported_options &= ~UPS_LOADPCT;
-        else if ( res != OK)
+        res = get_ups_variable("ups.load", temp_buffer, config);
+        if (res == NOSUCHVAR) {
+                supported_options &= ~UPS_LOADPCT;
+        } else if (res != OK) {
                 return STATE_CRITICAL;
-        else {
+        } else {
                 supported_options |= UPS_LOADPCT;
-                ups_load_percent = atof (temp_buffer);
-                xasprintf (&message, "%sLoad=%3.1f%% ", message, ups_load_percent);
 
-                if (check_variable == UPS_LOADPCT) {
-                        if (check_crit==TRUE && ups_load_percent>=critical_value) {
+                double ups_load_percent = 0.0;
+                ups_load_percent = atof(temp_buffer);
+                xasprintf(&message, "%sLoad=%3.1f%% ", message, ups_load_percent);
+
+                if (config.check_variable == UPS_LOADPCT) {
+                        if (config.check_crit &&
+                                ups_load_percent >= config.critical_value) {
                                 result = STATE_CRITICAL;
+                        } else if (config.check_warn &&
+                                           ups_load_percent >= config.warning_value) {
+                                result = max_state(result, STATE_WARNING);
                         }
-                        else if (check_warn==TRUE && ups_load_percent>=warning_value) {
-                                result = max_state (result, STATE_WARNING);
-                        }
-                        xasprintf (&data, "%s %s", data,
-                                  perfdata ("load", (long)ups_load_percent, "%",
-                                            check_warn, (long)(warning_value),
-                                            check_crit, (long)(critical_value),
-                                            TRUE, 0, TRUE, 100));
+                        xasprintf(&data, "%s %s", data,
+                                          perfdata("load", (long)ups_load_percent, "%",
+                                                           config.check_warn, (long)(config.warning_value),
+                                                           config.check_crit, (long)(config.critical_value),
+                                                           true, 0, true, 100));
                 } else {
-                        xasprintf (&data, "%s %s", data,
-                                  perfdata ("load", (long)ups_load_percent, "%",
-                                            FALSE, 0, FALSE, 0, TRUE, 0, TRUE, 100));
+                        xasprintf(&data, "%s %s", data,
+                                          perfdata("load", (long)ups_load_percent, "%", false, 0,
+                                                           false, 0, true, 0, true, 100));
                 }
         }
 
         /* get the ups temperature if possible */
-        res=get_ups_variable ("ups.temperature", temp_buffer);
-        if ( res == NOSUCHVAR ) supported_options &= ~UPS_TEMP;
-        else if ( res != OK)
+        res = get_ups_variable("ups.temperature", temp_buffer, config);
+        if (res == NOSUCHVAR) {
+                supported_options &= ~UPS_TEMP;
+        } else if (res != OK) {
                 return STATE_CRITICAL;
-        else {
-                supported_options |= UPS_TEMP;
-                if (temp_output_c) {
-                  tunits="degC";
-                  ups_temperature = atof (temp_buffer);
-                  xasprintf (&message, "%sTemp=%3.1fC", message, ups_temperature);
-                }
-                else {
-                  tunits="degF";
-                  ups_temperature = (atof (temp_buffer) * 1.8) + 32;
-                  xasprintf (&message, "%sTemp=%3.1fF", message, ups_temperature);
+        } else {
+                supported_options |= UPS_TEMP;
+
+                double ups_temperature = 0.0;
+                char *tunits;
+
+                if (config.temp_output_c) {
+                        tunits = "degC";
+                        ups_temperature = atof(temp_buffer);
+                        xasprintf(&message, "%sTemp=%3.1fC", message, ups_temperature);
+                } else {
+                        tunits = "degF";
+                        ups_temperature = (atof(temp_buffer) * 1.8) + 32;
+                        xasprintf(&message, "%sTemp=%3.1fF", message, ups_temperature);
                 }
 
-                if (check_variable == UPS_TEMP) {
-                        if (check_crit==TRUE && ups_temperature>=critical_value) {
+                if (config.check_variable == UPS_TEMP) {
+                        if (config.check_crit && ups_temperature >= config.critical_value) {
                                 result = STATE_CRITICAL;
+                        } else if (config.check_warn &&
+                                           ups_temperature >= config.warning_value) {
+                                result = max_state(result, STATE_WARNING);
                         }
-                        else if (check_warn == TRUE && ups_temperature>=warning_value) {
-                                result = max_state (result, STATE_WARNING);
+                        xasprintf(&data, "%s %s", data,
+                                          perfdata("temp", (long)ups_temperature, tunits,
+                                                           config.check_warn, (long)(config.warning_value),
+                                                           config.check_crit, (long)(config.critical_value),
+                                                           true, 0, false, 0));
+                } else {
+                        xasprintf(&data, "%s %s", data,
+                                          perfdata("temp", (long)ups_temperature, tunits, false, 0,
+                                                           false, 0, true, 0, false, 0));
+                }
+        }
+
+        /* get the ups real power if possible */
+        res = get_ups_variable("ups.realpower", temp_buffer, config);
+        if (res == NOSUCHVAR) {
+                supported_options &= ~UPS_REALPOWER;
+        } else if (res != OK) {
+                return STATE_CRITICAL;
+        } else {
+                supported_options |= UPS_REALPOWER;
+                double ups_realpower = 0.0;
+                ups_realpower = atof(temp_buffer);
+                xasprintf(&message, "%sReal power=%3.1fW ", message, ups_realpower);
+
+                if (config.check_variable == UPS_REALPOWER) {
+                        if (config.check_crit && ups_realpower >= config.critical_value) {
+                                result = STATE_CRITICAL;
+                        } else if (config.check_warn &&
+                                           ups_realpower >= config.warning_value) {
+                                result = max_state(result, STATE_WARNING);
                         }
-                        xasprintf (&data, "%s %s", data,
-                                  perfdata ("temp", (long)ups_temperature, tunits,
-                                            check_warn, (long)(warning_value),
-                                            check_crit, (long)(critical_value),
-                                            TRUE, 0, FALSE, 0));
+                        xasprintf(&data, "%s %s", data,
+                                          perfdata("realpower", (long)ups_realpower, "W",
+                                                           config.check_warn, (long)(config.warning_value),
+                                                           config.check_crit, (long)(config.critical_value),
+                                                           true, 0, false, 0));
                 } else {
-                        xasprintf (&data, "%s %s", data,
-                                  perfdata ("temp", (long)ups_temperature, tunits,
-                                            FALSE, 0, FALSE, 0, TRUE, 0, FALSE, 0));
+                        xasprintf(&data, "%s %s", data,
+                                          perfdata("realpower", (long)ups_realpower, "W", false, 0,
+                                                           false, 0, true, 0, false, 0));
                 }
         }
 
-        /* if the UPS does not support any options we are looking for, report an error */
+        /* if the UPS does not support any options we are looking for, report an
+         * error */
         if (supported_options == UPS_NONE) {
                 result = STATE_CRITICAL;
-                xasprintf (&message, _("UPS does not support any available options\n"));
+                xasprintf(&message, _("UPS does not support any available options\n"));
         }
 
         /* reset timeout */
-        alarm (0);
+        alarm(0);
 
-        printf ("UPS %s - %s|%s\n", state_text(result), message, data);
+        printf("UPS %s - %s|%s\n", state_text(result), message, data);
         return result;
 }
 
-
-
 /* determines what options are supported by the UPS */
-int
-determine_status (void)
-{
+int determine_status(ups_config *config, int *supported_options) {
         char recv_buffer[MAX_INPUT_BUFFER];
-        char temp_buffer[MAX_INPUT_BUFFER];
-        char *ptr;
-        int res;
 
-        res=get_ups_variable ("ups.status", recv_buffer);
-        if (res == NOSUCHVAR) return OK;
+        int res = get_ups_variable("ups.status", recv_buffer, *config);
+        if (res == NOSUCHVAR) {
+                return OK;
+        }
+
         if (res != STATE_OK) {
-                printf ("%s\n", _("Invalid response received from host"));
+                printf("%s\n", _("Invalid response received from host"));
                 return ERROR;
         }
 
-        supported_options |= UPS_STATUS;
-
-        strcpy (temp_buffer, recv_buffer);
-        for (ptr = (char *) strtok (temp_buffer, " "); ptr != NULL;
-                         ptr = (char *) strtok (NULL, " ")) {
-                if (!strcmp (ptr, "OFF"))
-                        status |= UPSSTATUS_OFF;
-                else if (!strcmp (ptr, "OL"))
-                        status |= UPSSTATUS_OL;
-                else if (!strcmp (ptr, "OB"))
-                        status |= UPSSTATUS_OB;
-                else if (!strcmp (ptr, "LB"))
-                        status |= UPSSTATUS_LB;
-                else if (!strcmp (ptr, "CAL"))
-                        status |= UPSSTATUS_CAL;
-                else if (!strcmp (ptr, "RB"))
-                        status |= UPSSTATUS_RB;
-                else if (!strcmp (ptr, "BYPASS"))
-                        status |= UPSSTATUS_BYPASS;
-                else if (!strcmp (ptr, "OVER"))
-                        status |= UPSSTATUS_OVER;
-                else if (!strcmp (ptr, "TRIM"))
-                        status |= UPSSTATUS_TRIM;
-                else if (!strcmp (ptr, "BOOST"))
-                        status |= UPSSTATUS_BOOST;
-                else if (!strcmp (ptr, "CHRG"))
-                        status |= UPSSTATUS_CHRG;
-                else if (!strcmp (ptr, "DISCHRG"))
-                        status |= UPSSTATUS_DISCHRG;
-                else
-                        status |= UPSSTATUS_UNKNOWN;
+        *supported_options |= UPS_STATUS;
+
+        char temp_buffer[MAX_INPUT_BUFFER];
+
+        strcpy(temp_buffer, recv_buffer);
+        for (char *ptr = (char *)strtok(temp_buffer, " "); ptr != NULL;
+                 ptr = (char *)strtok(NULL, " ")) {
+                if (!strcmp(ptr, "OFF")) {
+                        config->status |= UPSSTATUS_OFF;
+                } else if (!strcmp(ptr, "OL")) {
+                        config->status |= UPSSTATUS_OL;
+                } else if (!strcmp(ptr, "OB")) {
+                        config->status |= UPSSTATUS_OB;
+                } else if (!strcmp(ptr, "LB")) {
+                        config->status |= UPSSTATUS_LB;
+                } else if (!strcmp(ptr, "CAL")) {
+                        config->status |= UPSSTATUS_CAL;
+                } else if (!strcmp(ptr, "RB")) {
+                        config->status |= UPSSTATUS_RB;
+                } else if (!strcmp(ptr, "BYPASS")) {
+                        config->status |= UPSSTATUS_BYPASS;
+                } else if (!strcmp(ptr, "OVER")) {
+                        config->status |= UPSSTATUS_OVER;
+                } else if (!strcmp(ptr, "TRIM")) {
+                        config->status |= UPSSTATUS_TRIM;
+                } else if (!strcmp(ptr, "BOOST")) {
+                        config->status |= UPSSTATUS_BOOST;
+                } else if (!strcmp(ptr, "CHRG")) {
+                        config->status |= UPSSTATUS_CHRG;
+                } else if (!strcmp(ptr, "DISCHRG")) {
+                        config->status |= UPSSTATUS_DISCHRG;
+                } else if (!strcmp(ptr, "ALARM")) {
+                        config->status |= UPSSTATUS_ALARM;
+                } else {
+                        config->status |= UPSSTATUS_UNKNOWN;
+                }
         }
 
         return OK;
 }
 
-
 /* gets a variable value for a specific UPS  */
-int
-get_ups_variable (const char *varname, char *buf)
-{
-        /*  char command[MAX_INPUT_BUFFER]; */
-        char temp_buffer[MAX_INPUT_BUFFER];
+int get_ups_variable(const char *varname, char *buf, const ups_config config) {
         char send_buffer[MAX_INPUT_BUFFER];
-        char *ptr;
-        char *logout = "OK Goodbye\n";
-        int logout_len = strlen(logout);
-        int len;
-
-        *buf=0;
 
         /* create the command string to send to the UPS daemon */
         /* Add LOGOUT to avoid read failure logs */
-        if (snprintf (send_buffer, sizeof(send_buffer), "GET VAR %s %s\nLOGOUT\n", ups_name, varname) >= sizeof(send_buffer)) {
+        int res = snprintf(send_buffer, sizeof(send_buffer),
+                                           "GET VAR %s %s\nLOGOUT\n", config.ups_name, varname);
+        if ((res > 0) && ((size_t)res >= sizeof(send_buffer))) {
                 printf("%s\n", _("UPS name to long for buffer"));
                 return ERROR;
         }
 
+        char temp_buffer[MAX_INPUT_BUFFER];
+
         /* send the command to the daemon and get a response back */
-        if (process_tcp_request
-                        (server_address, server_port, send_buffer, temp_buffer,
-                         sizeof (temp_buffer)) != STATE_OK) {
-                printf ("%s\n", _("Invalid response received from host"));
+        if (process_tcp_request(config.server_address, config.server_port,
+                                                        send_buffer, temp_buffer,
+                                                        sizeof(temp_buffer)) != STATE_OK) {
+                printf("%s\n", _("Invalid response received from host"));
                 return ERROR;
         }
 
-        ptr = temp_buffer;
-        len = strlen(ptr);
-        if (len > logout_len && strcmp (ptr + len - logout_len, logout) == 0) len -= logout_len;
-        if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0;
-        if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) {
-                printf (_("CRITICAL - no such UPS '%s' on that host\n"), ups_name);
+        char *ptr = temp_buffer;
+        int len = strlen(ptr);
+        const char *logout = "OK Goodbye\n";
+        const int logout_len = strlen(logout);
+
+        if (len > logout_len && strcmp(ptr + len - logout_len, logout) == 0) {
+                len -= logout_len;
+        }
+        if (len > 0 && ptr[len - 1] == '\n') {
+                ptr[len - 1] = 0;
+        }
+        if (strcmp(ptr, "ERR UNKNOWN-UPS") == 0) {
+                printf(_("CRITICAL - no such UPS '%s' on that host\n"),
+                           config.ups_name);
                 return ERROR;
         }
 
-        if (strcmp (ptr, "ERR VAR-NOT-SUPPORTED") == 0) {
+        if (strcmp(ptr, "ERR VAR-NOT-SUPPORTED") == 0) {
                 /*printf ("Error: Variable '%s' is not supported\n", varname);*/
                 return NOSUCHVAR;
         }
 
-        if (strcmp (ptr, "ERR DATA-STALE") == 0) {
-                printf ("%s\n", _("CRITICAL - UPS data is stale"));
+        if (strcmp(ptr, "ERR DATA-STALE") == 0) {
+                printf("%s\n", _("CRITICAL - UPS data is stale"));
                 return ERROR;
         }
 
-        if (strncmp (ptr, "ERR", 3) == 0) {
-                printf (_("Unknown error: %s\n"), ptr);
+        if (strncmp(ptr, "ERR", 3) == 0) {
+                printf(_("Unknown error: %s\n"), ptr);
                 return ERROR;
         }
 
-        ptr = temp_buffer + strlen (varname) + strlen (ups_name) + 6;
+        ptr = temp_buffer + strlen(varname) + strlen(config.ups_name) + 6;
         len = strlen(ptr);
-        if (len < 2 || ptr[0] != '"' || ptr[len-1] != '"') {
-                printf ("%s\n", _("Error: unable to parse variable"));
+        if (len < 2 || ptr[0] != '"' || ptr[len - 1] != '"') {
+                printf("%s\n", _("Error: unable to parse variable"));
                 return ERROR;
         }
-        strncpy (buf, ptr+1, len - 2);
+
+        *buf = 0;
+        strncpy(buf, ptr + 1, len - 2);
         buf[len - 2] = 0;
 
         return OK;
 }
 
-
 /* Command line: CHECK_UPS -H <host_address> -u ups [-p port] [-v variable]
                            [-wv warn_value] [-cv crit_value] [-to to_sec] */
 
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'},
-                {"ups", required_argument, 0, 'u'},
-                {"port", required_argument, 0, 'p'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"timeout", required_argument, 0, 't'},
-                {"temperature", no_argument, 0, 'T'},
-                {"variable", required_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
-
-        if (argc < 2)
+int process_arguments(int argc, char **argv, ups_config *config) {
+
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"ups", required_argument, 0, 'u'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"temperature", no_argument, 0, 'T'},
+                                                                           {"variable", required_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
+
+        if (argc < 2) {
                 return ERROR;
+        }
 
+        int c;
         for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+                if (strcmp("-to", argv[c]) == 0) {
+                        strcpy(argv[c], "-t");
+                } else if (strcmp("-wt", argv[c]) == 0) {
+                        strcpy(argv[c], "-w");
+                } else if (strcmp("-ct", argv[c]) == 0) {
+                        strcpy(argv[c], "-c");
+                }
         }
 
+        int option = 0;
         while (1) {
-                c = getopt_long (argc, argv, "hVTH:u:p:v:c:w:t:", longopts,
-                                                                         &option);
+                c = getopt_long(argc, argv, "hVTH:u:p:v:c:w:t:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (c == -1 || c == EOF) {
                         break;
+                }
 
                 switch (c) {
-                case '?':                                                                       /* help */
-                        usage5 ();
-                case 'H':                                                                       /* hostname */
-                        if (is_host (optarg)) {
-                                server_address = optarg;
-                        }
-                        else {
-                                usage2 (_("Invalid hostname/address"), optarg);
+                case '?': /* help */
+                        usage5();
+                case 'H': /* hostname */
+                        if (is_host(optarg)) {
+                                config->server_address = optarg;
+                        } else {
+                                usage2(_("Invalid hostname/address"), optarg);
                         }
                         break;
-                case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for Fahrenheit) */
-                        temp_output_c = 1;
+                case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for
+                                         Fahrenheit) */
+                        config->temp_output_c = true;
                         break;
-                case 'u':                                                                       /* ups name */
-                        ups_name = optarg;
+                case 'u': /* ups name */
+                        config->ups_name = optarg;
                         break;
-                case 'p':                                                                       /* port */
-                        if (is_intpos (optarg)) {
-                                server_port = atoi (optarg);
-                        }
-                        else {
-                                usage2 (_("Port must be a positive integer"), optarg);
+                case 'p': /* port */
+                        if (is_intpos(optarg)) {
+                                config->server_port = atoi(optarg);
+                        } else {
+                                usage2(_("Port must be a positive integer"), optarg);
                         }
                         break;
-                case 'c':                                                                       /* critical time threshold */
-                        if (is_intnonneg (optarg)) {
-                                critical_value = atoi (optarg);
-                                check_crit = TRUE;
-                        }
-                        else {
-                                usage2 (_("Critical time must be a positive integer"), optarg);
+                case 'c': /* critical time threshold */
+                        if (is_intnonneg(optarg)) {
+                                config->critical_value = atoi(optarg);
+                                config->check_crit = true;
+                        } else {
+                                usage2(_("Critical time must be a positive integer"), optarg);
                         }
                         break;
-                case 'w':                                                                       /* warning time threshold */
-                        if (is_intnonneg (optarg)) {
-                                warning_value = atoi (optarg);
-                                check_warn = TRUE;
-                        }
-                        else {
-                                usage2 (_("Warning time must be a positive integer"), optarg);
+                case 'w': /* warning time threshold */
+                        if (is_intnonneg(optarg)) {
+                                config->warning_value = atoi(optarg);
+                                config->check_warn = true;
+                        } else {
+                                usage2(_("Warning time must be a positive integer"), optarg);
                         }
                         break;
-                case 'v':                                                                       /* variable */
-                        if (!strcmp (optarg, "LINE"))
-                                check_variable = UPS_UTILITY;
-                        else if (!strcmp (optarg, "TEMP"))
-                                check_variable = UPS_TEMP;
-                        else if (!strcmp (optarg, "BATTPCT"))
-                                check_variable = UPS_BATTPCT;
-                        else if (!strcmp (optarg, "LOADPCT"))
-                                check_variable = UPS_LOADPCT;
-                        else
-                                usage2 (_("Unrecognized UPS variable"), optarg);
-                        break;
-                case 't':                                                                       /* timeout */
-                        if (is_intnonneg (optarg)) {
-                                socket_timeout = atoi (optarg);
+                case 'v': /* variable */
+                        if (!strcmp(optarg, "LINE")) {
+                                config->check_variable = UPS_UTILITY;
+                        } else if (!strcmp(optarg, "TEMP")) {
+                                config->check_variable = UPS_TEMP;
+                        } else if (!strcmp(optarg, "BATTPCT")) {
+                                config->check_variable = UPS_BATTPCT;
+                        } else if (!strcmp(optarg, "LOADPCT")) {
+                                config->check_variable = UPS_LOADPCT;
+                        } else if (!strcmp(optarg, "REALPOWER")) {
+                                config->check_variable = UPS_REALPOWER;
+                        } else {
+                                usage2(_("Unrecognized UPS variable"), optarg);
                         }
-                        else {
-                                usage4 (_("Timeout interval must be a positive integer"));
+                        break;
+                case 't': /* timeout */
+                        if (is_intnonneg(optarg)) {
+                                socket_timeout = atoi(optarg);
+                        } else {
+                                usage4(_("Timeout interval must be a positive integer"));
                         }
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
                 }
         }
 
-
-        if (server_address == NULL && argc > optind) {
-                if (is_host (argv[optind]))
-                        server_address = argv[optind++];
-                else
-                        usage2 (_("Invalid hostname/address"), optarg);
+        if (config->server_address == NULL && argc > optind) {
+                if (is_host(argv[optind])) {
+                        config->server_address = argv[optind++];
+                } else {
+                        usage2(_("Invalid hostname/address"), optarg);
+                }
         }
 
-        if (server_address == NULL)
-                server_address = strdup("127.0.0.1");
+        if (config->server_address == NULL) {
+                config->server_address = strdup("127.0.0.1");
+        }
 
-        return validate_arguments();
+        return validate_arguments(*config);
 }
 
-
-int
-validate_arguments (void)
-{
-        if (! ups_name) {
-                printf ("%s\n", _("Error : no UPS indicated"));
+int validate_arguments(ups_config config) {
+        if (!config.ups_name) {
+                printf("%s\n", _("Error : no UPS indicated"));
                 return ERROR;
         }
         return OK;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-void
-print_help (void)
-{
-        char *myport;
-        xasprintf (&myport, "%d", PORT);
-
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 2000 Tom Shields\n");
-        printf ("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n");
-        printf ("Copyright (c) 2004 Arnaud Quette <arnaud.quette@mgeups.com>\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf ("%s\n", _("This plugin tests the UPS service on the specified host. Network UPS Tools"));
-  printf ("%s\n", _("from www.networkupstools.org must be running for this plugin to work."));
-
-  printf ("\n\n");
-
-        print_usage ();
+        printf("Copyright (c) 2000 Tom Shields\n");
+        printf("Copyright (c) 2004 Alain Richard <alain.richard@equation.fr>\n");
+        printf("Copyright (c) 2004 Arnaud Quette <arnaud.quette@mgeups.com>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf("%s\n", _("This plugin tests the UPS service on the specified host. "
+                                         "Network UPS Tools"));
+        printf("%s\n", _("from www.networkupstools.org must be running for this "
+                                         "plugin to work."));
 
-        printf (UT_HOST_PORT, 'p', myport);
+        printf("\n\n");
 
-        printf (" %s\n", "-u, --ups=STRING");
-  printf ("    %s\n", _("Name of UPS"));
-  printf (" %s\n", "-T, --temperature");
-  printf ("    %s\n", _("Output of temperatures in Celsius"));
-  printf (" %s\n", "-v, --variable=STRING");
-  printf ("    %s %s\n", _("Valid values for STRING are"), "LINE, TEMP, BATTPCT or LOADPCT");
+        print_usage();
 
-        printf (UT_WARN_CRIT);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-/* TODO: -v clashing with -v/-variable. Commenting out help text since verbose
-         is unused up to now */
-/*      printf (UT_VERBOSE); */
-
-  printf ("\n");
-        printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
-  printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the"));
-  printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING"));
-  printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL"));
-  printf ("%s\n", _("state."));
-
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("You may also specify a variable to check (such as temperature, utility voltage,"));
-  printf (" %s\n", _("battery load, etc.) as well as warning and critical thresholds for the value"));
-  printf (" %s\n", _("of that variable.  If the remote host has multiple UPS that are being monitored"));
-  printf (" %s\n", _("you will have to use the --ups option to specify which UPS to check."));
-  printf ("\n");
-  printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's"));
-  printf (" %s\n", _("Network UPS Tools be installed on the remote host. If you do not have the"));
-  printf (" %s\n", _("package installed on your system, you can download it from"));
-  printf (" %s\n", _("http://www.networkupstools.org"));
-
-        printf (UT_SUPPORT);
+        char *myport;
+        xasprintf(&myport, "%d", PORT);
+        printf(UT_HOST_PORT, 'p', myport);
+
+        printf(" %s\n", "-u, --ups=STRING");
+        printf("    %s\n", _("Name of UPS"));
+        printf(" %s\n", "-T, --temperature");
+        printf("    %s\n", _("Output of temperatures in Celsius"));
+        printf(" %s\n", "-v, --variable=STRING");
+        printf("    %s %s\n", _("Valid values for STRING are"),
+                   "LINE, TEMP, BATTPCT, LOADPCT or REALPOWER");
+
+        printf(UT_WARN_CRIT);
+
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        /* TODO: -v clashing with -v/-variable. Commenting out help text since
+           verbose is unused up to now */
+        /*      printf (UT_VERBOSE); */
+
+        printf("\n");
+        printf("%s\n", _("This plugin attempts to determine the status of a UPS "
+                                         "(Uninterruptible Power"));
+        printf("%s\n", _("Supply) on a local or remote host. If the UPS is online "
+                                         "or calibrating, the"));
+        printf("%s\n", _("plugin will return an OK state. If the battery is on it "
+                                         "will return a WARNING"));
+        printf("%s\n", _("state. If the UPS is off or has a low battery the plugin "
+                                         "will return a CRITICAL"));
+        printf("%s\n", _("state."));
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("You may also specify a variable to check (such as "
+                                          "temperature, utility voltage,"));
+        printf(" %s\n", _("battery load, etc.) as well as warning and critical "
+                                          "thresholds for the value"));
+        printf(" %s\n", _("of that variable.  If the remote host has multiple UPS "
+                                          "that are being monitored"));
+        printf(" %s\n", _("you will have to use the --ups option to specify which "
+                                          "UPS to check."));
+        printf("\n");
+        printf(" %s\n", _("This plugin requires that the UPSD daemon distributed "
+                                          "with Russell Kroll's"));
+        printf(" %s\n", _("Network UPS Tools be installed on the remote host. If "
+                                          "you do not have the"));
+        printf(" %s\n",
+                   _("package installed on your system, you can download it from"));
+        printf(" %s\n", _("http://www.networkupstools.org"));
+
+        printf(UT_SUPPORT);
 }
 
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H host -u ups [-p port] [-v variable] [-w warn_value] [-c crit_value] [-to to_sec] [-T]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host -u ups [-p port] [-v variable] [-w warn_value] [-c "
+                   "crit_value] [-to to_sec] [-T]\n",
+                   progname);
 }
diff --git a/plugins/check_users.c b/plugins/check_users.c
index 2a9ee98..89b9536 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -179,7 +179,7 @@ main (int argc, char **argv)
                 printf (_("USERS %s - %d users currently logged in |%s\n"),
                                 state_text(result), users,
                                 sperfdata_int("users", users, "", warning_range,
-                                                        critical_range, TRUE, 0, FALSE, 0));
+                                                        critical_range, true, 0, false, 0));
         }
 
         return result;
@@ -202,7 +202,7 @@ process_arguments (int argc, char **argv)
         if (argc < 2)
                 usage ("\n");
 
-        while (1) {
+        while (true) {
                 c = getopt_long (argc, argv, "+hVvc:w:", longopts, &option);
 
                 if (c == -1 || c == EOF || c == 1)
@@ -227,18 +227,23 @@ process_arguments (int argc, char **argv)
         }
 
         c = optind;
+
         if (warning_range == NULL && argc > c)
                 warning_range = argv[c++];
+
         if (critical_range == NULL && argc > c)
                 critical_range = argv[c++];
 
         /* this will abort in case of invalid ranges */
         set_thresholds (&thlds, warning_range, critical_range);
 
-        if (thlds->warning->end < 0)
-                usage4 (_("Warning threshold must be a positive integer"));
-        if (thlds->critical->end < 0)
-                usage4 (_("Critical threshold must be a positive integer"));
+        if (!thlds->warning) {
+                usage4 (_("Warning threshold must be a valid range expression"));
+        }
+
+        if (!thlds->critical) {
+                usage4 (_("Critical threshold must be a valid range expression"));
+        }
 
         return OK;
 }
@@ -261,10 +266,10 @@ print_help (void)
         printf (UT_HELP_VRSN);
         printf (UT_EXTRA_OPTS);
 
-        printf (" %s\n", "-w, --warning=INTEGER");
-        printf ("    %s\n", _("Set WARNING status if more than INTEGER users are logged in"));
-        printf (" %s\n", "-c, --critical=INTEGER");
-        printf ("    %s\n", _("Set CRITICAL status if more than INTEGER users are logged in"));
+        printf (" %s\n", "-w, --warning=RANGE_EXPRESSION");
+        printf ("    %s\n", _("Set WARNING status if number of logged in users violates RANGE_EXPRESSION"));
+        printf (" %s\n", "-c, --critical=RANGE_EXPRESSION");
+        printf ("    %s\n", _("Set CRITICAL status if number of logged in users violates RANGE_EXPRESSION"));
 
         printf (UT_SUPPORT);
 }
diff --git a/plugins/common.h b/plugins/common.h
index 0f08e2f..833479c 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -184,14 +184,6 @@ enum {
         ERROR = -1
 };
 
-/* AIX seems to have this defined somewhere else */
-#ifndef FALSE
-enum {
-        FALSE,
-        TRUE
-};
-#endif
-
 enum {
         STATE_OK,
         STATE_WARNING,
@@ -225,18 +217,4 @@ enum {
 # define __attribute__(x) /* do nothing */
 #endif
 
-/* Try sysconf(_SC_OPEN_MAX) first, as it can be higher than OPEN_MAX.
- * If that fails and the macro isn't defined, we fall back to an educated
- * guess. There's no guarantee that our guess is adequate and the program
- * will die with SIGSEGV if it isn't and the upper boundary is breached. */
-#define DEFAULT_MAXFD  256   /* fallback value if no max open files value is set */
-#define MAXFD_LIMIT   8192   /* upper limit of open files */
-#ifdef _SC_OPEN_MAX
-static long maxfd = 0;
-#elif defined(OPEN_MAX)
-# define maxfd OPEN_MAX
-#else   /* sysconf macro unavailable, so guess (may be wildly inaccurate) */
-# define maxfd DEFAULT_MAXFD
-#endif
-
 #endif /* _COMMON_H_ */
diff --git a/plugins/negate.c b/plugins/negate.c
index 50f62d3..c5fe7e1 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -47,7 +47,7 @@ static const char **process_arguments (int, char **);
 void validate_arguments (char **);
 void print_help (void);
 void print_usage (void);
-int subst_text = FALSE;
+bool subst_text = false;
 
 static int state[4] = {
         STATE_OK,
@@ -63,7 +63,6 @@ main (int argc, char **argv)
         char *sub;
         char **command_line;
         output chld_out, chld_err;
-        int i;
 
         setlocale (LC_ALL, "");
         bindtextdomain (PACKAGE, LOCALEDIR);
@@ -86,7 +85,7 @@ main (int argc, char **argv)
                 result = cmd_run_array (command_line, &chld_out, &chld_err, 0);
         }
         if (chld_err.lines > 0) {
-                for (i = 0; i < chld_err.lines; i++) {
+                for (size_t i = 0; i < chld_err.lines; i++) {
                         fprintf (stderr, "%s\n", chld_err.line[i]);
                 }
         }
@@ -95,7 +94,7 @@ main (int argc, char **argv)
         if (chld_out.lines == 0)
                 die (max_state_alt (result, STATE_UNKNOWN), _("No data returned from command\n"));
 
-        for (i = 0; i < chld_out.lines; i++) {
+        for (size_t i = 0; i < chld_out.lines; i++) {
                 if (subst_text && result >= 0 && result <= 4 && result != state[result])  {
                         /* Loop over each match found */
                         while ((sub = strstr (chld_out.line[i], state_text (result)))) {
@@ -122,7 +121,7 @@ static const char **
 process_arguments (int argc, char **argv)
 {
         int c;
-        int permute = TRUE;
+        bool permute = true;
 
         int option = 0;
         static struct option longopts[] = {
@@ -168,26 +167,26 @@ process_arguments (int argc, char **argv)
                 case 'o':     /* replacement for OK */
                         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;
+                        permute = false;
                         break;
 
                 case 'w':     /* replacement for WARNING */
                         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;
+                        permute = false;
                         break;
                 case 'c':     /* replacement for CRITICAL */
                         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;
+                        permute = false;
                         break;
                 case 'u':     /* replacement for UNKNOWN */
                         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;
+                        permute = false;
                         break;
                 case 's':     /* Substitute status text */
-                        subst_text = TRUE;
+                        subst_text = true;
                         break;
                 }
         }
@@ -221,8 +220,10 @@ print_help (void)
 
         printf (COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("Negates the status of a plugin (returns OK for CRITICAL and vice-versa)."));
-        printf ("%s\n", _("Additional switches can be used to control which state becomes what."));
+        printf ("%s\n", _("Negates only the return code of a plugin (returns OK for CRITICAL and vice-versa) by default."));
+        printf ("%s\n", _("Additional switches can be used to control:\n"));
+        printf ("\t  - which state becomes what\n");
+        printf ("\t  - changing the plugin output text to match the return code");
 
         printf ("\n\n");
 
diff --git a/plugins/netutils.c b/plugins/netutils.c
index 1bb4f07..c6af248 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -34,7 +34,7 @@ unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
 unsigned int socket_timeout_state = STATE_CRITICAL;
 
 int econn_refuse_state = STATE_CRITICAL;
-int was_refused = FALSE;
+bool was_refused = false;
 #if USE_IPV6
 int address_family = AF_UNSPEC;
 #else
@@ -215,14 +215,14 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
                         result = connect (*sd, r->ai_addr, r->ai_addrlen);
 
                         if (result == 0) {
-                                was_refused = FALSE;
+                                was_refused = false;
                                 break;
                         }
 
                         if (result < 0) {
                                 switch (errno) {
                                 case ECONNREFUSED:
-                                        was_refused = TRUE;
+                                        was_refused = true;
                                         break;
                                 }
                         }
@@ -246,7 +246,7 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
                 }
                 result = connect(*sd, (struct sockaddr *)&su, sizeof(su));
                 if (result < 0 && errno == ECONNREFUSED)
-                        was_refused = TRUE;
+                        was_refused = true;
         }
 
         if (result == 0)
@@ -326,13 +326,11 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int
 }
 
 
-int
-is_host (const char *address)
-{
+bool is_host (const char *address) {
         if (is_addr (address) || is_hostname (address))
-                return (TRUE);
+                return (true);
 
-        return (FALSE);
+        return (false);
 }
 
 void
@@ -342,20 +340,18 @@ host_or_die(const char *str)
                 usage_va(_("Invalid hostname/address - %s"), str);
 }
 
-int
-is_addr (const char *address)
-{
+bool is_addr (const char *address) {
 #ifdef USE_IPV6
         if (address_family == AF_INET && is_inet_addr (address))
-                return TRUE;
+                return true;
         else if (address_family == AF_INET6 && is_inet6_addr (address))
-                return TRUE;
+                return true;
 #else
         if (is_inet_addr (address))
-                return (TRUE);
+                return (true);
 #endif
 
-        return (FALSE);
+        return (false);
 }
 
 int
@@ -370,10 +366,10 @@ dns_lookup (const char *in, struct sockaddr_storage *ss, int family)
 
         retval = getaddrinfo (in, NULL, &hints, &res);
         if (retval != 0)
-                return FALSE;
+                return false;
 
         if (ss != NULL)
                 memcpy (ss, res->ai_addr, res->ai_addrlen);
         freeaddrinfo (res);
-        return TRUE;
+        return true;
 }
diff --git a/plugins/netutils.h b/plugins/netutils.h
index d7ee0dd..a95057e 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -73,8 +73,8 @@ int send_request (int sd, int proto, const char *send_buffer, char *recv_buffer,
 
 
 /* "is_*" wrapper macros and functions */
-int is_host (const char *);
-int is_addr (const char *);
+bool is_host (const char *);
+bool is_addr (const char *);
 int dns_lookup (const char *, struct sockaddr_storage *, int);
 void host_or_die(const char *str);
 #define resolve_host_or_addr(addr, family) dns_lookup(addr, NULL, family)
@@ -89,10 +89,10 @@ void host_or_die(const char *str);
 extern unsigned int socket_timeout;
 extern unsigned int socket_timeout_state;
 extern int econn_refuse_state;
-extern int was_refused;
+extern bool was_refused;
 extern int address_family;
 
-RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
+void socket_timeout_alarm_handler (int) __attribute__((noreturn));
 
 /* SSL-Related functionality */
 #ifdef HAVE_SSL
diff --git a/plugins/popen.c b/plugins/popen.c
index 723817d..54e63bc 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -38,8 +38,9 @@
 * 
 *****************************************************************************/
 
-#include "common.h"
-#include "utils.h"
+#include "./common.h"
+#include "./utils.h"
+#include "../lib/maxfd.h"
 
 /* extern so plugin has pid to kill exec'd process on timeouts */
 extern pid_t *childpid;
@@ -49,9 +50,9 @@ extern FILE *child_process;
 FILE *spopen (const char *);
 int spclose (FILE *);
 #ifdef REDHAT_SPOPEN_ERROR
-RETSIGTYPE popen_sigchld_handler (int);
+void popen_sigchld_handler (int);
 #endif
-RETSIGTYPE popen_timeout_alarm_handler (int);
+void popen_timeout_alarm_handler (int);
 
 #include <stdarg.h>                                                     /* ANSI C header file */
 #include <fcntl.h>
@@ -104,7 +105,7 @@ spopen (const char *cmdstring)
 #endif
 
         env[0] = strdup("LC_ALL=C");
-        env[1] = '\0';
+        env[1] = NULL;
 
         /* if no command was passed, return with no error */
         if (cmdstring == NULL)
@@ -177,8 +178,7 @@ spopen (const char *cmdstring)
         }
         argv[i] = NULL;
 
-        if(maxfd == 0)
-                maxfd = open_max();
+        long maxfd = mp_open_max();
 
         if (childpid == NULL) {                         /* first time through */
                 if ((childpid = calloc ((size_t)maxfd, sizeof (pid_t))) == NULL)
@@ -266,7 +266,7 @@ spclose (FILE * fp)
 }
 
 #ifdef REDHAT_SPOPEN_ERROR
-RETSIGTYPE
+void
 popen_sigchld_handler (int signo)
 {
         if (signo == SIGCHLD)
@@ -274,7 +274,7 @@ popen_sigchld_handler (int signo)
 }
 #endif
 
-RETSIGTYPE
+void
 popen_timeout_alarm_handler (int signo)
 {
         int fh;
diff --git a/plugins/popen.h b/plugins/popen.h
index a5dd8fa..1ea6963 100644
--- a/plugins/popen.h
+++ b/plugins/popen.h
@@ -5,7 +5,7 @@
 
 FILE *spopen (const char *);
 int spclose (FILE *);
-RETSIGTYPE popen_timeout_alarm_handler (int);
+void popen_timeout_alarm_handler (int);
 
 pid_t *childpid=NULL;
 int *child_stderr_array=NULL;
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 102191e..ed49bb9 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -60,6 +60,8 @@
 # define SIG_ERR ((Sigfunc *)-1)
 #endif
 
+#include "../lib/maxfd.h"
+
 /* This variable must be global, since there's no way the caller
  * can forcibly slay a dead or ungainly running program otherwise.
  * Multithreading apps and plugins can initialize it (via NP_RUNCMD_INIT)
@@ -88,8 +90,7 @@ extern void die (int, const char *, ...)
  * through this api and thus achieve async-safeness throughout the api */
 void np_runcmd_init(void)
 {
-        if(maxfd == 0)
-                maxfd = open_max();
+  long maxfd = mp_open_max();
         if(!np_pids) np_pids = calloc(maxfd, sizeof(pid_t));
 }
 
@@ -114,7 +115,7 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
         if(!np_pids) NP_RUNCMD_INIT;
 
         env[0] = strdup("LC_ALL=C");
-        env[1] = '\0';
+        env[1] = NULL;
 
         /* make copy of command string so strtok() doesn't silently modify it */
         /* (the calling program may want to access it later) */
@@ -192,6 +193,7 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
                 /* close all descriptors in np_pids[]
                  * This is executed in a separate address space (pure child),
                  * so we don't have to worry about async safety */
+    long maxfd = mp_open_max();
                 for (i = 0; i < maxfd; i++)
                         if(np_pids[i] > 0)
                                 close (i);
@@ -219,6 +221,7 @@ np_runcmd_close(int fd)
         pid_t pid;
 
         /* make sure this fd was opened by popen() */
+  long maxfd = mp_open_max();
         if(fd < 0 || fd > maxfd || !np_pids || (pid = np_pids[fd]) == 0)
                 return -1;
 
@@ -237,12 +240,12 @@ np_runcmd_close(int fd)
 void
 runcmd_timeout_alarm_handler (int signo)
 {
-        size_t i;
 
         if (signo == SIGALRM)
                 puts(_("CRITICAL - Plugin timed out while executing system call"));
 
-        if(np_pids) for(i = 0; i < maxfd; i++) {
+  long maxfd = mp_open_max();
+        if(np_pids) for(long int i = 0; i < maxfd; i++) {
                 if(np_pids[i] != 0) kill(np_pids[i], SIGKILL);
         }
 
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 666a012..6bc0ba8 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -31,9 +31,8 @@
 #include "netutils.h"
 
 #ifdef HAVE_SSL
-static SSL_CTX *c=NULL;
+static SSL_CTX *ctx=NULL;
 static SSL *s=NULL;
-static int initialized=0;
 
 int np_net_ssl_init(int sd) {
         return np_net_ssl_init_with_hostname(sd, NULL);
@@ -48,24 +47,24 @@ int np_net_ssl_init_with_hostname_and_version(int sd, char *host_name, int versi
 }
 
 int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int version, char *cert, char *privkey) {
-        const SSL_METHOD *method = NULL;
         long options = 0;
 
+        if ((ctx = SSL_CTX_new(TLS_client_method())) == NULL) {
+                printf("%s\n", _("CRITICAL - Cannot create SSL context."));
+                return STATE_CRITICAL;
+        }
+
         switch (version) {
         case MP_SSLv2: /* SSLv2 protocol */
-#if defined(USE_GNUTLS) || defined(OPENSSL_NO_SSL2)
                 printf("%s\n", _("UNKNOWN - SSL protocol version 2 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
-                method = SSLv2_client_method();
-                break;
-#endif
         case MP_SSLv3: /* SSLv3 protocol */
 #if defined(OPENSSL_NO_SSL3)
                 printf("%s\n", _("UNKNOWN - SSL protocol version 3 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
 #else
-                method = SSLv3_client_method();
+                SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
+                SSL_CTX_set_max_proto_version(ctx, SSL3_VERSION);
                 break;
 #endif
         case MP_TLSv1: /* TLSv1 protocol */
@@ -73,7 +72,8 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
                 printf("%s\n", _("UNKNOWN - TLS protocol version 1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
 #else
-                method = TLSv1_client_method();
+                SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
+                SSL_CTX_set_max_proto_version(ctx, TLS1_VERSION);
                 break;
 #endif
         case MP_TLSv1_1: /* TLSv1.1 protocol */
@@ -81,7 +81,8 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
                 printf("%s\n", _("UNKNOWN - TLS protocol version 1.1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
 #else
-                method = TLSv1_1_client_method();
+                SSL_CTX_set_min_proto_version(ctx, TLS1_1_VERSION);
+                SSL_CTX_set_max_proto_version(ctx, TLS1_1_VERSION);
                 break;
 #endif
         case MP_TLSv1_2: /* TLSv1.2 protocol */
@@ -89,7 +90,8 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
                 printf("%s\n", _("UNKNOWN - TLS protocol version 1.2 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
 #else
-                method = TLSv1_2_client_method();
+                SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION);
+                SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION);
                 break;
 #endif
         case MP_TLSv1_2_OR_NEWER:
@@ -97,56 +99,43 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
                 printf("%s\n", _("UNKNOWN - Disabling TLSv1.1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
 #else
-                options |= SSL_OP_NO_TLSv1_1;
+                SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION);
+                break;
 #endif
-                /* FALLTHROUGH */
         case MP_TLSv1_1_OR_NEWER:
 #if !defined(SSL_OP_NO_TLSv1)
                 printf("%s\n", _("UNKNOWN - Disabling TLSv1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
 #else
-                options |= SSL_OP_NO_TLSv1;
+                SSL_CTX_set_min_proto_version(ctx, TLS1_1_VERSION);
+                break;
 #endif
-                /* FALLTHROUGH */
         case MP_TLSv1_OR_NEWER:
 #if defined(SSL_OP_NO_SSLv3)
-                options |= SSL_OP_NO_SSLv3;
+                SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
+                break;
 #endif
-                /* FALLTHROUGH */
         case MP_SSLv3_OR_NEWER:
 #if defined(SSL_OP_NO_SSLv2)
-                options |= SSL_OP_NO_SSLv2;
+                SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
+                break;
 #endif
-        case MP_SSLv2_OR_NEWER:
-                /* FALLTHROUGH */
-        default: /* Default to auto negotiation */
-                method = SSLv23_client_method();
-        }
-        if (!initialized) {
-                /* Initialize SSL context */
-                SSLeay_add_ssl_algorithms();
-                SSL_load_error_strings();
-                OpenSSL_add_all_algorithms();
-                initialized = 1;
-        }
-        if ((c = SSL_CTX_new(method)) == NULL) {
-                printf("%s\n", _("CRITICAL - Cannot create SSL context."));
-                return STATE_CRITICAL;
         }
+
         if (cert && privkey) {
 #ifdef USE_OPENSSL
-                if (!SSL_CTX_use_certificate_chain_file(c, cert)) {
+                if (!SSL_CTX_use_certificate_chain_file(ctx, cert)) {
 #elif  USE_GNUTLS
-                if (!SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM)) {
+                if (!SSL_CTX_use_certificate_file(ctx, cert, SSL_FILETYPE_PEM)) {
 #else
 #error Unported for unknown SSL library
 #endif
                         printf ("%s\n", _("CRITICAL - Unable to open certificate chain file!\n"));
                         return STATE_CRITICAL;
                 }
-                SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM);
+                SSL_CTX_use_PrivateKey_file(ctx, privkey, SSL_FILETYPE_PEM);
 #ifdef USE_OPENSSL
-                if (!SSL_CTX_check_private_key(c)) {
+                if (!SSL_CTX_check_private_key(ctx)) {
                         printf ("%s\n", _("CRITICAL - Private key does not seem to match certificate!\n"));
                         return STATE_CRITICAL;
                 }
@@ -155,9 +144,9 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
 #ifdef SSL_OP_NO_TICKET
         options |= SSL_OP_NO_TICKET;
 #endif
-        SSL_CTX_set_options(c, options);
-        SSL_CTX_set_mode(c, SSL_MODE_AUTO_RETRY);
-        if ((s = SSL_new(c)) != NULL) {
+        SSL_CTX_set_options(ctx, options);
+        SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
+        if ((s = SSL_new(ctx)) != NULL) {
 #ifdef SSL_set_tlsext_host_name
                 if (host_name != NULL)
                         SSL_set_tlsext_host_name(s, host_name);
@@ -184,9 +173,9 @@ void np_net_ssl_cleanup() {
 #endif
                 SSL_shutdown(s);
                 SSL_free(s);
-                if (c) {
-                        SSL_CTX_free(c);
-                        c=NULL;
+                if (ctx) {
+                        SSL_CTX_free(ctx);
+                        ctx=NULL;
                 }
                 s=NULL;
         }
diff --git a/plugins/t/check_curl.t b/plugins/t/check_curl.t
index eae98cc..7a930a4 100644
--- a/plugins/t/check_curl.t
+++ b/plugins/t/check_curl.t
@@ -205,9 +205,9 @@ SKIP: {
         like  ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' );
         like  ( $res->output, '/time_ssl=[\d\.]+/', 'Extended Performance Data SSL Output OK' );
 
-        $res = NPTest->testCmd( "./$plugin -H www.mozilla.com -u /firefox -f curl" );
+        $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org -u /download.html -f follow" );
         is( $res->return_code, 0, "Redirection based on location is okay");
 
-        $res = NPTest->testCmd( "./$plugin -H www.mozilla.com --extended-perfdata" );
+        $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org --extended-perfdata" );
         like  ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' );
 }
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index ca035ce..9eb77ce 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -23,11 +23,11 @@ my $mountpoint2_valid = getTestParameter( "NP_MOUNTPOINT2_VALID", "Path to anoth
 if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") {
         plan skip_all => "Need 2 mountpoints to test";
 } else {
-        plan tests => 88;
+        plan tests => 94;
 }
 
-$result = NPTest->testCmd( 
-        "./check_disk -w 1% -c 1% -p $mountpoint_valid -w 1% -c 1% -p $mountpoint2_valid" 
+$result = NPTest->testCmd(
+        "./check_disk -w 1% -c 1% -p $mountpoint_valid -w 1% -c 1% -p $mountpoint2_valid"
         );
 cmp_ok( $result->return_code, "==", 0, "Checking two mountpoints (must have at least 1% free in space and inodes)");
 my $c = 0;
@@ -44,7 +44,7 @@ my @perf_data = sort(split(/ /, $result->perf_output));
 # Calculate avg_free free on mountpoint1 and mountpoint2
 # because if you check in the middle, you should get different errors
 $_ = $result->output;
-my ($free_on_mp1, $free_on_mp2) = (m/\((\d+)%.*\((\d+)%/);
+my ($free_on_mp1, $free_on_mp2) = (m/\((\d+\.\d+)%.*\((\d+\.\d+)%/);
 die "Cannot parse output: $_" unless ($free_on_mp1 && $free_on_mp2);
 my $avg_free = ceil(($free_on_mp1+$free_on_mp2)/2);
 my ($more_free, $less_free);
@@ -103,8 +103,8 @@ is ($crit_percth_data, int((1-10/100)*$total_percth_data), "Wrong critical in pe
 
 
 # Check when order of mount points are reversed, that perf data remains same
-$result = NPTest->testCmd( 
-        "./check_disk -w 1% -c 1% -p $mountpoint2_valid -w 1% -c 1% -p $mountpoint_valid" 
+$result = NPTest->testCmd(
+        "./check_disk -w 1% -c 1% -p $mountpoint2_valid -w 1% -c 1% -p $mountpoint_valid"
         );
 @_ = sort(split(/ /, $result->perf_output));
 is_deeply( \@perf_data, \@_, "perf data for both filesystems same when reversed");
@@ -119,8 +119,12 @@ like  ( $result->only_output, qr/$more_free/, "Have disk name in text");
 
 $result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free -p $less_free" );
 cmp_ok( $result->return_code, '==', 0, "At least 1 MB available on $more_free and $less_free");
+
 $_ = $result->output;
+
 my ($free_mb_on_mp1, $free_mb_on_mp2) = (m/(\d+)MiB .* (\d+)MiB /g);
+die "Cannot parse output: $_" unless ($free_mb_on_mp1 && $free_mb_on_mp2);
+
 my $free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2;
 
 
@@ -134,8 +138,8 @@ cmp_ok( $result->return_code, '==', 0, "Old syntax okay" );
 $result = NPTest->testCmd( "./check_disk -w 1% -c 1% -p $more_free" );
 cmp_ok( $result->return_code, "==", 0, "At least 1% free" );
 
-$result = NPTest->testCmd( 
-        "./check_disk -w 1% -c 1% -p $more_free -w 100% -c 100% -p $less_free" 
+$result = NPTest->testCmd(
+        "./check_disk -w 1% -c 1% -p $more_free -w 100% -c 100% -p $less_free"
         );
 cmp_ok( $result->return_code, "==", 2, "Get critical on less_free mountpoint $less_free" );
 like( $result->output, $failureOutput, "Right output" );
@@ -151,14 +155,14 @@ $result = NPTest->testCmd(
         );
 cmp_ok( $result->return_code, '==', 0, "Get ok on more_free mountpoint, when checking avg_free");
 
-$result = NPTest->testCmd( 
-        "./check_disk -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free" 
+$result = NPTest->testCmd(
+        "./check_disk -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free"
         );
 cmp_ok( $result->return_code, "==", 1, "Combining above two tests, get warning");
 my $all_disks = $result->output;
 
 $result = NPTest->testCmd(
-        "./check_disk -e -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free" 
+        "./check_disk -e -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free"
         );
 isnt( $result->output, $all_disks, "-e gives different output");
 
@@ -240,7 +244,7 @@ TODO: {
         cmp_ok( $result->return_code, '==', 3, "Invalid command line options" );
 }
 
-$result = NPTest->testCmd( 
+$result = NPTest->testCmd(
         "./check_disk -p $mountpoint_valid -w 10% -c 15%"
         );
 cmp_ok( $result->return_code, "==", 3, "Invalid options: -p must come after thresholds" );
@@ -311,8 +315,8 @@ $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -C -w 0% -c 0% -p $mountpoi
 like( $result->output, '/;.*;\|/', "-C selects partitions if -p is not given");
 
 # grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit
-$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all + 1) ."-g group -p $mountpoint_valid -p $mountpoint2_valid" );
-cmp_ok( $result->return_code, '==', 2, "grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit");
+$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all + 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
+cmp_ok( $result->return_code, '==', 2, "grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit\nInstead received: " . $result->output);
 
 # grouping: exit warning if the sum of free megs on mp1+mp2 is between -w and -c
 $result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all - 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
@@ -322,7 +326,7 @@ cmp_ok( $result->return_code, '==', 1, "grouping: exit warning if the sum of fre
 $result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all - 1) ." -c ". ($free_mb_on_all - 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
 cmp_ok( $result->return_code, '==', 0, "grouping: exit ok if the sum of free megs on mp1+mp2 is more than warn/crit");
 
-# grouping: exit unknown if group name is given after -p 
+# grouping: exit unknown if group name is given after -p
 $result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all - 1) ." -c ". ($free_mb_on_all - 1) ." -p $mountpoint_valid -g group -p $mountpoint2_valid" );
 cmp_ok( $result->return_code, '==', 3, "Invalid options: -p must come after groupname");
 
@@ -355,17 +359,17 @@ like( $result->output, qr/$mountpoint2_valid/,"ignore: output data does have $mo
 # ignore-missing: exit okay, when fs is not accessible
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -p /bob");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for not existing filesystem /bob");
-like( $result->output, '/^DISK OK - No disks were found for provided parameters; - ignored paths: /bob;.*$/', 'Output OK');
+like( $result->output, '/^DISK OK - No disks were found for provided parameters - ignored paths: /bob;.*$/', 'Output OK');
 
 # ignore-missing: exit okay, when regex does not match
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -r /bob");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
-like( $result->output, '/^DISK OK - No disks were found for provided parameters;.*$/', 'Output OK');
+like( $result->output, '/^DISK OK - No disks were found for provided parameters.*$/', 'Output OK');
 
 # ignore-missing: exit okay, when fs with exact match (-E) is not found
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -E -p /etc");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay when exact match does not find fs");
-like( $result->output, '/^DISK OK - No disks were found for provided parameters; - ignored paths: /etc;.*$/', 'Output OK');
+like( $result->output, '/^DISK OK - No disks were found for provided parameters - ignored paths: /etc;.*$/', 'Output OK');
 
 # ignore-missing: exit okay, when checking one existing fs and one non-existing fs (regex)
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -r '/bob' -r '^/\$'");
@@ -375,4 +379,19 @@ like( $result->output, '/^DISK OK - free space: \/ .*$/', 'Output OK');
 # ignore-missing: exit okay, when checking one existing fs and one non-existing fs (path)
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -p '/bob' -p '/'");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
-like( $result->output, '/^DISK OK - free space: / .*; - ignored paths: /bob;.*$/', 'Output OK');
\ No newline at end of file
+like( $result->output, '/^DISK OK - free space: / .*; - ignored paths: /bob;.*$/', 'Output OK');
+
+# ignore-missing: exit okay, when checking one non-existing fs (path) and one ignored
+$result = NPTest->testCmd( "./check_disk -n -w 0% -c 0% -r /dummy -i /dummy2");
+cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
+like( $result->output, '/^DISK OK - No disks were found for provided parameters\|$/', 'Output OK');
+
+# ignore-missing: exit okay, when regex match does not find anything
+$result = NPTest->testCmd( "./check_disk -n -e -l -w 10% -c 5% -W 10% -K 5% -r /dummy");
+cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
+like( $result->output, '/^DISK OK\|$/', 'Output OK');
+
+# ignore-missing: exit okay, when regex match does not find anything
+$result = NPTest->testCmd( "./check_disk -n -l -w 10% -c 5% -W 10% -K 5% -r /dummy");
+cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
+like( $result->output, '/^DISK OK - No disks were found for provided parameters\|$/', 'Output OK');
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index 1f2fbdf..6ab4a5b 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -166,10 +166,10 @@ SKIP: {
         like  ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' );
         like  ( $res->output, '/time_ssl=[\d\.]+/', 'Extended Performance Data SSL Output OK' );
 
-        $res = NPTest->testCmd( "./$plugin -H www.mozilla.com -u /firefox -f follow" );
+        $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org -u /download.html -f follow" );
         is( $res->return_code, 0, "Redirection based on location is okay");
 
-        $res = NPTest->testCmd( "./$plugin -H www.mozilla.com --extended-perfdata" );
+        $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org --extended-perfdata" );
         like  ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' );
 }
 
diff --git a/plugins/t/check_imap.t b/plugins/t/check_imap.t
index 7c74e56..cf2f81c 100644
--- a/plugins/t/check_imap.t
+++ b/plugins/t/check_imap.t
@@ -25,7 +25,7 @@ $t = NPTest->testCmd( "./check_imap $host_tcp_imap -p 143 -wt 9 -ct 9 -to 10 -e
 cmp_ok( $t->return_code, '==', 0, "Check old parameter options" );
 
 $t = NPTest->testCmd( "./check_imap $host_nonresponsive" );
-cmp_ok( $t->return_code, '==', 2, "Get error with non reponsive host" );
+cmp_ok( $t->return_code, '==', 2, "Get error with non responsive host" );
 
 $t = NPTest->testCmd( "./check_imap $hostname_invalid" );
 cmp_ok( $t->return_code, '==', 2, "Invalid hostname" );
diff --git a/plugins/t/check_ssh.t b/plugins/t/check_ssh.t
index a5cd23c..907d33a 100644
--- a/plugins/t/check_ssh.t
+++ b/plugins/t/check_ssh.t
@@ -8,34 +8,116 @@ use strict;
 use Test::More;
 use NPTest;
 
+my $res;
+
 # Required parameters
-my $ssh_host           = getTestParameter("NP_SSH_HOST", "A host providing SSH service", "localhost");
-my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname of system not responsive to network requests", "10.0.0.1" );
-my $hostname_invalid   = getTestParameter("NP_HOSTNAME_INVALID", "An invalid (not known to DNS) hostname", "nosuchhost" );
+my $ssh_host           = getTestParameter("NP_SSH_HOST",
+                                          "A host providing SSH service",
+                                          "localhost");
+
+my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE",
+                                          "The hostname of system not responsive to network requests",
+                                          "10.0.0.1" );
+
+my $hostname_invalid   = getTestParameter("NP_HOSTNAME_INVALID",
+                                          "An invalid (not known to DNS) hostname",
+                                          "nosuchhost" );
+
+
+plan tests => 14 + 6;
+
+SKIP: {
+        skip "SSH_HOST must be defined", 6 unless $ssh_host;
+        my $result = NPTest->testCmd(
+                "./check_ssh -H $ssh_host"
+                );
+        cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+        like($result->output, '/^SSH OK - /', "Status text if command returned none (OK)");
+
+
+        $result = NPTest->testCmd(
+                "./check_ssh -H $host_nonresponsive -t 2"
+                );
+        cmp_ok($result->return_code, '==', 2, "Exit with return code 0 (OK)");
+        like($result->output, '/^CRITICAL - Socket timeout after 2 seconds/', "Status text if command returned none (OK)");
+
+
+
+        $result = NPTest->testCmd(
+                "./check_ssh -H $hostname_invalid -t 2"
+                );
+        cmp_ok($result->return_code, '==', 3, "Exit with return code 0 (OK)");
+        like($result->output, '/^check_ssh: Invalid hostname/', "Status text if command returned none (OK)");
+
 
+}
+SKIP: {
 
-plan skip_all => "SSH_HOST must be defined" unless $ssh_host;
-plan tests    => 6;
+        skip "No netcat available", 14 unless (system("which nc > /dev/null") == 0);
 
+        # netcat on linux (on debian) will just keep the socket open if not advised otherwise
+        # therefore we add -q to close it after two seconds after receiving the EOF from input
+        my $nc_flags = "-l 5003 -N";
+        #A valid protocol version control string has the form
+        #       SSH-protoversion-softwareversion SP comments CR LF
+        #
+        # where `comments` is optional, protoversion is the SSH protocol version and
+        # softwareversion is an arbitrary string representing the server software version
+        open(NC, "echo 'SSH-2.0-nagiosplug.ssh.0.1' | nc ${nc_flags}|");
+        sleep 0.1;
+        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
+        cmp_ok( $res->return_code, '==', 0, "Got SSH protocol version control string");
+        like( $res->output, '/^SSH OK - nagiosplug.ssh.0.1 \(protocol 2.0\)/', "Output OK");
+        close NC;
 
-my $result = NPTest->testCmd(
-    "./check_ssh -H $ssh_host"
-    );
-cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
-like($result->output, '/^SSH OK - /', "Status text if command returned none (OK)");
+        open(NC, "echo 'SSH-2.0-3.2.9.1' | nc ${nc_flags}|");
+        sleep 0.1;
+        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
+        cmp_ok( $res->return_code, "==", 0, "Got SSH protocol version control string with non-alpha softwareversion string");
+        like( $res->output, '/^SSH OK - 3.2.9.1 \(protocol 2.0\)/', "Output OK for non-alpha softwareversion string");
+        close NC;
 
+        open(NC, "echo 'SSH-2.0-nagiosplug.ssh.0.1 this is a comment' | nc ${nc_flags} |");
+        sleep 0.1;
+        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003 -r nagiosplug.ssh.0.1" );
+        cmp_ok( $res->return_code, '==', 0, "Got SSH protocol version control string, and parsed comment appropriately");
+        like( $res->output, '/^SSH OK - nagiosplug.ssh.0.1 \(protocol 2.0\)/', "Output OK");
+        close NC;
 
-$result = NPTest->testCmd(
-    "./check_ssh -H $host_nonresponsive -t 2"
-    );
-cmp_ok($result->return_code, '==', 2, "Exit with return code 0 (OK)");
-like($result->output, '/^CRITICAL - Socket timeout after 2 seconds/', "Status text if command returned none (OK)");
+        open(NC, "echo 'SSH-' | nc ${nc_flags}|");
+        sleep 0.1;
+        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
+        cmp_ok( $res->return_code, '==', 2, "Got invalid SSH protocol version control string");
+        like( $res->output, '/^SSH CRITICAL/', "Output OK");
+        close NC;
 
+        open(NC, "echo '' | nc ${nc_flags}|");
+        sleep 0.1;
+        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
+        cmp_ok( $res->return_code, '==', 2, "No version control string received");
+        like( $res->output, '/^SSH CRITICAL - No version control string received/', "Output OK");
+        close NC;
 
+        open(NC, "echo 'Not a version control string' | nc ${nc_flags}|");
+        sleep 0.1;
+        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
+        cmp_ok( $res->return_code, '==', 2, "No version control string received");
+        like( $res->output, '/^SSH CRITICAL - No version control string received/', "Output OK");
+        close NC;
 
-$result = NPTest->testCmd(
-    "./check_ssh -H $hostname_invalid -t 2"
-    );
-cmp_ok($result->return_code, '==', 3, "Exit with return code 0 (OK)");
-like($result->output, '/^check_ssh: Invalid hostname/', "Status text if command returned none (OK)");
 
+        #RFC 4253 permits servers to send any number of data lines prior to sending the protocol version control string
+        open(NC, "{ echo 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'; sleep 0.5;
+                echo 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB'; sleep 0.5;
+                echo 'CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC'; sleep 0.2;
+                echo 'DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD'; sleep 0.3;
+                printf 'EEEEEEEEEEEEEEEEEE'; sleep 0.2;
+                printf 'EEEEEEEEEEEEEEEEEE\n'; sleep 0.2;
+                echo 'Some\nPrepended\nData\nLines\n'; sleep 0.2;
+                echo 'SSH-2.0-nagiosplug.ssh.0.2';} | nc ${nc_flags}|");
+        sleep 0.1;
+        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
+        cmp_ok( $res->return_code, '==', 0, "Got delayed SSH protocol version control string");
+        like( $res->output, '/^SSH OK - nagiosplug.ssh.0.2 \(protocol 2.0\)/', "Output OK");
+        close NC;
+}
diff --git a/plugins/t/check_swap.t b/plugins/t/check_swap.t
index de9e0f0..1878038 100644
--- a/plugins/t/check_swap.t
+++ b/plugins/t/check_swap.t
@@ -5,7 +5,7 @@
 #
 
 use strict;
-use Test::More tests => 8;
+use Test::More tests => 14;
 use NPTest;
 
 my $successOutput = '/^SWAP OK - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\)/';
@@ -14,6 +14,10 @@ my $warnOutput    = '/^SWAP WARNING - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\)
 
 my $result;
 
+$result = NPTest->testCmd( "./check_swap" );                                    # Always OK
+cmp_ok( $result->return_code, "==", 0, "Always OK" );
+like( $result->output, $successOutput, "Right output" );
+
 $result = NPTest->testCmd( "./check_swap -w 1048576 -c 1048576" );              # 1 MB free
 cmp_ok( $result->return_code, "==", 0, "At least 1MB free" );
 like( $result->output, $successOutput, "Right output" );
@@ -29,3 +33,11 @@ like( $result->output, $failureOutput, "Right output" );
 $result = NPTest->testCmd( "./check_swap -w 100% -c 1%" );                      # 100% (always warn)
 cmp_ok( $result->return_code, "==", 1, 'Get warning because not 100% free' );
 like( $result->output, $warnOutput, "Right output" );
+
+$result = NPTest->testCmd( "./check_swap -w 100%" );                            # 100% (single threshold, always warn)
+cmp_ok( $result->return_code, "==", 1, 'Get warning because not 100% free' );
+like( $result->output, $warnOutput, "Right output" );
+
+$result = NPTest->testCmd( "./check_swap -c 100%" );                            # 100% (single threshold, always critical)
+cmp_ok( $result->return_code, "==", 2, 'Get critical because not 100% free' );
+like( $result->output, $failureOutput, "Right output" );
diff --git a/plugins/t/check_users.t b/plugins/t/check_users.t
index 088f3b5..21c3e53 100644
--- a/plugins/t/check_users.t
+++ b/plugins/t/check_users.t
@@ -2,7 +2,7 @@
 #
 # Logged in Users Tests via check_users
 #
-# Trick: This ckeck requires at least 1 user logged in. These commands should
+# Trick: This check requires at least 1 user logged in. These commands should
 #        leave a session open forever in the background:
 #
 #   $ ssh -tt localhost </dev/null >/dev/null 2>/dev/null &
@@ -13,10 +13,11 @@ use Test;
 use NPTest;
 
 use vars qw($tests);
-BEGIN {$tests = 8; plan tests => $tests}
+BEGIN {$tests = 12; plan tests => $tests}
 
 my $successOutput = '/^USERS OK - [0-9]+ users currently logged in/';
 my $failureOutput = '/^USERS CRITICAL - [0-9]+ users currently logged in/';
+my $wrongOptionOutput = '/Usage:/';
 
 my $t;
 
@@ -24,6 +25,8 @@ $t += checkCmd( "./check_users 1000 1000", 0, $successOutput );
 $t += checkCmd( "./check_users    0    0", 2, $failureOutput );
 $t += checkCmd( "./check_users -w 0:1000 -c 0:1000", 0, $successOutput );
 $t += checkCmd( "./check_users -w 0:0 -c 0:0", 2, $failureOutput );
+$t += checkCmd( "./check_users -w 0:1000", 3, $wrongOptionOutput);
+$t += checkCmd( "./check_users", 3, $wrongOptionOutput);
 
 exit(0) if defined($Test::Harness::VERSION);
 exit($tests - $t);
diff --git a/plugins/tests/check_curl.t b/plugins/tests/check_curl.t
index 72f2b7c..eaa9f51 100755
--- a/plugins/tests/check_curl.t
+++ b/plugins/tests/check_curl.t
@@ -9,7 +9,7 @@
 # Country Name (2 letter code) [AU]:DE
 # State or Province Name (full name) [Some-State]:Bavaria
 # Locality Name (eg, city) []:Munich
-# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins
+# Organization Name (eg, company) [Internet Widgets Pty Ltd]:Monitoring Plugins
 # Organizational Unit Name (eg, section) []:
 # Common Name (e.g. server FQDN or YOUR name) []:Monitoring Plugins
 # Email Address []:devel@monitoring-plugins.org
@@ -21,7 +21,7 @@ use FindBin qw($Bin);
 
 $ENV{'LC_TIME'} = "C";
 
-my $common_tests = 73;
+my $common_tests = 75;
 my $ssl_only_tests = 8;
 # Check that all dependent modules are available
 eval "use HTTP::Daemon 6.01;";
@@ -178,6 +178,11 @@ sub run_server {
                                 $c->send_basic_header;
                                 $c->send_crlf;
                                 $c->send_response(HTTP::Response->new( 200, 'OK', undef, 'redirected' ));
+                        } elsif ($r->url->path eq "/redirect_rel") {
+                                $c->send_basic_header(302);
+                                $c->send_header("Location", "/redirect2" );
+                                $c->send_crlf;
+                                $c->send_response('moved to /redirect2');
                         } elsif ($r->url->path eq "/redir_timeout") {
                                 $c->send_redirect( "/timeout" );
                         } elsif ($r->url->path eq "/timeout") {
@@ -471,9 +476,12 @@ sub run_common_tests {
         is( $result->return_code, 0, $cmd);
         like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
 
-  # These tests may block
-        print "ALRM\n";
+        $cmd = "$command -f follow -u /redirect_rel -s redirected";
+        $result = NPTest->testCmd( $cmd );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
 
+        # These tests may block
         # stickyport - on full urlS port is set back to 80 otherwise
         $cmd = "$command -f stickyport -u /redir_external -t 5 -s redirected";
         eval {
diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t
index 6078b27..6eaf85b 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -13,7 +13,7 @@ use IO::Socket::INET;
 
 $ENV{'LC_TIME'} = "C";
 
-my $common_tests = 71;
+my $common_tests = 73;
 my $virtual_port_tests = 8;
 my $ssl_only_tests = 12;
 my $chunked_encoding_special_tests = 1;
@@ -199,6 +199,11 @@ sub run_server {
                                         $c->send_basic_header;
                                         $c->send_crlf;
                                         $c->send_response(HTTP::Response->new( 200, 'OK', undef, 'redirected' ));
+                        } elsif ($r->url->path eq "/redirect_rel") {
+                                $c->send_basic_header(302);
+                                $c->send_header("Location", "/redirect2" );
+                                $c->send_crlf;
+                                $c->send_response('moved to /redirect2');
                                 } elsif ($r->url->path eq "/redir_timeout") {
                                         $c->send_redirect( "/timeout" );
                                 } elsif ($r->url->path eq "/timeout") {
@@ -515,6 +520,11 @@ sub run_common_tests {
         is( $result->return_code, 0, $cmd);
         like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
 
+        $cmd = "$command -f follow -u /redirect_rel -s redirected";
+        $result = NPTest->testCmd( $cmd );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+
   # These tests may block
         print "ALRM\n";
 
diff --git a/plugins/utils.c b/plugins/utils.c
index b4214c6..77d6a6f 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -23,13 +23,15 @@
 *****************************************************************************/
 
 #include "common.h"
-#include "utils.h"
+#include "./utils.h"
 #include "utils_base.h"
 #include <stdarg.h>
 #include <limits.h>
 #include <string.h>
 #include <errno.h>
 
+#include <stdbool.h>
+
 #include <arpa/inet.h>
 
 extern void print_usage (void);
@@ -147,98 +149,107 @@ print_revision (const char *command_name, const char *revision)
                  command_name, revision, PACKAGE, VERSION);
 }
 
-int
-is_numeric (char *number)
-{
+bool is_numeric (char *number) {
         char tmp[1];
         float x;
 
         if (!number)
-                return FALSE;
+                return false;
         else if (sscanf (number, "%f%c", &x, tmp) == 1)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
-int
-is_positive (char *number)
-{
+bool is_positive (char *number) {
         if (is_numeric (number) && atof (number) > 0.0)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
-int
-is_negative (char *number)
-{
+bool is_negative (char *number) {
         if (is_numeric (number) && atof (number) < 0.0)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
-int
-is_nonnegative (char *number)
-{
+bool is_nonnegative (char *number) {
         if (is_numeric (number) && atof (number) >= 0.0)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
-int
-is_percentage (char *number)
-{
+bool is_percentage (char *number) {
         int x;
         if (is_numeric (number) && (x = atof (number)) >= 0 && x <= 100)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
-int
-is_integer (char *number)
-{
+bool is_percentage_expression (const char str[]) {
+        if (!str) {
+                return false;
+        }
+
+        size_t len = strlen(str);
+
+        if (str[len-1] != '%') {
+                return false;
+        }
+
+        char *foo = calloc(sizeof(char), len + 1);
+
+        if (!foo) {
+                die (STATE_UNKNOWN, _("calloc failed \n"));
+        }
+
+        strcpy(foo, str);
+        foo[len-1] = '\0';
+
+        bool result = is_numeric(foo);
+
+        free(foo);
+
+        return result;
+}
+
+bool is_integer (char *number) {
         long int n;
 
         if (!number || (strspn (number, "-0123456789 ") != strlen (number)))
-                return FALSE;
+                return false;
 
         n = strtol (number, NULL, 10);
 
         if (errno != ERANGE && n >= INT_MIN && n <= INT_MAX)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
-int
-is_intpos (char *number)
-{
+bool is_intpos (char *number) {
         if (is_integer (number) && atoi (number) > 0)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
-int
-is_intneg (char *number)
-{
+bool is_intneg (char *number) {
         if (is_integer (number) && atoi (number) < 0)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
-int
-is_intnonneg (char *number)
-{
+bool is_intnonneg (char *number) {
         if (is_integer (number) && atoi (number) >= 0)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
 /*
@@ -246,19 +257,27 @@ is_intnonneg (char *number)
  * On success the number will be written to the _target_ address, if _target_ is not set
  * to NULL.
  */
-int is_int64(char *number, int64_t *target) {
+bool is_int64(char *number, int64_t *target) {
         errno = 0;
-        uint64_t tmp = strtoll(number, NULL, 10);
+        char *endptr = { 0 };
+
+        int64_t tmp = strtoll(number, &endptr, 10);
         if (errno != 0) {
+                return false;
+        }
+
+        if (*endptr == '\0') {
                 return 0;
         }
+
         if (tmp < INT64_MIN || tmp > INT64_MAX) {
-                return 0;
+                return false;
         }
+
         if (target != NULL) {
                 *target = tmp;
         }
-        return 1;
+        return true;
 }
 
 /*
@@ -266,40 +285,45 @@ int is_int64(char *number, int64_t *target) {
  * On success the number will be written to the _target_ address, if _target_ is not set
  * to NULL.
  */
-int is_uint64(char *number, uint64_t *target) {
+bool is_uint64(char *number, uint64_t *target) {
         errno = 0;
-        uint64_t tmp = strtoll(number, NULL, 10);
+        char *endptr = { 0 };
+        unsigned long long tmp = strtoull(number, &endptr, 10);
+
         if (errno != 0) {
-                return 0;
+                return false;
         }
-        if (tmp < 0 || tmp > UINT64_MAX) {
-                return 0;
+
+        if (*endptr != '\0') {
+                return false;
+        }
+
+        if (tmp > UINT64_MAX) {
+                return false;
         }
+
         if (target != NULL) {
-                *target = tmp;
+                *target = (uint64_t)tmp;
         }
-        return 1;
+
+        return true;
 }
 
-int
-is_intpercent (char *number)
-{
+bool is_intpercent (char *number) {
         int i;
         if (is_integer (number) && (i = atoi (number)) >= 0 && i <= 100)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
-int
-is_option (char *str)
-{
+bool is_option (char *str) {
         if (!str)
-                return FALSE;
+                return false;
         else if (strspn (str, "-") == 1 || strspn (str, "-") == 2)
-                return TRUE;
+                return true;
         else
-                return FALSE;
+                return false;
 }
 
 #ifdef NEED_GETTIMEOFDAY
@@ -804,19 +828,3 @@ char *sperfdata_int (const char *label,
 
         return data;
 }
-
-int
-open_max (void)
-{
-        errno = 0;
-        if (maxfd > 0)
-                return(maxfd);
-
-        if ((maxfd = sysconf (_SC_OPEN_MAX)) < 0) {
-                if (errno == 0)
-                        maxfd = DEFAULT_MAXFD;   /* it's indeterminate */
-        else
-                die (STATE_UNKNOWN, _("sysconf error for _SC_OPEN_MAX\n"));
-        }
-        return(maxfd);
-}
diff --git a/plugins/utils.h b/plugins/utils.h
index c76b321..f939e33 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -16,6 +16,8 @@ suite of plugins. */
 /* now some functions etc are being defined in ../lib/utils_base.c */
 #include "utils_base.h"
 
+#include <stdbool.h>
+
 
 #ifdef NP_EXTRA_OPTS
 /* Include extra-opts functions if compiled in */
@@ -34,21 +36,22 @@ extern time_t start_time, end_time;
 
 /* Test input types */
 
-int is_integer (char *);
-int is_intpos (char *);
-int is_intneg (char *);
-int is_intnonneg (char *);
-int is_intpercent (char *);
-int is_uint64(char *number, uint64_t *target);
-int is_int64(char *number, int64_t *target);
+bool is_integer (char *);
+bool is_intpos (char *);
+bool is_intneg (char *);
+bool is_intnonneg (char *);
+bool is_intpercent (char *);
+bool is_uint64(char *number, uint64_t *target);
+bool is_int64(char *number, int64_t *target);
 
-int is_numeric (char *);
-int is_positive (char *);
-int is_negative (char *);
-int is_nonnegative (char *);
-int is_percentage (char *);
+bool is_numeric (char *);
+bool is_positive (char *);
+bool is_negative (char *);
+bool is_nonnegative (char *);
+bool is_percentage (char *);
+bool is_percentage_expression (const char[]);
 
-int is_option (char *);
+bool is_option (char *);
 
 /* Generalized timer that will do milliseconds if available */
 #ifndef HAVE_STRUCT_TIMEVAL
@@ -106,8 +109,6 @@ char *sperfdata (const char *, double, const char *, char *, char *,
 char *sperfdata_int (const char *, int, const char *, char *, char *,
                      int, int, int, int);
 
-int open_max (void);
-
 /* The idea here is that, although not every plugin will use all of these, 
    most will or should.  Therefore, for consistency, these very common 
    options should have only these meanings throughout the overall suite */
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644
index 1074102..0000000
--- a/po/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-2003-07-02  gettextize  <bug-gnu-gettext@gnu.org>
-
-        * Makefile.in.in: New file, from gettext-0.11.4.
-        * boldquot.sed: New file, from gettext-0.11.4.
-        * en@boldquot.header: New file, from gettext-0.11.4.
-        * en@quot.header: New file, from gettext-0.11.4.
-        * insert-header.sin: New file, from gettext-0.11.4.
-        * quot.sed: New file, from gettext-0.11.4.
-        * remove-potcdate.sin: New file, from gettext-0.11.4.
-        * Rules-quot: New file, from gettext-0.11.4.
-
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index 1ce0c39..0000000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-fr de
-
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index 82864b2..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,395 +0,0 @@
-# -*- buffer-read-only: t -*- vi: set ro:
-# DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
-# functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
-# General Public License and is *not* in the public domain.
-#
-# Origin: gettext-0.15
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
-datadir = @datadir@
-localedir = @localedir@
-gettextsrcdir = $(datadir)/gettext/po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-mkinstalldirs = $(SHELL) @install_sh@ -d
-mkdir_p = @MKDIR_P@
-
-GMSGFMT_ = @GMSGFMT@
-GMSGFMT_no = @GMSGFMT@
-GMSGFMT_yes = @GMSGFMT_015@
-GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
-XGETTEXT_ = @XGETTEXT@
-XGETTEXT_no = @XGETTEXT@
-XGETTEXT_yes = @XGETTEXT_015@
-XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
-MSGMERGE_UPDATE = @MSGMERGE@ --update
-MSGINIT = msginit
-MSGCONV = msgconv
-MSGFILTER = msgfilter
-
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-UPDATEPOFILES = @UPDATEPOFILES@
-DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in remove-potcdate.sin \
-$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
-$(POFILES) $(GMOFILES) \
-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-
-# Makevars gets inserted here. (Don't remove this line!)
-
-.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-        @echo "$(MSGFMT) -c -o $@ $<"; \
-        $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
-.po.gmo:
-        @lang=`echo $* | sed -e 's,.*/,,'`; \
-        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-        echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-        cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
-.sin.sed:
-        sed -e '/^#/d' $< > t-$@
-        mv t-$@ $@
-
-
-all: all-@USE_NLS@
-
-all-yes: stamp-po
-all-no:
-
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
-# we don't want to bother translators with empty POT files). We assume that
-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
-        test ! -f $(srcdir)/$(DOMAIN).pot || \
-          test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
-        @test ! -f $(srcdir)/$(DOMAIN).pot || { \
-          echo "touch stamp-po" && \
-          echo timestamp > stamp-poT && \
-          mv stamp-poT stamp-po; \
-        }
-
-# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
-# otherwise packages like GCC can not be built if only parts of the source
-# have been downloaded.
-
-# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-        if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
-          msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
-        else \
-          msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
-        fi; \
-        $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-          --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-          --files-from=$(srcdir)/POTFILES.in \
-          --copyright-holder='$(COPYRIGHT_HOLDER)' \
-          --msgid-bugs-address="$$msgid_bugs_address"
-        test ! -f $(DOMAIN).po || { \
-          if test -f $(srcdir)/$(DOMAIN).pot; then \
-            sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-            sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-            if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-              rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-            else \
-              rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-              mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-            fi; \
-          else \
-            mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-          fi; \
-        }
-
-# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
-# every "make" invocation, only create it when it is missing.
-# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
-$(srcdir)/$(DOMAIN).pot:
-        $(MAKE) $(DOMAIN).pot-update
-
-# This target rebuilds a PO file if $(DOMAIN).pot has changed.
-# Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
-        @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-        if test -f "$(srcdir)/$${lang}.po"; then \
-          test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-          echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-          cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
-        else \
-          $(MAKE) $${lang}.po-create; \
-        fi
-
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-        if test "$(PACKAGE)" = "gettext-tools"; then \
-          $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-          for file in $(DISTFILES.common) Makevars.template; do \
-            $(INSTALL_DATA) $(srcdir)/$$file \
-                            $(DESTDIR)$(gettextsrcdir)/$$file; \
-          done; \
-          for file in Makevars; do \
-            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-          done; \
-        else \
-          : ; \
-        fi
-install-data-no: all
-install-data-yes: all
-        $(mkdir_p) $(DESTDIR)$(datadir)
-        @catalogs='$(CATALOGS)'; \
-        for cat in $$catalogs; do \
-          cat=`basename $$cat`; \
-          lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-          dir=$(localedir)/$$lang/LC_MESSAGES; \
-          $(mkdir_p) $(DESTDIR)$$dir; \
-          if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-          $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-          echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-          for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-            if test -n "$$lc"; then \
-              if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-                link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-                mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-                mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-                (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-                 for file in *; do \
-                   if test -f $$file; then \
-                     ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-                   fi; \
-                 done); \
-                rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-              else \
-                if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-                  :; \
-                else \
-                  rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-                  mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-                fi; \
-              fi; \
-              rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-              ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-              ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-              cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-              echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
-            fi; \
-          done; \
-        done
-
-install-strip: install
-
-installdirs: installdirs-exec installdirs-data
-installdirs-exec:
-installdirs-data: installdirs-data-@USE_NLS@
-        if test "$(PACKAGE)" = "gettext-tools"; then \
-          $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-        else \
-          : ; \
-        fi
-installdirs-data-no:
-installdirs-data-yes:
-        $(mkdir_p) $(DESTDIR)$(datadir)
-        @catalogs='$(CATALOGS)'; \
-        for cat in $$catalogs; do \
-          cat=`basename $$cat`; \
-          lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-          dir=$(localedir)/$$lang/LC_MESSAGES; \
-          $(mkdir_p) $(DESTDIR)$$dir; \
-          for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-            if test -n "$$lc"; then \
-              if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-                link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-                mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-                mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-                (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-                 for file in *; do \
-                   if test -f $$file; then \
-                     ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-                   fi; \
-                 done); \
-                rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-              else \
-                if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-                  :; \
-                else \
-                  rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-                  mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-                fi; \
-              fi; \
-            fi; \
-          done; \
-        done
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall: uninstall-exec uninstall-data
-uninstall-exec:
-uninstall-data: uninstall-data-@USE_NLS@
-        if test "$(PACKAGE)" = "gettext-tools"; then \
-          for file in $(DISTFILES.common) Makevars.template; do \
-            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-          done; \
-        else \
-          : ; \
-        fi
-uninstall-data-no:
-uninstall-data-yes:
-        catalogs='$(CATALOGS)'; \
-        for cat in $$catalogs; do \
-          cat=`basename $$cat`; \
-          lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-          for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-            rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-          done; \
-        done
-
-check: all
-
-info dvi ps pdf html tags TAGS ctags CTAGS ID:
-
-mostlyclean:
-        rm -f remove-potcdate.sed
-        rm -f stamp-poT
-        rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-        rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-        rm -f Makefile Makefile.in POTFILES *.mo
-
-maintainer-clean: distclean
-        @echo "This command is intended for maintainers to use;"
-        @echo "it deletes files that may require special tools to rebuild."
-        rm -f stamp-po $(GMOFILES)
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
-        $(MAKE) update-po
-        @$(MAKE) dist2
-# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
-        dists="$(DISTFILES)"; \
-        if test "$(PACKAGE)" = "gettext-tools"; then \
-          dists="$$dists Makevars.template"; \
-        fi; \
-        if test -f $(srcdir)/$(DOMAIN).pot; then \
-          dists="$$dists $(DOMAIN).pot stamp-po"; \
-        fi; \
-        if test -f $(srcdir)/ChangeLog; then \
-          dists="$$dists ChangeLog"; \
-        fi; \
-        for i in 0 1 2 3 4 5 6 7 8 9; do \
-          if test -f $(srcdir)/ChangeLog.$$i; then \
-            dists="$$dists ChangeLog.$$i"; \
-          fi; \
-        done; \
-        if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-        for file in $$dists; do \
-          if test -f $$file; then \
-            cp -p $$file $(distdir) || exit 1; \
-          else \
-            cp -p $(srcdir)/$$file $(distdir) || exit 1; \
-          fi; \
-        done
-
-update-po: Makefile
-        $(MAKE) $(DOMAIN).pot-update
-        test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-        $(MAKE) update-gmo
-
-# General rule for creating PO files.
-
-.nop.po-create:
-        @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
-        echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
-        exit 1
-
-# General rule for updating PO files.
-
-.nop.po-update:
-        @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-        if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
-        tmpdir=`pwd`; \
-        echo "$$lang:"; \
-        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-        echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-        cd $(srcdir); \
-        if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-          if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-            rm -f $$tmpdir/$$lang.new.po; \
-          else \
-            if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-              :; \
-            else \
-              echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-              exit 1; \
-            fi; \
-          fi; \
-        else \
-          echo "msgmerge for $$lang.po failed!" 1>&2; \
-          rm -f $$tmpdir/$$lang.new.po; \
-        fi
-
-$(DUMMYPOFILES):
-
-update-gmo: Makefile $(GMOFILES)
-        @:
-
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
-        cd $(top_builddir) \
-          && $(SHELL) ./config.status $(subdir)/$@.in po-directories
-
-force:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index b35f5ad..0000000
--- a/po/Makevars
+++ /dev/null
@@ -1,29 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --flag=error:3:c-format --flag=error_at_line:5:c-format --flag=asprintf:2:c-format --flag=vasprintf:2:c-format --no-location
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# 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 = 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 = devel@monitoring-plugins.org
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644
index 6e491d7..0000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,44 +0,0 @@
-plugins/check_by_ssh.c
-plugins/check_cluster.c
-plugins/check_dig.c
-plugins/check_disk.c
-plugins/check_dns.c
-plugins/check_dummy.c
-plugins/check_fping.c
-plugins/check_game.c
-plugins/check_hpjd.c
-plugins/check_http.c
-plugins/check_ldap.c
-plugins/check_load.c
-plugins/check_mrtg.c
-plugins/check_mrtgtraf.c
-plugins/check_mysql.c
-plugins/check_nagios.c
-plugins/check_nt.c
-plugins/check_ntp.c
-plugins/check_ntp_peer.c
-plugins/check_ntp_time.c
-plugins/check_nwstat.c
-plugins/check_overcr.c
-plugins/check_pgsql.c
-plugins/check_ping.c
-plugins/check_procs.c
-plugins/check_radius.c
-plugins/check_real.c
-plugins/check_smtp.c
-plugins/check_snmp.c
-plugins/check_ssh.c
-plugins/check_swap.c
-plugins/check_tcp.c
-plugins/check_time.c
-plugins/check_ups.c
-plugins/check_users.c
-plugins/check_ide_smart.c
-plugins/negate.c
-plugins/netutils.c
-plugins/popen.c
-plugins/urlize.c
-plugins/utils.c
-plugins/utils.h
-plugins-root/check_dhcp.c
-plugins-root/check_icmp.c
diff --git a/po/de.po b/po/de.po
deleted file mode 100644
index d597203..0000000
--- a/po/de.po
+++ /dev/null
@@ -1,5393 +0,0 @@
-# translation of de.po to
-# German Language Translation File.
-# This file is distributed under the same license as the nagios-plugins package.
-# Copyright (C) 2023 Nagios Plugin Development Group.
-# Karl DeBisschop <kdebisschop@users.sourceforge.net>, 2003, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
-"POT-Creation-Date: 2023-09-05 00:31+0200\n"
-"PO-Revision-Date: 2004-12-23 17:46+0100\n"
-"Last-Translator:  \n"
-"Language-Team: Monitoring Plugin Development Team <devel@monitoring-plugins.org>\n"
-"Language: de\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.3.1\n"
-
-msgid "Could not parse arguments"
-msgstr "Argumente konnten nicht ausgewertet werden"
-
-msgid "Cannot catch SIGALRM"
-msgstr "Konnte SIGALRM nicht erhalten"
-
-#, c-format
-msgid "SSH connection failed: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Remote command execution failed: %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n"
-msgstr ""
-
-#, c-format
-msgid "SSH WARNING: could not open %s\n"
-msgstr "SSH WARNING: Konnte %s nicht öffnen\n"
-
-#, c-format
-msgid "%s: Error parsing output\n"
-msgstr ""
-
-msgid "Timeout interval must be a positive integer"
-msgstr "Timeout interval muss ein positiver Integer sein"
-
-msgid "Port must be a positive integer"
-msgstr "Port muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "skip-stdout argument must be an integer"
-msgstr "skip-stdout argument muss ein Integer sein"
-
-#, fuzzy
-msgid "skip-stderr argument must be an integer"
-msgstr "skip-stderr argument muss ein Integer sein"
-
-#, c-format
-msgid "%s: You must provide a host name\n"
-msgstr "%s: Hostname muss angegeben werden\n"
-
-msgid "No remotecmd"
-msgstr "Kein remotecm"
-
-#, c-format
-msgid "%s: Argument limit of %d exceeded\n"
-msgstr ""
-
-#, fuzzy
-msgid "Can not (re)allocate 'commargv' buffer\n"
-msgstr "Konnte·url·nicht·zuweisen\n"
-
-#, 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"
-
-#, fuzzy, c-format
-msgid ""
-"%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"
-
-#, 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"
-
-msgid "tell ssh to use Protocol 1 [optional]"
-msgstr ""
-
-msgid "tell ssh to use Protocol 2 [optional]"
-msgstr ""
-
-msgid "Ignore all or (if specified) first n lines on STDOUT [optional]"
-msgstr ""
-
-msgid "Ignore all or (if specified) first n lines on STDERR [optional]"
-msgstr ""
-
-msgid "Exit with an warning, if there is an output on STDERR"
-msgstr ""
-
-msgid ""
-"tells ssh to fork rather than create a tty [optional]. This will always "
-"return OK if ssh is executed"
-msgstr ""
-
-msgid "command to execute on the remote machine"
-msgstr ""
-
-msgid "SSH user name on remote host [optional]"
-msgstr ""
-
-msgid "identity of an authorized key [optional]"
-msgstr ""
-
-msgid "external command file for monitoring [optional]"
-msgstr ""
-
-msgid "list of monitoring service names, separated by ':' [optional]"
-msgstr ""
-
-msgid "short name of host in the monitoring configuration [optional]"
-msgstr ""
-
-msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
-msgstr ""
-
-msgid "Tell ssh to use this configfile [optional]"
-msgstr ""
-
-msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
-msgstr ""
-
-msgid "Make connection problems return UNKNOWN instead of CRITICAL"
-msgstr ""
-
-msgid "The most common mode of use is to refer to a local identity file with"
-msgstr ""
-
-msgid "the '-i' option. In this mode, the identity pair should have a null"
-msgstr ""
-
-msgid "passphrase and the public key should be listed in the authorized_keys"
-msgstr ""
-
-msgid "file of the remote host. Usually the key will be restricted to running"
-msgstr ""
-
-msgid "only one command on the remote server. If the remote SSH server tracks"
-msgstr ""
-
-msgid "invocation arguments, the one remote program may be an agent that can"
-msgstr ""
-
-msgid "execute additional commands as proxy"
-msgstr ""
-
-msgid "To use passive mode, provide multiple '-C' options, and provide"
-msgstr ""
-
-msgid ""
-"all of -O, -s, and -n options (servicelist order must match '-C'options)"
-msgstr ""
-
-msgid "Examples:"
-msgstr ""
-
-msgid "Usage:"
-msgstr ""
-
-#, c-format
-msgid "Host/Service Cluster Plugin for Monitoring"
-msgstr ""
-
-msgid "Options:"
-msgstr ""
-
-msgid "Check service cluster status"
-msgstr ""
-
-msgid "Check host cluster status"
-msgstr ""
-
-msgid "Optional prepended text output (i.e. \"Host cluster\")"
-msgstr ""
-
-msgid "Specifies the range of hosts or services in cluster that must be in a"
-msgstr ""
-
-msgid "non-OK state in order to return a WARNING status level"
-msgstr ""
-
-msgid "non-OK state in order to return a CRITICAL status level"
-msgstr ""
-
-msgid "The status codes of the hosts or services in the cluster, separated by"
-msgstr ""
-
-msgid "commas"
-msgstr ""
-
-msgid "Notes:"
-msgstr ""
-
-msgid ""
-"Will alert critical if there are 3 or more service data points in a non-OK"
-msgstr ""
-
-msgid "state."
-msgstr ""
-
-#, c-format
-msgid "Looking for: '%s'\n"
-msgstr ""
-
-msgid "dig returned an error status"
-msgstr "dig hat einen Fehler zurückgegeben"
-
-msgid "Server not found in ANSWER SECTION"
-msgstr "Server nicht gefunden in ANSWER SECTION"
-
-msgid "No ANSWER SECTION found"
-msgstr "Keine ANSWER SECTION gefunden"
-
-#, fuzzy
-msgid "Probably a non-existent host/domain"
-msgstr "nicht existierender Host/Domain"
-
-#, fuzzy, c-format
-msgid "Port must be a positive integer - %s"
-msgstr "Port muss ein positiver Integer sein - %s"
-
-#, fuzzy, c-format
-msgid "Warning interval must be a positive integer - %s"
-msgstr "Warning interval muss ein positiver Integer sein - %s"
-
-#, fuzzy, c-format
-msgid "Critical interval must be a positive integer - %s"
-msgstr "Critical interval muss ein positiver Integer sein - %s"
-
-#, fuzzy, c-format
-msgid "Timeout interval must be a positive integer - %s"
-msgstr "Timeout interval muss ein positiver Integer sein - %s"
-
-#, fuzzy, c-format
-msgid "This plugin tests the DNS service on the specified host using dig"
-msgstr "Testet den DNS Dienst auf dem angegebenen Host mit dig"
-
-msgid "Force dig to only use IPv4 query transport"
-msgstr ""
-
-msgid "Force dig to only use IPv6 query transport"
-msgstr ""
-
-#, fuzzy
-msgid "Machine name to lookup"
-msgstr "zu prüfender Hostname"
-
-#, fuzzy
-msgid "Record type to lookup (default: A)"
-msgstr "abzufragender Datensatztyp (Default: A)"
-
-#, fuzzy
-msgid ""
-"An address expected to be in the answer section. If not set, uses whatever"
-msgstr ""
-"Adresse die in der ANSWER SECTION erwartet wird.wenn nicht gesetzt, "
-"ubernommen aus -l"
-
-msgid "was in -l"
-msgstr ""
-
-msgid "Pass STRING as argument(s) to dig"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "DISK %s: %s not found\n"
-msgstr "%s [%s nicht gefunden]"
-
-#, c-format
-msgid "CRITICAL"
-msgstr "CRITICAL"
-
-#, c-format
-msgid "unit type %s not known\n"
-msgstr "unbekannter unit type: %s\n"
-
-#, c-format
-msgid "failed allocating storage for '%s'\n"
-msgstr "konnte keinen Speicher für '%s' reservieren\n"
-
-#, c-format
-msgid "UNKNOWN"
-msgstr "UNKNOWN"
-
-msgid "Must set a threshold value before using -p\n"
-msgstr ""
-
-msgid "Must set -E before selecting paths\n"
-msgstr ""
-
-msgid "Must set group value before selecting paths\n"
-msgstr ""
-
-msgid ""
-"Paths need to be selected before using -i/-I. Use -A to select all paths "
-"explicitly"
-msgstr ""
-
-msgid "Could not compile regular expression"
-msgstr ""
-
-msgid "Must set a threshold value before using -r/-R\n"
-msgstr ""
-
-msgid "Regular expression did not match any path or disk"
-msgstr ""
-
-#, fuzzy
-msgid "Unknown argument"
-msgstr "Unbekanntes Argument"
-
-#, c-format
-msgid " for %s\n"
-msgstr ""
-
-#, 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"
-
-#, fuzzy
-msgid ""
-"and generates an alert if free space is less than one of the threshold values"
-msgstr ""
-"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte "
-"unterschritten wird."
-
-msgid "Exit with WARNING status if less than INTEGER units of disk are free"
-msgstr ""
-
-msgid "Exit with WARNING status if less than PERCENT of disk space is free"
-msgstr ""
-
-msgid "Exit with CRITICAL status if less than INTEGER units of disk are free"
-msgstr ""
-
-msgid "Exit with CRITICAL status if less than PERCENT of disk space is free"
-msgstr ""
-
-msgid "Exit with WARNING status if less than PERCENT of inode space is free"
-msgstr ""
-
-msgid "Exit with CRITICAL status if less than PERCENT of inode space is free"
-msgstr ""
-
-msgid ""
-"Mount point or block device as emitted by the mount(8) command (may be "
-"repeated)"
-msgstr ""
-
-msgid "Ignore device (only works if -p unspecified)"
-msgstr ""
-
-msgid "Clear thresholds"
-msgstr ""
-
-msgid "For paths or partitions specified with -p, only check for exact paths"
-msgstr ""
-
-msgid "Display only devices/mountpoints with errors"
-msgstr ""
-
-msgid "Don't account root-reserved blocks into freespace in perfdata"
-msgstr ""
-
-msgid "Display inode usage in perfdata"
-msgstr ""
-
-msgid ""
-"Group paths. Thresholds apply to (free-)space of all partitions together"
-msgstr ""
-
-msgid "Same as '--units kB'"
-msgstr ""
-
-msgid "Only check local filesystems"
-msgstr ""
-
-msgid ""
-"Only check local filesystems against thresholds. Yet call stat on remote "
-"filesystems"
-msgstr ""
-
-msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)"
-msgstr ""
-
-msgid "Display the (block) device instead of the mount point"
-msgstr ""
-
-msgid "Same as '--units MB'"
-msgstr ""
-
-msgid "Explicitly select all paths. This is equivalent to -R '.*'"
-msgstr ""
-
-msgid ""
-"Case insensitive regular expression for path/partition (may be repeated)"
-msgstr ""
-
-msgid "Regular expression for path or partition (may be repeated)"
-msgstr ""
-
-msgid ""
-"Regular expression to ignore selected path/partition (case insensitive) (may "
-"be repeated)"
-msgstr ""
-
-msgid ""
-"Regular expression to ignore selected path or partition (may be repeated)"
-msgstr ""
-
-msgid ""
-"Return OK if no filesystem matches, filesystem does not exist or is "
-"inaccessible."
-msgstr ""
-
-msgid "(Provide this option before -p / -r / --ereg-path if used)"
-msgstr ""
-
-msgid "Choose bytes, kB, MB, GB, TB (default: MB)"
-msgstr ""
-
-msgid "Ignore all filesystems of indicated type (may be repeated)"
-msgstr ""
-
-msgid "Check only filesystems of indicated type (may be repeated)"
-msgstr ""
-
-msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"
-msgstr ""
-
-msgid ""
-"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
-"r regex"
-msgstr ""
-
-msgid ""
-"are grouped which means the freespace thresholds are applied to all disks "
-"together"
-msgstr ""
-
-msgid ""
-"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
-"100M/50M"
-msgstr ""
-
-#, c-format
-msgid "%s %s: %s\n"
-msgstr ""
-
-msgid "is not accessible"
-msgstr ""
-
-#, fuzzy
-msgid "nslookup returned an error status"
-msgstr "nslookup hat einen Fehler zurückgegeben"
-
-msgid "Warning plugin error"
-msgstr "Warnung Plugin Fehler"
-
-#, fuzzy, c-format
-msgid "DNS CRITICAL - '%s' returned empty server string\n"
-msgstr "DNS CRITICAL - '%s'  hat einen leeren Hostnamen zurückgegeben\n"
-
-#, fuzzy, c-format
-msgid "DNS CRITICAL - No response from DNS %s\n"
-msgstr "Keine Antwort von DNS %s\n"
-
-#, c-format
-msgid "DNS CRITICAL - '%s' returned empty host name string\n"
-msgstr "DNS CRITICAL - '%s'  hat einen leeren Hostnamen zurückgegeben\n"
-
-msgid "Non-authoritative answer:"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Domain '%s' was not found by the server\n"
-msgstr "Domäne %s wurde vom Server nicht gefunden\n"
-
-#, fuzzy, c-format
-msgid "DNS CRITICAL - '%s' msg parsing exited with no address\n"
-msgstr "DNS CRITICAL - '%s' Ausgabeverarbeitung hat keine Adresse ergeben\n"
-
-#, fuzzy, c-format
-msgid "expected '%s' but got '%s'"
-msgstr "Erwartet: %s aber: %s erhalten"
-
-#, fuzzy, c-format
-msgid "Domain '%s' was found by the server: '%s'\n"
-msgstr "Domäne %s wurde vom Server nicht gefunden\n"
-
-#, c-format
-msgid "server %s is not authoritative for %s"
-msgstr "Server %s ist nicht autoritativ für %s"
-
-#, c-format
-msgid "OK"
-msgstr "OK"
-
-#, c-format
-msgid "WARNING"
-msgstr "WARNING"
-
-#, fuzzy, c-format
-msgid "%.3f second response time"
-msgid_plural "%.3f seconds response time"
-msgstr[0] "%.3f Sekunden Antwortzeit "
-msgstr[1] "%.3f Sekunden Antwortzeit "
-
-#, fuzzy, c-format
-msgid ". %s returns %s"
-msgstr "%s hat %s zurückgegeben"
-
-#, c-format
-msgid "DNS WARNING - %s\n"
-msgstr "DNS WARNING - %s\n"
-
-msgid " Probably a non-existent host/domain"
-msgstr "nicht existierender Host/Domain"
-
-#, c-format
-msgid "DNS CRITICAL - %s\n"
-msgstr "DNS CRITICAL - %s\n"
-
-#, fuzzy, c-format
-msgid "DNS UNKNOWN - %s\n"
-msgstr "DNS UNKNOWN - %s\n"
-
-msgid "Note: nslookup is deprecated and may be removed from future releases."
-msgstr ""
-
-msgid "Consider using the `dig' or `host' programs instead.  Run nslookup with"
-msgstr ""
-
-msgid "the `-sil[ent]' option to prevent this message from appearing."
-msgstr ""
-
-#, c-format
-msgid "No response from DNS %s\n"
-msgstr "Keine Antwort von DNS %s\n"
-
-#, c-format
-msgid "DNS %s has no records\n"
-msgstr "Nameserver %s hat keine Datensätze\n"
-
-#, c-format
-msgid "Connection to DNS %s was refused\n"
-msgstr "Verbindung zum Nameserver %s wurde verweigert\n"
-
-#, c-format
-msgid "Query was refused by DNS server at %s\n"
-msgstr ""
-
-#, c-format
-msgid "No information returned by DNS server at %s\n"
-msgstr ""
-
-msgid "Network is unreachable\n"
-msgstr "Netzwerk nicht erreichbar\n"
-
-#, c-format
-msgid "DNS failure for %s\n"
-msgstr "DNS Fehler für %s\n"
-
-msgid "Input buffer overflow\n"
-msgstr "Eingabe-Pufferüberlauf\n"
-
-msgid ""
-"This plugin uses the nslookup program to obtain the IP address for the given "
-"host/domain query."
-msgstr ""
-
-msgid "An optional DNS server to use may be specified."
-msgstr ""
-
-msgid ""
-"If no DNS server is specified, the default server(s) specified in /etc/"
-"resolv.conf will be used."
-msgstr ""
-
-msgid "The name or address you want to query"
-msgstr ""
-
-msgid "Optional DNS server you want to use for the lookup"
-msgstr ""
-
-msgid ""
-"Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end"
-msgstr ""
-
-msgid ""
-"with a dot (.). This option can be repeated multiple times (Returns OK if any"
-msgstr ""
-
-msgid "value matches)."
-msgstr ""
-
-msgid ""
-"Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)"
-msgstr ""
-
-msgid "Cannot be used together with -a"
-msgstr ""
-
-msgid "Optionally expect the DNS server to be authoritative for the lookup"
-msgstr ""
-
-msgid "Return warning if elapsed time exceeds value. Default off"
-msgstr ""
-
-msgid "Return critical if elapsed time exceeds value. Default off"
-msgstr ""
-
-msgid ""
-"Return critical if the list of expected addresses does not match all "
-"addresses"
-msgstr ""
-
-msgid "returned. Default off"
-msgstr ""
-
-msgid "Arguments to check_dummy must be an integer"
-msgstr "Argument für check_dummy muss ein Integer sein"
-
-#, c-format
-msgid "Status %d is not a supported error state\n"
-msgstr "Status %d ist kein bekannter Fehlerstatus\n"
-
-msgid ""
-"This plugin will simply return the state corresponding to the numeric value"
-msgstr ""
-
-msgid "of the <state> argument with optional text"
-msgstr ""
-
-#, c-format
-msgid "Could not open pipe: %s\n"
-msgstr "Pipe: %s konnte nicht geöffnet werden\n"
-
-#, c-format
-msgid "Could not open stderr for %s\n"
-msgstr "Konnte stderr nicht öffnen für: %s\n"
-
-#, fuzzy
-msgid "FPING UNKNOWN - IP address not found\n"
-msgstr "FPING UNKNOWN - %s nicht gefunden\n"
-
-msgid "FPING UNKNOWN - invalid commandline argument\n"
-msgstr ""
-
-#, fuzzy
-msgid "FPING UNKNOWN - failed system call\n"
-msgstr "FPING UNKNOWN - %s nicht gefunden\n"
-
-#, fuzzy, c-format
-msgid "FPING %s - %s (rta=%f ms)|%s\n"
-msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n"
-
-#, c-format
-msgid "FPING UNKNOWN - %s not found\n"
-msgstr "FPING UNKNOWN - %s nicht gefunden\n"
-
-#, c-format
-msgid "FPING CRITICAL - %s is unreachable\n"
-msgstr "FPING CRITICAL - %s ist nicht erreichbar\n"
-
-#, fuzzy, c-format
-msgid "FPING UNKNOWN - %s parameter error\n"
-msgstr "FPING UNKNOWN - %s nicht gefunden\n"
-
-#, c-format
-msgid "FPING CRITICAL - %s is down\n"
-msgstr "FPING CRITICAL - %s ist down\n"
-
-#, 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"
-
-#, c-format
-msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
-msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n"
-
-msgid "Invalid hostname/address"
-msgstr "Ungültige(r) Hostname/Adresse"
-
-msgid "IPv6 support not available\n"
-msgstr ""
-
-msgid "Packet size must be a positive integer"
-msgstr "Paketgröße muss ein positiver Integer sein"
-
-msgid "Packet count must be a positive integer"
-msgstr "Paketanzahl muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "Target timeout must be a positive integer"
-msgstr "Warnung time muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "Interval must be a positive integer"
-msgstr "Timeout interval muss ein positiver Integer sein"
-
-msgid "Hostname was not supplied"
-msgstr ""
-
-#, c-format
-msgid "%s: Only one threshold may be packet loss (%s)\n"
-msgstr "%s: Nur ein Wert darf für packet loss angegeben werden (%s)\n"
-
-#, c-format
-msgid "%s: Only one threshold must be packet loss (%s)\n"
-msgstr "%s: Nur ein Wert darf für packet loss angegeben werden (%s)\n"
-
-msgid ""
-"This plugin will use the fping command to ping the specified host for a fast "
-"check"
-msgstr ""
-
-msgid "Note that it is necessary to set the suid flag on fping."
-msgstr ""
-
-msgid ""
-"name or IP Address of host to ping (IP Address bypasses name lookup, "
-"reducing system load)"
-msgstr ""
-
-#, fuzzy
-msgid "warning threshold pair"
-msgstr "Warning threshold  Integer sein"
-
-#, fuzzy
-msgid "critical threshold pair"
-msgstr "Critical threshold muss ein Integer sein"
-
-msgid "Return OK after first successful reply"
-msgstr ""
-
-msgid "size of ICMP packet"
-msgstr ""
-
-msgid "number of ICMP packets to send"
-msgstr ""
-
-msgid "Target timeout (ms)"
-msgstr ""
-
-msgid "Interval (ms) between sending packets"
-msgstr ""
-
-msgid "name or IP Address of sourceip"
-msgstr ""
-
-msgid "source interface name"
-msgstr ""
-
-#, c-format
-msgid ""
-"THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time "
-"(ms)"
-msgstr ""
-
-msgid ""
-"which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"
-msgstr ""
-
-msgid "packet loss to trigger an alarm state."
-msgstr ""
-
-msgid "IPv4 is used by default. Specify -6 to use IPv6."
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Host type parameter incorrect!\n"
-msgstr "CRITICAL - Host type parameter unkorrekt!\n"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Host not found\n"
-msgstr "CRITICAL - Text nicht gefunden%s|%s %s\n"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Game server down or unavailable\n"
-msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Game server timeout\n"
-msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
-
-#, c-format
-msgid "This plugin tests game server connections with the specified host."
-msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-
-msgid "Optional port of which to connect"
-msgstr ""
-
-msgid "Field number in raw qstat output that contains game name"
-msgstr ""
-
-msgid "Field number in raw qstat output that contains map name"
-msgstr ""
-
-msgid "Field number in raw qstat output that contains ping time"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"This plugin uses the 'qstat' command, the popular game server status query "
-"tool."
-msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-
-msgid ""
-"If you don't have the package installed, you will need to download it from"
-msgstr ""
-
-msgid "https://github.com/multiplay/qstat before you can use this plugin."
-msgstr ""
-
-msgid "Paper Jam"
-msgstr "Papierstau"
-
-msgid "Out of Paper"
-msgstr "Kein Papier"
-
-msgid "Printer Offline"
-msgstr "Drucker ausgeschaltet"
-
-msgid "Peripheral Error"
-msgstr "Peripheriefehler"
-
-msgid "Intervention Required"
-msgstr "Eingriff benötigt"
-
-msgid "Toner Low"
-msgstr "Wenig Toner"
-
-msgid "Insufficient Memory"
-msgstr "Nicht genügend Speicher"
-
-msgid "A Door is Open"
-msgstr "Eine Abdeckung ist offen"
-
-msgid "Output Tray is Full"
-msgstr "Ausgabeschacht ist voll"
-
-msgid "Data too Slow for Engine"
-msgstr ""
-
-msgid "Unknown Paper Error"
-msgstr "Papierfehler"
-
-#, c-format
-msgid "Printer ok - (%s)\n"
-msgstr "Printer ok - (%s)\n"
-
-#, fuzzy
-msgid "Port must be a positive short integer"
-msgstr "Port muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "This plugin tests the STATUS of an HP printer with a JetDirect card."
-msgstr ""
-"Dieses Plugin testet den STATUS eines HP Druckers mit einer JetDirect "
-"Karte.\n"
-"Net-snmp muss auf dem ausführenden Computer installiert sein.\n"
-"\n"
-
-#, fuzzy
-msgid "Net-snmp must be installed on the computer running the plugin."
-msgstr ""
-"Dieses Plugin testet den STATUS eines HP Druckers mit einer JetDirect "
-"Karte.\n"
-"Net-snmp muss auf dem ausführenden Computer installiert sein.\n"
-"\n"
-
-msgid "The SNMP community name "
-msgstr ""
-
-#, c-format
-msgid "(default=%s)"
-msgstr ""
-
-msgid "Specify the port to check "
-msgstr ""
-
-msgid "Disable paper check "
-msgstr ""
-
-msgid "file does not exist or is not readable"
-msgstr ""
-
-msgid "Invalid certificate expiration period"
-msgstr "Ungültiger Zertifikatsablauftermin"
-
-msgid ""
-"Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional "
-"'+' suffix)"
-msgstr ""
-
-#, fuzzy
-msgid "Invalid option - SSL is not available"
-msgstr "Ungültige Option - SSL ist nicht verfügbar\n"
-
-msgid "Invalid max_redirs count"
-msgstr ""
-
-msgid "Invalid onredirect option"
-msgstr ""
-
-#, c-format
-msgid "option f:%d \n"
-msgstr "Option f:%d \n"
-
-msgid "Invalid port number"
-msgstr "Ungültige Portnummer"
-
-#, c-format
-msgid "Could Not Compile Regular Expression: %s"
-msgstr ""
-
-msgid "IPv6 support not available"
-msgstr "IPv6 Unterstützung nicht vorhanden"
-
-msgid "You must specify a server address or host name"
-msgstr "Hostname oder Serveradresse muss angegeben werden"
-
-msgid ""
-"If you use a client certificate you must also specify a private key file"
-msgstr ""
-
-#, fuzzy
-msgid "HTTP UNKNOWN - Memory allocation error\n"
-msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n"
-
-#, fuzzy, c-format
-msgid "%sServer date unknown, "
-msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n"
-
-#, fuzzy, c-format
-msgid "%sDocument modification date unknown, "
-msgstr "HTTP CRITICAL - Datum der letzten Änderung unbekannt\n"
-
-#, fuzzy, c-format
-msgid "%sServer date \"%100s\" unparsable, "
-msgstr "HTTP CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
-
-#, fuzzy, c-format
-msgid "%sDocument date \"%100s\" unparsable, "
-msgstr ""
-"HTTP CRITICAL - Dokumentendatum \"%100s\" konnte nicht verarbeitet werden"
-
-#, fuzzy, c-format
-msgid "%sDocument is %d seconds in the future, "
-msgstr "HTTP CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
-
-#, fuzzy, c-format
-msgid "%sLast modified %.1f days ago, "
-msgstr "HTTP CRITICAL - Letzte Änderung vor %.1f Tagen\n"
-
-#, fuzzy, c-format
-msgid "%sLast modified %d:%02d:%02d ago, "
-msgstr "HTTP CRITICAL - Letzte Änderung vor %d:%02d:%02d \n"
-
-msgid "HTTP CRITICAL - Unable to open TCP socket\n"
-msgstr "HTTP CRITICAL - Konnte TCP socket nicht öffnen\n"
-
-#, fuzzy
-msgid "HTTP UNKNOWN - Could not allocate memory for full_page\n"
-msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n"
-
-msgid "HTTP CRITICAL - Error on receive\n"
-msgstr "HTTP CRITICAL - Fehler beim Empfangen\n"
-
-#, fuzzy
-msgid "HTTP CRITICAL - No data received from host\n"
-msgstr "HTTP CRITICAL - Keine Daten empfangen\n"
-
-#, fuzzy, c-format
-msgid "Invalid HTTP response received from host: %s\n"
-msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-
-#, 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"
-
-#, c-format
-msgid ""
-"%s\n"
-"%s"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Status line output matched \"%s\" - "
-msgstr "HTTP OK: Statusausgabe passt auf \"%s\"\n"
-
-#, c-format
-msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
-msgstr "HTTP CRITICAL: Ungültige Statusmeldung (%s)\n"
-
-#, c-format
-msgid "HTTP CRITICAL: Invalid Status (%s)\n"
-msgstr "HTTP CRITICAL: Ungültiger Status (%s)\n"
-
-#, c-format
-msgid "%s - "
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%sheader '%s' not found on '%s://%s:%d%s', "
-msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
-
-#, fuzzy, c-format
-msgid "%sstring '%s' not found on '%s://%s:%d%s', "
-msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
-
-#, fuzzy, c-format
-msgid "%spattern not found, "
-msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
-
-#, fuzzy, c-format
-msgid "%spattern found, "
-msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n"
-
-#, fuzzy, c-format
-msgid "%sExecute Error: %s, "
-msgstr "HTTP CRITICAL - Fehler: %s\n"
-
-#, fuzzy, c-format
-msgid "%spage size %d too large, "
-msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n"
-
-#, fuzzy, c-format
-msgid "%spage size %d too small, "
-msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n"
-
-#, 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"
-
-#, 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"
-
-msgid "HTTP UNKNOWN - Could not allocate addr\n"
-msgstr "HTTP UNKNOWN - Konnte addr nicht zuweisen\n"
-
-#, fuzzy
-msgid "HTTP UNKNOWN - Could not allocate URL\n"
-msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n"
-
-#, c-format
-msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "HTTP UNKNOWN - Empty redirect location%s\n"
-msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n"
-
-#, c-format
-msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n"
-msgstr ""
-
-#, 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"
-
-#, fuzzy, c-format
-msgid "HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"
-msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n"
-
-#, 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"
-
-#, c-format
-msgid "Redirection to %s://%s:%d%s\n"
-msgstr ""
-
-#, 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"
-
-msgid "normal (http) and secure (https) servers, follow redirects, search for"
-msgstr ""
-
-msgid "strings and regular expressions, check connection times, and report on"
-msgstr ""
-
-#, fuzzy
-msgid "certificate expiration times."
-msgstr "Clientzertifikat benötigt\n"
-
-#, c-format
-msgid "In the first form, make an HTTP request."
-msgstr ""
-
-#, c-format
-msgid ""
-"In the second form, connect to the server and check the TLS certificate."
-msgstr ""
-
-#, c-format
-msgid "NOTE: One or both of -H and -I must be specified"
-msgstr ""
-
-msgid "Host name argument for servers using host headers (virtual host)"
-msgstr ""
-
-msgid "Append a port to include it in the header (eg: example.com:5000)"
-msgstr ""
-
-msgid ""
-"IP address or name (use numeric address if possible to bypass DNS lookup)."
-msgstr ""
-
-msgid "Port number (default: "
-msgstr ""
-
-msgid ""
-"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"
-msgstr ""
-
-msgid "auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1,"
-msgstr ""
-
-msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted."
-msgstr ""
-
-msgid "Enable SSL/TLS hostname extension support (SNI)"
-msgstr ""
-
-msgid ""
-"Minimum number of days a certificate has to be valid. Port defaults to 443"
-msgstr ""
-
-msgid ""
-"(when this option is used the URL is not checked by default. You can use"
-msgstr ""
-
-msgid " --continue-after-certificate to override this behavior)"
-msgstr ""
-
-msgid ""
-"Allows the HTTP check to continue after performing the certificate check."
-msgstr ""
-
-msgid "Does nothing unless -C is used."
-msgstr ""
-
-msgid "Name of file that contains the client certificate (PEM format)"
-msgstr ""
-
-msgid "to be used in establishing the SSL session"
-msgstr ""
-
-msgid "Name of file containing the private key (PEM format)"
-msgstr ""
-
-msgid "matching the client certificate"
-msgstr ""
-
-msgid "Comma-delimited list of strings, at least one of them is expected in"
-msgstr ""
-
-msgid "the first (status) line of the server response (default: "
-msgstr ""
-
-msgid ""
-"If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"
-msgstr ""
-
-msgid "String to expect in the response headers"
-msgstr ""
-
-msgid "String to expect in the content"
-msgstr ""
-
-msgid "URL to GET or POST (default: /)"
-msgstr ""
-
-msgid "URL encoded http POST data"
-msgstr ""
-
-msgid "Set HTTP method."
-msgstr ""
-
-msgid "Don't wait for document body: stop reading after headers."
-msgstr ""
-
-msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)"
-msgstr ""
-
-msgid "Warn if document is more than SECONDS old. the number can also be of"
-msgstr ""
-
-msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."
-msgstr ""
-
-msgid "specify Content-Type header media type when POSTing\n"
-msgstr ""
-
-msgid "Allow regex to span newlines (must precede -r or -R)"
-msgstr ""
-
-msgid "Search page for regex STRING"
-msgstr ""
-
-msgid "Search page for case-insensitive regex STRING"
-msgstr ""
-
-msgid "Return CRITICAL if found, OK if not\n"
-msgstr ""
-
-msgid "Username:password on sites with basic authentication"
-msgstr ""
-
-msgid "Username:password on proxy-servers with basic authentication"
-msgstr ""
-
-msgid "String to be sent in http header as \"User Agent\""
-msgstr ""
-
-msgid ""
-"Any other tags to be sent in http header. Use multiple times for additional "
-"headers"
-msgstr ""
-
-msgid "Print additional performance data"
-msgstr ""
-
-msgid "Print body content below status line"
-msgstr ""
-
-msgid "Wrap output in HTML link (obsoleted by urlize)"
-msgstr ""
-
-msgid "How to handle redirected pages. sticky is like follow but stick to the"
-msgstr ""
-
-msgid "specified IP address. stickyport also ensures port stays the same."
-msgstr ""
-
-#, fuzzy
-msgid "Maximal number of redirects (default: "
-msgstr "Ungültige Portnummer"
-
-msgid "Minimum page size required (bytes) : Maximum page size required (bytes)"
-msgstr ""
-
-#, fuzzy
-msgid "This plugin will attempt to open an HTTP connection with the host."
-msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-
-msgid ""
-"Successful connects return STATE_OK, refusals and timeouts return "
-"STATE_CRITICAL"
-msgstr ""
-
-msgid ""
-"other errors return STATE_UNKNOWN.  Successful connects, but incorrect "
-"response"
-msgstr ""
-
-msgid ""
-"messages from the host result in STATE_WARNING return values.  If you are"
-msgstr ""
-
-msgid ""
-"checking a virtual server that uses 'host headers' you must supply the FQDN"
-msgstr ""
-
-msgid "(fully qualified domain name) as the [host_name] argument."
-msgstr ""
-
-msgid "This plugin can also check whether an SSL enabled web server is able to"
-msgstr ""
-
-msgid "serve content (optionally within a specified time) or whether the X509 "
-msgstr ""
-
-msgid "certificate is still valid for the specified number of days."
-msgstr ""
-
-#, 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"
-
-msgid "certificate matches the hostname of the server, or if the certificate"
-msgstr ""
-
-msgid "has a valid chain of trust to one of the locally installed CAs."
-msgstr ""
-
-msgid ""
-"When the 'www.verisign.com' server returns its content within 5 seconds,"
-msgstr ""
-
-msgid ""
-"a STATE_OK will be returned. When the server returns its content but exceeds"
-msgstr ""
-
-msgid ""
-"the 5-second threshold, a STATE_WARNING will be returned. When an error "
-"occurs,"
-msgstr ""
-
-msgid "a STATE_CRITICAL will be returned."
-msgstr ""
-
-msgid ""
-"When the certificate of 'www.verisign.com' is valid for more than 14 days,"
-msgstr ""
-
-msgid ""
-"a STATE_OK is returned. When the certificate is still valid, but for less "
-"than"
-msgstr ""
-
-msgid ""
-"14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
-msgstr ""
-
-#, fuzzy
-msgid "the certificate is expired."
-msgstr "Clientzertifikat benötigt\n"
-
-msgid ""
-"When the certificate of 'www.verisign.com' is valid for more than 30 days,"
-msgstr ""
-
-msgid "30 days, but more than 14 days, a STATE_WARNING is returned."
-msgstr ""
-
-msgid ""
-"A STATE_CRITICAL will be returned when certificate expires in less than 14 "
-"days"
-msgstr ""
-
-msgid ""
-"check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j "
-"CONNECT -H www.verisign.com "
-msgstr ""
-
-msgid ""
-"all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -"
-"S(sl) -j CONNECT -H <webserver>"
-msgstr ""
-
-msgid ""
-"a STATE_CRITICAL will be returned. By adding a colon to the method you can "
-"set the method used"
-msgstr ""
-
-msgid "inside the proxied connection: -j CONNECT:POST"
-msgstr ""
-
-#, c-format
-msgid "Could not connect to the server at port %i\n"
-msgstr ""
-
-#, c-format
-msgid "Could not set protocol version %d\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Could not init TLS at port %i!\n"
-msgstr "Konnte stderr nicht öffnen für: %s\n"
-
-#, c-format
-msgid "TLS not supported by the libraries!\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Could not init startTLS at port %i!\n"
-msgstr "Konnte stderr nicht öffnen für: %s\n"
-
-#, c-format
-msgid "startTLS not supported by the library, needs LDAPv3!\n"
-msgstr ""
-
-#, c-format
-msgid "Could not bind to the LDAP server\n"
-msgstr ""
-
-#, c-format
-msgid "Could not search/find objectclasses in %s\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "LDAP %s - found %d entries in %.3f seconds|%s %s\n"
-msgstr "HTTP OK %s - %.3f Sekunde Antwortzeit %s%s|%s %s\n"
-
-#, c-format
-msgid "LDAP %s - %.3f seconds response time|%s\n"
-msgstr ""
-
-#, c-format
-msgid "%s cannot be combined with %s"
-msgstr ""
-
-msgid "Please specify the host name\n"
-msgstr ""
-
-msgid "Please specify the LDAP base\n"
-msgstr ""
-
-msgid "ldap attribute to search (default: \"(objectclass=*)\""
-msgstr ""
-
-msgid "ldap base (eg. ou=my unit, o=my org, c=at"
-msgstr ""
-
-msgid "ldap bind DN (if required)"
-msgstr ""
-
-msgid ""
-"ldap password (if required, or set the password through environment variable "
-"'LDAP_PASSWORD')"
-msgstr ""
-
-msgid "use starttls mechanism introduced in protocol version 3"
-msgstr ""
-
-msgid "use ldaps (ldap v2 ssl method). this also sets the default port to"
-msgstr ""
-
-msgid "use ldap protocol version 2"
-msgstr ""
-
-msgid "use ldap protocol version 3"
-msgstr ""
-
-msgid "default protocol version:"
-msgstr ""
-
-msgid "Number of found entries to result in warning status"
-msgstr ""
-
-msgid "Number of found entries to result in critical status"
-msgstr ""
-
-msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"
-msgstr ""
-
-#, c-format
-msgid ""
-" implied (using default port %i) unless --port=636 is specified. In that "
-"case\n"
-msgstr ""
-
-msgid "'SSL on connect' will be used no matter how the plugin was called."
-msgstr ""
-
-msgid ""
-"This detection is deprecated, please use 'check_ldap' with the '--starttls' "
-"or '--ssl' flags"
-msgstr ""
-
-msgid "to define the behaviour explicitly instead."
-msgstr ""
-
-msgid "The parameters --warn-entries and --crit-entries are optional."
-msgstr ""
-
-msgid "Warning threshold must be float or float triplet!\n"
-msgstr ""
-
-#, c-format
-msgid "Error opening %s\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "could not parse load from uptime %s: %d\n"
-msgstr "Argumente konnten nicht ausgewertet werden"
-
-#, c-format
-msgid "Error code %d returned in %s\n"
-msgstr ""
-
-#, c-format
-msgid "Error in getloadavg()\n"
-msgstr ""
-
-#, c-format
-msgid "Error processing %s\n"
-msgstr ""
-
-#, c-format
-msgid "load average: %.2f, %.2f, %.2f"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Critical threshold for %d-minute load average is not specified\n"
-msgstr "Critical threshold muss ein positiver Integer sein\n"
-
-#, fuzzy, c-format
-msgid "Warning threshold for %d-minute load average is not specified\n"
-msgstr "Warning threshold muss ein positiver Integer sein\n"
-
-#, c-format
-msgid ""
-"Parameter inconsistency: %d-minute \"warning load\" is greater than "
-"\"critical load\"\n"
-msgstr ""
-
-#, c-format
-msgid "This plugin tests the current system load average."
-msgstr ""
-
-msgid "Exit with WARNING status if load average exceeds WLOADn"
-msgstr ""
-
-msgid "Exit with CRITICAL status if load average exceed CLOADn"
-msgstr ""
-
-msgid "the load average format is the same used by \"uptime\" and \"w\""
-msgstr ""
-
-msgid "Divide the load averages by the number of CPUs (when possible)"
-msgstr ""
-
-msgid "Number of processes to show when printing the top consuming processes."
-msgstr ""
-
-msgid "NUMBER_OF_PROCS=0 disables this feature. Default value is 0"
-msgstr ""
-
-#, c-format
-msgid "'%s' exited with non-zero status.\n"
-msgstr ""
-
-#, c-format
-msgid "some error occurred getting procs list.\n"
-msgstr ""
-
-msgid "Could not parse arguments\n"
-msgstr ""
-
-#, c-format
-msgid "Unable to open MRTG log file\n"
-msgstr ""
-
-#, c-format
-msgid "Unable to process MRTG log file\n"
-msgstr ""
-
-#, c-format
-msgid "MRTG data has expired (%d minutes old)\n"
-msgstr ""
-
-msgid "Avg"
-msgstr ""
-
-msgid "Max"
-msgstr ""
-
-msgid "Invalid variable number"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s is not a valid expiration time\n"
-"Use '%s -h' for additional help\n"
-msgstr ""
-
-msgid "Invalid variable number\n"
-msgstr ""
-
-msgid "You must supply the variable number"
-msgstr ""
-
-msgid ""
-"This plugin will check either the average or maximum value of one of the"
-msgstr ""
-
-#, fuzzy
-msgid "two variables recorded in an MRTG log file."
-msgstr "Konnte MRTG Logfile nicht öffnen"
-
-msgid "The MRTG log file containing the data you want to monitor"
-msgstr ""
-
-msgid "Minutes before MRTG data is considered to be too old"
-msgstr ""
-
-msgid "Should we check average or maximum values?"
-msgstr ""
-
-msgid "Which variable set should we inspect? (1 or 2)"
-msgstr ""
-
-msgid "Threshold value for data to result in WARNING status"
-msgstr ""
-
-msgid "Threshold value for data to result in CRITICAL status"
-msgstr ""
-
-msgid "Type label for data (Examples: Conns, \"Processor Load\", In, Out)"
-msgstr ""
-
-msgid "Option units label for data (Example: Packets/Sec, Errors/Sec,"
-msgstr ""
-
-#, c-format
-msgid "\"Bytes Per Second\", \"%% Utilization\")"
-msgstr ""
-
-msgid ""
-"If the value exceeds the <vwl> threshold, a WARNING status is returned. If"
-msgstr ""
-
-msgid ""
-"the value exceeds the <vcl> threshold, a CRITICAL status is returned.  If"
-msgstr ""
-
-msgid "the data in the log file is older than <expire_minutes> old, a WARNING"
-msgstr ""
-
-msgid "status is returned and a warning message is printed."
-msgstr ""
-
-msgid ""
-"This plugin is useful for monitoring MRTG data that does not correspond to"
-msgstr ""
-
-msgid ""
-"bandwidth usage.  (Use the check_mrtgtraf plugin for monitoring bandwidth)."
-msgstr ""
-
-msgid ""
-"It can be used to monitor any kind of data that MRTG is monitoring - errors,"
-msgstr ""
-
-msgid ""
-"packets/sec, etc.  I use MRTG in conjunction with the Novell NLM that allows"
-msgstr ""
-
-msgid ""
-"me to track processor utilization, user connections, drive space, etc and"
-msgstr ""
-
-msgid "this plugin works well for monitoring that kind of data as well."
-msgstr ""
-
-msgid ""
-"- This plugin only monitors one of the two variables stored in the MRTG log"
-msgstr ""
-
-msgid "file.  If you want to monitor both values you will have to define two"
-msgstr ""
-
-msgid "commands with different values for the <variable> argument.  Of course,"
-msgstr ""
-
-msgid "you can always hack the code to make this plugin work for you..."
-msgstr ""
-
-msgid ""
-"- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded "
-"from"
-msgstr ""
-
-msgid "Unable to open MRTG log file"
-msgstr "Konnte MRTG Logfile nicht öffnen"
-
-msgid "Unable to process MRTG log file"
-msgstr ""
-
-#, c-format
-msgid "%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"
-msgstr ""
-
-#, c-format
-msgid "Traffic %s - %s\n"
-msgstr ""
-
-msgid ""
-"This plugin will check the incoming/outgoing transfer rates of a router,"
-msgstr ""
-
-msgid "switch, etc recorded in an MRTG log.  If the newest log entry is older"
-msgstr ""
-
-msgid "than <expire_minutes>, a WARNING status is returned. If either the"
-msgstr ""
-
-msgid "incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in"
-msgstr ""
-
-msgid "Bytes/sec), a CRITICAL status results.  If either of the rates exceed"
-msgstr ""
-
-msgid "the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results."
-msgstr ""
-
-msgid "File to read log from"
-msgstr ""
-
-msgid "Minutes after which log expires"
-msgstr ""
-
-msgid "Test average or maximum"
-msgstr ""
-
-#, fuzzy
-msgid "Warning threshold pair <incoming>,<outgoing>"
-msgstr "Warning threshold  Integer sein"
-
-#, fuzzy
-msgid "Critical threshold pair <incoming>,<outgoing>"
-msgstr "Critical threshold muss ein Integer sein"
-
-msgid ""
-"- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from"
-msgstr ""
-
-msgid "- While MRTG can monitor things other than traffic rates, this"
-msgstr ""
-
-msgid "  plugin probably won't work with much else without modification."
-msgstr ""
-
-msgid "- The calculated i/o rates are a little off from what MRTG actually"
-msgstr ""
-
-msgid "  reports.  I'm not sure why this is right now, but will look into it"
-msgstr ""
-
-msgid "  for future enhancements of this plugin."
-msgstr ""
-
-#, c-format
-msgid "Usage"
-msgstr ""
-
-#, c-format
-msgid "status store_result error: %s\n"
-msgstr ""
-
-#, c-format
-msgid "slave query error: %s\n"
-msgstr ""
-
-#, c-format
-msgid "slave store_result error: %s\n"
-msgstr ""
-
-msgid "No slaves defined"
-msgstr ""
-
-#, c-format
-msgid "slave fetch row error: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Slave running: %s"
-msgstr ""
-
-msgid "This program tests connections to a MySQL server"
-msgstr ""
-
-msgid "Ignore authentication failure and check for mysql connectivity only"
-msgstr ""
-
-msgid "Use the specified socket (has no effect if -H is used)"
-msgstr ""
-
-msgid "Check database with indicated name"
-msgstr ""
-
-msgid "Read from the specified client options file"
-msgstr ""
-
-msgid "Use a client options group"
-msgstr ""
-
-msgid "Connect using the indicated username"
-msgstr ""
-
-msgid "Use the indicated password to authenticate the connection"
-msgstr ""
-
-msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"
-msgstr ""
-
-msgid "Your clear-text password could be visible as a process table entry"
-msgstr ""
-
-msgid "Check if the slave thread is running properly."
-msgstr ""
-
-msgid "Exit with WARNING status if slave server is more than INTEGER seconds"
-msgstr ""
-
-msgid "behind master"
-msgstr ""
-
-msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds"
-msgstr ""
-
-msgid "Use ssl encryption"
-msgstr ""
-
-msgid "Path to CA signing the cert"
-msgstr ""
-
-msgid "Path to SSL certificate"
-msgstr ""
-
-msgid "Path to private SSL key"
-msgstr ""
-
-msgid "Path to CA directory"
-msgstr ""
-
-msgid "List of valid SSL ciphers"
-msgstr ""
-
-msgid ""
-"There are no required arguments. By default, the local database is checked"
-msgstr ""
-
-msgid ""
-"using the default unix socket. You can force TCP on localhost by using an"
-msgstr ""
-
-msgid "IP address or FQDN ('localhost' will use the socket as well)."
-msgstr ""
-
-msgid "You must specify -p with an empty string to force an empty password,"
-msgstr ""
-
-msgid "overriding any my.cnf settings."
-msgstr ""
-
-msgid "Cannot open status log for reading!"
-msgstr ""
-
-#, c-format
-msgid "Found process: %s %s\n"
-msgstr ""
-
-msgid "Could not locate a running Nagios process!"
-msgstr ""
-
-msgid "Cannot parse Nagios log file for valid time"
-msgstr ""
-
-#, c-format
-msgid "%d process"
-msgid_plural "%d processes"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "status log updated %d second ago"
-msgid_plural "status log updated %d seconds ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy
-msgid "Expiration time must be an integer (seconds)\n"
-msgstr "skip lines muss ein Integer sein"
-
-#, fuzzy
-msgid "Timeout must be an integer (seconds)\n"
-msgstr "skip lines muss ein Integer sein"
-
-#, fuzzy
-msgid "You must provide the status_log\n"
-msgstr "%s: Hostname muss angegeben werden\n"
-
-#, fuzzy
-msgid "You must provide a process string\n"
-msgstr "%s: Hostname muss angegeben werden\n"
-
-#, fuzzy
-msgid ""
-"This plugin checks the status of the Nagios process on the local machine"
-msgstr ""
-"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem\n"
-"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte "
-"unterschritten wird.\n"
-"\n"
-
-msgid ""
-"The plugin will check to make sure the Nagios status log is no older than"
-msgstr ""
-
-msgid "the number of minutes specified by the expires option."
-msgstr ""
-
-msgid ""
-"It also checks the process table for a process matching the command argument."
-msgstr ""
-
-msgid "Name of the log file to check"
-msgstr ""
-
-msgid "Minutes aging after which logfile is considered stale"
-msgstr ""
-
-msgid "Substring to search for in process arguments"
-msgstr ""
-
-msgid "Timeout for the plugin in seconds"
-msgstr ""
-
-#, c-format
-msgid "Wrong client version - running: %s, required: %s"
-msgstr ""
-
-msgid "missing -l parameters"
-msgstr ""
-
-msgid "wrong -l parameter."
-msgstr ""
-
-msgid "CPU Load"
-msgstr ""
-
-#, c-format
-msgid " %lu%% (%lu min average)"
-msgstr ""
-
-#, c-format
-msgid " '%lu min avg Load'=%lu%%;%lu;%lu;0;100"
-msgstr ""
-
-msgid "not enough values for -l parameters"
-msgstr ""
-
-msgid "wrong -l argument"
-msgstr ""
-
-#, c-format
-msgid "System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"
-msgstr ""
-
-#, c-format
-msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"
-msgstr ""
-
-#, c-format
-msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"
-msgstr ""
-
-msgid "Free disk space : Invalid drive"
-msgstr ""
-
-msgid "No service/process specified"
-msgstr ""
-
-msgid "could not fetch information from server\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)"
-msgstr ""
-
-#, c-format
-msgid "'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f"
-msgstr ""
-
-msgid "No counter specified"
-msgstr ""
-
-msgid "Minimum value contains non-numbers"
-msgstr ""
-
-msgid "Maximum value contains non-numbers"
-msgstr ""
-
-msgid "No unit counter specified"
-msgstr ""
-
-msgid "Please specify a variable to check"
-msgstr ""
-
-#, fuzzy
-msgid "Server port must be an integer\n"
-msgstr "skip lines muss ein Integer sein"
-
-#, fuzzy
-msgid "You must provide a server address or host name"
-msgstr "Hostname oder Serveradresse muss angegeben werden"
-
-msgid "None"
-msgstr ""
-
-msgid "This plugin collects data from the NSClient service running on a"
-msgstr ""
-
-msgid "Windows NT/2000/XP/2003 server."
-msgstr ""
-
-msgid "Name of the host to check"
-msgstr ""
-
-#, fuzzy
-msgid "Optional port number (default: "
-msgstr "Ungültige Portnummer"
-
-msgid "Password needed for the request"
-msgstr ""
-
-msgid "Threshold which will result in a warning status"
-msgstr ""
-
-msgid "Threshold which will result in a critical status"
-msgstr ""
-
-msgid "Seconds before connection attempt times out (default: "
-msgstr ""
-
-msgid "Parameters passed to specified check (see below)"
-msgstr ""
-
-msgid "Display options (currently only SHOWALL works)"
-msgstr ""
-
-msgid "Return UNKNOWN on timeouts"
-msgstr ""
-
-msgid "Print this help screen"
-msgstr ""
-
-msgid "Print version information"
-msgstr ""
-
-msgid "Variable to check"
-msgstr ""
-
-msgid "Valid variables are:"
-msgstr ""
-
-msgid "Get the NSClient version"
-msgstr ""
-
-msgid "If -l <version> is specified, will return warning if versions differ."
-msgstr ""
-
-msgid "Average CPU load on last x minutes."
-msgstr ""
-
-msgid "Request a -l parameter with the following syntax:"
-msgstr ""
-
-msgid "-l <minutes range>,<warning threshold>,<critical threshold>."
-msgstr ""
-
-msgid "<minute range> should be less than 24*60."
-msgstr ""
-
-msgid ""
-"Thresholds are percentage and up to 10 requests can be done in one shot."
-msgstr ""
-
-msgid "Get the uptime of the machine."
-msgstr ""
-
-msgid "-l <unit> "
-msgstr ""
-
-msgid "<unit> = seconds, minutes, hours, or days. (default: minutes)"
-msgstr ""
-
-#, fuzzy
-msgid "Thresholds will use the unit specified above."
-msgstr ""
-"Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
-"\n"
-
-msgid "Size and percentage of disk use."
-msgstr ""
-
-msgid "Request a -l parameter containing the drive letter only."
-msgstr ""
-
-msgid "Warning and critical thresholds can be specified with -w and -c."
-msgstr ""
-
-msgid "Memory use."
-msgstr ""
-
-msgid "Check the state of one or several services."
-msgstr ""
-
-msgid "Request a -l parameters with the following syntax:"
-msgstr ""
-
-msgid "-l <service1>,<service2>,<service3>,..."
-msgstr ""
-
-msgid "You can specify -d SHOWALL in case you want to see working services"
-msgstr ""
-
-msgid "in the returned string."
-msgstr ""
-
-msgid "Check if one or several process are running."
-msgstr ""
-
-msgid "Same syntax as SERVICESTATE."
-msgstr ""
-
-msgid "Check any performance counter of Windows NT/2000."
-msgstr ""
-
-msgid "-l \"\\\\<performance object>\\\\counter\",\"<description>"
-msgstr ""
-
-msgid "The <description> parameter is optional and is given to a printf "
-msgstr ""
-
-msgid "output command which requires a float parameter."
-msgstr ""
-
-#, c-format
-msgid "If <description> does not include \"%%\", it is used as a label."
-msgstr ""
-
-msgid "Some examples:"
-msgstr ""
-
-msgid "Check any performance counter object of Windows NT/2000."
-msgstr ""
-
-msgid ""
-"Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"
-msgstr ""
-
-msgid "<counter object> is a Windows Perfmon Counter object (eg. Process),"
-msgstr ""
-
-msgid "if it is two words, it should be enclosed in quotes"
-msgstr ""
-
-msgid "The returned results will be a comma-separated list of instances on "
-msgstr ""
-
-msgid " the selected computer for that object."
-msgstr ""
-
-msgid ""
-"The purpose of this is to be run from command line to determine what "
-"instances"
-msgstr ""
-
-msgid ""
-" are available for monitoring without having to log onto the Windows server"
-msgstr ""
-
-msgid "  to run Perfmon directly."
-msgstr ""
-
-msgid ""
-"It can also be used in scripts that automatically create the monitoring "
-"service"
-msgstr ""
-
-msgid " configuration files."
-msgstr ""
-
-msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"
-msgstr ""
-
-msgid ""
-"- The NSClient service should be running on the server to get any information"
-msgstr ""
-
-msgid "- Critical thresholds should be lower than warning thresholds"
-msgstr ""
-
-msgid "- Default port 1248 is sometimes in use by other services. The error"
-msgstr ""
-
-msgid ""
-"output when this happens contains \"Cannot map xxxxx to protocol number\"."
-msgstr ""
-
-msgid "One fix for this is to change the port to something else on check_nt "
-msgstr ""
-
-msgid "and on the client service it's connecting to."
-msgstr ""
-
-#, c-format
-msgid "jitter response too large (%lu bytes)\n"
-msgstr ""
-
-msgid "NTP CRITICAL:"
-msgstr "NTP CRITICAL:"
-
-msgid "NTP WARNING:"
-msgstr "NTP WARNING:"
-
-msgid "NTP OK:"
-msgstr "NTP OK:"
-
-msgid "NTP UNKNOWN:"
-msgstr "NTP UNKNOWN:"
-
-msgid "Offset unknown"
-msgstr ""
-
-msgid "Offset"
-msgstr ""
-
-#, fuzzy
-msgid "This plugin checks the selected ntp server"
-msgstr ""
-"Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
-"\n"
-
-msgid "Offset to result in warning status (seconds)"
-msgstr ""
-
-msgid "Offset to result in critical status (seconds)"
-msgstr ""
-
-#, fuzzy
-msgid "Warning threshold for jitter"
-msgstr "Warning threshold  Integer sein"
-
-#, fuzzy
-msgid "Critical threshold for jitter"
-msgstr "Critical threshold muss ein Integer sein"
-
-msgid "Normal offset check:"
-msgstr ""
-
-msgid ""
-"Check jitter too, avoiding critical notifications if jitter isn't available"
-msgstr ""
-
-msgid "(See Notes above for more details on thresholds formats):"
-msgstr ""
-
-msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or"
-msgstr ""
-
-msgid "check_ntp_time instead."
-msgstr ""
-
-msgid "Server not synchronized"
-msgstr ""
-
-msgid "Server has the LI_ALARM bit set"
-msgstr ""
-
-msgid ""
-"Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"
-msgstr ""
-
-#, fuzzy
-msgid "Warning threshold for stratum of server's synchronization peer"
-msgstr "Warning threshold  Integer sein"
-
-#, fuzzy
-msgid "Critical threshold for stratum of server's synchronization peer"
-msgstr "Critical threshold muss ein Integer sein"
-
-#, fuzzy
-msgid "Warning threshold for number of usable time sources (\"truechimers\")"
-msgstr "Warning threshold muss ein positiver Integer sein\n"
-
-#, fuzzy
-msgid "Critical threshold for number of usable time sources (\"truechimers\")"
-msgstr "Critical threshold muss ein positiver Integer sein\n"
-
-msgid "This plugin checks an NTP server independent of any commandline"
-msgstr ""
-
-msgid "programs or external libraries."
-msgstr ""
-
-#, 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"
-
-msgid "checking the offset with the sync peer, the jitter and stratum. This"
-msgstr ""
-
-msgid "plugin will not check the clock offset between the local host and NTP"
-msgstr ""
-
-msgid "server; please use check_ntp_time for that purpose."
-msgstr ""
-
-msgid "Simple NTP server check:"
-msgstr ""
-
-msgid "Only check the number of usable time sources (\"truechimers\"):"
-msgstr ""
-
-msgid "Check only stratum:"
-msgstr ""
-
-#, 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"
-
-msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found"
-msgstr ""
-
-msgid "Expected offset of the ntp server relative to local server (seconds)"
-msgstr ""
-
-#, fuzzy
-msgid "This plugin checks the clock offset between the local host and a"
-msgstr ""
-"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem\n"
-"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte "
-"unterschritten wird.\n"
-"\n"
-
-msgid "remote NTP server. It is independent of any commandline programs or"
-msgstr ""
-
-msgid "external libraries."
-msgstr ""
-
-msgid "If you'd rather want to monitor an NTP server, please use"
-msgstr ""
-
-msgid "check_ntp_peer."
-msgstr ""
-
-msgid "--time-offset is useful for compensating for servers with known"
-msgstr ""
-
-msgid "and expected clock skew."
-msgstr ""
-
-#, c-format
-msgid "NetWare %s: "
-msgstr ""
-
-#, c-format
-msgid "Up %s,"
-msgstr ""
-
-#, c-format
-msgid "Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s: Long term cache hits = %lu%%"
-msgstr ""
-
-#, c-format
-msgid "%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s: LRU sitting time = %lu minutes"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Volume '%s' does not exist!"
-msgstr ""
-
-#, c-format
-msgid "%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;"
-msgstr ""
-
-msgid "Only "
-msgstr ""
-
-#, c-format
-msgid "%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid ""
-"%lu MB (%lu%%) free on volume %s - total %lu MB|FreeMB%s=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "Directory Services Database is %s (DS version %s)"
-msgstr ""
-
-#, c-format
-msgid "Logins are %s"
-msgstr ""
-
-msgid "enabled"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-#, fuzzy
-msgid "CRITICAL - NRM Status is bad!"
-msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
-
-msgid "Warning - NRM Status is suspect!"
-msgstr ""
-
-msgid "OK - NRM Status is good!"
-msgstr ""
-
-#, c-format
-msgid "%lu of %lu (%lu%%) packet receive buffers used"
-msgstr ""
-
-#, c-format
-msgid "%lu entries in SAP table"
-msgstr ""
-
-#, c-format
-msgid "%lu entries in SAP table for SAP type %d"
-msgstr ""
-
-#, c-format
-msgid "%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "%s%lu KB not yet purgeable on volume %s"
-msgstr ""
-
-#, c-format
-msgid "%lu MB (%lu%%) not yet purgeable on volume %s"
-msgstr ""
-
-#, c-format
-msgid "%lu open files|Openfiles=%lu;%lu;%lu;0,0"
-msgstr ""
-
-#, c-format
-msgid "%lu abended threads|Abends=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu"
-msgstr ""
-
-msgid "CRITICAL - Time not in sync with network!"
-msgstr ""
-
-msgid "OK - Time in sync with network!"
-msgstr ""
-
-#, c-format
-msgid "LRU sitting time = %lu seconds"
-msgstr ""
-
-#, c-format
-msgid "Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "NDS Version %s"
-msgstr ""
-
-#, c-format
-msgid "Up %s"
-msgstr ""
-
-#, c-format
-msgid "Module %s version %s is loaded"
-msgstr ""
-
-#, c-format
-msgid "Module %s is not loaded"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "CRITICAL - Value '%s' does not exist!"
-msgstr "%s [%s nicht gefunden]"
-
-#, c-format
-msgid "%s is  %lu|%s=%lu;%lu;%lu;;"
-msgstr ""
-
-msgid "Nothing to check!\n"
-msgstr ""
-
-#, fuzzy
-msgid "Server port an integer\n"
-msgstr "skip lines muss ein Integer sein"
-
-msgid "This plugin attempts to contact the MRTGEXT NLM running on a"
-msgstr ""
-
-msgid "Novell server to gather the requested system information."
-msgstr ""
-
-msgid "Variable to check.  Valid variables include:"
-msgstr ""
-
-msgid "LOAD1     = 1 minute average CPU load"
-msgstr ""
-
-msgid "LOAD5     = 5 minute average CPU load"
-msgstr ""
-
-msgid "LOAD15    = 15 minute average CPU load"
-msgstr ""
-
-msgid "CSPROCS   = number of current service processes (NW 5.x only)"
-msgstr ""
-
-msgid "ABENDS    = number of abended threads (NW 5.x only)"
-msgstr ""
-
-msgid "UPTIME    = server uptime"
-msgstr ""
-
-msgid "LTCH      = percent long term cache hits"
-msgstr ""
-
-msgid "CBUFF     = current number of cache buffers"
-msgstr ""
-
-msgid "CDBUFF    = current number of dirty cache buffers"
-msgstr ""
-
-msgid "DCB       = dirty cache buffers as a percentage of the total"
-msgstr ""
-
-msgid "TCB       = dirty cache buffers as a percentage of the original"
-msgstr ""
-
-msgid "OFILES    = number of open files"
-msgstr ""
-
-msgid "    VMF<vol>  = MB of free space on Volume <vol>"
-msgstr ""
-
-msgid "    VMU<vol>  = MB used space on Volume <vol>"
-msgstr ""
-
-msgid "    VMP<vol>  = MB of purgeable space on Volume <vol>"
-msgstr ""
-
-msgid "    VPF<vol>  = percent free space on volume <vol>"
-msgstr ""
-
-msgid "    VKF<vol>  = KB of free space on volume <vol>"
-msgstr ""
-
-msgid "    VPP<vol>  = percent purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    VKP<vol>  = KB of purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    VPNP<vol> = percent not yet purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    VKNP<vol> = KB of not yet purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    LRUM      = LRU sitting time in minutes"
-msgstr ""
-
-msgid "    LRUS      = LRU sitting time in seconds"
-msgstr ""
-
-msgid "    DSDB      = check to see if DS Database is open"
-msgstr ""
-
-msgid "    DSVER     = NDS version"
-msgstr ""
-
-msgid "    UPRB      = used packet receive buffers"
-msgstr ""
-
-msgid "    PUPRB     = percent (of max) used packet receive buffers"
-msgstr ""
-
-msgid "    SAPENTRIES = number of entries in the SAP table"
-msgstr ""
-
-msgid "    SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>"
-msgstr ""
-
-msgid "    TSYNC     = timesync status"
-msgstr ""
-
-msgid "    LOGINS    = check to see if logins are enabled"
-msgstr ""
-
-msgid "    CONNS     = number of currently licensed connections"
-msgstr ""
-
-msgid "    NRMH\t= NRM Summary Status"
-msgstr ""
-
-msgid "    NRMP<stat> = Returns the current value for a NRM health item"
-msgstr ""
-
-msgid "    NRMM<stat> = Returns the current memory stats from NRM"
-msgstr ""
-
-msgid "    NRMS<stat> = Returns the current Swapfile stats from NRM"
-msgstr ""
-
-msgid "    NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml"
-msgstr ""
-
-msgid "    NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml"
-msgstr ""
-
-msgid "    NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml"
-msgstr ""
-
-msgid "    NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml"
-msgstr ""
-
-msgid "    NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml"
-msgstr ""
-
-msgid ""
-"    NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml"
-msgstr ""
-
-msgid "    NLM:<nlm> = check if NLM is loaded and report version"
-msgstr ""
-
-msgid "                (e.g. NLM:TSANDS.NLM)"
-msgstr ""
-
-msgid "Include server version string in results"
-msgstr ""
-
-msgid "- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"
-msgstr ""
-
-msgid ""
-"  extension for NetWare be loaded on the Novell servers you wish to check."
-msgstr ""
-
-msgid "  (available from http://www.engr.wisc.edu/~drews/mrtg/)"
-msgstr ""
-
-msgid ""
-"- Values for critical thresholds should be lower than warning thresholds"
-msgstr ""
-
-msgid ""
-"  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "
-msgstr ""
-
-msgid "  TCB, LRUS and LRUM."
-msgstr ""
-
-msgid "Unknown error fetching load data\n"
-msgstr ""
-
-msgid "Invalid response from server - no load information\n"
-msgstr ""
-
-msgid "Invalid response from server after load 1\n"
-msgstr ""
-
-msgid "Invalid response from server after load 5\n"
-msgstr ""
-
-#, c-format
-msgid "Load %s - %s-min load average = %0.2f"
-msgstr ""
-
-msgid "Unknown error fetching disk data\n"
-msgstr ""
-
-msgid "Invalid response from server\n"
-msgstr ""
-
-msgid "Unknown error fetching network status\n"
-msgstr ""
-
-#, c-format
-msgid "Net %s - %d connection%s on port %d"
-msgstr ""
-
-msgid "Unknown error fetching process status\n"
-msgstr ""
-
-#, c-format
-msgid "Process %s - %d instance%s of %s running"
-msgstr ""
-
-#, c-format
-msgid "Uptime %s - Up %d days %d hours %d minutes"
-msgstr ""
-
-msgid ""
-"This plugin attempts to contact the Over-CR collector daemon running on the"
-msgstr ""
-
-msgid "remote UNIX server in order to gather the requested system information."
-msgstr ""
-
-msgid "LOAD1         = 1 minute average CPU load"
-msgstr ""
-
-msgid "LOAD5         = 5 minute average CPU load"
-msgstr ""
-
-msgid "LOAD15        = 15 minute average CPU load"
-msgstr ""
-
-msgid "DPU<filesys>  = percent used disk space on filesystem <filesys>"
-msgstr ""
-
-msgid "PROC<process> = number of running processes with name <process>"
-msgstr ""
-
-msgid "NET<port>     = number of active connections on TCP port <port>"
-msgstr ""
-
-msgid "UPTIME        = system uptime in seconds"
-msgstr ""
-
-msgid "This plugin requires that Eric Molitors' Over-CR collector daemon be"
-msgstr ""
-
-msgid "running on the remote server."
-msgstr ""
-
-msgid "Over-CR can be downloaded from http://www.molitor.org/overcr"
-msgstr ""
-
-msgid "This plugin was tested with version 0.99.53 of the Over-CR collector"
-msgstr ""
-
-msgid ""
-"For the available options, the critical threshold value should always be"
-msgstr ""
-
-msgid ""
-"higher than the warning threshold value, EXCEPT with the uptime variable"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - no connection to '%s' (%s).\n"
-msgstr ""
-
-#, c-format
-msgid " %s - database %s (%f sec.)|%s\n"
-msgstr ""
-
-msgid "Critical threshold must be a positive integer"
-msgstr "Critical threshold muss ein positiver Integer sein"
-
-msgid "Warning threshold must be a positive integer"
-msgstr "Warning threshold muss ein positiver Integer sein"
-
-msgid "Database name exceeds the maximum length"
-msgstr ""
-
-msgid "User name is not valid"
-msgstr ""
-
-#, c-format
-msgid "Test whether a PostgreSQL Database is accepting connections."
-msgstr ""
-
-msgid "Database to check "
-msgstr ""
-
-#, c-format
-msgid "(default: %s)\n"
-msgstr ""
-
-msgid "Login name of user"
-msgstr ""
-
-msgid "Password (BIG SECURITY ISSUE)"
-msgstr ""
-
-msgid "Connection parameters (keyword = value), see below"
-msgstr ""
-
-msgid "SQL query to run. Only first column in first row will be read"
-msgstr ""
-
-msgid "A name for the query, this string is used instead of the query"
-msgstr ""
-
-msgid "in the long output of the plugin"
-msgstr ""
-
-msgid "SQL query value to result in warning status (double)"
-msgstr ""
-
-msgid "SQL query value to result in critical status (double)"
-msgstr ""
-
-msgid "All parameters are optional."
-msgstr ""
-
-msgid ""
-"This plugin tests a PostgreSQL DBMS to determine whether it is active and"
-msgstr ""
-
-msgid "accepting queries. In its current operation, it simply connects to the"
-msgstr ""
-
-msgid ""
-"specified database, and then disconnects. If no database is specified, it"
-msgstr ""
-
-msgid ""
-"connects to the template1 database, which is present in every functioning"
-msgstr ""
-
-msgid "PostgreSQL DBMS."
-msgstr ""
-
-msgid "If a query is specified using the -q option, it will be executed after"
-msgstr ""
-
-msgid "connecting to the server. The result from the query has to be numeric."
-msgstr ""
-
-msgid ""
-"Multiple SQL commands, separated by semicolon, are allowed but the result "
-msgstr ""
-
-msgid "of the last command is taken into account only. The value of the first"
-msgstr ""
-
-msgid ""
-"column in the first row is used as the check result. If a second column is"
-msgstr ""
-
-msgid "present in the result set, this is added to the plugin output with a"
-msgstr ""
-
-msgid ""
-"prefix of \"Extra Info:\". This information can be displayed in the system"
-msgstr ""
-
-msgid "executing the plugin."
-msgstr ""
-
-msgid ""
-"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"
-msgstr ""
-
-msgid ""
-"for details about how to access internal statistics of the database server."
-msgstr ""
-
-msgid ""
-"For a list of available connection parameters which may be used with the -o"
-msgstr ""
-
-msgid ""
-"command line option, see the documentation for PQconnectdb() in the chapter"
-msgstr ""
-
-msgid ""
-"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"
-msgstr ""
-
-msgid ""
-"used to specify a service name in pg_service.conf to be used for additional"
-msgstr ""
-
-msgid "connection parameters: -o 'service=<name>' or to specify the SSL mode:"
-msgstr ""
-
-msgid "-o 'sslmode=require'."
-msgstr ""
-
-msgid ""
-"The plugin will connect to a local postmaster if no host is specified. To"
-msgstr ""
-
-msgid ""
-"connect to a remote host, be sure that the remote postmaster accepts TCP/IP"
-msgstr ""
-
-msgid "connections (start the postmaster with the -i option)."
-msgstr ""
-
-msgid ""
-"Typically, the monitoring user (unless the --logname option is used) should "
-"be"
-msgstr ""
-
-msgid ""
-"able to connect to the database without a password. The plugin can also send"
-msgstr ""
-
-msgid "a password, but no effort is made to obscure or encrypt the password."
-msgstr ""
-
-#, c-format
-msgid "QUERY %s - %s: %s.\n"
-msgstr ""
-
-msgid "Error with query"
-msgstr ""
-
-msgid "No rows returned"
-msgstr ""
-
-msgid "No columns returned"
-msgstr ""
-
-#, fuzzy
-msgid "No data returned"
-msgstr "Keine Daten empfangen %s\n"
-
-msgid "Is not a numeric"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s returned %f"
-msgstr "%s hat %s zurückgegeben"
-
-#, fuzzy, c-format
-msgid "'%s' returned %f"
-msgstr "%s hat %s zurückgegeben"
-
-msgid "CRITICAL - Could not interpret output from ping command\n"
-msgstr ""
-
-#, c-format
-msgid "PING %s - %sPacket loss = %d%%"
-msgstr ""
-
-#, c-format
-msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"
-msgstr ""
-
-msgid "Could not realloc() addresses\n"
-msgstr ""
-
-#, c-format
-msgid "<max_packets> (%s) must be a non-negative number\n"
-msgstr ""
-
-#, c-format
-msgid "<wpl> (%s) must be an integer percentage\n"
-msgstr ""
-
-#, c-format
-msgid "<cpl> (%s) must be an integer percentage\n"
-msgstr ""
-
-#, c-format
-msgid "<wrta> (%s) must be a non-negative number\n"
-msgstr ""
-
-#, c-format
-msgid "<crta> (%s) must be a non-negative number\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s: Warning threshold must be integer or percentage!\n"
-"\n"
-msgstr ""
-
-#, c-format
-msgid "<wrta> was not set\n"
-msgstr ""
-
-#, c-format
-msgid "<crta> was not set\n"
-msgstr ""
-
-#, c-format
-msgid "<wpl> was not set\n"
-msgstr ""
-
-#, c-format
-msgid "<cpl> was not set\n"
-msgstr ""
-
-#, c-format
-msgid "<wrta> (%f) cannot be larger than <crta> (%f)\n"
-msgstr ""
-
-#, c-format
-msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
-msgstr ""
-
-#, c-format
-msgid "Cannot open stderr for %s\n"
-msgstr ""
-
-msgid "System call sent warnings to stderr "
-msgstr ""
-
-#, fuzzy, c-format
-msgid "CRITICAL - Network Unreachable (%s)\n"
-msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Host Unreachable (%s)\n"
-msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"
-msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"
-msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Network Prohibited (%s)\n"
-msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Host Prohibited (%s)\n"
-msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Packet Filtered (%s)\n"
-msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Host not found (%s)\n"
-msgstr "CRITICAL - Text nicht gefunden%s|%s %s\n"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Time to live exceeded (%s)\n"
-msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Destination Unreachable (%s)\n"
-msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)"
-
-msgid "Unable to realloc warn_text\n"
-msgstr ""
-
-#, c-format
-msgid "Use ping to check connection statistics for a remote host."
-msgstr ""
-
-msgid "host to ping"
-msgstr ""
-
-msgid "number of ICMP ECHO packets to send"
-msgstr ""
-
-#, c-format
-msgid "(Default: %d)\n"
-msgstr ""
-
-msgid "show HTML in the plugin output (obsoleted by urlize)"
-msgstr ""
-
-msgid "THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"
-msgstr ""
-
-msgid "time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"
-msgstr ""
-
-msgid "percentage of packet loss to trigger an alarm state."
-msgstr ""
-
-#, fuzzy
-msgid ""
-"This plugin uses the ping command to probe the specified host for packet loss"
-msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-
-msgid ""
-"(percentage) and round trip average (milliseconds). It can produce HTML "
-"output"
-msgstr ""
-
-msgid ""
-"linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"
-msgstr ""
-
-msgid "the contrib area of the downloads section at http://www.nagios.org/"
-msgstr ""
-
-#, c-format
-msgid "CMD: %s\n"
-msgstr ""
-
-msgid "System call sent warnings to stderr"
-msgstr ""
-
-#, c-format
-msgid "Not parseable: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to read output\n"
-msgstr ""
-
-#, c-format
-msgid "%d warn out of "
-msgstr ""
-
-#, c-format
-msgid "%d crit, %d warn out of "
-msgstr ""
-
-#, c-format
-msgid " with %s"
-msgstr ""
-
-#, fuzzy
-msgid "Parent Process ID must be an integer!"
-msgstr "Argument für check_dummy muss ein Integer sein"
-
-#, c-format
-msgid "%s%sSTATE = %s"
-msgstr ""
-
-#, fuzzy
-msgid "UID was not found"
-msgstr "%s [%s nicht gefunden]"
-
-#, fuzzy
-msgid "User name was not found"
-msgstr "%s [%s nicht gefunden]"
-
-#, c-format
-msgid "%s%scommand name '%s'"
-msgstr ""
-
-#, c-format
-msgid "%s%sexclude progs '%s'"
-msgstr ""
-
-#, fuzzy
-msgid "RSS must be an integer!"
-msgstr "skip lines muss ein Integer sein"
-
-#, fuzzy
-msgid "VSZ must be an integer!"
-msgstr "skip lines muss ein Integer sein"
-
-msgid "PCPU must be a float!"
-msgstr ""
-
-msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
-msgstr ""
-
-msgid ""
-"Checks all processes and generates WARNING or CRITICAL states if the "
-"specified"
-msgstr ""
-
-msgid ""
-"metric is outside the required threshold ranges. The metric defaults to "
-"number"
-msgstr ""
-
-msgid ""
-"of processes.  Search filters can be applied to limit the processes to check."
-msgstr ""
-
-msgid "Generate warning state if metric is outside this range"
-msgstr ""
-
-msgid "Generate critical state if metric is outside this range"
-msgstr ""
-
-msgid "Check thresholds against metric. Valid types:"
-msgstr ""
-
-msgid "PROCS   - number of processes (default)"
-msgstr ""
-
-msgid "VSZ     - virtual memory size"
-msgstr ""
-
-msgid "RSS     - resident set memory size"
-msgstr ""
-
-msgid "CPU     - percentage CPU"
-msgstr ""
-
-msgid "ELAPSED - time elapsed in seconds"
-msgstr ""
-
-msgid "Extra information. Up to 3 verbosity levels"
-msgstr ""
-
-msgid "Filter own process the traditional way by PID instead of /proc/pid/exe"
-msgstr ""
-
-msgid "Only scan for processes that have, in the output of `ps`, one or"
-msgstr ""
-
-msgid "more of the status flags you specify (for example R, Z, S, RS,"
-msgstr ""
-
-msgid "RSZDT, plus others based on the output of your 'ps' command)."
-msgstr ""
-
-msgid "Only scan for children of the parent process ID indicated."
-msgstr ""
-
-msgid "Only scan for processes with VSZ higher than indicated."
-msgstr ""
-
-msgid "Only scan for processes with RSS higher than indicated."
-msgstr ""
-
-msgid "Only scan for processes with PCPU higher than indicated."
-msgstr ""
-
-msgid "Only scan for processes with user name or ID indicated."
-msgstr ""
-
-msgid "Only scan for processes with args that contain STRING."
-msgstr ""
-
-msgid "Only scan for processes with args that contain the regex STRING."
-msgstr ""
-
-msgid "Only scan for exact matches of COMMAND (without path)."
-msgstr ""
-
-msgid "Exclude processes which match this comma separated list"
-msgstr ""
-
-msgid "Only scan for non kernel threads (works on Linux only)."
-msgstr ""
-
-#, c-format
-msgid ""
-"\n"
-"RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n"
-"specified 'max:min', a warning status will be generated if the\n"
-"count is inside the specified range\n"
-"\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"This plugin checks the number of currently running processes and\n"
-"generates WARNING or CRITICAL states if the process count is outside\n"
-"the specified threshold ranges. The process count can be filtered by\n"
-"process owner, parent process PID, current state (e.g., 'Z'), or may\n"
-"be the total number of running processes\n"
-"\n"
-msgstr ""
-
-msgid "Warning if not two processes with command name portsentry."
-msgstr ""
-
-msgid "Critical if < 2 or > 1024 processes"
-msgstr ""
-
-msgid "Critical if not at least 1 process with command sshd"
-msgstr ""
-
-msgid "Warning if > 1024 processes with command name sshd."
-msgstr ""
-
-msgid "Critical if < 1 processes with command name sshd."
-msgstr ""
-
-msgid "Warning alert if > 10 processes with command arguments containing"
-msgstr ""
-
-msgid "'/usr/local/bin/perl' and owned by root"
-msgstr ""
-
-msgid "Alert if VSZ of any processes over 50K or 100K"
-msgstr ""
-
-msgid "Alert if CPU of any processes over 10% or 20%"
-msgstr ""
-
-msgid "Config file error\n"
-msgstr ""
-
-#, fuzzy
-msgid "Out of Memory?\n"
-msgstr "Kein Papier"
-
-#, fuzzy
-msgid "Invalid NAS-Identifier\n"
-msgstr "Ungültige(r) Hostname/Adresse"
-
-#, c-format
-msgid "gethostname() failed!\n"
-msgstr ""
-
-#, fuzzy
-msgid "Invalid NAS-IP-Address\n"
-msgstr "Ungültige(r) Hostname/Adresse"
-
-msgid "Timeout\n"
-msgstr ""
-
-msgid "Auth Error\n"
-msgstr ""
-
-#, fuzzy
-msgid "Auth Failed\n"
-msgstr "Fehlgeschlagen"
-
-msgid "Bad Response\n"
-msgstr ""
-
-msgid "Auth OK\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Unexpected result code %d"
-msgstr "Erwartet: %s aber: %s erhalten"
-
-msgid "Number of retries must be a positive integer"
-msgstr ""
-
-msgid "User not specified"
-msgstr ""
-
-msgid "Password not specified"
-msgstr ""
-
-msgid "Configuration file not specified"
-msgstr ""
-
-#, fuzzy
-msgid "Tests to see if a RADIUS server is accepting connections."
-msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-
-msgid "The user to authenticate"
-msgstr ""
-
-msgid "Password for authentication (SECURITY RISK)"
-msgstr ""
-
-msgid "NAS identifier"
-msgstr ""
-
-msgid "NAS IP Address"
-msgstr ""
-
-msgid "Configuration file"
-msgstr ""
-
-msgid "Response string to expect from the server"
-msgstr ""
-
-msgid "Number of times to retry a failed connection"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"This plugin tests a RADIUS server to see if it is accepting connections."
-msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-
-msgid ""
-"The server to test must be specified in the invocation, as well as a user"
-msgstr ""
-
-msgid "name and password. A configuration file must be present. The format of"
-msgstr ""
-
-msgid ""
-"the configuration file is described in the radiusclient library sources."
-msgstr ""
-
-msgid "The password option presents a substantial security issue because the"
-msgstr ""
-
-msgid ""
-"password can possibly be determined by careful watching of the command line"
-msgstr ""
-
-msgid "in a process listing. This risk is exacerbated because the plugin will"
-msgstr ""
-
-msgid ""
-"typically be executed at regular predictable intervals. Please be sure that"
-msgstr ""
-
-msgid "the password used does not allow access to sensitive system resources."
-msgstr ""
-
-#, c-format
-msgid "Unable to connect to %s on port %d\n"
-msgstr ""
-
-#, c-format
-msgid "No data received from %s\n"
-msgstr ""
-
-#, fuzzy
-msgid "Invalid REAL response received from host"
-msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-
-#, c-format
-msgid "Invalid REAL response received from host on port %d\n"
-msgstr ""
-
-#, c-format
-msgid "No data received from host\n"
-msgstr ""
-
-#, c-format
-msgid "REAL %s - %d second response time\n"
-msgstr ""
-
-msgid "Warning time must be a positive integer"
-msgstr "Warnung time muss ein positiver Integer sein"
-
-msgid "Critical time must be a positive integer"
-msgstr "Critical time muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "You must provide a server to check"
-msgstr "%s: Hostname muss angegeben werden\n"
-
-#, fuzzy
-msgid "This plugin tests the REAL service on the specified host."
-msgstr ""
-"Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
-"\n"
-
-msgid "Connect to this url"
-msgstr ""
-
-#, c-format
-msgid "String to expect in first line of server response (default: %s)\n"
-msgstr ""
-
-#, fuzzy
-msgid "This plugin will attempt to open an RTSP connection with the host."
-msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-
-msgid "Successful connects return STATE_OK, refusals and timeouts return"
-msgstr ""
-
-msgid ""
-"STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful connects,"
-msgstr ""
-
-msgid ""
-"but incorrect response messages from the host result in STATE_WARNING return"
-msgstr ""
-
-msgid "values."
-msgstr ""
-
-#, c-format
-msgid "malloc() failed!\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Cannot create SSL context.\n"
-msgstr ""
-
-#, c-format
-msgid "recv() failed\n"
-msgstr ""
-
-#, c-format
-msgid "WARNING - TLS not supported by server\n"
-msgstr ""
-
-#, c-format
-msgid "Server does not support STARTTLS\n"
-msgstr ""
-
-msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS."
-msgstr ""
-
-#, c-format
-msgid "sent %s"
-msgstr ""
-
-msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Invalid SMTP response received from host: %s\n"
-msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-
-#, 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"
-
-#, c-format
-msgid "Could Not Compile Regular Expression"
-msgstr ""
-
-#, c-format
-msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "Execute Error: %s\n"
-msgstr ""
-
-msgid "no authuser specified, "
-msgstr ""
-
-msgid "no authpass specified, "
-msgstr ""
-
-#, c-format
-msgid "sent %s\n"
-msgstr ""
-
-#, fuzzy
-msgid "recv() failed after AUTH LOGIN, "
-msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-
-#, fuzzy, c-format
-msgid "received %s\n"
-msgstr "Keine Daten empfangen %s\n"
-
-#, fuzzy
-msgid "invalid response received after AUTH LOGIN, "
-msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-
-msgid "recv() failed after sending authuser, "
-msgstr ""
-
-#, fuzzy
-msgid "invalid response received after authuser, "
-msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-
-msgid "recv() failed after sending authpass, "
-msgstr ""
-
-#, fuzzy
-msgid "invalid response received after authpass, "
-msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-
-msgid "only authtype LOGIN is supported, "
-msgstr ""
-
-#, 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"
-
-#, c-format
-msgid "Could not realloc() units [%d]\n"
-msgstr ""
-
-#, fuzzy
-msgid "Critical time must be a positive"
-msgstr "Critical time muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "Warning time must be a positive"
-msgstr "Warnung time muss ein positiver Integer sein"
-
-msgid "SSL support not available - install OpenSSL and recompile"
-msgstr ""
-
-msgid "Set either -s/--ssl/--tls or -S/--starttls"
-msgstr "Setze entweder -s/--ssl/--tls oder -S/--starttls"
-
-#, c-format
-msgid "Connection closed by server before sending QUIT command\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "recv() failed after QUIT."
-msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-
-#, c-format
-msgid "Connection reset by peer."
-msgstr ""
-
-#, fuzzy
-msgid "This plugin will attempt to open an SMTP connection with the host."
-msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
-
-#, c-format
-msgid "    String to expect in first line of server response (default: '%s')\n"
-msgstr ""
-
-msgid "SMTP command (may be used repeatedly)"
-msgstr ""
-
-msgid "Expected response to command (may be used repeatedly)"
-msgstr ""
-
-msgid "FROM-address to include in MAIL command, required by Exchange 2000"
-msgstr ""
-
-msgid "FQDN used for HELO"
-msgstr ""
-
-msgid "Use PROXY protocol prefix for the connection."
-msgstr "Benutze PROXY-Protokoll-Präfix für die Verbindung."
-
-msgid "Minimum number of days a certificate has to be valid."
-msgstr ""
-
-#, fuzzy
-msgid "Use SSL/TLS for the connection."
-msgstr "Benutze SSL/TLS für die Verbindung."
-
-#, c-format
-msgid "    Sets default port to %d.\n"
-msgstr "    Setze den Default-Port auf %d.\n"
-
-msgid "Use STARTTLS for the connection."
-msgstr "Benutze STARTTLS für die Verbindung."
-
-msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
-msgstr ""
-
-msgid "SMTP AUTH username"
-msgstr ""
-
-msgid "SMTP AUTH password"
-msgstr ""
-
-msgid "Send LHLO instead of HELO/EHLO"
-msgstr ""
-
-msgid "Ignore failure when sending QUIT command to server"
-msgstr ""
-
-msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful"
-msgstr ""
-
-msgid "connects, but incorrect response messages from the host result in"
-msgstr ""
-
-msgid "STATE_WARNING return values."
-msgstr ""
-
-msgid "Cannot malloc"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "External command error: %s\n"
-msgstr "Papierfehler"
-
-#, c-format
-msgid "External command error with no output (return code: %d)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "No valid data returned (%s)\n"
-msgstr "Keine Daten empfangen %s\n"
-
-msgid "Time duration between plugin calls is invalid"
-msgstr ""
-
-msgid "Cannot asprintf()"
-msgstr ""
-
-msgid "Cannot realloc()"
-msgstr ""
-
-msgid "No previous data to calculate rate - assume okay"
-msgstr ""
-
-#, fuzzy
-msgid "Retries interval must be a positive integer"
-msgstr "Time interval muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "Exit status must be a positive integer"
-msgstr "Maxbytes muss ein positiver Integer sein"
-
-#, fuzzy, c-format
-msgid "Could not reallocate labels[%d]"
-msgstr "Konnte addr nicht zuweisen\n"
-
-#, fuzzy
-msgid "Could not reallocate labels\n"
-msgstr "Konnte·url·nicht·zuweisen\n"
-
-#, fuzzy, c-format
-msgid "Could not reallocate units [%d]\n"
-msgstr "Konnte·url·nicht·zuweisen\n"
-
-msgid "Could not realloc() units\n"
-msgstr ""
-
-#, fuzzy
-msgid "Rate multiplier must be a positive integer"
-msgstr "Paketgröße muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "No host specified\n"
-msgstr ""
-"Kein Hostname angegeben\n"
-"\n"
-
-#, fuzzy
-msgid "No OIDs specified\n"
-msgstr ""
-"Kein Hostname angegeben\n"
-"\n"
-
-#, c-format
-msgid "Required parameter: %s\n"
-msgstr ""
-
-msgid "Invalid seclevel"
-msgstr ""
-
-msgid "Invalid SNMP version"
-msgstr ""
-
-msgid "Unbalanced quotes\n"
-msgstr ""
-
-#, c-format
-msgid "multiplier set (%.1f), but input is not a number: %s"
-msgstr ""
-
-msgid "Check status of remote machines and obtain system information via SNMP"
-msgstr ""
-
-msgid "Use SNMP GETNEXT instead of SNMP GET"
-msgstr ""
-
-msgid "SNMP protocol version"
-msgstr ""
-
-msgid "SNMPv3 context"
-msgstr ""
-
-msgid "SNMPv3 securityLevel"
-msgstr ""
-
-msgid "SNMPv3 auth proto"
-msgstr ""
-
-msgid "SNMPv3 priv proto (default DES)"
-msgstr ""
-
-msgid "Optional community string for SNMP communication"
-msgstr ""
-
-msgid "default is"
-msgstr ""
-
-msgid "SNMPv3 username"
-msgstr ""
-
-msgid "SNMPv3 authentication password"
-msgstr ""
-
-msgid "SNMPv3 privacy password"
-msgstr ""
-
-msgid "Object identifier(s) or SNMP variables whose value you wish to query"
-msgstr ""
-
-msgid ""
-"List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
-msgstr ""
-
-msgid "for symbolic OIDs.)"
-msgstr ""
-
-msgid "Delimiter to use when parsing returned data. Default is"
-msgstr ""
-
-msgid "Any data on the right hand side of the delimiter is considered"
-msgstr ""
-
-msgid "to be the data that should be used in the evaluation."
-msgstr ""
-
-msgid "If the check returns a 0 length string or NULL value"
-msgstr ""
-
-msgid "This option allows you to choose what status you want it to exit"
-msgstr ""
-
-msgid "Excluding this option renders the default exit of 3(STATE_UNKNOWN)"
-msgstr ""
-
-msgid "0 = OK"
-msgstr ""
-
-#, fuzzy
-msgid "1 = WARNING"
-msgstr "WARNING"
-
-#, fuzzy
-msgid "2 = CRITICAL"
-msgstr "CRITICAL"
-
-#, fuzzy
-msgid "3 = UNKNOWN"
-msgstr "UNKNOWN"
-
-#, fuzzy
-msgid "Warning threshold range(s)"
-msgstr "Warning threshold  Integer sein"
-
-#, fuzzy
-msgid "Critical threshold range(s)"
-msgstr "Critical threshold muss ein Integer sein"
-
-msgid "Enable rate calculation. See 'Rate Calculation' below"
-msgstr ""
-
-msgid ""
-"Converts rate per second. For example, set to 60 to convert to per minute"
-msgstr ""
-
-msgid "Add/subtract the specified OFFSET to numeric sensor data"
-msgstr ""
-
-msgid "Return OK state (for that OID) if STRING is an exact match"
-msgstr ""
-
-msgid ""
-"Return OK state (for that OID) if extended regular expression REGEX matches"
-msgstr ""
-
-msgid ""
-"Return OK state (for that OID) if case-insensitive extended REGEX matches"
-msgstr ""
-
-msgid "Invert search result (CRITICAL if found)"
-msgstr ""
-
-msgid "Prefix label for output from plugin"
-msgstr ""
-
-msgid "Units label(s) for output data (e.g., 'sec.')."
-msgstr ""
-
-msgid "Separates output on multiple OID requests"
-msgstr ""
-
-msgid "Multiplies current value, 0 < n < 1 works as divider, defaults to 1"
-msgstr ""
-
-msgid "C-style format string for float values (see option -M)"
-msgstr ""
-
-msgid ""
-"NOTE the final timeout value is calculated using this formula: "
-"timeout_interval * retries + 5"
-msgstr ""
-
-msgid "Number of retries to be used in the requests, default: "
-msgstr ""
-
-msgid "Label performance data with OIDs instead of --label's"
-msgstr ""
-
-msgid "Tell snmpget to not print errors encountered when parsing MIB files"
-msgstr ""
-
-msgid ""
-"This plugin uses the 'snmpget' command included with the NET-SNMP package."
-msgstr ""
-
-msgid ""
-"if you don't have the package installed, you will need to download it from"
-msgstr ""
-
-msgid "http://net-snmp.sourceforge.net before you can use this plugin."
-msgstr ""
-
-msgid ""
-"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited  "
-msgstr ""
-
-msgid "list (lists with internal spaces must be quoted)."
-msgstr ""
-
-msgid ""
-"- When checking multiple OIDs, separate ranges by commas like '-w "
-"1:10,1:,:20'"
-msgstr ""
-
-msgid "- Note that only one string and one regex may be checked at present"
-msgstr ""
-
-msgid ""
-"- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
-msgstr ""
-
-msgid "returned from the SNMP query is an unsigned integer."
-msgstr ""
-
-msgid "Rate Calculation:"
-msgstr ""
-
-msgid "In many places, SNMP returns counters that are only meaningful when"
-msgstr ""
-
-msgid "calculating the counter difference since the last check. check_snmp"
-msgstr ""
-
-msgid "saves the last state information in a file so that the rate per second"
-msgstr ""
-
-msgid "can be calculated. Use the --rate option to save state information."
-msgstr ""
-
-msgid ""
-"On the first run, there will be no prior state - this will return with OK."
-msgstr ""
-
-msgid "The state is uniquely determined by the arguments to the plugin, so"
-msgstr ""
-
-msgid "changing the arguments will create a new state file."
-msgstr ""
-
-#, fuzzy
-msgid "Port number must be a positive integer"
-msgstr "Port muss ein positiver Integer sein"
-
-#, c-format
-msgid "Server answer: %s"
-msgstr ""
-
-#, c-format
-msgid "SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "SSH OK - %s (protocol %s) | %s\n"
-msgstr ""
-
-msgid "Try to connect to an SSH server at specified server and port"
-msgstr ""
-
-msgid ""
-"Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)"
-msgstr ""
-
-msgid "Alert if protocol doesn't match expected protocol version (ex: 2.0)"
-msgstr ""
-
-#, c-format
-msgid "Command: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Format: %s\n"
-msgstr ""
-
-#, c-format
-msgid "total=%.0f, used=%.0f, free=%.0f\n"
-msgstr ""
-
-#, c-format
-msgid "total=%.0f, free=%.0f\n"
-msgstr ""
-
-msgid "Error getting swap devices\n"
-msgstr ""
-
-msgid "SWAP OK: No swap devices defined\n"
-msgstr ""
-
-msgid "swapctl failed: "
-msgstr ""
-
-msgid "Error in swapctl call\n"
-msgstr ""
-
-#, c-format
-msgid "SWAP %s - %d%% free (%dMB out of %dMB) %s|"
-msgstr ""
-
-#, fuzzy
-msgid "Warning threshold percentage must be <= 100!"
-msgstr "Warning threshold  Integer sein"
-
-#, fuzzy
-msgid "Warning threshold be positive integer or percentage!"
-msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein"
-
-#, fuzzy
-msgid "Critical threshold percentage must be <= 100!"
-msgstr "Critical threshold muss ein Integer sein"
-
-#, fuzzy
-msgid "Critical threshold be positive integer or percentage!"
-msgstr "Critical threshold muss ein Integer oder ein Prozentwert sein!"
-
-msgid ""
-"no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
-"or integer (0-3)."
-msgstr ""
-
-#, fuzzy
-msgid "Warning should be more than critical"
-msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein"
-
-msgid "Check swap space on local machine."
-msgstr ""
-
-msgid ""
-"Exit with WARNING status if less than INTEGER bytes of swap space are free"
-msgstr ""
-
-msgid "Exit with WARNING status if less than PERCENT of swap space is free"
-msgstr ""
-
-msgid ""
-"Exit with CRITICAL status if less than INTEGER bytes of swap space are free"
-msgstr ""
-
-msgid "Exit with CRITICAL status if less than PERCENT of swap space is free"
-msgstr ""
-
-msgid "Conduct comparisons for all swap partitions, one by one"
-msgstr ""
-
-msgid ""
-"Resulting state when there is no swap regardless of thresholds. Default:"
-msgstr ""
-
-msgid ""
-"Both INTEGER and PERCENT thresholds can be specified, they are all checked."
-msgstr ""
-
-msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."
-msgstr ""
-
-msgid "CRITICAL - Generic check_tcp called with unknown service\n"
-msgstr ""
-
-msgid "With UDP checks, a send/expect string must be specified."
-msgstr ""
-
-msgid "No arguments found"
-msgstr ""
-
-msgid "Maxbytes must be a positive integer"
-msgstr "Maxbytes muss ein positiver Integer sein"
-
-msgid "Refuse must be one of ok, warn, crit"
-msgstr ""
-
-msgid "Mismatch must be one of ok, warn, crit"
-msgstr ""
-
-msgid "Delay must be a positive integer"
-msgstr "Delay muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "You must provide a server address"
-msgstr "%s: Hostname muss angegeben werden\n"
-
-#, fuzzy
-msgid "Invalid hostname, address or socket"
-msgstr "Ungültige(r) Hostname/Adresse"
-
-#, 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."
-
-msgid ""
-"Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send "
-"or quit option"
-msgstr ""
-
-msgid "Default: nothing added to send, \\r\\n added to end of quit"
-msgstr ""
-
-msgid "String to send to the server"
-msgstr ""
-
-msgid "String to expect in server response"
-msgstr ""
-
-msgid "(may be repeated)"
-msgstr ""
-
-msgid "All expect strings need to occur in server response. Default is any"
-msgstr ""
-
-msgid "String to send server to initiate a clean close of the connection"
-msgstr ""
-
-msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
-msgstr ""
-
-msgid ""
-"Accept expected string mismatches with states ok, warn, crit (default: warn)"
-msgstr ""
-
-#, fuzzy
-msgid "Hide output from TCP socket"
-msgstr "Konnte TCP socket nicht öffnen\n"
-
-msgid "Close connection once more than this number of bytes are received"
-msgstr ""
-
-msgid "Seconds to wait between sending string and polling for response"
-msgstr ""
-
-msgid "1st is #days for warning, 2nd is critical (if not specified - 0)."
-msgstr ""
-
-msgid "Use SSL for the connection."
-msgstr ""
-
-msgid "SSL server_name"
-msgstr ""
-
-#, c-format
-msgid "TIME UNKNOWN - could not connect to server %s, port %d\n"
-msgstr ""
-
-#, c-format
-msgid "TIME UNKNOWN - could not send UDP request to server %s, port %d\n"
-msgstr ""
-
-#, c-format
-msgid "TIME UNKNOWN - no data received from server %s, port %d\n"
-msgstr ""
-
-#, c-format
-msgid "TIME %s - %d second response time|%s\n"
-msgstr ""
-
-#, c-format
-msgid "TIME %s - %lu second time difference|%s %s\n"
-msgstr ""
-
-msgid "Warning thresholds must be a positive integer"
-msgstr "Warning thresholds muss ein positiver Integer sein"
-
-msgid "Critical thresholds must be a positive integer"
-msgstr "Critical thresholds muss ein positiver Integer sein"
-
-#, fuzzy
-msgid "This plugin will check the time on the specified host."
-msgstr ""
-"Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
-"\n"
-
-msgid "Use UDP to connect, not TCP"
-msgstr ""
-
-msgid "Time difference (sec.) necessary to result in a warning status"
-msgstr ""
-
-msgid "Time difference (sec.) necessary to result in a critical status"
-msgstr ""
-
-msgid "Response time (sec.) necessary to result in warning status"
-msgstr ""
-
-msgid "Response time (sec.) necessary to result in critical status"
-msgstr ""
-
-msgid "On Battery, Low Battery"
-msgstr ""
-
-msgid "Online"
-msgstr ""
-
-msgid "On Battery"
-msgstr ""
-
-msgid ", Low Battery"
-msgstr ""
-
-msgid ", Calibrating"
-msgstr ""
-
-msgid ", Replace Battery"
-msgstr ""
-
-msgid ", On Bypass"
-msgstr ""
-
-msgid ", Overload"
-msgstr ""
-
-msgid ", Trimming"
-msgstr ""
-
-msgid ", Boosting"
-msgstr ""
-
-msgid ", Charging"
-msgstr ""
-
-msgid ", Discharging"
-msgstr ""
-
-msgid ", Unknown"
-msgstr ""
-
-#, fuzzy
-msgid "UPS does not support any available options\n"
-msgstr "IPv6 Unterstützung nicht vorhanden"
-
-#, fuzzy
-msgid "Invalid response received from host"
-msgstr "Ungültige HTTP Antwort von Host empfangen\n"
-
-msgid "UPS name to long for buffer"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "CRITICAL - no such UPS '%s' on that host\n"
-msgstr "%s [%s nicht gefunden]"
-
-#, fuzzy
-msgid "CRITICAL - UPS data is stale"
-msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
-
-#, fuzzy, c-format
-msgid "Unknown error: %s\n"
-msgstr "Papierfehler"
-
-msgid "Error: unable to parse variable"
-msgstr ""
-
-msgid "Unrecognized UPS variable"
-msgstr ""
-
-msgid "Error : no UPS indicated"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"This plugin tests the UPS service on the specified host. Network UPS Tools"
-msgstr ""
-"Testet den DNS Dienst auf dem angegebenen Host mit dig\n"
-"\n"
-
-msgid "from www.networkupstools.org must be running for this plugin to work."
-msgstr ""
-
-msgid "Name of UPS"
-msgstr ""
-
-msgid "Output of temperatures in Celsius"
-msgstr ""
-
-msgid "Valid values for STRING are"
-msgstr ""
-
-msgid ""
-"This plugin attempts to determine the status of a UPS (Uninterruptible Power"
-msgstr ""
-
-msgid ""
-"Supply) on a local or remote host. If the UPS is online or calibrating, the"
-msgstr ""
-
-msgid ""
-"plugin will return an OK state. If the battery is on it will return a WARNING"
-msgstr ""
-
-msgid ""
-"state. If the UPS is off or has a low battery the plugin will return a "
-"CRITICAL"
-msgstr ""
-
-msgid ""
-"You may also specify a variable to check (such as temperature, utility "
-"voltage,"
-msgstr ""
-
-msgid ""
-"battery load, etc.) as well as warning and critical thresholds for the value"
-msgstr ""
-
-msgid ""
-"of that variable.  If the remote host has multiple UPS that are being "
-"monitored"
-msgstr ""
-
-msgid "you will have to use the --ups option to specify which UPS to check."
-msgstr ""
-
-msgid ""
-"This plugin requires that the UPSD daemon distributed with Russell Kroll's"
-msgstr ""
-
-msgid ""
-"Network UPS Tools be installed on the remote host. If you do not have the"
-msgstr ""
-
-msgid "package installed on your system, you can download it from"
-msgstr ""
-
-msgid "http://www.networkupstools.org"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Could not enumerate RD sessions: %d\n"
-msgstr "Konnte·url·nicht·zuweisen\n"
-
-#, c-format
-msgid "# users=%d"
-msgstr ""
-
-msgid "Unable to read output"
-msgstr ""
-
-#, c-format
-msgid "USERS %s - %d users currently logged in |%s\n"
-msgstr ""
-
-#, fuzzy
-msgid "This plugin checks the number of users currently logged in on the local"
-msgstr ""
-"Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem\n"
-"und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte "
-"unterschritten wird.\n"
-"\n"
-
-msgid ""
-"system and generates an error if the number exceeds the thresholds specified."
-msgstr ""
-
-msgid "Set WARNING status if more than INTEGER users are logged in"
-msgstr ""
-
-msgid "Set CRITICAL status if more than INTEGER users are logged in"
-msgstr ""
-
-msgid ""
-"DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"."
-msgstr ""
-
-msgid "Nagios-compatible output is now always returned."
-msgstr ""
-
-msgid "SMART commands are broken and have been disabled (See Notes in --help)."
-msgstr ""
-
-msgid ""
-"DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the"
-msgstr ""
-
-msgid "default and will be removed from future releases."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "CRITICAL - Couldn't open device %s: %s\n"
-msgstr "CRITICAL - Device konnte nicht geöffnet werden: %s\n"
-
-#, c-format
-msgid "CRITICAL - SMART_CMD_ENABLE\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - SMART_READ_VALUES: %s\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
-msgstr ""
-
-#, c-format
-msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
-msgstr ""
-
-#, c-format
-msgid "OK - Operational (%d/%d tests passed)\n"
-msgstr ""
-
-#, c-format
-msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n"
-msgstr ""
-
-#, c-format
-msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
-msgstr ""
-
-#, c-format
-msgid "OffLineCapability=%d {%s %s %s}\n"
-msgstr ""
-
-#, c-format
-msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - %s: %s\n"
-msgstr ""
-
-#, c-format
-msgid "OK - Command sent (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"This plugin checks a local hard drive with the (Linux specific) SMART "
-"interface [http://smartlinux.sourceforge.net/smart/index.php]."
-msgstr ""
-
-msgid "Select device DEVICE"
-msgstr ""
-
-msgid ""
-"Note: if the device is specified without this option, any further option will"
-msgstr ""
-
-msgid "be ignored."
-msgstr ""
-
-msgid ""
-"The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were"
-msgstr ""
-
-msgid ""
-"broken in an underhand manner and have been disabled. You can use smartctl"
-msgstr ""
-
-msgid "instead:"
-msgstr ""
-
-msgid "-0/--auto-off:  use \"smartctl --offlineauto=off\""
-msgstr ""
-
-msgid "-1/--auto-on:   use \"smartctl --offlineauto=on\""
-msgstr ""
-
-msgid "-i/--immediate: use \"smartctl --test=offline\""
-msgstr ""
-
-#, fuzzy
-msgid "No data returned from command\n"
-msgstr "Keine Daten empfangen %s\n"
-
-msgid ""
-"Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
-"or integer (0-3)."
-msgstr ""
-
-msgid ""
-"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer "
-"(0-3)."
-msgstr ""
-
-msgid ""
-"Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
-"integer (0-3)."
-msgstr ""
-
-msgid ""
-"Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
-"integer (0-3)."
-msgstr ""
-
-msgid ""
-"Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
-"integer (0-3)."
-msgstr ""
-
-msgid "Require path to command"
-msgstr ""
-
-msgid ""
-"Negates the status of a plugin (returns OK for CRITICAL and vice-versa)."
-msgstr ""
-
-msgid "Additional switches can be used to control which state becomes what."
-msgstr ""
-
-msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status."
-msgstr ""
-
-msgid "Custom result on Negate timeouts; see below for STATUS definition\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"    STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"    quotes. Numeric values are accepted. If nothing is specified, permutes\n"
-msgstr ""
-
-#, c-format
-msgid "    OK and CRITICAL.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Substitute output text as well. Will only substitute text in CAPITALS\n"
-msgstr ""
-
-msgid "Run check_ping and invert result. Must use full path to plugin"
-msgstr ""
-
-msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"
-msgstr ""
-
-msgid ""
-"This plugin is a wrapper to take the output of another plugin and invert it."
-msgstr ""
-
-msgid "The full path of the plugin must be provided."
-msgstr ""
-
-msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL."
-msgstr ""
-
-msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK."
-msgstr ""
-
-msgid "Otherwise, the output state of the wrapped plugin is unchanged."
-msgstr ""
-
-msgid ""
-"Using timeout-result, it is possible to override the timeout behaviour or a"
-msgstr ""
-
-msgid "plugin by setting the negate timeout a bit lower."
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s - Socket timeout after %d seconds\n"
-msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
-
-#, fuzzy, c-format
-msgid "%s - Abnormal timeout after %d seconds\n"
-msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
-
-msgid "Send failed"
-msgstr ""
-
-#, fuzzy
-msgid "No data was received from host!"
-msgstr "Keine Daten empfangen %s\n"
-
-msgid "Socket creation failed"
-msgstr ""
-
-msgid "Supplied path too long unix domain socket"
-msgstr ""
-
-msgid "Receive failed"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Invalid hostname/address - %s"
-msgstr ""
-"Ungültige(r) Name/Adresse: %s\n"
-"\n"
-
-#, fuzzy
-msgid "Could not malloc argv array in popen()"
-msgstr "Konnte addr nicht zuweisen\n"
-
-#, fuzzy
-msgid "CRITICAL - You need more args!!!"
-msgstr "CRITICAL - Fehler: %s\n"
-
-#, fuzzy
-msgid "Cannot catch SIGCHLD"
-msgstr "Konnte SIGALRM nicht erhalten"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Plugin timed out after %d seconds\n"
-msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
-
-msgid "CRITICAL - popen timeout received, but no child process"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s UNKNOWN - No data received from host\n"
-"CMD: %s</A>\n"
-msgstr ""
-
-msgid ""
-"This plugin wraps the text output of another command (plugin) in HTML <A>"
-msgstr ""
-
-msgid ""
-"tags, thus displaying the child plugin's output as a clickable link in "
-"compatible"
-msgstr ""
-
-msgid ""
-"monitoring status screen. This plugin returns the status of the invoked "
-"plugin."
-msgstr ""
-
-msgid ""
-"Pay close attention to quoting to ensure that the shell passes the expected"
-msgstr ""
-
-msgid "data to the plugin. For example, in:"
-msgstr ""
-
-msgid "urlize http://example.com/ check_http -H example.com -r 'two words'"
-msgstr ""
-
-msgid "the shell will remove the single quotes and urlize will see:"
-msgstr ""
-
-msgid "urlize http://example.com/ check_http -H example.com -r two words"
-msgstr ""
-
-msgid "You probably want:"
-msgstr ""
-
-msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\""
-msgstr ""
-
-#, fuzzy
-msgid "failed realloc in strpcpy\n"
-msgstr "konnte keinen Speicher für '%s' reservieren\n"
-
-#, fuzzy
-msgid "failed malloc in strscat\n"
-msgstr "konnte keinen Speicher für '%s' reservieren\n"
-
-#, fuzzy
-msgid "failed malloc in xvasprintf\n"
-msgstr "konnte keinen Speicher für '%s' reservieren\n"
-
-msgid "sysconf error for _SC_OPEN_MAX\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"       %s (-h | --help) for detailed help\n"
-"       %s (-V | --version) for version information\n"
-msgstr ""
-
-msgid ""
-"\n"
-"Options:\n"
-" -h, --help\n"
-"    Print detailed help screen\n"
-" -V, --version\n"
-"    Print version information\n"
-msgstr ""
-
-#, c-format
-msgid ""
-" -H, --hostname=ADDRESS\n"
-"    Host name, IP Address, or unix socket (must be an absolute path)\n"
-" -%c, --port=INTEGER\n"
-"    Port number (default: %s)\n"
-msgstr ""
-
-msgid ""
-" -4, --use-ipv4\n"
-"    Use IPv4 connection\n"
-" -6, --use-ipv6\n"
-"    Use IPv6 connection\n"
-msgstr ""
-
-msgid ""
-" -v, --verbose\n"
-"    Show details for command-line debugging (output may be truncated by\n"
-"    the monitoring system)\n"
-msgstr ""
-
-msgid ""
-" -w, --warning=DOUBLE\n"
-"    Response time to result in warning status (seconds)\n"
-" -c, --critical=DOUBLE\n"
-"    Response time to result in critical status (seconds)\n"
-msgstr ""
-
-msgid ""
-" -w, --warning=RANGE\n"
-"    Warning range (format: start:end). Alert if outside this range\n"
-" -c, --critical=RANGE\n"
-"    Critical range\n"
-msgstr ""
-
-#, c-format
-msgid ""
-" -t, --timeout=INTEGER\n"
-"    Seconds before connection times out (default: %d)\n"
-msgstr ""
-
-#, c-format
-msgid ""
-" -t, --timeout=INTEGER\n"
-"    Seconds before plugin times out (default: %d)\n"
-msgstr ""
-
-msgid ""
-" --extra-opts=[section][@file]\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 ""
-
-msgid ""
-" See:\n"
-" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
-" for THRESHOLD format and examples.\n"
-msgstr ""
-
-msgid ""
-"\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 ""
-
-msgid ""
-"\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 ""
-
-#, c-format
-msgid "Error: Could not get hardware address of interface '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "Error: if_nametoindex error - %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: Couldn't get hardware address from interface %s. malloc error - %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: can't find unit number in interface_name (%s) - expecting TypeNumber "
-"eg lnc0.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: can't read MAC address from DLPI streams interface for device %s unit "
-"%d.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: can't get MAC address for this architecture.  Use the --mac option.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Cannot determine IP address of interface %s\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Cannot get interface IP address on this platform.\n"
-msgstr ""
-
-#, c-format
-msgid "Pretending to be relay client %s\n"
-msgstr ""
-
-#, c-format
-msgid "DHCPDISCOVER to %s port %d\n"
-msgstr ""
-
-#, c-format
-msgid "Result=ERROR\n"
-msgstr ""
-
-#, c-format
-msgid "Result=OK\n"
-msgstr ""
-
-#, c-format
-msgid "DHCPOFFER from IP address %s"
-msgstr ""
-
-#, c-format
-msgid " via %s\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"
-msgstr ""
-
-#, c-format
-msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n"
-msgstr ""
-
-#, c-format
-msgid "Total responses seen on the wire: %d\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Valid responses for this machine: %d\n"
-msgstr "Keine Antwort vom Host \n"
-
-#, c-format
-msgid "send_dhcp_packet result: %d\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "No (more) data received (nfound: %d)\n"
-msgstr "Keine Daten empfangen %s\n"
-
-#, c-format
-msgid "recvfrom() failed, "
-msgstr ""
-
-#, c-format
-msgid "receive_dhcp_packet() result: %d\n"
-msgstr ""
-
-#, c-format
-msgid "receive_dhcp_packet() source: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Could not create socket!\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Could not set reuse address option on DHCP socket!\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Could not set broadcast option on DHCP socket!\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: Could not bind socket to interface %s.  Check your privileges...\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: Could not bind to DHCP socket (port %d)!  Check your privileges...\n"
-msgstr ""
-
-#, c-format
-msgid "Requested server address: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Lease Time: Infinite\n"
-msgstr ""
-
-#, c-format
-msgid "Lease Time: %lu seconds\n"
-msgstr ""
-
-#, c-format
-msgid "Renewal Time: Infinite\n"
-msgstr ""
-
-#, c-format
-msgid "Renewal Time: %lu seconds\n"
-msgstr ""
-
-#, c-format
-msgid "Rebinding Time: Infinite\n"
-msgstr ""
-
-#, c-format
-msgid "Rebinding Time: %lu seconds\n"
-msgstr ""
-
-#, c-format
-msgid "Added offer from server @ %s"
-msgstr ""
-
-#, c-format
-msgid " of IP address %s\n"
-msgstr ""
-
-#, c-format
-msgid "DHCP Server Match: Offerer=%s"
-msgstr ""
-
-#, c-format
-msgid " Requested=%s"
-msgstr ""
-
-#, c-format
-msgid " (duplicate)"
-msgstr ""
-
-#, c-format
-msgid "\n"
-msgstr ""
-
-#, c-format
-msgid "No DHCPOFFERs were received.\n"
-msgstr ""
-
-#, c-format
-msgid "Received %d DHCPOFFER(s)"
-msgstr ""
-
-#, c-format
-msgid ", %s%d of %d requested servers responded"
-msgstr ""
-
-#, c-format
-msgid ", requested address (%s) was %soffered"
-msgstr ""
-
-msgid "not "
-msgstr ""
-
-#, c-format
-msgid ", max lease time = "
-msgstr ""
-
-#, c-format
-msgid "Infinity"
-msgstr ""
-
-msgid "Got unexpected non-option argument"
-msgstr ""
-
-#, c-format
-msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Hardware address: "
-msgstr ""
-
-msgid "This plugin tests the availability of DHCP servers on a network."
-msgstr ""
-
-msgid "IP address of DHCP server that we must hear from"
-msgstr ""
-
-msgid "IP address that should be offered by at least one DHCP server"
-msgstr ""
-
-msgid "Seconds to wait for DHCPOFFER before timeout occurs"
-msgstr ""
-
-msgid "Interface to to use for listening (i.e. eth0)"
-msgstr ""
-
-msgid "MAC address to use in the DHCP request"
-msgstr ""
-
-msgid "Unicast testing: mimic a DHCP relay, requires -s"
-msgstr ""
-
-msgid "specify a target"
-msgstr ""
-
-msgid "Use IPv4 (default) or IPv6 to communicate with the targets"
-msgstr ""
-
-#, fuzzy
-msgid "warning threshold (currently "
-msgstr "Warning threshold  Integer sein"
-
-#, fuzzy
-msgid "critical threshold (currently "
-msgstr "Critical threshold muss ein Integer sein"
-
-#, fuzzy
-msgid "specify a source IP address or device name"
-msgstr "Hostname oder Serveradresse muss angegeben werden"
-
-msgid "number of packets to send (currently "
-msgstr ""
-
-msgid "max packet interval (currently "
-msgstr ""
-
-msgid "max target interval (currently "
-msgstr ""
-
-msgid "number of alive hosts required for success"
-msgstr ""
-
-msgid "TTL on outgoing packets (currently "
-msgstr ""
-
-msgid "timeout value (seconds, currently  "
-msgstr ""
-
-msgid "Number of icmp data bytes to send"
-msgstr ""
-
-msgid "Packet size will be data bytes + icmp header (currently"
-msgstr ""
-
-msgid "verbose"
-msgstr ""
-
-msgid "The -H switch is optional. Naming a host (or several) to check is not."
-msgstr ""
-
-msgid ""
-"Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"
-msgstr ""
-
-msgid "packet loss.  The default values should work well for most users."
-msgstr ""
-
-msgid ""
-"You can specify different RTA factors using the standardized abbreviations"
-msgstr ""
-
-msgid ""
-"us (microseconds), ms (milliseconds, default) or just plain s for seconds."
-msgstr ""
-
-msgid "The -v switch can be specified several times for increased verbosity."
-msgstr ""
-
-#, fuzzy, c-format
-#~ msgid "%s - Plugin timed out after %d seconds\n"
-#~ msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n"
-
-#, 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"
-
-#~ msgid "Invalid HTTP response received from host on port %d\n"
-#~ msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n"
-
-#~ msgid "HTTP CRITICAL: %s\n"
-#~ msgstr "HTTP CRITICAL: %s\n"
-
-#~ msgid "HTTP WARNING: %s\n"
-#~ msgstr "HTTP WARNING: %s\n"
-
-#~ msgid "HTTP UNKNOWN"
-#~ msgstr "HTTP UNKNOWN"
-
-#~ msgid "HTTP OK"
-#~ msgstr "HTTP OK"
-
-#~ msgid "HTTP WARNING"
-#~ msgstr "HTTP WARNING"
-
-#~ msgid "HTTP CRITICAL"
-#~ msgstr "HTTP CRITICAL"
-
-#, fuzzy
-#~ msgid "HTTP OK %s - %.3f second response time %s|%s %s\n"
-#~ msgstr "HTTP OK %s - %.3f Sekunde Antwortzeit %s%s|%s %s\n"
-
-#~ msgid "HTTP CRITICAL - string not found%s|%s %s\n"
-#~ msgstr "HTTP CRITICAL - Text nicht gefunden%s|%s %s\n"
-
-#, fuzzy
-#~ msgid "HTTP UNKNOWN - could not allocate url\n"
-#~ msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n"
-
-#, fuzzy
-#~ msgid "snmpget returned an error status"
-#~ msgstr "dig hat einen Fehler zurückgegeben"
-
-#, fuzzy
-#~ msgid "Invalid critical threshold"
-#~ msgstr "Critical threshold muss ein Integer sein"
-
-#, fuzzy
-#~ msgid "Invalid warning threshold"
-#~ msgstr "Warning threshold  Integer sein"
-
-#, fuzzy
-#~ msgid "HTTP WARNING: %s - %.3f second response time %s|%s %s\n"
-#~ msgstr "HTTP WARNING: %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n"
-
-#, fuzzy
-#~ msgid "%s does not exist\n"
-#~ msgstr "%s [%s nicht gefunden]"
-
-#, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "Papierfehler"
-
-#, fuzzy
-#~ msgid "Unknown argument - %s"
-#~ msgstr ""
-#~ "%s: Unbekanntes Argument: %s\n"
-#~ "\n"
-
-#~ msgid ""
-#~ " -1, --proto1\n"
-#~ "    tell ssh to use Protocol 1\n"
-#~ " -2, --proto2\n"
-#~ "    tell ssh to use Protocol 2\n"
-#~ " -S, --skiplines=n\n"
-#~ "    Ignore first n lines on STDERR (to suppress a logon banner)\n"
-#~ " -f\n"
-#~ "    tells ssh to fork rather than create a tty\n"
-#~ msgstr ""
-#~ " -1, --proto1\n"
-#~ "    ssh anweisen Protokoll 1 zu verwenden\n"
-#~ " -2, --proto2\n"
-#~ "    ssh anweisen Protokoll 2 zu verwenden\n"
-#~ " -S, --skiplines=n\n"
-#~ "    Ignoriere die ersten n Zeilen auf STDERR (um Logon Banner zu "
-#~ "unterdrücken)\n"
-#~ " -f\n"
-#~ "    ssh anweisen fork zu nutzen statt ein tty zu erzeugen\n"
-
-#~ msgid ""
-#~ " -C, --command='COMMAND STRING'\n"
-#~ "    command to execute on the remote machine\n"
-#~ " -l, --logname=USERNAME\n"
-#~ "    SSH user name on remote host [optional]\n"
-#~ " -i, --identity=KEYFILE\n"
-#~ "    identity of an authorized key [optional]\n"
-#~ " -O, --output=FILE\n"
-#~ "    external command file for nagios [optional]\n"
-#~ " -s, --services=LIST\n"
-#~ "    list of nagios service names, separated by ':' [optional]\n"
-#~ " -n, --name=NAME\n"
-#~ "    short name of host in nagios configuration [optional]\n"
-#~ msgstr ""
-#~ " -C, --command='COMMAND STRING'\n"
-#~ "    Befehl der auf der entfernten Maschine ausgeführt werden soll\n"
-#~ " -l, --logname=USERNAME\n"
-#~ "    SSH user name auf dem entfernten Host [optional]\n"
-#~ " -i, --identity=KEYFILE\n"
-#~ "    zu verwendende Schlüsseldatei [optional]\n"
-#~ " -O, --output=FILE\n"
-#~ "    externe Befehlsdatei für nagios [optional]\n"
-#~ " -s, --services=LIST\n"
-#~ "    Liste von nagios Servicenamen, getrennt durch ':' [optional]\n"
-#~ " -n, --name=NAME\n"
-#~ "    Shortname des Hosts in der nagios Konfiguration [optional]\n"
-
-#, fuzzy
-#~ msgid "Warning inode threshold must be percentage!\n"
-#~ msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein!\n"
-
-#, fuzzy
-#~ msgid "Critical inode threshold must be percentage!\n"
-#~ msgstr "Critical threshold muss ein Integer oder ein Prozentwert sein!\n"
-
-#~ msgid "INPUT ERROR: No thresholds specified"
-#~ msgstr "FEHLER: Kein Schwellwert angegeben"
-
-#~ msgid ""
-#~ "INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should "
-#~ "be between zero and 100 percent, inclusive"
-#~ msgstr ""
-#~ "INPUT ERROR: C_DFP (%f) sollte kleiner sein als W_DFP (%.1f) und beide "
-#~ "sollten zwischen 0 und 100 Prozent liegen"
-
-#, fuzzy
-#~ msgid ""
-#~ "INPUT ERROR: C_IDFP (%f) should be less than W_IDFP (%.1f) and both "
-#~ "should be between zero and 100 percent, inclusive"
-#~ msgstr ""
-#~ "INPUT ERROR: C_DFP (%f) sollte kleiner sein als W_DFP (%.1f) und beide "
-#~ "sollten zwischen 0 und 100 Prozent liegen"
-
-#~ msgid ""
-#~ "INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be "
-#~ "greater than zero"
-#~ msgstr ""
-#~ "INPUT ERROR: C_DF (%lu) sollte kleiner sein als W_DF (%lu) und beide "
-#~ "sollten größer als 0 sein"
-
-#, fuzzy
-#~ msgid "No response from host on port %d\n"
-#~ msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n"
-
-#, fuzzy
-#~ msgid "Invalid response received from host on port %d\n"
-#~ msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n"
-
-#~ msgid "%.3f seconds response time (%s)"
-#~ msgstr "%.3f Sekunden Antwortzeit (%s)"
-
-#~ msgid ""
-#~ " -w, --warning=INTEGER\n"
-#~ "   Exit with WARNING status if less than INTEGER --units of disk are "
-#~ "free\n"
-#~ " -w, --warning=PERCENT%%\n"
-#~ "   Exit with WARNING status if less than PERCENT of disk space is free\n"
-#~ " -c, --critical=INTEGER\n"
-#~ "   Exit with CRITICAL status if less than INTEGER --units of disk are "
-#~ "free\n"
-#~ " -c, --critical=PERCENT%%\n"
-#~ "   Exit with CRITICAL status if less than PERCENT of disk space is free\n"
-#~ " -C, --clear\n"
-#~ "    Clear thresholds\n"
-#~ msgstr ""
-#~ " -w, --warning=INTEGER\n"
-#~ "  meldet Status WARNING, wenn weniger als INTEGER --Einheiten frei\n"
-#~ " -w, --warning=PERCENT%%\n"
-#~ "  meldet Status WARNING, wenn weniger als PERCENT --Plattenplatz frei\n"
-#~ " -c, --critical=INTEGER\n"
-#~ "  meldet Status CRITICAL, wenn weniger als INTEGER --Einheiten frei\n"
-#~ " -c, --critical=PERCENT%%\n"
-#~ "  meldet Status CRITICAL, wenn weniger als PERCENT --Plattenplatz frei\n"
-#~ " -C, --clear\n"
-#~ "    Schwellwerte löschen\n"
-
-#~ msgid ""
-#~ "Examples:\n"
-#~ " check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n"
-#~ "   Checks /tmp and /var at 10%,5% and / at 100MB, 50MB\n"
-#~ msgstr ""
-#~ "Beispiel:\n"
-#~ " check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n"
-#~ "   Prüft /tmp und /var mit 10%,5% und / mit 100MB, 50MB\n"
-
-#~ msgid ""
-#~ "This plugin uses the nslookup program to obtain the IP address\n"
-#~ "for the given host/domain query.  A optional DNS server to use may\n"
-#~ "be specified.  If no DNS server is specified, the default server(s)\n"
-#~ "specified in /etc/resolv.conf will be used.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Dieses Plugin nutzt nslookup, um die IP-Adresse des angegebenen\n"
-#~ "Hosts zu erfragen.  Optional kann ein DNS-Server angegeben werden\n"
-#~ "Wenn kein DNS-Server angegeben wird, so wird der Standardserver aus\n"
-#~ "/etc/resolv.conf genutzt.\n"
-#~ "\n"
-
-#~ msgid "HTTP CRITICAL - Could not make SSL connection\n"
-#~ msgstr "HTTP CRITICAL - Konnte keine SSL Verbindung herstellen\n"
-
-#~ msgid "Client Certificate Required\n"
-#~ msgstr "Clientzertifikat benötigt\n"
-
-#~ msgid "CRITICAL -  Cannot create SSL context.\n"
-#~ msgstr "CRITICAL -  Konnte SSL Kontext nicht erzeugen.\n"
-
-#~ msgid "CRITICAL - Cannot initiate SSL handshake.\n"
-#~ msgstr "CRITICAL - Konnte SSL Handshake nicht starten.\n"
-
-#, fuzzy
-#~ msgid "Failed to allocate memory for hostname"
-#~ msgstr "konnte keinen Speicher für '%s' reservieren\n"
-
-#, fuzzy
-#~ msgid "CRITICAL - %d of %d hosts are alive\n"
-#~ msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden"
-
-#, fuzzy
-#~ msgid "%s has no address data\n"
-#~ msgstr "Nameserver %s hat keine Datensätze\n"
-
-#, fuzzy
-#~ msgid "CRITICAL - Could not make SSL connection\n"
-#~ msgstr "HTTP CRITICAL - Konnte keine SSL Verbindung herstellen\n"
-
-#, fuzzy
-#~ msgid "Unexpected response from host: %s\n"
-#~ msgstr "Keine Antwort vom Host \n"
-
-#, fuzzy
-#~ msgid "Certificate expires today (%s).\n"
-#~ msgstr "Clientzertifikat benötigt\n"
-
-#, fuzzy
-#~ msgid "ERROR: Cannot create SSL context.\n"
-#~ msgstr "CRITICAL -  Konnte SSL Kontext nicht erzeugen.\n"
-
-#, fuzzy
-#~ msgid "ERROR: Cannot retrieve server certificate.\n"
-#~ msgstr "CRITICAL - Konnte kein Serverzertifikat erhalten\n"
-
-#, fuzzy
-#~ msgid "ERROR: Cannot initiate SSL handshake.\n"
-#~ msgstr "CRITICAL - Konnte SSL Handshake nicht starten.\n"
-
-#~ msgid ""
-#~ "%s: Unknown argument: %s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s: Unbekanntes Argument: %s\n"
-#~ "\n"
-
-#~ msgid "Critical time must be a nonnegative integer"
-#~ msgstr "Critical time muss ein positiver Integer sein"
-
-#~ msgid "Time interval must be a nonnegative integer"
-#~ msgstr "Time interval muss ein positiver Integer sein"
-
-#~ msgid "check_http: invalid option - SSL is not available\n"
-#~ msgstr "check_http: ungültige Option - SSL ist nicht verfügbar\n"
-
-#~ msgid "invalid hostname/address"
-#~ msgstr "Ungültige(r) Hostname/Adresse"
diff --git a/po/fr.po b/po/fr.po
deleted file mode 100644
index dfc2c5d..0000000
--- a/po/fr.po
+++ /dev/null
@@ -1,5384 +0,0 @@
-# translation of fr.po to
-# Messages français pour Nagios Plugins
-# Copyright (C) 2003-2023 Nagios Plugin Development Group
-# This file is distributed under the same license as the nagiosplug package.
-#
-# Karl DeBisschop <kdebisschop@users.sourceforge.net>, 2003.
-# Benoit Mortier <benoit.mortier@opensides.be>, 2004, 2006, 2007.
-# Thomas Guyot-Sionnest <dermoth@aei.ca>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
-"POT-Creation-Date: 2023-09-05 00:31+0200\n"
-"PO-Revision-Date: 2010-04-21 23:38-0400\n"
-"Last-Translator: \n"
-"Language-Team: Monitoring Plugin Development Team <devel@monitoring-plugins.org>\n"
-"Language: fr\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"
-
-msgid "Could not parse arguments"
-msgstr "Impossible de décomposer les arguments"
-
-msgid "Cannot catch SIGALRM"
-msgstr "Impossible d'obtenir le signal SIGALRM"
-
-#, fuzzy, c-format
-msgid "SSH connection failed: %s\n"
-msgstr "L'exécution de la commande à distance %s à échoué\n"
-
-#, c-format
-msgid "Remote command execution failed: %s\n"
-msgstr "L'exécution de la commande à distance %s à échoué\n"
-
-#, c-format
-msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n"
-msgstr ""
-
-#, c-format
-msgid "SSH WARNING: could not open %s\n"
-msgstr "SSH AVERTISSEMENT: impossible d'ouvrir %s\n"
-
-#, c-format
-msgid "%s: Error parsing output\n"
-msgstr "%s: Erreur d'analyse du résultat\n"
-
-msgid "Timeout interval must be a positive integer"
-msgstr "Le délai d'attente doit être un entier positif"
-
-msgid "Port must be a positive integer"
-msgstr "Le numéro du port doit être un entier positif"
-
-msgid "skip-stdout argument must be an integer"
-msgstr "Le nombres de lignes à sauter (skip-stdout) doit être un entier"
-
-msgid "skip-stderr argument must be an integer"
-msgstr "Le nombres de lignes à sauter (skip-stderr) doit être un entier"
-
-#, c-format
-msgid "%s: You must provide a host name\n"
-msgstr "%s: Vous devez fournir un nom d'hôte\n"
-
-msgid "No remotecmd"
-msgstr "Pas de commande distante"
-
-#, c-format
-msgid "%s: Argument limit of %d exceeded\n"
-msgstr ""
-
-msgid "Can not (re)allocate 'commargv' buffer\n"
-msgstr "Impossible de réallouer le tampon 'commargv'\n"
-
-#, 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"
-
-#, fuzzy, c-format
-msgid ""
-"%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"
-
-#, 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"
-
-msgid "tell ssh to use Protocol 1 [optional]"
-msgstr "dire à ssh d'utiliser le protocole version 1 [optionnel]"
-
-msgid "tell ssh to use Protocol 2 [optional]"
-msgstr "dire à ssh d'utiliser le protocole 2 [optionnel]"
-
-msgid "Ignore all or (if specified) first n lines on STDOUT [optional]"
-msgstr ""
-
-msgid "Ignore all or (if specified) first n lines on STDERR [optional]"
-msgstr ""
-
-msgid "Exit with an warning, if there is an output on STDERR"
-msgstr ""
-
-msgid ""
-"tells ssh to fork rather than create a tty [optional]. This will always "
-"return OK if ssh is executed"
-msgstr ""
-
-msgid "command to execute on the remote machine"
-msgstr "commande à exécuter sur la machine distante"
-
-msgid "SSH user name on remote host [optional]"
-msgstr "Nom d'utilisateur ssh sur la machine distante [optionnel]"
-
-msgid "identity of an authorized key [optional]"
-msgstr "Identité de la clé autorisée [optionnel]"
-
-#, fuzzy
-msgid "external command file for monitoring [optional]"
-msgstr "commande externe pour nagios [optionnel]"
-
-#, fuzzy
-msgid "list of monitoring service names, separated by ':' [optional]"
-msgstr "liste des services nagios, séparés par ':' [optionnel] "
-
-#, fuzzy
-msgid "short name of host in the monitoring configuration [optional]"
-msgstr "nom court de l'hôte dans la configuration nagios [optionnel]"
-
-msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
-msgstr ""
-"appelle ssh avec '-o OPTION' (peut être utilisé plusieurs fois) [optionnel]"
-
-#, fuzzy
-msgid "Tell ssh to use this configfile [optional]"
-msgstr "dire à ssh d'utiliser le protocole version 1 [optionnel]"
-
-msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
-msgstr ""
-"dire à ssh de supprimer les messages d'erreurs et de diagnostic [optionnel]"
-
-msgid "Make connection problems return UNKNOWN instead of CRITICAL"
-msgstr ""
-
-msgid "The most common mode of use is to refer to a local identity file with"
-msgstr ""
-
-msgid "the '-i' option. In this mode, the identity pair should have a null"
-msgstr ""
-
-msgid "passphrase and the public key should be listed in the authorized_keys"
-msgstr ""
-
-msgid "file of the remote host. Usually the key will be restricted to running"
-msgstr ""
-
-msgid "only one command on the remote server. If the remote SSH server tracks"
-msgstr ""
-
-msgid "invocation arguments, the one remote program may be an agent that can"
-msgstr ""
-
-msgid "execute additional commands as proxy"
-msgstr ""
-
-msgid "To use passive mode, provide multiple '-C' options, and provide"
-msgstr "Pour utiliser le mode passif, utilisez plusieurs fois l'option '-C',et"
-
-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)"
-
-msgid "Examples:"
-msgstr "Exemples:"
-
-msgid "Usage:"
-msgstr "Utilisation:"
-
-#, fuzzy, c-format
-msgid "Host/Service Cluster Plugin for Monitoring"
-msgstr "Plugin de Cluster d'Hôte/Service pour Nagios 2"
-
-msgid "Options:"
-msgstr "Options:"
-
-msgid "Check service cluster status"
-msgstr "Vérifie l'état d'un cluster de services"
-
-msgid "Check host cluster status"
-msgstr "Vérifie l'état d'un cluster d'hôtes"
-
-msgid "Optional prepended text output (i.e. \"Host cluster\")"
-msgstr "Texte optionnel accolé à la sortie (i.e. \"Cluster d'hôtes\")"
-
-msgid "Specifies the range of hosts or services in cluster that must be in a"
-msgstr "Défini le nombre d'hôtes ou de services du cluster qui doivent être"
-
-msgid "non-OK state in order to return a WARNING status level"
-msgstr "dans un état non-OK pour retourner un état AVERTISSEMENT"
-
-msgid "non-OK state in order to return a CRITICAL status level"
-msgstr "dans un état non-OK pour retourner un état CRITIQUE"
-
-msgid "The status codes of the hosts or services in the cluster, separated by"
-msgstr "Les codes d'état des hôtes ou des services du cluster, séparés par des"
-
-msgid "commas"
-msgstr "virgules"
-
-msgid "Notes:"
-msgstr "Notes:"
-
-msgid ""
-"Will alert critical if there are 3 or more service data points in a non-OK"
-msgstr ""
-
-msgid "state."
-msgstr ""
-
-#, c-format
-msgid "Looking for: '%s'\n"
-msgstr "Recherche de: '%s'\n"
-
-msgid "dig returned an error status"
-msgstr "dig à renvoyé un état d'erreur"
-
-msgid "Server not found in ANSWER SECTION"
-msgstr "Le serveur n'a pas été trouvé dans l'ANSWER SECTION"
-
-msgid "No ANSWER SECTION found"
-msgstr "Pas d' ANSWER SECTION trouvé"
-
-msgid "Probably a non-existent host/domain"
-msgstr "Probablement un hôte/domaine inexistant"
-
-#, c-format
-msgid "Port must be a positive integer - %s"
-msgstr "Le numéro du port doit être un entier positif - %s"
-
-#, c-format
-msgid "Warning interval must be a positive integer - %s"
-msgstr "Le seuil d'avertissement doit être un entier positif - %s"
-
-#, c-format
-msgid "Critical interval must be a positive integer - %s"
-msgstr "Le seuil critique doit être un entier positif - %s"
-
-#, c-format
-msgid "Timeout interval must be a positive integer - %s"
-msgstr "Le délai d'attente doit être un entier positif - %s"
-
-#, fuzzy, c-format
-msgid "This plugin tests 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"
-
-msgid "Force dig to only use IPv4 query transport"
-msgstr ""
-
-msgid "Force dig to only use IPv6 query transport"
-msgstr ""
-
-msgid "Machine name to lookup"
-msgstr "Nom de machine à rechercher"
-
-msgid "Record type to lookup (default: A)"
-msgstr "Type d'enregistrement à rechercher (par défaut: A)"
-
-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"
-
-msgid "was in -l"
-msgstr "ce qui est passé au paramètre -l"
-
-msgid "Pass STRING as argument(s) to dig"
-msgstr ""
-
-#, c-format
-msgid "DISK %s: %s not found\n"
-msgstr "DISK %s: %s non trouvé\n"
-
-#, c-format
-msgid "CRITICAL"
-msgstr "CRITIQUE"
-
-#, c-format
-msgid "unit type %s not known\n"
-msgstr "unité de type %s inconnue\n"
-
-#, c-format
-msgid "failed allocating storage for '%s'\n"
-msgstr "Impossible d'allouer de l'espace pour '%s'\n"
-
-#, c-format
-msgid "UNKNOWN"
-msgstr "INCONNU"
-
-msgid "Must set a threshold value before using -p\n"
-msgstr ""
-
-msgid "Must set -E before selecting paths\n"
-msgstr ""
-
-msgid "Must set group value before selecting paths\n"
-msgstr ""
-
-msgid ""
-"Paths need to be selected before using -i/-I. Use -A to select all paths "
-"explicitly"
-msgstr ""
-
-msgid "Could not compile regular expression"
-msgstr "Impossible de compiler l'expression rationnelle"
-
-msgid "Must set a threshold value before using -r/-R\n"
-msgstr ""
-
-msgid "Regular expression did not match any path or disk"
-msgstr ""
-
-msgid "Unknown argument"
-msgstr "Argument inconnu"
-
-#, c-format
-msgid " for %s\n"
-msgstr " pour %s\n"
-
-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é"
-
-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"
-
-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"
-
-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"
-
-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"
-
-#, 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"
-
-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"
-
-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"
-
-msgid ""
-"Mount point or block device as emitted by the mount(8) command (may be "
-"repeated)"
-msgstr ""
-
-msgid "Ignore device (only works if -p unspecified)"
-msgstr "Ignorer le périphérique (marche seulement lorsque -p est utilisé)"
-
-msgid "Clear thresholds"
-msgstr "Effacer les seuils"
-
-msgid "For paths or partitions specified with -p, only check for exact paths"
-msgstr ""
-
-msgid "Display only devices/mountpoints with errors"
-msgstr "Afficher seulement les périphériques/point de montage avec des erreurs"
-
-msgid "Don't account root-reserved blocks into freespace in perfdata"
-msgstr ""
-
-msgid "Display inode usage in perfdata"
-msgstr ""
-
-msgid ""
-"Group paths. Thresholds apply to (free-)space of all partitions together"
-msgstr ""
-
-msgid "Same as '--units kB'"
-msgstr "Pareil à '--units kB'"
-
-msgid "Only check local filesystems"
-msgstr "Vérifier seulement les systèmes de fichiers locaux"
-
-msgid ""
-"Only check local filesystems against thresholds. Yet call stat on remote "
-"filesystems"
-msgstr ""
-
-msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)"
-msgstr ""
-
-#, fuzzy
-msgid "Display the (block) device instead of the mount point"
-msgstr "Afficher le point de montage au lieu de la partition"
-
-msgid "Same as '--units MB'"
-msgstr "Pareil à '--units MB'"
-
-msgid "Explicitly select all paths. This is equivalent to -R '.*'"
-msgstr ""
-
-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)"
-
-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)"
-
-msgid ""
-"Regular expression to ignore selected path/partition (case insensitive) (may "
-"be repeated)"
-msgstr ""
-"Expression rationnelle pour ignorer un répertoire ou une partition (peut "
-"être utilisé plusieurs fois)"
-
-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)"
-
-msgid ""
-"Return OK if no filesystem matches, filesystem does not exist or is "
-"inaccessible."
-msgstr ""
-
-msgid "(Provide this option before -p / -r / --ereg-path if used)"
-msgstr ""
-
-msgid "Choose bytes, kB, MB, GB, TB (default: MB)"
-msgstr "Choisissez octets, kb, MB, GB, TB (par défaut: MB)"
-
-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)"
-
-#, 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)"
-
-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"
-
-msgid ""
-"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
-"r regex"
-msgstr ""
-
-msgid ""
-"are grouped which means the freespace thresholds are applied to all disks "
-"together"
-msgstr ""
-
-msgid ""
-"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
-"100M/50M"
-msgstr ""
-
-#, c-format
-msgid "%s %s: %s\n"
-msgstr ""
-
-msgid "is not accessible"
-msgstr ""
-
-msgid "nslookup returned an error status"
-msgstr "nslookup à retourné un code d'erreur"
-
-msgid "Warning plugin error"
-msgstr "Alerte erreur de plugin"
-
-#, fuzzy, c-format
-msgid "DNS CRITICAL - '%s' returned empty server string\n"
-msgstr "DNS CRITIQUE - '%s' à retourné un nom d'hôte vide\n"
-
-#, fuzzy, c-format
-msgid "DNS CRITICAL - No response from DNS %s\n"
-msgstr "Pas de réponse du DNS %s\n"
-
-#, c-format
-msgid "DNS CRITICAL - '%s' returned empty host name string\n"
-msgstr "DNS CRITIQUE - '%s' à retourné un nom d'hôte vide\n"
-
-msgid "Non-authoritative answer:"
-msgstr "Réponse non autoritative:"
-
-#, fuzzy, c-format
-msgid "Domain '%s' was not found by the server\n"
-msgstr "Le domaine %s n'a pas été trouvé par le serveur\n"
-
-#, c-format
-msgid "DNS CRITICAL - '%s' msg parsing exited with no address\n"
-msgstr "DNS CRITIQUE - '%s' n'a pas retourné d'adresse\n"
-
-#, c-format
-msgid "expected '%s' but got '%s'"
-msgstr "j'attendais '%s' mais j'ai reçu '%s'"
-
-#, fuzzy, c-format
-msgid "Domain '%s' was found by the server: '%s'\n"
-msgstr "Le domaine %s n'a pas été trouvé par le serveur\n"
-
-#, c-format
-msgid "server %s is not authoritative for %s"
-msgstr "serveur %s n'est pas autoritaire pour %s"
-
-#, c-format
-msgid "OK"
-msgstr "OK"
-
-#, c-format
-msgid "WARNING"
-msgstr "AVERTISSEMENT"
-
-#, c-format
-msgid "%.3f second response time"
-msgid_plural "%.3f seconds response time"
-msgstr[0] "%.3f secondes de temps de réponse "
-msgstr[1] "%.3f secondes de temps de réponse "
-
-#, c-format
-msgid ". %s returns %s"
-msgstr ". %s renvoie %s"
-
-#, c-format
-msgid "DNS WARNING - %s\n"
-msgstr "DNS AVERTISSEMENT - %s\n"
-
-msgid " Probably a non-existent host/domain"
-msgstr " Probablement un hôte/domaine inexistant"
-
-#, c-format
-msgid "DNS CRITICAL - %s\n"
-msgstr "DNS CRITIQUE - %s\n"
-
-#, c-format
-msgid "DNS UNKNOWN - %s\n"
-msgstr "DNS INCONNU - %s\n"
-
-msgid "Note: nslookup is deprecated and may be removed from future releases."
-msgstr ""
-"Note: nslookup est obsolète et pourra être retiré dans les prochaines "
-"versions."
-
-msgid "Consider using the `dig' or `host' programs instead.  Run nslookup with"
-msgstr ""
-"Veuillez utiliser le programme 'dig' ou 'host' à la place. Faire fonctionner "
-"nslookup avec"
-
-msgid "the `-sil[ent]' option to prevent this message from appearing."
-msgstr "L'option '-sil[ent]' empêche l'apparition de ce message."
-
-#, c-format
-msgid "No response from DNS %s\n"
-msgstr "Pas de réponse du DNS %s\n"
-
-#, c-format
-msgid "DNS %s has no records\n"
-msgstr "Le DNS %s n'a pas d'enregistrements\n"
-
-#, c-format
-msgid "Connection to DNS %s was refused\n"
-msgstr "La connexion au DNS %s à été refusée\n"
-
-#, c-format
-msgid "Query was refused by DNS server at %s\n"
-msgstr "La requête à été refusée par le serveur DNS %s\n"
-
-#, c-format
-msgid "No information returned by DNS server at %s\n"
-msgstr "Pas d'information renvoyée par le serveur DNS %s\n"
-
-msgid "Network is unreachable\n"
-msgstr "Le réseau est inaccessible\n"
-
-#, c-format
-msgid "DNS failure for %s\n"
-msgstr "DNS à échoué pour %s\n"
-
-msgid "Input buffer overflow\n"
-msgstr "Le tampon d'entrée a débordé\n"
-
-msgid ""
-"This plugin uses the nslookup program to obtain the IP address for the given "
-"host/domain query."
-msgstr ""
-"Ce plugin utilise le programme nslookup pour obtenir l'adresse IP de l'hôte/"
-"domaine à interroger."
-
-msgid "An optional DNS server to use may be specified."
-msgstr "Un serveur DNS à utiliser peut être indiqué."
-
-msgid ""
-"If no DNS server is specified, the default server(s) specified in /etc/"
-"resolv.conf will be used."
-msgstr ""
-"Si aucun serveur DNS n'est spécifié, les serveurs spécifiés dans /etc/resolv."
-"conf seront utilisé."
-
-msgid "The name or address you want to query"
-msgstr "Le nom ou l'adresse que vous voulez interroger"
-
-msgid "Optional DNS server you want to use for the lookup"
-msgstr "Serveur DNS que vous voulez utiliser pour la recherche"
-
-#, fuzzy
-msgid ""
-"Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end"
-msgstr ""
-"Adresse IP que le serveur DNS doit retourner. Les hôtes doivent se terminer "
-
-#, fuzzy
-msgid ""
-"with a dot (.). This option can be repeated multiple times (Returns OK if any"
-msgstr "avec un point (.). Cette option peut être répétée (Retourne OK si une"
-
-msgid "value matches)."
-msgstr ""
-
-msgid ""
-"Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)"
-msgstr ""
-
-msgid "Cannot be used together with -a"
-msgstr ""
-
-msgid "Optionally expect the DNS server to be authoritative for the lookup"
-msgstr "Serveur DNS qui doit normalement être autoritaire pour la recherche"
-
-msgid "Return warning if elapsed time exceeds value. Default off"
-msgstr ""
-"Renvoie une alerte si le temps écoulé dépasse la valeur indiquée. Désactivé "
-"par défaut"
-
-msgid "Return critical if elapsed time exceeds value. Default off"
-msgstr ""
-"Renvoie critique si le temps utilisé dépasse la valeur indiquée. Désactivé "
-"par défaut"
-
-msgid ""
-"Return critical if the list of expected addresses does not match all "
-"addresses"
-msgstr ""
-
-msgid "returned. Default off"
-msgstr ""
-
-msgid "Arguments to check_dummy must be an integer"
-msgstr "Les arguments pour check_dummy doivent être des entiers"
-
-#, c-format
-msgid "Status %d is not a supported error state\n"
-msgstr "Le résultat %d n'est pas un résultat supporté\n"
-
-msgid ""
-"This plugin will simply return the state corresponding to the numeric value"
-msgstr ""
-"Ce plugin renverra simplement l'état correspondant à la valeur numérique"
-
-msgid "of the <state> argument with optional text"
-msgstr "du paramètre <state> avec un texte optionnel"
-
-#, c-format
-msgid "Could not open pipe: %s\n"
-msgstr "Impossible d'ouvrir le pipe: %s\n"
-
-#, c-format
-msgid "Could not open stderr for %s\n"
-msgstr "Impossible d'ouvrir la sortie d'erreur standard pour %s\n"
-
-#, fuzzy
-msgid "FPING UNKNOWN - IP address not found\n"
-msgstr "PING INCONNU - Hôte non trouvé (%s)\n"
-
-msgid "FPING UNKNOWN - invalid commandline argument\n"
-msgstr ""
-
-#, fuzzy
-msgid "FPING UNKNOWN - failed system call\n"
-msgstr "PING INCONNU - Hôte non trouvé (%s)\n"
-
-#, fuzzy, c-format
-msgid "FPING %s - %s (rta=%f ms)|%s\n"
-msgstr "FPING %s - %s (perte=%.0f%% )|%s\n"
-
-#, c-format
-msgid "FPING UNKNOWN - %s not found\n"
-msgstr "PING INCONNU - Hôte non trouvé (%s)\n"
-
-#, c-format
-msgid "FPING CRITICAL - %s is unreachable\n"
-msgstr "PING CRITIQUE - Hôte inaccessible (%s)\n"
-
-#, fuzzy, c-format
-msgid "FPING UNKNOWN - %s parameter error\n"
-msgstr "PING INCONNU - Hôte non trouvé (%s)\n"
-
-#, c-format
-msgid "FPING CRITICAL - %s is down\n"
-msgstr "FPING CRITIQUE - %s est en panne\n"
-
-#, 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"
-
-#, c-format
-msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
-msgstr "FPING %s - %s (perte=%.0f%% )|%s\n"
-
-msgid "Invalid hostname/address"
-msgstr "Adresse/Nom d'hôte invalide"
-
-msgid "IPv6 support not available\n"
-msgstr "Support IPv6 non disponible\n"
-
-msgid "Packet size must be a positive integer"
-msgstr "La taille du paquet doit être un entier positif"
-
-msgid "Packet count must be a positive integer"
-msgstr "Le nombre de paquets doit être un entier positif"
-
-msgid "Target timeout must be a positive integer"
-msgstr "Le seuil d'avertissement doit être un entier positif"
-
-msgid "Interval must be a positive integer"
-msgstr "Le délai d'attente doit être un entier positif"
-
-msgid "Hostname was not supplied"
-msgstr "Le nom de l'hôte n'a pas été spécifié"
-
-#, 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"
-
-#, 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"
-
-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."
-
-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."
-
-msgid ""
-"name or IP Address of host to ping (IP Address bypasses name lookup, "
-"reducing system load)"
-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)"
-
-msgid "warning threshold pair"
-msgstr "Valeurs pour le seuil d'avertissement"
-
-msgid "critical threshold pair"
-msgstr "Valeurs pour le seuil critique"
-
-msgid "Return OK after first successful reply"
-msgstr ""
-
-msgid "size of ICMP packet"
-msgstr "taille du paquet ICMP"
-
-msgid "number of ICMP packets to send"
-msgstr "nombre de paquets ICMP à envoyer"
-
-msgid "Target timeout (ms)"
-msgstr ""
-
-msgid "Interval (ms) between sending packets"
-msgstr ""
-
-msgid "name or IP Address of sourceip"
-msgstr ""
-
-msgid "source interface name"
-msgstr ""
-
-#, c-format
-msgid ""
-"THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time "
-"(ms)"
-msgstr ""
-"Le seuil est <rta>,<pl>%% ou <rta> est le temps moyen pour l'aller retour "
-"(ms)"
-
-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"
-
-msgid "packet loss to trigger an alarm state."
-msgstr "paquets perdu pour déclencher une alarme."
-
-msgid "IPv4 is used by default. Specify -6 to use IPv6."
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Host type parameter incorrect!\n"
-msgstr "CRITIQUE - Argument de type hôte incorrect!\n"
-
-#, c-format
-msgid "CRITICAL - Host not found\n"
-msgstr "CRITIQUE - Hôte non trouvé\n"
-
-#, c-format
-msgid "CRITICAL - Game server down or unavailable\n"
-msgstr "CRITIQUE - Serveur de jeux en panne ou non disponible\n"
-
-#, c-format
-msgid "CRITICAL - Game server timeout\n"
-msgstr "CRITIQUE - Temps d'attente pour le serveur de jeux dépassé\n"
-
-#, c-format
-msgid "This plugin tests game server connections with the specified host."
-msgstr "Le plugin teste la connexion au serveur de jeux avec l'hôte spécifié."
-
-msgid "Optional port of which to connect"
-msgstr ""
-
-msgid "Field number in raw qstat output that contains game name"
-msgstr ""
-
-msgid "Field number in raw qstat output that contains map name"
-msgstr ""
-
-msgid "Field number in raw qstat output that contains ping time"
-msgstr ""
-
-msgid ""
-"This plugin uses the 'qstat' command, the popular game server status query "
-"tool."
-msgstr ""
-"Ce plugin utilise la commande 'qstat', un programme répandu pour questioner "
-"les serveurs de jeux."
-
-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"
-
-#, fuzzy
-msgid "https://github.com/multiplay/qstat before you can use this plugin."
-msgstr ""
-"http://www.activesw.com/people/steve/qstat.html avant de pouvoir utiliser ce "
-"plugin."
-
-msgid "Paper Jam"
-msgstr "Bourrage Papier"
-
-msgid "Out of Paper"
-msgstr "Plus de Papier"
-
-msgid "Printer Offline"
-msgstr "Imprimante hors ligne"
-
-msgid "Peripheral Error"
-msgstr "Erreur du périphérique"
-
-msgid "Intervention Required"
-msgstr "Intervention Requise"
-
-msgid "Toner Low"
-msgstr "Toner Faible"
-
-msgid "Insufficient Memory"
-msgstr "Mémoire Insuffisante"
-
-msgid "A Door is Open"
-msgstr "Une porte est ouverte"
-
-msgid "Output Tray is Full"
-msgstr "Le bac de sortie est plein"
-
-msgid "Data too Slow for Engine"
-msgstr "Le données arrivent trop lentement pour l'imprimante"
-
-msgid "Unknown Paper Error"
-msgstr "Erreur de papier inconnue"
-
-#, c-format
-msgid "Printer ok - (%s)\n"
-msgstr "Imprimante ok - (%s)\n"
-
-#, fuzzy
-msgid "Port must be a positive short integer"
-msgstr "Le numéro du port doit être un entier positif"
-
-msgid "This plugin tests the STATUS of an HP printer with a JetDirect card."
-msgstr "Ce plugin teste l'état d'une imprimante HP avec une carte JetDirect."
-
-msgid "Net-snmp must be installed on the computer running the plugin."
-msgstr "Net-snmp doit être installé sur l'ordinateur qui exécute le plugin."
-
-msgid "The SNMP community name "
-msgstr "Le nom de la communauté SNMP "
-
-#, c-format
-msgid "(default=%s)"
-msgstr "(défaut=%s)"
-
-#, fuzzy
-msgid "Specify the port to check "
-msgstr "Nom de l'hôte à vérifier"
-
-#, fuzzy
-msgid "Disable paper check "
-msgstr "Variable a vérifier"
-
-msgid "file does not exist or is not readable"
-msgstr ""
-
-msgid "Invalid certificate expiration period"
-msgstr "Période d'expiration du certificat invalide"
-
-msgid ""
-"Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional "
-"'+' suffix)"
-msgstr ""
-
-msgid "Invalid option - SSL is not available"
-msgstr "Option invalide - SSL n'est pas disponible"
-
-msgid "Invalid max_redirs count"
-msgstr ""
-
-msgid "Invalid onredirect option"
-msgstr ""
-
-#, c-format
-msgid "option f:%d \n"
-msgstr "option f:%d \n"
-
-msgid "Invalid port number"
-msgstr "Numéro de port invalide"
-
-#, c-format
-msgid "Could Not Compile Regular Expression: %s"
-msgstr "Impossible de compiler l'expression rationnelle: %s"
-
-msgid "IPv6 support not available"
-msgstr "Support IPv6 non disponible"
-
-msgid "You must specify a server address or host name"
-msgstr "Vous devez spécifier une adresse ou un nom d'hôte"
-
-msgid ""
-"If you use a client certificate you must also specify a private key file"
-msgstr ""
-
-msgid "HTTP UNKNOWN - Memory allocation error\n"
-msgstr "HTTP INCONNU - Impossible d'allouer la mémoire\n"
-
-#, c-format
-msgid "%sServer date unknown, "
-msgstr "%sDate du serveur inconnue, "
-
-#, c-format
-msgid "%sDocument modification date unknown, "
-msgstr "%sDate de modification du document inconnue, "
-
-#, c-format
-msgid "%sServer date \"%100s\" unparsable, "
-msgstr "%sDate du serveur \"%100s\" illisible, "
-
-#, c-format
-msgid "%sDocument date \"%100s\" unparsable, "
-msgstr "%sDate du document \"%100s\" illisible, "
-
-#, c-format
-msgid "%sDocument is %d seconds in the future, "
-msgstr "%sLa date du document est %d secondes dans le futur, "
-
-#, c-format
-msgid "%sLast modified %.1f days ago, "
-msgstr "%sDernière modification %.1f jours auparavant, "
-
-#, c-format
-msgid "%sLast modified %d:%02d:%02d ago, "
-msgstr "%sDernière modification %d:%02d:%02d auparavant, "
-
-msgid "HTTP CRITICAL - Unable to open TCP socket\n"
-msgstr "HTTP CRITIQUE - Impossible d'ouvrir un socket TCP\n"
-
-#, fuzzy
-msgid "HTTP UNKNOWN - Could not allocate memory for full_page\n"
-msgstr "HTTP INCONNU - Impossible d'allouer une adresse\n"
-
-msgid "HTTP CRITICAL - Error on receive\n"
-msgstr "HTTP CRITIQUE - Erreur dans la réception\n"
-
-msgid "HTTP CRITICAL - No data received from host\n"
-msgstr "HTTP CRITIQUE - Pas de données reçues de l'hôte\n"
-
-#, c-format
-msgid "Invalid HTTP response received from host: %s\n"
-msgstr "Réponse HTTP reçue de l'hôte invalide: %s\n"
-
-#, 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"
-
-#, c-format
-msgid ""
-"%s\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Status line output matched \"%s\" - "
-msgstr "La ligne d'état correspond à \"%s\" - "
-
-#, c-format
-msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
-msgstr "HTTP CRITIQUE: Ligne d'état non valide (%s)\n"
-
-#, c-format
-msgid "HTTP CRITICAL: Invalid Status (%s)\n"
-msgstr "HTTP CRITIQUE: Etat Invalide (%s)\n"
-
-#, c-format
-msgid "%s - "
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%sheader '%s' not found on '%s://%s:%d%s', "
-msgstr "%schaîne non trouvée, "
-
-#, fuzzy, c-format
-msgid "%sstring '%s' not found on '%s://%s:%d%s', "
-msgstr "%schaîne non trouvée, "
-
-#, c-format
-msgid "%spattern not found, "
-msgstr "%sexpression non trouvée, "
-
-#, c-format
-msgid "%spattern found, "
-msgstr "%sexpression trouvée, "
-
-#, c-format
-msgid "%sExecute Error: %s, "
-msgstr "%sErreur d'exécution: %s, "
-
-#, c-format
-msgid "%spage size %d too large, "
-msgstr "%sla taille de la page est trop grande (%d), "
-
-#, c-format
-msgid "%spage size %d too small, "
-msgstr "%sla taille de la page est trop petite (%d), "
-
-#, 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"
-
-#, 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"
-
-msgid "HTTP UNKNOWN - Could not allocate addr\n"
-msgstr "HTTP INCONNU - Impossible d'allouer une adresse\n"
-
-msgid "HTTP UNKNOWN - Could not allocate URL\n"
-msgstr "HTTP INCONNU - Impossible d'allouer l'URL\n"
-
-#, 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"
-
-#, c-format
-msgid "HTTP UNKNOWN - Empty redirect location%s\n"
-msgstr "HTTP INCONNU - endroit de redirection vide%s\n"
-
-#, 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"
-
-#, 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"
-
-#, fuzzy, c-format
-msgid "HTTP CRITICAL - 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"
-
-#, 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"
-
-#, c-format
-msgid "Redirection to %s://%s:%d%s\n"
-msgstr "Redirection vers %s://%s:%d%s\n"
-
-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"
-
-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"
-
-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"
-
-msgid "certificate expiration times."
-msgstr "et rapporter la date d'expiration du certificat."
-
-#, c-format
-msgid "In the first form, make an HTTP request."
-msgstr ""
-
-#, c-format
-msgid ""
-"In the second form, connect to the server and check the TLS certificate."
-msgstr ""
-
-#, 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"
-
-msgid "Host name argument for servers using host headers (virtual host)"
-msgstr ""
-
-msgid "Append a port to include it in the header (eg: example.com:5000)"
-msgstr ""
-
-msgid ""
-"IP address or name (use numeric address if possible to bypass DNS lookup)."
-msgstr ""
-
-msgid "Port number (default: "
-msgstr "Numéro du port (défaut: "
-
-msgid ""
-"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"
-msgstr ""
-
-msgid "auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1,"
-msgstr ""
-
-msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted."
-msgstr ""
-
-msgid "Enable SSL/TLS hostname extension support (SNI)"
-msgstr ""
-
-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"
-
-msgid ""
-"(when this option is used the URL is not checked by default. You can use"
-msgstr ""
-
-msgid " --continue-after-certificate to override this behavior)"
-msgstr ""
-
-msgid ""
-"Allows the HTTP check to continue after performing the certificate check."
-msgstr ""
-
-msgid "Does nothing unless -C is used."
-msgstr ""
-
-msgid "Name of file that contains the client certificate (PEM format)"
-msgstr ""
-
-msgid "to be used in establishing the SSL session"
-msgstr ""
-
-msgid "Name of file containing the private key (PEM format)"
-msgstr ""
-
-msgid "matching the client certificate"
-msgstr ""
-
-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"
-
-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: "
-
-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)"
-
-#, fuzzy
-msgid "String to expect in the response headers"
-msgstr "Chaîne de caractères à attendre en réponse"
-
-msgid "String to expect in the content"
-msgstr "Chaîne de caractère attendue dans le contenu"
-
-msgid "URL to GET or POST (default: /)"
-msgstr "URL pour le GET ou le POST (défaut: /)"
-
-msgid "URL encoded http POST data"
-msgstr ""
-
-msgid "Set HTTP method."
-msgstr ""
-
-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"
-
-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.)"
-
-msgid "Warn if document is more than SECONDS old. the number can also be of"
-msgstr ""
-
-msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."
-msgstr ""
-
-msgid "specify Content-Type header media type when POSTing\n"
-msgstr ""
-
-msgid "Allow regex to span newlines (must precede -r or -R)"
-msgstr ""
-
-msgid "Search page for regex STRING"
-msgstr ""
-
-msgid "Search page for case-insensitive regex STRING"
-msgstr ""
-
-msgid "Return CRITICAL if found, OK if not\n"
-msgstr ""
-
-msgid "Username:password on sites with basic authentication"
-msgstr ""
-
-msgid "Username:password on proxy-servers with basic authentication"
-msgstr ""
-
-msgid "String to be sent in http header as \"User Agent\""
-msgstr ""
-
-msgid ""
-"Any other tags to be sent in http header. Use multiple times for additional "
-"headers"
-msgstr ""
-
-msgid "Print additional performance data"
-msgstr ""
-
-msgid "Print body content below status line"
-msgstr ""
-
-msgid "Wrap output in HTML link (obsoleted by urlize)"
-msgstr ""
-
-msgid "How to handle redirected pages. sticky is like follow but stick to the"
-msgstr ""
-
-msgid "specified IP address. stickyport also ensures port stays the same."
-msgstr ""
-
-#, fuzzy
-msgid "Maximal number of redirects (default: "
-msgstr "PROCS   - nombre de  processus (défaut)"
-
-msgid "Minimum page size required (bytes) : Maximum page size required (bytes)"
-msgstr ""
-
-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."
-
-msgid ""
-"Successful connects return STATE_OK, refusals and timeouts return "
-"STATE_CRITICAL"
-msgstr ""
-
-msgid ""
-"other errors return STATE_UNKNOWN.  Successful connects, but incorrect "
-"response"
-msgstr ""
-
-msgid ""
-"messages from the host result in STATE_WARNING return values.  If you are"
-msgstr ""
-
-msgid ""
-"checking a virtual server that uses 'host headers' you must supply the FQDN"
-msgstr ""
-
-msgid "(fully qualified domain name) as the [host_name] argument."
-msgstr ""
-
-msgid "This plugin can also check whether an SSL enabled web server is able to"
-msgstr ""
-
-msgid "serve content (optionally within a specified time) or whether the X509 "
-msgstr ""
-
-msgid "certificate is still valid for the specified number of days."
-msgstr ""
-
-#, 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"
-
-msgid "certificate matches the hostname of the server, or if the certificate"
-msgstr ""
-
-msgid "has a valid chain of trust to one of the locally installed CAs."
-msgstr ""
-
-msgid ""
-"When the 'www.verisign.com' server returns its content within 5 seconds,"
-msgstr ""
-
-msgid ""
-"a STATE_OK will be returned. When the server returns its content but exceeds"
-msgstr ""
-
-msgid ""
-"the 5-second threshold, a STATE_WARNING will be returned. When an error "
-"occurs,"
-msgstr ""
-
-msgid "a STATE_CRITICAL will be returned."
-msgstr ""
-
-msgid ""
-"When the certificate of 'www.verisign.com' is valid for more than 14 days,"
-msgstr ""
-
-msgid ""
-"a STATE_OK is returned. When the certificate is still valid, but for less "
-"than"
-msgstr ""
-
-msgid ""
-"14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
-msgstr ""
-
-msgid "the certificate is expired."
-msgstr "le certificat est expiré."
-
-msgid ""
-"When the certificate of 'www.verisign.com' is valid for more than 30 days,"
-msgstr ""
-
-msgid "30 days, but more than 14 days, a STATE_WARNING is returned."
-msgstr ""
-
-msgid ""
-"A STATE_CRITICAL will be returned when certificate expires in less than 14 "
-"days"
-msgstr ""
-
-msgid ""
-"check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j "
-"CONNECT -H www.verisign.com "
-msgstr ""
-
-msgid ""
-"all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -"
-"S(sl) -j CONNECT -H <webserver>"
-msgstr ""
-
-msgid ""
-"a STATE_CRITICAL will be returned. By adding a colon to the method you can "
-"set the method used"
-msgstr ""
-
-msgid "inside the proxied connection: -j CONNECT:POST"
-msgstr ""
-
-#, c-format
-msgid "Could not connect to the server at port %i\n"
-msgstr "Impossible de se connecter au serveur port %i\n"
-
-#, c-format
-msgid "Could not set protocol version %d\n"
-msgstr "Impossible d'utiliser le protocole version %d\n"
-
-#, c-format
-msgid "Could not init TLS at port %i!\n"
-msgstr "Impossible d'initialiser TLS sur le port %i!\n"
-
-#, c-format
-msgid "TLS not supported by the libraries!\n"
-msgstr "TLS n'est pas supporté!\n"
-
-#, c-format
-msgid "Could not init startTLS at port %i!\n"
-msgstr "Impossible d'initialiser startTLS sur le port %i!\n"
-
-#, c-format
-msgid "startTLS not supported by the library, needs LDAPv3!\n"
-msgstr ""
-"startTLS n'est pas supporté par la librairie LDAP, j'ai besoin de LDAPv3!\n"
-
-#, c-format
-msgid "Could not bind to the LDAP server\n"
-msgstr "Impossible de se connecter au serveur LDAP\n"
-
-#, c-format
-msgid "Could not search/find objectclasses in %s\n"
-msgstr "Impossible de chercher/trouver les objectclasses dans %s\n"
-
-#, fuzzy, c-format
-msgid "LDAP %s - found %d entries in %.3f seconds|%s %s\n"
-msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s"
-
-#, c-format
-msgid "LDAP %s - %.3f seconds response time|%s\n"
-msgstr "LDAP %s - %.3f secondes de temps de réponse|%s\n"
-
-#, c-format
-msgid "%s cannot be combined with %s"
-msgstr ""
-
-msgid "Please specify the host name\n"
-msgstr "Veuillez spécifier le nom de l'hôte\n"
-
-msgid "Please specify the LDAP base\n"
-msgstr "Veuillez spécifier la base LDAP\n"
-
-msgid "ldap attribute to search (default: \"(objectclass=*)\""
-msgstr ""
-
-msgid "ldap base (eg. ou=my unit, o=my org, c=at"
-msgstr ""
-
-msgid "ldap bind DN (if required)"
-msgstr ""
-
-msgid ""
-"ldap password (if required, or set the password through environment variable "
-"'LDAP_PASSWORD')"
-msgstr ""
-
-msgid "use starttls mechanism introduced in protocol version 3"
-msgstr "utiliser le fonctionnement starttls du protocole version 3"
-
-msgid "use ldaps (ldap v2 ssl method). this also sets the default port to"
-msgstr ""
-
-msgid "use ldap protocol version 2"
-msgstr "utiliser le protocole ldap version 2"
-
-msgid "use ldap protocol version 3"
-msgstr "utiliser le protocole ldap version 3"
-
-msgid "default protocol version:"
-msgstr "version du protocole par défaut:"
-
-#, fuzzy
-msgid "Number of found entries to result in warning status"
-msgstr "Décalage résultant en un avertissement (secondes)"
-
-#, fuzzy
-msgid "Number of found entries to result in critical status"
-msgstr "Décalage résultant en un état critique (secondes)"
-
-msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"
-msgstr ""
-
-#, c-format
-msgid ""
-" implied (using default port %i) unless --port=636 is specified. In that "
-"case\n"
-msgstr ""
-
-msgid "'SSL on connect' will be used no matter how the plugin was called."
-msgstr ""
-
-msgid ""
-"This detection is deprecated, please use 'check_ldap' with the '--starttls' "
-"or '--ssl' flags"
-msgstr ""
-
-msgid "to define the behaviour explicitly instead."
-msgstr ""
-
-msgid "The parameters --warn-entries and --crit-entries are optional."
-msgstr ""
-
-msgid "Warning threshold must be float or float triplet!\n"
-msgstr "Le seuil d'alerte doit être un nombre à virgule flottante!\n"
-
-#, c-format
-msgid "Error opening %s\n"
-msgstr "Erreur à l'ouverture de %s\n"
-
-#, fuzzy, c-format
-msgid "could not parse load from uptime %s: %d\n"
-msgstr "Lecture des arguments impossible\n"
-
-#, c-format
-msgid "Error code %d returned in %s\n"
-msgstr "Le code erreur %d à été retourné par %s\n"
-
-#, c-format
-msgid "Error in getloadavg()\n"
-msgstr "Erreur dans la fonction getloadavg()\n"
-
-#, c-format
-msgid "Error processing %s\n"
-msgstr "Erreur lors de l'utilisation de %s\n"
-
-#, c-format
-msgid "load average: %.2f, %.2f, %.2f"
-msgstr "Charge moyenne: %.2f, %.2f, %.2f"
-
-#, 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"
-
-#, 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"
-
-#, c-format
-msgid ""
-"Parameter inconsistency: %d-minute \"warning load\" is greater than "
-"\"critical load\"\n"
-msgstr ""
-"Arguments Incorrects: %d-minute \"alerte charge système\" est plus grand que "
-"\"alerte critique charge système\"\n"
-
-#, c-format
-msgid "This plugin tests the current system load average."
-msgstr "Ce plugin teste la charge système actuelle."
-
-msgid "Exit with WARNING status if load average exceeds WLOADn"
-msgstr ""
-"Sortir avec un résultat AVERTISSEMENT si la charge moyenne dépasse WLOAD"
-
-msgid "Exit with CRITICAL status if load average exceed CLOADn"
-msgstr "Sortir avec un résultat CRITIQUE si la charge moyenne excède CLOAD"
-
-msgid "the load average format is the same used by \"uptime\" and \"w\""
-msgstr ""
-
-msgid "Divide the load averages by the number of CPUs (when possible)"
-msgstr ""
-
-msgid "Number of processes to show when printing the top consuming processes."
-msgstr ""
-
-msgid "NUMBER_OF_PROCS=0 disables this feature. Default value is 0"
-msgstr ""
-
-#, c-format
-msgid "'%s' exited with non-zero status.\n"
-msgstr ""
-
-#, c-format
-msgid "some error occurred getting procs list.\n"
-msgstr ""
-
-msgid "Could not parse arguments\n"
-msgstr "Lecture des arguments impossible\n"
-
-#, c-format
-msgid "Unable to open MRTG log file\n"
-msgstr "Impossible d'ouvrir le fichier de log de MRTG\n"
-
-#, c-format
-msgid "Unable to process MRTG log file\n"
-msgstr "Impossible de traiter le fichier de log de MRTG\n"
-
-#, c-format
-msgid "MRTG data has expired (%d minutes old)\n"
-msgstr "Les données de MRTG on expirées (vieilles de %d minutes)\n"
-
-msgid "Avg"
-msgstr "Moyenne"
-
-msgid "Max"
-msgstr "Max"
-
-msgid "Invalid variable number"
-msgstr "Numéro de la variable invalide"
-
-#, c-format
-msgid ""
-"%s is not a valid expiration time\n"
-"Use '%s -h' for additional help\n"
-msgstr ""
-"%s n'est pas un temps d'expiration valide\n"
-"Utilisez '%s -h' pour de l'aide supplémentaire\n"
-
-msgid "Invalid variable number\n"
-msgstr "Numéro de la variable invalide\n"
-
-msgid "You must supply the variable number"
-msgstr "Vous devez fournir le numéro de la variable"
-
-msgid ""
-"This plugin will check either the average or maximum value of one of the"
-msgstr "Ce plugin va vérifier la moyenne ou le maximum d'une "
-
-msgid "two variables recorded in an MRTG log file."
-msgstr "deux variables du fichier de log de MRTG."
-
-msgid "The MRTG log file containing the data you want to monitor"
-msgstr ""
-
-msgid "Minutes before MRTG data is considered to be too old"
-msgstr ""
-
-msgid "Should we check average or maximum values?"
-msgstr ""
-
-msgid "Which variable set should we inspect? (1 or 2)"
-msgstr ""
-
-msgid "Threshold value for data to result in WARNING status"
-msgstr ""
-
-msgid "Threshold value for data to result in CRITICAL status"
-msgstr ""
-
-msgid "Type label for data (Examples: Conns, \"Processor Load\", In, Out)"
-msgstr ""
-
-msgid "Option units label for data (Example: Packets/Sec, Errors/Sec,"
-msgstr ""
-
-#, c-format
-msgid "\"Bytes Per Second\", \"%% Utilization\")"
-msgstr ""
-
-msgid ""
-"If the value exceeds the <vwl> threshold, a WARNING status is returned. If"
-msgstr ""
-
-msgid ""
-"the value exceeds the <vcl> threshold, a CRITICAL status is returned.  If"
-msgstr ""
-
-msgid "the data in the log file is older than <expire_minutes> old, a WARNING"
-msgstr ""
-
-msgid "status is returned and a warning message is printed."
-msgstr ""
-
-msgid ""
-"This plugin is useful for monitoring MRTG data that does not correspond to"
-msgstr ""
-
-msgid ""
-"bandwidth usage.  (Use the check_mrtgtraf plugin for monitoring bandwidth)."
-msgstr ""
-
-msgid ""
-"It can be used to monitor any kind of data that MRTG is monitoring - errors,"
-msgstr ""
-
-msgid ""
-"packets/sec, etc.  I use MRTG in conjunction with the Novell NLM that allows"
-msgstr ""
-
-msgid ""
-"me to track processor utilization, user connections, drive space, etc and"
-msgstr ""
-
-msgid "this plugin works well for monitoring that kind of data as well."
-msgstr ""
-
-msgid ""
-"- This plugin only monitors one of the two variables stored in the MRTG log"
-msgstr ""
-"- Ce plugin vérifie seulement une ou deux variables écrites dans un fichier "
-"de log MRTG"
-
-msgid "file.  If you want to monitor both values you will have to define two"
-msgstr ""
-
-msgid "commands with different values for the <variable> argument.  Of course,"
-msgstr ""
-
-msgid "you can always hack the code to make this plugin work for you..."
-msgstr ""
-
-msgid ""
-"- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded "
-"from"
-msgstr ""
-
-msgid "Unable to open MRTG log file"
-msgstr "Impossible d'ouvrir le fichier de log de MRTG"
-
-msgid "Unable to process MRTG log file"
-msgstr "Impossible de traiter le fichier de log de MRTG"
-
-#, fuzzy, c-format
-msgid "%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"
-msgstr "%s. Entrée = %0.1f %s, %s. Sortie = %0.1f %s|%s %s\n"
-
-#, c-format
-msgid "Traffic %s - %s\n"
-msgstr "Trafic %s - %s\n"
-
-msgid ""
-"This plugin will check the incoming/outgoing transfer rates of a router,"
-msgstr ""
-"Ce plugin va vérifier le taux de transfert en entrée/sortie d'un routeur,"
-
-msgid "switch, etc recorded in an MRTG log.  If the newest log entry is older"
-msgstr ""
-
-msgid "than <expire_minutes>, a WARNING status is returned. If either the"
-msgstr ""
-
-msgid "incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in"
-msgstr ""
-
-msgid "Bytes/sec), a CRITICAL status results.  If either of the rates exceed"
-msgstr ""
-
-msgid "the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results."
-msgstr ""
-
-msgid "File to read log from"
-msgstr ""
-
-msgid "Minutes after which log expires"
-msgstr ""
-
-msgid "Test average or maximum"
-msgstr ""
-
-msgid "Warning threshold pair <incoming>,<outgoing>"
-msgstr "Paire de seuils d'avertissement <entrant>,<sortant>"
-
-msgid "Critical threshold pair <incoming>,<outgoing>"
-msgstr "Paire de seuils critique <entrant>,<sortant>"
-
-msgid ""
-"- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from"
-msgstr ""
-
-msgid "- While MRTG can monitor things other than traffic rates, this"
-msgstr ""
-
-msgid "  plugin probably won't work with much else without modification."
-msgstr ""
-
-msgid "- The calculated i/o rates are a little off from what MRTG actually"
-msgstr ""
-
-msgid "  reports.  I'm not sure why this is right now, but will look into it"
-msgstr ""
-
-msgid "  for future enhancements of this plugin."
-msgstr ""
-
-#, c-format
-msgid "Usage"
-msgstr "Utilisation"
-
-#, fuzzy, c-format
-msgid "status store_result error: %s\n"
-msgstr "erreur slave store_result: %s\n"
-
-#, c-format
-msgid "slave query error: %s\n"
-msgstr "erreur de requête de l'esclave: %s\n"
-
-#, c-format
-msgid "slave store_result error: %s\n"
-msgstr "erreur slave store_result: %s\n"
-
-msgid "No slaves defined"
-msgstr "Pas d'esclave spécifié"
-
-#, c-format
-msgid "slave fetch row error: %s\n"
-msgstr "erreur esclave lecture d'une ligne: %s\n"
-
-#, c-format
-msgid "Slave running: %s"
-msgstr "L'esclave fonctionne: %s"
-
-msgid "This program tests connections to a MySQL server"
-msgstr "Ce plugin teste une connexion vers un serveur MySQL"
-
-msgid "Ignore authentication failure and check for mysql connectivity only"
-msgstr ""
-
-msgid "Use the specified socket (has no effect if -H is used)"
-msgstr ""
-
-msgid "Check database with indicated name"
-msgstr ""
-
-msgid "Read from the specified client options file"
-msgstr ""
-
-msgid "Use a client options group"
-msgstr ""
-
-msgid "Connect using the indicated username"
-msgstr ""
-
-msgid "Use the indicated password to authenticate the connection"
-msgstr ""
-
-msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"
-msgstr ""
-
-msgid "Your clear-text password could be visible as a process table entry"
-msgstr ""
-
-msgid "Check if the slave thread is running properly."
-msgstr ""
-
-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 "
-
-msgid "behind master"
-msgstr "secondes en retard sur le maître"
-
-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 "
-
-msgid "Use ssl encryption"
-msgstr ""
-
-msgid "Path to CA signing the cert"
-msgstr ""
-
-msgid "Path to SSL certificate"
-msgstr ""
-
-msgid "Path to private SSL key"
-msgstr ""
-
-msgid "Path to CA directory"
-msgstr ""
-
-msgid "List of valid SSL ciphers"
-msgstr ""
-
-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"
-
-msgid ""
-"using the default unix socket. You can force TCP on localhost by using an"
-msgstr ""
-
-msgid "IP address or FQDN ('localhost' will use the socket as well)."
-msgstr ""
-
-msgid "You must specify -p with an empty string to force an empty password,"
-msgstr ""
-
-msgid "overriding any my.cnf settings."
-msgstr ""
-
-msgid "Cannot open status log for reading!"
-msgstr "Impossible d'ouvrir le fichier status log en lecture!"
-
-#, c-format
-msgid "Found process: %s %s\n"
-msgstr "Processus trouvé: %s %s\n"
-
-msgid "Could not locate a running Nagios process!"
-msgstr "Impossible de trouver un processus Nagios actif!"
-
-msgid "Cannot parse Nagios log file for valid time"
-msgstr ""
-"Impossible de trouver une date/heure valide dans le fichier de log de Nagios"
-
-#, c-format
-msgid "%d process"
-msgid_plural "%d processes"
-msgstr[0] "%d processus"
-msgstr[1] "%d processus"
-
-#, c-format
-msgid "status log updated %d second ago"
-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"
-
-msgid "Expiration time must be an integer (seconds)\n"
-msgstr "Le délai d'expiration doit être un entier (en secondes)\n"
-
-#, fuzzy
-msgid "Timeout must be an integer (seconds)\n"
-msgstr "Le délai d'expiration doit être un entier (en secondes)\n"
-
-msgid "You must provide the status_log\n"
-msgstr "Vous devez fournir le status_log\n"
-
-msgid "You must provide a process string\n"
-msgstr "Vous devez fournir un nom de processus\n"
-
-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."
-
-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"
-
-msgid "the number of minutes specified by the expires option."
-msgstr "le nombre de minutes spécifies par l'option expire."
-
-msgid ""
-"It also checks the process table for a process matching the command argument."
-msgstr ""
-
-msgid "Name of the log file to check"
-msgstr "Nom du fichier log à vérifier"
-
-msgid "Minutes aging after which logfile is considered stale"
-msgstr ""
-
-msgid "Substring to search for in process arguments"
-msgstr ""
-
-msgid "Timeout for the plugin in seconds"
-msgstr ""
-
-#, c-format
-msgid "Wrong client version - running: %s, required: %s"
-msgstr "Mauvaise version du client utilisée: %s, nécessaire: %s"
-
-msgid "missing -l parameters"
-msgstr "Arguments -l manquants"
-
-msgid "wrong -l parameter."
-msgstr "Arguments -l erronés."
-
-msgid "CPU Load"
-msgstr "Charge CPU"
-
-#, c-format
-msgid " %lu%% (%lu min average)"
-msgstr " %lu%% (%lu moyenne minimale)"
-
-#, c-format
-msgid " '%lu min avg Load'=%lu%%;%lu;%lu;0;100"
-msgstr " '%lu Charge moyenne minimale'=%lu%%;%lu;%lu;0;100"
-
-msgid "not enough values for -l parameters"
-msgstr "pas assez de valeur pour l'argument -l"
-
-msgid "wrong -l argument"
-msgstr "Argument -l erroné"
-
-#, fuzzy, c-format
-msgid "System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"
-msgstr "Système démarré - %u jour(s) %u heure(s) %u minute(s)"
-
-#, 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%%)"
-
-#, c-format
-msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"
-msgstr "'%s:\\ Espace Utilisé'=%.2fGb;%.2f;%.2f;0.00;%.2f"
-
-msgid "Free disk space : Invalid drive"
-msgstr "Espace disque libre : Lecteur invalide"
-
-msgid "No service/process specified"
-msgstr "Pas de service/processus spécifié"
-
-msgid "could not fetch information from server\n"
-msgstr "Impossible d'obtenir l'information depuis le serveur\n"
-
-#, fuzzy, c-format
-msgid ""
-"Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)"
-msgstr ""
-"Mémoire utilisée: total:%.2f Mb - utilisée: %.2f Mb (%.0f%%) - libre: %.2f "
-"Mb (%.0f%%)"
-
-#, fuzzy, c-format
-msgid "'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f"
-msgstr "'Mémoire utilisée'=%.2fMb;%.2f;%.2f;0.00;%.2f"
-
-msgid "No counter specified"
-msgstr "Pas de compteur spécifié"
-
-msgid "Minimum value contains non-numbers"
-msgstr "La valeur minimum contient des caractères non numériques"
-
-msgid "Maximum value contains non-numbers"
-msgstr "La valeur maximum contient des caractères non numériques"
-
-msgid "No unit counter specified"
-msgstr "Pas de compteur spécifié"
-
-msgid "Please specify a variable to check"
-msgstr "Veuillez préciser une variable a vérifier"
-
-msgid "Server port must be an integer\n"
-msgstr "Le port du serveur doit être un nombre entier\n"
-
-msgid "You must provide a server address or host name"
-msgstr "Vous devez spécifier une adresse ou un nom d'hôte"
-
-msgid "None"
-msgstr "Aucun"
-
-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"
-
-msgid "Windows NT/2000/XP/2003 server."
-msgstr "Serveur Windows NT/2000/XP/2003."
-
-msgid "Name of the host to check"
-msgstr "Nom de l'hôte à vérifier"
-
-msgid "Optional port number (default: "
-msgstr "Numéro de port optionnel (défaut: "
-
-msgid "Password needed for the request"
-msgstr "Mot de passe nécessaire pour la requête"
-
-msgid "Threshold which will result in a warning status"
-msgstr ""
-
-msgid "Threshold which will result in a critical status"
-msgstr ""
-
-msgid "Seconds before connection attempt times out (default: "
-msgstr ""
-
-msgid "Parameters passed to specified check (see below)"
-msgstr ""
-
-msgid "Display options (currently only SHOWALL works)"
-msgstr ""
-
-msgid "Return UNKNOWN on timeouts"
-msgstr ""
-
-msgid "Print this help screen"
-msgstr "Afficher l'écran d'aide"
-
-msgid "Print version information"
-msgstr "Afficher la version"
-
-msgid "Variable to check"
-msgstr "Variable a vérifier"
-
-msgid "Valid variables are:"
-msgstr "Les variables valides sont"
-
-msgid "Get the NSClient version"
-msgstr "Obtenir la version de NSClient"
-
-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."
-
-msgid "Average CPU load on last x minutes."
-msgstr "Moyenne de la charge CPU sur les dernières x minutes."
-
-msgid "Request a -l parameter with the following syntax:"
-msgstr "Demande un paramètre -l avec la syntaxe suivante:"
-
-msgid "-l <minutes range>,<warning threshold>,<critical threshold>."
-msgstr "-l <plage de minutes>,<seuil d'avertissement>,<seuil critique>."
-
-msgid "<minute range> should be less than 24*60."
-msgstr "<plage de minutes> devrait être inférieur à 24*60."
-
-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."
-
-msgid "Get the uptime of the machine."
-msgstr "Obtenir le temps de service de la machine."
-
-msgid "-l <unit> "
-msgstr ""
-
-msgid "<unit> = seconds, minutes, hours, or days. (default: minutes)"
-msgstr ""
-
-#, fuzzy
-msgid "Thresholds will use the unit specified above."
-msgstr "Ce plugin va vérifier l'heure sur l'hôte spécifié."
-
-msgid "Size and percentage of disk use."
-msgstr "Taille et pourcentage de l'utilisation disque."
-
-msgid "Request a -l parameter containing the drive letter only."
-msgstr "Demande un paramètre -l contennant uniquement la lettre du lecteur."
-
-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."
-
-msgid "Memory use."
-msgstr "Mémoire utilisée."
-
-msgid "Check the state of one or several services."
-msgstr "Vérifier l'état d'un ou plusieurs services."
-
-msgid "Request a -l parameters with the following syntax:"
-msgstr "Demande un paramètre -l avec la syntaxe suivante:"
-
-msgid "-l <service1>,<service2>,<service3>,..."
-msgstr "-l <service1>,<service2>,<service3>,..."
-
-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"
-
-msgid "in the returned string."
-msgstr "dans la chaîne de caractère renvoyée."
-
-msgid "Check if one or several process are running."
-msgstr "Vérifie si un ou plusieurs processus sont démarrés."
-
-msgid "Same syntax as SERVICESTATE."
-msgstr "Même syntaxe que SERVICESTATE."
-
-msgid "Check any performance counter of Windows NT/2000."
-msgstr "Vérifier n'importe quel compteur de performance sur Windows NT/2000."
-
-msgid "-l \"\\\\<performance object>\\\\counter\",\"<description>"
-msgstr "-l \"\\\\<catégorie>\\\\compteur\",\"<description>"
-
-msgid "The <description> parameter is optional and is given to a printf "
-msgstr "Le paramètre <description> est optionnel et est passé à la fonction "
-
-msgid "output command which requires a float parameter."
-msgstr "de sortie printf qui demande un paramètre de type float."
-
-#, 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."
-
-msgid "Some examples:"
-msgstr "Exemples:"
-
-msgid "Check any performance counter object of Windows NT/2000."
-msgstr "Vérifie n'importe quel compteur de performance de Windows NT/2000."
-
-msgid ""
-"Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"
-msgstr ""
-
-msgid "<counter object> is a Windows Perfmon Counter object (eg. Process),"
-msgstr ""
-
-msgid "if it is two words, it should be enclosed in quotes"
-msgstr ""
-
-msgid "The returned results will be a comma-separated list of instances on "
-msgstr ""
-
-msgid " the selected computer for that object."
-msgstr ""
-
-msgid ""
-"The purpose of this is to be run from command line to determine what "
-"instances"
-msgstr ""
-
-msgid ""
-" are available for monitoring without having to log onto the Windows server"
-msgstr ""
-
-msgid "  to run Perfmon directly."
-msgstr ""
-
-msgid ""
-"It can also be used in scripts that automatically create the monitoring "
-"service"
-msgstr ""
-
-msgid " configuration files."
-msgstr ""
-
-msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"
-msgstr ""
-
-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"
-
-msgid "- Critical thresholds should be lower than warning thresholds"
-msgstr ""
-"- Les seuils critiques doivent être plus bas que les seuils d'avertissement"
-
-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"
-
-msgid ""
-"output when this happens contains \"Cannot map xxxxx to protocol number\"."
-msgstr "qui en résulte contiens \"Cannot map xxxxx to protocol number\"."
-
-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 "
-
-msgid "and on the client service it's connecting to."
-msgstr "et dans le service auquel il se connecte."
-
-#, c-format
-msgid "jitter response too large (%lu bytes)\n"
-msgstr ""
-
-msgid "NTP CRITICAL:"
-msgstr "NTP CRITIQUE:"
-
-msgid "NTP WARNING:"
-msgstr "NTP AVERTISSEMENT:"
-
-msgid "NTP OK:"
-msgstr "NTP OK:"
-
-msgid "NTP UNKNOWN:"
-msgstr "NTP INCONNU:"
-
-msgid "Offset unknown"
-msgstr "Décalage inconnu"
-
-msgid "Offset"
-msgstr "Décalage"
-
-msgid "This plugin checks the selected ntp server"
-msgstr "Ce plugin vérifie le service ntp sur l'hôte"
-
-msgid "Offset to result in warning status (seconds)"
-msgstr "Décalage résultant en un avertissement (secondes)"
-
-msgid "Offset to result in critical status (seconds)"
-msgstr "Décalage résultant en un état critique (secondes)"
-
-msgid "Warning threshold for jitter"
-msgstr "Seuil d'avertissement pour la variation (jitter)"
-
-msgid "Critical threshold for jitter"
-msgstr "Seuil critique pour la variation (jitter)"
-
-msgid "Normal offset check:"
-msgstr "Vérification normale du décalage:"
-
-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"
-
-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)"
-
-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"
-
-msgid "check_ntp_time instead."
-msgstr "ou check_ntp_time."
-
-msgid "Server not synchronized"
-msgstr "Le serveur n'est pas synchronisé"
-
-msgid "Server has the LI_ALARM bit set"
-msgstr ""
-
-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é"
-
-#, fuzzy
-msgid "Warning threshold for stratum of server's synchronization peer"
-msgstr "Seuil d'avertissement pour le stratum"
-
-#, fuzzy
-msgid "Critical threshold for stratum of server's synchronization peer"
-msgstr "Seuil critique pour le stratum"
-
-msgid "Warning threshold for number of usable time sources (\"truechimers\")"
-msgstr ""
-"Seuil d'avertissement pour le nombre de sources de temps utilisable "
-"(\"truechimers\")"
-
-msgid "Critical threshold for number of usable time sources (\"truechimers\")"
-msgstr ""
-"Seuil critique pour le nombre de sources de temps utilisable "
-"(\"truechimers\")"
-
-msgid "This plugin checks an NTP server independent of any commandline"
-msgstr "Ce plugin vérifie un serveur NTP sans recours aux programmes de"
-
-msgid "programs or external libraries."
-msgstr "la ligne de commande ou libraries externes"
-
-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"
-
-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."
-
-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"
-
-msgid "server; please use check_ntp_time for that purpose."
-msgstr "NTP; utilisez plutôt check_ntp_time à cette fin."
-
-msgid "Simple NTP server check:"
-msgstr "Vérification simple du serveur NTP:"
-
-msgid "Only check the number of usable time sources (\"truechimers\"):"
-msgstr ""
-
-msgid "Check only stratum:"
-msgstr "Vérification du stratum seulement:"
-
-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"
-
-msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found"
-msgstr "Retourne INCONNU au lieu de CRITIQUE si le décalage est inconnu"
-
-msgid "Expected offset of the ntp server relative to local server (seconds)"
-msgstr ""
-
-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"
-
-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"
-
-msgid "external libraries."
-msgstr "la ligne de commande ou libraries externes."
-
-msgid "If you'd rather want to monitor an NTP server, please use"
-msgstr "Si vous voulez plutôt surveiller un serveur NTP, veuillez"
-
-msgid "check_ntp_peer."
-msgstr "utiliser check_ntp_peer."
-
-msgid "--time-offset is useful for compensating for servers with known"
-msgstr ""
-
-msgid "and expected clock skew."
-msgstr ""
-
-#, c-format
-msgid "NetWare %s: "
-msgstr "NetWare %s: "
-
-#, c-format
-msgid "Up %s,"
-msgstr "Démarré %s,"
-
-#, c-format
-msgid "Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100"
-msgstr ""
-"Charge %s - %s %s charge système minimale = %lu%%|charge%s=%lu;%lu;%lu;0;100"
-
-#, c-format
-msgid "Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;"
-msgstr "Conns %s - %lu connections actuelles|Conns=%lu;%lu;%lu;;"
-
-#, c-format
-msgid "%s: Long term cache hits = %lu%%"
-msgstr "%s: Accès cache longue durée = %lu%%"
-
-#, c-format
-msgid "%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;"
-msgstr "%s: Total des caches tampons= %lu|Caches Tampons=%lu,%lu;%lu;;"
-
-#, c-format
-msgid "%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;"
-msgstr "%s: cache tampons sales = %lu|caches tampons sales=%lu;%lu;%lu;;"
-
-#, c-format
-msgid "%s: LRU sitting time = %lu minutes"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Volume '%s' does not exist!"
-msgstr "CRITIQUE: Le volume '%s' n'existe pas!"
-
-#, c-format
-msgid "%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;"
-msgstr "%s%lu KB libre sur le volume %s|KB libres%s=%lu;%lu;%lu;;"
-
-msgid "Only "
-msgstr "Seulement"
-
-#, c-format
-msgid "%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;"
-msgstr "%s%lu MB libre sur le volume %s|MBlibre%s=%lu;%lu;%lu;;"
-
-#, c-format
-msgid "%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-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"
-
-#, c-format
-msgid "Directory Services Database is %s (DS version %s)"
-msgstr "La base de données Directory Services est %s (DS version %s)"
-
-#, c-format
-msgid "Logins are %s"
-msgstr "Les logins sont %s"
-
-msgid "enabled"
-msgstr "activé"
-
-msgid "disabled"
-msgstr "désactivé"
-
-msgid "CRITICAL - NRM Status is bad!"
-msgstr "CRITIQUE - le statut NRM est mauvais!"
-
-msgid "Warning - NRM Status is suspect!"
-msgstr ""
-
-msgid "OK - NRM Status is good!"
-msgstr "OK - Le status du NRM est bon!"
-
-#, c-format
-msgid "%lu of %lu (%lu%%) packet receive buffers used"
-msgstr "%lu de %lu (%lu%%) paquets du tampon de réception utilisés"
-
-#, c-format
-msgid "%lu entries in SAP table"
-msgstr "%lu entrées dans la table SAP"
-
-#, c-format
-msgid "%lu entries in SAP table for SAP type %d"
-msgstr "%lu entrées dans la table SAP pour le type SAP %d"
-
-#, c-format
-msgid "%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"
-msgstr "%s%lu KB effaçables sur le volume %s|Purge%s=%lu;%lu;%lu;;"
-
-#, c-format
-msgid "%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"
-msgstr "%s%lu KB effaçables sur le volume %s|Purge%s=%lu;%lu;%lu;;"
-
-#, c-format
-msgid "%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100"
-msgstr ""
-"%lu MB (%lu%%) effaçables sur le volume %s|Effacable%s=%lu;%lu;%lu;0;100"
-
-#, c-format
-msgid "%s%lu KB not yet purgeable on volume %s"
-msgstr "%s%lu KB pas encore effaçables sur le volume %s"
-
-#, c-format
-msgid "%lu MB (%lu%%) not yet purgeable on volume %s"
-msgstr "%lu MB (%lu%%) pas encore effaçables sur le volume %s"
-
-#, c-format
-msgid "%lu open files|Openfiles=%lu;%lu;%lu;0,0"
-msgstr ""
-
-#, c-format
-msgid "%lu abended threads|Abends=%lu;%lu;%lu;;"
-msgstr "%lu processus avortés|Avortés=%lu;%lu;%lu;;"
-
-#, c-format
-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"
-
-msgid "CRITICAL - Time not in sync with network!"
-msgstr "CRITIQUE - Le temps n'est pas synchronisé avec le réseau!"
-
-msgid "OK - Time in sync with network!"
-msgstr "OK - Le temps est synchronisé avec le réseau!"
-
-#, c-format
-msgid "LRU sitting time = %lu seconds"
-msgstr "LRU temps d'attente = %lu secondes"
-
-#, c-format
-msgid "Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100"
-msgstr "Buffers cache sales = %lu%% du total|DCB=%lu;%lu;%lu;0;100"
-
-#, c-format
-msgid "Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100"
-msgstr "cache tampons totaux= %lu%% de l'original|TCB=%lu;%lu;%lu;0;100"
-
-#, c-format
-msgid "NDS Version %s"
-msgstr "Version NDS %s"
-
-#, c-format
-msgid "Up %s"
-msgstr "Démarré %s"
-
-#, c-format
-msgid "Module %s version %s is loaded"
-msgstr "Le Module %s version %s est chargé"
-
-#, c-format
-msgid "Module %s is not loaded"
-msgstr "Le Module %s n'est pas chargé"
-
-#, c-format
-msgid "CRITICAL - Value '%s' does not exist!"
-msgstr "CRITIQUE: Le valeur '%s' n'existe pas!"
-
-#, c-format
-msgid "%s is  %lu|%s=%lu;%lu;%lu;;"
-msgstr "%s est  %lu|%s=%lu;%lu;%lu;;"
-
-msgid "Nothing to check!\n"
-msgstr "Rien à vérifier!\n"
-
-msgid "Server port an integer\n"
-msgstr "Le port du serveur doit être un nombre entier\n"
-
-msgid "This plugin attempts to contact the MRTGEXT NLM running on a"
-msgstr "Ce plugin essaye de contacter le NLM MRTGEXT qui s'exécute sur"
-
-msgid "Novell server to gather the requested system information."
-msgstr "un serveur Novell pour récupérer l'information système demandée."
-
-msgid "Variable to check.  Valid variables include:"
-msgstr "Variable à vérifier.  Les variables valides sont:"
-
-msgid "LOAD1     = 1 minute average CPU load"
-msgstr ""
-
-msgid "LOAD5     = 5 minute average CPU load"
-msgstr ""
-
-msgid "LOAD15    = 15 minute average CPU load"
-msgstr ""
-
-msgid "CSPROCS   = number of current service processes (NW 5.x only)"
-msgstr "CSPROCS   = nombres de processus services actuels (NW 5.x seulement)"
-
-msgid "ABENDS    = number of abended threads (NW 5.x only)"
-msgstr ""
-
-msgid "UPTIME    = server uptime"
-msgstr ""
-
-msgid "LTCH      = percent long term cache hits"
-msgstr ""
-
-msgid "CBUFF     = current number of cache buffers"
-msgstr ""
-
-msgid "CDBUFF    = current number of dirty cache buffers"
-msgstr ""
-
-msgid "DCB       = dirty cache buffers as a percentage of the total"
-msgstr ""
-
-msgid "TCB       = dirty cache buffers as a percentage of the original"
-msgstr ""
-
-msgid "OFILES    = number of open files"
-msgstr ""
-
-msgid "    VMF<vol>  = MB of free space on Volume <vol>"
-msgstr ""
-
-msgid "    VMU<vol>  = MB used space on Volume <vol>"
-msgstr ""
-
-msgid "    VMP<vol>  = MB of purgeable space on Volume <vol>"
-msgstr ""
-
-msgid "    VPF<vol>  = percent free space on volume <vol>"
-msgstr ""
-
-msgid "    VKF<vol>  = KB of free space on volume <vol>"
-msgstr ""
-
-msgid "    VPP<vol>  = percent purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    VKP<vol>  = KB of purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    VPNP<vol> = percent not yet purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    VKNP<vol> = KB of not yet purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    LRUM      = LRU sitting time in minutes"
-msgstr ""
-
-msgid "    LRUS      = LRU sitting time in seconds"
-msgstr "    LRUS       = LRU temps d'attente en secondes"
-
-msgid "    DSDB      = check to see if DS Database is open"
-msgstr ""
-
-msgid "    DSVER     = NDS version"
-msgstr ""
-
-msgid "    UPRB      = used packet receive buffers"
-msgstr "    UPRB      = paquets du tampon de réception utilisés"
-
-msgid "    PUPRB     = percent (of max) used packet receive buffers"
-msgstr ""
-
-msgid "    SAPENTRIES = number of entries in the SAP table"
-msgstr ""
-
-msgid "    SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>"
-msgstr "    SAPENTRIES<n> = entrées dans la table SAP pour le type SAP <n>"
-
-msgid "    TSYNC     = timesync status"
-msgstr ""
-
-msgid "    LOGINS    = check to see if logins are enabled"
-msgstr ""
-
-msgid "    CONNS     = number of currently licensed connections"
-msgstr ""
-
-msgid "    NRMH\t= NRM Summary Status"
-msgstr ""
-
-msgid "    NRMP<stat> = Returns the current value for a NRM health item"
-msgstr ""
-
-msgid "    NRMM<stat> = Returns the current memory stats from NRM"
-msgstr ""
-
-msgid "    NRMS<stat> = Returns the current Swapfile stats from NRM"
-msgstr ""
-
-msgid "    NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml"
-msgstr ""
-
-msgid "    NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml"
-msgstr ""
-
-msgid "    NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml"
-msgstr ""
-
-msgid "    NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml"
-msgstr ""
-
-msgid "    NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml"
-msgstr ""
-
-msgid ""
-"    NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml"
-msgstr ""
-
-msgid "    NLM:<nlm> = check if NLM is loaded and report version"
-msgstr ""
-
-msgid "                (e.g. NLM:TSANDS.NLM)"
-msgstr ""
-
-msgid "Include server version string in results"
-msgstr ""
-
-msgid "- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"
-msgstr ""
-
-msgid ""
-"  extension for NetWare be loaded on the Novell servers you wish to check."
-msgstr ""
-
-msgid "  (available from http://www.engr.wisc.edu/~drews/mrtg/)"
-msgstr "  (disponible depuis http://www.engr.wisc.edu/~drews/mrtg/)"
-
-msgid ""
-"- Values for critical thresholds should be lower than warning thresholds"
-msgstr ""
-
-msgid ""
-"  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "
-msgstr ""
-
-msgid "  TCB, LRUS and LRUM."
-msgstr ""
-
-msgid "Unknown error fetching load data\n"
-msgstr ""
-"Erreur inconnue lors de la récupération des données de charge système\n"
-
-msgid "Invalid response from server - no load information\n"
-msgstr "Réponse invalide du serveur - pas d'information de charge système\n"
-
-msgid "Invalid response from server after load 1\n"
-msgstr "Réponse invalide du serveur après charge système à 1 minute\n"
-
-msgid "Invalid response from server after load 5\n"
-msgstr "Réponse invalide du serveur après charge système à 5 minute\n"
-
-#, c-format
-msgid "Load %s - %s-min load average = %0.2f"
-msgstr "Charge %s - %s-moyenne minimale de charge système = %0.2f"
-
-msgid "Unknown error fetching disk data\n"
-msgstr "Erreur inconnue en récupérant les données des disques\n"
-
-msgid "Invalid response from server\n"
-msgstr "Réponse invalide reçue du serveur\n"
-
-msgid "Unknown error fetching network status\n"
-msgstr "Erreur inconnue lors de la réception de l'état du réseau\n"
-
-#, c-format
-msgid "Net %s - %d connection%s on port %d"
-msgstr "Net %s - %d connections%s sur le port %d"
-
-msgid "Unknown error fetching process status\n"
-msgstr "Erreur inconnue en récupérant l'état des processus\n"
-
-#, c-format
-msgid "Process %s - %d instance%s of %s running"
-msgstr "Processus %s - %d instances%s de %s démarrées"
-
-#, c-format
-msgid "Uptime %s - Up %d days %d hours %d minutes"
-msgstr "Temps de fonctionnement %s - Up %d jours %d heures %d minutes"
-
-msgid ""
-"This plugin attempts to contact the Over-CR collector daemon running on the"
-msgstr ""
-"Ce plugin essaye de joindre le service Over CR tournant sur le serveur UNIX"
-
-msgid "remote UNIX server in order to gather the requested system information."
-msgstr "distant afin de récupérer les informations système demandées."
-
-msgid "LOAD1         = 1 minute average CPU load"
-msgstr ""
-
-msgid "LOAD5         = 5 minute average CPU load"
-msgstr ""
-
-msgid "LOAD15        = 15 minute average CPU load"
-msgstr ""
-
-msgid "DPU<filesys>  = percent used disk space on filesystem <filesys>"
-msgstr ""
-
-msgid "PROC<process> = number of running processes with name <process>"
-msgstr ""
-
-msgid "NET<port>     = number of active connections on TCP port <port>"
-msgstr ""
-
-msgid "UPTIME        = system uptime in seconds"
-msgstr ""
-
-msgid "This plugin requires that Eric Molitors' Over-CR collector daemon be"
-msgstr "Ce plugin requiert que le daemon collecteur Over-CR d'Eric Molitors"
-
-msgid "running on the remote server."
-msgstr "soit fonctionnel sur le serveur distant"
-
-msgid "Over-CR can be downloaded from http://www.molitor.org/overcr"
-msgstr ""
-
-msgid "This plugin was tested with version 0.99.53 of the Over-CR collector"
-msgstr "Ce plugin a été testé avec la version 0.99.53 su collecteur Over-CR"
-
-msgid ""
-"For the available options, the critical threshold value should always be"
-msgstr ""
-"Pour toutes les options disponibles, le seuil critique doit toujours être"
-
-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"
-
-#, c-format
-msgid "CRITICAL - no connection to '%s' (%s).\n"
-msgstr "CRITIQUE - pas de connexion à '%s' (%s).\n"
-
-#, fuzzy, c-format
-msgid " %s - database %s (%f sec.)|%s\n"
-msgstr " %s - base de données %s (%d sec.)|%s\n"
-
-msgid "Critical threshold must be a positive integer"
-msgstr "Le seuil critique doit être un entier positif"
-
-msgid "Warning threshold must be a positive integer"
-msgstr "Le seuil d'avertissement doit être un entier positif"
-
-#, fuzzy
-msgid "Database name exceeds the maximum length"
-msgstr "Le nom de la base de données est invalide"
-
-msgid "User name is not valid"
-msgstr "Le nom de l'utilisateur est invalide"
-
-#, c-format
-msgid "Test whether a PostgreSQL Database is accepting connections."
-msgstr "Teste si une base de données Postgresql accepte les connections."
-
-msgid "Database to check "
-msgstr ""
-
-#, fuzzy, c-format
-msgid "(default: %s)\n"
-msgstr "(Défaut: %d)\n"
-
-msgid "Login name of user"
-msgstr "Le nom d'un utilisateur"
-
-msgid "Password (BIG SECURITY ISSUE)"
-msgstr ""
-
-msgid "Connection parameters (keyword = value), see below"
-msgstr ""
-
-msgid "SQL query to run. Only first column in first row will be read"
-msgstr ""
-
-msgid "A name for the query, this string is used instead of the query"
-msgstr ""
-
-msgid "in the long output of the plugin"
-msgstr ""
-
-#, fuzzy
-msgid "SQL query value to result in warning status (double)"
-msgstr "Décalage résultant en un avertissement (secondes)"
-
-#, fuzzy
-msgid "SQL query value to result in critical status (double)"
-msgstr "Décalage résultant en un état critique (secondes)"
-
-msgid "All parameters are optional."
-msgstr ""
-
-msgid ""
-"This plugin tests a PostgreSQL DBMS to determine whether it is active and"
-msgstr ""
-
-msgid "accepting queries. In its current operation, it simply connects to the"
-msgstr ""
-
-msgid ""
-"specified database, and then disconnects. If no database is specified, it"
-msgstr ""
-
-msgid ""
-"connects to the template1 database, which is present in every functioning"
-msgstr ""
-
-msgid "PostgreSQL DBMS."
-msgstr ""
-
-msgid "If a query is specified using the -q option, it will be executed after"
-msgstr ""
-
-msgid "connecting to the server. The result from the query has to be numeric."
-msgstr ""
-
-msgid ""
-"Multiple SQL commands, separated by semicolon, are allowed but the result "
-msgstr ""
-
-msgid "of the last command is taken into account only. The value of the first"
-msgstr ""
-
-msgid ""
-"column in the first row is used as the check result. If a second column is"
-msgstr ""
-
-msgid "present in the result set, this is added to the plugin output with a"
-msgstr ""
-
-msgid ""
-"prefix of \"Extra Info:\". This information can be displayed in the system"
-msgstr ""
-
-msgid "executing the plugin."
-msgstr ""
-
-msgid ""
-"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"
-msgstr ""
-
-msgid ""
-"for details about how to access internal statistics of the database server."
-msgstr ""
-
-msgid ""
-"For a list of available connection parameters which may be used with the -o"
-msgstr ""
-
-msgid ""
-"command line option, see the documentation for PQconnectdb() in the chapter"
-msgstr ""
-
-msgid ""
-"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"
-msgstr ""
-
-msgid ""
-"used to specify a service name in pg_service.conf to be used for additional"
-msgstr ""
-
-msgid "connection parameters: -o 'service=<name>' or to specify the SSL mode:"
-msgstr ""
-
-msgid "-o 'sslmode=require'."
-msgstr ""
-
-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é."
-
-msgid ""
-"connect to a remote host, be sure that the remote postmaster accepts TCP/IP"
-msgstr ""
-
-msgid "connections (start the postmaster with the -i option)."
-msgstr ""
-
-msgid ""
-"Typically, the monitoring user (unless the --logname option is used) should "
-"be"
-msgstr ""
-
-msgid ""
-"able to connect to the database without a password. The plugin can also send"
-msgstr ""
-
-msgid "a password, but no effort is made to obscure or encrypt the password."
-msgstr ""
-
-#, c-format
-msgid "QUERY %s - %s: %s.\n"
-msgstr ""
-
-msgid "Error with query"
-msgstr ""
-
-#, fuzzy
-msgid "No rows returned"
-msgstr "Pas de données valides reçues"
-
-#, fuzzy
-msgid "No columns returned"
-msgstr "Pas de données valides reçues"
-
-#, fuzzy
-msgid "No data returned"
-msgstr "Pas de données valides reçues"
-
-msgid "Is not a numeric"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s returned %f"
-msgstr ". %s renvoie %s"
-
-#, fuzzy, c-format
-msgid "'%s' returned %f"
-msgstr ". %s renvoie %s"
-
-msgid "CRITICAL - Could not interpret output from ping command\n"
-msgstr "CRITIQUE - Impossible d'interpréter le réponse de la commande ping\n"
-
-#, c-format
-msgid "PING %s - %sPacket loss = %d%%"
-msgstr "PING %s - %s Paquets perdus = %d%%"
-
-#, c-format
-msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"
-msgstr "PING %s - %s Paquets perdus = %d%%, RTA = %2.2f ms"
-
-msgid "Could not realloc() addresses\n"
-msgstr "Impossible de réallouer les adresses\n"
-
-#, c-format
-msgid "<max_packets> (%s) must be a non-negative number\n"
-msgstr "<max_packets> (%s) doit être un nombre positif\n"
-
-#, c-format
-msgid "<wpl> (%s) must be an integer percentage\n"
-msgstr "<wpl> (%s) doit être un pourcentage entier\n"
-
-#, c-format
-msgid "<cpl> (%s) must be an integer percentage\n"
-msgstr "<cpl> (%s) doit être un pourcentage entier\n"
-
-#, c-format
-msgid "<wrta> (%s) must be a non-negative number\n"
-msgstr "<wrta> (%s) doit être un nombre positif\n"
-
-#, c-format
-msgid "<crta> (%s) must be a non-negative number\n"
-msgstr "<crta> (%s) doit être un nombre positif\n"
-
-#, c-format
-msgid ""
-"%s: Warning threshold must be integer or percentage!\n"
-"\n"
-msgstr "%s: Le seuil d'avertissement doit être un entier ou un pourcentage!\n"
-
-#, c-format
-msgid "<wrta> was not set\n"
-msgstr "<wrta> n'a pas été indiqué\n"
-
-#, c-format
-msgid "<crta> was not set\n"
-msgstr "<crta> n'a pas été indiqué\n"
-
-#, c-format
-msgid "<wpl> was not set\n"
-msgstr " <wpl> n'a pas été indiqué\n"
-
-#, c-format
-msgid "<cpl> was not set\n"
-msgstr "<cpl> n'a pas été indiqué\n"
-
-#, c-format
-msgid "<wrta> (%f) cannot be larger than <crta> (%f)\n"
-msgstr "<wrta> (%f) ne peut pas être plus large que <crta> (%f)\n"
-
-#, c-format
-msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
-msgstr "<wpl> (%d) ne peut pas être plus large que <cpl> (%d)\n"
-
-#, c-format
-msgid "Cannot open stderr for %s\n"
-msgstr "Impossible d'ouvrir le canal d'erreur standard pour %s\n"
-
-msgid "System call sent warnings to stderr "
-msgstr ""
-"Les appel système enverront leurs messages d'avertissement vers le canal "
-"d'erreur standard"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Network Unreachable (%s)\n"
-msgstr "CRITIQUE - Le réseau est inaccessible (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Host Unreachable (%s)\n"
-msgstr "CRITIQUE - Hôte inaccessible (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"
-msgstr "CRITIQUE - Paquet ICMP incorrect: Port inaccessible (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"
-msgstr "CRITIQUE - Paquet ICMP incorrect: Protocole inaccessible (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Network Prohibited (%s)\n"
-msgstr "CRITIQUE - L'accès au réseau est interdit (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Host Prohibited (%s)\n"
-msgstr "CRITIQUE - L'accès a l'hôte est interdit (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Packet Filtered (%s)\n"
-msgstr "CRITIQUE - Paquet filtré (%s)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Host not found (%s)\n"
-msgstr "CRITIQUE - Hôte non trouvé (%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)"
-
-#, fuzzy, c-format
-msgid "CRITICAL - Destination Unreachable (%s)\n"
-msgstr "CRITIQUE - Hôte inaccessible (%s)"
-
-#, fuzzy
-msgid "Unable to realloc warn_text\n"
-msgstr "Impossible de réattribuer le texte d'avertissement"
-
-#, 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."
-
-msgid "host to ping"
-msgstr "hôte à tester"
-
-msgid "number of ICMP ECHO packets to send"
-msgstr "nombre de paquets ICMP à envoyer"
-
-#, c-format
-msgid "(Default: %d)\n"
-msgstr "(Défaut: %d)\n"
-
-msgid "show HTML in the plugin output (obsoleted by urlize)"
-msgstr ""
-
-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)"
-
-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 "
-
-msgid "percentage of packet loss to trigger an alarm state."
-msgstr "pourcentage de paquets perdus pour déclencher une alarme."
-
-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"
-
-msgid ""
-"(percentage) and round trip average (milliseconds). It can produce HTML "
-"output"
-msgstr ""
-
-msgid ""
-"linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"
-msgstr ""
-
-msgid "the contrib area of the downloads section at http://www.nagios.org/"
-msgstr ""
-
-#, c-format
-msgid "CMD: %s\n"
-msgstr "Commande: %s\n"
-
-msgid "System call sent warnings to stderr"
-msgstr ""
-"L'appel système à retourné des avertissement vers le canal d'erreur standard"
-
-#, c-format
-msgid "Not parseable: %s"
-msgstr "Impossible de parcourir les arguments: %s"
-
-#, c-format
-msgid "Unable to read output\n"
-msgstr "Impossible de lire les données en entrée\n"
-
-#, c-format
-msgid "%d warn out of "
-msgstr "%d avertissements sur"
-
-#, c-format
-msgid "%d crit, %d warn out of "
-msgstr "%d crit, %d alertes sur "
-
-#, c-format
-msgid " with %s"
-msgstr " avec %s"
-
-msgid "Parent Process ID must be an integer!"
-msgstr "L'identifiant du processus parent doit être un entier!"
-
-#, c-format
-msgid "%s%sSTATE = %s"
-msgstr "%s%sETAT = %s"
-
-msgid "UID was not found"
-msgstr "L'UID n'a pas été trouvé"
-
-msgid "User name was not found"
-msgstr "L'utilisateur n'a pas été trouvé"
-
-#, c-format
-msgid "%s%scommand name '%s'"
-msgstr "%s%snom de la commande '%s'"
-
-#, c-format
-msgid "%s%sexclude progs '%s'"
-msgstr ""
-
-msgid "RSS must be an integer!"
-msgstr "RSS doit être un entier!"
-
-msgid "VSZ must be an integer!"
-msgstr "VSZ doit être un entier!"
-
-msgid "PCPU must be a float!"
-msgstr "PCPU doit être un nombre en virgule flottante!"
-
-msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
-msgstr "Metric doit être l'un des PROCS, VSZ, RSS, CPU, ELAPSED!"
-
-msgid ""
-"Checks all processes and generates WARNING or CRITICAL states if the "
-"specified"
-msgstr ""
-
-msgid ""
-"metric is outside the required threshold ranges. The metric defaults to "
-"number"
-msgstr ""
-
-msgid ""
-"of processes.  Search filters can be applied to limit the processes to check."
-msgstr ""
-
-msgid "Generate warning state if metric is outside this range"
-msgstr ""
-
-msgid "Generate critical state if metric is outside this range"
-msgstr ""
-
-msgid "Check thresholds against metric. Valid types:"
-msgstr ""
-
-msgid "PROCS   - number of processes (default)"
-msgstr "PROCS   - nombre de  processus (défaut)"
-
-msgid "VSZ     - virtual memory size"
-msgstr "VSZ     - taille mémoire virtuelle"
-
-msgid "RSS     - resident set memory size"
-msgstr ""
-
-msgid "CPU     - percentage CPU"
-msgstr "CPU     - pourcentage du processeur"
-
-msgid "ELAPSED - time elapsed in seconds"
-msgstr "ELAPSED - temps écoulé en secondes"
-
-msgid "Extra information. Up to 3 verbosity levels"
-msgstr "informations supplémentaires. Jusqu'à 3 niveaux de verbosité"
-
-msgid "Filter own process the traditional way by PID instead of /proc/pid/exe"
-msgstr ""
-
-msgid "Only scan for processes that have, in the output of `ps`, one or"
-msgstr ""
-
-msgid "more of the status flags you specify (for example R, Z, S, RS,"
-msgstr ""
-
-msgid "RSZDT, plus others based on the output of your 'ps' command)."
-msgstr ""
-
-msgid "Only scan for children of the parent process ID indicated."
-msgstr ""
-
-msgid "Only scan for processes with VSZ higher than indicated."
-msgstr ""
-
-msgid "Only scan for processes with RSS higher than indicated."
-msgstr ""
-
-msgid "Only scan for processes with PCPU higher than indicated."
-msgstr ""
-
-msgid "Only scan for processes with user name or ID indicated."
-msgstr ""
-
-msgid "Only scan for processes with args that contain STRING."
-msgstr ""
-
-msgid "Only scan for processes with args that contain the regex STRING."
-msgstr ""
-
-msgid "Only scan for exact matches of COMMAND (without path)."
-msgstr ""
-
-msgid "Exclude processes which match this comma separated list"
-msgstr ""
-
-msgid "Only scan for non kernel threads (works on Linux only)."
-msgstr ""
-
-#, c-format
-msgid ""
-"\n"
-"RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n"
-"specified 'max:min', a warning status will be generated if the\n"
-"count is inside the specified range\n"
-"\n"
-msgstr ""
-"\n"
-"Les seuils sont spécifiés 'min:max' or 'min:' or ':max' (or 'max').\n"
-"Si spécifié 'max:min', un avertissement sera généré si le nombre\n"
-"est à l'intérieur du seuil\n"
-"\n"
-
-#, c-format
-msgid ""
-"This plugin checks the number of currently running processes and\n"
-"generates WARNING or CRITICAL states if the process count is outside\n"
-"the specified threshold ranges. The process count can be filtered by\n"
-"process owner, parent process PID, current state (e.g., 'Z'), or may\n"
-"be the total number of running processes\n"
-"\n"
-msgstr ""
-"Ce plugin vérifie le nombre de processus actifs et génère un résultat \n"
-"AVERTISSEMENT ou CRITIQUE si le nombre de processus est au dessus du seuil\n"
-"spécifié. Le total des processus peut être filtré par propriétaire, "
-"processus parent,\n"
-"état actuel (ex: 'Z'), ou par le nombre de processus en cours d'exécution\n"
-"\n"
-
-msgid "Warning if not two processes with command name portsentry."
-msgstr ""
-
-msgid "Critical if < 2 or > 1024 processes"
-msgstr ""
-
-msgid "Critical if not at least 1 process with command sshd"
-msgstr ""
-
-msgid "Warning if > 1024 processes with command name sshd."
-msgstr ""
-
-msgid "Critical if < 1 processes with command name sshd."
-msgstr ""
-
-msgid "Warning alert if > 10 processes with command arguments containing"
-msgstr ""
-
-msgid "'/usr/local/bin/perl' and owned by root"
-msgstr ""
-
-msgid "Alert if VSZ of any processes over 50K or 100K"
-msgstr ""
-
-msgid "Alert if CPU of any processes over 10% or 20%"
-msgstr ""
-
-#, fuzzy
-msgid "Config file error\n"
-msgstr "Erreur dans le fichier de configuration"
-
-#, fuzzy
-msgid "Out of Memory?\n"
-msgstr "Manque de Mémoire?"
-
-#, fuzzy
-msgid "Invalid NAS-Identifier\n"
-msgstr "NAS-Identifier invalide"
-
-#, c-format
-msgid "gethostname() failed!\n"
-msgstr "La commande gethostname() à échoué\n"
-
-#, fuzzy
-msgid "Invalid NAS-IP-Address\n"
-msgstr "NAS-IP-Address invalide"
-
-#, fuzzy
-msgid "Timeout\n"
-msgstr "Temps dépassé"
-
-#, fuzzy
-msgid "Auth Error\n"
-msgstr "Erreur d'authentification"
-
-#, fuzzy
-msgid "Auth Failed\n"
-msgstr "L'authentification à échoué"
-
-#, fuzzy
-msgid "Bad Response\n"
-msgstr "Réponse invalide"
-
-#, fuzzy
-msgid "Auth OK\n"
-msgstr "L'authentification à réussi"
-
-#, c-format
-msgid "Unexpected result code %d"
-msgstr "Résultat inattendu: %d"
-
-msgid "Number of retries must be a positive integer"
-msgstr "Le nombre d'essai doit être un entier positif"
-
-msgid "User not specified"
-msgstr "L'utilisateur n'a pas été spécifié"
-
-msgid "Password not specified"
-msgstr "Le mot de passe n'a pas été spécifié"
-
-msgid "Configuration file not specified"
-msgstr "Le fichier de configuration n'a pas été spécifié"
-
-msgid "Tests to see if a RADIUS server is accepting connections."
-msgstr "Teste si un serveur RADIUS accepte les connections."
-
-msgid "The user to authenticate"
-msgstr ""
-
-msgid "Password for authentication (SECURITY RISK)"
-msgstr ""
-
-msgid "NAS identifier"
-msgstr ""
-
-msgid "NAS IP Address"
-msgstr "Adresse IP NAS"
-
-msgid "Configuration file"
-msgstr "Fichier de configuration"
-
-msgid "Response string to expect from the server"
-msgstr ""
-
-msgid "Number of times to retry a failed connection"
-msgstr ""
-
-msgid ""
-"This plugin tests a RADIUS server to see if it is accepting connections."
-msgstr ""
-"Ce plugin teste un serveur RADIUS afin de vérifier si il accepte les "
-"connections."
-
-msgid ""
-"The server to test must be specified in the invocation, as well as a user"
-msgstr ""
-
-msgid "name and password. A configuration file must be present. The format of"
-msgstr ""
-
-msgid ""
-"the configuration file is described in the radiusclient library sources."
-msgstr ""
-
-msgid "The password option presents a substantial security issue because the"
-msgstr ""
-
-msgid ""
-"password can possibly be determined by careful watching of the command line"
-msgstr ""
-
-msgid "in a process listing. This risk is exacerbated because the plugin will"
-msgstr ""
-
-msgid ""
-"typically be executed at regular predictable intervals. Please be sure that"
-msgstr ""
-
-msgid "the password used does not allow access to sensitive system resources."
-msgstr ""
-
-#, c-format
-msgid "Unable to connect to %s on port %d\n"
-msgstr "Impossible de se connecter à %s sur le port %d\n"
-
-#, c-format
-msgid "No data received from %s\n"
-msgstr "Pas de données reçues de %s\n"
-
-msgid "Invalid REAL response received from host"
-msgstr "Réponses REAL invalide reçue de l'hôte"
-
-#, c-format
-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"
-
-#, c-format
-msgid "No data received from host\n"
-msgstr "Pas de données reçues de l'hôte\n"
-
-#, c-format
-msgid "REAL %s - %d second response time\n"
-msgstr "REAL %s - %d secondes de temps de réponse\n"
-
-msgid "Warning time must be a positive integer"
-msgstr "Le seuil d'avertissement doit être un entier positif"
-
-msgid "Critical time must be a positive integer"
-msgstr "Le seuil critique doit être un entier positif"
-
-msgid "You must provide a server to check"
-msgstr "Vous devez fournir un serveur à vérifier"
-
-msgid "This plugin tests the REAL service on the specified host."
-msgstr "Ce plugin teste le service REAL sur l'hôte spécifié."
-
-msgid "Connect to this url"
-msgstr ""
-
-#, 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"
-
-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."
-
-msgid "Successful connects return STATE_OK, refusals and timeouts return"
-msgstr ""
-
-msgid ""
-"STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful connects,"
-msgstr ""
-
-msgid ""
-"but incorrect response messages from the host result in STATE_WARNING return"
-msgstr ""
-
-msgid "values."
-msgstr ""
-
-#, c-format
-msgid "malloc() failed!\n"
-msgstr "l'allocation mémoire à échoué!\n"
-
-#, c-format
-msgid "CRITICAL - Cannot create SSL context.\n"
-msgstr "CRITIQUE - Impossible de créer le contexte SSL.\n"
-
-#, c-format
-msgid "recv() failed\n"
-msgstr "La commande recv() à échoué\n"
-
-#, c-format
-msgid "WARNING - TLS not supported by server\n"
-msgstr "AVERTISSEMENT: - TLS n'est pas supporté par ce serveur\n"
-
-#, c-format
-msgid "Server does not support STARTTLS\n"
-msgstr "Le serveur ne supporte pas STARTTLS\n"
-
-msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS."
-msgstr ""
-
-#, c-format
-msgid "sent %s"
-msgstr "envoyé %s"
-
-msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
-msgstr ""
-
-#, c-format
-msgid "Invalid SMTP response received from host: %s\n"
-msgstr "Réponse SMTP reçue de l'hôte invalide: %s\n"
-
-#, 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"
-
-#, c-format
-msgid "Could Not Compile Regular Expression"
-msgstr "Impossible de compiler l'expression rationnelle"
-
-#, c-format
-msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
-msgstr "SMTP %s - réponse invalide de '%s' à la commande '%s'\n"
-
-#, c-format
-msgid "Execute Error: %s\n"
-msgstr "Erreur d'exécution: %s\n"
-
-msgid "no authuser specified, "
-msgstr "Pas d'utilisateur pour l'authentification spécifié, "
-
-msgid "no authpass specified, "
-msgstr "pas de mot de passe spécifié, "
-
-#, c-format
-msgid "sent %s\n"
-msgstr "envoyé %s\n"
-
-msgid "recv() failed after AUTH LOGIN, "
-msgstr "recv() à échoué après AUTH LOGIN, "
-
-#, c-format
-msgid "received %s\n"
-msgstr "reçu %s\n"
-
-msgid "invalid response received after AUTH LOGIN, "
-msgstr "Réponse invalide reçue après AUTH LOGIN, "
-
-msgid "recv() failed after sending authuser, "
-msgstr "La commande recv() a échoué après authuser, "
-
-msgid "invalid response received after authuser, "
-msgstr "Réponse invalide reçue après authuser, "
-
-msgid "recv() failed after sending authpass, "
-msgstr "la commande recv() à échoué après authpass, "
-
-msgid "invalid response received after authpass, "
-msgstr "Réponse invalide reçue après authpass, "
-
-msgid "only authtype LOGIN is supported, "
-msgstr "seul la méthode d'authentification LOGIN est supportée, "
-
-#, 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"
-
-#, c-format
-msgid "Could not realloc() units [%d]\n"
-msgstr "Impossible de réallouer des unités [%d]\n"
-
-#, fuzzy
-msgid "Critical time must be a positive"
-msgstr "Le seuil critique doit être un entier positif"
-
-#, fuzzy
-msgid "Warning time must be a positive"
-msgstr "Le seuil d'avertissement doit être un entier positif"
-
-msgid "SSL support not available - install OpenSSL and recompile"
-msgstr "SSL n'est pas disponible - installer OpenSSL et recompilez"
-
-msgid "Set either -s/--ssl/--tls or -S/--starttls"
-msgstr "Définissez -s/--ssl/--tls ou -S/--starttls"
-
-#, c-format
-msgid "Connection closed by server before sending QUIT command\n"
-msgstr ""
-
-#, c-format
-msgid "recv() failed after QUIT."
-msgstr "recv() à échoué après QUIT."
-
-#, c-format
-msgid "Connection reset by peer."
-msgstr ""
-
-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."
-
-#, 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"
-
-msgid "SMTP command (may be used repeatedly)"
-msgstr "Commande SMTP (peut être utilisé plusieurs fois)"
-
-msgid "Expected response to command (may be used repeatedly)"
-msgstr ""
-
-msgid "FROM-address to include in MAIL command, required by Exchange 2000"
-msgstr ""
-
-msgid "FQDN used for HELO"
-msgstr ""
-
-msgid "Use PROXY protocol prefix for the connection."
-msgstr "Utiliser le préfixe du protocole PROXY pour la connexion."
-
-msgid "Minimum number of days a certificate has to be valid."
-msgstr "Nombre de jours minimum pour que le certificat soit valide."
-
-#, fuzzy
-msgid "Use SSL/TLS for the connection."
-msgstr "Utiliser SSL/TLS pour la connexion."
-
-#, c-format
-msgid "    Sets default port to %d.\n"
-msgstr "    Définit le port par défaut à %d.\n"
-
-msgid "Use STARTTLS for the connection."
-msgstr "Utiliser STARTTLS pour la connexion."
-
-msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
-msgstr ""
-
-msgid "SMTP AUTH username"
-msgstr ""
-
-msgid "SMTP AUTH password"
-msgstr ""
-
-msgid "Send LHLO instead of HELO/EHLO"
-msgstr ""
-
-msgid "Ignore failure when sending QUIT command to server"
-msgstr ""
-
-msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful"
-msgstr ""
-
-msgid "connects, but incorrect response messages from the host result in"
-msgstr ""
-
-msgid "STATE_WARNING return values."
-msgstr ""
-
-msgid "Cannot malloc"
-msgstr ""
-
-#, c-format
-msgid "External command error: %s\n"
-msgstr "Erreur d'exécution de commande externe: %s\n"
-
-#, c-format
-msgid "External command error with no output (return code: %d)\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "No valid data returned (%s)\n"
-msgstr "Pas de données valides reçues"
-
-msgid "Time duration between plugin calls is invalid"
-msgstr ""
-
-msgid "Cannot asprintf()"
-msgstr ""
-
-#, fuzzy
-msgid "Cannot realloc()"
-msgstr "Impossible de réallouer des unités\n"
-
-msgid "No previous data to calculate rate - assume okay"
-msgstr ""
-
-msgid "Retries interval must be a positive integer"
-msgstr "L'intervalle pour les essais doit être un entier positif"
-
-#, fuzzy
-msgid "Exit status must be a positive integer"
-msgstr "Maxbytes doit être un entier positif"
-
-#, c-format
-msgid "Could not reallocate labels[%d]"
-msgstr "Impossible de réallouer des labels[%d]"
-
-msgid "Could not reallocate labels\n"
-msgstr "Impossible de réallouer des labels\n"
-
-#, c-format
-msgid "Could not reallocate units [%d]\n"
-msgstr "Impossible de réallouer des unités [%d]\n"
-
-msgid "Could not realloc() units\n"
-msgstr "Impossible de réallouer des unités\n"
-
-#, fuzzy
-msgid "Rate multiplier must be a positive integer"
-msgstr "La taille du paquet doit être un entier positif"
-
-msgid "No host specified\n"
-msgstr "Pas d'hôte spécifié\n"
-
-msgid "No OIDs specified\n"
-msgstr "Pas de compteur spécifié\n"
-
-#, c-format
-msgid "Required parameter: %s\n"
-msgstr ""
-
-msgid "Invalid seclevel"
-msgstr ""
-
-msgid "Invalid SNMP version"
-msgstr "Version de SNMP invalide"
-
-msgid "Unbalanced quotes\n"
-msgstr "Guillemets manquants\n"
-
-#, c-format
-msgid "multiplier set (%.1f), but input is not a number: %s"
-msgstr ""
-
-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"
-
-msgid "Use SNMP GETNEXT instead of SNMP GET"
-msgstr "Utiliser SNMP GETNEXT au lieu de SNMP GET"
-
-msgid "SNMP protocol version"
-msgstr "Version du protocole SNMP"
-
-#, fuzzy
-msgid "SNMPv3 context"
-msgstr "Nom d'utilisateur SNMPv3"
-
-msgid "SNMPv3 securityLevel"
-msgstr "Niveau de sécurité SNMPv3 (securityLevel)"
-
-msgid "SNMPv3 auth proto"
-msgstr "Protocole d'authentification SNMPv3"
-
-msgid "SNMPv3 priv proto (default DES)"
-msgstr ""
-
-msgid "Optional community string for SNMP communication"
-msgstr "Communauté optionnelle pour la communication SNMP"
-
-msgid "default is"
-msgstr "défaut:"
-
-msgid "SNMPv3 username"
-msgstr "Nom d'utilisateur SNMPv3"
-
-msgid "SNMPv3 authentication password"
-msgstr "Mot de passe d'authentification SNMPv3"
-
-msgid "SNMPv3 privacy password"
-msgstr "Mot de passe de confidentialité SNMPv3"
-
-msgid "Object identifier(s) or SNMP variables whose value you wish to query"
-msgstr ""
-
-msgid ""
-"List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
-msgstr ""
-
-msgid "for symbolic OIDs.)"
-msgstr ""
-
-msgid "Delimiter to use when parsing returned data. Default is"
-msgstr ""
-
-msgid "Any data on the right hand side of the delimiter is considered"
-msgstr ""
-
-msgid "to be the data that should be used in the evaluation."
-msgstr ""
-
-msgid "If the check returns a 0 length string or NULL value"
-msgstr ""
-
-msgid "This option allows you to choose what status you want it to exit"
-msgstr ""
-
-msgid "Excluding this option renders the default exit of 3(STATE_UNKNOWN)"
-msgstr ""
-
-msgid "0 = OK"
-msgstr ""
-
-#, fuzzy
-msgid "1 = WARNING"
-msgstr "AVERTISSEMENT"
-
-#, fuzzy
-msgid "2 = CRITICAL"
-msgstr "CRITIQUE"
-
-#, fuzzy
-msgid "3 = UNKNOWN"
-msgstr "INCONNU"
-
-msgid "Warning threshold range(s)"
-msgstr "Valeurs pour le seuil d'avertissement"
-
-msgid "Critical threshold range(s)"
-msgstr "Valeurs pour le seuil critique"
-
-msgid "Enable rate calculation. See 'Rate Calculation' below"
-msgstr ""
-
-msgid ""
-"Converts rate per second. For example, set to 60 to convert to per minute"
-msgstr ""
-
-msgid "Add/subtract the specified OFFSET to numeric sensor data"
-msgstr ""
-
-msgid "Return OK state (for that OID) if STRING is an exact match"
-msgstr ""
-
-msgid ""
-"Return OK state (for that OID) if extended regular expression REGEX matches"
-msgstr ""
-
-msgid ""
-"Return OK state (for that OID) if case-insensitive extended REGEX matches"
-msgstr ""
-
-msgid "Invert search result (CRITICAL if found)"
-msgstr ""
-
-msgid "Prefix label for output from plugin"
-msgstr ""
-
-msgid "Units label(s) for output data (e.g., 'sec.')."
-msgstr ""
-
-msgid "Separates output on multiple OID requests"
-msgstr ""
-
-msgid "Multiplies current value, 0 < n < 1 works as divider, defaults to 1"
-msgstr ""
-
-msgid "C-style format string for float values (see option -M)"
-msgstr ""
-
-msgid ""
-"NOTE the final timeout value is calculated using this formula: "
-"timeout_interval * retries + 5"
-msgstr ""
-
-#, fuzzy
-msgid "Number of retries to be used in the requests, default: "
-msgstr "Le nombre d'essai pour les requêtes"
-
-msgid "Label performance data with OIDs instead of --label's"
-msgstr ""
-
-msgid "Tell snmpget to not print errors encountered when parsing MIB files"
-msgstr ""
-
-msgid ""
-"This plugin uses the 'snmpget' command included with the NET-SNMP package."
-msgstr ""
-
-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"
-
-msgid "http://net-snmp.sourceforge.net before you can use this plugin."
-msgstr "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin."
-
-#, fuzzy
-msgid ""
-"- 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"
-
-#, fuzzy
-msgid "list (lists with internal spaces must be quoted)."
-msgstr "(Les liste avec espaces doivent être entre guillemets). Max:"
-
-msgid ""
-"- When checking multiple OIDs, separate ranges by commas like '-w "
-"1:10,1:,:20'"
-msgstr ""
-
-msgid "- Note that only one string and one regex may be checked at present"
-msgstr ""
-
-msgid ""
-"- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
-msgstr ""
-
-msgid "returned from the SNMP query is an unsigned integer."
-msgstr ""
-
-msgid "Rate Calculation:"
-msgstr ""
-
-msgid "In many places, SNMP returns counters that are only meaningful when"
-msgstr ""
-
-msgid "calculating the counter difference since the last check. check_snmp"
-msgstr ""
-
-msgid "saves the last state information in a file so that the rate per second"
-msgstr ""
-
-msgid "can be calculated. Use the --rate option to save state information."
-msgstr ""
-
-msgid ""
-"On the first run, there will be no prior state - this will return with OK."
-msgstr ""
-
-msgid "The state is uniquely determined by the arguments to the plugin, so"
-msgstr ""
-
-msgid "changing the arguments will create a new state file."
-msgstr ""
-
-msgid "Port number must be a positive integer"
-msgstr "Le numéro du port doit être un nombre entier positif"
-
-#, c-format
-msgid "Server answer: %s"
-msgstr "Réponse du serveur: %s"
-
-#, fuzzy, c-format
-msgid "SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"
-msgstr ""
-"SSH AVERTISSEMENT - %s (protocole %s) différence de version, attendu'%s'\n"
-
-#, fuzzy, c-format
-msgid ""
-"SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"
-msgstr ""
-"SSH AVERTISSEMENT - %s (protocole %s) différence de version, attendu'%s'\n"
-
-#, fuzzy, c-format
-msgid "SSH OK - %s (protocol %s) | %s\n"
-msgstr "SSH OK - %s (protocole %s)\n"
-
-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"
-
-#, fuzzy
-msgid ""
-"Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)"
-msgstr ""
-"AVERTISSEMENT si la chaîne ne correspond pas à la version précisée (ex: "
-"OpenSSH_3.9p1)"
-
-#, fuzzy
-msgid "Alert if protocol doesn't match expected protocol version (ex: 2.0)"
-msgstr ""
-"AVERTISSEMENT si la chaîne ne correspond pas à la version précisée (ex: "
-"OpenSSH_3.9p1)"
-
-#, c-format
-msgid "Command: %s\n"
-msgstr "Commande: %s\n"
-
-#, c-format
-msgid "Format: %s\n"
-msgstr "Format: %s\n"
-
-#, c-format
-msgid "total=%.0f, used=%.0f, free=%.0f\n"
-msgstr "total=%.0f, utilisé=%.0f, libre=%.0ff\n"
-
-#, c-format
-msgid "total=%.0f, free=%.0f\n"
-msgstr "total=%.0f, libre=%.0f\n"
-
-msgid "Error getting swap devices\n"
-msgstr ""
-
-msgid "SWAP OK: No swap devices defined\n"
-msgstr "SWAP OK: Pas de périphériques swap définis\n"
-
-msgid "swapctl failed: "
-msgstr "swapctl à échoué:"
-
-msgid "Error in swapctl call\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "SWAP %s - %d%% free (%dMB out of %dMB) %s|"
-msgstr "SWAP %s - %d%% libre (%d MB sur un total de %d MB) %s|"
-
-#, fuzzy
-msgid "Warning threshold percentage must be <= 100!"
-msgstr "Le seuil d'avertissement doit être un entier positif"
-
-#, fuzzy
-msgid "Warning threshold be positive integer or percentage!"
-msgstr "Le seuil d'avertissement doit être un entier ou un pourcentage!"
-
-#, fuzzy
-msgid "Critical threshold percentage must be <= 100!"
-msgstr "le seuil critique doit être un entier positif"
-
-#, fuzzy
-msgid "Critical threshold be positive integer or percentage!"
-msgstr "Le seuil critique doit être un entier ou un pourcentage!"
-
-#, fuzzy
-msgid ""
-"no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
-"or integer (0-3)."
-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)."
-
-#, fuzzy
-msgid "Warning should be more than critical"
-msgstr ""
-"Le pourcentage d'avertissement doit être plus important que le pourcentage "
-"critique"
-
-msgid "Check swap space on local machine."
-msgstr "Vérifie l'espace swap sur la machine locale."
-
-msgid ""
-"Exit with WARNING status if less than INTEGER bytes of swap space are free"
-msgstr ""
-"Sortir avec un résultat AVERTISSEMENT si moins de X octets de mémoire "
-"virtuelle sont libres"
-
-msgid "Exit with WARNING status if less than PERCENT of swap space is free"
-msgstr ""
-"Sortir avec un résultat AVERTISSEMENT si moins de X pour cent de mémoire "
-"virtuelle est libre"
-
-msgid ""
-"Exit with CRITICAL status if less than INTEGER bytes of swap space are free"
-msgstr ""
-"Sortir avec un résultat CRITIQUE si moins de X octets de mémoire virtuelle "
-"sont libres"
-
-msgid "Exit with CRITICAL status if less than PERCENT of swap space is free"
-msgstr ""
-"Sortir avec un résultat CRITIQUE si moins de X pour cent de mémoire "
-"virtuelle est libre"
-
-msgid "Conduct comparisons for all swap partitions, one by one"
-msgstr "Vérifier chacune des partitions de mémoire virtuelle séparément"
-
-msgid ""
-"Resulting state when there is no swap regardless of thresholds. Default:"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"Both INTEGER and PERCENT thresholds can be specified, they are all checked."
-msgstr "Les seuils d'alerte et critiques peuvent être spécifiés avec -w et -c."
-
-msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."
-msgstr ""
-"Sur AIX, si -a est spécifié, le plugin utilise lsps -a, sinon il utilise "
-"lsps -s."
-
-msgid "CRITICAL - Generic check_tcp called with unknown service\n"
-msgstr ""
-"CRITIQUE -check_tcp version générique utilisé avec un service inconnu\n"
-
-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."
-
-msgid "No arguments found"
-msgstr "Pas de paramètres"
-
-msgid "Maxbytes must be a positive integer"
-msgstr "Maxbytes doit être un entier positif"
-
-msgid "Refuse must be one of ok, warn, crit"
-msgstr "Refuse doit être parmis ok, warn, crit"
-
-msgid "Mismatch must be one of ok, warn, crit"
-msgstr "Mismatch doit être parmis ok, warn, crit"
-
-msgid "Delay must be a positive integer"
-msgstr "Delay doit être un entier positif"
-
-msgid "You must provide a server address"
-msgstr "Vous devez fournir une adresse serveur"
-
-msgid "Invalid hostname, address or socket"
-msgstr "Adresse/Nom/Socket invalide"
-
-#, c-format
-msgid ""
-"This plugin tests %s connections with the specified host (or unix socket).\n"
-"\n"
-msgstr ""
-"Ce plugin teste %s connections avec l'hôte spécifié (ou socket unix).\n"
-"\n"
-
-#, fuzzy
-msgid ""
-"Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send "
-"or quit option"
-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."
-
-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"
-
-msgid "String to send to the server"
-msgstr "Chaîne de caractères à envoyer au serveur"
-
-msgid "String to expect in server response"
-msgstr "Chaîne de caractères à attendre en réponse"
-
-msgid "(may be repeated)"
-msgstr "(peut être utilisé plusieurs fois)"
-
-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."
-
-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"
-
-msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
-msgstr ""
-
-msgid ""
-"Accept expected string mismatches with states ok, warn, crit (default: warn)"
-msgstr ""
-
-msgid "Hide output from TCP socket"
-msgstr "Cacher la réponse provenant du socket TCP"
-
-msgid "Close connection once more than this number of bytes are received"
-msgstr ""
-
-msgid "Seconds to wait between sending string and polling for response"
-msgstr ""
-
-msgid "1st is #days for warning, 2nd is critical (if not specified - 0)."
-msgstr ""
-
-msgid "Use SSL for the connection."
-msgstr ""
-
-#, fuzzy
-msgid "SSL server_name"
-msgstr "Nom d'utilisateur SNMPv3"
-
-#, c-format
-msgid "TIME UNKNOWN - could not connect to server %s, port %d\n"
-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"
-
-#, c-format
-msgid "TIME UNKNOWN - no data received from server %s, port %d\n"
-msgstr "TEMPS INCONNU - pas de données reçues du serveur %s, du port %d\n"
-
-#, c-format
-msgid "TIME %s - %d second response time|%s\n"
-msgstr "TEMPS %s - %d secondes de temps de réponse|%s\n"
-
-#, c-format
-msgid "TIME %s - %lu second time difference|%s %s\n"
-msgstr "TEMPS %s - %lu secondes de différence|%s %s\n"
-
-msgid "Warning thresholds must be a positive integer"
-msgstr "Les seuils d'avertissement doivent être un entier positif"
-
-msgid "Critical thresholds must be a positive integer"
-msgstr "Les seuils critiques doivent être un entier positif"
-
-msgid "This plugin will check the time on the specified host."
-msgstr "Ce plugin va vérifier l'heure sur l'hôte spécifié."
-
-msgid "Use UDP to connect, not TCP"
-msgstr ""
-
-msgid "Time difference (sec.) necessary to result in a warning status"
-msgstr ""
-
-msgid "Time difference (sec.) necessary to result in a critical status"
-msgstr ""
-
-msgid "Response time (sec.) necessary to result in warning status"
-msgstr ""
-
-msgid "Response time (sec.) necessary to result in critical status"
-msgstr ""
-
-msgid "On Battery, Low Battery"
-msgstr "Sur Batterie, Batterie faible"
-
-msgid "Online"
-msgstr "En marche"
-
-msgid "On Battery"
-msgstr "Sur Batterie"
-
-msgid ", Low Battery"
-msgstr ", Batterie faible"
-
-msgid ", Calibrating"
-msgstr ", Calibration"
-
-msgid ", Replace Battery"
-msgstr ", Remplacer la batterie"
-
-msgid ", On Bypass"
-msgstr ", Sur Secteur"
-
-msgid ", Overload"
-msgstr ", Surcharge"
-
-msgid ", Trimming"
-msgstr ", En Test"
-
-msgid ", Boosting"
-msgstr ""
-
-msgid ", Charging"
-msgstr ", En charge"
-
-msgid ", Discharging"
-msgstr ", Déchargement"
-
-msgid ", Unknown"
-msgstr ", Inconnu"
-
-msgid "UPS does not support any available options\n"
-msgstr "L'UPS ne supporte aucune des options disponibles\n"
-
-msgid "Invalid response received from host"
-msgstr "Réponse invalide reçue de l'hôte"
-
-msgid "UPS name to long for buffer"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - no such UPS '%s' on that host\n"
-msgstr "CRITIQUE - pas d'UPS '%s' sur cet hôte\n"
-
-msgid "CRITICAL - UPS data is stale"
-msgstr "CRITIQUE - les données de l'ups ne sont plus valables"
-
-#, c-format
-msgid "Unknown error: %s\n"
-msgstr "Erreur inconnue: %s\n"
-
-msgid "Error: unable to parse variable"
-msgstr "Erreur: impossible de lire la variable"
-
-msgid "Unrecognized UPS variable"
-msgstr "Variable d'UPS non reconnue"
-
-msgid "Error : no UPS indicated"
-msgstr "Erreur: pas d'UPS indiqué"
-
-msgid ""
-"This plugin tests the UPS service on the specified host. Network UPS Tools"
-msgstr "Ce plugin teste le service UPS sur l'hôte spécifié. Network UPS Tools"
-
-msgid "from www.networkupstools.org must be running for this plugin to work."
-msgstr ""
-"de www.networkupstools.org doit s'exécuter sur l'hôte pour que ce plugin "
-"fonctionne."
-
-msgid "Name of UPS"
-msgstr ""
-
-msgid "Output of temperatures in Celsius"
-msgstr "Affichage des températures en Celsius"
-
-msgid "Valid values for STRING are"
-msgstr "Les variables valides pour STRING sont"
-
-msgid ""
-"This plugin attempts to determine the status of a UPS (Uninterruptible Power"
-msgstr ""
-
-msgid ""
-"Supply) on a local or remote host. If the UPS is online or calibrating, the"
-msgstr ""
-
-msgid ""
-"plugin will return an OK state. If the battery is on it will return a WARNING"
-msgstr ""
-
-msgid ""
-"state. If the UPS is off or has a low battery the plugin will return a "
-"CRITICAL"
-msgstr ""
-
-msgid ""
-"You may also specify a variable to check (such as temperature, utility "
-"voltage,"
-msgstr ""
-
-msgid ""
-"battery load, etc.) as well as warning and critical thresholds for the value"
-msgstr ""
-
-msgid ""
-"of that variable.  If the remote host has multiple UPS that are being "
-"monitored"
-msgstr ""
-
-msgid "you will have to use the --ups option to specify which UPS to check."
-msgstr ""
-
-msgid ""
-"This plugin requires that the UPSD daemon distributed with Russell Kroll's"
-msgstr ""
-
-msgid ""
-"Network UPS Tools be installed on the remote host. If you do not have the"
-msgstr ""
-
-msgid "package installed on your system, you can download it from"
-msgstr ""
-
-msgid "http://www.networkupstools.org"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Could not enumerate RD sessions: %d\n"
-msgstr "Impossible d'utiliser le protocole version %d\n"
-
-#, c-format
-msgid "# users=%d"
-msgstr "# utilisateurs=%d"
-
-msgid "Unable to read output"
-msgstr "Impossible de lire les données en entrée"
-
-#, c-format
-msgid "USERS %s - %d users currently logged in |%s\n"
-msgstr "UTILISATEURS %s - %d utilisateurs actuellement connectés sur |%s\n"
-
-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"
-
-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é."
-
-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"
-
-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"
-
-msgid ""
-"DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"."
-msgstr ""
-
-msgid "Nagios-compatible output is now always returned."
-msgstr ""
-
-msgid "SMART commands are broken and have been disabled (See Notes in --help)."
-msgstr ""
-
-msgid ""
-"DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the"
-msgstr ""
-
-#, fuzzy
-msgid "default and will be removed from future releases."
-msgstr ""
-"Note: nslookup est obsolète et pourra être retiré dans les prochaines "
-"versions."
-
-#, c-format
-msgid "CRITICAL - Couldn't open device %s: %s\n"
-msgstr "Critique - Impossible d'ouvrir le périphérique %s: %s\n"
-
-#, c-format
-msgid "CRITICAL - SMART_CMD_ENABLE\n"
-msgstr "CRITIQUE - SMART_CMD_ENABLE\n"
-
-#, c-format
-msgid "CRITICAL - SMART_READ_VALUES: %s\n"
-msgstr "CRITIQUE - SMART_READ_VALUES: %s\n"
-
-#, 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"
-
-#, 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"
-
-#, c-format
-msgid "OK - Operational (%d/%d tests passed)\n"
-msgstr "OK - En fonctionnement (%d/%d les tests on été réussi)\n"
-
-#, c-format
-msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n"
-msgstr "ERREUR - État '%d' inconnu. %d/%d les tests on réussi\n"
-
-#, 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"
-
-#, c-format
-msgid "OffLineCapability=%d {%s %s %s}\n"
-msgstr "Capacité Hors Ligne=%d {%s %s %s}\n"
-
-#, 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"
-
-#, c-format
-msgid "CRITICAL - %s: %s\n"
-msgstr "CRITIQUE - %s: %s\n"
-
-#, fuzzy, c-format
-msgid "OK - Command sent (%s)\n"
-msgstr "Commande: %s\n"
-
-#, c-format
-msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
-msgstr "CRITIQUE - SMART_READ_THRESHOLDS: %s\n"
-
-#, c-format
-msgid ""
-"This plugin checks a local hard drive with the (Linux specific) SMART "
-"interface [http://smartlinux.sourceforge.net/smart/index.php]."
-msgstr ""
-"Ce plugin vérifie un disque dur local à l'aide de l'interface SMART (pour "
-"Linux) [http://smartlinux.sourceforge.net/smart/index.php]."
-
-msgid "Select device DEVICE"
-msgstr ""
-
-msgid ""
-"Note: if the device is specified without this option, any further option will"
-msgstr ""
-
-msgid "be ignored."
-msgstr ""
-
-msgid ""
-"The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were"
-msgstr ""
-
-msgid ""
-"broken in an underhand manner and have been disabled. You can use smartctl"
-msgstr ""
-
-msgid "instead:"
-msgstr ""
-
-msgid "-0/--auto-off:  use \"smartctl --offlineauto=off\""
-msgstr ""
-
-msgid "-1/--auto-on:   use \"smartctl --offlineauto=on\""
-msgstr ""
-
-msgid "-i/--immediate: use \"smartctl --test=offline\""
-msgstr ""
-
-msgid "No data returned from command\n"
-msgstr "Pas de données reçues de la commande\n"
-
-msgid ""
-"Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
-"or integer (0-3)."
-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)."
-
-msgid ""
-"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)."
-
-msgid ""
-"Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
-"integer (0-3)."
-msgstr ""
-"Warning doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou "
-"un nombre entier (0-3)."
-
-msgid ""
-"Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
-"integer (0-3)."
-msgstr ""
-"Critical doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou "
-"un nombre entier (0-3)."
-
-msgid ""
-"Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
-"integer (0-3)."
-msgstr ""
-"Unknown doit être un nom d'état valide (OK, WARNING, CRITICAL, UNKNOWN) ou "
-"un nombre entier (0-3)."
-
-msgid "Require path to command"
-msgstr "Chemin vers la commande requis"
-
-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)."
-
-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."
-
-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"
-
-msgid "Custom result on Negate timeouts; see below for STATUS definition\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"    STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n"
-msgstr ""
-"    STATUS peut être 'OK', 'WARNING', 'CRITICAL' ou 'UNKNOWN' sans les "
-"simple\n"
-
-#, 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"
-
-#, c-format
-msgid "    OK and CRITICAL.\n"
-msgstr "    spécifié, inverse OK et CRITIQUE.\n"
-
-#, c-format
-msgid ""
-"    Substitute output text as well. Will only substitute text in CAPITALS\n"
-msgstr ""
-
-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é"
-
-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"
-
-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."
-
-msgid "The full path of the plugin must be provided."
-msgstr "Le chemin complet du plugin doit être spécifié."
-
-msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL."
-msgstr "Si le plugin executé retourne OK, l'adaptateur retournera CRITIQUE."
-
-msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK."
-msgstr "Si le plugin executé retourne CRITIQUE, l'adaptateur retournera OK."
-
-msgid "Otherwise, the output state of the wrapped plugin is unchanged."
-msgstr "Autrement, l'état du plugin executé reste inchangé."
-
-msgid ""
-"Using timeout-result, it is possible to override the timeout behaviour or a"
-msgstr ""
-
-msgid "plugin by setting the negate timeout a bit lower."
-msgstr ""
-
-#, c-format
-msgid "%s - Socket timeout after %d seconds\n"
-msgstr "%s - Le socket n'a pas répondu dans les %d secondes\n"
-
-#, 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"
-
-msgid "Send failed"
-msgstr "L'envoi à échoué"
-
-msgid "No data was received from host!"
-msgstr "Pas de données reçues de l'hôte!"
-
-msgid "Socket creation failed"
-msgstr "La création du socket à échoué "
-
-msgid "Supplied path too long unix domain socket"
-msgstr "Le chemin fourni est trop long pour un socket unix"
-
-msgid "Receive failed"
-msgstr "La réception à échoué"
-
-#, c-format
-msgid "Invalid hostname/address - %s"
-msgstr "Adresse/Nom invalide - %s"
-
-msgid "Could not malloc argv array in popen()"
-msgstr "Impossible de réallouer un tableau pour les paramètres dans popen()"
-
-msgid "CRITICAL - You need more args!!!"
-msgstr "CRITIQUE - Vous devez spécifier plus d'arguments!!!"
-
-msgid "Cannot catch SIGCHLD"
-msgstr "impossible d'obtenir le signal SIGCHLD"
-
-#, c-format
-msgid "CRITICAL - Plugin timed out after %d seconds\n"
-msgstr "CRITIQUE - Le plugin n'as pas répondu dans les %d secondes\n"
-
-msgid "CRITICAL - popen timeout received, but no child process"
-msgstr ""
-"CRITIQUE - le temps d'attente à été dépassé dans la fonction popen, mais il "
-"n'y a pas de processus fils"
-
-#, c-format
-msgid ""
-"%s UNKNOWN - No data received from host\n"
-"CMD: %s</A>\n"
-msgstr ""
-"%s INCONNU - Pas de données reçues de l'hôte\n"
-"Commande: %s</A>\n"
-
-#, 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."
-
-msgid ""
-"tags, thus displaying the child plugin's output as a clickable link in "
-"compatible"
-msgstr ""
-
-msgid ""
-"monitoring status screen. This plugin returns the status of the invoked "
-"plugin."
-msgstr ""
-
-msgid ""
-"Pay close attention to quoting to ensure that the shell passes the expected"
-msgstr ""
-
-msgid "data to the plugin. For example, in:"
-msgstr ""
-
-msgid "urlize http://example.com/ check_http -H example.com -r 'two words'"
-msgstr ""
-
-msgid "the shell will remove the single quotes and urlize will see:"
-msgstr ""
-
-msgid "urlize http://example.com/ check_http -H example.com -r two words"
-msgstr ""
-
-msgid "You probably want:"
-msgstr ""
-
-msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\""
-msgstr ""
-
-msgid "failed realloc in strpcpy\n"
-msgstr "La fonction realloc à échoué dans strpcpy\n"
-
-msgid "failed malloc in strscat\n"
-msgstr "La fonction malloc à échoué dans strscat\n"
-
-#, fuzzy
-msgid "failed malloc in xvasprintf\n"
-msgstr "La fonction malloc à échoué dans strscat\n"
-
-msgid "sysconf error for _SC_OPEN_MAX\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"       %s (-h | --help) for detailed help\n"
-"       %s (-V | --version) for version information\n"
-msgstr ""
-"       %s (-h | --help) pour l'aide détaillée\n"
-"       %s (-V | --version) pour les informations relative à la version\n"
-
-msgid ""
-"\n"
-"Options:\n"
-" -h, --help\n"
-"    Print detailed help screen\n"
-" -V, --version\n"
-"    Print version information\n"
-msgstr ""
-"\n"
-"Options:\n"
-" -h, --help\n"
-"    Afficher l'aide détaillée\n"
-" -V, --version\n"
-"    Afficher les informations relative à la version\n"
-
-#, c-format
-msgid ""
-" -H, --hostname=ADDRESS\n"
-"    Host name, IP Address, or unix socket (must be an absolute path)\n"
-" -%c, --port=INTEGER\n"
-"    Port number (default: %s)\n"
-msgstr ""
-" -H, --hostname=ADDRESS\n"
-"    Nom d'hôte, Adresse IP, ou socket UNIX (doit être un chemin absolu)\n"
-" -%c, --port=INTEGER\n"
-"    Numéro de port (défaut: %s)\n"
-
-msgid ""
-" -4, --use-ipv4\n"
-"    Use IPv4 connection\n"
-" -6, --use-ipv6\n"
-"    Use IPv6 connection\n"
-msgstr ""
-" -4, --use-ipv4\n"
-"    Utiliser une connection IPv4\n"
-" -6, --use-ipv6\n"
-"    Utiliser une connection IPv6\n"
-
-#, fuzzy
-msgid ""
-" -v, --verbose\n"
-"    Show details for command-line debugging (output may be truncated by\n"
-"    the monitoring system)\n"
-msgstr ""
-" -v, --verbose\n"
-"    Affiche les informations de déboguage en ligne de commande (Nagios peut "
-"tronquer la sortie)\n"
-
-msgid ""
-" -w, --warning=DOUBLE\n"
-"    Response time to result in warning status (seconds)\n"
-" -c, --critical=DOUBLE\n"
-"    Response time to result in critical status (seconds)\n"
-msgstr ""
-" -w, --warning=DOUBLE\n"
-"    Temps de réponse résultant en un état d'avertissement (secondes)\n"
-" -c, --critical=DOUBLE\n"
-"    Temps de réponse résultant en un état critique (secondes)\n"
-
-msgid ""
-" -w, --warning=RANGE\n"
-"    Warning range (format: start:end). Alert if outside this range\n"
-" -c, --critical=RANGE\n"
-"    Critical range\n"
-msgstr ""
-" -w, --warning=RANGE\n"
-"    Seuil d'avertissement (format: début:fin). Alerte à l'extérieur de la "
-"plage\n"
-" -c, --critical=RANGE\n"
-"    Seuil critique\n"
-
-#, c-format
-msgid ""
-" -t, --timeout=INTEGER\n"
-"    Seconds before connection times out (default: %d)\n"
-msgstr ""
-" -t, --timeout=INTEGER\n"
-"    Délais de connection en secondes (défaut: %d)\n"
-
-#, fuzzy, c-format
-msgid ""
-" -t, --timeout=INTEGER\n"
-"    Seconds before plugin times out (default: %d)\n"
-msgstr ""
-" -t, --timeout=INTEGER\n"
-"    Délais de connection en secondes (défaut: %d)\n"
-
-#, fuzzy
-msgid ""
-" --extra-opts=[section][@file]\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\n"
-"    https://www.monitoring-plugins.org/doc/extra-opts.html\n"
-"    pour les instructions et examples.\n"
-
-#, fuzzy
-msgid ""
-" See:\n"
-" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
-" for THRESHOLD format and examples.\n"
-msgstr ""
-" Voir:\n"
-" https://www.monitoring-plugins.org/doc/guidelines.html."
-"html#THRESHOLDFORMAT\n"
-" pour le format et examples des seuils (THRESHOLD).\n"
-
-#, fuzzy
-msgid ""
-"\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 à 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 à devel@monitoring-plugins.org\n"
-"\n"
-
-#, fuzzy
-msgid ""
-"\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 ""
-"\n"
-"Les plugins de Nagios ne portent AUCUNE GARANTIE. Vous pouvez redistribuer\n"
-"des copies des plugins selon les termes de la GNU General Public License.\n"
-"Pour de plus ample informations, voir le fichier COPYING.\n"
-
-#, c-format
-msgid "Error: Could not get hardware address of interface '%s'\n"
-msgstr ""
-"Erreur: Impossible d'obtenir l'adresse matérielle pour l'interface '%s'\n"
-
-#, c-format
-msgid "Error: if_nametoindex error - %s.\n"
-msgstr "Erreur: if_nametoindex erreur - %s.\n"
-
-#, c-format
-msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n"
-msgstr ""
-"Erreur: Impossible d'obtenir l'adresse matérielle depuis %s. erreur sysctl 1 "
-"- %s.\n"
-
-#, c-format
-msgid ""
-"Error: Couldn't get hardware address from interface %s. malloc error - %s.\n"
-msgstr ""
-"Erreur: Impossible d'obtenir l'adresse matérielle depuis l'interface %s\n"
-" erreur malloc - %s.\n"
-
-#, c-format
-msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"
-msgstr ""
-"Erreur: Impossible d'obtenir l'adresse matérielle depuis %s erreur sysctl 2 "
-"- %s.\n"
-
-#, c-format
-msgid ""
-"Error: can't find unit number in interface_name (%s) - expecting TypeNumber "
-"eg lnc0.\n"
-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"
-
-#, c-format
-msgid ""
-"Error: can't read MAC address from DLPI streams interface for device %s unit "
-"%d.\n"
-msgstr ""
-"Erreur: impossible de lire l'adresse MAC depuis l'interface DLPI pour le \n"
-"périphérique %s numéro %d.\n"
-
-#, c-format
-msgid ""
-"Error: can't get MAC address for this architecture.  Use the --mac option.\n"
-msgstr ""
-"Erreur: impossible d'obtenir l'adresse MAC sur cette architecture.  Utilisez "
-"l'option --mac.\n"
-
-#, 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"
-
-#, 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"
-
-#, c-format
-msgid "Pretending to be relay client %s\n"
-msgstr ""
-
-#, c-format
-msgid "DHCPDISCOVER to %s port %d\n"
-msgstr "DHCPDISCOVER vers %s port %d\n"
-
-#, c-format
-msgid "Result=ERROR\n"
-msgstr "Résultat=ERREUR\n"
-
-#, c-format
-msgid "Result=OK\n"
-msgstr "Résultat=OK\n"
-
-#, c-format
-msgid "DHCPOFFER from IP address %s"
-msgstr "DHCPOFFER depuis l'adresse IP %s"
-
-#, c-format
-msgid " via %s\n"
-msgstr " depuis %s\n"
-
-#, c-format
-msgid ""
-"DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"
-msgstr ""
-"DHCPOFFER XID (%u) ne correspond pas au DHCPDISCOVER XID (%u) - paquet "
-"ignoré\n"
-
-#, c-format
-msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n"
-msgstr ""
-"l'adresse matérielle du DHCPOFFER ne correspond pas à la notre paquet "
-"ignoré\n"
-
-#, c-format
-msgid "Total responses seen on the wire: %d\n"
-msgstr "Nombre total de réponses vues: %d\n"
-
-#, c-format
-msgid "Valid responses for this machine: %d\n"
-msgstr "Nombre de réponse valides pour cette machine: %d\n"
-
-#, c-format
-msgid "send_dhcp_packet result: %d\n"
-msgstr "résultat de send_dchp_packet: %d\n"
-
-#, c-format
-msgid "No (more) data received (nfound: %d)\n"
-msgstr "Plus de données reçues (nfound: %d)\n"
-
-#, c-format
-msgid "recvfrom() failed, "
-msgstr "recvfrom() a échoué, "
-
-#, c-format
-msgid "receive_dhcp_packet() result: %d\n"
-msgstr "résultat de receive_dchp_packet(): %d\n"
-
-#, c-format
-msgid "receive_dhcp_packet() source: %s\n"
-msgstr "source de receive_dchp_packet(): %s\n"
-
-#, c-format
-msgid "Error: Could not create socket!\n"
-msgstr "Erreur: Impossible de créer un socket!\n"
-
-#, c-format
-msgid "Error: Could not set reuse address option on DHCP socket!\n"
-msgstr ""
-"Erreur: Impossible de configurer l'option de réutilisation de l'adresse sur\n"
-"le socket DHCP!\n"
-
-#, c-format
-msgid "Error: Could not set broadcast option on DHCP socket!\n"
-msgstr ""
-"Erreur: Impossible de configurer l'option broadcast sur le socket DHCP!\n"
-
-#, c-format
-msgid ""
-"Error: Could not bind socket to interface %s.  Check your privileges...\n"
-msgstr ""
-"Erreur: Impossible de connecter le socket à l'interface %s.\n"
-"Vérifiez vos droits...\n"
-
-#, c-format
-msgid ""
-"Error: Could not bind to DHCP socket (port %d)!  Check your privileges...\n"
-msgstr ""
-"Erreur: Impossible de se connecter au socket (port %d)!  Vérifiez vos "
-"droits..\n"
-
-#, c-format
-msgid "Requested server address: %s\n"
-msgstr "Adresse serveur demandée: %s\n"
-
-#, c-format
-msgid "Lease Time: Infinite\n"
-msgstr "Durée du Bail: Infini\n"
-
-#, c-format
-msgid "Lease Time: %lu seconds\n"
-msgstr "Durée du Bail: %lu secondes\n"
-
-#, c-format
-msgid "Renewal Time: Infinite\n"
-msgstr "Renouvellement du bail: Infini\n"
-
-#, c-format
-msgid "Renewal Time: %lu seconds\n"
-msgstr "Durée du renouvellement = %lu secondes\n"
-
-#, c-format
-msgid "Rebinding Time: Infinite\n"
-msgstr "Délai de nouvelle demande: Infini\n"
-
-#, c-format
-msgid "Rebinding Time: %lu seconds\n"
-msgstr "Délai de nouvelle demande: %lu secondes\n"
-
-#, c-format
-msgid "Added offer from server @ %s"
-msgstr "Rajouté offre du serveur @ %s"
-
-#, c-format
-msgid " of IP address %s\n"
-msgstr "de l'adresse IP %s\n"
-
-#, c-format
-msgid "DHCP Server Match: Offerer=%s"
-msgstr "Correspondance du serveur DHCP: Offrant=%s"
-
-#, c-format
-msgid " Requested=%s"
-msgstr " Demandé=%s"
-
-#, c-format
-msgid " (duplicate)"
-msgstr ""
-
-#, c-format
-msgid "\n"
-msgstr ""
-
-#, c-format
-msgid "No DHCPOFFERs were received.\n"
-msgstr "Pas de DHCPOFFERs reçus.\n"
-
-#, c-format
-msgid "Received %d DHCPOFFER(s)"
-msgstr "Reçu %d DHCPOFFER(s)"
-
-#, c-format
-msgid ", %s%d of %d requested servers responded"
-msgstr ", %s%d de %d serveurs ont répondus"
-
-#, c-format
-msgid ", requested address (%s) was %soffered"
-msgstr ", l'adresse demandée (%s) %s été offerte"
-
-msgid "not "
-msgstr "n'as pas"
-
-#, c-format
-msgid ", max lease time = "
-msgstr ", bail maximum = "
-
-#, c-format
-msgid "Infinity"
-msgstr "Infini"
-
-msgid "Got unexpected non-option argument"
-msgstr ""
-
-#, 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"
-
-#, 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"
-
-#, 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"
-
-#, 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"
-
-#, 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"
-
-#, c-format
-msgid "Hardware address: "
-msgstr "Adresse matérielle: "
-
-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."
-
-msgid "IP address of DHCP server that we must hear from"
-msgstr ""
-
-msgid "IP address that should be offered by at least one DHCP server"
-msgstr ""
-
-msgid "Seconds to wait for DHCPOFFER before timeout occurs"
-msgstr ""
-
-msgid "Interface to to use for listening (i.e. eth0)"
-msgstr ""
-
-msgid "MAC address to use in the DHCP request"
-msgstr ""
-
-msgid "Unicast testing: mimic a DHCP relay, requires -s"
-msgstr ""
-
-msgid "specify a target"
-msgstr ""
-
-msgid "Use IPv4 (default) or IPv6 to communicate with the targets"
-msgstr ""
-
-msgid "warning threshold (currently "
-msgstr "Valeurs pour le seuil d'avertissement (actuellement "
-
-msgid "critical threshold (currently "
-msgstr "Valeurs pour le seuil critique (actuellement "
-
-msgid "specify a source IP address or device name"
-msgstr "spécifiez une adresse ou un nom d'hôte"
-
-msgid "number of packets to send (currently "
-msgstr "nombre de paquets à envoyer (actuellement "
-
-msgid "max packet interval (currently "
-msgstr ""
-
-msgid "max target interval (currently "
-msgstr ""
-
-msgid "number of alive hosts required for success"
-msgstr "nombre d'hôtes vivants requis pour réussite"
-
-msgid "TTL on outgoing packets (currently "
-msgstr ""
-
-msgid "timeout value (seconds, currently  "
-msgstr ""
-
-msgid "Number of icmp data bytes to send"
-msgstr "Nombre de paquets ICMP à envoyer"
-
-msgid "Packet size will be data bytes + icmp header (currently"
-msgstr ""
-
-msgid "verbose"
-msgstr ""
-
-msgid "The -H switch is optional. Naming a host (or several) to check is not."
-msgstr ""
-
-msgid ""
-"Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"
-msgstr ""
-
-msgid "packet loss.  The default values should work well for most users."
-msgstr ""
-
-msgid ""
-"You can specify different RTA factors using the standardized abbreviations"
-msgstr ""
-
-msgid ""
-"us (microseconds), ms (milliseconds, default) or just plain s for seconds."
-msgstr ""
-
-msgid "The -v switch can be specified several times for increased verbosity."
-msgstr ""
-
-#~ msgid "Path or partition (may be repeated)"
-#~ msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)"
-
-#~ msgid ""
-#~ "value match). If multiple addresses are returned at once, you have to "
-#~ "match"
-#~ msgstr ""
-#~ "valeur correspond). Si plusieurs adresses sont retournées en même temps,"
-
-#~ msgid ""
-#~ "the whole string of addresses separated with commas (sorted "
-#~ "alphabetically)."
-#~ msgstr ""
-#~ "vous devrez toutes les inscrire séparées pas des virgules (en ordre "
-#~ "alphabétique)"
-
-#~ msgid "No specific parameters. No warning or critical threshold"
-#~ msgstr "Pas d'argument spécifique. Pas de seuil d'avertissement ou critique"
-
-#~ msgid "Can't find local IP for NAS-IP-Address"
-#~ msgstr "Impossible de trouver une addresse IP locale pour le NAS-IP-Address"
-
-#~ msgid "Warning free space should be more than critical free space"
-#~ msgstr ""
-#~ "Le seuil d'avertissement pour la place libre doit être plus grand que le "
-#~ "seuil critique"
-
-#, 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"
-
-#~ 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: "
-
-#~ msgid ""
-#~ " See: http://nagiosplugins.org/extra-opts for --extra-opts usage and "
-#~ "examples.\n"
-#~ msgstr ""
-#~ " Voir: http://nagiosplugins.org/extra-opts pour le format et examples de "
-#~ "--extra-opts.\n"
diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot
deleted file mode 100644
index af48f03..0000000
--- a/po/monitoring-plugins.pot
+++ /dev/null
@@ -1,4929 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Monitoring Plugins Development Team
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n"
-"POT-Creation-Date: 2023-09-12 01:33+0200\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"
-
-msgid "Could not parse arguments"
-msgstr ""
-
-msgid "Cannot catch SIGALRM"
-msgstr ""
-
-#, c-format
-msgid "SSH connection failed: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Remote command execution failed: %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n"
-msgstr ""
-
-#, c-format
-msgid "SSH WARNING: could not open %s\n"
-msgstr ""
-
-#, c-format
-msgid "%s: Error parsing output\n"
-msgstr ""
-
-msgid "Timeout interval must be a positive integer"
-msgstr ""
-
-msgid "Port must be a positive integer"
-msgstr ""
-
-msgid "skip-stdout argument must be an integer"
-msgstr ""
-
-msgid "skip-stderr argument must be an integer"
-msgstr ""
-
-#, c-format
-msgid "%s: You must provide a host name\n"
-msgstr ""
-
-msgid "No remotecmd"
-msgstr ""
-
-#, c-format
-msgid "%s: Argument limit of %d exceeded\n"
-msgstr ""
-
-msgid "Can not (re)allocate 'commargv' buffer\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s: In passive mode, you must provide a service name for each command.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s: In passive mode, you must provide the host short name from the "
-"monitoring configs.\n"
-msgstr ""
-
-#, c-format
-msgid "This plugin uses SSH to execute commands on a remote host"
-msgstr ""
-
-msgid "tell ssh to use Protocol 1 [optional]"
-msgstr ""
-
-msgid "tell ssh to use Protocol 2 [optional]"
-msgstr ""
-
-msgid "Ignore all or (if specified) first n lines on STDOUT [optional]"
-msgstr ""
-
-msgid "Ignore all or (if specified) first n lines on STDERR [optional]"
-msgstr ""
-
-msgid "Exit with an warning, if there is an output on STDERR"
-msgstr ""
-
-msgid ""
-"tells ssh to fork rather than create a tty [optional]. This will always "
-"return OK if ssh is executed"
-msgstr ""
-
-msgid "command to execute on the remote machine"
-msgstr ""
-
-msgid "SSH user name on remote host [optional]"
-msgstr ""
-
-msgid "identity of an authorized key [optional]"
-msgstr ""
-
-msgid "external command file for monitoring [optional]"
-msgstr ""
-
-msgid "list of monitoring service names, separated by ':' [optional]"
-msgstr ""
-
-msgid "short name of host in the monitoring configuration [optional]"
-msgstr ""
-
-msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]"
-msgstr ""
-
-msgid "Tell ssh to use this configfile [optional]"
-msgstr ""
-
-msgid "Tell ssh to suppress warning and diagnostic messages [optional]"
-msgstr ""
-
-msgid "Make connection problems return UNKNOWN instead of CRITICAL"
-msgstr ""
-
-msgid "The most common mode of use is to refer to a local identity file with"
-msgstr ""
-
-msgid "the '-i' option. In this mode, the identity pair should have a null"
-msgstr ""
-
-msgid "passphrase and the public key should be listed in the authorized_keys"
-msgstr ""
-
-msgid "file of the remote host. Usually the key will be restricted to running"
-msgstr ""
-
-msgid "only one command on the remote server. If the remote SSH server tracks"
-msgstr ""
-
-msgid "invocation arguments, the one remote program may be an agent that can"
-msgstr ""
-
-msgid "execute additional commands as proxy"
-msgstr ""
-
-msgid "To use passive mode, provide multiple '-C' options, and provide"
-msgstr ""
-
-msgid ""
-"all of -O, -s, and -n options (servicelist order must match '-C'options)"
-msgstr ""
-
-msgid "Examples:"
-msgstr ""
-
-msgid "Usage:"
-msgstr ""
-
-#, c-format
-msgid "Host/Service Cluster Plugin for Monitoring"
-msgstr ""
-
-msgid "Options:"
-msgstr ""
-
-msgid "Check service cluster status"
-msgstr ""
-
-msgid "Check host cluster status"
-msgstr ""
-
-msgid "Optional prepended text output (i.e. \"Host cluster\")"
-msgstr ""
-
-msgid "Specifies the range of hosts or services in cluster that must be in a"
-msgstr ""
-
-msgid "non-OK state in order to return a WARNING status level"
-msgstr ""
-
-msgid "non-OK state in order to return a CRITICAL status level"
-msgstr ""
-
-msgid "The status codes of the hosts or services in the cluster, separated by"
-msgstr ""
-
-msgid "commas"
-msgstr ""
-
-msgid "Notes:"
-msgstr ""
-
-msgid ""
-"Will alert critical if there are 3 or more service data points in a non-OK"
-msgstr ""
-
-msgid "state."
-msgstr ""
-
-#, c-format
-msgid "Looking for: '%s'\n"
-msgstr ""
-
-msgid "dig returned an error status"
-msgstr ""
-
-msgid "Server not found in ANSWER SECTION"
-msgstr ""
-
-msgid "No ANSWER SECTION found"
-msgstr ""
-
-msgid "Probably a non-existent host/domain"
-msgstr ""
-
-#, c-format
-msgid "Port must be a positive integer - %s"
-msgstr ""
-
-#, c-format
-msgid "Warning interval must be a positive integer - %s"
-msgstr ""
-
-#, c-format
-msgid "Critical interval must be a positive integer - %s"
-msgstr ""
-
-#, c-format
-msgid "Timeout interval must be a positive integer - %s"
-msgstr ""
-
-#, c-format
-msgid "This plugin tests the DNS service on the specified host using dig"
-msgstr ""
-
-msgid "Force dig to only use IPv4 query transport"
-msgstr ""
-
-msgid "Force dig to only use IPv6 query transport"
-msgstr ""
-
-msgid "Machine name to lookup"
-msgstr ""
-
-msgid "Record type to lookup (default: A)"
-msgstr ""
-
-msgid ""
-"An address expected to be in the answer section. If not set, uses whatever"
-msgstr ""
-
-msgid "was in -l"
-msgstr ""
-
-msgid "Pass STRING as argument(s) to dig"
-msgstr ""
-
-#, c-format
-msgid "DISK %s: %s not found\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL"
-msgstr ""
-
-#, c-format
-msgid "unit type %s not known\n"
-msgstr ""
-
-#, c-format
-msgid "failed allocating storage for '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "UNKNOWN"
-msgstr ""
-
-msgid "Must set a threshold value before using -p\n"
-msgstr ""
-
-msgid "Must set -E before selecting paths\n"
-msgstr ""
-
-msgid "Must set group value before selecting paths\n"
-msgstr ""
-
-msgid ""
-"Paths need to be selected before using -i/-I. Use -A to select all paths "
-"explicitly"
-msgstr ""
-
-msgid "Could not compile regular expression"
-msgstr ""
-
-msgid "Must set a threshold value before using -r/-R\n"
-msgstr ""
-
-msgid "Regular expression did not match any path or disk"
-msgstr ""
-
-msgid "Unknown argument"
-msgstr ""
-
-#, c-format
-msgid " for %s\n"
-msgstr ""
-
-msgid ""
-"This plugin checks the amount of used disk space on a mounted file system"
-msgstr ""
-
-msgid ""
-"and generates an alert if free space is less than one of the threshold values"
-msgstr ""
-
-msgid "Exit with WARNING status if less than INTEGER units of disk are free"
-msgstr ""
-
-msgid "Exit with WARNING status if less than PERCENT of disk space is free"
-msgstr ""
-
-msgid "Exit with CRITICAL status if less than INTEGER units of disk are free"
-msgstr ""
-
-msgid "Exit with CRITICAL status if less than PERCENT of disk space is free"
-msgstr ""
-
-msgid "Exit with WARNING status if less than PERCENT of inode space is free"
-msgstr ""
-
-msgid "Exit with CRITICAL status if less than PERCENT of inode space is free"
-msgstr ""
-
-msgid ""
-"Mount point or block device as emitted by the mount(8) command (may be "
-"repeated)"
-msgstr ""
-
-msgid "Ignore device (only works if -p unspecified)"
-msgstr ""
-
-msgid "Clear thresholds"
-msgstr ""
-
-msgid "For paths or partitions specified with -p, only check for exact paths"
-msgstr ""
-
-msgid "Display only devices/mountpoints with errors"
-msgstr ""
-
-msgid "Don't account root-reserved blocks into freespace in perfdata"
-msgstr ""
-
-msgid "Display inode usage in perfdata"
-msgstr ""
-
-msgid ""
-"Group paths. Thresholds apply to (free-)space of all partitions together"
-msgstr ""
-
-msgid "Same as '--units kB'"
-msgstr ""
-
-msgid "Only check local filesystems"
-msgstr ""
-
-msgid ""
-"Only check local filesystems against thresholds. Yet call stat on remote "
-"filesystems"
-msgstr ""
-
-msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)"
-msgstr ""
-
-msgid "Display the (block) device instead of the mount point"
-msgstr ""
-
-msgid "Same as '--units MB'"
-msgstr ""
-
-msgid "Explicitly select all paths. This is equivalent to -R '.*'"
-msgstr ""
-
-msgid ""
-"Case insensitive regular expression for path/partition (may be repeated)"
-msgstr ""
-
-msgid "Regular expression for path or partition (may be repeated)"
-msgstr ""
-
-msgid ""
-"Regular expression to ignore selected path/partition (case insensitive) (may "
-"be repeated)"
-msgstr ""
-
-msgid ""
-"Regular expression to ignore selected path or partition (may be repeated)"
-msgstr ""
-
-msgid ""
-"Return OK if no filesystem matches, filesystem does not exist or is "
-"inaccessible."
-msgstr ""
-
-msgid "(Provide this option before -p / -r / --ereg-path if used)"
-msgstr ""
-
-msgid "Choose bytes, kB, MB, GB, TB (default: MB)"
-msgstr ""
-
-msgid "Ignore all filesystems of indicated type (may be repeated)"
-msgstr ""
-
-msgid "Check only filesystems of indicated type (may be repeated)"
-msgstr ""
-
-msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"
-msgstr ""
-
-msgid ""
-"Checks all filesystems not matching -r at 100M and 50M. The fs matching the -"
-"r regex"
-msgstr ""
-
-msgid ""
-"are grouped which means the freespace thresholds are applied to all disks "
-"together"
-msgstr ""
-
-msgid ""
-"Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use "
-"100M/50M"
-msgstr ""
-
-#, c-format
-msgid "%s %s: %s\n"
-msgstr ""
-
-msgid "is not accessible"
-msgstr ""
-
-msgid "nslookup returned an error status"
-msgstr ""
-
-msgid "Warning plugin error"
-msgstr ""
-
-#, c-format
-msgid "DNS CRITICAL - '%s' returned empty server string\n"
-msgstr ""
-
-#, c-format
-msgid "DNS CRITICAL - No response from DNS %s\n"
-msgstr ""
-
-#, c-format
-msgid "DNS CRITICAL - '%s' returned empty host name string\n"
-msgstr ""
-
-msgid "Non-authoritative answer:"
-msgstr ""
-
-#, c-format
-msgid "Domain '%s' was not found by the server\n"
-msgstr ""
-
-#, c-format
-msgid "DNS CRITICAL - '%s' msg parsing exited with no address\n"
-msgstr ""
-
-#, c-format
-msgid "expected '%s' but got '%s'"
-msgstr ""
-
-#, c-format
-msgid "Domain '%s' was found by the server: '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "server %s is not authoritative for %s"
-msgstr ""
-
-#, c-format
-msgid "OK"
-msgstr ""
-
-#, c-format
-msgid "WARNING"
-msgstr ""
-
-#, c-format
-msgid "%.3f second response time"
-msgid_plural "%.3f seconds response time"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid ". %s returns %s"
-msgstr ""
-
-#, c-format
-msgid "DNS WARNING - %s\n"
-msgstr ""
-
-msgid " Probably a non-existent host/domain"
-msgstr ""
-
-#, c-format
-msgid "DNS CRITICAL - %s\n"
-msgstr ""
-
-#, c-format
-msgid "DNS UNKNOWN - %s\n"
-msgstr ""
-
-msgid "Note: nslookup is deprecated and may be removed from future releases."
-msgstr ""
-
-msgid "Consider using the `dig' or `host' programs instead.  Run nslookup with"
-msgstr ""
-
-msgid "the `-sil[ent]' option to prevent this message from appearing."
-msgstr ""
-
-#, c-format
-msgid "No response from DNS %s\n"
-msgstr ""
-
-#, c-format
-msgid "DNS %s has no records\n"
-msgstr ""
-
-#, c-format
-msgid "Connection to DNS %s was refused\n"
-msgstr ""
-
-#, c-format
-msgid "Query was refused by DNS server at %s\n"
-msgstr ""
-
-#, c-format
-msgid "No information returned by DNS server at %s\n"
-msgstr ""
-
-msgid "Network is unreachable\n"
-msgstr ""
-
-#, c-format
-msgid "DNS failure for %s\n"
-msgstr ""
-
-msgid "Input buffer overflow\n"
-msgstr ""
-
-msgid ""
-"This plugin uses the nslookup program to obtain the IP address for the given "
-"host/domain query."
-msgstr ""
-
-msgid "An optional DNS server to use may be specified."
-msgstr ""
-
-msgid ""
-"If no DNS server is specified, the default server(s) specified in /etc/"
-"resolv.conf will be used."
-msgstr ""
-
-msgid "The name or address you want to query"
-msgstr ""
-
-msgid "Optional DNS server you want to use for the lookup"
-msgstr ""
-
-msgid ""
-"Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end"
-msgstr ""
-
-msgid ""
-"with a dot (.). This option can be repeated multiple times (Returns OK if any"
-msgstr ""
-
-msgid "value matches)."
-msgstr ""
-
-msgid ""
-"Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)"
-msgstr ""
-
-msgid "Cannot be used together with -a"
-msgstr ""
-
-msgid "Optionally expect the DNS server to be authoritative for the lookup"
-msgstr ""
-
-msgid "Return warning if elapsed time exceeds value. Default off"
-msgstr ""
-
-msgid "Return critical if elapsed time exceeds value. Default off"
-msgstr ""
-
-msgid ""
-"Return critical if the list of expected addresses does not match all "
-"addresses"
-msgstr ""
-
-msgid "returned. Default off"
-msgstr ""
-
-msgid "Arguments to check_dummy must be an integer"
-msgstr ""
-
-#, c-format
-msgid "Status %d is not a supported error state\n"
-msgstr ""
-
-msgid ""
-"This plugin will simply return the state corresponding to the numeric value"
-msgstr ""
-
-msgid "of the <state> argument with optional text"
-msgstr ""
-
-#, c-format
-msgid "Could not open pipe: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Could not open stderr for %s\n"
-msgstr ""
-
-msgid "FPING UNKNOWN - IP address not found\n"
-msgstr ""
-
-msgid "FPING UNKNOWN - invalid commandline argument\n"
-msgstr ""
-
-msgid "FPING UNKNOWN - failed system call\n"
-msgstr ""
-
-#, c-format
-msgid "FPING %s - %s (rta=%f ms)|%s\n"
-msgstr ""
-
-#, c-format
-msgid "FPING UNKNOWN - %s not found\n"
-msgstr ""
-
-#, c-format
-msgid "FPING CRITICAL - %s is unreachable\n"
-msgstr ""
-
-#, c-format
-msgid "FPING UNKNOWN - %s parameter error\n"
-msgstr ""
-
-#, c-format
-msgid "FPING CRITICAL - %s is down\n"
-msgstr ""
-
-#, c-format
-msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"
-msgstr ""
-
-#, c-format
-msgid "FPING %s - %s (loss=%.0f%% )|%s\n"
-msgstr ""
-
-msgid "Invalid hostname/address"
-msgstr ""
-
-msgid "IPv6 support not available\n"
-msgstr ""
-
-msgid "Packet size must be a positive integer"
-msgstr ""
-
-msgid "Packet count must be a positive integer"
-msgstr ""
-
-msgid "Target timeout must be a positive integer"
-msgstr ""
-
-msgid "Interval must be a positive integer"
-msgstr ""
-
-msgid "Hostname was not supplied"
-msgstr ""
-
-#, c-format
-msgid "%s: Only one threshold may be packet loss (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "%s: Only one threshold must be packet loss (%s)\n"
-msgstr ""
-
-msgid ""
-"This plugin will use the fping command to ping the specified host for a fast "
-"check"
-msgstr ""
-
-msgid "Note that it is necessary to set the suid flag on fping."
-msgstr ""
-
-msgid ""
-"name or IP Address of host to ping (IP Address bypasses name lookup, "
-"reducing system load)"
-msgstr ""
-
-msgid "warning threshold pair"
-msgstr ""
-
-msgid "critical threshold pair"
-msgstr ""
-
-msgid "Return OK after first successful reply"
-msgstr ""
-
-msgid "size of ICMP packet"
-msgstr ""
-
-msgid "number of ICMP packets to send"
-msgstr ""
-
-msgid "Target timeout (ms)"
-msgstr ""
-
-msgid "Interval (ms) between sending packets"
-msgstr ""
-
-msgid "name or IP Address of sourceip"
-msgstr ""
-
-msgid "source interface name"
-msgstr ""
-
-#, c-format
-msgid ""
-"THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time "
-"(ms)"
-msgstr ""
-
-msgid ""
-"which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"
-msgstr ""
-
-msgid "packet loss to trigger an alarm state."
-msgstr ""
-
-msgid "IPv4 is used by default. Specify -6 to use IPv6."
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Host type parameter incorrect!\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Host not found\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Game server down or unavailable\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Game server timeout\n"
-msgstr ""
-
-#, c-format
-msgid "This plugin tests game server connections with the specified host."
-msgstr ""
-
-msgid "Optional port of which to connect"
-msgstr ""
-
-msgid "Field number in raw qstat output that contains game name"
-msgstr ""
-
-msgid "Field number in raw qstat output that contains map name"
-msgstr ""
-
-msgid "Field number in raw qstat output that contains ping time"
-msgstr ""
-
-msgid ""
-"This plugin uses the 'qstat' command, the popular game server status query "
-"tool."
-msgstr ""
-
-msgid ""
-"If you don't have the package installed, you will need to download it from"
-msgstr ""
-
-msgid "https://github.com/multiplay/qstat before you can use this plugin."
-msgstr ""
-
-msgid "Paper Jam"
-msgstr ""
-
-msgid "Out of Paper"
-msgstr ""
-
-msgid "Printer Offline"
-msgstr ""
-
-msgid "Peripheral Error"
-msgstr ""
-
-msgid "Intervention Required"
-msgstr ""
-
-msgid "Toner Low"
-msgstr ""
-
-msgid "Insufficient Memory"
-msgstr ""
-
-msgid "A Door is Open"
-msgstr ""
-
-msgid "Output Tray is Full"
-msgstr ""
-
-msgid "Data too Slow for Engine"
-msgstr ""
-
-msgid "Unknown Paper Error"
-msgstr ""
-
-#, c-format
-msgid "Printer ok - (%s)\n"
-msgstr ""
-
-msgid "Port must be a positive short integer"
-msgstr ""
-
-msgid "This plugin tests the STATUS of an HP printer with a JetDirect card."
-msgstr ""
-
-msgid "Net-snmp must be installed on the computer running the plugin."
-msgstr ""
-
-msgid "The SNMP community name "
-msgstr ""
-
-#, c-format
-msgid "(default=%s)"
-msgstr ""
-
-msgid "Specify the port to check "
-msgstr ""
-
-msgid "Disable paper check "
-msgstr ""
-
-msgid "file does not exist or is not readable"
-msgstr ""
-
-msgid "Invalid certificate expiration period"
-msgstr ""
-
-msgid ""
-"Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional "
-"'+' suffix)"
-msgstr ""
-
-msgid "Invalid option - SSL is not available"
-msgstr ""
-
-msgid "Invalid max_redirs count"
-msgstr ""
-
-msgid "Invalid onredirect option"
-msgstr ""
-
-#, c-format
-msgid "option f:%d \n"
-msgstr ""
-
-msgid "Invalid port number"
-msgstr ""
-
-#, c-format
-msgid "Could Not Compile Regular Expression: %s"
-msgstr ""
-
-msgid "IPv6 support not available"
-msgstr ""
-
-msgid "You must specify a server address or host name"
-msgstr ""
-
-msgid ""
-"If you use a client certificate you must also specify a private key file"
-msgstr ""
-
-msgid "HTTP UNKNOWN - Memory allocation error\n"
-msgstr ""
-
-#, c-format
-msgid "%sServer date unknown, "
-msgstr ""
-
-#, c-format
-msgid "%sDocument modification date unknown, "
-msgstr ""
-
-#, c-format
-msgid "%sServer date \"%100s\" unparsable, "
-msgstr ""
-
-#, c-format
-msgid "%sDocument date \"%100s\" unparsable, "
-msgstr ""
-
-#, c-format
-msgid "%sDocument is %d seconds in the future, "
-msgstr ""
-
-#, c-format
-msgid "%sLast modified %.1f days ago, "
-msgstr ""
-
-#, c-format
-msgid "%sLast modified %d:%02d:%02d ago, "
-msgstr ""
-
-msgid "HTTP CRITICAL - Unable to open TCP socket\n"
-msgstr ""
-
-msgid "HTTP UNKNOWN - Could not allocate memory for full_page\n"
-msgstr ""
-
-msgid "HTTP CRITICAL - Error on receive\n"
-msgstr ""
-
-msgid "HTTP CRITICAL - No data received from host\n"
-msgstr ""
-
-#, c-format
-msgid "Invalid HTTP response received from host: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Invalid HTTP response received from host on port %d: %s\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s\n"
-"%s"
-msgstr ""
-
-#, c-format
-msgid "Status line output matched \"%s\" - "
-msgstr ""
-
-#, c-format
-msgid "HTTP CRITICAL: Invalid Status Line (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "HTTP CRITICAL: Invalid Status (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "%s - "
-msgstr ""
-
-#, c-format
-msgid "%sheader '%s' not found on '%s://%s:%d%s', "
-msgstr ""
-
-#, c-format
-msgid "%sstring '%s' not found on '%s://%s:%d%s', "
-msgstr ""
-
-#, c-format
-msgid "%spattern not found, "
-msgstr ""
-
-#, c-format
-msgid "%spattern found, "
-msgstr ""
-
-#, c-format
-msgid "%sExecute Error: %s, "
-msgstr ""
-
-#, c-format
-msgid "%spage size %d too large, "
-msgstr ""
-
-#, c-format
-msgid "%spage size %d too small, "
-msgstr ""
-
-#, c-format
-msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s"
-msgstr ""
-
-#, c-format
-msgid "%s - %d bytes in %.3f second response time %s|%s %s"
-msgstr ""
-
-msgid "HTTP UNKNOWN - Could not allocate addr\n"
-msgstr ""
-
-msgid "HTTP UNKNOWN - Could not allocate URL\n"
-msgstr ""
-
-#, c-format
-msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n"
-msgstr ""
-
-#, c-format
-msgid "HTTP UNKNOWN - Empty redirect location%s\n"
-msgstr ""
-
-#, c-format
-msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n"
-msgstr ""
-
-#, c-format
-msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"
-msgstr ""
-
-#, c-format
-msgid "HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"
-msgstr ""
-
-#, c-format
-msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"
-msgstr ""
-
-#, c-format
-msgid "Redirection to %s://%s:%d%s\n"
-msgstr ""
-
-msgid "This plugin tests the HTTP service on the specified host. It can test"
-msgstr ""
-
-msgid "normal (http) and secure (https) servers, follow redirects, search for"
-msgstr ""
-
-msgid "strings and regular expressions, check connection times, and report on"
-msgstr ""
-
-msgid "certificate expiration times."
-msgstr ""
-
-#, c-format
-msgid "In the first form, make an HTTP request."
-msgstr ""
-
-#, c-format
-msgid ""
-"In the second form, connect to the server and check the TLS certificate."
-msgstr ""
-
-#, c-format
-msgid "NOTE: One or both of -H and -I must be specified"
-msgstr ""
-
-msgid "Host name argument for servers using host headers (virtual host)"
-msgstr ""
-
-msgid "Append a port to include it in the header (eg: example.com:5000)"
-msgstr ""
-
-msgid ""
-"IP address or name (use numeric address if possible to bypass DNS lookup)."
-msgstr ""
-
-msgid "Port number (default: "
-msgstr ""
-
-msgid ""
-"Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"
-msgstr ""
-
-msgid "auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1,"
-msgstr ""
-
-msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted."
-msgstr ""
-
-msgid "Enable SSL/TLS hostname extension support (SNI)"
-msgstr ""
-
-msgid ""
-"Minimum number of days a certificate has to be valid. Port defaults to 443"
-msgstr ""
-
-msgid ""
-"(when this option is used the URL is not checked by default. You can use"
-msgstr ""
-
-msgid " --continue-after-certificate to override this behavior)"
-msgstr ""
-
-msgid ""
-"Allows the HTTP check to continue after performing the certificate check."
-msgstr ""
-
-msgid "Does nothing unless -C is used."
-msgstr ""
-
-msgid "Name of file that contains the client certificate (PEM format)"
-msgstr ""
-
-msgid "to be used in establishing the SSL session"
-msgstr ""
-
-msgid "Name of file containing the private key (PEM format)"
-msgstr ""
-
-msgid "matching the client certificate"
-msgstr ""
-
-msgid "Comma-delimited list of strings, at least one of them is expected in"
-msgstr ""
-
-msgid "the first (status) line of the server response (default: "
-msgstr ""
-
-msgid ""
-"If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"
-msgstr ""
-
-msgid "String to expect in the response headers"
-msgstr ""
-
-msgid "String to expect in the content"
-msgstr ""
-
-msgid "URL to GET or POST (default: /)"
-msgstr ""
-
-msgid "URL encoded http POST data"
-msgstr ""
-
-msgid "Set HTTP method."
-msgstr ""
-
-msgid "Don't wait for document body: stop reading after headers."
-msgstr ""
-
-msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)"
-msgstr ""
-
-msgid "Warn if document is more than SECONDS old. the number can also be of"
-msgstr ""
-
-msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."
-msgstr ""
-
-msgid "specify Content-Type header media type when POSTing\n"
-msgstr ""
-
-msgid "Allow regex to span newlines (must precede -r or -R)"
-msgstr ""
-
-msgid "Search page for regex STRING"
-msgstr ""
-
-msgid "Search page for case-insensitive regex STRING"
-msgstr ""
-
-msgid "Return CRITICAL if found, OK if not\n"
-msgstr ""
-
-msgid "Username:password on sites with basic authentication"
-msgstr ""
-
-msgid "Username:password on proxy-servers with basic authentication"
-msgstr ""
-
-msgid "String to be sent in http header as \"User Agent\""
-msgstr ""
-
-msgid ""
-"Any other tags to be sent in http header. Use multiple times for additional "
-"headers"
-msgstr ""
-
-msgid "Print additional performance data"
-msgstr ""
-
-msgid "Print body content below status line"
-msgstr ""
-
-msgid "Wrap output in HTML link (obsoleted by urlize)"
-msgstr ""
-
-msgid "How to handle redirected pages. sticky is like follow but stick to the"
-msgstr ""
-
-msgid "specified IP address. stickyport also ensures port stays the same."
-msgstr ""
-
-msgid "Maximal number of redirects (default: "
-msgstr ""
-
-msgid "Minimum page size required (bytes) : Maximum page size required (bytes)"
-msgstr ""
-
-msgid "This plugin will attempt to open an HTTP connection with the host."
-msgstr ""
-
-msgid ""
-"Successful connects return STATE_OK, refusals and timeouts return "
-"STATE_CRITICAL"
-msgstr ""
-
-msgid ""
-"other errors return STATE_UNKNOWN.  Successful connects, but incorrect "
-"response"
-msgstr ""
-
-msgid ""
-"messages from the host result in STATE_WARNING return values.  If you are"
-msgstr ""
-
-msgid ""
-"checking a virtual server that uses 'host headers' you must supply the FQDN"
-msgstr ""
-
-msgid "(fully qualified domain name) as the [host_name] argument."
-msgstr ""
-
-msgid "This plugin can also check whether an SSL enabled web server is able to"
-msgstr ""
-
-msgid "serve content (optionally within a specified time) or whether the X509 "
-msgstr ""
-
-msgid "certificate is still valid for the specified number of days."
-msgstr ""
-
-msgid "Please note that this plugin does not check if the presented server"
-msgstr ""
-
-msgid "certificate matches the hostname of the server, or if the certificate"
-msgstr ""
-
-msgid "has a valid chain of trust to one of the locally installed CAs."
-msgstr ""
-
-msgid ""
-"When the 'www.verisign.com' server returns its content within 5 seconds,"
-msgstr ""
-
-msgid ""
-"a STATE_OK will be returned. When the server returns its content but exceeds"
-msgstr ""
-
-msgid ""
-"the 5-second threshold, a STATE_WARNING will be returned. When an error "
-"occurs,"
-msgstr ""
-
-msgid "a STATE_CRITICAL will be returned."
-msgstr ""
-
-msgid ""
-"When the certificate of 'www.verisign.com' is valid for more than 14 days,"
-msgstr ""
-
-msgid ""
-"a STATE_OK is returned. When the certificate is still valid, but for less "
-"than"
-msgstr ""
-
-msgid ""
-"14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"
-msgstr ""
-
-msgid "the certificate is expired."
-msgstr ""
-
-msgid ""
-"When the certificate of 'www.verisign.com' is valid for more than 30 days,"
-msgstr ""
-
-msgid "30 days, but more than 14 days, a STATE_WARNING is returned."
-msgstr ""
-
-msgid ""
-"A STATE_CRITICAL will be returned when certificate expires in less than 14 "
-"days"
-msgstr ""
-
-msgid ""
-"check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j "
-"CONNECT -H www.verisign.com "
-msgstr ""
-
-msgid ""
-"all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -"
-"S(sl) -j CONNECT -H <webserver>"
-msgstr ""
-
-msgid ""
-"a STATE_CRITICAL will be returned. By adding a colon to the method you can "
-"set the method used"
-msgstr ""
-
-msgid "inside the proxied connection: -j CONNECT:POST"
-msgstr ""
-
-#, c-format
-msgid "Could not connect to the server at port %i\n"
-msgstr ""
-
-#, c-format
-msgid "Could not set protocol version %d\n"
-msgstr ""
-
-#, c-format
-msgid "Could not init TLS at port %i!\n"
-msgstr ""
-
-#, c-format
-msgid "TLS not supported by the libraries!\n"
-msgstr ""
-
-#, c-format
-msgid "Could not init startTLS at port %i!\n"
-msgstr ""
-
-#, c-format
-msgid "startTLS not supported by the library, needs LDAPv3!\n"
-msgstr ""
-
-#, c-format
-msgid "Could not bind to the LDAP server\n"
-msgstr ""
-
-#, c-format
-msgid "Could not search/find objectclasses in %s\n"
-msgstr ""
-
-#, c-format
-msgid "LDAP %s - found %d entries in %.3f seconds|%s %s\n"
-msgstr ""
-
-#, c-format
-msgid "LDAP %s - %.3f seconds response time|%s\n"
-msgstr ""
-
-#, c-format
-msgid "%s cannot be combined with %s"
-msgstr ""
-
-msgid "Please specify the host name\n"
-msgstr ""
-
-msgid "Please specify the LDAP base\n"
-msgstr ""
-
-msgid "ldap attribute to search (default: \"(objectclass=*)\""
-msgstr ""
-
-msgid "ldap base (eg. ou=my unit, o=my org, c=at"
-msgstr ""
-
-msgid "ldap bind DN (if required)"
-msgstr ""
-
-msgid ""
-"ldap password (if required, or set the password through environment variable "
-"'LDAP_PASSWORD')"
-msgstr ""
-
-msgid "use starttls mechanism introduced in protocol version 3"
-msgstr ""
-
-msgid "use ldaps (ldap v2 ssl method). this also sets the default port to"
-msgstr ""
-
-msgid "use ldap protocol version 2"
-msgstr ""
-
-msgid "use ldap protocol version 3"
-msgstr ""
-
-msgid "default protocol version:"
-msgstr ""
-
-msgid "Number of found entries to result in warning status"
-msgstr ""
-
-msgid "Number of found entries to result in critical status"
-msgstr ""
-
-msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"
-msgstr ""
-
-#, c-format
-msgid ""
-" implied (using default port %i) unless --port=636 is specified. In that "
-"case\n"
-msgstr ""
-
-msgid "'SSL on connect' will be used no matter how the plugin was called."
-msgstr ""
-
-msgid ""
-"This detection is deprecated, please use 'check_ldap' with the '--starttls' "
-"or '--ssl' flags"
-msgstr ""
-
-msgid "to define the behaviour explicitly instead."
-msgstr ""
-
-msgid "The parameters --warn-entries and --crit-entries are optional."
-msgstr ""
-
-msgid "Warning threshold must be float or float triplet!\n"
-msgstr ""
-
-#, c-format
-msgid "Error opening %s\n"
-msgstr ""
-
-#, c-format
-msgid "could not parse load from uptime %s: %d\n"
-msgstr ""
-
-#, c-format
-msgid "Error code %d returned in %s\n"
-msgstr ""
-
-#, c-format
-msgid "Error in getloadavg()\n"
-msgstr ""
-
-#, c-format
-msgid "Error processing %s\n"
-msgstr ""
-
-#, c-format
-msgid "load average: %.2f, %.2f, %.2f"
-msgstr ""
-
-#, c-format
-msgid "Critical threshold for %d-minute load average is not specified\n"
-msgstr ""
-
-#, c-format
-msgid "Warning threshold for %d-minute load average is not specified\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Parameter inconsistency: %d-minute \"warning load\" is greater than "
-"\"critical load\"\n"
-msgstr ""
-
-#, c-format
-msgid "This plugin tests the current system load average."
-msgstr ""
-
-msgid "Exit with WARNING status if load average exceeds WLOADn"
-msgstr ""
-
-msgid "Exit with CRITICAL status if load average exceed CLOADn"
-msgstr ""
-
-msgid "the load average format is the same used by \"uptime\" and \"w\""
-msgstr ""
-
-msgid "Divide the load averages by the number of CPUs (when possible)"
-msgstr ""
-
-msgid "Number of processes to show when printing the top consuming processes."
-msgstr ""
-
-msgid "NUMBER_OF_PROCS=0 disables this feature. Default value is 0"
-msgstr ""
-
-#, c-format
-msgid "'%s' exited with non-zero status.\n"
-msgstr ""
-
-#, c-format
-msgid "some error occurred getting procs list.\n"
-msgstr ""
-
-msgid "Could not parse arguments\n"
-msgstr ""
-
-#, c-format
-msgid "Unable to open MRTG log file\n"
-msgstr ""
-
-#, c-format
-msgid "Unable to process MRTG log file\n"
-msgstr ""
-
-#, c-format
-msgid "MRTG data has expired (%d minutes old)\n"
-msgstr ""
-
-msgid "Avg"
-msgstr ""
-
-msgid "Max"
-msgstr ""
-
-msgid "Invalid variable number"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s is not a valid expiration time\n"
-"Use '%s -h' for additional help\n"
-msgstr ""
-
-msgid "Invalid variable number\n"
-msgstr ""
-
-msgid "You must supply the variable number"
-msgstr ""
-
-msgid ""
-"This plugin will check either the average or maximum value of one of the"
-msgstr ""
-
-msgid "two variables recorded in an MRTG log file."
-msgstr ""
-
-msgid "The MRTG log file containing the data you want to monitor"
-msgstr ""
-
-msgid "Minutes before MRTG data is considered to be too old"
-msgstr ""
-
-msgid "Should we check average or maximum values?"
-msgstr ""
-
-msgid "Which variable set should we inspect? (1 or 2)"
-msgstr ""
-
-msgid "Threshold value for data to result in WARNING status"
-msgstr ""
-
-msgid "Threshold value for data to result in CRITICAL status"
-msgstr ""
-
-msgid "Type label for data (Examples: Conns, \"Processor Load\", In, Out)"
-msgstr ""
-
-msgid "Option units label for data (Example: Packets/Sec, Errors/Sec,"
-msgstr ""
-
-#, c-format
-msgid "\"Bytes Per Second\", \"%% Utilization\")"
-msgstr ""
-
-msgid ""
-"If the value exceeds the <vwl> threshold, a WARNING status is returned. If"
-msgstr ""
-
-msgid ""
-"the value exceeds the <vcl> threshold, a CRITICAL status is returned.  If"
-msgstr ""
-
-msgid "the data in the log file is older than <expire_minutes> old, a WARNING"
-msgstr ""
-
-msgid "status is returned and a warning message is printed."
-msgstr ""
-
-msgid ""
-"This plugin is useful for monitoring MRTG data that does not correspond to"
-msgstr ""
-
-msgid ""
-"bandwidth usage.  (Use the check_mrtgtraf plugin for monitoring bandwidth)."
-msgstr ""
-
-msgid ""
-"It can be used to monitor any kind of data that MRTG is monitoring - errors,"
-msgstr ""
-
-msgid ""
-"packets/sec, etc.  I use MRTG in conjunction with the Novell NLM that allows"
-msgstr ""
-
-msgid ""
-"me to track processor utilization, user connections, drive space, etc and"
-msgstr ""
-
-msgid "this plugin works well for monitoring that kind of data as well."
-msgstr ""
-
-msgid ""
-"- This plugin only monitors one of the two variables stored in the MRTG log"
-msgstr ""
-
-msgid "file.  If you want to monitor both values you will have to define two"
-msgstr ""
-
-msgid "commands with different values for the <variable> argument.  Of course,"
-msgstr ""
-
-msgid "you can always hack the code to make this plugin work for you..."
-msgstr ""
-
-msgid ""
-"- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded "
-"from"
-msgstr ""
-
-msgid "Unable to open MRTG log file"
-msgstr ""
-
-msgid "Unable to process MRTG log file"
-msgstr ""
-
-#, c-format
-msgid "%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"
-msgstr ""
-
-#, c-format
-msgid "Traffic %s - %s\n"
-msgstr ""
-
-msgid ""
-"This plugin will check the incoming/outgoing transfer rates of a router,"
-msgstr ""
-
-msgid "switch, etc recorded in an MRTG log.  If the newest log entry is older"
-msgstr ""
-
-msgid "than <expire_minutes>, a WARNING status is returned. If either the"
-msgstr ""
-
-msgid "incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in"
-msgstr ""
-
-msgid "Bytes/sec), a CRITICAL status results.  If either of the rates exceed"
-msgstr ""
-
-msgid "the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results."
-msgstr ""
-
-msgid "File to read log from"
-msgstr ""
-
-msgid "Minutes after which log expires"
-msgstr ""
-
-msgid "Test average or maximum"
-msgstr ""
-
-msgid "Warning threshold pair <incoming>,<outgoing>"
-msgstr ""
-
-msgid "Critical threshold pair <incoming>,<outgoing>"
-msgstr ""
-
-msgid ""
-"- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from"
-msgstr ""
-
-msgid "- While MRTG can monitor things other than traffic rates, this"
-msgstr ""
-
-msgid "  plugin probably won't work with much else without modification."
-msgstr ""
-
-msgid "- The calculated i/o rates are a little off from what MRTG actually"
-msgstr ""
-
-msgid "  reports.  I'm not sure why this is right now, but will look into it"
-msgstr ""
-
-msgid "  for future enhancements of this plugin."
-msgstr ""
-
-#, c-format
-msgid "Usage"
-msgstr ""
-
-#, c-format
-msgid "status store_result error: %s\n"
-msgstr ""
-
-#, c-format
-msgid "slave query error: %s\n"
-msgstr ""
-
-#, c-format
-msgid "slave store_result error: %s\n"
-msgstr ""
-
-msgid "No slaves defined"
-msgstr ""
-
-#, c-format
-msgid "slave fetch row error: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Slave running: %s"
-msgstr ""
-
-msgid "This program tests connections to a MySQL server"
-msgstr ""
-
-msgid "Ignore authentication failure and check for mysql connectivity only"
-msgstr ""
-
-msgid "Use the specified socket (has no effect if -H is used)"
-msgstr ""
-
-msgid "Check database with indicated name"
-msgstr ""
-
-msgid "Read from the specified client options file"
-msgstr ""
-
-msgid "Use a client options group"
-msgstr ""
-
-msgid "Connect using the indicated username"
-msgstr ""
-
-msgid "Use the indicated password to authenticate the connection"
-msgstr ""
-
-msgid "IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"
-msgstr ""
-
-msgid "Your clear-text password could be visible as a process table entry"
-msgstr ""
-
-msgid "Check if the slave thread is running properly."
-msgstr ""
-
-msgid "Exit with WARNING status if slave server is more than INTEGER seconds"
-msgstr ""
-
-msgid "behind master"
-msgstr ""
-
-msgid "Exit with CRITICAL status if slave server is more then INTEGER seconds"
-msgstr ""
-
-msgid "Use ssl encryption"
-msgstr ""
-
-msgid "Path to CA signing the cert"
-msgstr ""
-
-msgid "Path to SSL certificate"
-msgstr ""
-
-msgid "Path to private SSL key"
-msgstr ""
-
-msgid "Path to CA directory"
-msgstr ""
-
-msgid "List of valid SSL ciphers"
-msgstr ""
-
-msgid ""
-"There are no required arguments. By default, the local database is checked"
-msgstr ""
-
-msgid ""
-"using the default unix socket. You can force TCP on localhost by using an"
-msgstr ""
-
-msgid "IP address or FQDN ('localhost' will use the socket as well)."
-msgstr ""
-
-msgid "You must specify -p with an empty string to force an empty password,"
-msgstr ""
-
-msgid "overriding any my.cnf settings."
-msgstr ""
-
-msgid "Cannot open status log for reading!"
-msgstr ""
-
-#, c-format
-msgid "Found process: %s %s\n"
-msgstr ""
-
-msgid "Could not locate a running Nagios process!"
-msgstr ""
-
-msgid "Cannot parse Nagios log file for valid time"
-msgstr ""
-
-#, c-format
-msgid "%d process"
-msgid_plural "%d processes"
-msgstr[0] ""
-msgstr[1] ""
-
-#, c-format
-msgid "status log updated %d second ago"
-msgid_plural "status log updated %d seconds ago"
-msgstr[0] ""
-msgstr[1] ""
-
-msgid "Expiration time must be an integer (seconds)\n"
-msgstr ""
-
-msgid "Timeout must be an integer (seconds)\n"
-msgstr ""
-
-msgid "You must provide the status_log\n"
-msgstr ""
-
-msgid "You must provide a process string\n"
-msgstr ""
-
-msgid ""
-"This plugin checks the status of the Nagios process on the local machine"
-msgstr ""
-
-msgid ""
-"The plugin will check to make sure the Nagios status log is no older than"
-msgstr ""
-
-msgid "the number of minutes specified by the expires option."
-msgstr ""
-
-msgid ""
-"It also checks the process table for a process matching the command argument."
-msgstr ""
-
-msgid "Name of the log file to check"
-msgstr ""
-
-msgid "Minutes aging after which logfile is considered stale"
-msgstr ""
-
-msgid "Substring to search for in process arguments"
-msgstr ""
-
-msgid "Timeout for the plugin in seconds"
-msgstr ""
-
-#, c-format
-msgid "Wrong client version - running: %s, required: %s"
-msgstr ""
-
-msgid "missing -l parameters"
-msgstr ""
-
-msgid "wrong -l parameter."
-msgstr ""
-
-msgid "CPU Load"
-msgstr ""
-
-#, c-format
-msgid " %lu%% (%lu min average)"
-msgstr ""
-
-#, c-format
-msgid " '%lu min avg Load'=%lu%%;%lu;%lu;0;100"
-msgstr ""
-
-msgid "not enough values for -l parameters"
-msgstr ""
-
-msgid "wrong -l argument"
-msgstr ""
-
-#, c-format
-msgid "System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"
-msgstr ""
-
-#, c-format
-msgid "%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"
-msgstr ""
-
-#, c-format
-msgid "'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"
-msgstr ""
-
-msgid "Free disk space : Invalid drive"
-msgstr ""
-
-msgid "No service/process specified"
-msgstr ""
-
-msgid "could not fetch information from server\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)"
-msgstr ""
-
-#, c-format
-msgid "'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f"
-msgstr ""
-
-msgid "No counter specified"
-msgstr ""
-
-msgid "Minimum value contains non-numbers"
-msgstr ""
-
-msgid "Maximum value contains non-numbers"
-msgstr ""
-
-msgid "No unit counter specified"
-msgstr ""
-
-msgid "Please specify a variable to check"
-msgstr ""
-
-msgid "Server port must be an integer\n"
-msgstr ""
-
-msgid "You must provide a server address or host name"
-msgstr ""
-
-msgid "None"
-msgstr ""
-
-msgid "This plugin collects data from the NSClient service running on a"
-msgstr ""
-
-msgid "Windows NT/2000/XP/2003 server."
-msgstr ""
-
-msgid "Name of the host to check"
-msgstr ""
-
-msgid "Optional port number (default: "
-msgstr ""
-
-msgid "Password needed for the request"
-msgstr ""
-
-msgid "Threshold which will result in a warning status"
-msgstr ""
-
-msgid "Threshold which will result in a critical status"
-msgstr ""
-
-msgid "Seconds before connection attempt times out (default: "
-msgstr ""
-
-msgid "Parameters passed to specified check (see below)"
-msgstr ""
-
-msgid "Display options (currently only SHOWALL works)"
-msgstr ""
-
-msgid "Return UNKNOWN on timeouts"
-msgstr ""
-
-msgid "Print this help screen"
-msgstr ""
-
-msgid "Print version information"
-msgstr ""
-
-msgid "Variable to check"
-msgstr ""
-
-msgid "Valid variables are:"
-msgstr ""
-
-msgid "Get the NSClient version"
-msgstr ""
-
-msgid "If -l <version> is specified, will return warning if versions differ."
-msgstr ""
-
-msgid "Average CPU load on last x minutes."
-msgstr ""
-
-msgid "Request a -l parameter with the following syntax:"
-msgstr ""
-
-msgid "-l <minutes range>,<warning threshold>,<critical threshold>."
-msgstr ""
-
-msgid "<minute range> should be less than 24*60."
-msgstr ""
-
-msgid ""
-"Thresholds are percentage and up to 10 requests can be done in one shot."
-msgstr ""
-
-msgid "Get the uptime of the machine."
-msgstr ""
-
-msgid "-l <unit> "
-msgstr ""
-
-msgid "<unit> = seconds, minutes, hours, or days. (default: minutes)"
-msgstr ""
-
-msgid "Thresholds will use the unit specified above."
-msgstr ""
-
-msgid "Size and percentage of disk use."
-msgstr ""
-
-msgid "Request a -l parameter containing the drive letter only."
-msgstr ""
-
-msgid "Warning and critical thresholds can be specified with -w and -c."
-msgstr ""
-
-msgid "Memory use."
-msgstr ""
-
-msgid "Check the state of one or several services."
-msgstr ""
-
-msgid "Request a -l parameters with the following syntax:"
-msgstr ""
-
-msgid "-l <service1>,<service2>,<service3>,..."
-msgstr ""
-
-msgid "You can specify -d SHOWALL in case you want to see working services"
-msgstr ""
-
-msgid "in the returned string."
-msgstr ""
-
-msgid "Check if one or several process are running."
-msgstr ""
-
-msgid "Same syntax as SERVICESTATE."
-msgstr ""
-
-msgid "Check any performance counter of Windows NT/2000."
-msgstr ""
-
-msgid "-l \"\\\\<performance object>\\\\counter\",\"<description>"
-msgstr ""
-
-msgid "The <description> parameter is optional and is given to a printf "
-msgstr ""
-
-msgid "output command which requires a float parameter."
-msgstr ""
-
-#, c-format
-msgid "If <description> does not include \"%%\", it is used as a label."
-msgstr ""
-
-msgid "Some examples:"
-msgstr ""
-
-msgid "Check any performance counter object of Windows NT/2000."
-msgstr ""
-
-msgid ""
-"Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"
-msgstr ""
-
-msgid "<counter object> is a Windows Perfmon Counter object (eg. Process),"
-msgstr ""
-
-msgid "if it is two words, it should be enclosed in quotes"
-msgstr ""
-
-msgid "The returned results will be a comma-separated list of instances on "
-msgstr ""
-
-msgid " the selected computer for that object."
-msgstr ""
-
-msgid ""
-"The purpose of this is to be run from command line to determine what "
-"instances"
-msgstr ""
-
-msgid ""
-" are available for monitoring without having to log onto the Windows server"
-msgstr ""
-
-msgid "  to run Perfmon directly."
-msgstr ""
-
-msgid ""
-"It can also be used in scripts that automatically create the monitoring "
-"service"
-msgstr ""
-
-msgid " configuration files."
-msgstr ""
-
-msgid "check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"
-msgstr ""
-
-msgid ""
-"- The NSClient service should be running on the server to get any information"
-msgstr ""
-
-msgid "- Critical thresholds should be lower than warning thresholds"
-msgstr ""
-
-msgid "- Default port 1248 is sometimes in use by other services. The error"
-msgstr ""
-
-msgid ""
-"output when this happens contains \"Cannot map xxxxx to protocol number\"."
-msgstr ""
-
-msgid "One fix for this is to change the port to something else on check_nt "
-msgstr ""
-
-msgid "and on the client service it's connecting to."
-msgstr ""
-
-#, c-format
-msgid "jitter response too large (%lu bytes)\n"
-msgstr ""
-
-msgid "NTP CRITICAL:"
-msgstr ""
-
-msgid "NTP WARNING:"
-msgstr ""
-
-msgid "NTP OK:"
-msgstr ""
-
-msgid "NTP UNKNOWN:"
-msgstr ""
-
-msgid "Offset unknown"
-msgstr ""
-
-msgid "Offset"
-msgstr ""
-
-msgid "This plugin checks the selected ntp server"
-msgstr ""
-
-msgid "Offset to result in warning status (seconds)"
-msgstr ""
-
-msgid "Offset to result in critical status (seconds)"
-msgstr ""
-
-msgid "Warning threshold for jitter"
-msgstr ""
-
-msgid "Critical threshold for jitter"
-msgstr ""
-
-msgid "Normal offset check:"
-msgstr ""
-
-msgid ""
-"Check jitter too, avoiding critical notifications if jitter isn't available"
-msgstr ""
-
-msgid "(See Notes above for more details on thresholds formats):"
-msgstr ""
-
-msgid "WARNING: check_ntp is deprecated. Please use check_ntp_peer or"
-msgstr ""
-
-msgid "check_ntp_time instead."
-msgstr ""
-
-msgid "Server not synchronized"
-msgstr ""
-
-msgid "Server has the LI_ALARM bit set"
-msgstr ""
-
-msgid ""
-"Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"
-msgstr ""
-
-msgid "Warning threshold for stratum of server's synchronization peer"
-msgstr ""
-
-msgid "Critical threshold for stratum of server's synchronization peer"
-msgstr ""
-
-msgid "Warning threshold for number of usable time sources (\"truechimers\")"
-msgstr ""
-
-msgid "Critical threshold for number of usable time sources (\"truechimers\")"
-msgstr ""
-
-msgid "This plugin checks an NTP server independent of any commandline"
-msgstr ""
-
-msgid "programs or external libraries."
-msgstr ""
-
-msgid "Use this plugin to check the health of an NTP server. It supports"
-msgstr ""
-
-msgid "checking the offset with the sync peer, the jitter and stratum. This"
-msgstr ""
-
-msgid "plugin will not check the clock offset between the local host and NTP"
-msgstr ""
-
-msgid "server; please use check_ntp_time for that purpose."
-msgstr ""
-
-msgid "Simple NTP server check:"
-msgstr ""
-
-msgid "Only check the number of usable time sources (\"truechimers\"):"
-msgstr ""
-
-msgid "Check only stratum:"
-msgstr ""
-
-msgid "This plugin checks the clock offset with the ntp server"
-msgstr ""
-
-msgid "Returns UNKNOWN instead of CRITICAL if offset cannot be found"
-msgstr ""
-
-msgid "Expected offset of the ntp server relative to local server (seconds)"
-msgstr ""
-
-msgid "This plugin checks the clock offset between the local host and a"
-msgstr ""
-
-msgid "remote NTP server. It is independent of any commandline programs or"
-msgstr ""
-
-msgid "external libraries."
-msgstr ""
-
-msgid "If you'd rather want to monitor an NTP server, please use"
-msgstr ""
-
-msgid "check_ntp_peer."
-msgstr ""
-
-msgid "--time-offset is useful for compensating for servers with known"
-msgstr ""
-
-msgid "and expected clock skew."
-msgstr ""
-
-#, c-format
-msgid "NetWare %s: "
-msgstr ""
-
-#, c-format
-msgid "Up %s,"
-msgstr ""
-
-#, c-format
-msgid "Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s: Long term cache hits = %lu%%"
-msgstr ""
-
-#, c-format
-msgid "%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s: LRU sitting time = %lu minutes"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Volume '%s' does not exist!"
-msgstr ""
-
-#, c-format
-msgid "%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;"
-msgstr ""
-
-msgid "Only "
-msgstr ""
-
-#, c-format
-msgid "%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid ""
-"%lu MB (%lu%%) free on volume %s - total %lu MB|FreeMB%s=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "Directory Services Database is %s (DS version %s)"
-msgstr ""
-
-#, c-format
-msgid "Logins are %s"
-msgstr ""
-
-msgid "enabled"
-msgstr ""
-
-msgid "disabled"
-msgstr ""
-
-msgid "CRITICAL - NRM Status is bad!"
-msgstr ""
-
-msgid "Warning - NRM Status is suspect!"
-msgstr ""
-
-msgid "OK - NRM Status is good!"
-msgstr ""
-
-#, c-format
-msgid "%lu of %lu (%lu%%) packet receive buffers used"
-msgstr ""
-
-#, c-format
-msgid "%lu entries in SAP table"
-msgstr ""
-
-#, c-format
-msgid "%lu entries in SAP table for SAP type %d"
-msgstr ""
-
-#, c-format
-msgid "%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "%s%lu KB not yet purgeable on volume %s"
-msgstr ""
-
-#, c-format
-msgid "%lu MB (%lu%%) not yet purgeable on volume %s"
-msgstr ""
-
-#, c-format
-msgid "%lu open files|Openfiles=%lu;%lu;%lu;0,0"
-msgstr ""
-
-#, c-format
-msgid "%lu abended threads|Abends=%lu;%lu;%lu;;"
-msgstr ""
-
-#, c-format
-msgid "%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu"
-msgstr ""
-
-msgid "CRITICAL - Time not in sync with network!"
-msgstr ""
-
-msgid "OK - Time in sync with network!"
-msgstr ""
-
-#, c-format
-msgid "LRU sitting time = %lu seconds"
-msgstr ""
-
-#, c-format
-msgid "Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100"
-msgstr ""
-
-#, c-format
-msgid "NDS Version %s"
-msgstr ""
-
-#, c-format
-msgid "Up %s"
-msgstr ""
-
-#, c-format
-msgid "Module %s version %s is loaded"
-msgstr ""
-
-#, c-format
-msgid "Module %s is not loaded"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Value '%s' does not exist!"
-msgstr ""
-
-#, c-format
-msgid "%s is  %lu|%s=%lu;%lu;%lu;;"
-msgstr ""
-
-msgid "Nothing to check!\n"
-msgstr ""
-
-msgid "Server port an integer\n"
-msgstr ""
-
-msgid "This plugin attempts to contact the MRTGEXT NLM running on a"
-msgstr ""
-
-msgid "Novell server to gather the requested system information."
-msgstr ""
-
-msgid "Variable to check.  Valid variables include:"
-msgstr ""
-
-msgid "LOAD1     = 1 minute average CPU load"
-msgstr ""
-
-msgid "LOAD5     = 5 minute average CPU load"
-msgstr ""
-
-msgid "LOAD15    = 15 minute average CPU load"
-msgstr ""
-
-msgid "CSPROCS   = number of current service processes (NW 5.x only)"
-msgstr ""
-
-msgid "ABENDS    = number of abended threads (NW 5.x only)"
-msgstr ""
-
-msgid "UPTIME    = server uptime"
-msgstr ""
-
-msgid "LTCH      = percent long term cache hits"
-msgstr ""
-
-msgid "CBUFF     = current number of cache buffers"
-msgstr ""
-
-msgid "CDBUFF    = current number of dirty cache buffers"
-msgstr ""
-
-msgid "DCB       = dirty cache buffers as a percentage of the total"
-msgstr ""
-
-msgid "TCB       = dirty cache buffers as a percentage of the original"
-msgstr ""
-
-msgid "OFILES    = number of open files"
-msgstr ""
-
-msgid "    VMF<vol>  = MB of free space on Volume <vol>"
-msgstr ""
-
-msgid "    VMU<vol>  = MB used space on Volume <vol>"
-msgstr ""
-
-msgid "    VMP<vol>  = MB of purgeable space on Volume <vol>"
-msgstr ""
-
-msgid "    VPF<vol>  = percent free space on volume <vol>"
-msgstr ""
-
-msgid "    VKF<vol>  = KB of free space on volume <vol>"
-msgstr ""
-
-msgid "    VPP<vol>  = percent purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    VKP<vol>  = KB of purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    VPNP<vol> = percent not yet purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    VKNP<vol> = KB of not yet purgeable space on volume <vol>"
-msgstr ""
-
-msgid "    LRUM      = LRU sitting time in minutes"
-msgstr ""
-
-msgid "    LRUS      = LRU sitting time in seconds"
-msgstr ""
-
-msgid "    DSDB      = check to see if DS Database is open"
-msgstr ""
-
-msgid "    DSVER     = NDS version"
-msgstr ""
-
-msgid "    UPRB      = used packet receive buffers"
-msgstr ""
-
-msgid "    PUPRB     = percent (of max) used packet receive buffers"
-msgstr ""
-
-msgid "    SAPENTRIES = number of entries in the SAP table"
-msgstr ""
-
-msgid "    SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>"
-msgstr ""
-
-msgid "    TSYNC     = timesync status"
-msgstr ""
-
-msgid "    LOGINS    = check to see if logins are enabled"
-msgstr ""
-
-msgid "    CONNS     = number of currently licensed connections"
-msgstr ""
-
-msgid "    NRMH\t= NRM Summary Status"
-msgstr ""
-
-msgid "    NRMP<stat> = Returns the current value for a NRM health item"
-msgstr ""
-
-msgid "    NRMM<stat> = Returns the current memory stats from NRM"
-msgstr ""
-
-msgid "    NRMS<stat> = Returns the current Swapfile stats from NRM"
-msgstr ""
-
-msgid "    NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml"
-msgstr ""
-
-msgid "    NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml"
-msgstr ""
-
-msgid "    NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml"
-msgstr ""
-
-msgid "    NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml"
-msgstr ""
-
-msgid "    NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml"
-msgstr ""
-
-msgid ""
-"    NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml"
-msgstr ""
-
-msgid "    NLM:<nlm> = check if NLM is loaded and report version"
-msgstr ""
-
-msgid "                (e.g. NLM:TSANDS.NLM)"
-msgstr ""
-
-msgid "Include server version string in results"
-msgstr ""
-
-msgid "- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"
-msgstr ""
-
-msgid ""
-"  extension for NetWare be loaded on the Novell servers you wish to check."
-msgstr ""
-
-msgid "  (available from http://www.engr.wisc.edu/~drews/mrtg/)"
-msgstr ""
-
-msgid ""
-"- Values for critical thresholds should be lower than warning thresholds"
-msgstr ""
-
-msgid ""
-"  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "
-msgstr ""
-
-msgid "  TCB, LRUS and LRUM."
-msgstr ""
-
-msgid "Unknown error fetching load data\n"
-msgstr ""
-
-msgid "Invalid response from server - no load information\n"
-msgstr ""
-
-msgid "Invalid response from server after load 1\n"
-msgstr ""
-
-msgid "Invalid response from server after load 5\n"
-msgstr ""
-
-#, c-format
-msgid "Load %s - %s-min load average = %0.2f"
-msgstr ""
-
-msgid "Unknown error fetching disk data\n"
-msgstr ""
-
-msgid "Invalid response from server\n"
-msgstr ""
-
-msgid "Unknown error fetching network status\n"
-msgstr ""
-
-#, c-format
-msgid "Net %s - %d connection%s on port %d"
-msgstr ""
-
-msgid "Unknown error fetching process status\n"
-msgstr ""
-
-#, c-format
-msgid "Process %s - %d instance%s of %s running"
-msgstr ""
-
-#, c-format
-msgid "Uptime %s - Up %d days %d hours %d minutes"
-msgstr ""
-
-msgid ""
-"This plugin attempts to contact the Over-CR collector daemon running on the"
-msgstr ""
-
-msgid "remote UNIX server in order to gather the requested system information."
-msgstr ""
-
-msgid "LOAD1         = 1 minute average CPU load"
-msgstr ""
-
-msgid "LOAD5         = 5 minute average CPU load"
-msgstr ""
-
-msgid "LOAD15        = 15 minute average CPU load"
-msgstr ""
-
-msgid "DPU<filesys>  = percent used disk space on filesystem <filesys>"
-msgstr ""
-
-msgid "PROC<process> = number of running processes with name <process>"
-msgstr ""
-
-msgid "NET<port>     = number of active connections on TCP port <port>"
-msgstr ""
-
-msgid "UPTIME        = system uptime in seconds"
-msgstr ""
-
-msgid "This plugin requires that Eric Molitors' Over-CR collector daemon be"
-msgstr ""
-
-msgid "running on the remote server."
-msgstr ""
-
-msgid "Over-CR can be downloaded from http://www.molitor.org/overcr"
-msgstr ""
-
-msgid "This plugin was tested with version 0.99.53 of the Over-CR collector"
-msgstr ""
-
-msgid ""
-"For the available options, the critical threshold value should always be"
-msgstr ""
-
-msgid ""
-"higher than the warning threshold value, EXCEPT with the uptime variable"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - no connection to '%s' (%s).\n"
-msgstr ""
-
-#, c-format
-msgid " %s - database %s (%f sec.)|%s\n"
-msgstr ""
-
-msgid "Critical threshold must be a positive integer"
-msgstr ""
-
-msgid "Warning threshold must be a positive integer"
-msgstr ""
-
-msgid "Database name exceeds the maximum length"
-msgstr ""
-
-msgid "User name is not valid"
-msgstr ""
-
-#, c-format
-msgid "Test whether a PostgreSQL Database is accepting connections."
-msgstr ""
-
-msgid "Database to check "
-msgstr ""
-
-#, c-format
-msgid "(default: %s)\n"
-msgstr ""
-
-msgid "Login name of user"
-msgstr ""
-
-msgid "Password (BIG SECURITY ISSUE)"
-msgstr ""
-
-msgid "Connection parameters (keyword = value), see below"
-msgstr ""
-
-msgid "SQL query to run. Only first column in first row will be read"
-msgstr ""
-
-msgid "A name for the query, this string is used instead of the query"
-msgstr ""
-
-msgid "in the long output of the plugin"
-msgstr ""
-
-msgid "SQL query value to result in warning status (double)"
-msgstr ""
-
-msgid "SQL query value to result in critical status (double)"
-msgstr ""
-
-msgid "All parameters are optional."
-msgstr ""
-
-msgid ""
-"This plugin tests a PostgreSQL DBMS to determine whether it is active and"
-msgstr ""
-
-msgid "accepting queries. In its current operation, it simply connects to the"
-msgstr ""
-
-msgid ""
-"specified database, and then disconnects. If no database is specified, it"
-msgstr ""
-
-msgid ""
-"connects to the template1 database, which is present in every functioning"
-msgstr ""
-
-msgid "PostgreSQL DBMS."
-msgstr ""
-
-msgid "If a query is specified using the -q option, it will be executed after"
-msgstr ""
-
-msgid "connecting to the server. The result from the query has to be numeric."
-msgstr ""
-
-msgid ""
-"Multiple SQL commands, separated by semicolon, are allowed but the result "
-msgstr ""
-
-msgid "of the last command is taken into account only. The value of the first"
-msgstr ""
-
-msgid ""
-"column in the first row is used as the check result. If a second column is"
-msgstr ""
-
-msgid "present in the result set, this is added to the plugin output with a"
-msgstr ""
-
-msgid ""
-"prefix of \"Extra Info:\". This information can be displayed in the system"
-msgstr ""
-
-msgid "executing the plugin."
-msgstr ""
-
-msgid ""
-"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"
-msgstr ""
-
-msgid ""
-"for details about how to access internal statistics of the database server."
-msgstr ""
-
-msgid ""
-"For a list of available connection parameters which may be used with the -o"
-msgstr ""
-
-msgid ""
-"command line option, see the documentation for PQconnectdb() in the chapter"
-msgstr ""
-
-msgid ""
-"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"
-msgstr ""
-
-msgid ""
-"used to specify a service name in pg_service.conf to be used for additional"
-msgstr ""
-
-msgid "connection parameters: -o 'service=<name>' or to specify the SSL mode:"
-msgstr ""
-
-msgid "-o 'sslmode=require'."
-msgstr ""
-
-msgid ""
-"The plugin will connect to a local postmaster if no host is specified. To"
-msgstr ""
-
-msgid ""
-"connect to a remote host, be sure that the remote postmaster accepts TCP/IP"
-msgstr ""
-
-msgid "connections (start the postmaster with the -i option)."
-msgstr ""
-
-msgid ""
-"Typically, the monitoring user (unless the --logname option is used) should "
-"be"
-msgstr ""
-
-msgid ""
-"able to connect to the database without a password. The plugin can also send"
-msgstr ""
-
-msgid "a password, but no effort is made to obscure or encrypt the password."
-msgstr ""
-
-#, c-format
-msgid "QUERY %s - %s: %s.\n"
-msgstr ""
-
-msgid "Error with query"
-msgstr ""
-
-msgid "No rows returned"
-msgstr ""
-
-msgid "No columns returned"
-msgstr ""
-
-msgid "No data returned"
-msgstr ""
-
-msgid "Is not a numeric"
-msgstr ""
-
-#, c-format
-msgid "%s returned %f"
-msgstr ""
-
-#, c-format
-msgid "'%s' returned %f"
-msgstr ""
-
-msgid "CRITICAL - Could not interpret output from ping command\n"
-msgstr ""
-
-#, c-format
-msgid "PING %s - %sPacket loss = %d%%"
-msgstr ""
-
-#, c-format
-msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"
-msgstr ""
-
-msgid "Could not realloc() addresses\n"
-msgstr ""
-
-#, c-format
-msgid "<max_packets> (%s) must be a non-negative number\n"
-msgstr ""
-
-#, c-format
-msgid "<wpl> (%s) must be an integer percentage\n"
-msgstr ""
-
-#, c-format
-msgid "<cpl> (%s) must be an integer percentage\n"
-msgstr ""
-
-#, c-format
-msgid "<wrta> (%s) must be a non-negative number\n"
-msgstr ""
-
-#, c-format
-msgid "<crta> (%s) must be a non-negative number\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s: Warning threshold must be integer or percentage!\n"
-"\n"
-msgstr ""
-
-#, c-format
-msgid "<wrta> was not set\n"
-msgstr ""
-
-#, c-format
-msgid "<crta> was not set\n"
-msgstr ""
-
-#, c-format
-msgid "<wpl> was not set\n"
-msgstr ""
-
-#, c-format
-msgid "<cpl> was not set\n"
-msgstr ""
-
-#, c-format
-msgid "<wrta> (%f) cannot be larger than <crta> (%f)\n"
-msgstr ""
-
-#, c-format
-msgid "<wpl> (%d) cannot be larger than <cpl> (%d)\n"
-msgstr ""
-
-#, c-format
-msgid "Cannot open stderr for %s\n"
-msgstr ""
-
-msgid "System call sent warnings to stderr "
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Network Unreachable (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Host Unreachable (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Network Prohibited (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Host Prohibited (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Packet Filtered (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Host not found (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Time to live exceeded (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Destination Unreachable (%s)\n"
-msgstr ""
-
-msgid "Unable to realloc warn_text\n"
-msgstr ""
-
-#, c-format
-msgid "Use ping to check connection statistics for a remote host."
-msgstr ""
-
-msgid "host to ping"
-msgstr ""
-
-msgid "number of ICMP ECHO packets to send"
-msgstr ""
-
-#, c-format
-msgid "(Default: %d)\n"
-msgstr ""
-
-msgid "show HTML in the plugin output (obsoleted by urlize)"
-msgstr ""
-
-msgid "THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"
-msgstr ""
-
-msgid "time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"
-msgstr ""
-
-msgid "percentage of packet loss to trigger an alarm state."
-msgstr ""
-
-msgid ""
-"This plugin uses the ping command to probe the specified host for packet loss"
-msgstr ""
-
-msgid ""
-"(percentage) and round trip average (milliseconds). It can produce HTML "
-"output"
-msgstr ""
-
-msgid ""
-"linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"
-msgstr ""
-
-msgid "the contrib area of the downloads section at http://www.nagios.org/"
-msgstr ""
-
-#, c-format
-msgid "CMD: %s\n"
-msgstr ""
-
-msgid "System call sent warnings to stderr"
-msgstr ""
-
-#, c-format
-msgid "Not parseable: %s"
-msgstr ""
-
-#, c-format
-msgid "Unable to read output\n"
-msgstr ""
-
-#, c-format
-msgid "%d warn out of "
-msgstr ""
-
-#, c-format
-msgid "%d crit, %d warn out of "
-msgstr ""
-
-#, c-format
-msgid " with %s"
-msgstr ""
-
-msgid "Parent Process ID must be an integer!"
-msgstr ""
-
-#, c-format
-msgid "%s%sSTATE = %s"
-msgstr ""
-
-msgid "UID was not found"
-msgstr ""
-
-msgid "User name was not found"
-msgstr ""
-
-#, c-format
-msgid "%s%scommand name '%s'"
-msgstr ""
-
-#, c-format
-msgid "%s%sexclude progs '%s'"
-msgstr ""
-
-msgid "RSS must be an integer!"
-msgstr ""
-
-msgid "VSZ must be an integer!"
-msgstr ""
-
-msgid "PCPU must be a float!"
-msgstr ""
-
-msgid "Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"
-msgstr ""
-
-msgid ""
-"Checks all processes and generates WARNING or CRITICAL states if the "
-"specified"
-msgstr ""
-
-msgid ""
-"metric is outside the required threshold ranges. The metric defaults to "
-"number"
-msgstr ""
-
-msgid ""
-"of processes.  Search filters can be applied to limit the processes to check."
-msgstr ""
-
-msgid "Generate warning state if metric is outside this range"
-msgstr ""
-
-msgid "Generate critical state if metric is outside this range"
-msgstr ""
-
-msgid "Check thresholds against metric. Valid types:"
-msgstr ""
-
-msgid "PROCS   - number of processes (default)"
-msgstr ""
-
-msgid "VSZ     - virtual memory size"
-msgstr ""
-
-msgid "RSS     - resident set memory size"
-msgstr ""
-
-msgid "CPU     - percentage CPU"
-msgstr ""
-
-msgid "ELAPSED - time elapsed in seconds"
-msgstr ""
-
-msgid "Extra information. Up to 3 verbosity levels"
-msgstr ""
-
-msgid "Filter own process the traditional way by PID instead of /proc/pid/exe"
-msgstr ""
-
-msgid "Only scan for processes that have, in the output of `ps`, one or"
-msgstr ""
-
-msgid "more of the status flags you specify (for example R, Z, S, RS,"
-msgstr ""
-
-msgid "RSZDT, plus others based on the output of your 'ps' command)."
-msgstr ""
-
-msgid "Only scan for children of the parent process ID indicated."
-msgstr ""
-
-msgid "Only scan for processes with VSZ higher than indicated."
-msgstr ""
-
-msgid "Only scan for processes with RSS higher than indicated."
-msgstr ""
-
-msgid "Only scan for processes with PCPU higher than indicated."
-msgstr ""
-
-msgid "Only scan for processes with user name or ID indicated."
-msgstr ""
-
-msgid "Only scan for processes with args that contain STRING."
-msgstr ""
-
-msgid "Only scan for processes with args that contain the regex STRING."
-msgstr ""
-
-msgid "Only scan for exact matches of COMMAND (without path)."
-msgstr ""
-
-msgid "Exclude processes which match this comma separated list"
-msgstr ""
-
-msgid "Only scan for non kernel threads (works on Linux only)."
-msgstr ""
-
-#, c-format
-msgid ""
-"\n"
-"RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n"
-"specified 'max:min', a warning status will be generated if the\n"
-"count is inside the specified range\n"
-"\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"This plugin checks the number of currently running processes and\n"
-"generates WARNING or CRITICAL states if the process count is outside\n"
-"the specified threshold ranges. The process count can be filtered by\n"
-"process owner, parent process PID, current state (e.g., 'Z'), or may\n"
-"be the total number of running processes\n"
-"\n"
-msgstr ""
-
-msgid "Warning if not two processes with command name portsentry."
-msgstr ""
-
-msgid "Critical if < 2 or > 1024 processes"
-msgstr ""
-
-msgid "Critical if not at least 1 process with command sshd"
-msgstr ""
-
-msgid "Warning if > 1024 processes with command name sshd."
-msgstr ""
-
-msgid "Critical if < 1 processes with command name sshd."
-msgstr ""
-
-msgid "Warning alert if > 10 processes with command arguments containing"
-msgstr ""
-
-msgid "'/usr/local/bin/perl' and owned by root"
-msgstr ""
-
-msgid "Alert if VSZ of any processes over 50K or 100K"
-msgstr ""
-
-msgid "Alert if CPU of any processes over 10% or 20%"
-msgstr ""
-
-msgid "Config file error\n"
-msgstr ""
-
-msgid "Out of Memory?\n"
-msgstr ""
-
-msgid "Invalid NAS-Identifier\n"
-msgstr ""
-
-#, c-format
-msgid "gethostname() failed!\n"
-msgstr ""
-
-msgid "Invalid NAS-IP-Address\n"
-msgstr ""
-
-msgid "Timeout\n"
-msgstr ""
-
-msgid "Auth Error\n"
-msgstr ""
-
-msgid "Auth Failed\n"
-msgstr ""
-
-msgid "Bad Response\n"
-msgstr ""
-
-msgid "Auth OK\n"
-msgstr ""
-
-#, c-format
-msgid "Unexpected result code %d"
-msgstr ""
-
-msgid "Number of retries must be a positive integer"
-msgstr ""
-
-msgid "User not specified"
-msgstr ""
-
-msgid "Password not specified"
-msgstr ""
-
-msgid "Configuration file not specified"
-msgstr ""
-
-msgid "Tests to see if a RADIUS server is accepting connections."
-msgstr ""
-
-msgid "The user to authenticate"
-msgstr ""
-
-msgid "Password for authentication (SECURITY RISK)"
-msgstr ""
-
-msgid "NAS identifier"
-msgstr ""
-
-msgid "NAS IP Address"
-msgstr ""
-
-msgid "Configuration file"
-msgstr ""
-
-msgid "Response string to expect from the server"
-msgstr ""
-
-msgid "Number of times to retry a failed connection"
-msgstr ""
-
-msgid ""
-"This plugin tests a RADIUS server to see if it is accepting connections."
-msgstr ""
-
-msgid ""
-"The server to test must be specified in the invocation, as well as a user"
-msgstr ""
-
-msgid "name and password. A configuration file must be present. The format of"
-msgstr ""
-
-msgid ""
-"the configuration file is described in the radiusclient library sources."
-msgstr ""
-
-msgid "The password option presents a substantial security issue because the"
-msgstr ""
-
-msgid ""
-"password can possibly be determined by careful watching of the command line"
-msgstr ""
-
-msgid "in a process listing. This risk is exacerbated because the plugin will"
-msgstr ""
-
-msgid ""
-"typically be executed at regular predictable intervals. Please be sure that"
-msgstr ""
-
-msgid "the password used does not allow access to sensitive system resources."
-msgstr ""
-
-#, c-format
-msgid "Unable to connect to %s on port %d\n"
-msgstr ""
-
-#, c-format
-msgid "No data received from %s\n"
-msgstr ""
-
-msgid "Invalid REAL response received from host"
-msgstr ""
-
-#, c-format
-msgid "Invalid REAL response received from host on port %d\n"
-msgstr ""
-
-#, c-format
-msgid "No data received from host\n"
-msgstr ""
-
-#, c-format
-msgid "REAL %s - %d second response time\n"
-msgstr ""
-
-msgid "Warning time must be a positive integer"
-msgstr ""
-
-msgid "Critical time must be a positive integer"
-msgstr ""
-
-msgid "You must provide a server to check"
-msgstr ""
-
-msgid "This plugin tests the REAL service on the specified host."
-msgstr ""
-
-msgid "Connect to this url"
-msgstr ""
-
-#, c-format
-msgid "String to expect in first line of server response (default: %s)\n"
-msgstr ""
-
-msgid "This plugin will attempt to open an RTSP connection with the host."
-msgstr ""
-
-msgid "Successful connects return STATE_OK, refusals and timeouts return"
-msgstr ""
-
-msgid ""
-"STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful connects,"
-msgstr ""
-
-msgid ""
-"but incorrect response messages from the host result in STATE_WARNING return"
-msgstr ""
-
-msgid "values."
-msgstr ""
-
-#, c-format
-msgid "malloc() failed!\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Cannot create SSL context.\n"
-msgstr ""
-
-#, c-format
-msgid "recv() failed\n"
-msgstr ""
-
-#, c-format
-msgid "WARNING - TLS not supported by server\n"
-msgstr ""
-
-#, c-format
-msgid "Server does not support STARTTLS\n"
-msgstr ""
-
-msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS."
-msgstr ""
-
-#, c-format
-msgid "sent %s"
-msgstr ""
-
-msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS."
-msgstr ""
-
-#, c-format
-msgid "Invalid SMTP response received from host: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Invalid SMTP response received from host on port %d: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Could Not Compile Regular Expression"
-msgstr ""
-
-#, c-format
-msgid "SMTP %s - Invalid response '%s' to command '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "Execute Error: %s\n"
-msgstr ""
-
-msgid "no authuser specified, "
-msgstr ""
-
-msgid "no authpass specified, "
-msgstr ""
-
-#, c-format
-msgid "sent %s\n"
-msgstr ""
-
-msgid "recv() failed after AUTH LOGIN, "
-msgstr ""
-
-#, c-format
-msgid "received %s\n"
-msgstr ""
-
-msgid "invalid response received after AUTH LOGIN, "
-msgstr ""
-
-msgid "recv() failed after sending authuser, "
-msgstr ""
-
-msgid "invalid response received after authuser, "
-msgstr ""
-
-msgid "recv() failed after sending authpass, "
-msgstr ""
-
-msgid "invalid response received after authpass, "
-msgstr ""
-
-msgid "only authtype LOGIN is supported, "
-msgstr ""
-
-#, c-format
-msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n"
-msgstr ""
-
-#, c-format
-msgid "Could not realloc() units [%d]\n"
-msgstr ""
-
-msgid "Critical time must be a positive"
-msgstr ""
-
-msgid "Warning time must be a positive"
-msgstr ""
-
-msgid "SSL support not available - install OpenSSL and recompile"
-msgstr ""
-
-msgid "Set either -s/--ssl/--tls or -S/--starttls"
-msgstr ""
-
-#, c-format
-msgid "Connection closed by server before sending QUIT command\n"
-msgstr ""
-
-#, c-format
-msgid "recv() failed after QUIT."
-msgstr ""
-
-#, c-format
-msgid "Connection reset by peer."
-msgstr ""
-
-msgid "This plugin will attempt to open an SMTP connection with the host."
-msgstr ""
-
-#, c-format
-msgid "    String to expect in first line of server response (default: '%s')\n"
-msgstr ""
-
-msgid "SMTP command (may be used repeatedly)"
-msgstr ""
-
-msgid "Expected response to command (may be used repeatedly)"
-msgstr ""
-
-msgid "FROM-address to include in MAIL command, required by Exchange 2000"
-msgstr ""
-
-msgid "FQDN used for HELO"
-msgstr ""
-
-msgid "Use PROXY protocol prefix for the connection."
-msgstr ""
-
-msgid "Minimum number of days a certificate has to be valid."
-msgstr ""
-
-msgid "Use SSL/TLS for the connection."
-msgstr ""
-
-#, c-format
-msgid "    Sets default port to %d.\n"
-msgstr ""
-
-msgid "Use STARTTLS for the connection."
-msgstr ""
-
-msgid "SMTP AUTH type to check (default none, only LOGIN supported)"
-msgstr ""
-
-msgid "SMTP AUTH username"
-msgstr ""
-
-msgid "SMTP AUTH password"
-msgstr ""
-
-msgid "Send LHLO instead of HELO/EHLO"
-msgstr ""
-
-msgid "Ignore failure when sending QUIT command to server"
-msgstr ""
-
-msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful"
-msgstr ""
-
-msgid "connects, but incorrect response messages from the host result in"
-msgstr ""
-
-msgid "STATE_WARNING return values."
-msgstr ""
-
-msgid "Cannot malloc"
-msgstr ""
-
-#, c-format
-msgid "External command error: %s\n"
-msgstr ""
-
-#, c-format
-msgid "External command error with no output (return code: %d)\n"
-msgstr ""
-
-#, c-format
-msgid "No valid data returned (%s)\n"
-msgstr ""
-
-msgid "Time duration between plugin calls is invalid"
-msgstr ""
-
-msgid "Cannot asprintf()"
-msgstr ""
-
-msgid "Cannot realloc()"
-msgstr ""
-
-msgid "No previous data to calculate rate - assume okay"
-msgstr ""
-
-msgid "Retries interval must be a positive integer"
-msgstr ""
-
-msgid "Exit status must be a positive integer"
-msgstr ""
-
-#, c-format
-msgid "Could not reallocate labels[%d]"
-msgstr ""
-
-msgid "Could not reallocate labels\n"
-msgstr ""
-
-#, c-format
-msgid "Could not reallocate units [%d]\n"
-msgstr ""
-
-msgid "Could not realloc() units\n"
-msgstr ""
-
-msgid "Rate multiplier must be a positive integer"
-msgstr ""
-
-msgid "No host specified\n"
-msgstr ""
-
-msgid "No OIDs specified\n"
-msgstr ""
-
-#, c-format
-msgid "Required parameter: %s\n"
-msgstr ""
-
-msgid "Invalid seclevel"
-msgstr ""
-
-msgid "Invalid SNMP version"
-msgstr ""
-
-msgid "Unbalanced quotes\n"
-msgstr ""
-
-#, c-format
-msgid "multiplier set (%.1f), but input is not a number: %s"
-msgstr ""
-
-msgid "Check status of remote machines and obtain system information via SNMP"
-msgstr ""
-
-msgid "Use SNMP GETNEXT instead of SNMP GET"
-msgstr ""
-
-msgid "SNMP protocol version"
-msgstr ""
-
-msgid "SNMPv3 context"
-msgstr ""
-
-msgid "SNMPv3 securityLevel"
-msgstr ""
-
-msgid "SNMPv3 auth proto"
-msgstr ""
-
-msgid "SNMPv3 priv proto (default DES)"
-msgstr ""
-
-msgid "Optional community string for SNMP communication"
-msgstr ""
-
-msgid "default is"
-msgstr ""
-
-msgid "SNMPv3 username"
-msgstr ""
-
-msgid "SNMPv3 authentication password"
-msgstr ""
-
-msgid "SNMPv3 privacy password"
-msgstr ""
-
-msgid "Object identifier(s) or SNMP variables whose value you wish to query"
-msgstr ""
-
-msgid ""
-"List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"
-msgstr ""
-
-msgid "for symbolic OIDs.)"
-msgstr ""
-
-msgid "Delimiter to use when parsing returned data. Default is"
-msgstr ""
-
-msgid "Any data on the right hand side of the delimiter is considered"
-msgstr ""
-
-msgid "to be the data that should be used in the evaluation."
-msgstr ""
-
-msgid "If the check returns a 0 length string or NULL value"
-msgstr ""
-
-msgid "This option allows you to choose what status you want it to exit"
-msgstr ""
-
-msgid "Excluding this option renders the default exit of 3(STATE_UNKNOWN)"
-msgstr ""
-
-msgid "0 = OK"
-msgstr ""
-
-msgid "1 = WARNING"
-msgstr ""
-
-msgid "2 = CRITICAL"
-msgstr ""
-
-msgid "3 = UNKNOWN"
-msgstr ""
-
-msgid "Warning threshold range(s)"
-msgstr ""
-
-msgid "Critical threshold range(s)"
-msgstr ""
-
-msgid "Enable rate calculation. See 'Rate Calculation' below"
-msgstr ""
-
-msgid ""
-"Converts rate per second. For example, set to 60 to convert to per minute"
-msgstr ""
-
-msgid "Add/subtract the specified OFFSET to numeric sensor data"
-msgstr ""
-
-msgid "Return OK state (for that OID) if STRING is an exact match"
-msgstr ""
-
-msgid ""
-"Return OK state (for that OID) if extended regular expression REGEX matches"
-msgstr ""
-
-msgid ""
-"Return OK state (for that OID) if case-insensitive extended REGEX matches"
-msgstr ""
-
-msgid "Invert search result (CRITICAL if found)"
-msgstr ""
-
-msgid "Prefix label for output from plugin"
-msgstr ""
-
-msgid "Units label(s) for output data (e.g., 'sec.')."
-msgstr ""
-
-msgid "Separates output on multiple OID requests"
-msgstr ""
-
-msgid "Multiplies current value, 0 < n < 1 works as divider, defaults to 1"
-msgstr ""
-
-msgid "C-style format string for float values (see option -M)"
-msgstr ""
-
-msgid ""
-"NOTE the final timeout value is calculated using this formula: "
-"timeout_interval * retries + 5"
-msgstr ""
-
-msgid "Number of retries to be used in the requests, default: "
-msgstr ""
-
-msgid "Label performance data with OIDs instead of --label's"
-msgstr ""
-
-msgid "Tell snmpget to not print errors encountered when parsing MIB files"
-msgstr ""
-
-msgid ""
-"This plugin uses the 'snmpget' command included with the NET-SNMP package."
-msgstr ""
-
-msgid ""
-"if you don't have the package installed, you will need to download it from"
-msgstr ""
-
-msgid "http://net-snmp.sourceforge.net before you can use this plugin."
-msgstr ""
-
-msgid ""
-"- Multiple OIDs (and labels) may be indicated by a comma or space-delimited  "
-msgstr ""
-
-msgid "list (lists with internal spaces must be quoted)."
-msgstr ""
-
-msgid ""
-"- When checking multiple OIDs, separate ranges by commas like '-w "
-"1:10,1:,:20'"
-msgstr ""
-
-msgid "- Note that only one string and one regex may be checked at present"
-msgstr ""
-
-msgid ""
-"- All evaluation methods other than PR, STR, and SUBSTR expect that the value"
-msgstr ""
-
-msgid "returned from the SNMP query is an unsigned integer."
-msgstr ""
-
-msgid "Rate Calculation:"
-msgstr ""
-
-msgid "In many places, SNMP returns counters that are only meaningful when"
-msgstr ""
-
-msgid "calculating the counter difference since the last check. check_snmp"
-msgstr ""
-
-msgid "saves the last state information in a file so that the rate per second"
-msgstr ""
-
-msgid "can be calculated. Use the --rate option to save state information."
-msgstr ""
-
-msgid ""
-"On the first run, there will be no prior state - this will return with OK."
-msgstr ""
-
-msgid "The state is uniquely determined by the arguments to the plugin, so"
-msgstr ""
-
-msgid "changing the arguments will create a new state file."
-msgstr ""
-
-msgid "Port number must be a positive integer"
-msgstr ""
-
-#, c-format
-msgid "Server answer: %s"
-msgstr ""
-
-#, c-format
-msgid "SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "SSH OK - %s (protocol %s) | %s\n"
-msgstr ""
-
-msgid "Try to connect to an SSH server at specified server and port"
-msgstr ""
-
-msgid ""
-"Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)"
-msgstr ""
-
-msgid "Alert if protocol doesn't match expected protocol version (ex: 2.0)"
-msgstr ""
-
-#, c-format
-msgid "Command: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Format: %s\n"
-msgstr ""
-
-#, c-format
-msgid "total=%.0f, used=%.0f, free=%.0f\n"
-msgstr ""
-
-#, c-format
-msgid "total=%.0f, free=%.0f\n"
-msgstr ""
-
-msgid "Error getting swap devices\n"
-msgstr ""
-
-msgid "SWAP OK: No swap devices defined\n"
-msgstr ""
-
-msgid "swapctl failed: "
-msgstr ""
-
-msgid "Error in swapctl call\n"
-msgstr ""
-
-#, c-format
-msgid "SWAP %s - %d%% free (%dMB out of %dMB) %s|"
-msgstr ""
-
-msgid "Warning threshold percentage must be <= 100!"
-msgstr ""
-
-msgid "Warning threshold be positive integer or percentage!"
-msgstr ""
-
-msgid "Critical threshold percentage must be <= 100!"
-msgstr ""
-
-msgid "Critical threshold be positive integer or percentage!"
-msgstr ""
-
-msgid ""
-"no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
-"or integer (0-3)."
-msgstr ""
-
-msgid "Warning should be more than critical"
-msgstr ""
-
-msgid "Check swap space on local machine."
-msgstr ""
-
-msgid ""
-"Exit with WARNING status if less than INTEGER bytes of swap space are free"
-msgstr ""
-
-msgid "Exit with WARNING status if less than PERCENT of swap space is free"
-msgstr ""
-
-msgid ""
-"Exit with CRITICAL status if less than INTEGER bytes of swap space are free"
-msgstr ""
-
-msgid "Exit with CRITICAL status if less than PERCENT of swap space is free"
-msgstr ""
-
-msgid "Conduct comparisons for all swap partitions, one by one"
-msgstr ""
-
-msgid ""
-"Resulting state when there is no swap regardless of thresholds. Default:"
-msgstr ""
-
-msgid ""
-"Both INTEGER and PERCENT thresholds can be specified, they are all checked."
-msgstr ""
-
-msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."
-msgstr ""
-
-msgid "CRITICAL - Generic check_tcp called with unknown service\n"
-msgstr ""
-
-msgid "With UDP checks, a send/expect string must be specified."
-msgstr ""
-
-msgid "No arguments found"
-msgstr ""
-
-msgid "Maxbytes must be a positive integer"
-msgstr ""
-
-msgid "Refuse must be one of ok, warn, crit"
-msgstr ""
-
-msgid "Mismatch must be one of ok, warn, crit"
-msgstr ""
-
-msgid "Delay must be a positive integer"
-msgstr ""
-
-msgid "You must provide a server address"
-msgstr ""
-
-msgid "Invalid hostname, address or socket"
-msgstr ""
-
-#, c-format
-msgid ""
-"This plugin tests %s connections with the specified host (or unix socket).\n"
-"\n"
-msgstr ""
-
-msgid ""
-"Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send "
-"or quit option"
-msgstr ""
-
-msgid "Default: nothing added to send, \\r\\n added to end of quit"
-msgstr ""
-
-msgid "String to send to the server"
-msgstr ""
-
-msgid "String to expect in server response"
-msgstr ""
-
-msgid "(may be repeated)"
-msgstr ""
-
-msgid "All expect strings need to occur in server response. Default is any"
-msgstr ""
-
-msgid "String to send server to initiate a clean close of the connection"
-msgstr ""
-
-msgid "Accept TCP refusals with states ok, warn, crit (default: crit)"
-msgstr ""
-
-msgid ""
-"Accept expected string mismatches with states ok, warn, crit (default: warn)"
-msgstr ""
-
-msgid "Hide output from TCP socket"
-msgstr ""
-
-msgid "Close connection once more than this number of bytes are received"
-msgstr ""
-
-msgid "Seconds to wait between sending string and polling for response"
-msgstr ""
-
-msgid "1st is #days for warning, 2nd is critical (if not specified - 0)."
-msgstr ""
-
-msgid "Use SSL for the connection."
-msgstr ""
-
-msgid "SSL server_name"
-msgstr ""
-
-#, c-format
-msgid "TIME UNKNOWN - could not connect to server %s, port %d\n"
-msgstr ""
-
-#, c-format
-msgid "TIME UNKNOWN - could not send UDP request to server %s, port %d\n"
-msgstr ""
-
-#, c-format
-msgid "TIME UNKNOWN - no data received from server %s, port %d\n"
-msgstr ""
-
-#, c-format
-msgid "TIME %s - %d second response time|%s\n"
-msgstr ""
-
-#, c-format
-msgid "TIME %s - %lu second time difference|%s %s\n"
-msgstr ""
-
-msgid "Warning thresholds must be a positive integer"
-msgstr ""
-
-msgid "Critical thresholds must be a positive integer"
-msgstr ""
-
-msgid "This plugin will check the time on the specified host."
-msgstr ""
-
-msgid "Use UDP to connect, not TCP"
-msgstr ""
-
-msgid "Time difference (sec.) necessary to result in a warning status"
-msgstr ""
-
-msgid "Time difference (sec.) necessary to result in a critical status"
-msgstr ""
-
-msgid "Response time (sec.) necessary to result in warning status"
-msgstr ""
-
-msgid "Response time (sec.) necessary to result in critical status"
-msgstr ""
-
-msgid "On Battery, Low Battery"
-msgstr ""
-
-msgid "Online"
-msgstr ""
-
-msgid "On Battery"
-msgstr ""
-
-msgid ", Low Battery"
-msgstr ""
-
-msgid ", Calibrating"
-msgstr ""
-
-msgid ", Replace Battery"
-msgstr ""
-
-msgid ", On Bypass"
-msgstr ""
-
-msgid ", Overload"
-msgstr ""
-
-msgid ", Trimming"
-msgstr ""
-
-msgid ", Boosting"
-msgstr ""
-
-msgid ", Charging"
-msgstr ""
-
-msgid ", Discharging"
-msgstr ""
-
-msgid ", Unknown"
-msgstr ""
-
-msgid "UPS does not support any available options\n"
-msgstr ""
-
-msgid "Invalid response received from host"
-msgstr ""
-
-msgid "UPS name to long for buffer"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - no such UPS '%s' on that host\n"
-msgstr ""
-
-msgid "CRITICAL - UPS data is stale"
-msgstr ""
-
-#, c-format
-msgid "Unknown error: %s\n"
-msgstr ""
-
-msgid "Error: unable to parse variable"
-msgstr ""
-
-msgid "Unrecognized UPS variable"
-msgstr ""
-
-msgid "Error : no UPS indicated"
-msgstr ""
-
-msgid ""
-"This plugin tests the UPS service on the specified host. Network UPS Tools"
-msgstr ""
-
-msgid "from www.networkupstools.org must be running for this plugin to work."
-msgstr ""
-
-msgid "Name of UPS"
-msgstr ""
-
-msgid "Output of temperatures in Celsius"
-msgstr ""
-
-msgid "Valid values for STRING are"
-msgstr ""
-
-msgid ""
-"This plugin attempts to determine the status of a UPS (Uninterruptible Power"
-msgstr ""
-
-msgid ""
-"Supply) on a local or remote host. If the UPS is online or calibrating, the"
-msgstr ""
-
-msgid ""
-"plugin will return an OK state. If the battery is on it will return a WARNING"
-msgstr ""
-
-msgid ""
-"state. If the UPS is off or has a low battery the plugin will return a "
-"CRITICAL"
-msgstr ""
-
-msgid ""
-"You may also specify a variable to check (such as temperature, utility "
-"voltage,"
-msgstr ""
-
-msgid ""
-"battery load, etc.) as well as warning and critical thresholds for the value"
-msgstr ""
-
-msgid ""
-"of that variable.  If the remote host has multiple UPS that are being "
-"monitored"
-msgstr ""
-
-msgid "you will have to use the --ups option to specify which UPS to check."
-msgstr ""
-
-msgid ""
-"This plugin requires that the UPSD daemon distributed with Russell Kroll's"
-msgstr ""
-
-msgid ""
-"Network UPS Tools be installed on the remote host. If you do not have the"
-msgstr ""
-
-msgid "package installed on your system, you can download it from"
-msgstr ""
-
-msgid "http://www.networkupstools.org"
-msgstr ""
-
-#, c-format
-msgid "Could not enumerate RD sessions: %d\n"
-msgstr ""
-
-#, c-format
-msgid "# users=%d"
-msgstr ""
-
-msgid "Unable to read output"
-msgstr ""
-
-#, c-format
-msgid "USERS %s - %d users currently logged in |%s\n"
-msgstr ""
-
-msgid "This plugin checks the number of users currently logged in on the local"
-msgstr ""
-
-msgid ""
-"system and generates an error if the number exceeds the thresholds specified."
-msgstr ""
-
-msgid "Set WARNING status if more than INTEGER users are logged in"
-msgstr ""
-
-msgid "Set CRITICAL status if more than INTEGER users are logged in"
-msgstr ""
-
-msgid ""
-"DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"."
-msgstr ""
-
-msgid "Nagios-compatible output is now always returned."
-msgstr ""
-
-msgid "SMART commands are broken and have been disabled (See Notes in --help)."
-msgstr ""
-
-msgid ""
-"DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the"
-msgstr ""
-
-msgid "default and will be removed from future releases."
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Couldn't open device %s: %s\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - SMART_CMD_ENABLE\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - SMART_READ_VALUES: %s\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"
-msgstr ""
-
-#, c-format
-msgid "WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"
-msgstr ""
-
-#, c-format
-msgid "OK - Operational (%d/%d tests passed)\n"
-msgstr ""
-
-#, c-format
-msgid "ERROR - Status '%d' unknown. %d/%d tests passed\n"
-msgstr ""
-
-#, c-format
-msgid "OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"
-msgstr ""
-
-#, c-format
-msgid "OffLineCapability=%d {%s %s %s}\n"
-msgstr ""
-
-#, c-format
-msgid "SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - %s: %s\n"
-msgstr ""
-
-#, c-format
-msgid "OK - Command sent (%s)\n"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - SMART_READ_THRESHOLDS: %s\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"This plugin checks a local hard drive with the (Linux specific) SMART "
-"interface [http://smartlinux.sourceforge.net/smart/index.php]."
-msgstr ""
-
-msgid "Select device DEVICE"
-msgstr ""
-
-msgid ""
-"Note: if the device is specified without this option, any further option will"
-msgstr ""
-
-msgid "be ignored."
-msgstr ""
-
-msgid ""
-"The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were"
-msgstr ""
-
-msgid ""
-"broken in an underhand manner and have been disabled. You can use smartctl"
-msgstr ""
-
-msgid "instead:"
-msgstr ""
-
-msgid "-0/--auto-off:  use \"smartctl --offlineauto=off\""
-msgstr ""
-
-msgid "-1/--auto-on:   use \"smartctl --offlineauto=on\""
-msgstr ""
-
-msgid "-i/--immediate: use \"smartctl --test=offline\""
-msgstr ""
-
-msgid "No data returned from command\n"
-msgstr ""
-
-msgid ""
-"Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) "
-"or integer (0-3)."
-msgstr ""
-
-msgid ""
-"Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer "
-"(0-3)."
-msgstr ""
-
-msgid ""
-"Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
-"integer (0-3)."
-msgstr ""
-
-msgid ""
-"Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
-"integer (0-3)."
-msgstr ""
-
-msgid ""
-"Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
-"integer (0-3)."
-msgstr ""
-
-msgid "Require path to command"
-msgstr ""
-
-msgid ""
-"Negates the status of a plugin (returns OK for CRITICAL and vice-versa)."
-msgstr ""
-
-msgid "Additional switches can be used to control which state becomes what."
-msgstr ""
-
-msgid "Keep timeout longer than the plugin timeout to retain CRITICAL status."
-msgstr ""
-
-msgid "Custom result on Negate timeouts; see below for STATUS definition\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"    STATUS can be 'OK', 'WARNING', 'CRITICAL' or 'UNKNOWN' without single\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"    quotes. Numeric values are accepted. If nothing is specified, permutes\n"
-msgstr ""
-
-#, c-format
-msgid "    OK and CRITICAL.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"    Substitute output text as well. Will only substitute text in CAPITALS\n"
-msgstr ""
-
-msgid "Run check_ping and invert result. Must use full path to plugin"
-msgstr ""
-
-msgid "This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"
-msgstr ""
-
-msgid ""
-"This plugin is a wrapper to take the output of another plugin and invert it."
-msgstr ""
-
-msgid "The full path of the plugin must be provided."
-msgstr ""
-
-msgid "If the wrapped plugin returns OK, the wrapper will return CRITICAL."
-msgstr ""
-
-msgid "If the wrapped plugin returns CRITICAL, the wrapper will return OK."
-msgstr ""
-
-msgid "Otherwise, the output state of the wrapped plugin is unchanged."
-msgstr ""
-
-msgid ""
-"Using timeout-result, it is possible to override the timeout behaviour or a"
-msgstr ""
-
-msgid "plugin by setting the negate timeout a bit lower."
-msgstr ""
-
-#, c-format
-msgid "%s - Socket timeout after %d seconds\n"
-msgstr ""
-
-#, c-format
-msgid "%s - Abnormal timeout after %d seconds\n"
-msgstr ""
-
-msgid "Send failed"
-msgstr ""
-
-msgid "No data was received from host!"
-msgstr ""
-
-msgid "Socket creation failed"
-msgstr ""
-
-msgid "Supplied path too long unix domain socket"
-msgstr ""
-
-msgid "Receive failed"
-msgstr ""
-
-#, c-format
-msgid "Invalid hostname/address - %s"
-msgstr ""
-
-msgid "Could not malloc argv array in popen()"
-msgstr ""
-
-msgid "CRITICAL - You need more args!!!"
-msgstr ""
-
-msgid "Cannot catch SIGCHLD"
-msgstr ""
-
-#, c-format
-msgid "CRITICAL - Plugin timed out after %d seconds\n"
-msgstr ""
-
-msgid "CRITICAL - popen timeout received, but no child process"
-msgstr ""
-
-#, c-format
-msgid ""
-"%s UNKNOWN - No data received from host\n"
-"CMD: %s</A>\n"
-msgstr ""
-
-msgid ""
-"This plugin wraps the text output of another command (plugin) in HTML <A>"
-msgstr ""
-
-msgid ""
-"tags, thus displaying the child plugin's output as a clickable link in "
-"compatible"
-msgstr ""
-
-msgid ""
-"monitoring status screen. This plugin returns the status of the invoked "
-"plugin."
-msgstr ""
-
-msgid ""
-"Pay close attention to quoting to ensure that the shell passes the expected"
-msgstr ""
-
-msgid "data to the plugin. For example, in:"
-msgstr ""
-
-msgid "urlize http://example.com/ check_http -H example.com -r 'two words'"
-msgstr ""
-
-msgid "the shell will remove the single quotes and urlize will see:"
-msgstr ""
-
-msgid "urlize http://example.com/ check_http -H example.com -r two words"
-msgstr ""
-
-msgid "You probably want:"
-msgstr ""
-
-msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\""
-msgstr ""
-
-msgid "failed realloc in strpcpy\n"
-msgstr ""
-
-msgid "failed malloc in strscat\n"
-msgstr ""
-
-msgid "failed malloc in xvasprintf\n"
-msgstr ""
-
-msgid "sysconf error for _SC_OPEN_MAX\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"       %s (-h | --help) for detailed help\n"
-"       %s (-V | --version) for version information\n"
-msgstr ""
-
-msgid ""
-"\n"
-"Options:\n"
-" -h, --help\n"
-"    Print detailed help screen\n"
-" -V, --version\n"
-"    Print version information\n"
-msgstr ""
-
-#, c-format
-msgid ""
-" -H, --hostname=ADDRESS\n"
-"    Host name, IP Address, or unix socket (must be an absolute path)\n"
-" -%c, --port=INTEGER\n"
-"    Port number (default: %s)\n"
-msgstr ""
-
-msgid ""
-" -4, --use-ipv4\n"
-"    Use IPv4 connection\n"
-" -6, --use-ipv6\n"
-"    Use IPv6 connection\n"
-msgstr ""
-
-msgid ""
-" -v, --verbose\n"
-"    Show details for command-line debugging (output may be truncated by\n"
-"    the monitoring system)\n"
-msgstr ""
-
-msgid ""
-" -w, --warning=DOUBLE\n"
-"    Response time to result in warning status (seconds)\n"
-" -c, --critical=DOUBLE\n"
-"    Response time to result in critical status (seconds)\n"
-msgstr ""
-
-msgid ""
-" -w, --warning=RANGE\n"
-"    Warning range (format: start:end). Alert if outside this range\n"
-" -c, --critical=RANGE\n"
-"    Critical range\n"
-msgstr ""
-
-#, c-format
-msgid ""
-" -t, --timeout=INTEGER\n"
-"    Seconds before connection times out (default: %d)\n"
-msgstr ""
-
-#, c-format
-msgid ""
-" -t, --timeout=INTEGER\n"
-"    Seconds before plugin times out (default: %d)\n"
-msgstr ""
-
-msgid ""
-" --extra-opts=[section][@file]\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 ""
-
-msgid ""
-" See:\n"
-" https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n"
-" for THRESHOLD format and examples.\n"
-msgstr ""
-
-msgid ""
-"\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 ""
-
-msgid ""
-"\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 ""
-
-#, c-format
-msgid "Error: Could not get hardware address of interface '%s'\n"
-msgstr ""
-
-#, c-format
-msgid "Error: if_nametoindex error - %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: Couldn't get hardware address from interface %s. malloc error - %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: can't find unit number in interface_name (%s) - expecting TypeNumber "
-"eg lnc0.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: can't read MAC address from DLPI streams interface for device %s unit "
-"%d.\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: can't get MAC address for this architecture.  Use the --mac option.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Cannot determine IP address of interface %s\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Cannot get interface IP address on this platform.\n"
-msgstr ""
-
-#, c-format
-msgid "Pretending to be relay client %s\n"
-msgstr ""
-
-#, c-format
-msgid "DHCPDISCOVER to %s port %d\n"
-msgstr ""
-
-#, c-format
-msgid "Result=ERROR\n"
-msgstr ""
-
-#, c-format
-msgid "Result=OK\n"
-msgstr ""
-
-#, c-format
-msgid "DHCPOFFER from IP address %s"
-msgstr ""
-
-#, c-format
-msgid " via %s\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"
-msgstr ""
-
-#, c-format
-msgid "DHCPOFFER hardware address did not match our own - ignoring packet\n"
-msgstr ""
-
-#, c-format
-msgid "Total responses seen on the wire: %d\n"
-msgstr ""
-
-#, c-format
-msgid "Valid responses for this machine: %d\n"
-msgstr ""
-
-#, c-format
-msgid "send_dhcp_packet result: %d\n"
-msgstr ""
-
-#, c-format
-msgid "No (more) data received (nfound: %d)\n"
-msgstr ""
-
-#, c-format
-msgid "recvfrom() failed, "
-msgstr ""
-
-#, c-format
-msgid "receive_dhcp_packet() result: %d\n"
-msgstr ""
-
-#, c-format
-msgid "receive_dhcp_packet() source: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Could not create socket!\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Could not set reuse address option on DHCP socket!\n"
-msgstr ""
-
-#, c-format
-msgid "Error: Could not set broadcast option on DHCP socket!\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: Could not bind socket to interface %s.  Check your privileges...\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: Could not bind to DHCP socket (port %d)!  Check your privileges...\n"
-msgstr ""
-
-#, c-format
-msgid "Requested server address: %s\n"
-msgstr ""
-
-#, c-format
-msgid "Lease Time: Infinite\n"
-msgstr ""
-
-#, c-format
-msgid "Lease Time: %lu seconds\n"
-msgstr ""
-
-#, c-format
-msgid "Renewal Time: Infinite\n"
-msgstr ""
-
-#, c-format
-msgid "Renewal Time: %lu seconds\n"
-msgstr ""
-
-#, c-format
-msgid "Rebinding Time: Infinite\n"
-msgstr ""
-
-#, c-format
-msgid "Rebinding Time: %lu seconds\n"
-msgstr ""
-
-#, c-format
-msgid "Added offer from server @ %s"
-msgstr ""
-
-#, c-format
-msgid " of IP address %s\n"
-msgstr ""
-
-#, c-format
-msgid "DHCP Server Match: Offerer=%s"
-msgstr ""
-
-#, c-format
-msgid " Requested=%s"
-msgstr ""
-
-#, c-format
-msgid " (duplicate)"
-msgstr ""
-
-#, c-format
-msgid "\n"
-msgstr ""
-
-#, c-format
-msgid "No DHCPOFFERs were received.\n"
-msgstr ""
-
-#, c-format
-msgid "Received %d DHCPOFFER(s)"
-msgstr ""
-
-#, c-format
-msgid ", %s%d of %d requested servers responded"
-msgstr ""
-
-#, c-format
-msgid ", requested address (%s) was %soffered"
-msgstr ""
-
-msgid "not "
-msgstr ""
-
-#, c-format
-msgid ", max lease time = "
-msgstr ""
-
-#, c-format
-msgid "Infinity"
-msgstr ""
-
-msgid "Got unexpected non-option argument"
-msgstr ""
-
-#, c-format
-msgid "Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"
-msgstr ""
-
-#, c-format
-msgid ""
-"Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"
-msgstr ""
-
-#, c-format
-msgid "Hardware address: "
-msgstr ""
-
-msgid "This plugin tests the availability of DHCP servers on a network."
-msgstr ""
-
-msgid "IP address of DHCP server that we must hear from"
-msgstr ""
-
-msgid "IP address that should be offered by at least one DHCP server"
-msgstr ""
-
-msgid "Seconds to wait for DHCPOFFER before timeout occurs"
-msgstr ""
-
-msgid "Interface to to use for listening (i.e. eth0)"
-msgstr ""
-
-msgid "MAC address to use in the DHCP request"
-msgstr ""
-
-msgid "Unicast testing: mimic a DHCP relay, requires -s"
-msgstr ""
-
-msgid "specify a target"
-msgstr ""
-
-msgid "Use IPv4 (default) or IPv6 to communicate with the targets"
-msgstr ""
-
-msgid "warning threshold (currently "
-msgstr ""
-
-msgid "critical threshold (currently "
-msgstr ""
-
-msgid "specify a source IP address or device name"
-msgstr ""
-
-msgid "number of packets to send (currently "
-msgstr ""
-
-msgid "max packet interval (currently "
-msgstr ""
-
-msgid "max target interval (currently "
-msgstr ""
-
-msgid "number of alive hosts required for success"
-msgstr ""
-
-msgid "TTL on outgoing packets (currently "
-msgstr ""
-
-msgid "timeout value (seconds, currently  "
-msgstr ""
-
-msgid "Number of icmp data bytes to send"
-msgstr ""
-
-msgid "Packet size will be data bytes + icmp header (currently"
-msgstr ""
-
-msgid "verbose"
-msgstr ""
-
-msgid "The -H switch is optional. Naming a host (or several) to check is not."
-msgstr ""
-
-msgid ""
-"Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"
-msgstr ""
-
-msgid "packet loss.  The default values should work well for most users."
-msgstr ""
-
-msgid ""
-"You can specify different RTA factors using the standardized abbreviations"
-msgstr ""
-
-msgid ""
-"us (microseconds), ms (milliseconds, default) or just plain s for seconds."
-msgstr ""
-
-msgid "The -v switch can be specified several times for increased verbosity."
-msgstr ""
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
deleted file mode 100644
index 2436c49..0000000
--- a/po/remove-potcdate.sin
+++ /dev/null
@@ -1,19 +0,0 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
-# from a POT file.
-#
-# The distinction between the first and the following occurrences of the
-# pattern is achieved by looking at the hold space.
-/^"POT-Creation-Date: .*"$/{
-x
-# Test if the hold space is empty.
-s/P/P/
-ta
-# Yes it was empty. First occurrence. Remove the line.
-g
-d
-bb
-:a
-# The hold space was nonempty. Following occurrences. Do nothing.
-x
-:b
-}