diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..94134e17
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+build/**
+*.o
+*.a
+**/.deps/**
+config.status
+config.log
+obj-x86_64-linux-gnu/**
+autom4te.cache/**
+debian/**
+m4/**
+Makefile
+*.gmo
+stamp-*
+Makevars.template
+config.h
+*~
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..d628d97d
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,392 @@
+cmake_minimum_required(VERSION 3.10)
+project(psensor VERSION 1.2.0 LANGUAGES C)
+
+# Set default build type if not specified
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build (Debug/Release/RelWithDebInfo/MinSizeRel)" FORCE)
+endif()
+
+# Add compiler flags for Debug build
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g3 -O0")
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2")
+
+# Build options
+option(WITH_GTOP "Build with libgtop support" ON)
+option(WITH_NVIDIA "Build with NVIDIA support" ON)
+option(WITH_ATI "Build with ATI support" OFF)
+option(ENABLE_NLS "Enable Native Language Support" ON)
+option(ENABLE_CPPCHECK "Enable cppcheck analysis" ON)
+
+# Find required tools
+find_program(HELP2MAN help2man)
+find_program(ASCIIDOC asciidoc)
+find_program(CPPCHECK cppcheck)
+find_program(GLIB_COMPILE_SCHEMAS glib-compile-schemas)
+
+# Standard install directories (provides CMAKE_INSTALL_DATADIR and
+# CMAKE_INSTALL_FULL_LOCALEDIR). Ensure GNUInstallDirs is available before
+# any install() calls or before we evaluate install destinations used for
+# translations so CMAKE_INSTALL_FULL_LOCALEDIR is stable during configure.
+include(GNUInstallDirs)
+
+# Enable large file support
+add_compile_definitions(_FILE_OFFSET_BITS=64)
+
+# Set compiler flags similar to autotools
+add_compile_options(-Wall)
+# Add -rdynamic for GTK signal handlers
+add_link_options(-rdynamic)
+# GTK/GDK flags to ensure proper API usage
+add_definitions(
+    -DGTK_DISABLE_SINGLE_INCLUDES
+    -DGDK_DISABLE_DEPRECATED
+    -DGSEAL_ENABLE
+)
+
+# Find required packages
+find_package(PkgConfig REQUIRED)
+find_package(Threads REQUIRED)
+
+# Gettext/i18n support
+if(ENABLE_NLS)
+    find_package(Gettext REQUIRED)
+    find_package(Intl REQUIRED)
+    # Ensure a valid CMAKE_INSTALL_FULL_LOCALEDIR; some CMake invocations
+    # (or cached configs) may leave CMAKE_INSTALL_LOCALEDIR empty which would
+    # define LOCALEDIR as an empty string in the binary. Provide a fallback
+    # to <prefix>/share/locale so bindtextdomain() can find installed catalogs.
+    if(NOT DEFINED CMAKE_INSTALL_FULL_LOCALEDIR OR CMAKE_INSTALL_FULL_LOCALEDIR STREQUAL "")
+        set(CMAKE_INSTALL_FULL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
+    endif()
+
+    # Find all PO files
+    file(GLOB PO_FILES ${CMAKE_SOURCE_DIR}/po/*.po)
+    
+    # Generate MO files for each PO file
+    foreach(PO_FILE ${PO_FILES})
+        get_filename_component(LANG ${PO_FILE} NAME_WE)
+        set(MO_FILE ${CMAKE_CURRENT_BINARY_DIR}/po/${LANG}.mo)
+        add_custom_command(
+            OUTPUT ${MO_FILE}
+            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/po
+            COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${MO_FILE} ${PO_FILE}
+            DEPENDS ${PO_FILE}
+            COMMENT "Generating MO file for ${LANG}"
+        )
+        list(APPEND MO_FILES ${MO_FILE})
+        # Install MO files into the full install locale directory. Use
+        # CMAKE_INSTALL_FULL_LOCALEDIR which is validated/fallbacked above
+        # to avoid generating installs like "/zh_CN/..." when the
+        # short variable is empty during packaging.
+        install(FILES ${MO_FILE}
+            DESTINATION share/locale/${LANG}/LC_MESSAGES/
+            RENAME ${PROJECT_NAME}.mo
+        )
+    endforeach()
+    
+    add_custom_target(translations ALL DEPENDS ${MO_FILES})
+    add_definitions(-DENABLE_NLS=1)
+    add_definitions(-DGETTEXT_PACKAGE="${PROJECT_NAME}")
+    add_definitions(-DPACKAGE="${PROJECT_NAME}")
+    # Compile LOCALEDIR into the binary so bindtextdomain(PACKAGE, LOCALEDIR)
+    # will resolve to an absolute directory under the install prefix. This
+    # relies on CMAKE_INSTALL_FULL_LOCALEDIR being defined (above via
+    # GNUInstallDirs or our fallback).
+    add_compile_definitions(LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
+endif()
+
+# (GNUInstallDirs already included earlier)
+
+# Required dependencies
+pkg_check_modules(GTK3 REQUIRED gtk+-3.0>=3.4)
+pkg_check_modules(X11 REQUIRED x11)
+pkg_check_modules(XEXT REQUIRED xext)
+
+# Optional dependencies
+pkg_check_modules(CANBERRA_GTK3 libcanberra-gtk3)
+pkg_check_modules(AT_SPI2_CORE at-spi2-core)
+pkg_check_modules(DBUS dbus-1)
+
+# Add compilation flags for optional features
+if(CANBERRA_GTK3_FOUND)
+    add_compile_definitions(HAVE_CANBERRA=1)
+endif()
+
+if(AT_SPI2_CORE_FOUND)
+    add_compile_definitions(HAVE_AT_SPI=1)
+endif()
+
+if(DBUS_FOUND)
+    add_compile_definitions(HAVE_DBUS=1)
+endif()
+pkg_check_modules(JSON REQUIRED json-c>=0.11.99)
+pkg_check_modules(CURL REQUIRED libcurl)
+pkg_check_modules(LIBMICROHTTPD REQUIRED libmicrohttpd)
+pkg_check_modules(LIBNOTIFY REQUIRED libnotify)
+pkg_check_modules(UDISKS2 REQUIRED udisks2)
+pkg_check_modules(ATASMART REQUIRED libatasmart)
+pkg_check_modules(APPINDICATOR3 REQUIRED appindicator3-0.1)
+
+# Define HAVE_* macros for pkg-config-found libs so headers that expect
+# autoconf-style macros will choose the real implementations (not inline stubs)
+if(JSON_LIBRARIES)
+    add_compile_definitions(HAVE_JSON=1)
+endif()
+if(CURL_LIBRARIES)
+    add_compile_definitions(HAVE_CURL=1)
+endif()
+if(LIBMICROHTTPD_LIBRARIES)
+    add_compile_definitions(HAVE_LIBMICROHTTPD=1)
+endif()
+if(LIBNOTIFY_LIBRARIES)
+    add_compile_definitions(HAVE_LIBNOTIFY=1)
+endif()
+if(UDISKS2_LIBRARIES)
+    add_compile_definitions(HAVE_LIBUDISKS2=1)
+endif()
+
+if(ATASMART_LIBRARIES)
+    add_compile_definitions(HAVE_ATASMART=1)
+endif()
+
+# Remote monitoring support (JSON + CURL)
+if(JSON_LIBRARIES AND CURL_LIBRARIES)
+    add_compile_definitions(HAVE_REMOTE_SUPPORT=1)
+endif()
+
+# Optional dependencies
+if(WITH_GTOP)
+    pkg_check_modules(GTOP libgtop-2.0)
+    if(GTOP_FOUND)
+        add_definitions(-DHAVE_GTOP)
+    endif()
+endif()
+
+# Check for libsensors
+find_library(SENSORS_LIB sensors)
+if(SENSORS_LIB)
+    add_compile_definitions(HAVE_LIBSENSORS=1)
+endif()
+
+# NVIDIA support
+if(WITH_NVIDIA)
+    find_path(NVIDIA_INCLUDE_DIR NVCtrl/NVCtrl.h
+        /usr/include
+        /usr/local/include
+    )
+    find_library(NVIDIA_LIB XNVCtrl)
+    if(NVIDIA_INCLUDE_DIR AND NVIDIA_LIB)
+        add_definitions(-DHAVE_NVIDIA)
+    endif()
+endif()
+if(NVIDIA_LIB)
+    list(APPEND PSENSOR_EXTRA_LIBS ${NVIDIA_LIB})
+endif()
+
+# Configure header
+configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+
+# Set the package data directory variable for paths.h.in
+set(pkgdatadir "${CMAKE_INSTALL_FULL_DATADIR}/psensor")
+
+# Find psensor data directory at runtime
+configure_file(
+    ${CMAKE_SOURCE_DIR}/src/paths.h.in
+    ${CMAKE_BINARY_DIR}/paths.h
+    @ONLY)
+
+# Set install prefix if not specified
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation prefix" FORCE)
+endif()
+
+# Make sure GNUInstallDirs is included before using its variables
+include(GNUInstallDirs)
+
+# Desktop file macro and data dir for source use
+add_compile_definitions(PSENSOR_DESKTOP_FILE=\"psensor.desktop\")
+add_compile_definitions(DATADIR=\"${CMAKE_INSTALL_FULL_DATADIR}\")
+add_compile_definitions(DEFAULT_WWW_DIR=\"${CMAKE_INSTALL_FULL_DATADIR}/psensor/www\")
+# Set default PACKAGE_DATA_DIR but allow environment override
+if(NOT DEFINED ENV{PSENSOR_DATA_DIR})
+    add_compile_definitions(PACKAGE_DATA_DIR=\"${CMAKE_INSTALL_FULL_DATADIR}/psensor\")
+else()
+    add_compile_definitions(PACKAGE_DATA_DIR=\"$ENV{PSENSOR_DATA_DIR}\")
+endif()
+
+message(STATUS "Installation prefix: ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "Full data directory: ${CMAKE_INSTALL_FULL_DATADIR}")
+message(STATUS "Package data directory: ${CMAKE_INSTALL_FULL_DATADIR}/psensor")
+
+if(NOT CANBERRA_GTK3_FOUND)
+    message(STATUS "libcanberra-gtk3 not found - sound support will be disabled")
+endif()
+
+if(NOT DBUS_FOUND)
+    message(STATUS "dbus-1 not found - some features may be limited")
+endif()
+
+add_subdirectory(src)
+
+# Installation
+include(GNUInstallDirs)
+
+# Install binaries
+install(TARGETS psensor psensor-server
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+# Install desktop file
+install(FILES psensor.desktop
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
+)
+
+# Install icons for all themes and sizes
+install(DIRECTORY icons/hicolor/
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
+    PATTERN "Makefile*" EXCLUDE    
+)
+install(DIRECTORY icons/ubuntu-mono-dark/
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/ubuntu-mono-dark
+    PATTERN "Makefile*" EXCLUDE    
+)
+install(DIRECTORY icons/ubuntu-mono-light/
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/ubuntu-mono-light
+    PATTERN "Makefile*" EXCLUDE
+)
+
+# Ensure icons are also installed into the per-size "apps/" subdirectories
+# so GTK/desktop environments can find the application icon via the
+# hicolor theme (e.g. icons/hicolor/48x48/apps/psensor.png).
+set(HICOLOR_SIZES 14x14 16x16 22x22 24x24 32x32 48x48 64x64)
+foreach(size IN LISTS HICOLOR_SIZES)
+    if(EXISTS ${CMAKE_SOURCE_DIR}/icons/hicolor/${size}/psensor.png)
+        install(FILES ${CMAKE_SOURCE_DIR}/icons/hicolor/${size}/psensor.png
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}/apps
+            RENAME psensor.png)
+    endif()
+endforeach()
+
+# Install scalable SVG icons into scalable/apps
+if(EXISTS ${CMAKE_SOURCE_DIR}/icons/hicolor/scalable/psensor.svg)
+    install(FILES
+        ${CMAKE_SOURCE_DIR}/icons/hicolor/scalable/psensor.svg
+        ${CMAKE_SOURCE_DIR}/icons/hicolor/scalable/psensor_normal.svg
+        ${CMAKE_SOURCE_DIR}/icons/hicolor/scalable/psensor_hot.svg
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
+    )
+endif()
+
+# Install glade UI files
+# Main interface first
+install(FILES src/glade/psensor.glade
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/psensor)
+
+# Then install all glade files to the glade subdirectory
+install(FILES
+    src/glade/psensor-appindicator.glade
+    src/glade/psensor-pref.glade
+    src/glade/psensor.glade
+    src/glade/sensor-edit.glade
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/psensor)
+
+# Install web interface files
+install(DIRECTORY www/
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/psensor/www
+    FILES_MATCHING 
+    PATTERN "*.html"
+    PATTERN "*.css"
+    PATTERN "*.js"
+    PATTERN "*.png"
+    PATTERN "Makefile*" EXCLUDE
+)
+
+# Install GSettings schema
+install(FILES src/psensor.gschema.xml
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas
+)
+
+# Install man pages
+install(FILES src/psensor.1
+    DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+)
+
+# Install documentation
+install(FILES
+    AUTHORS
+    ChangeLog
+    COPYING
+    NEWS
+    NEWS.html
+    README
+    README.html
+    DESTINATION ${CMAKE_INSTALL_DOCDIR}
+)
+
+# Install translations
+# install(DIRECTORY po/
+#     # Install the po/ (compiled .mo) files into the canonical locale
+#     # location under the installation prefix. Use
+#     # CMAKE_INSTALL_FULL_LOCALEDIR to ensure the directory is absolute
+#     # and not empty during package creation.
+#     DESTINATION ${CMAKE_INSTALL_FULL_LOCALEDIR}/locale
+#     FILES_MATCHING PATTERN "*.mo"
+# )
+message(STATUS "CMAKE_INSTALL_FULL_LOCALEDIR = ${CMAKE_INSTALL_FULL_LOCALEDIR}")
+message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
+# Generate man page if help2man is available
+if(HELP2MAN)
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/psensor.1
+        COMMAND ${HELP2MAN} --include=${CMAKE_SOURCE_DIR}/src/description.txt
+                           -N --name="Temperature monitoring application"
+                           --output=${CMAKE_CURRENT_BINARY_DIR}/psensor.1
+                           $<TARGET_FILE:psensor>
+        DEPENDS psensor
+        COMMENT "Generating man page with help2man"
+    )
+    add_custom_target(man ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/psensor.1)
+endif()
+
+# Generate HTML documentation if asciidoc is available
+if(ASCIIDOC)
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/README.html
+        COMMAND ${ASCIIDOC} --theme style -a themedir=${CMAKE_SOURCE_DIR}/www -n -a toc
+                           -o ${CMAKE_CURRENT_BINARY_DIR}/README.html
+                           ${CMAKE_SOURCE_DIR}/README
+        DEPENDS ${CMAKE_SOURCE_DIR}/README ${CMAKE_SOURCE_DIR}/www/style.css
+        COMMENT "Generating README.html with asciidoc"
+    )
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/NEWS.html
+        COMMAND ${ASCIIDOC} --theme style -a themedir=${CMAKE_SOURCE_DIR}/www
+                           -o ${CMAKE_CURRENT_BINARY_DIR}/NEWS.html
+                           ${CMAKE_SOURCE_DIR}/NEWS
+        DEPENDS ${CMAKE_SOURCE_DIR}/NEWS ${CMAKE_SOURCE_DIR}/www/style.css
+        COMMENT "Generating NEWS.html with asciidoc"
+    )
+    add_custom_target(docs ALL 
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/README.html
+                ${CMAKE_CURRENT_BINARY_DIR}/NEWS.html
+    )
+endif()
+
+# Run cppcheck if available
+if(CPPCHECK AND ENABLE_CPPCHECK)
+    add_custom_target(cppcheck
+        COMMAND ${CPPCHECK} --enable=all --inline-suppr
+                           -I ${CMAKE_SOURCE_DIR}/src
+                           -I ${CMAKE_SOURCE_DIR}/src/lib
+                           ${CMAKE_SOURCE_DIR}/src
+        COMMENT "Running cppcheck analysis"
+    )
+endif()
+
+# Post-install commands
+install(CODE "
+    # Compile GSettings schema
+    execute_process(
+        COMMAND ${GLIB_COMPILE_SCHEMAS} ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas
+    )
+")
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
index 20998407..e82fd21d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free
+Software Foundation, Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,97 +12,96 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell command `./configure && make && make install'
+   Briefly, the shell command './configure && make && make install'
 should configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
+more-detailed instructions are generic; see the 'README' file for
 instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
+'INSTALL' file but do not implement all of the features documented
 below.  The lack of an optional feature in a given package is not
 necessarily a bug.  More recommendations for GNU packages can be found
 in *note Makefile Conventions: (standards)Makefile Conventions.
 
-   The `configure' shell script attempts to guess correct values for
+   The 'configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions.  Finally, it creates a shell script 'config.status' that
 you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
 
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+   It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring.  Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
 
    If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
 be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+   The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'.  You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
 
    The simplest way to compile this package is:
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
+  1. 'cd' to the directory containing the package's source code and type
+     './configure' to configure the package for your system.
 
-     Running `configure' might take a while.  While running, it prints
+     Running 'configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
 
-  2. Type `make' to compile the package.
+  2. Type 'make' to compile the package.
 
-  3. Optionally, type `make check' to run any self-tests that come with
+  3. Optionally, type 'make check' to run any self-tests that come with
      the package, generally using the just-built uninstalled binaries.
 
-  4. Type `make install' to install the programs and any data files and
+  4. Type 'make install' to install the programs and any data files and
      documentation.  When installing into a prefix owned by root, it is
      recommended that the package be configured and built as a regular
-     user, and only the `make install' phase executed with root
+     user, and only the 'make install' phase executed with root
      privileges.
 
-  5. Optionally, type `make installcheck' to repeat any self-tests, but
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
      this time using the binaries in their final installed location.
      This target does not install anything.  Running this target as a
-     regular user, particularly if the prior `make install' required
+     regular user, particularly if the prior 'make install' required
      root privileges, verifies that the installation completed
      correctly.
 
   6. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
+     source code directory by typing 'make clean'.  To also remove the
+     files that 'configure' created (so you can compile the package for
+     a different kind of computer), type 'make distclean'.  There is
+     also a 'make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  7. Often, you can also type `make uninstall' to remove the installed
+  7. Often, you can also type 'make uninstall' to remove the installed
      files again.  In practice, not all packages have tested that
      uninstallation works correctly, even though it is required by the
      GNU Coding Standards.
 
-  8. Some packages, particularly those that use Automake, provide `make
+  8. Some packages, particularly those that use Automake, provide 'make
      distcheck', which can by used by developers to test that all other
-     targets like `make install' and `make uninstall' work correctly.
+     targets like 'make install' and 'make uninstall' work correctly.
      This target is generally not run by end users.
 
 Compilers and Options
 =====================
 
    Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  Run `./configure --help'
+the 'configure' script does not know about.  Run './configure --help'
 for details on some of the pertinent environment variables.
 
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
+   You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here is
+an example:
 
      ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
@@ -113,21 +112,21 @@ Compiling For Multiple Architectures
 
    You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU 'make'.  'cd' to the
 directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.  This
-is known as a "VPATH" build.
+the 'configure' script.  'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'.  This is known
+as a "VPATH" build.
 
-   With a non-GNU `make', it is safer to compile the package for one
+   With a non-GNU 'make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
 reconfiguring for another architecture.
 
    On MacOS X 10.5 and later systems, you can create libraries and
 executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor.  Like
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor.  Like
 this:
 
      ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
@@ -136,105 +135,104 @@ this:
 
    This is not guaranteed to produce working output in all cases, you
 may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+using the 'lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-   By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
+   By default, 'make install' installs the package's commands under
+'/usr/local/bin', include files under '/usr/local/include', etc.  You
+can specify an installation prefix other than '/usr/local' by giving
+'configure' the option '--prefix=PREFIX', where PREFIX must be an
 absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.  In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
+options like '--bindir=DIR' to specify different values for particular
+kinds of files.  Run 'configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the default
+for these options is expressed in terms of '${prefix}', so that
+specifying just '--prefix' will affect all of the other directory
 specifications that were not explicitly provided.
 
    The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
+correct locations to 'configure'; however, many packages provide one or
 both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
+'make install' command line to change installation locations without
 having to reconfigure or recompile.
 
    The first method involves providing an override variable for each
-affected directory.  For example, `make install
+affected directory.  For example, 'make install
 prefix=/alternate/directory' will choose an alternate location for all
 directory configuration variables that were expressed in terms of
-`${prefix}'.  Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated.  The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
-   The second method involves providing the `DESTDIR' variable.  For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names.  The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
+'${prefix}'.  Any directories that were specified during 'configure',
+but not in terms of '${prefix}', must each be overridden at install time
+for the entire installation to be relocated.  The approach of makefile
+variable overrides for each directory variable is required by the GNU
+Coding Standards, and ideally causes no recompilation.  However, some
+platforms have known limitations with the semantics of shared libraries
+that end up requiring recompilation when using this method, particularly
+noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the 'DESTDIR' variable.  For
+example, 'make install DESTDIR=/alternate/directory' will prepend
+'/alternate/directory' before all installation names.  The approach of
+'DESTDIR' overrides is not required by the GNU Coding Standards, and
 does not work on platforms that have drive letters.  On the other hand,
 it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
+when some directory options were not specified in terms of '${prefix}'
+at 'configure' time.
 
 Optional Features
 =================
 
    If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
+with an extra prefix or suffix on their names by giving 'configure' the
+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
+
+   Some packages pay attention to '--enable-FEATURE' options to
+'configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
+is something like 'gnu-as' or 'x' (for the X Window System).  The
+'README' should mention any '--enable-' and '--with-' options that the
 package recognizes.
 
-   For packages that use the X Window System, `configure' can usually
+   For packages that use the X Window System, 'configure' can usually
 find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
+you can use the 'configure' options '--x-includes=DIR' and
+'--x-libraries=DIR' to specify their locations.
 
    Some packages offer the ability to configure how verbose the
-execution of `make' will be.  For these packages, running `./configure
+execution of 'make' will be.  For these packages, running './configure
 --enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
+overridden with 'make V=1'; while running './configure
 --disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
+overridden with 'make V=0'.
 
 Particular systems
 ==================
 
-   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-CC is not installed, it is recommended to use the following options in
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC
+is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
      ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
-   HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved.  Use GNU `make'
-instead.
+   HP-UX 'make' updates targets which have the same timestamps as their
+prerequisites, which makes it generally unusable when shipped generated
+files such as 'configure' are involved.  Use GNU 'make' instead.
 
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-a workaround.  If GNU CC is not installed, it is therefore recommended
-to try
+parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a
+workaround.  If GNU CC is not installed, it is therefore recommended to
+try
 
      ./configure CC="cc"
 
@@ -242,26 +240,26 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
-   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This
 directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
+these programs are available in '/usr/bin'.  So, if you need '/usr/ucb'
+in your 'PATH', put it _after_ '/usr/bin'.
 
-   On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'.  It is recommended to use the following options:
+   On Haiku, software installed for all users goes in '/boot/common',
+not '/usr/local'.  It is recommended to use the following options:
 
      ./configure --prefix=/boot/common
 
 Specifying the System Type
 ==========================
 
-   There may be some features `configure' cannot figure out
+   There may be some features 'configure' cannot figure out
 automatically, but needs to determine by the type of machine the package
 will run on.  Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
+_same_ architectures, 'configure' can figure that out, but if it prints
 a message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
+'--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as 'sun4', or a canonical name which has the form:
 
      CPU-COMPANY-SYSTEM
 
@@ -270,101 +268,101 @@ where SYSTEM can have one of these forms:
      OS
      KERNEL-OS
 
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
+   See the file 'config.sub' for the possible values of each field.  If
+'config.sub' isn't included in this package, then this package doesn't
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the option '--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
+eventually be run) with '--host=TYPE'.
 
 Sharing Defaults
 ================
 
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
+   If you want to set default values for 'configure' scripts to share,
+you can create a site shell script called 'config.site' that gives
+default values for variables like 'CC', 'cache_file', and 'prefix'.
+'configure' looks for 'PREFIX/share/config.site' if it exists, then
+'PREFIX/etc/config.site' if it exists.  Or, you can set the
+'CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all 'configure' scripts look for a site script.
 
 Defining Variables
 ==================
 
    Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
+environment passed to 'configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
+them in the 'configure' command line, using 'VAR=value'.  For example:
 
      ./configure CC=/usr/local2/bin/gcc
 
-causes the specified `gcc' to be used as the C compiler (unless it is
+causes the specified 'gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
+Autoconf limitation.  Until the limitation is lifted, you can use this
+workaround:
 
      CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
-`configure' Invocation
+'configure' Invocation
 ======================
 
-   `configure' recognizes the following options to control how it
+   'configure' recognizes the following options to control how it
 operates.
 
-`--help'
-`-h'
-     Print a summary of all of the options to `configure', and exit.
+'--help'
+'-h'
+     Print a summary of all of the options to 'configure', and exit.
 
-`--help=short'
-`--help=recursive'
+'--help=short'
+'--help=recursive'
      Print a summary of the options unique to this package's
-     `configure', and exit.  The `short' variant lists options used
-     only in the top level, while the `recursive' variant lists options
-     also present in any nested packages.
+     'configure', and exit.  The 'short' variant lists options used only
+     in the top level, while the 'recursive' variant lists options also
+     present in any nested packages.
 
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
+'--version'
+'-V'
+     Print the version of Autoconf used to generate the 'configure'
      script, and exit.
 
-`--cache-file=FILE'
+'--cache-file=FILE'
      Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     traditionally 'config.cache'.  FILE defaults to '/dev/null' to
      disable caching.
 
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
+'--config-cache'
+'-C'
+     Alias for '--cache-file=config.cache'.
 
-`--quiet'
-`--silent'
-`-q'
+'--quiet'
+'--silent'
+'-q'
      Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
+     suppress all normal output, redirect it to '/dev/null' (any error
      messages will still be shown).
 
-`--srcdir=DIR'
+'--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
+     'configure' can determine that directory automatically.
 
-`--prefix=DIR'
-     Use DIR as the installation prefix.  *note Installation Names::
-     for more details, including other options available for fine-tuning
-     the installation locations.
+'--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names:: for
+     more details, including other options available for fine-tuning the
+     installation locations.
 
-`--no-create'
-`-n'
+'--no-create'
+'-n'
      Run the configure checks, but stop before creating any output
      files.
 
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
+'configure' also accepts some other, not widely useful, options.  Run
+'configure --help' for more details.
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..ef7d0b41
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,956 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgincludedir = $(includedir)/psensor
+pkglibdir = $(libdir)/psensor
+pkglibexecdir = $(libexecdir)/psensor
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-pc-linux-gnu
+host_triplet = x86_64-pc-linux-gnu
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(dist_doc_DATA) $(am__DIST_COMMON)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_$(V))
+am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"
+DATA = $(desktop_DATA) $(dist_doc_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir distdir-am dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+	config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README ar-lib \
+	compile config.guess config.rpath config.sub depcomp \
+	install-sh missing
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+pkgdatadir = /usr/share/psensor
+ACLOCAL = ${SHELL} '/mydata/psensor/missing' aclocal-1.16
+AMTAR = $${TAR-tar}
+AM_DEFAULT_VERBOSITY = 1
+APPINDICATOR_CFLAGS = -I/usr/include/libappindicator3-0.1 -I/usr/include/libdbusmenu-glib-0.4 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/x86_64-linux-gnu -I/usr/include/webp -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -pthread 
+APPINDICATOR_LIBS = -lappindicator3 -ldbusmenu-glib -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 
+AR = ar
+ASCIIDOC = yes
+ATASMART_CFLAGS = 
+ATASMART_LIBS = -latasmart 
+AUTOCONF = ${SHELL} '/mydata/psensor/missing' autoconf
+AUTOHEADER = ${SHELL} '/mydata/psensor/missing' autoheader
+AUTOMAKE = ${SHELL} '/mydata/psensor/missing' automake-1.16
+AWK = mawk
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2
+CPP = gcc -E
+CPPFLAGS = 
+CSCOPE = cscope
+CTAGS = ctags
+CURL_CFLAGS = -I/usr/include/x86_64-linux-gnu 
+CURL_LIBS = -lcurl 
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+ETAGS = etags
+EXEEXT = 
+GLIB_COMPILE_SCHEMAS = /usr/lib/x86_64-linux-gnu/glib-2.0/glib-compile-schemas
+GMSGFMT = /usr/bin/msgfmt
+GMSGFMT_015 = /usr/bin/msgfmt
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = 
+GTK_CFLAGS = -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/x86_64-linux-gnu -I/usr/include/webp -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -pthread  -DGTK_DISABLE_SINGLE_INCLUDES  -DGDK_DISABLE_DEPRECATED  -DGSEAL_ENABLE 
+GTK_LIBS = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 
+GTOP_CFLAGS = -I/usr/include/libgtop-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include 
+GTOP_LIBS = -lgtop-2.0 -lglib-2.0 
+HAVE_CPPCHECK = yes
+HELP2MAN = help2man
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+INTLLIBS = 
+INTL_MACOSX_LIBS = 
+JSON_CFLAGS = -I/usr/include/json-c 
+JSON_LIBS = -ljson-c 
+LDFLAGS = 
+LIBATIADL_CFLAGS = 
+LIBATIADL_LIBS = 
+LIBICONV = -liconv
+LIBINTL = 
+LIBMICROHTTPD_CFLAGS = -I/usr/include/p11-kit-1 
+LIBMICROHTTPD_LIBS = -lmicrohttpd 
+LIBNOTIFY_CFLAGS = -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libpng16 -I/usr/include/x86_64-linux-gnu -I/usr/include/webp -I/usr/include/libmount -I/usr/include/blkid -pthread 
+LIBNOTIFY_LIBS = -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 
+LIBOBJS = 
+LIBS = -lpthread  -lX11 -lXext
+LIBUDISKS2_CFLAGS = -I/usr/include/udisks2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -pthread -I/usr/include/libmount -I/usr/include/blkid 
+LIBUDISKS2_LIBS = -ludisks2 -lgio-2.0 -lgobject-2.0 -lglib-2.0 
+LTLIBICONV = -liconv
+LTLIBINTL = 
+LTLIBOBJS = 
+MAKEINFO = ${SHELL} '/mydata/psensor/missing' makeinfo
+MKDIR_P = /usr/bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGFMT_015 = /usr/bin/msgfmt
+MSGMERGE = /usr/bin/msgmerge
+NVIDIA_CFLAGS = 
+NVIDIA_LIBS = -lXNVCtrl -lX11 -lXext
+OBJEXT = o
+PACKAGE = psensor
+PACKAGE_BUGREPORT = jeanfi@gmail.com
+PACKAGE_NAME = psensor
+PACKAGE_STRING = psensor 1.2.0
+PACKAGE_TARNAME = psensor
+PACKAGE_URL = http://wpitchoune.net/psensor
+PACKAGE_VERSION = 1.2.0
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+PKG_CONFIG_LIBDIR = 
+PKG_CONFIG_PATH = 
+POSUB = po
+PTHREAD_LIBS = -pthread
+RANLIB = ranlib
+SENSORS_LIBS = -lsensors
+SET_MAKE = 
+SHELL = /bin/bash
+STRIP = 
+UNITY_CFLAGS = -I/usr/include/unity/unity -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/dee-1.0 -I/usr/include/gio-unix-2.0 -pthread -I/usr/include/libdbusmenu-glib-0.4 
+UNITY_LIBS = -lunity -ldee-1.0 -lgthread-2.0 -pthread -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -ldbusmenu-glib 
+USE_NLS = yes
+VERSION = 1.2.0
+X11_CFLAGS = 
+X11_LIBS = -lX11 
+XEXT_CFLAGS = 
+XEXT_LIBS = -lXext 
+XGETTEXT = /usr/bin/xgettext
+XGETTEXT_015 = /usr/bin/xgettext
+XMKMF = 
+abs_builddir = /mydata/psensor
+abs_srcdir = /mydata/psensor
+abs_top_builddir = /mydata/psensor
+abs_top_srcdir = /mydata/psensor
+ac_ct_AR = ar
+ac_ct_CC = gcc
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = $${TAR-tar} chof - "$$tardir"
+am__untar = $${TAR-tar} xf -
+bindir = ${exec_prefix}/bin
+build = x86_64-pc-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = pc
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+gsettingsschemadir = ${datarootdir}/glib-2.0/schemas
+host = x86_64-pc-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = pc
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = ${SHELL} /mydata/psensor/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = /usr/share/locale
+localstatedir = ${prefix}/var
+mandir = ${datarootdir}/man
+mkdir_p = /usr/bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+runstatedir = ${localstatedir}/run
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+sysconfdir = ${prefix}/etc
+target_alias = 
+top_build_prefix = 
+top_builddir = .
+top_srcdir = .
+SUBDIRS = doc \
+	po \
+	src \
+	icons/hicolor/scalable \
+	icons/hicolor/14x14 \
+	icons/hicolor/16x16 \
+	icons/hicolor/22x22 \
+	icons/hicolor/24x24 \
+	icons/hicolor/32x32 \
+	icons/hicolor/48x48 \
+	icons/hicolor/64x64 \
+	icons/ubuntu-mono-dark/status/22 \
+	icons/ubuntu-mono-light/status/22 \
+	icons/ubuntu-mono-dark/apps/22 \
+	www \
+	tests
+
+dist_doc_DATA = AUTHORS \
+	COPYING \
+	INSTALL \
+	NEWS \
+	NEWS.html \
+	README \
+	README.html
+
+desktopdir = $(datadir)/applications
+desktop_DATA = psensor.desktop
+EXTRA_DIST = $(desktop_DATA) $(autostart_DATA)
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+.SUFFIXES:
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+config.h: stamp-h1
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+install-desktopDATA: $(desktop_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+	done
+
+uninstall-desktopDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+install-dist_docDATA: $(dist_doc_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+	done
+
+uninstall-dist_docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-zstd: distdir
+	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	*.tar.zst*) \
+	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-desktopDATA install-dist_docDATA
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA
+
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+	dist-zstd distcheck distclean distclean-generic distclean-hdr \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-desktopDATA \
+	install-dist_docDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-desktopDATA uninstall-dist_docDATA
+
+.PRECIOUS: Makefile
+
+
+README.html: README www/style.css
+	asciidoc --theme style -a themedir=`pwd`/www -n -a toc README
+
+NEWS.html: NEWS www/style.css
+	asciidoc --theme style -a themedir=`pwd`/www NEWS
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/Makefile.in b/Makefile.in
index 0f50944e..475a4e6a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
@@ -164,9 +167,9 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
+	cscope distdir distdir-am dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+	config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -183,9 +186,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README ar-lib \
@@ -229,10 +229,13 @@ am__relativize = \
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -251,6 +254,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -259,13 +264,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -320,7 +323,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -335,7 +337,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -443,8 +444,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -618,8 +619,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -684,7 +687,7 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -699,6 +702,10 @@ dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 
+dist-zstd: distdir
+	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+	$(am__post_remove_distdir)
+
 dist-tarZ: distdir
 	@echo WARNING: "Support for distribution archives compressed with" \
 		       "legacy program 'compress' is deprecated." >&2
@@ -710,7 +717,7 @@ dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -728,7 +735,7 @@ dist dist-all:
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -738,9 +745,11 @@ distcheck: dist
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
+	*.tar.zst*) \
+	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
@@ -756,7 +765,7 @@ distcheck: dist
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -920,7 +929,7 @@ uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA
 	am--refresh check check-am clean clean-cscope clean-generic \
 	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
 	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
+	dist-zstd distcheck distclean distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-desktopDATA \
diff --git a/NEWS.html b/NEWS.html
index 1d84e546..5992f794 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
 <title>Psensor NEWS</title>
 <style type="text/css">
 
@@ -2980,7 +2981,7 @@ <h2 id="_v0_1_0">v0.1.0</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2016-08-25 23:02:17 CEST
+ 2025-11-07 09:12:10 UTC
 </div>
 </div>
 </body>
diff --git a/README.html b/README.html
index 510d0dde..3b52eff1 100644
--- a/README.html
+++ b/README.html
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
 <title>Psensor README</title>
 <style type="text/css">
 
@@ -378,9 +379,9 @@
 <body class="article">
 <div id="header">
 <h1>Psensor README</h1>
-<div id="toc">
-  <div id="toctitle">Table of Contents</div>
-  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
+<div id="toc">
+  <div id="toctitle">Table of Contents</div>
+  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
 </div>
 </div>
 <div id="content">
@@ -688,7 +689,7 @@ <h2 id="_contact">4. Contact</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2016-06-05 13:12:53 CEST
+ 2025-11-07 09:12:10 UTC
 </div>
 </div>
 </body>
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..bdce6c86
--- /dev/null
+++ b/README.md
@@ -0,0 +1,57 @@
+psensor
+- adjustment to avoid too small sensorlist area
+- fix memory leak.
+- support CMakefile.
+
+psensor — CMake build
+
+This repository has been migrated from autotools to CMake. The CMake build
+produces two targets:
+
+- psensor — the GUI application
+- psensor-server — the HTTP server
+
+Quick build
+
+```bash
+mkdir -p build
+cd build
+cmake ..
+make -j$(nproc)
+```
+
+Install
+
+```bash
+# install to default prefix (/usr/local)
+sudo cmake --install .
+
+# or configure prefix explicitly
+cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+make -j
+sudo make install
+```
+
+Options and feature toggles
+
+You can enable/disable optional features using CMake options when configuring:
+
+- WITH_GTOP=ON|OFF — enable libgtop support (default ON)
+- WITH_NVIDIA=ON|OFF — try to detect and enable NVIDIA support (default ON)
+- WITH_ATI=ON|OFF — try to enable ATI ADL support (default OFF)
+
+If required development packages are missing, the build system will silently
+exclude platform-specific source files and compile with the fallback stubs.
+
+Notes
+
+- The CMake build provides compile-time definitions that mimic the autoconf
+  macros (HAVE_LIBSENSORS, PACKAGE_DATA_DIR, DATADIR, etc.).
+- The original autotools files are still present in the repo. If you want
+  me to move or remove them, tell me and I will back them up first.
+
+Build .deb for Ubuntu:
+```bash
+make-deb.sh
+``` 
+
diff --git a/aclocal.m4 b/aclocal.m4
index 0aef9eb0..71946713 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,417 +14,14 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
+[m4_warning([this file was generated for autoconf 2.71.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# gettext.m4 serial 67 (gettext-0.19.6)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.  If NEEDSYMBOL is specified and is
-dnl    'need-formatstring-macros', then GNU gettext implementations that don't
-dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value '$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
-    [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
-  define([gt_included_intl],
-    ifelse([$1], [external],
-      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
-      [yes]))
-  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED([$2])
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Sometimes libintl requires libiconv, so first search for libiconv.
-  dnl Ideally we would do this search only after the
-  dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
-  dnl the configure script would need to contain the same shell code
-  dnl again, outside any 'if'. There are two solutions:
-  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
-  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
-  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
-  dnl documented, we avoid it.
-  ifelse(gt_included_intl, yes, , [
-    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-  ])
-
-  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
-  dnl Set USE_NLS.
-  AC_REQUIRE([AM_NLS])
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH([included-gettext],
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_LINK_IFELSE(
-            [AC_LANG_PROGRAM(
-               [[
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-               ]],
-               [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
-               ]])],
-            [eval "$gt_func_gnugettext_libc=yes"],
-            [eval "$gt_func_gnugettext_libc=no"])])
-
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            [$gt_func_gnugettext_libintl],
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_LINK_IFELSE(
-              [AC_LANG_PROGRAM(
-                 [[
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-                 ]],
-                 [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-                 ]])],
-              [eval "$gt_func_gnugettext_libintl=yes"],
-              [eval "$gt_func_gnugettext_libintl=no"])
-            dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_LINK_IFELSE(
-                [AC_LANG_PROGRAM(
-                   [[
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
-                   ]],
-                   [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-                   ]])],
-                [LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
-                ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
-                && test "$PACKAGE" != gettext-runtime \
-                && test "$PACKAGE" != gettext-tools; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
-
-      CATOBJEXT=
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE([ENABLE_NLS], [1],
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
-  fi
-
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
-  if test "$USE_NLS" = "yes"; then
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
-
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE([HAVE_GETTEXT], [1],
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE([HAVE_DCGETTEXT], [1],
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
-
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST([BUILD_INCLUDED_LIBINTL])
-    AC_SUBST([USE_INCLUDED_LIBINTL])
-    AC_SUBST([CATOBJEXT])
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST([DATADIRNAME])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST([INSTOBJEXT])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST([GENCAT])
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INTLOBJS=
-    if test "$USE_INCLUDED_LIBINTL" = yes; then
-      INTLOBJS="\$(GETTOBJS)"
-    fi
-    AC_SUBST([INTLOBJS])
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST([INTLLIBS])
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST([LIBINTL])
-  AC_SUBST([LTLIBINTL])
-  AC_SUBST([POSUB])
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
-  m4_divert_text([DEFAULTS], [gt_needs=])
-  m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
-  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-
-dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
+# Increment this whenever this file is changed.
+#serial 2
 
 dnl GLIB_GSETTINGS
 dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
@@ -433,6 +30,10 @@ dnl
 
 AC_DEFUN([GLIB_GSETTINGS],
 [
+  dnl We can't use PKG_PREREQ because that needs 0.29.
+  m4_ifndef([PKG_PROG_PKG_CONFIG],
+            [pkg.m4 version 0.28 or later is required])
+
   m4_pattern_allow([AM_V_GEN])
   AC_ARG_ENABLE(schemas-compile,
                 AS_HELP_STRING([--disable-schemas-compile],
@@ -445,11 +46,9 @@ AC_DEFUN([GLIB_GSETTINGS],
   AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
   PKG_PROG_PKG_CONFIG([0.16])
   AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
-  if test x$cross_compiling != xyes; then
-    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
-  else
-    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
-  fi
+  AS_IF([test x$cross_compiling != xyes],
+        [PKG_CHECK_VAR([GLIB_COMPILE_SCHEMAS], [gio-2.0], [glib_compile_schemas])],
+        [AC_PATH_PROG([GLIB_COMPILE_SCHEMAS], [glib-compile-schemas])])
   AC_SUBST(GLIB_COMPILE_SCHEMAS)
   if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
     ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
@@ -510,1494 +109,9 @@ m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
 ]
 )
 
-# iconv.m4 serial 19 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
+# pkg.m4 - Macros to locate and use pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
 
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM(
-         [[
-#include <stdlib.h>
-#include <iconv.h>
-         ]],
-         [[iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);]])],
-      [am_cv_func_iconv=yes])
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-           ]],
-           [[iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);]])],
-        [am_cv_lib_iconv=yes]
-        [am_cv_func_iconv=yes])
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
-      dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
-      dnl Solaris 10.
-      am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      am_cv_func_iconv_works=no
-      for ac_iconv_const in '' 'const'; do
-        AC_RUN_IFELSE(
-          [AC_LANG_PROGRAM(
-             [[
-#include <iconv.h>
-#include <string.h>
-
-#ifndef ICONV_CONST
-# define ICONV_CONST $ac_iconv_const
-#endif
-             ]],
-             [[int result = 0;
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\263";
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
-  return result;
-]])],
-          [am_cv_func_iconv_works=yes], ,
-          [case "$host_os" in
-             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-             *)            am_cv_func_iconv_works="guessing yes" ;;
-           esac])
-        test "$am_cv_func_iconv_works" = no || break
-      done
-      LIBS="$am_save_LIBS"
-    ])
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-    AC_DEFINE([HAVE_ICONV], [1],
-      [Define if you have the iconv() function and it works.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST([LIBICONV])
-  AC_SUBST([LTLIBICONV])
-])
-
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
-m4_define([gl_iconv_AC_DEFUN],
-  m4_version_prereq([2.64],
-    [[AC_DEFUN_ONCE(
-        [$1], [$2])]],
-    [m4_ifdef([gl_00GNULIB],
-       [[AC_DEFUN_ONCE(
-           [$1], [$2])]],
-       [[AC_DEFUN(
-           [$1], [$2])]])]))
-gl_iconv_AC_DEFUN([AM_ICONV],
-[
-  AM_ICONV_LINK
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL([am_cv_proto_iconv], [
-      AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM(
-           [[
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-           ]],
-           [[]])],
-        [am_cv_proto_iconv_arg1=""],
-        [am_cv_proto_iconv_arg1="const"])
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([
-         $am_cv_proto_iconv])
-    AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
-      [Define as const if the declaration of iconv() needs const.])
-    dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
-    m4_ifdef([gl_ICONV_H_DEFAULTS],
-      [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
-       if test -n "$am_cv_proto_iconv_arg1"; then
-         ICONV_CONST="const"
-       fi
-      ])
-  fi
-])
-
-# intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on Mac OS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
-  dnl Check for API introduced in Mac OS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    [gt_cv_func_CFPreferencesCopyAppValue],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFPreferences.h>]],
-          [[CFPreferencesCopyAppValue(NULL, NULL)]])],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
-      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
-  fi
-  dnl Check for API introduced in Mac OS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <CoreFoundation/CFLocale.h>]],
-          [[CFLocaleCopyCurrent();]])],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
-      [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
-  fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
-  fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
-
-# lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
-
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
-*)
-  acl_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-2.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-        [assume the C compiler uses GNU ld [default=no]])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL([acl_cv_path_LD],
-[if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
-      *)
-        test "$with_gnu_ld" != yes && break
-        ;;
-      esac
-    fi
-  done
-  IFS="$acl_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT([$LD])
-else
-  AC_MSG_RESULT([no])
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
-
-# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.54])
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-    ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. The missing-message
-dnl defaults to 'no' and may contain additional hints for the user.
-dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
-dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[m4_translit([$1],[./+-], [____])])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
-    dnl because these -l options might require -L options that are present in
-    dnl LIBS. -l options benefit only from the -L options listed before it.
-    dnl Otherwise, add it to the front of LIBS, because it may be a static
-    dnl library that depends on another static library that is present in LIBS.
-    dnl Static libraries benefit only from the static libraries listed after
-    dnl it.
-    case " $LIB[]NAME" in
-      *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
-      *)       LIBS="$LIB[]NAME $LIBS" ;;
-    esac
-    AC_LINK_IFELSE(
-      [AC_LANG_PROGRAM([[$3]], [[$4]])],
-      [ac_cv_lib[]Name=yes],
-      [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-    LIB[]NAME[]_PREFIX=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  AC_SUBST([LIB]NAME[_PREFIX])
-  popdef([NAME])
-  popdef([Name])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl   acl_libext,
-dnl   acl_shlibext,
-dnl   acl_libname_spec,
-dnl   acl_library_names_spec,
-dnl   acl_hardcode_libdir_flag_spec,
-dnl   acl_hardcode_libdir_separator,
-dnl   acl_hardcode_direct,
-dnl   acl_hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  dnl Determine whether the user wants rpath handling at all.
-  AC_ARG_ENABLE([rpath],
-    [  --disable-rpath         do not hardcode runtime library paths],
-    :, enable_rpath=yes)
-])
-
-dnl AC_LIB_FROMPACKAGE(name, package)
-dnl declares that libname comes from the given package. The configure file
-dnl will then not have a --with-libname-prefix option but a
-dnl --with-package-prefix option. Several libraries can come from the same
-dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
-dnl macro call that searches for libname.
-AC_DEFUN([AC_LIB_FROMPACKAGE],
-[
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_frompackage_]NAME, [$2])
-  popdef([NAME])
-  pushdef([PACK],[$2])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
-  popdef([PACKUP])
-  popdef([PACK])
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
-                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
-                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-  pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
-  dnl Autoconf >= 2.61 supports dots in --with options.
-  pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH(P_A_C_K[-prefix],
-[[  --with-]]P_A_C_K[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
-  --without-]]P_A_C_K[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  LIB[]NAME[]_PREFIX=
-  dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
-  dnl computed. So it has to be reset here.
-  HAVE_LIB[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
-          if test $use_additional = yes; then
-            dir="$additional_libdir"
-            dnl The same code as in the loop below:
-            dnl First look for a shared library.
-            if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
-              fi
-            fi
-            dnl Then look for a static library.
-            if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  dnl First look for a shared library.
-                  if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
-                    else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
-                    fi
-                  fi
-                  dnl Then look for a static library.
-                  if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
-                    fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$acl_hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$acl_hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = '$1'; then
-                  LIB[]NAME[]_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -R*)
-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
-                    if test "$enable_rpath" != no; then
-                      dnl Potentially add DIR to rpathdirs.
-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
-                      haveit=
-                      for x in $rpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        rpathdirs="$rpathdirs $dir"
-                      fi
-                      dnl Potentially add DIR to ltrpathdirs.
-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                      haveit=
-                      for x in $ltrpathdirs; do
-                        if test "X$x" = "X$dir"; then
-                          haveit=yes
-                          break
-                        fi
-                      done
-                      if test -z "$haveit"; then
-                        ltrpathdirs="$ltrpathdirs $dir"
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-  popdef([P_A_C_K])
-  popdef([PACKLIBS])
-  popdef([PACKUP])
-  popdef([PACK])
-  popdef([NAME])
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
-
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
-[
-  AC_REQUIRE([AC_LIB_RPATH])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  $1=
-  if test "$enable_rpath" != no; then
-    if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
-      dnl Use an explicit option to hardcode directories into the resulting
-      dnl binary.
-      rpathdirs=
-      next=
-      for opt in $2; do
-        if test -n "$next"; then
-          dir="$next"
-          dnl No need to hardcode the standard /usr/lib.
-          if test "X$dir" != "X/usr/$acl_libdirstem" \
-             && test "X$dir" != "X/usr/$acl_libdirstem2"; then
-            rpathdirs="$rpathdirs $dir"
-          fi
-          next=
-        else
-          case $opt in
-            -L) next=yes ;;
-            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
-                 dnl No need to hardcode the standard /usr/lib.
-                 if test "X$dir" != "X/usr/$acl_libdirstem" \
-                    && test "X$dir" != "X/usr/$acl_libdirstem2"; then
-                   rpathdirs="$rpathdirs $dir"
-                 fi
-                 next= ;;
-            *) next= ;;
-          esac
-        fi
-      done
-      if test "X$rpathdirs" != "X"; then
-        if test -n ""$3""; then
-          dnl libtool is used for linking. Use -R options.
-          for dir in $rpathdirs; do
-            $1="${$1}${$1:+ }-R$dir"
-          done
-        else
-          dnl The linker is used for linking directly.
-          if test -n "$acl_hardcode_libdir_separator"; then
-            dnl Weird platform: only the last -rpath option counts, the user
-            dnl must pass all path elements in one option.
-            alldirs=
-            for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
-            done
-            acl_save_libdir="$libdir"
-            libdir="$alldirs"
-            eval flag=\"$acl_hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
-            $1="$flag"
-          else
-            dnl The -rpath options are cumulative.
-            for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
-              libdir="$dir"
-              eval flag=\"$acl_hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
-              $1="${$1}${$1:+ }$flag"
-            done
-          fi
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST([$1])
-])
-
-# lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_LIB_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_PREPARE_MULTILIB creates
-dnl - a variable acl_libdirstem, containing the basename of the libdir, either
-dnl   "lib" or "lib64" or "lib/64",
-dnl - a variable acl_libdirstem2, as a secondary possible value for
-dnl   acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
-dnl   "lib/amd64".
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
-  dnl There is no formal standard regarding lib and lib64.
-  dnl On glibc systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
-  dnl the compiler's default mode by looking at the compiler's library search
-  dnl path. If at least one of its elements ends in /lib64 or points to a
-  dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
-  dnl Otherwise we use the default, namely "lib".
-  dnl On Solaris systems, the current practice is that on a system supporting
-  dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
-  dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
-  dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-      dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
-      dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
-      dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
-      dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
-      dnl symlink is missing, so we set acl_libdirstem2 too.
-      AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
-        [AC_EGREP_CPP([sixtyfour bits], [
-#ifdef _LP64
-sixtyfour bits
-#endif
-           ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
-        ])
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
-        esac
-      fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-])
-
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29.1)
-dnl
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@@ -2038,7 +152,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.1])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@@ -2083,7 +197,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
 dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
 dnl
 dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-dnl only at the first occurence in configure.ac, so if the first place
+dnl only at the first occurrence in configure.ac, so if the first place
 dnl it's called might be skipped (such as if it is within an "if", you
 dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
@@ -2139,7 +253,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -2149,17 +263,17 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else
+                $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+        # Put the nasty error message in config.log where it belongs
+        echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	m4_default([$4], [AC_MSG_ERROR(
+        m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -2170,8 +284,8 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
+        AC_MSG_RESULT([no])
+        m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -2181,10 +295,10 @@ _PKG_TEXT
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
         ])
 else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	$3
+        $3
 fi[]dnl
 ])dnl PKG_CHECK_MODULES
 
@@ -2271,553 +385,75 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
-# po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+dnl   [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------
 dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
+dnl Prepare a "--with-" configure option using the lowercase
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN([PKG_WITH_MODULES],
 [
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  AC_REQUIRE([AC_PROG_SED])dnl
-  AC_REQUIRE([AM_NLS])dnl
-
-  dnl Release version of the gettext macros. This is used to ensure that
-  dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-
-  dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([MSGFMT_015])
-changequote(,)dnl
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([GMSGFMT_015])
-
-  dnl Search for GNU xgettext 0.12 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
-  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([XGETTEXT_015])
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
-  dnl Installation directories.
-  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
-  dnl have to define it here, so that it can be used in po/Makefile.
-  test -n "$localedir" || localedir='${datadir}/locale'
-  AC_SUBST([localedir])
-
-  dnl Support for AM_XGETTEXT_OPTION.
-  test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-  AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
-  AC_CONFIG_COMMANDS([po-directories], [[
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          POMAKEFILEDEPS="POTFILES.in"
-          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$OBSOLETE_ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-          else
-            # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
-            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
-          fi
-          # Compute POFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-          # Compute UPDATEPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-          # Compute DUMMYPOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-          # Compute GMOFILES
-          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          GMOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done]],
-   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
-    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake < 1.5.
-    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
+m4_pushdef([with_arg], m4_tolower([$1]))
 
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
-  # When this code is run, in config.status, two variables have already been
-  # set:
-  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
-  # - LINGUAS is the value of the environment variable LINGUAS at configure
-  #   time.
-
-changequote(,)dnl
-  # Adjust a relative srcdir.
-  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-  ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-  # In autoconf-2.13 it is called $ac_given_srcdir.
-  # In autoconf-2.50 it is called $srcdir.
-  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-  case "$ac_given_srcdir" in
-    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-    /*) top_srcdir="$ac_given_srcdir" ;;
-    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
+m4_pushdef([description],
+           [m4_default([$5], [build with ]with_arg[ support])])
 
-  # Find a way to echo strings without interpreting backslash.
-  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
-    gt_echo='echo'
-  else
-    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
-      gt_echo='printf %s\n'
-    else
-      echo_func () {
-        cat <<EOT
-$*
-EOT
-      }
-      gt_echo='echo_func'
-    fi
-  fi
+m4_pushdef([def_arg], [m4_default([$6], [auto])])
+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
 
-  # A sed script that extracts the value of VARIABLE from a Makefile.
-  tab=`printf '\t'`
-  sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
-  # Seen the first line of the variable definition.
-  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
-  ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
-  # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
-  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
-  # Compute POTFILES_DEPS as
-  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
-  POTFILES_DEPS=
-  for file in $POTFILES; do
-    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
-  done
-  POMAKEFILEDEPS=""
+m4_case(def_arg,
+            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
+            [m4_pushdef([with_without],[--with-]with_arg)])
 
-  if test -n "$OBSOLETE_ALL_LINGUAS"; then
-    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-  fi
-  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-    # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
-  else
-    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
-    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
-  fi
-  # Hide the ALL_LINGUAS assignment from automake < 1.5.
-  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-  # Compute POFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
-  # Compute UPDATEPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
-  # Compute DUMMYPOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
-  # Compute GMOFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
-  # Compute PROPERTIESFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
-  # Compute CLASSFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
-  # Compute QMFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
-  # Compute MSGFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
-  case "$ac_given_srcdir" in
-    .) srcdirpre= ;;
-    *) srcdirpre='$(srcdir)/' ;;
-  esac
-  POFILES=
-  UPDATEPOFILES=
-  DUMMYPOFILES=
-  GMOFILES=
-  PROPERTIESFILES=
-  CLASSFILES=
-  QMFILES=
-  MSGFILES=
-  RESOURCESDLLFILES=
-  for lang in $ALL_LINGUAS; do
-    POFILES="$POFILES $srcdirpre$lang.po"
-    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
-    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
-    QMFILES="$QMFILES $srcdirpre$lang.qm"
-    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
-  done
-  # CATALOGS depends on both $ac_dir and the user's LINGUAS
-  # environment variable.
-  INST_LINGUAS=
-  if test -n "$ALL_LINGUAS"; then
-    for presentlang in $ALL_LINGUAS; do
-      useit=no
-      if test "%UNSET%" != "$LINGUAS"; then
-        desiredlanguages="$LINGUAS"
-      else
-        desiredlanguages="$ALL_LINGUAS"
-      fi
-      for desiredlang in $desiredlanguages; do
-        # Use the presentlang catalog if desiredlang is
-        #   a. equal to presentlang, or
-        #   b. a variant of presentlang (because in this case,
-        #      presentlang can be used as a fallback for messages
-        #      which are not translated in the desiredlang catalog).
-        case "$desiredlang" in
-          "$presentlang"*) useit=yes;;
-        esac
-      done
-      if test $useit = yes; then
-        INST_LINGUAS="$INST_LINGUAS $presentlang"
-      fi
-    done
-  fi
-  CATALOGS=
-  JAVACATALOGS=
-  QTCATALOGS=
-  TCLCATALOGS=
-  CSHARPCATALOGS=
-  if test -n "$INST_LINGUAS"; then
-    for lang in $INST_LINGUAS; do
-      CATALOGS="$CATALOGS $lang.gmo"
-      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
-      QTCATALOGS="$QTCATALOGS $lang.qm"
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
-    done
-  fi
+AC_ARG_WITH(with_arg,
+     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
+    [AS_TR_SH([with_]with_arg)=def_arg])
 
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
-  tab=`printf '\t'`
-  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
-  if test -n "$POMAKEFILEDEPS"; then
-    cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
-  fi
-  mv "$ac_file.tmp" "$ac_file"
-])
+AS_CASE([$AS_TR_SH([with_]with_arg)],
+            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
+            [auto],[PKG_CHECK_MODULES([$1],[$2],
+                                        [m4_n([def_action_if_found]) $3],
+                                        [m4_n([def_action_if_not_found]) $4])])
 
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
-  XGETTEXT_EXTRA_OPTIONS=
-])
+m4_popdef([with_arg])
+m4_popdef([description])
+m4_popdef([def_arg])
 
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
-  AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
-  XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
+])dnl PKG_WITH_MODULES
 
-# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2015 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [DESCRIPTION], [DEFAULT])
+dnl -----------------------------------------------
 dnl
-dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ([2.50])
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
+AC_DEFUN([PKG_HAVE_WITH_MODULES],
+[
+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
 
-# Search path for a program which passes the given test.
+AM_CONDITIONAL([HAVE_][$1],
+               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+])dnl PKG_HAVE_WITH_MODULES
 
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
+dnl and preprocessor variable.
+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
 [
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
-fi
+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
 
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  ac_executable_p="test -x"
-else
-  ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL([ac_cv_path_$1],
-[case "[$]$1" in
-  [[\\/]]* | ?:[[\\/]]*)
-    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-    ;;
-  *)
-    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in ifelse([$5], , $PATH, [$5]); do
-      IFS="$ac_save_IFS"
-      test -z "$ac_dir" && ac_dir=.
-      for ac_exec_ext in '' $ac_executable_extensions; do
-        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
-          if [$3]; then
-            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
-            break 2
-          fi
-        fi
-      done
-    done
-    IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-    ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$][$1])
-else
-  AC_MSG_RESULT([no])
-fi
-AC_SUBST([$1])dnl
-])
+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
+        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
+])dnl PKG_HAVE_DEFINE_WITH_MODULES
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2829,10 +465,10 @@ AC_SUBST([$1])dnl
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.16.5], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2848,12 +484,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.16.5])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2915,7 +551,7 @@ AC_SUBST([AR])dnl
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2967,7 +603,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -2998,7 +634,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3189,13 +825,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -3203,49 +838,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE([$CONFIG_FILES],
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    am_filepart=`AS_BASENAME(["$am_mf"])`
+    AM_RUN_LOG([cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles]) || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE="gmake" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).])
+  fi
+  AS_UNSET([am_dirpart])
+  AS_UNSET([am_filepart])
+  AS_UNSET([am_mf])
+  AS_UNSET([am_rc])
+  rm -f conftest-deps.mk
 }
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
@@ -3254,18 +883,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3293,6 +921,10 @@ m4_defn([AC_PROG_CC])
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_PREREQ([2.65])dnl
+m4_ifdef([_$0_ALREADY_INIT],
+  [m4_fatal([$0 expanded multiple times
+]m4_defn([_$0_ALREADY_INIT]))],
+  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -3329,7 +961,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
   [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
@@ -3352,8 +984,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@@ -3381,6 +1013,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 		  [m4_define([AC_PROG_OBJCXX],
 			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+AC_SUBST([CTAGS])
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+AC_SUBST([ETAGS])
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+AC_SUBST([CSCOPE])
+
 AC_REQUIRE([AM_SILENT_RULES])dnl
 dnl The testsuite driver may need to know about EXEEXT, so add the
 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
@@ -3420,7 +1066,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -3462,7 +1108,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3483,7 +1129,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3504,7 +1150,7 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3512,49 +1158,42 @@ AC_SUBST([am__leading_dot])])
 
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
 AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+      ['0:this is the am__doit target'],
+      [AS_CASE([$s],
+          [BSD], [am__include='.include' am__quote='"'],
+          [am__include='include' am__quote=''])])
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3575,12 +1214,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
 if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
@@ -3591,9 +1225,41 @@ else
 fi
 ])
 
+# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for 'mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl FIXME we are no longer going to remove this! adjust warning
+dnl FIXME message accordingly.
+AC_DIAGNOSE([obsolete],
+[$0: this macro is deprecated, and will soon be removed.
+You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3622,7 +1288,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3669,7 +1335,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3688,7 +1354,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3769,7 +1435,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3829,7 +1495,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3857,7 +1523,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3876,7 +1542,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -4007,3 +1673,11 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/gettext.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/po.m4])
+m4_include([m4/progtest.m4])
diff --git a/ar-lib b/ar-lib
index fe2301e7..c349042c 100755
--- a/ar-lib
+++ b/ar-lib
@@ -2,9 +2,9 @@
 # Wrapper for Microsoft lib.exe
 
 me=ar-lib
-scriptversion=2012-03-01.08; # UTC
+scriptversion=2019-07-04.01; # UTC
 
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2021 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda@lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@ scriptversion=2012-03-01.08; # UTC
 # 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/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -65,7 +65,7 @@ func_file_conv ()
 	mingw)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin)
+	cygwin | msys)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine)
@@ -224,10 +224,11 @@ elif test -n "$extract"; then
       esac
     done
   else
-    $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member
-    do
-      $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
-    done
+    $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \
+      | while read member
+        do
+          $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $?
+        done
   fi
 
 elif test -n "$quick$replace"; then
diff --git a/compile b/compile
index 531136b0..df363c8f 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # 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/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/config.guess b/config.guess
index b79252d6..7f76b622 100755
--- a/config.guess
+++ b/config.guess
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2013-06-10'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-09'
 
 # This file 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
+# 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
@@ -15,7 +17,7 @@ timestamp='2013-06-10'
 # 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/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -24,12 +26,20 @@ timestamp='2013-06-10'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
+
+
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -39,7 +49,7 @@ Usage: $0 [OPTION]
 
 Output the configuration name of the system \`$me' is run on.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -50,7 +60,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -84,7 +94,8 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
+# Just in case it came from the environment.
+GUESS=
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -96,66 +107,90 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
+
+set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039,SC3028
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+	{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+	{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+	{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+	,,)    echo "int x;" > "$dummy.c"
+	       for driver in cc gcc c89 c99 ; do
+		   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+		       CC_FOR_BUILD=$driver
+		       break
+		   fi
+	       done
+	       if test x"$CC_FOR_BUILD" = x ; then
+		   CC_FOR_BUILD=no_compiler_found
+	       fi
+	       ;;
+	,,*)   CC_FOR_BUILD=$CC ;;
+	,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+if test -f /.attbin/uname ; then
 	PATH=$PATH:/.attbin ; export PATH
 fi
 
 UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_SYSTEM}" in
+case $UNAME_SYSTEM in
 Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
+	LIBC=unknown
 
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
+	set_cc_for_build
+	cat <<-EOF > "$dummy.c"
 	#include <features.h>
 	#if defined(__UCLIBC__)
 	LIBC=uclibc
 	#elif defined(__dietlibc__)
 	LIBC=dietlibc
-	#else
+	#elif defined(__GLIBC__)
 	LIBC=gnu
+	#else
+	#include <stdarg.h>
+	/* First heuristic to detect musl libc.  */
+	#ifdef __DEFINED_va_list
+	LIBC=musl
+	#endif
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	eval "$cc_set_libc"
+
+	# Second heuristic to detect musl libc.
+	if [ "$LIBC" = unknown ] &&
+	   command -v ldd >/dev/null &&
+	   ldd --version 2>&1 | grep -q ^musl; then
+		LIBC=musl
+	fi
+
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	if [ "$LIBC" = unknown ]; then
+		LIBC=gnu
+	fi
 	;;
 esac
 
 # Note: order is significant - the case branches are not exclusive.
 
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
@@ -167,22 +202,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \
+	    echo unknown)`
+	case $UNAME_MACHINE_ARCH in
+	    aarch64eb) machine=aarch64_be-unknown ;;
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	    earmv*)
+		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
+	    *) machine=$UNAME_MACHINE_ARCH-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
+	# to ELF recently (or will in the future) and ABI.
+	case $UNAME_MACHINE_ARCH in
+	    earm*)
+		os=netbsdelf
+		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
+		set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
 		then
@@ -197,45 +242,80 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case $UNAME_MACHINE_ARCH in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
 	# kernel version information, so it can be replaced with a
 	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
+	case $UNAME_VERSION in
 	    Debian*)
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
+	GUESS=$machine-${os}${release}${abi-}
+	;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE
+	;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE
+	;;
+    *:SecBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'`
+	GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE
+	;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE
+	;;
+    *:MidnightBSD:*:*)
+	GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE
+	;;
     *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE
+	;;
     *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE
+	;;
+    *:OS108:*:*)
+	GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE
+	;;
     macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE
+	;;
     *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE
+	;;
+    *:Sortix:*:*)
+	GUESS=$UNAME_MACHINE-unknown-sortix
+	;;
+    *:Twizzler:*:*)
+	GUESS=$UNAME_MACHINE-unknown-twizzler
+	;;
+    *:Redox:*:*)
+	GUESS=$UNAME_MACHINE-unknown-redox
+	;;
+    mips:OSF1:*.*)
+	GUESS=mips-dec-osf1
+	;;
     alpha:OSF1:*:*)
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	trap '' 0
 	case $UNAME_RELEASE in
 	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -249,163 +329,158 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# covers most systems running today.  This code pipes the CPU
 	# types through head -n 1, so we only detect the type of CPU 0.
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
+	case $ALPHA_CPU_TYPE in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
+	OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	GUESS=$UNAME_MACHINE-dec-osf$OSF_REL
+	;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
+	GUESS=m68k-unknown-sysv4
+	;;
     *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-amigaos
+	;;
     *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-morphos
+	;;
     *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
+	GUESS=i370-ibm-openedition
+	;;
     *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
+	GUESS=s390-ibm-zvmoe
+	;;
     *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
+	GUESS=powerpc-ibm-os400
+	;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
+	GUESS=arm-acorn-riscix$UNAME_RELEASE
+	;;
     arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
+	GUESS=arm-unknown-riscos
+	;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
+	GUESS=hppa1.1-hitachi-hiuxmpp
+	;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
+	case `(/bin/universe) 2>/dev/null` in
+	    att) GUESS=pyramid-pyramid-sysv3 ;;
+	    *)   GUESS=pyramid-pyramid-bsd   ;;
+	esac
+	;;
     NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
+	GUESS=pyramid-pyramid-svr4
+	;;
     DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
+	GUESS=sparc-icl-nx6
+	;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
+	    sparc) GUESS=sparc-icl-nx7 ;;
+	esac
+	;;
     s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL
+	;;
     sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=sparc-hal-solaris2$SUN_REL
+	;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=sparc-sun-solaris2$SUN_REL
+	;;
     i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-pc-auroraux$UNAME_RELEASE
+	;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	set_cc_for_build
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=$SUN_ARCH-pc-solaris2$SUN_REL
+	;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=sparc-sun-solaris3$SUN_REL
+	;;
     sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
+	case `/usr/bin/arch -k` in
 	    Series*|S4*)
 		UNAME_RELEASE=`uname -v`
 		;;
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
+	GUESS=sparc-sun-sunos$SUN_REL
+	;;
     sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-sun-sunos$UNAME_RELEASE
+	;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
+	test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3
+	case `/bin/arch` in
 	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
+		GUESS=m68k-sun-sunos$UNAME_RELEASE
 		;;
 	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
+		GUESS=sparc-sun-sunos$UNAME_RELEASE
 		;;
 	esac
-	exit ;;
+	;;
     aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-auspex-sunos$UNAME_RELEASE
+	;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -415,44 +490,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-atari-mint$UNAME_RELEASE
+	;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-milan-mint$UNAME_RELEASE
+	;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-hades-mint$UNAME_RELEASE
+	;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-unknown-mint$UNAME_RELEASE
+	;;
     m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-apple-machten$UNAME_RELEASE
+	;;
     powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-apple-machten$UNAME_RELEASE
+	;;
     RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
+	GUESS=mips-dec-mach_bsd4.3
+	;;
     RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-dec-ultrix$UNAME_RELEASE
+	;;
     VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
+	GUESS=vax-dec-ultrix$UNAME_RELEASE
+	;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
+	GUESS=clipper-intergraph-clix$UNAME_RELEASE
+	;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
 	int main (int argc, char *argv[]) {
@@ -461,95 +536,96 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 #endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	  printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0);
 	#endif
 	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	  printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0);
 	#endif
 	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	  printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0);
 	#endif
 	#endif
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" &&
+	  dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`"$dummy" "$dummyarg"` &&
 	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-mips-riscos$UNAME_RELEASE
+	;;
     Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
+	GUESS=powerpc-motorola-powermax
+	;;
     Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
+	GUESS=powerpc-harris-powermax
+	;;
     Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
+	GUESS=powerpc-harris-powerunix
+	;;
     m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
+	GUESS=m88k-harris-cxux7
+	;;
     m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
+	GUESS=m88k-motorola-sysv4
+	;;
     m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
     AViiON:dgux:*:*)
 	# DG/UX returns AViiON for all architectures
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110
 	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \
+	       test "$TARGET_BINARY_INTERFACE"x = x
 	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
+		GUESS=m88k-dg-dgux$UNAME_RELEASE
 	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+		GUESS=m88k-dg-dguxbcs$UNAME_RELEASE
 	    fi
 	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
+	    GUESS=i586-dg-dgux$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
+	GUESS=m88k-dolphin-sysv3
+	;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
+	GUESS=m88k-motorola-sysv3
+	;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
+	GUESS=m88k-tektronix-sysv3
+	;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
+	GUESS=m68k-tektronix-bsd
+	;;
     *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
+	IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'`
+	GUESS=mips-sgi-irix$IRIX_REL
+	;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+	GUESS=romp-ibm-aix    # uname -m gives an 8 hex-code CPU id
+	;;                    # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
+	GUESS=i386-ibm-aix
+	;;
     ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
+	if test -x /usr/bin/oslevel ; then
 		IBM_REV=`/usr/bin/oslevel`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV
+	;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
+		set_cc_for_build
+		sed 's/^		//' << EOF > "$dummy.c"
 		#include <sys/systemcfg.h>
 
 		main()
@@ -560,76 +636,77 @@ EOF
 			exit(0);
 			}
 EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"`
 		then
-			echo "$SYSTEM_NAME"
+			GUESS=$SYSTEM_NAME
 		else
-			echo rs6000-ibm-aix3.2.5
+			GUESS=rs6000-ibm-aix3.2.5
 		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
+		GUESS=rs6000-ibm-aix3.2.4
 	else
-		echo rs6000-ibm-aix3.2
+		GUESS=rs6000-ibm-aix3.2
 	fi
-	exit ;;
+	;;
     *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+	if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if test -x /usr/bin/lslpp ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+		IBM_REV=$UNAME_VERSION.$UNAME_RELEASE
 	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
+	GUESS=$IBM_ARCH-ibm-aix$IBM_REV
+	;;
     *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
+	GUESS=rs6000-ibm-aix
+	;;
+    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*)
+	GUESS=romp-ibm-bsd4.4
+	;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
+	GUESS=romp-ibm-bsd$UNAME_RELEASE    # 4.3 with uname added to
+	;;                                  # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
+	GUESS=rs6000-bull-bosx
+	;;
     DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
+	GUESS=m68k-bull-sysv3
+	;;
     9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
+	GUESS=m68k-hp-bsd
+	;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
+	GUESS=m68k-hp-bsd4.4
+	;;
     9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+	case $UNAME_MACHINE in
+	    9000/31?)            HP_ARCH=m68000 ;;
+	    9000/[34]??)         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
+		if test -x /usr/bin/getconf; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		    case $sc_cpu_version in
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			case $sc_kernel_bits in
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
+		if test "$HP_ARCH" = ""; then
+		    set_cc_for_build
+		    sed 's/^		//' << EOF > "$dummy.c"
 
 		#define _HPUX_SOURCE
 		#include <stdlib.h>
@@ -662,13 +739,13 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if test "$HP_ARCH" = hppa2.0w
 	then
-	    eval $set_cc_for_build
+	    set_cc_for_build
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -679,23 +756,23 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
+	GUESS=$HP_ARCH-hp-hpux$HPUX_REV
+	;;
     ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
+	HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'`
+	GUESS=ia64-hp-hpux$HPUX_REV
+	;;
     3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	sed 's/^	//' << EOF > "$dummy.c"
 	#include <unistd.h>
 	int
 	main ()
@@ -720,38 +797,38 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+	$CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` &&
 		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
+	GUESS=unknown-hitachi-hiuxwe2
+	;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*)
+	GUESS=hppa1.1-hp-bsd
+	;;
     9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
+	GUESS=hppa1.0-hp-bsd
+	;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
+	GUESS=hppa1.0-hp-mpeix
+	;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*)
+	GUESS=hppa1.1-hp-osf
+	;;
     hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
+	GUESS=hppa1.0-hp-osf
+	;;
     i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	if test -x /usr/sbin/sysversion ; then
+	    GUESS=$UNAME_MACHINE-unknown-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
+	    GUESS=$UNAME_MACHINE-unknown-osf1
 	fi
-	exit ;;
+	;;
     parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
+	GUESS=hppa1.1-hp-lites
+	;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
+	GUESS=c1-convex-bsd
+	;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
@@ -759,139 +836,148 @@ EOF
 	fi
 	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
+	GUESS=c34-convex-bsd
+	;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
+	GUESS=c38-convex-bsd
+	;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
+	GUESS=c4-convex-bsd
+	;;
     CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=ymp-cray-unicos$CRAY_REL
+	;;
     CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
 	exit ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=t90-cray-unicos$CRAY_REL
+	;;
     CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=alphaev5-cray-unicosmk$CRAY_REL
+	;;
     CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=sv1-cray-unicos$CRAY_REL
+	;;
     *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
+	CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'`
+	GUESS=craynv-cray-unicosmp$CRAY_REL
+	;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'`
+	GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
+	GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}
+	;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE
+	;;
     sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-unknown-bsdi$UNAME_RELEASE
+	;;
     *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE
+	;;
+    arm:FreeBSD:*:*)
+	UNAME_PROCESSOR=`uname -p`
+	set_cc_for_build
+	if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_PCS_VFP
+	then
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi
+	else
+	    FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	    GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf
+	fi
+	;;
     *:FreeBSD:*:*)
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
+	case $UNAME_PROCESSOR in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
-	exit ;;
+	FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL
+	;;
     i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-cygwin
+	;;
     *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw64
+	;;
     *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-mingw32
+	;;
+    *:MSYS*:*)
+	GUESS=$UNAME_MACHINE-pc-msys
+	;;
     i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-pw32
+	;;
+    *:SerenityOS:*:*)
+        GUESS=$UNAME_MACHINE-pc-serenity
+        ;;
     *:Interix*:*)
-	case ${UNAME_MACHINE} in
+	case $UNAME_MACHINE in
 	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=i586-pc-interix$UNAME_RELEASE
+		;;
 	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=x86_64-unknown-interix$UNAME_RELEASE
+		;;
 	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
+		GUESS=ia64-unknown-interix$UNAME_RELEASE
+		;;
 	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
     i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-uwin
+	;;
     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
+	GUESS=x86_64-pc-cygwin
+	;;
     prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
+	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+	GUESS=powerpcle-unknown-solaris2$SUN_REL
+	;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
+	GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'`
+	GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL
+	;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
+	GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"`
+	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
+	;;
+    *:Minix:*:*)
+	GUESS=$UNAME_MACHINE-unknown-minix
+	;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
 	  EV56)  UNAME_MACHINE=alphaev56 ;;
 	  PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -901,172 +987,226 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     arm*:Linux:*:*)
-	eval $set_cc_for_build
+	set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	    GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+		GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
-	exit ;;
+	;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-axis-linux-$LIBC
+	;;
+    e2k:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-linux-$LIBC
+	;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    k1om:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
+	set_cc_for_build
+	IS_GLIBC=0
+	test x"${LIBC}" = xgnu && IS_GLIBC=1
+	sed 's/^	//' << EOF > "$dummy.c"
 	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
+	#undef mips
+	#undef mipsel
+	#undef mips64
+	#undef mips64el
+	#if ${IS_GLIBC} && defined(_ABI64)
+	LIBCABI=gnuabi64
+	#else
+	#if ${IS_GLIBC} && defined(_ABIN32)
+	LIBCABI=gnuabin32
+	#else
+	LIBCABI=${LIBC}
+	#endif
+	#endif
+
+	#if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa64r6
+	#else
+	#if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6
+	CPU=mipsisa32r6
+	#else
+	#if defined(__mips64)
+	CPU=mips64
+	#else
+	CPU=mips
+	#endif
+	#endif
+	#endif
+
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
+	MIPS_ENDIAN=el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
+	MIPS_ENDIAN=
 	#else
-	CPU=
+	MIPS_ENDIAN=
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'`
+	eval "$cc_set_vars"
+	test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
+	;;
+    mips64el:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
+    openrisc*:Linux:*:*)
+	GUESS=or1k-unknown-linux-$LIBC
+	;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=sparc-unknown-linux-$LIBC
+	;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=hppa64-unknown-linux-$LIBC
+	;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;;
+	  PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;;
+	  *)    GUESS=hppa-unknown-linux-$LIBC ;;
 	esac
-	exit ;;
+	;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc64-unknown-linux-$LIBC
+	;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc-unknown-linux-$LIBC
+	;;
     ppc64le:Linux:*:*)
-	echo powerpc64le-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpc64le-unknown-linux-$LIBC
+	;;
     ppcle:Linux:*:*)
-	echo powerpcle-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=powerpcle-unknown-linux-$LIBC
+	;;
+    riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*)
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-ibm-linux-$LIBC
+	;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-dec-linux-$LIBC
+	;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	set_cc_for_build
+	LIBCABI=$LIBC
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
+	    if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_X32 >/dev/null
+	    then
+		LIBCABI=${LIBC}x32
+	    fi
+	fi
+	GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI
+	;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
+	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
+	GUESS=i386-sequent-sysv4
+	;;
     i*86:UNIX_SV:4.2MP:2.*)
 	# Unixware is an offshoot of SVR4, but it has its own version
 	# number series starting with 2...
 	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
 	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
+	;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-os2-emx
+	;;
     i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-stop
+	;;
     i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-atheos
+	;;
     i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-syllable
+	;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-unknown-lynxos$UNAME_RELEASE
+	;;
     i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	GUESS=$UNAME_MACHINE-pc-msdosdjgpp
+	;;
+    i*86:*:4.*:*)
+	UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+		GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+		GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL
 	fi
-	exit ;;
+	;;
     i*86:*:5:[678]*)
 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
@@ -1074,12 +1214,12 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+		GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL
 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
@@ -1089,43 +1229,43 @@ EOF
 			&& UNAME_MACHINE=i686
 		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+		GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL
 	else
-		echo ${UNAME_MACHINE}-pc-sysv32
+		GUESS=$UNAME_MACHINE-pc-sysv32
 	fi
-	exit ;;
+	;;
     pc:*:*:*)
 	# Left here for compatibility:
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
+	GUESS=i586-pc-msdosdjgpp
+	;;
     Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
+	GUESS=i386-pc-mach3
+	;;
     paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
+	GUESS=i860-intel-osf1
+	;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	  GUESS=i860-stardent-sysv$UNAME_RELEASE    # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  GUESS=i860-unknown-sysv$UNAME_RELEASE     # Unknown i860-SVR4
 	fi
-	exit ;;
+	;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
+	GUESS=m68010-convergent-sysv
+	;;
     mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
+	GUESS=m68k-convergent-sysv
+	;;
     M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
+	GUESS=m68k-diab-dnix
+	;;
     M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
@@ -1133,9 +1273,9 @@ EOF
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	  && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	  && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 	  && { echo i486-ncr-sysv4; exit; } ;;
@@ -1144,228 +1284,284 @@ EOF
 	test -r /etc/.relid \
 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	    && { echo i486-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-unknown-lynxos$UNAME_RELEASE
+	;;
     mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
+	GUESS=m68k-atari-sysv4
+	;;
     TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=sparc-unknown-lynxos$UNAME_RELEASE
+	;;
     rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=rs6000-unknown-lynxos$UNAME_RELEASE
+	;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-unknown-lynxos$UNAME_RELEASE
+	;;
     SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-dde-sysv$UNAME_RELEASE
+	;;
     RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
     RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
+	GUESS=mips-sni-sysv4
+	;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
+		GUESS=$UNAME_MACHINE-sni-sysv4
 	else
-		echo ns32k-sni-sysv
+		GUESS=ns32k-sni-sysv
 	fi
-	exit ;;
+	;;
     PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
+	GUESS=i586-unisys-sysv4
+	;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
+	GUESS=hppa1.1-stratus-sysv4
+	;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
+	GUESS=i860-stratus-sysv4
+	;;
     i*86:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
+	GUESS=$UNAME_MACHINE-stratus-vos
+	;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
+	GUESS=hppa1.1-stratus-vos
+	;;
     mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
+	GUESS=m68k-apple-aux$UNAME_RELEASE
+	;;
     news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
+	GUESS=mips-sony-newsos6
+	;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
+	if test -d /usr/nec; then
+		GUESS=mips-nec-sysv$UNAME_RELEASE
 	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
+		GUESS=mips-unknown-sysv$UNAME_RELEASE
 	fi
-	exit ;;
+	;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
+	GUESS=powerpc-be-beos
+	;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
+	GUESS=powerpc-apple-beos
+	;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
+	GUESS=i586-pc-beos
+	;;
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
+	GUESS=i586-pc-haiku
+	;;
     x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
+	GUESS=x86_64-unknown-haiku
+	;;
     SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx4-nec-superux$UNAME_RELEASE
+	;;
     SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx5-nec-superux$UNAME_RELEASE
+	;;
     SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx6-nec-superux$UNAME_RELEASE
+	;;
     SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx7-nec-superux$UNAME_RELEASE
+	;;
     SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx8-nec-superux$UNAME_RELEASE
+	;;
     SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
+	GUESS=sx8r-nec-superux$UNAME_RELEASE
+	;;
+    SX-ACE:SUPER-UX:*:*)
+	GUESS=sxace-nec-superux$UNAME_RELEASE
+	;;
     Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	GUESS=powerpc-apple-rhapsody$UNAME_RELEASE
+	;;
     *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE
+	;;
+    arm64:Darwin:*:*)
+	GUESS=aarch64-apple-darwin$UNAME_RELEASE
+	;;
     *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
+	UNAME_PROCESSOR=`uname -p`
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	if command -v xcode-select > /dev/null 2> /dev/null && \
+		! xcode-select --print-path > /dev/null 2> /dev/null ; then
+	    # Avoid executing cc if there is no toolchain installed as
+	    # cc will be a stub that puts up a graphical alert
+	    # prompting the user to install developer tools.
+	    CC_FOR_BUILD=no_compiler_found
+	else
+	    set_cc_for_build
 	fi
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if test "$CC_FOR_BUILD" != no_compiler_found; then
 	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_64BIT_ARCH >/dev/null
 	    then
 		case $UNAME_PROCESSOR in
 		    i386) UNAME_PROCESSOR=x86_64 ;;
 		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
 		esac
 	    fi
+	    # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
+	    if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
+		   (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		   grep IS_PPC >/dev/null
+	    then
+		UNAME_PROCESSOR=powerpc
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # uname -m returns i386 or x86_64
+	    UNAME_PROCESSOR=$UNAME_MACHINE
 	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE
+	;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE
+	;;
     *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	GUESS=i386-pc-qnx
+	;;
+    NEO-*:NONSTOP_KERNEL:*:*)
+	GUESS=neo-tandem-nsk$UNAME_RELEASE
+	;;
     NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
+	GUESS=nse-tandem-nsk$UNAME_RELEASE
+	;;
+    NSR-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsr-tandem-nsk$UNAME_RELEASE
+	;;
+    NSV-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsv-tandem-nsk$UNAME_RELEASE
+	;;
+    NSX-*:NONSTOP_KERNEL:*:*)
+	GUESS=nsx-tandem-nsk$UNAME_RELEASE
+	;;
     *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
+	GUESS=mips-compaq-nonstopux
+	;;
     BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
+	GUESS=bs2000-siemens-sysv
+	;;
     DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
+	GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE
+	;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "${cputype-}" = 386; then
 	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
+	elif test "x${cputype-}" != x; then
+	    UNAME_MACHINE=$cputype
 	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-plan9
+	;;
     *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
+	GUESS=pdp10-unknown-tops10
+	;;
     *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
+	GUESS=pdp10-unknown-tenex
+	;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
+	GUESS=pdp10-dec-tops20
+	;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
+	GUESS=pdp10-xkl-tops20
+	;;
     *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
+	GUESS=pdp10-unknown-tops20
+	;;
     *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
+	GUESS=pdp10-unknown-its
+	;;
     SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
+	GUESS=mips-sei-seiux$UNAME_RELEASE
+	;;
     *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
+	DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
+	GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL
+	;;
     *:*VMS:*:*)
 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
+	case $UNAME_MACHINE in
+	    A*) GUESS=alpha-dec-vms ;;
+	    I*) GUESS=ia64-dec-vms ;;
+	    V*) GUESS=vax-dec-vms ;;
 	esac ;;
     *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
+	GUESS=i386-pc-xenix
+	;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
+	SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`
+	GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL
+	;;
     i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
+	GUESS=$UNAME_MACHINE-pc-rdos
+	;;
+    i*86:Fiwix:*:*)
+	GUESS=$UNAME_MACHINE-pc-fiwix
+	;;
+    *:AROS:*:*)
+	GUESS=$UNAME_MACHINE-unknown-aros
+	;;
     x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
+	GUESS=$UNAME_MACHINE-unknown-esx
+	;;
+    amd64:Isilon\ OneFS:*:*)
+	GUESS=x86_64-unknown-onefs
+	;;
+    *:Unleashed:*:*)
+	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
+	;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
+# Do we have a guess based on uname results?
+if test "x$GUESS" != x; then
+    echo "$GUESS"
+    exit
+fi
+
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
 #ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include <sys/utsname.h>
+#endif
+#endif
 #endif
 main ()
 {
@@ -1378,20 +1574,12 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-	"4"
+  "4"
 #else
-	""
-#endif
-	); exit (0);
+  ""
 #endif
+  ); exit (0);
 #endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
 #endif
 
 #if defined (NeXT)
@@ -1433,39 +1621,54 @@ main ()
 #endif
 
 #if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
+  struct utsname un;
 
+  uname(&un);
+  if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+  }
+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+  }
+  printf ("i386-sequent-ptx\n"); exit (0);
 #endif
 
 #if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+  printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname un;
+  uname (&un);
+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname *un;
+  uname (&un);
+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
+#else
+  printf ("mips-dec-ultrix\n"); exit (0);
+#endif
+#endif
 #endif
 
 #if defined (alliant) && defined (i860)
@@ -1476,54 +1679,46 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` &&
 	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+echo "$0: unable to guess system type" >&2
 
-# Convex versions that predate uname can use getsysinfo(1)
+case $UNAME_MACHINE:$UNAME_SYSTEM in
+    mips:Linux | mips64:Linux)
+	# If we got here on MIPS GNU/Linux, output extra information.
+	cat >&2 <<EOF
 
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
+NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize
+the system type. Please install a C compiler and try again.
+EOF
+	;;
+esac
 
 cat >&2 <<EOF
-$0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite *all*
+copies of config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+EOF
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+our_year=`echo $timestamp | sed 's,-.*,,'`
+thisyear=`date +%Y`
+# shellcheck disable=SC2003
+script_age=`expr "$thisyear" - "$our_year"`
+if test "$script_age" -lt 3 ; then
+   cat >&2 <<EOF
+
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
@@ -1542,16 +1737,17 @@ hostinfo               = `(hostinfo) 2>/dev/null`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
+UNAME_MACHINE = "$UNAME_MACHINE"
+UNAME_RELEASE = "$UNAME_RELEASE"
+UNAME_SYSTEM  = "$UNAME_SYSTEM"
+UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/config.h.cmake b/config.h.cmake
new file mode 100644
index 00000000..cba269bf
--- /dev/null
+++ b/config.h.cmake
@@ -0,0 +1,26 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#cmakedefine HAVE_APPINDICATOR
+#cmakedefine HAVE_ATASMART
+#cmakedefine HAVE_CURL
+#cmakedefine HAVE_GTOP
+#cmakedefine HAVE_JSON
+#cmakedefine HAVE_LIBATIADL
+#cmakedefine HAVE_LIBMICROHTTPD
+#cmakedefine HAVE_LIBNOTIFY
+#cmakedefine HAVE_LIBSENSORS
+#cmakedefine HAVE_LIBUDISKS2
+#cmakedefine HAVE_NVIDIA
+#cmakedefine HAVE_REMOTE_SUPPORT
+#cmakedefine HAVE_UNITY
+
+#define PACKAGE "@PROJECT_NAME@"
+#define PACKAGE_NAME "@PROJECT_NAME@"
+#define PACKAGE_VERSION "@PROJECT_VERSION@"
+#define PACKAGE_STRING "@PROJECT_NAME@ @PROJECT_VERSION@"
+#define PACKAGE_BUGREPORT "jeanfi@gmail.com"
+#define PACKAGE_URL "http://wpitchoune.net/psensor"
+#define VERSION "@PROJECT_VERSION@"
+
+#endif /* CONFIG_H */
\ No newline at end of file
diff --git a/config.h.in b/config.h.in
index d2323bf3..821fd78e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -13,11 +13,11 @@
 /* Use libatasmart */
 #undef HAVE_ATASMART
 
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
 
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
@@ -34,7 +34,7 @@
 /* Use GTOP */
 #undef HAVE_GTOP
 
-/* Define if you have the iconv() function and it works. */
+/* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
 /* Define to 1 if you have the <inttypes.h> header file. */
@@ -64,9 +64,6 @@
 /* Use libudisks */
 #undef HAVE_LIBUDISKS2
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define to 1 if you have the <NVCtrl/NVCtrlLib.h> header file. */
 #undef HAVE_NVCTRL_NVCTRLLIB_H
 
@@ -91,6 +88,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -112,6 +112,9 @@
 /* Use Unity */
 #undef HAVE_UNITY
 
+/* Location of gettext message catalogs */
+#undef LOCALEDIR
+
 /* Name of package */
 #undef PACKAGE
 
@@ -133,17 +136,14 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
 /* Version number of package */
 #undef VERSION
 
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
diff --git a/config.sub b/config.sub
index 9633db70..dba16e84 100755
--- a/config.sub
+++ b/config.sub
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2022 Free Software Foundation, Inc.
 
-timestamp='2013-08-10'
+# shellcheck disable=SC2006,SC2268 # see below for rationale
+
+timestamp='2022-01-03'
 
 # This file 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
+# 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
@@ -15,7 +17,7 @@ timestamp='2013-08-10'
 # 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/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -25,7 +27,7 @@ timestamp='2013-08-10'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -33,7 +35,7 @@ timestamp='2013-08-10'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -50,15 +52,21 @@ timestamp='2013-08-10'
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
+# The "shellcheck disable" line above the timestamp inhibits complaints
+# about features and limitations of the classic Bourne shell that were
+# superseded or lifted in POSIX.  However, this script identifies a wide
+# variety of pre-POSIX systems that do not have POSIX shells at all, and
+# even some reasonably current systems (Solaris 10 as case-in-point) still
+# have a pre-POSIX /bin/sh.
+
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
-Operation modes:
+Options:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
@@ -68,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -90,12 +98,12 @@ while test $# -gt 0 ; do
     - )	# Use stdin as input.
        break ;;
     -* )
-       echo "$me: invalid option $1$help"
+       echo "$me: invalid option $1$help" >&2
        exit 1 ;;
 
     *local*)
        # First pass through any local machine types.
-       echo $1
+       echo "$1"
        exit ;;
 
     * )
@@ -111,1209 +119,1186 @@ case $# in
     exit 1;;
 esac
 
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
+# Split fields of configuration type
+# shellcheck disable=SC2162
+saved_IFS=$IFS
+IFS="-" read field1 field2 field3 field4 <<EOF
+$1
+EOF
+IFS=$saved_IFS
 
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
+# Separate into logical components for further validation
+case $1 in
+	*-*-*-*-*)
+		echo Invalid configuration \`"$1"\': more than four components >&2
+		exit 1
 		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+	*-*-*-*)
+		basic_machine=$field1-$field2
+		basic_os=$field3-$field4
 		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+	*-*-*)
+		# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
+		# parts
+		maybe_os=$field2-$field3
+		case $maybe_os in
+			nto-qnx* | linux-* | uclinux-uclibc* \
+			| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
+			| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
+			| storm-chaos* | os2-emx* | rtmk-nova*)
+				basic_machine=$field1
+				basic_os=$maybe_os
+				;;
+			android-linux)
+				basic_machine=$field1-unknown
+				basic_os=linux-android
+				;;
+			*)
+				basic_machine=$field1-$field2
+				basic_os=$field3
+				;;
+		esac
 		;;
-	-psos*)
-		os=-psos
+	*-*)
+		# A lone config we happen to match not fitting any pattern
+		case $field1-$field2 in
+			decstation-3100)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			*-*)
+				# Second component is usually, but not always the OS
+				case $field2 in
+					# Prevent following clause from handling this valid os
+					sun*os*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+					zephyr*)
+						basic_machine=$field1-unknown
+						basic_os=$field2
+						;;
+					# Manufacturers
+					dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
+					| att* | 7300* | 3300* | delta* | motorola* | sun[234]* \
+					| unicom* | ibm* | next | hp | isi* | apollo | altos* \
+					| convergent* | ncr* | news | 32* | 3600* | 3100* \
+					| hitachi* | c[123]* | convex* | sun | crds | omron* | dg \
+					| ultra | tti* | harris | dolphin | highlevel | gould \
+					| cbm | ns | masscomp | apple | axis | knuth | cray \
+					| microblaze* | sim | cisco \
+					| oki | wec | wrs | winbond)
+						basic_machine=$field1-$field2
+						basic_os=
+						;;
+					*)
+						basic_machine=$field1
+						basic_os=$field2
+						;;
+				esac
+			;;
+		esac
 		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
+	*)
+		# Convert single-component short-hands not valid as part of
+		# multi-component configurations.
+		case $field1 in
+			386bsd)
+				basic_machine=i386-pc
+				basic_os=bsd
+				;;
+			a29khif)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			adobe68k)
+				basic_machine=m68010-adobe
+				basic_os=scout
+				;;
+			alliant)
+				basic_machine=fx80-alliant
+				basic_os=
+				;;
+			altos | altos3068)
+				basic_machine=m68k-altos
+				basic_os=
+				;;
+			am29k)
+				basic_machine=a29k-none
+				basic_os=bsd
+				;;
+			amdahl)
+				basic_machine=580-amdahl
+				basic_os=sysv
+				;;
+			amiga)
+				basic_machine=m68k-unknown
+				basic_os=
+				;;
+			amigaos | amigados)
+				basic_machine=m68k-unknown
+				basic_os=amigaos
+				;;
+			amigaunix | amix)
+				basic_machine=m68k-unknown
+				basic_os=sysv4
+				;;
+			apollo68)
+				basic_machine=m68k-apollo
+				basic_os=sysv
+				;;
+			apollo68bsd)
+				basic_machine=m68k-apollo
+				basic_os=bsd
+				;;
+			aros)
+				basic_machine=i386-pc
+				basic_os=aros
+				;;
+			aux)
+				basic_machine=m68k-apple
+				basic_os=aux
+				;;
+			balance)
+				basic_machine=ns32k-sequent
+				basic_os=dynix
+				;;
+			blackfin)
+				basic_machine=bfin-unknown
+				basic_os=linux
+				;;
+			cegcc)
+				basic_machine=arm-unknown
+				basic_os=cegcc
+				;;
+			convex-c1)
+				basic_machine=c1-convex
+				basic_os=bsd
+				;;
+			convex-c2)
+				basic_machine=c2-convex
+				basic_os=bsd
+				;;
+			convex-c32)
+				basic_machine=c32-convex
+				basic_os=bsd
+				;;
+			convex-c34)
+				basic_machine=c34-convex
+				basic_os=bsd
+				;;
+			convex-c38)
+				basic_machine=c38-convex
+				basic_os=bsd
+				;;
+			cray)
+				basic_machine=j90-cray
+				basic_os=unicos
+				;;
+			crds | unos)
+				basic_machine=m68k-crds
+				basic_os=
+				;;
+			da30)
+				basic_machine=m68k-da30
+				basic_os=
+				;;
+			decstation | pmax | pmin | dec3100 | decstatn)
+				basic_machine=mips-dec
+				basic_os=
+				;;
+			delta88)
+				basic_machine=m88k-motorola
+				basic_os=sysv3
+				;;
+			dicos)
+				basic_machine=i686-pc
+				basic_os=dicos
+				;;
+			djgpp)
+				basic_machine=i586-pc
+				basic_os=msdosdjgpp
+				;;
+			ebmon29k)
+				basic_machine=a29k-amd
+				basic_os=ebmon
+				;;
+			es1800 | OSE68k | ose68k | ose | OSE)
+				basic_machine=m68k-ericsson
+				basic_os=ose
+				;;
+			gmicro)
+				basic_machine=tron-gmicro
+				basic_os=sysv
+				;;
+			go32)
+				basic_machine=i386-pc
+				basic_os=go32
+				;;
+			h8300hms)
+				basic_machine=h8300-hitachi
+				basic_os=hms
+				;;
+			h8300xray)
+				basic_machine=h8300-hitachi
+				basic_os=xray
+				;;
+			h8500hms)
+				basic_machine=h8500-hitachi
+				basic_os=hms
+				;;
+			harris)
+				basic_machine=m88k-harris
+				basic_os=sysv3
+				;;
+			hp300 | hp300hpux)
+				basic_machine=m68k-hp
+				basic_os=hpux
+				;;
+			hp300bsd)
+				basic_machine=m68k-hp
+				basic_os=bsd
+				;;
+			hppaosf)
+				basic_machine=hppa1.1-hp
+				basic_os=osf
+				;;
+			hppro)
+				basic_machine=hppa1.1-hp
+				basic_os=proelf
+				;;
+			i386mach)
+				basic_machine=i386-mach
+				basic_os=mach
+				;;
+			isi68 | isi)
+				basic_machine=m68k-isi
+				basic_os=sysv
+				;;
+			m68knommu)
+				basic_machine=m68k-unknown
+				basic_os=linux
+				;;
+			magnum | m3230)
+				basic_machine=mips-mips
+				basic_os=sysv
+				;;
+			merlin)
+				basic_machine=ns32k-utek
+				basic_os=sysv
+				;;
+			mingw64)
+				basic_machine=x86_64-pc
+				basic_os=mingw64
+				;;
+			mingw32)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			mingw32ce)
+				basic_machine=arm-unknown
+				basic_os=mingw32ce
+				;;
+			monitor)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			morphos)
+				basic_machine=powerpc-unknown
+				basic_os=morphos
+				;;
+			moxiebox)
+				basic_machine=moxie-unknown
+				basic_os=moxiebox
+				;;
+			msdos)
+				basic_machine=i386-pc
+				basic_os=msdos
+				;;
+			msys)
+				basic_machine=i686-pc
+				basic_os=msys
+				;;
+			mvs)
+				basic_machine=i370-ibm
+				basic_os=mvs
+				;;
+			nacl)
+				basic_machine=le32-unknown
+				basic_os=nacl
+				;;
+			ncr3000)
+				basic_machine=i486-ncr
+				basic_os=sysv4
+				;;
+			netbsd386)
+				basic_machine=i386-pc
+				basic_os=netbsd
+				;;
+			netwinder)
+				basic_machine=armv4l-rebel
+				basic_os=linux
+				;;
+			news | news700 | news800 | news900)
+				basic_machine=m68k-sony
+				basic_os=newsos
+				;;
+			news1000)
+				basic_machine=m68030-sony
+				basic_os=newsos
+				;;
+			necv70)
+				basic_machine=v70-nec
+				basic_os=sysv
+				;;
+			nh3000)
+				basic_machine=m68k-harris
+				basic_os=cxux
+				;;
+			nh[45]000)
+				basic_machine=m88k-harris
+				basic_os=cxux
+				;;
+			nindy960)
+				basic_machine=i960-intel
+				basic_os=nindy
+				;;
+			mon960)
+				basic_machine=i960-intel
+				basic_os=mon960
+				;;
+			nonstopux)
+				basic_machine=mips-compaq
+				basic_os=nonstopux
+				;;
+			os400)
+				basic_machine=powerpc-ibm
+				basic_os=os400
+				;;
+			OSE68000 | ose68000)
+				basic_machine=m68000-ericsson
+				basic_os=ose
+				;;
+			os68k)
+				basic_machine=m68k-none
+				basic_os=os68k
+				;;
+			paragon)
+				basic_machine=i860-intel
+				basic_os=osf
+				;;
+			parisc)
+				basic_machine=hppa-unknown
+				basic_os=linux
+				;;
+			psp)
+				basic_machine=mipsallegrexel-sony
+				basic_os=psp
+				;;
+			pw32)
+				basic_machine=i586-unknown
+				basic_os=pw32
+				;;
+			rdos | rdos64)
+				basic_machine=x86_64-pc
+				basic_os=rdos
+				;;
+			rdos32)
+				basic_machine=i386-pc
+				basic_os=rdos
+				;;
+			rom68k)
+				basic_machine=m68k-rom68k
+				basic_os=coff
+				;;
+			sa29200)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			sei)
+				basic_machine=mips-sei
+				basic_os=seiux
+				;;
+			sequent)
+				basic_machine=i386-sequent
+				basic_os=
+				;;
+			sps7)
+				basic_machine=m68k-bull
+				basic_os=sysv2
+				;;
+			st2000)
+				basic_machine=m68k-tandem
+				basic_os=
+				;;
+			stratus)
+				basic_machine=i860-stratus
+				basic_os=sysv4
+				;;
+			sun2)
+				basic_machine=m68000-sun
+				basic_os=
+				;;
+			sun2os3)
+				basic_machine=m68000-sun
+				basic_os=sunos3
+				;;
+			sun2os4)
+				basic_machine=m68000-sun
+				basic_os=sunos4
+				;;
+			sun3)
+				basic_machine=m68k-sun
+				basic_os=
+				;;
+			sun3os3)
+				basic_machine=m68k-sun
+				basic_os=sunos3
+				;;
+			sun3os4)
+				basic_machine=m68k-sun
+				basic_os=sunos4
+				;;
+			sun4)
+				basic_machine=sparc-sun
+				basic_os=
+				;;
+			sun4os3)
+				basic_machine=sparc-sun
+				basic_os=sunos3
+				;;
+			sun4os4)
+				basic_machine=sparc-sun
+				basic_os=sunos4
+				;;
+			sun4sol2)
+				basic_machine=sparc-sun
+				basic_os=solaris2
+				;;
+			sun386 | sun386i | roadrunner)
+				basic_machine=i386-sun
+				basic_os=
+				;;
+			sv1)
+				basic_machine=sv1-cray
+				basic_os=unicos
+				;;
+			symmetry)
+				basic_machine=i386-sequent
+				basic_os=dynix
+				;;
+			t3e)
+				basic_machine=alphaev5-cray
+				basic_os=unicos
+				;;
+			t90)
+				basic_machine=t90-cray
+				basic_os=unicos
+				;;
+			toad1)
+				basic_machine=pdp10-xkl
+				basic_os=tops20
+				;;
+			tpf)
+				basic_machine=s390x-ibm
+				basic_os=tpf
+				;;
+			udi29k)
+				basic_machine=a29k-amd
+				basic_os=udi
+				;;
+			ultra3)
+				basic_machine=a29k-nyu
+				basic_os=sym1
+				;;
+			v810 | necv810)
+				basic_machine=v810-nec
+				basic_os=none
+				;;
+			vaxv)
+				basic_machine=vax-dec
+				basic_os=sysv
+				;;
+			vms)
+				basic_machine=vax-dec
+				basic_os=vms
+				;;
+			vsta)
+				basic_machine=i386-pc
+				basic_os=vsta
+				;;
+			vxworks960)
+				basic_machine=i960-wrs
+				basic_os=vxworks
+				;;
+			vxworks68)
+				basic_machine=m68k-wrs
+				basic_os=vxworks
+				;;
+			vxworks29k)
+				basic_machine=a29k-wrs
+				basic_os=vxworks
+				;;
+			xbox)
+				basic_machine=i686-pc
+				basic_os=mingw32
+				;;
+			ymp)
+				basic_machine=ymp-cray
+				basic_os=unicos
+				;;
+			*)
+				basic_machine=$1
+				basic_os=
+				;;
+		esac
 		;;
 esac
 
-# Decode aliases for certain CPU-COMPANY combinations.
+# Decode 1-component or ad-hoc basic machines
 case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| be32 | be64 \
-	| bfin \
-	| c4x | c8051 | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
+	# Here we handle the default manufacturer of certain CPU types.  It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		cpu=hppa1.1
+		vendor=winbond
 		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
+	op50n)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
+	op60c)
+		cpu=hppa1.1
+		vendor=oki
 		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
+	ibm*)
+		cpu=i370
+		vendor=ibm
 		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
+	orion105)
+		cpu=clipper
+		vendor=highlevel
 		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
+	mac | mpw | mac-mpw)
+		cpu=m68k
+		vendor=apple
 		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| c8051-* | clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
+	pmac | pmac-mpw)
+		cpu=powerpc
+		vendor=apple
 		;;
+
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
+		cpu=m68000
+		vendor=att
 		;;
 	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
+		cpu=we32k
+		vendor=att
 		;;
 	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
+		cpu=powerpc
+		vendor=ibm
+		basic_os=cnk
 		;;
 	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops10
 		;;
 	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
+		cpu=pdp10
+		vendor=dec
+		basic_os=tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
+		cpu=m68k
+		vendor=motorola
 		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
+	dpx2*)
+		cpu=m68k
+		vendor=bull
+		basic_os=sysv3
 		;;
 	encore | umax | mmax)
-		basic_machine=ns32k-encore
+		cpu=ns32k
+		vendor=encore
 		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
+	elxsi)
+		cpu=elxsi
+		vendor=elxsi
+		basic_os=${basic_os:-bsd}
 		;;
 	fx2800)
-		basic_machine=i860-alliant
+		cpu=i860
+		vendor=alliant
 		;;
 	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
+		cpu=ns32k
+		vendor=ns
 		;;
 	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
+		cpu=m68000
+		vendor=hp
 		;;
 	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
+		cpu=m68k
+		vendor=hp
 		;;
 	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k78[0-9] | hp78[0-9])
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
+		cpu=hppa1.1
+		vendor=hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
+		cpu=hppa1.0
+		vendor=hp
 		;;
 	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv32
 		;;
 	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv4
 		;;
 	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=sysv
 		;;
 	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
+		cpu=`echo "$1" | sed -e 's/86.*/86/'`
+		vendor=pc
+		basic_os=solaris2
 		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
+	j90 | j90-cray)
+		cpu=j90
+		vendor=cray
+		basic_os=${basic_os:-unicos}
 		;;
 	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
+		cpu=mips
+		vendor=sgi
+		case $basic_os in
+		    irix*)
 			;;
 		    *)
-			os=-irix4
+			basic_os=irix4
 			;;
 		esac
 		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
-		basic_machine=m68000-convergent
+		cpu=m68000
+		vendor=convergent
 		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i686-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
+	*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		cpu=m68k
+		vendor=atari
+		basic_os=mint
 		;;
 	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
+		cpu=mips
+		vendor=sony
+		basic_os=newsos
+		;;
+	next | m*-next)
+		cpu=m68k
+		vendor=next
+		case $basic_os in
+		    openstep*)
+		        ;;
+		    nextstep*)
 			;;
-		    -ns2*)
-		      os=-nextstep2
+		    ns2*)
+		      basic_os=nextstep2
 			;;
 		    *)
-		      os=-nextstep3
+		      basic_os=nextstep3
 			;;
 		esac
 		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
 	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
+		cpu=np1
+		vendor=gould
 		;;
 	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
+		cpu=hppa1.1
+		vendor=oki
+		basic_os=proelf
 		;;
 	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
+		cpu=hppa1.1
+		vendor=hitachi
+		basic_os=hiuxwe2
 		;;
 	pbd)
-		basic_machine=sparc-tti
+		cpu=sparc
+		vendor=tti
 		;;
 	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		cpu=m68k
+		vendor=tti
 		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+	pc532)
+		cpu=ns32k
+		vendor=pc532
 		;;
 	pn)
-		basic_machine=pn-gould
+		cpu=pn
+		vendor=gould
 		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+	power)
+		cpu=power
+		vendor=ibm
 		;;
 	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
+		cpu=i386
+		vendor=ibm
 		;;
 	rm[46]00)
-		basic_machine=mips-siemens
+		cpu=mips
+		vendor=siemens
 		;;
 	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
+		cpu=romp
+		vendor=ibm
 		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
+	sde)
+		cpu=mipsisa32
+		vendor=sde
+		basic_os=${basic_os:-elf}
 		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
+	simso-wrs)
+		cpu=sparclite
+		vendor=wrs
+		basic_os=vxworks
 		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
+	tower | tower-32)
+		cpu=m68k
+		vendor=ncr
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
+	vpp*|vx|vx-*)
+		cpu=f301
+		vendor=fujitsu
 		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
+	w65)
+		cpu=w65
+		vendor=wdc
 		;;
-	sequent)
-		basic_machine=i386-sequent
+	w89k-*)
+		cpu=hppa1.1
+		vendor=winbond
+		basic_os=proelf
 		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
+	none)
+		cpu=none
+		vendor=none
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
+	leon|leon[3-9])
+		cpu=sparc
+		vendor=$basic_machine
 		;;
-	sh64)
-		basic_machine=sh64-unknown
+	leon-*|leon[3-9]-*)
+		cpu=sparc
+		vendor=`echo "$basic_machine" | sed 's/-.*//'`
 		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
+
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read cpu vendor <<EOF
+$basic_machine
+EOF
+		IFS=$saved_IFS
 		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+		cpu=$basic_machine
+		vendor=pc
 		;;
-	spur)
-		basic_machine=spur-unknown
+	# These rules are duplicated from below for sake of the special case above;
+	# i.e. things that normalized to x86 arches should also default to "pc"
+	pc98)
+		cpu=i386
+		vendor=pc
 		;;
-	st2000)
-		basic_machine=m68k-tandem
+	x64 | amd64)
+		cpu=x86_64
+		vendor=pc
 		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
+	# Recognize the basic CPU types without company name.
+	*)
+		cpu=$basic_machine
+		vendor=unknown
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+esac
+
+unset -v basic_machine
+
+# Decode basic machines in the full and proper CPU-Company form.
+case $cpu-$vendor in
+	# Here we handle the default manufacturer of certain CPU types in canonical form. It is in
+	# some cases the only manufacturer, in others, it is the most popular.
+	craynv-unknown)
+		vendor=cray
+		basic_os=${basic_os:-unicosmp}
 		;;
-	sun2)
-		basic_machine=m68000-sun
+	c90-unknown | c90-cray)
+		vendor=cray
+		basic_os=${Basic_os:-unicos}
 		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
+	fx80-unknown)
+		vendor=alliant
 		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
+	romp-unknown)
+		vendor=ibm
 		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
+	mmix-unknown)
+		vendor=knuth
 		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
+	microblaze-unknown | microblazeel-unknown)
+		vendor=xilinx
 		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
+	rs6000-unknown)
+		vendor=ibm
 		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
+	vax-unknown)
+		vendor=dec
 		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
+	pdp11-unknown)
+		vendor=dec
 		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
+	we32k-unknown)
+		vendor=att
 		;;
-	sun4)
-		basic_machine=sparc-sun
+	cydra-unknown)
+		vendor=cydrome
 		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
+	i370-ibm*)
+		vendor=ibm
 		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
+	orion-unknown)
+		vendor=highlevel
 		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
+	xps-unknown | xps100-unknown)
+		cpu=xps100
+		vendor=honeywell
 		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
+
+	# Here we normalize CPU types with a missing or matching vendor
+	armh-unknown | armh-alt)
+		cpu=armv7l
+		vendor=alt
+		basic_os=${basic_os:-linux-gnueabihf}
 		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
+	dpx20-unknown | dpx20-bull)
+		cpu=rs6000
+		vendor=bull
+		basic_os=${basic_os:-bosx}
 		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
+
+	# Here we normalize CPU types irrespective of the vendor
+	amd64-*)
+		cpu=x86_64
 		;;
-	tx39)
-		basic_machine=mipstx39-unknown
+	blackfin-*)
+		cpu=bfin
+		basic_os=linux
 		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
+	c54x-*)
+		cpu=tic54x
 		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
+	c55x-*)
+		cpu=tic55x
 		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
+	c6x-*)
+		cpu=tic6x
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
+	e500v[12]-*)
+		cpu=powerpc
+		basic_os=${basic_os}"spe"
 		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
+	mips3*-*)
+		cpu=mips64
 		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
+	ms1-*)
+		cpu=mt
 		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
+	m68knommu-*)
+		cpu=m68k
+		basic_os=linux
 		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
+	m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
+		cpu=s12z
 		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
+	openrisc-*)
+		cpu=or32
 		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
+	parisc-*)
+		cpu=hppa
+		basic_os=linux
 		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		cpu=i586
 		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
+	pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+		cpu=i686
 		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		cpu=i686
 		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
+	pentium4-*)
+		cpu=i786
 		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
+	pc98-*)
+		cpu=i386
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
+	ppc-* | ppcbe-*)
+		cpu=powerpc
 		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
+	ppcle-* | powerpclittle-*)
+		cpu=powerpcle
 		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+	ppc64-*)
+		cpu=powerpc64
 		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
+	ppc64le-* | powerpc64little-*)
+		cpu=powerpc64le
 		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
+	sb1-*)
+		cpu=mipsisa64sb1
 		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
+	sb1el-*)
+		cpu=mipsisa64sb1el
 		;;
-	none)
-		basic_machine=none-none
-		os=-none
+	sh5e[lb]-*)
+		cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'`
 		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
+	spur-*)
+		cpu=spur
 		;;
-	op50n)
-		basic_machine=hppa1.1-oki
+	strongarm-* | thumb-*)
+		cpu=arm
 		;;
-	op60c)
-		basic_machine=hppa1.1-oki
+	tx39-*)
+		cpu=mipstx39
 		;;
-	romp)
-		basic_machine=romp-ibm
+	tx39el-*)
+		cpu=mipstx39el
 		;;
-	mmix)
-		basic_machine=mmix-knuth
+	x64-*)
+		cpu=x86_64
 		;;
-	rs6000)
-		basic_machine=rs6000-ibm
+	xscale-* | xscalee[bl]-*)
+		cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
 		;;
-	vax)
-		basic_machine=vax-dec
+	arm64-* | aarch64le-*)
+		cpu=aarch64
 		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
+
+	# Recognize the canonical CPU Types that limit and/or modify the
+	# company names they are paired with.
+	cr16-*)
+		basic_os=${basic_os:-elf}
 		;;
-	pdp11)
-		basic_machine=pdp11-dec
+	crisv32-* | etraxfs*-*)
+		cpu=crisv32
+		vendor=axis
 		;;
-	we32k)
-		basic_machine=we32k-att
+	cris-* | etrax*-*)
+		cpu=cris
+		vendor=axis
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
+	crx-*)
+		basic_os=${basic_os:-elf}
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
+	neo-tandem)
+		cpu=neo
+		vendor=tandem
 		;;
-	cydra)
-		basic_machine=cydra-cydrome
+	nse-tandem)
+		cpu=nse
+		vendor=tandem
 		;;
-	orion)
-		basic_machine=orion-highlevel
+	nsr-tandem)
+		cpu=nsr
+		vendor=tandem
 		;;
-	orion105)
-		basic_machine=clipper-highlevel
+	nsv-tandem)
+		cpu=nsv
+		vendor=tandem
 		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
+	nsx-tandem)
+		cpu=nsx
+		vendor=tandem
 		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
+	mipsallegrexel-sony)
+		cpu=mipsallegrexel
+		vendor=sony
 		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
+	tile*-*)
+		basic_os=${basic_os:-linux-gnu}
 		;;
+
 	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
+		# Recognize the canonical CPU types that are allowed with any
+		# company name.
+		case $cpu in
+			1750a | 580 \
+			| a29k \
+			| aarch64 | aarch64_be \
+			| abacus \
+			| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
+			| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
+			| alphapca5[67] | alpha64pca5[67] \
+			| am33_2.0 \
+			| amdgcn \
+			| arc | arceb | arc32 | arc64 \
+			| arm | arm[lb]e | arme[lb] | armv* \
+			| avr | avr32 \
+			| asmjs \
+			| ba \
+			| be32 | be64 \
+			| bfin | bpf | bs2000 \
+			| c[123]* | c30 | [cjt]90 | c4x \
+			| c8051 | clipper | craynv | csky | cydra \
+			| d10v | d30v | dlx | dsp16xx \
+			| e2k | elxsi | epiphany \
+			| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
+			| h8300 | h8500 \
+			| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+			| hexagon \
+			| i370 | i*86 | i860 | i960 | ia16 | ia64 \
+			| ip2k | iq2000 \
+			| k1om \
+			| le32 | le64 \
+			| lm32 \
+			| loongarch32 | loongarch64 | loongarchx32 \
+			| m32c | m32r | m32rle \
+			| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
+			| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
+			| m88110 | m88k | maxq | mb | mcore | mep | metag \
+			| microblaze | microblazeel \
+			| mips | mipsbe | mipseb | mipsel | mipsle \
+			| mips16 \
+			| mips64 | mips64eb | mips64el \
+			| mips64octeon | mips64octeonel \
+			| mips64orion | mips64orionel \
+			| mips64r5900 | mips64r5900el \
+			| mips64vr | mips64vrel \
+			| mips64vr4100 | mips64vr4100el \
+			| mips64vr4300 | mips64vr4300el \
+			| mips64vr5000 | mips64vr5000el \
+			| mips64vr5900 | mips64vr5900el \
+			| mipsisa32 | mipsisa32el \
+			| mipsisa32r2 | mipsisa32r2el \
+			| mipsisa32r3 | mipsisa32r3el \
+			| mipsisa32r5 | mipsisa32r5el \
+			| mipsisa32r6 | mipsisa32r6el \
+			| mipsisa64 | mipsisa64el \
+			| mipsisa64r2 | mipsisa64r2el \
+			| mipsisa64r3 | mipsisa64r3el \
+			| mipsisa64r5 | mipsisa64r5el \
+			| mipsisa64r6 | mipsisa64r6el \
+			| mipsisa64sb1 | mipsisa64sb1el \
+			| mipsisa64sr71k | mipsisa64sr71kel \
+			| mipsr5900 | mipsr5900el \
+			| mipstx39 | mipstx39el \
+			| mmix \
+			| mn10200 | mn10300 \
+			| moxie \
+			| mt \
+			| msp430 \
+			| nds32 | nds32le | nds32be \
+			| nfp \
+			| nios | nios2 | nios2eb | nios2el \
+			| none | np1 | ns16k | ns32k | nvptx \
+			| open8 \
+			| or1k* \
+			| or32 \
+			| orion \
+			| picochip \
+			| pdp10 | pdp11 | pj | pjl | pn | power \
+			| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+			| pru \
+			| pyramid \
+			| riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+			| rl78 | romp | rs6000 | rx \
+			| s390 | s390x \
+			| score \
+			| sh | shl \
+			| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
+			| sh[1234]e[lb] |  sh[12345][lb]e | sh[23]ele | sh64 | sh64le \
+			| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \
+			| sparclite \
+			| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
+			| spu \
+			| tahoe \
+			| thumbv7* \
+			| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
+			| tron \
+			| ubicom32 \
+			| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
+			| vax \
+			| visium \
+			| w65 \
+			| wasm32 | wasm64 \
+			| we32k \
+			| x86 | x86_64 | xc16x | xgate | xps100 \
+			| xstormy16 | xtensa* \
+			| ymp \
+			| z8k | z80)
+				;;
+
+			*)
+				echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
+				exit 1
+				;;
+		esac
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+case $vendor in
+	digital*)
+		vendor=dec
 		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+	commodore*)
+		vendor=cbm
 		;;
 	*)
 		;;
@@ -1321,200 +1306,215 @@ esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
-if [ x"$os" != x"" ]
+if test x$basic_os != x
 then
+
+# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
+# set os.
+case $basic_os in
+	gnu/linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
+		;;
+	os2-emx)
+		kernel=os2
+		os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
+		;;
+	nto-qnx*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
+		;;
+	*-*)
+		# shellcheck disable=SC2162
+		saved_IFS=$IFS
+		IFS="-" read kernel os <<EOF
+$basic_os
+EOF
+		IFS=$saved_IFS
+		;;
+	# Default OS when just kernel was specified
+	nto*)
+		kernel=nto
+		os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
+		;;
+	linux*)
+		kernel=linux
+		os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
+		;;
+	*)
+		kernel=
+		os=$basic_os
+		;;
+esac
+
+# Now, normalize the OS (knowing we just have one component, it's not a kernel,
+# etc.)
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
+	# First match some system type aliases that might get confused
+	# with valid system types.
+	# solaris* is a basic system type, with this one exception.
+	auroraux)
+		os=auroraux
 		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+	bluegene*)
+		os=cnk
 		;;
-	-solaris)
-		os=-solaris2
+	solaris1 | solaris1.*)
+		os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
 		;;
-	-svr4*)
-		os=-sysv4
+	solaris)
+		os=solaris2
 		;;
-	-unixware*)
-		os=-sysv4.2uw
+	unixware*)
+		os=sysv4.2uw
 		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+	# es1800 is here to avoid being matched by es* (a different OS)
+	es1800*)
+		os=ose
 		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
 		;;
-	-nto-qnx*)
+	isc)
+		os=isc2.2
 		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+	sco6)
+		os=sco5v6
 		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+	sco5)
+		os=sco3.2v5
 		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
+	sco4)
+		os=sco3.2v4
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
+	sco3.2.[4-9]*)
+		os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+	sco*v* | scout)
+		# Don't match below
 		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+	sco*)
+		os=sco3.2v2
 		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+	psos*)
+		os=psos
 		;;
-	-opened*)
-		os=-openedition
+	qnx*)
+		os=qnx
 		;;
-	-os400*)
-		os=-os400
+	hiux*)
+		os=hiuxwe2
 		;;
-	-wince*)
-		os=-wince
+	lynx*178)
+		os=lynxos178
 		;;
-	-osfrose*)
-		os=-osfrose
+	lynx*5)
+		os=lynxos5
 		;;
-	-osf*)
-		os=-osf
+	lynxos*)
+		# don't get caught up in next wildcard
 		;;
-	-utek*)
-		os=-bsd
+	lynx*)
+		os=lynxos
 		;;
-	-dynix*)
-		os=-bsd
+	mac[0-9]*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
-	-acis*)
-		os=-aos
+	opened*)
+		os=openedition
 		;;
-	-atheos*)
-		os=-atheos
+	os400*)
+		os=os400
 		;;
-	-syllable*)
-		os=-syllable
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
 		;;
-	-386bsd)
-		os=-bsd
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
 		;;
-	-ctix* | -uts*)
-		os=-sysv
+	wince*)
+		os=wince
 		;;
-	-nova*)
-		os=-rtmk-nova
+	utek*)
+		os=bsd
 		;;
-	-ns2 )
-		os=-nextstep2
+	dynix*)
+		os=bsd
 		;;
-	-nsk*)
-		os=-nsk
+	acis*)
+		os=aos
 		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
+	atheos*)
+		os=atheos
 		;;
-	-sinix*)
-		os=-sysv4
+	syllable*)
+		os=syllable
 		;;
-	-tpf*)
-		os=-tpf
+	386bsd)
+		os=bsd
 		;;
-	-triton*)
-		os=-sysv3
+	ctix* | uts*)
+		os=sysv
 		;;
-	-oss*)
-		os=-sysv3
+	nova*)
+		os=rtmk-nova
 		;;
-	-svr4)
-		os=-sysv4
+	ns2)
+		os=nextstep2
 		;;
-	-svr3)
-		os=-sysv3
+	# Preserve the version number of sinix5.
+	sinix5.*)
+		os=`echo "$os" | sed -e 's|sinix|sysv|'`
 		;;
-	-sysvr4)
-		os=-sysv4
+	sinix*)
+		os=sysv4
 		;;
-	# This must come after -sysvr4.
-	-sysv*)
+	tpf*)
+		os=tpf
 		;;
-	-ose*)
-		os=-ose
+	triton*)
+		os=sysv3
 		;;
-	-es1800*)
-		os=-ose
+	oss*)
+		os=sysv3
 		;;
-	-xenix)
-		os=-xenix
+	svr4*)
+		os=sysv4
 		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
+	svr3)
+		os=sysv3
 		;;
-	-aros*)
-		os=-aros
+	sysvr4)
+		os=sysv4
 		;;
-	-zvmoe)
-		os=-zvmoe
+	ose*)
+		os=ose
 		;;
-	-dicos*)
-		os=-dicos
+	*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
+		os=mint
 		;;
-	-nacl*)
+	dicos*)
+		os=dicos
 		;;
-	-none)
+	pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $cpu in
+		    arm*)
+			os=eabi
+			;;
+		    *)
+			os=elf
+			;;
+		esac
 		;;
 	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
+		# No normalization, but not necessarily accepted, that comes below.
 		;;
 esac
+
 else
 
 # Here we handle the default operating systems that come with various machines.
@@ -1527,264 +1527,363 @@ else
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
-case $basic_machine in
+kernel=
+case $cpu-$vendor in
 	score-*)
-		os=-elf
+		os=elf
 		;;
 	spu-*)
-		os=-elf
+		os=elf
 		;;
 	*-acorn)
-		os=-riscix1.2
+		os=riscix1.2
 		;;
 	arm*-rebel)
-		os=-linux
+		kernel=linux
+		os=gnu
 		;;
 	arm*-semi)
-		os=-aout
+		os=aout
 		;;
 	c4x-* | tic4x-*)
-		os=-coff
+		os=coff
 		;;
 	c8051-*)
-		os=-elf
+		os=elf
+		;;
+	clipper-intergraph)
+		os=clix
 		;;
 	hexagon-*)
-		os=-elf
+		os=elf
 		;;
 	tic54x-*)
-		os=-coff
+		os=coff
 		;;
 	tic55x-*)
-		os=-coff
+		os=coff
 		;;
 	tic6x-*)
-		os=-coff
+		os=coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
-		os=-tops20
+		os=tops20
 		;;
 	pdp11-*)
-		os=-none
+		os=none
 		;;
 	*-dec | vax-*)
-		os=-ultrix4.2
+		os=ultrix4.2
 		;;
 	m68*-apollo)
-		os=-domain
+		os=domain
 		;;
 	i386-sun)
-		os=-sunos4.0.2
+		os=sunos4.0.2
 		;;
 	m68000-sun)
-		os=-sunos3
+		os=sunos3
 		;;
 	m68*-cisco)
-		os=-aout
+		os=aout
 		;;
 	mep-*)
-		os=-elf
+		os=elf
 		;;
 	mips*-cisco)
-		os=-elf
+		os=elf
 		;;
 	mips*-*)
-		os=-elf
-		;;
-	or1k-*)
-		os=-elf
+		os=elf
 		;;
 	or32-*)
-		os=-coff
+		os=coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
+		os=sysv3
 		;;
 	sparc-* | *-sun)
-		os=-sunos4.1.1
+		os=sunos4.1.1
 		;;
-	*-be)
-		os=-beos
+	pru-*)
+		os=elf
 		;;
-	*-haiku)
-		os=-haiku
+	*-be)
+		os=beos
 		;;
 	*-ibm)
-		os=-aix
+		os=aix
 		;;
 	*-knuth)
-		os=-mmixware
+		os=mmixware
 		;;
 	*-wec)
-		os=-proelf
+		os=proelf
 		;;
 	*-winbond)
-		os=-proelf
+		os=proelf
 		;;
 	*-oki)
-		os=-proelf
+		os=proelf
 		;;
 	*-hp)
-		os=-hpux
+		os=hpux
 		;;
 	*-hitachi)
-		os=-hiux
+		os=hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
+		os=sysv
 		;;
 	*-cbm)
-		os=-amigaos
+		os=amigaos
 		;;
 	*-dg)
-		os=-dgux
+		os=dgux
 		;;
 	*-dolphin)
-		os=-sysv3
+		os=sysv3
 		;;
 	m68k-ccur)
-		os=-rtu
+		os=rtu
 		;;
 	m88k-omron*)
-		os=-luna
+		os=luna
 		;;
-	*-next )
-		os=-nextstep
+	*-next)
+		os=nextstep
 		;;
 	*-sequent)
-		os=-ptx
+		os=ptx
 		;;
 	*-crds)
-		os=-unos
+		os=unos
 		;;
 	*-ns)
-		os=-genix
+		os=genix
 		;;
 	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
+		os=mvs
 		;;
 	*-gould)
-		os=-sysv
+		os=sysv
 		;;
 	*-highlevel)
-		os=-bsd
+		os=bsd
 		;;
 	*-encore)
-		os=-bsd
+		os=bsd
 		;;
 	*-sgi)
-		os=-irix
+		os=irix
 		;;
 	*-siemens)
-		os=-sysv4
+		os=sysv4
 		;;
 	*-masscomp)
-		os=-rtu
+		os=rtu
 		;;
 	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
+		os=uxpv
 		;;
 	*-rom68k)
-		os=-coff
+		os=coff
 		;;
 	*-*bug)
-		os=-coff
+		os=coff
 		;;
 	*-apple)
-		os=-macos
+		os=macos
 		;;
 	*-atari*)
-		os=-mint
+		os=mint
+		;;
+	*-wrs)
+		os=vxworks
 		;;
 	*)
-		os=-none
+		os=none
 		;;
 esac
+
 fi
 
+# Now, validate our (potentially fixed-up) OS.
+case $os in
+	# Sometimes we do "kernel-libc", so those need to count as OSes.
+	musl* | newlib* | relibc* | uclibc*)
+		;;
+	# Likewise for "kernel-abi"
+	eabi* | gnueabi*)
+		;;
+	# VxWorks passes extra cpu info in the 4th filed.
+	simlinux | simwindows | spe)
+		;;
+	# Now accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST end in a * to match a version number.
+	gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
+	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+	     | sym* |  plan9* | psp* | sim* | xray* | os68k* | v88r* \
+	     | hiux* | abug | nacl* | netware* | windows* \
+	     | os9* | macos* | osx* | ios* \
+	     | mpw* | magic* | mmixware* | mon960* | lnews* \
+	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+	     | aos* | aros* | cloudabi* | sortix* | twizzler* \
+	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+	     | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+	     | mirbsd* | netbsd* | dicos* | openedition* | ose* \
+	     | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
+	     | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
+	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+	     | udi* | lites* | ieee* | go32* | aux* | hcos* \
+	     | chorusrdb* | cegcc* | glidix* | serenity* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+	     | midipix* | mingw32* | mingw64* | mint* \
+	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+	     | interix* | uwin* | mks* | rhapsody* | darwin* \
+	     | openstep* | oskit* | conix* | pw32* | nonstopux* \
+	     | storm-chaos* | tops10* | tenex* | tops20* | its* \
+	     | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
+	     | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
+	     | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+	     | fiwix* )
+		;;
+	# This one is extra strict with allowed versions
+	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	none)
+		;;
+	*)
+		echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# As a final step for OS-related things, validate the OS-kernel combination
+# (given a valid OS), if there is a kernel.
+case $kernel-$os in
+	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \
+		   | linux-musl* | linux-relibc* | linux-uclibc* )
+		;;
+	uclinux-uclibc* )
+		;;
+	-dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* )
+		# These are just libc implementations, not actual OSes, and thus
+		# require a kernel.
+		echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2
+		exit 1
+		;;
+	kfreebsd*-gnu* | kopensolaris*-gnu*)
+		;;
+	vxworks-simlinux | vxworks-simwindows | vxworks-spe)
+		;;
+	nto-qnx*)
+		;;
+	os2-emx)
+		;;
+	*-eabi* | *-gnueabi*)
+		;;
+	-*)
+		# Blank kernel with real OS is always fine.
+		;;
+	*-*)
+		echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2
+		exit 1
+		;;
+esac
+
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
+case $vendor in
+	unknown)
+		case $cpu-$os in
+			*-riscix*)
 				vendor=acorn
 				;;
-			-sunos*)
+			*-sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			*-cnk* | *-aix*)
 				vendor=ibm
 				;;
-			-beos*)
+			*-beos*)
 				vendor=be
 				;;
-			-hpux*)
+			*-hpux*)
 				vendor=hp
 				;;
-			-mpeix*)
+			*-mpeix*)
 				vendor=hp
 				;;
-			-hiux*)
+			*-hiux*)
 				vendor=hitachi
 				;;
-			-unos*)
+			*-unos*)
 				vendor=crds
 				;;
-			-dgux*)
+			*-dgux*)
 				vendor=dg
 				;;
-			-luna*)
+			*-luna*)
 				vendor=omron
 				;;
-			-genix*)
+			*-genix*)
 				vendor=ns
 				;;
-			-mvs* | -opened*)
+			*-clix*)
+				vendor=intergraph
+				;;
+			*-mvs* | *-opened*)
+				vendor=ibm
+				;;
+			*-os400*)
 				vendor=ibm
 				;;
-			-os400*)
+			s390-* | s390x-*)
 				vendor=ibm
 				;;
-			-ptx*)
+			*-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
+			*-tpf*)
 				vendor=ibm
 				;;
-			-vxsim* | -vxworks* | -windiss*)
+			*-vxsim* | *-vxworks* | *-windiss*)
 				vendor=wrs
 				;;
-			-aux*)
+			*-aux*)
 				vendor=apple
 				;;
-			-hms*)
+			*-hms*)
 				vendor=hitachi
 				;;
-			-mpw* | -macos*)
+			*-mpw* | *-macos*)
 				vendor=apple
 				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+			*-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
 				vendor=atari
 				;;
-			-vos*)
+			*-vos*)
 				vendor=stratus
 				;;
 		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
-echo $basic_machine$os
+echo "$cpu-$vendor-${kernel:+$kernel-}$os"
 exit
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
diff --git a/configure b/configure
index b32b5941..148a29d0 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,12 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for psensor 1.2.0.
+# Generated by GNU Autoconf 2.71 for psensor 1.2.0.
 #
 # Report bugs to <jeanfi@gmail.com>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -16,14 +17,16 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -33,46 +36,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -96,8 +92,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -109,30 +109,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -154,20 +134,22 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  as_bourne_compatible="as_nop=:
+if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else
+else \$as_nop
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
@@ -187,42 +169,52 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
+else \$as_nop
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
+  if (eval "$as_required") 2>/dev/null
+then :
   as_have_required=yes
-else
+else $as_nop
   as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
+	     as_shell=$as_dir$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
   break 2
 fi
 fi
@@ -230,14 +222,21 @@ fi
        esac
   as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi
+fi
 
 
-      if test "x$CONFIG_SHELL" != x; then :
+      if test "x$CONFIG_SHELL" != x
+then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -255,18 +254,19 @@ esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno
+then :
+  printf "%s\n" "$0: This script requires a shell more modern than all"
+  printf "%s\n" "$0: the shells that I found on your system."
+  if test ${ZSH_VERSION+y} ; then
+    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and jeanfi@gmail.com
+    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and jeanfi@gmail.com
 $0: about your system, including any error possibly output
 $0: before this message. Then install a modern shell, or
 $0: manually run the script under such a shell if you do
@@ -294,6 +294,7 @@ as_fn_unset ()
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -311,6 +312,14 @@ as_fn_exit ()
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_mkdir_p
 # -------------
@@ -325,7 +334,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -334,7 +343,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -373,12 +382,13 @@ as_fn_executable_p ()
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -390,18 +400,27 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
+# as_fn_nop
+# ---------
+# Do nothing but, unlike ":", preserve the value of $?.
+as_fn_nop ()
+{
+  return $?
+}
+as_nop=as_fn_nop
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
@@ -413,9 +432,9 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -442,7 +461,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -486,7 +505,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -500,6 +519,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -513,6 +536,13 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -588,40 +618,36 @@ PACKAGE_URL='http://wpitchoune.net/psensor'
 ac_unique_file="src/ui.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
 gt_needs=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
@@ -636,6 +662,7 @@ ASCIIDOC
 HELP2MAN_FALSE
 HELP2MAN_TRUE
 HELP2MAN
+pkgdatadir
 GTOP_FALSE
 GTOP_TRUE
 GTOP_LIBS
@@ -718,7 +745,6 @@ build_os
 build_vendor
 build_cpu
 build
-XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
 XGETTEXT_015
 XGETTEXT
@@ -726,11 +752,7 @@ GMSGFMT_015
 MSGFMT_015
 GMSGFMT
 MSGFMT
-GETTEXT_MACRO_VERSION
 USE_NLS
-SED
-EGREP
-GREP
 CPP
 XMKMF
 ac_ct_AR
@@ -743,7 +765,6 @@ am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
-am__quote
 am__include
 DEPDIR
 OBJEXT
@@ -757,6 +778,9 @@ AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
+CSCOPE
+ETAGS
+CTAGS
 am__untar
 am__tar
 AMTAR
@@ -818,7 +842,8 @@ PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@@ -848,6 +873,7 @@ CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+GLIB_COMPILE_SCHEMAS
 X11_CFLAGS
 X11_LIBS
 XEXT_CFLAGS
@@ -940,8 +966,6 @@ do
   *)    ac_optarg=yes ;;
   esac
 
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -982,9 +1006,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1008,9 +1032,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1221,9 +1245,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1237,9 +1261,9 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: \`$ac_useropt'"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1283,9 +1307,9 @@ Try \`$0 --help' for more information"
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1301,7 +1325,7 @@ if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1365,7 +1389,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1521,7 +1545,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-x                use the X Window System
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
@@ -1544,6 +1568,8 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  GLIB_COMPILE_SCHEMAS
+              value of glib_compile_schemas for gio-2.0, overriding pkg-config
   X11_CFLAGS  C compiler flags for X11, overriding pkg-config
   X11_LIBS    linker flags for X11, overriding pkg-config
   XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
@@ -1600,9 +1626,9 @@ if test "$ac_init_help" = "recursive"; then
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1630,7 +1656,8 @@ esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
+    # Check for configure.gnu first; this name is used for a wrapper for
+    # Metaconfig's "Configure" on case-insensitive file systems.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1638,7 +1665,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1648,9 +1675,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 psensor configure 1.2.0
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.71
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1667,14 +1694,14 @@ fi
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
+  rm -f conftest.$ac_objext conftest.beam
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1682,14 +1709,15 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest.$ac_objext
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1699,57 +1727,20 @@ fi
 
 } # ac_fn_c_try_compile
 
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -1757,17 +1748,18 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }; then :
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
@@ -1782,138 +1774,43 @@ fi
 
 } # ac_fn_c_try_link
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------- ##
-## Report this to jeanfi@gmail.com ##
-## ------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
+# ac_fn_c_try_cpp LINENO
 # ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
+printf "%s\n" "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }
+then :
   ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_retval=$ac_status
+    ac_retval=1
 fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
-} # ac_fn_c_try_run
+} # ac_fn_c_try_cpp
 
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
@@ -1922,37 +1819,59 @@ fi
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   eval "$3=yes"
-else
+else $as_nop
   eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
+ac_configure_args_raw=
+for ac_arg
+do
+  case $ac_arg in
+  *\'*)
+    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+  esac
+  as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+  *$as_nl*)
+    ac_safe_unquote= ;;
+  *)
+    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
+    ac_unsafe_a="$ac_unsafe_z#~"
+    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
+    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by psensor $as_me 1.2.0, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
-  $ $0 $@
+  $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -1985,8 +1904,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    printf "%s\n" "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -2021,7 +1944,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2056,11 +1979,13 @@ done
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+  # Sanitize IFS.
+  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    $as_echo "## ---------------- ##
+    printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -2071,8 +1996,8 @@ trap 'exit_status=$?
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -2096,7 +2021,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    $as_echo "## ----------------- ##
+    printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -2104,14 +2029,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      $as_echo "$ac_var='\''$ac_val'\''"
+      printf "%s\n" "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -2119,15 +2044,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -2135,8 +2060,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       echo
     fi
     test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
+      printf "%s\n" "$as_me: caught signal $ac_signal"
+    printf "%s\n" "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2150,63 +2075,48 @@ ac_signal=0
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
+  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
+  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+  case $ac_site_file in #(
+  */*) :
+     ;; #(
+  *) :
+    ac_site_file=./$ac_site_file ;;
+esac
+  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
@@ -2216,121 +2126,510 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-gt_needs="$gt_needs "
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-am__api_version='1.15'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+   Do not test the value of __STDC__, because some compilers set it to 0
+   while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not \xHH hex character constants.
+   These do not provoke an error unfortunately, instead are silently treated
+   as an "x".  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
+   array size at least.  It is necessary to write \x00 == 0 to get something
+   that is true only with -std.  */
+int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) '\''x'\''
+int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+               int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+// Does the compiler advertise C99 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+  #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str = "";
+  int number = 0;
+  float fnumber = 0;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case '\''s'\'': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case '\''d'\'': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case '\''f'\'': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+
+  return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+  // Check bool.
+  _Bool success = false;
+  success |= (argc != 0);
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[0] = argv[0][0];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
+	 || dynamic_array[ni.number - 1] != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+// Does the compiler advertise C11 conformance?
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+  int_alignment = _Alignof (int),
+  int_array_alignment = _Alignof (int[100]),
+  char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+  int x;
+  _Static_assert (sizeof (int) <= sizeof (long int),
+                  "_Static_assert does not work in struct");
+  long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal[] = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+  union {
+    struct { int i; int j; };
+    struct { int k; long int l; } w;
+  };
+  int m;
+} v1;
+'
 
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+  _Static_assert ((offsetof (struct anonymous, i)
+		   == offsetof (struct anonymous, w.k)),
+		  "Anonymous union alignment botch");
+  v1.i = 2;
+  v1.w.k = 5;
+  ok |= v1.i != 5;
+'
 
-# Find a good install program.  We prefer a C program (faster),
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  ${ac_c_conftest_c11_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  ${ac_c_conftest_c99_main}
+  return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+  int ok = 0;
+  ${ac_c_conftest_c89_main}
+  return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+gt_needs="$gt_needs "
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.guess config.sub config.rpath ar-lib compile missing install-sh"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.."
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+  as_found=:
+
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
+  ac_aux_dir_found=yes
+  ac_install_sh=
+  for ac_aux in $ac_aux_files
+  do
+    # As a special case, if "install-sh" is required, that requirement
+    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+    # and $ac_install_sh is set appropriately for whichever one is found.
+    if test x"$ac_aux" = x"install-sh"
+    then
+      if test -f "${as_dir}install-sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
+        ac_install_sh="${as_dir}install-sh -c"
+      elif test -f "${as_dir}install.sh"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
+        ac_install_sh="${as_dir}install.sh -c"
+      elif test -f "${as_dir}shtool"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
+        ac_install_sh="${as_dir}shtool install -c"
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+        else
+          break
+        fi
+      fi
+    else
+      if test -f "${as_dir}${ac_aux}"; then
+        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
+      else
+        ac_aux_dir_found=no
+        if $ac_first_candidate; then
+          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+        else
+          break
+        fi
+      fi
+    fi
+  done
+  if test "$ac_aux_dir_found" = yes; then
+    ac_aux_dir="$as_dir"
+    break
+  fi
+  ac_first_candidate=false
+
+  as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else $as_nop
+  as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+  ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+printf "%s\n" "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+printf "%s\n" "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file'
+	    and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+am__api_version='1.16'
+
+
+
+  # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
@@ -2344,20 +2643,25 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${ac_cv_path_install+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+  ./ | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
@@ -2367,13 +2671,13 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
 	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
@@ -2381,12 +2685,12 @@ case $as_dir/ in #((
 	    echo one > conftest.one
 	    echo two > conftest.two
 	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	    if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
 	      test -s conftest.one && test -s conftest.two &&
 	      test -s conftest.dir/conftest.one &&
 	      test -s conftest.dir/conftest.two
 	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
 	      break 3
 	    fi
 	  fi
@@ -2402,7 +2706,7 @@ IFS=$as_save_IFS
 rm -rf conftest.one conftest.two conftest.dir
 
 fi
-  if test "${ac_cv_path_install+set}" = set; then
+  if test ${ac_cv_path_install+y}; then
     INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  Don't cache a
@@ -2412,8 +2716,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -2423,8 +2727,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+printf %s "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2478,8 +2782,8 @@ else
    as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 # If we didn't sleep, we still need to ensure time stamps of config.status and
 # generated files are strictly newer.
 am_sleep_pid=
@@ -2498,26 +2802,23 @@ test "$program_suffix" != NONE &&
 # Double any \ or $.
 # By default was `s,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+
 
 # Expand $ac_aux_dir to an absolute path.
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
+
+  if test x"${MISSING+set}" != xset; then
+  MISSING="\${SHELL} '$am_aux_dir/missing'"
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
@@ -2537,11 +2838,12 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
@@ -2549,11 +2851,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2564,11 +2870,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2577,11 +2883,12 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
@@ -2589,11 +2896,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2604,11 +2915,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2616,8 +2927,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -2629,25 +2940,31 @@ fi
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+printf %s "checking for a race-free mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  if test ${ac_cv_path_mkdir+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
+	   as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir ('*'coreutils) '* | \
+	     'BusyBox '* | \
 	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
 	       break 3;;
 	   esac
 	 done
@@ -2658,7 +2975,7 @@ IFS=$as_save_IFS
 fi
 
   test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
+  if test ${ac_cv_path_mkdir+y}; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
     # As a last resort, use the slow shell script.  Don't cache a
@@ -2668,18 +2985,19 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf "%s\n" "$MKDIR_P" >&6; }
 
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
@@ -2687,11 +3005,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2702,24 +3024,25 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
@@ -2735,12 +3058,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2754,7 +3077,8 @@ fi
 rmdir .tst 2>/dev/null
 
 # Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
+if test ${enable_silent_rules+y}
+then :
   enableval=$enable_silent_rules;
 fi
 
@@ -2764,12 +3088,13 @@ case $enable_silent_rules in # (((
     *) AM_DEFAULT_VERBOSITY=1;;
 esac
 am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if printf "%s\n" 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
@@ -2781,8 +3106,8 @@ else
   am_cv_make_support_nested_variables=no
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
 if test $am_cv_make_support_nested_variables = yes; then
     AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
@@ -2817,14 +3142,10 @@ fi
  VERSION='1.2.0'
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
+printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
+printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h
 
 # Some tools Automake needs.
 
@@ -2844,8 +3165,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver).  The
@@ -2864,6 +3185,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+
+
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
@@ -2896,7 +3231,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@@ -2916,6 +3251,15 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 # Checks for programs.
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2924,11 +3268,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -2936,11 +3281,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2951,11 +3300,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2964,11 +3313,12 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -2976,11 +3326,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2991,11 +3345,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3003,8 +3357,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3017,11 +3371,12 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3029,11 +3384,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3044,11 +3403,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3057,11 +3416,12 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3070,15 +3430,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3094,18 +3458,18 @@ if test $ac_prog_rejected = yes; then
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+    ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3116,11 +3480,12 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
@@ -3128,11 +3493,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3143,11 +3512,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3160,11 +3529,12 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
@@ -3172,11 +3542,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3187,11 +3561,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3203,8 +3577,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3212,25 +3586,129 @@ esac
 fi
 
 fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="clang"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+fi
+
+
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -3240,7 +3718,7 @@ $as_echo "$ac_try_echo"; } >&5
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -3248,7 +3726,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3260,9 +3738,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3283,11 +3761,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -3304,7 +3783,7 @@ do
 	# certainly right.
 	break;;
     *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -3320,44 +3799,46 @@ do
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
+else $as_nop
   ac_file=''
 fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3371,15 +3852,15 @@ for ac_file in conftest.exe conftest conftest.*; do
     * ) break;;
   esac
 done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3388,7 +3869,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
@@ -3400,8 +3881,8 @@ _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3409,10 +3890,10 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -3420,39 +3901,40 @@ $as_echo "$ac_try_echo"; } >&5
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3466,11 +3948,12 @@ case "(($ac_try" in
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3479,31 +3962,32 @@ $as_echo "$ac_try_echo"; } >&5
        break;;
   esac
 done
-else
-  $as_echo "$as_me: failed program was:" >&5
+else $as_nop
+  printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
        choke me
@@ -3513,29 +3997,33 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_compiler_gnu=yes
-else
+else $as_nop
   ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
@@ -3544,57 +4032,60 @@ else
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
-else
+else $as_nop
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
+else $as_nop
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -3609,94 +4100,144 @@ else
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c11" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+     CC="$CC $ac_cv_prog_cc_c11"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+  ac_prog_cc_stdc=c11
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"
+then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+fi
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c99" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+     CC="$CC $ac_cv_prog_cc_c99"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+  ac_prog_cc_stdc=c99
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
+  if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
-
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else $as_nop
+  if test "x$ac_cv_prog_cc_c89" = x
+then :
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else $as_nop
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+     CC="$CC $ac_cv_prog_cc_c89"
+fi
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+  ac_prog_cc_stdc=c89
+fi
 fi
 
 ac_ext=c
@@ -3705,21 +4246,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_ext=c
+
+  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+printf %s "checking whether $CC understands -c and -o together... " >&6; }
+if test ${am_cv_prog_cc_c_o+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main ()
+main (void)
 {
 
   ;
@@ -3747,8 +4290,8 @@ _ACEOF
   rm -f core conftest*
   unset am_i
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+printf "%s\n" "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
@@ -3767,48 +4310,49 @@ DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
      ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf "%s\n" "${_am_result}" >&6; }
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
+if test ${enable_dependency_tracking+y}
+then :
   enableval=$enable_dependency_tracking;
 fi
 
@@ -3829,11 +4373,12 @@ fi
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+printf %s "checking dependency style of $depcc... " >&6; }
+if test ${am_cv_CC_dependencies_compiler_type+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
@@ -3940,8 +4485,8 @@ else
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -3959,17 +4504,19 @@ fi
 
 
 # Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
+if test ${enable_largefile+y}
+then :
   enableval=$enable_largefile;
 fi
 
 if test "$enable_largefile" != no; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+printf %s "checking for special C compiler options needed for large files... " >&6; }
+if test ${ac_cv_sys_largefile_CC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_cv_sys_largefile_CC=no
      if test "$GCC" != yes; then
        ac_save_CC=$CC
@@ -3983,44 +4530,47 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
+	 if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_largefile_CC=' -n32'; break
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 	 break
        done
        CC=$ac_save_CC
        rm -f conftest.$ac_ext
     fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; }
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if test ${ac_cv_sys_file_offset_bits+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4029,22 +4579,23 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _FILE_OFFSET_BITS 64
@@ -4053,43 +4604,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_file_offset_bits=64; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_file_offset_bits=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; }
 case $ac_cv_sys_file_offset_bits in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
+printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+printf %s "checking for _LARGE_FILES value needed for large files... " >&6; }
+if test ${ac_cv_sys_large_files+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -4098,22 +4649,23 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=no; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGE_FILES 1
@@ -4122,40 +4674,37 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
 int
-main ()
+main (void)
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   ac_cv_sys_large_files=1; break
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
   ac_cv_sys_large_files=unknown
   break
 done
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+printf "%s\n" "$ac_cv_sys_large_files" >&6; }
 case $ac_cv_sys_large_files in #(
   no | unknown) ;;
   *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
+printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h
 ;;
 esac
 rm -rf conftest*
   fi
-
-
 fi
 
 
@@ -4163,11 +4712,12 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
@@ -4175,11 +4725,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4190,11 +4744,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4203,11 +4757,12 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_RANLIB+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
@@ -4215,11 +4770,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4230,11 +4789,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+printf "%s\n" "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -4242,8 +4801,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -4252,16 +4811,18 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-if test -n "$ac_tool_prefix"; then
+
+  if test -n "$ac_tool_prefix"; then
   for ac_prog in ar lib "link -lib"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
@@ -4269,11 +4830,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4284,11 +4849,11 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4301,11 +4866,12 @@ if test -z "$AR"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
@@ -4313,11 +4879,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4328,11 +4898,11 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4344,8 +4914,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -4354,11 +4924,12 @@ fi
 
 : ${AR=ar}
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
-$as_echo_n "checking the archiver ($AR) interface... " >&6; }
-if ${am_cv_ar_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+printf %s "checking the archiver ($AR) interface... " >&6; }
+if test ${am_cv_ar_interface+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4370,12 +4941,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 /* end confdefs.h.  */
 int some_variable = 0;
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
   am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
   (eval $am_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test "$ac_status" -eq 0; then
         am_cv_ar_interface=ar
@@ -4384,7 +4956,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
         { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
   (eval $am_ar_try) 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         if test "$ac_status" -eq 0; then
           am_cv_ar_interface=lib
@@ -4395,7 +4967,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
       rm -f conftest.lib libconftest.a
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4403,8 +4975,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
-$as_echo "$am_cv_ar_interface" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+printf "%s\n" "$am_cv_ar_interface" >&6; }
 
 case $am_cv_ar_interface in
 ar)
@@ -4430,40 +5002,36 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+  if test ${ac_cv_prog_CPP+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+      # Double quotes because $CC needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4475,10 +5043,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4488,7 +5057,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
   break
 fi
 
@@ -4500,29 +5070,24 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+#include <limits.h>
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
 
-else
+else $as_nop
   # Broken: fails on valid input.
 continue
 fi
@@ -4534,10 +5099,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # Broken: success on invalid input.
 continue
-else
+else $as_nop
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4547,11 +5113,12 @@ rm -f conftest.err conftest.i conftest.$ac_ext
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
+if $ac_preproc_ok
+then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else $as_nop
+  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
@@ -4563,12 +5130,13 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
-$as_echo_n "checking for X... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+printf %s "checking for X... " >&6; }
 
 
 # Check whether --with-x was given.
-if test "${with_x+set}" = set; then :
+if test ${with_x+y}
+then :
   withval=$with_x;
 fi
 
@@ -4579,12 +5147,41 @@ if test "x$with_x" = xno; then
 else
   case $x_includes,$x_libraries in #(
     *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
-    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    *,NONE | NONE,*) if test ${ac_cv_have_x+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -f -r conftest.dir
+ac_x_includes=no
+ac_x_libraries=no
+# Do we need to do anything special at all?
+ac_save_LIBS=$LIBS
+LIBS="-lX11 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <X11/Xlib.h>
+int
+main (void)
+{
+XrmInitialize ()
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  # We can compile and link X programs with no special options.
+  ac_x_includes=
+  ac_x_libraries=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS="$ac_save_LIBS"
+# If that didn't work, only try xmkmf and file system searches
+# for native compilation.
+if test x"$ac_x_includes" = xno && test "$cross_compiling" = no
+then :
+  rm -f -r conftest.dir
 if mkdir conftest.dir; then
   cd conftest.dir
   cat >Imakefile <<'_ACEOF'
@@ -4623,7 +5220,7 @@ _ACEOF
   rm -f -r conftest.dir
 fi
 
-# Standard set of common directories for X headers.
+  # Standard set of common directories for X headers.
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
@@ -4650,6 +5247,8 @@ ac_x_header_dirs='
 /usr/local/include/X11R5
 /usr/local/include/X11R4
 
+/opt/X11/include
+
 /usr/X386/include
 /usr/x386/include
 /usr/XFree86/include/X11
@@ -4671,10 +5270,11 @@ if test "$ac_x_includes" = no; then
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+if ac_fn_c_try_cpp "$LINENO"
+then :
   # We can compile using X headers with no special include directory.
 ac_x_includes=
-else
+else $as_nop
   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
@@ -4695,20 +5295,21 @@ if test "$ac_x_libraries" = no; then
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
-main ()
+main (void)
 {
 XrmInitialize ()
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
-else
+else $as_nop
   LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
   for ac_extension in a so sl dylib la dll; do
@@ -4719,19 +5320,21 @@ do
   done
 done
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
+fi
+# Record the results.
 case $ac_x_includes,$ac_x_libraries in #(
-  no,* | *,no | *\'*)
+  no,* | *,no | *\'*) :
     # Didn't find X, or a directory has "'" in its name.
-    ac_cv_have_x="have_x=no";; #(
-  *)
+    ac_cv_have_x="have_x=no" ;; #(
+  *) :
     # Record where we found X for the cache.
     ac_cv_have_x="have_x=yes\
 	ac_x_includes='$ac_x_includes'\
-	ac_x_libraries='$ac_x_libraries'"
+	ac_x_libraries='$ac_x_libraries'" ;;
 esac
 fi
 ;; #(
@@ -4741,8 +5344,8 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
-$as_echo "$have_x" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+printf "%s\n" "$have_x" >&6; }
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
@@ -4752,369 +5355,70 @@ else
   ac_cv_have_x="have_x=yes\
 	ac_x_includes='$x_includes'\
 	ac_x_libraries='$x_libraries'"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
+printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; }
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
+  if test $ac_cache; then
+    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+      printf "%s\n" "#define $ac_item 1" >> confdefs.h
     fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    ac_header= ac_cache=
+  elif test $ac_header; then
+    ac_cache=$ac_item
+  else
+    ac_header=$ac_item
   fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
+done
 
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
 
-fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
 
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-fi
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
-
-done
-
-
-for ac_header in stdbool.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdbool_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDBOOL_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdbool_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_STDBOOL_H 1" >>confdefs.h
 
 fi
 
-done
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
 esac
 
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+printf %s "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
+if test ${enable_nls+y}
+then :
   enableval=$enable_nls; USE_NLS=$enableval
-else
+else $as_nop
   USE_NLS=yes
 fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf "%s\n" "$USE_NLS" >&6; }
 
 
-      GETTEXT_MACRO_VERSION=0.19
 
 
 
@@ -5122,14 +5426,15 @@ $as_echo "$USE_NLS" >&6; }
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -5148,11 +5453,12 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGFMT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case "$MSGFMT" in
   [\\/]* | ?:[\\/]*)
     ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
@@ -5180,20 +5486,21 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf "%s\n" "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GMSGFMT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
@@ -5203,11 +5510,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -5220,11 +5531,11 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf "%s\n" "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5244,14 +5555,15 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -5270,11 +5582,12 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XGETTEXT+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case "$XGETTEXT" in
   [\\/]* | ?:[\\/]*)
     ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
@@ -5302,11 +5615,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf "%s\n" "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
     rm -f messages.po
@@ -5321,14 +5634,15 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -5347,11 +5661,12 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGMERGE+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case "$MSGMERGE" in
   [\\/]* | ?:[\\/]*)
     ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
@@ -5378,20 +5693,17 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf "%s\n" "$MSGMERGE" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
         test -n "$localedir" || localedir='${datadir}/locale'
 
 
-    test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-
-
   ac_config_commands="$ac_config_commands po-directories"
 
 
@@ -5411,26 +5723,29 @@ fi
   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
   prefix="$acl_save_prefix"
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+  # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -5449,21 +5764,22 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -5483,32 +5799,32 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
-
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
+else $as_nop
   with_gnu_ld=no
 fi
 
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
-  # contains only /bin. Note that ksh looks also at the FPATH variable,
-  # so we have to set that as well for the test.
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
-           || PATH_SEPARATOR=';'
-       }
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
 fi
-
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+printf %s "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -5518,12 +5834,12 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
+    [\\/]* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
-      while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -5537,36 +5853,34 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${acl_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+if test ${acl_cv_path_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -z "$LD"; then
-  acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
   for ac_dir in $PATH; do
-    IFS="$acl_save_ifs"
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       acl_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
+      # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
       *GNU* | *'with BFD'*)
-        test "$with_gnu_ld" != no && break
-        ;;
+	test "$with_gnu_ld" != no && break ;;
       *)
-        test "$with_gnu_ld" != yes && break
-        ;;
+	test "$with_gnu_ld" != yes && break ;;
       esac
     fi
   done
-  IFS="$acl_save_ifs"
+  IFS="$ac_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -5574,40 +5888,41 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${acl_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${acl_cv_prog_gnu_ld+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes
-  ;;
+  acl_cv_prog_gnu_ld=yes ;;
 *)
-  acl_cv_prog_gnu_ld=no
-  ;;
+  acl_cv_prog_gnu_ld=no ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
 
-                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if ${acl_cv_rpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+
+                                                { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+printf %s "checking for shared library run path origin... " >&6; }
+if test ${acl_cv_rpath+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
@@ -5616,91 +5931,42 @@ else
     acl_cv_rpath=done
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf "%s\n" "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
-  acl_libext="$acl_cv_libext"
-  acl_shlibext="$acl_cv_shlibext"
-  acl_libname_spec="$acl_cv_libname_spec"
-  acl_library_names_spec="$acl_cv_library_names_spec"
-  acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  acl_hardcode_direct="$acl_cv_hardcode_direct"
-  acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
     # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
+if test ${enable_rpath+y}
+then :
   enableval=$enable_rpath; :
-else
+else $as_nop
   enable_rpath=yes
 fi
 
 
 
-
-  acl_libdirstem=lib
-  acl_libdirstem2=
-  case "$host_os" in
-    solaris*)
-                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
-$as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef _LP64
-sixtyfour bits
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
-  gl_cv_solaris_64bit=yes
-else
-  gl_cv_solaris_64bit=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; }
-      if test $gl_cv_solaris_64bit = yes; then
-        acl_libdirstem=lib/64
-        case "$host_cpu" in
-          sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-          i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+                  acl_libdirstem=lib
+  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+  if test -n "$searchpath"; then
+    acl_save_IFS="${IFS= 	}"; IFS=":"
+    for searchdir in $searchpath; do
+      if test -d "$searchdir"; then
+        case "$searchdir" in
+          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+          *) searchdir=`cd "$searchdir" && pwd`
+             case "$searchdir" in
+               */lib64 ) acl_libdirstem=lib64 ;;
+             esac ;;
         esac
       fi
-      ;;
-    *)
-      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-      if test -n "$searchpath"; then
-        acl_save_IFS="${IFS= 	}"; IFS=":"
-        for searchdir in $searchpath; do
-          if test -d "$searchdir"; then
-            case "$searchdir" in
-              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-              */../ | */.. )
-                # Better ignore directories of this form. They are misleading.
-                ;;
-              *) searchdir=`cd "$searchdir" && pwd`
-                 case "$searchdir" in
-                   */lib64 ) acl_libdirstem=lib64 ;;
-                 esac ;;
-            esac
-          fi
-        done
-        IFS="$acl_save_IFS"
-      fi
-      ;;
-  esac
-  test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-
-
-
-
+    done
+    IFS="$acl_save_IFS"
+  fi
 
 
 
@@ -5724,7 +5990,8 @@ $as_echo "$gl_cv_solaris_64bit" >&6; }
 
 
 # Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then :
+if test ${with_libiconv_prefix+y}
+then :
   withval=$with_libiconv_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -5745,10 +6012,6 @@ if test "${with_libiconv_prefix+set}" = set; then :
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
       fi
     fi
 
@@ -5757,8 +6020,6 @@ fi
       LIBICONV=
   LTLIBICONV=
   INCICONV=
-  LIBICONV_PREFIX=
-      HAVE_LIBICONV=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -5776,7 +6037,7 @@ fi
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -5792,50 +6053,27 @@ fi
           found_la=
           found_so=
           found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
               else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
+                found_so="$additional_libdir/lib$name.dll.a"
               fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
               fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
               fi
             fi
           fi
@@ -5853,42 +6091,26 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
                     else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
+                      found_so="$dir/lib$name.dll.a"
                     fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
                     fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
                     fi
                   fi
                   ;;
@@ -5901,9 +6123,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
               else
                                                                                 haveit=
@@ -5916,10 +6136,10 @@ fi
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$acl_hardcode_direct" = yes; then
+                                if test "$hardcode_direct" = yes; then
                                                       LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                 else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
                                                             LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -5951,7 +6171,7 @@ fi
                     if test -z "$haveit"; then
                       LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
                     fi
-                    if test "$acl_hardcode_minus_L" != no; then
+                    if test "$hardcode_minus_L" != no; then
                                                                                         LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
                     else
                                                                                                                                                                                 LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
@@ -5970,16 +6190,6 @@ fi
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'iconv'; then
-                  LIBICONV_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'iconv'; then
-                  LIBICONV_PREFIX="$basedir"
-                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -6028,11 +6238,9 @@ fi
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -6132,21 +6340,21 @@ fi
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
+    if test -n "$hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      eval flag=\"$hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        eval flag=\"$hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
       done
@@ -6182,78 +6390,76 @@ fi
 
 
 
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
-$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
+if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CFPreferences.h>
 int
-main ()
+main (void)
 {
 CFPreferencesCopyAppValue(NULL, NULL)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   gt_cv_func_CFPreferencesCopyAppValue=yes
-else
+else $as_nop
   gt_cv_func_CFPreferencesCopyAppValue=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
      LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 
-$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
+printf %s "checking for CFLocaleCopyCurrent... " >&6; }
+if test ${gt_cv_func_CFLocaleCopyCurrent+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CFLocale.h>
 int
-main ()
+main (void)
 {
 CFLocaleCopyCurrent();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   gt_cv_func_CFLocaleCopyCurrent=yes
-else
+else $as_nop
   gt_cv_func_CFLocaleCopyCurrent=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
      LIBS="$gt_save_LIBS"
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+printf "%s\n" "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
   if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
 
-$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
 
   fi
   INTL_MACOSX_LIBS=
@@ -6283,12 +6489,12 @@ $as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
 
 
         if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
+          gt_revision_test_code='[
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-'
+]'
         else
           gt_revision_test_code=
         fi
@@ -6298,41 +6504,39 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
           gt_expression_test_code=
         fi
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
-$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval \${$gt_func_gnugettext_libc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+printf %s "checking for GNU gettext in libc... " >&6; }
+if eval test \${$gt_func_gnugettext_libc+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
-
 int
-main ()
+main (void)
 {
-
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
-
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$gt_func_gnugettext_libc=yes"
-else
+else $as_nop
   eval "$gt_func_gnugettext_libc=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$gt_func_gnugettext_libc
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
@@ -6365,227 +6569,75 @@ $as_echo "$ac_res" >&6; }
   done
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+printf %s "checking for iconv... " >&6; }
+if test ${am_cv_func_iconv+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <stdlib.h>
 #include <iconv.h>
-
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-           iconv(cd,NULL,NULL,NULL,NULL);
-           iconv_close(cd);
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <stdlib.h>
 #include <iconv.h>
-
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
-             iconv(cd,NULL,NULL,NULL,NULL);
-             iconv_close(cd);
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf "%s\n" "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
-$as_echo_n "checking for working iconv... " >&6; }
-if ${am_cv_func_iconv_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-                  am_save_LIBS="$LIBS"
-      if test $am_cv_lib_iconv = yes; then
-        LIBS="$LIBS $LIBICONV"
-      fi
-      am_cv_func_iconv_works=no
-      for ac_iconv_const in '' 'const'; do
-        if test "$cross_compiling" = yes; then :
-  case "$host_os" in
-             aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
-             *)            am_cv_func_iconv_works="guessing yes" ;;
-           esac
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <iconv.h>
-#include <string.h>
-
-#ifndef ICONV_CONST
-# define ICONV_CONST $ac_iconv_const
-#endif
-
-int
-main ()
-{
-int result = 0;
-  /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
-     returns.  */
-  {
-    iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
-    if (cd_utf8_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_utf8_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 1;
-        iconv_close (cd_utf8_to_88591);
-      }
-  }
-  /* Test against Solaris 10 bug: Failures are not distinguishable from
-     successful returns.  */
-  {
-    iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
-    if (cd_ascii_to_88591 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\263";
-        char buf[10];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_ascii_to_88591,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res == 0)
-          result |= 2;
-        iconv_close (cd_ascii_to_88591);
-      }
-  }
-  /* Test against AIX 6.1..7.1 bug: Buffer overrun.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304";
-        static char buf[2] = { (char)0xDE, (char)0xAD };
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = 1;
-        char *outptr = buf;
-        size_t outbytesleft = 1;
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
-          result |= 4;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#if 0 /* This bug could be worked around by the caller.  */
-  /* Test against HP-UX 11.11 bug: Positive return value instead of 0.  */
-  {
-    iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
-    if (cd_88591_to_utf8 != (iconv_t)(-1))
-      {
-        static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
-        char buf[50];
-        ICONV_CONST char *inptr = input;
-        size_t inbytesleft = strlen (input);
-        char *outptr = buf;
-        size_t outbytesleft = sizeof (buf);
-        size_t res = iconv (cd_88591_to_utf8,
-                            &inptr, &inbytesleft,
-                            &outptr, &outbytesleft);
-        if ((int)res > 0)
-          result |= 8;
-        iconv_close (cd_88591_to_utf8);
-      }
-  }
-#endif
-  /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
-     provided.  */
-  if (/* Try standardized names.  */
-      iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
-      /* Try IRIX, OSF/1 names.  */
-      && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
-      /* Try AIX names.  */
-      && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
-      /* Try HP-UX names.  */
-      && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    result |= 16;
-  return result;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  am_cv_func_iconv_works=yes
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-        test "$am_cv_func_iconv_works" = no || break
-      done
-      LIBS="$am_save_LIBS"
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-$as_echo "$am_cv_func_iconv_works" >&6; }
-    case "$am_cv_func_iconv_works" in
-      *no) am_func_iconv=no am_cv_lib_iconv=no ;;
-      *)   am_func_iconv=yes ;;
-    esac
-  else
-    am_func_iconv=no am_cv_lib_iconv=no
-  fi
-  if test "$am_func_iconv" = yes; then
-
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+printf %s "checking how to link with libiconv... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf "%s\n" "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -6598,10 +6650,6 @@ $as_echo "$LIBICONV" >&6; }
 
 
 
-
-
-
-
     use_additional=yes
 
   acl_save_prefix="$prefix"
@@ -6617,7 +6665,8 @@ $as_echo "$LIBICONV" >&6; }
 
 
 # Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then :
+if test ${with_libintl_prefix+y}
+then :
   withval=$with_libintl_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -6638,10 +6687,6 @@ if test "${with_libintl_prefix+set}" = set; then :
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && ! test -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
       fi
     fi
 
@@ -6650,8 +6695,6 @@ fi
       LIBINTL=
   LTLIBINTL=
   INCINTL=
-  LIBINTL_PREFIX=
-      HAVE_LIBINTL=
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
@@ -6669,7 +6712,7 @@ fi
       done
       if test -z "$already_handled"; then
         names_already_handled="$names_already_handled $name"
-                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+                        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -6685,50 +6728,27 @@ fi
           found_la=
           found_so=
           found_a=
-          eval libname=\"$acl_libname_spec\"    # typically: libname=lib$name
-          if test -n "$acl_shlibext"; then
-            shrext=".$acl_shlibext"             # typically: shrext=.so
-          else
-            shrext=
-          fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
+            if test -n "$shlibext" \
+               && { test -f "$additional_libdir/lib$name.$shlibext" \
+                    || { test "$shlibext" = dll \
+                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+              found_dir="$additional_libdir"
+              if test -f "$additional_libdir/lib$name.$shlibext"; then
+                found_so="$additional_libdir/lib$name.$shlibext"
               else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
-                  fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
-                      found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
-                    fi
-                  done
-                fi
+                found_so="$additional_libdir/lib$name.dll.a"
               fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
               fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
               fi
             fi
           fi
@@ -6746,42 +6766,26 @@ fi
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                                    if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
-                      found_dir="$dir"
-                      found_so="$dir/$libname$shrext"
+                  if test -n "$shlibext" \
+                     && { test -f "$dir/lib$name.$shlibext" \
+                          || { test "$shlibext" = dll \
+                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                    found_dir="$dir"
+                    if test -f "$dir/lib$name.$shlibext"; then
+                      found_so="$dir/lib$name.$shlibext"
                     else
-                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                        ver=`(cd "$dir" && \
-                              for f in "$libname$shrext".*; do echo "$f"; done \
-                              | sed -e "s,^$libname$shrext\\\\.,," \
-                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                              | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                          found_dir="$dir"
-                          found_so="$dir/$libname$shrext.$ver"
-                        fi
-                      else
-                        eval library_names=\"$acl_library_names_spec\"
-                        for f in $library_names; do
-                          if test -f "$dir/$f"; then
-                            found_dir="$dir"
-                            found_so="$dir/$f"
-                            break
-                          fi
-                        done
-                      fi
+                      found_so="$dir/lib$name.dll.a"
                     fi
-                  fi
-                                    if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/$libname.$acl_libext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
                     fi
-                  fi
-                  if test "X$found_dir" != "X"; then
-                    if test -f "$dir/$libname.la"; then
-                      found_la="$dir/$libname.la"
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
                     fi
                   fi
                   ;;
@@ -6794,9 +6798,7 @@ fi
           if test "X$found_dir" != "X"; then
                         LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
             if test "X$found_so" != "X"; then
-                                                        if test "$enable_rpath" = no \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                                                        if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
                                 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
               else
                                                                                 haveit=
@@ -6809,10 +6811,10 @@ fi
                 if test -z "$haveit"; then
                   ltrpathdirs="$ltrpathdirs $found_dir"
                 fi
-                                if test "$acl_hardcode_direct" = yes; then
+                                if test "$hardcode_direct" = yes; then
                                                       LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                 else
-                  if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
                                                             LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                                                             haveit=
                     for x in $rpathdirs; do
@@ -6844,7 +6846,7 @@ fi
                     if test -z "$haveit"; then
                       LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
                     fi
-                    if test "$acl_hardcode_minus_L" != no; then
+                    if test "$hardcode_minus_L" != no; then
                                                                                         LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
                     else
                                                                                                                                                                                 LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
@@ -6863,16 +6865,6 @@ fi
             case "$found_dir" in
               */$acl_libdirstem | */$acl_libdirstem/)
                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
-                additional_includedir="$basedir/include"
-                ;;
-              */$acl_libdirstem2 | */$acl_libdirstem2/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
-                if test "$name" = 'intl'; then
-                  LIBINTL_PREFIX="$basedir"
-                fi
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -6921,11 +6913,9 @@ fi
                 case "$dep" in
                   -L*)
                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -7025,21 +7015,21 @@ fi
     done
   done
   if test "X$rpathdirs" != "X"; then
-    if test -n "$acl_hardcode_libdir_separator"; then
+    if test -n "$hardcode_libdir_separator"; then
                         alldirs=
       for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
       done
             acl_save_libdir="$libdir"
       libdir="$alldirs"
-      eval flag=\"$acl_hardcode_libdir_flag_spec\"
+      eval flag=\"$hardcode_libdir_flag_spec\"
       libdir="$acl_save_libdir"
       LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
     else
             for found_dir in $rpathdirs; do
         acl_save_libdir="$libdir"
         libdir="$found_dir"
-        eval flag=\"$acl_hardcode_libdir_flag_spec\"
+        eval flag=\"$hardcode_libdir_flag_spec\"
         libdir="$acl_save_libdir"
         LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
       done
@@ -7051,23 +7041,18 @@ fi
     done
   fi
 
-
-
-
-
-
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval \${$gt_func_gnugettext_libintl+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+printf %s "checking for GNU gettext in libintl... " >&6; }
+if eval test \${$gt_func_gnugettext_libintl+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -7076,30 +7061,27 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-
 int
-main ()
+main (void)
 {
-
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   eval "$gt_func_gnugettext_libintl=yes"
-else
+else $as_nop
   eval "$gt_func_gnugettext_libintl=no"
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
                         if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 #include <libintl.h>
 $gt_revision_test_code
 extern int _nl_msg_cat_cntr;
@@ -7108,33 +7090,31 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-
 int
-main ()
+main (void)
 {
-
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 eval "$gt_func_gnugettext_libintl=yes"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                eval "$gt_func_gnugettext_libintl=yes"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
 eval ac_res=\$$gt_func_gnugettext_libintl
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
         fi
 
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
@@ -7161,20 +7141,20 @@ $as_echo "$ac_res" >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
 
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
     fi
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
-$as_echo_n "checking whether to use NLS... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+printf %s "checking whether to use NLS... " >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf "%s\n" "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
-$as_echo_n "checking where the gettext function comes from... " >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+printf %s "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
@@ -7184,18 +7164,18 @@ $as_echo_n "checking where the gettext function comes from... " >&6; }
     else
       gt_source="included intl directory"
     fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-$as_echo "$gt_source" >&6; }
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf "%s\n" "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
-$as_echo_n "checking how to link with libintl... " >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-$as_echo "$LIBINTL" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+printf %s "checking how to link with libintl... " >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf "%s\n" "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -7222,10 +7202,10 @@ $as_echo "$LIBINTL" >&6; }
       fi
 
 
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -7245,8 +7225,11 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
 # Gsettings
 
 
+
+
   # Check whether --enable-schemas-compile was given.
-if test "${enable_schemas_compile+set}" = set; then :
+if test ${enable_schemas_compile+y}
+then :
   enableval=$enable_schemas_compile; case ${enableval} in
                   yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
                   no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
@@ -7266,11 +7249,12 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
@@ -7280,11 +7264,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7296,11 +7284,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -7309,11 +7297,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
@@ -7323,11 +7312,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7339,11 +7332,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -7351,8 +7344,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -7364,29 +7357,54 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.16
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
   gsettingsschemadir=${datadir}/glib-2.0/schemas
 
-  if test x$cross_compiling != xyes; then
-    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
-  else
-    # Extract the first word of "glib-compile-schemas", so it can be a program name with args.
-set dummy glib-compile-schemas; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then :
-  $as_echo_n "(cached) " >&6
+  if test x$cross_compiling != xyes
+then :
+
+if test -n "$GLIB_COMPILE_SCHEMAS"; then
+    pkg_cv_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
+  ac_status=$?
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable="glib_compile_schemas" "gio-2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+GLIB_COMPILE_SCHEMAS=$pkg_cv_GLIB_COMPILE_SCHEMAS
+
+if test "x$GLIB_COMPILE_SCHEMAS" = x""
+then :
+
+fi
+else $as_nop
+  # Extract the first word of "glib-compile-schemas", so it can be a program name with args.
+set dummy glib-compile-schemas; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GLIB_COMPILE_SCHEMAS+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   case $GLIB_COMPILE_SCHEMAS in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path.
@@ -7396,11 +7414,15 @@ else
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir$ac_word$ac_exec_ext"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -7412,15 +7434,15 @@ esac
 fi
 GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS
 if test -n "$GLIB_COMPILE_SCHEMAS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5
-$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5
+printf "%s\n" "$GLIB_COMPILE_SCHEMAS" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-  fi
+fi
 
   if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
     as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5
@@ -7479,11 +7501,12 @@ endif
 ############### common
 
 # Checks pthread
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_create+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+printf %s "checking for pthread_create in -lpthread... " >&6; }
+if test ${ac_cv_lib_pthread_pthread_create+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7492,33 +7515,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char pthread_create ();
 int
-main ()
+main (void)
 {
 return pthread_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_pthread_pthread_create=yes
-else
+else $as_nop
   ac_cv_lib_pthread_pthread_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+printf "%s\n" "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes
+then :
+  printf "%s\n" "#define HAVE_LIBPTHREAD 1" >>confdefs.h
 
   LIBS="-lpthread $LIBS"
 
@@ -7528,11 +7548,12 @@ PTHREAD_LIBS=-pthread
 
 
 # Checks sensors, required by psensor and psensor-server
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sensors_init in -lsensors" >&5
-$as_echo_n "checking for sensors_init in -lsensors... " >&6; }
-if ${ac_cv_lib_sensors_sensors_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sensors_init in -lsensors" >&5
+printf %s "checking for sensors_init in -lsensors... " >&6; }
+if test ${ac_cv_lib_sensors_sensors_init+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsensors  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7541,48 +7562,47 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char sensors_init ();
 int
-main ()
+main (void)
 {
 return sensors_init ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_sensors_sensors_init=yes
-else
+else $as_nop
   ac_cv_lib_sensors_sensors_init=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sensors_sensors_init" >&5
-$as_echo "$ac_cv_lib_sensors_sensors_init" >&6; }
-if test "x$ac_cv_lib_sensors_sensors_init" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sensors_sensors_init" >&5
+printf "%s\n" "$ac_cv_lib_sensors_sensors_init" >&6; }
+if test "x$ac_cv_lib_sensors_sensors_init" = xyes
+then :
   SENSORS_LIBS=-lsensors
 
-$as_echo "#define HAVE_LIBSENSORS 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBSENSORS 1" >>confdefs.h
 
 fi
 
-for ac_header in sensors/sensors.h sensors/error.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "sensors/sensors.h" "ac_cv_header_sensors_sensors_h" "$ac_includes_default"
+if test "x$ac_cv_header_sensors_sensors_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SENSORS_SENSORS_H 1" >>confdefs.h
 
 fi
+ac_fn_c_check_header_compile "$LINENO" "sensors/error.h" "ac_cv_header_sensors_error_h" "$ac_includes_default"
+if test "x$ac_cv_header_sensors_error_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_SENSORS_ERROR_H 1" >>confdefs.h
 
-done
+fi
 
  if test -n "$SENSORS_LIBS"; then
   SENSORS_TRUE=
@@ -7600,17 +7620,17 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
-$as_echo_n "checking for X11... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11" >&5
+printf %s "checking for x11... " >&6; }
 
 if test -n "$X11_CFLAGS"; then
     pkg_cv_X11_CFLAGS="$X11_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7624,10 +7644,10 @@ if test -n "$X11_LIBS"; then
     pkg_cv_X11_LIBS="$X11_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7641,8 +7661,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -7650,25 +7670,25 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11" 2>&1`
+                X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11" 2>&1`
         else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11" 2>&1`
+                X11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$X11_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$X11_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"x11 missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"x11 missing psensor will not be built\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"x11 missing psensor will not be built\"" >&5
+printf "%s\n" "$as_me: WARNING: \"x11 missing psensor will not be built\"" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"x11 missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"x11 missing psensor will not be built\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"x11 missing psensor will not be built\"" >&5
+printf "%s\n" "$as_me: WARNING: \"x11 missing psensor will not be built\"" >&2;}
 else
-	X11_CFLAGS=$pkg_cv_X11_CFLAGS
-	X11_LIBS=$pkg_cv_X11_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        X11_CFLAGS=$pkg_cv_X11_CFLAGS
+        X11_LIBS=$pkg_cv_X11_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
  if test -n "$X11_LIBS"; then
@@ -7684,17 +7704,17 @@ fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEXT" >&5
-$as_echo_n "checking for XEXT... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xext" >&5
+printf %s "checking for xext... " >&6; }
 
 if test -n "$XEXT_CFLAGS"; then
     pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xext") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XEXT_CFLAGS=`$PKG_CONFIG --cflags "xext" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7708,10 +7728,10 @@ if test -n "$XEXT_LIBS"; then
     pkg_cv_XEXT_LIBS="$XEXT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xext") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XEXT_LIBS=`$PKG_CONFIG --libs "xext" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7725,8 +7745,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -7734,25 +7754,25 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xext" 2>&1`
+                XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xext" 2>&1`
         else
-	        XEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xext" 2>&1`
+                XEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xext" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XEXT_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$XEXT_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"xext missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"xext missing psensor will not be built\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"xext missing psensor will not be built\"" >&5
+printf "%s\n" "$as_me: WARNING: \"xext missing psensor will not be built\"" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"xext missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"xext missing psensor will not be built\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"xext missing psensor will not be built\"" >&5
+printf "%s\n" "$as_me: WARNING: \"xext missing psensor will not be built\"" >&2;}
 else
-	XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
-	XEXT_LIBS=$pkg_cv_XEXT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
+        XEXT_LIBS=$pkg_cv_XEXT_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
  if test -n "$XEXT_LIBS"; then
@@ -7769,17 +7789,17 @@ fi
 # Check GTK+ 3.0
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.4" >&5
+printf %s "checking for gtk+-3.0 >= 3.4... " >&6; }
 
 if test -n "$GTK_CFLAGS"; then
     pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7793,10 +7813,10 @@ if test -n "$GTK_LIBS"; then
     pkg_cv_GTK_LIBS="$GTK_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7810,8 +7830,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -7819,25 +7839,25 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1`
+                GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1`
         else
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1`
+                GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$GTK_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gtk missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"gtk missing psensor will not be built\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"gtk missing psensor will not be built\"" >&5
+printf "%s\n" "$as_me: WARNING: \"gtk missing psensor will not be built\"" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gtk missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"gtk missing psensor will not be built\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"gtk missing psensor will not be built\"" >&5
+printf "%s\n" "$as_me: WARNING: \"gtk missing psensor will not be built\"" >&2;}
 else
-	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-	GTK_LIBS=$pkg_cv_GTK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+        GTK_LIBS=$pkg_cv_GTK_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
  if test -n "$GTK_LIBS"; then
@@ -7862,17 +7882,17 @@ GTK_CFLAGS+=" -DGSEAL_ENABLE "
 # Check udisks2
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDISKS2" >&5
-$as_echo_n "checking for LIBUDISKS2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for udisks2" >&5
+printf %s "checking for udisks2... " >&6; }
 
 if test -n "$LIBUDISKS2_CFLAGS"; then
     pkg_cv_LIBUDISKS2_CFLAGS="$LIBUDISKS2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"udisks2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"udisks2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "udisks2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBUDISKS2_CFLAGS=`$PKG_CONFIG --cflags "udisks2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7886,10 +7906,10 @@ if test -n "$LIBUDISKS2_LIBS"; then
     pkg_cv_LIBUDISKS2_LIBS="$LIBUDISKS2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"udisks2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"udisks2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "udisks2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBUDISKS2_LIBS=`$PKG_CONFIG --libs "udisks2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7903,8 +7923,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -7912,27 +7932,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBUDISKS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "udisks2" 2>&1`
+                LIBUDISKS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "udisks2" 2>&1`
         else
-	        LIBUDISKS2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "udisks2" 2>&1`
+                LIBUDISKS2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "udisks2" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBUDISKS2_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBUDISKS2_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Library udisks2 not present\"" >&5
-$as_echo "$as_me: WARNING: \"Library udisks2 not present\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Library udisks2 not present\"" >&5
+printf "%s\n" "$as_me: WARNING: \"Library udisks2 not present\"" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Library udisks2 not present\"" >&5
-$as_echo "$as_me: WARNING: \"Library udisks2 not present\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Library udisks2 not present\"" >&5
+printf "%s\n" "$as_me: WARNING: \"Library udisks2 not present\"" >&2;}
 else
-	LIBUDISKS2_CFLAGS=$pkg_cv_LIBUDISKS2_CFLAGS
-	LIBUDISKS2_LIBS=$pkg_cv_LIBUDISKS2_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        LIBUDISKS2_CFLAGS=$pkg_cv_LIBUDISKS2_CFLAGS
+        LIBUDISKS2_LIBS=$pkg_cv_LIBUDISKS2_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_LIBUDISKS2 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBUDISKS2 1" >>confdefs.h
 
 fi
  if test -n "$LIBUDISKS2_LIBS"; then
@@ -7949,17 +7969,17 @@ fi
 # Check libatasmart
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATASMART" >&5
-$as_echo_n "checking for ATASMART... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libatasmart" >&5
+printf %s "checking for libatasmart... " >&6; }
 
 if test -n "$ATASMART_CFLAGS"; then
     pkg_cv_ATASMART_CFLAGS="$ATASMART_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libatasmart\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libatasmart\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libatasmart") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ATASMART_CFLAGS=`$PKG_CONFIG --cflags "libatasmart" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7973,10 +7993,10 @@ if test -n "$ATASMART_LIBS"; then
     pkg_cv_ATASMART_LIBS="$ATASMART_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libatasmart\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libatasmart\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libatasmart") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ATASMART_LIBS=`$PKG_CONFIG --libs "libatasmart" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -7990,8 +8010,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -7999,27 +8019,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        ATASMART_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libatasmart" 2>&1`
+                ATASMART_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libatasmart" 2>&1`
         else
-	        ATASMART_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libatasmart" 2>&1`
+                ATASMART_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libatasmart" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$ATASMART_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$ATASMART_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Library atasmart not present\"" >&5
-$as_echo "$as_me: WARNING: \"Library atasmart not present\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Library atasmart not present\"" >&5
+printf "%s\n" "$as_me: WARNING: \"Library atasmart not present\"" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Library atasmart not present\"" >&5
-$as_echo "$as_me: WARNING: \"Library atasmart not present\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Library atasmart not present\"" >&5
+printf "%s\n" "$as_me: WARNING: \"Library atasmart not present\"" >&2;}
 else
-	ATASMART_CFLAGS=$pkg_cv_ATASMART_CFLAGS
-	ATASMART_LIBS=$pkg_cv_ATASMART_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        ATASMART_CFLAGS=$pkg_cv_ATASMART_CFLAGS
+        ATASMART_LIBS=$pkg_cv_ATASMART_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_ATASMART 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ATASMART 1" >>confdefs.h
 
 fi
 
@@ -8038,17 +8058,17 @@ fi
 LIBNOTIFY_LIBS=
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
-$as_echo_n "checking for LIBNOTIFY... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnotify" >&5
+printf %s "checking for libnotify... " >&6; }
 
 if test -n "$LIBNOTIFY_CFLAGS"; then
     pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8062,10 +8082,10 @@ if test -n "$LIBNOTIFY_LIBS"; then
     pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8079,8 +8099,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -8088,27 +8108,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify" 2>&1`
+                LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify" 2>&1`
         else
-	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify" 2>&1`
+                LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBNOTIFY_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBNOTIFY_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Desktop notification disabled\"" >&5
-$as_echo "$as_me: WARNING: \"Desktop notification disabled\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Desktop notification disabled\"" >&5
+printf "%s\n" "$as_me: WARNING: \"Desktop notification disabled\"" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Desktop notification disabled\"" >&5
-$as_echo "$as_me: WARNING: \"Desktop notification disabled\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Desktop notification disabled\"" >&5
+printf "%s\n" "$as_me: WARNING: \"Desktop notification disabled\"" >&2;}
 else
-	LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
-	LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
+        LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBNOTIFY 1" >>confdefs.h
 
 fi
  if test -n "$LIBNOTIFY_LIBS"; then
@@ -8126,17 +8146,17 @@ fi
 APPINDICATOR_LIBS=
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR" >&5
-$as_echo_n "checking for APPINDICATOR... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for appindicator3-0.1" >&5
+printf %s "checking for appindicator3-0.1... " >&6; }
 
 if test -n "$APPINDICATOR_CFLAGS"; then
     pkg_cv_APPINDICATOR_CFLAGS="$APPINDICATOR_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5
   ($PKG_CONFIG --exists --print-errors "appindicator3-0.1") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_APPINDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator3-0.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8150,10 +8170,10 @@ if test -n "$APPINDICATOR_LIBS"; then
     pkg_cv_APPINDICATOR_LIBS="$APPINDICATOR_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator3-0.1\""; } >&5
   ($PKG_CONFIG --exists --print-errors "appindicator3-0.1") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_APPINDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator3-0.1" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8167,8 +8187,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -8176,27 +8196,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator3-0.1" 2>&1`
+                APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "appindicator3-0.1" 2>&1`
         else
-	        APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator3-0.1" 2>&1`
+                APPINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "appindicator3-0.1" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$APPINDICATOR_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$APPINDICATOR_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 3-0.1 not present\"" >&5
-$as_echo "$as_me: WARNING: AppIndicator 3-0.1 not present\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 3-0.1 not present\"" >&5
+printf "%s\n" "$as_me: WARNING: AppIndicator 3-0.1 not present\"" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 3-0.1 not present\"" >&5
-$as_echo "$as_me: WARNING: AppIndicator 3-0.1 not present\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: AppIndicator 3-0.1 not present\"" >&5
+printf "%s\n" "$as_me: WARNING: AppIndicator 3-0.1 not present\"" >&2;}
 else
-	APPINDICATOR_CFLAGS=$pkg_cv_APPINDICATOR_CFLAGS
-	APPINDICATOR_LIBS=$pkg_cv_APPINDICATOR_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        APPINDICATOR_CFLAGS=$pkg_cv_APPINDICATOR_CFLAGS
+        APPINDICATOR_LIBS=$pkg_cv_APPINDICATOR_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_APPINDICATOR 1" >>confdefs.h
+printf "%s\n" "#define HAVE_APPINDICATOR 1" >>confdefs.h
 
 fi
  if test -n "$APPINDICATOR_LIBS"; then
@@ -8214,17 +8234,17 @@ fi
 CURL_LIBS=
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
-$as_echo_n "checking for CURL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5
+printf %s "checking for libcurl... " >&6; }
 
 if test -n "$CURL_CFLAGS"; then
     pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8238,10 +8258,10 @@ if test -n "$CURL_LIBS"; then
     pkg_cv_CURL_LIBS="$CURL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8255,8 +8275,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -8264,27 +8284,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl" 2>&1`
+                CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl" 2>&1`
         else
-	        CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl" 2>&1`
+                CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CURL_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$CURL_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Remote monitoring disabled" >&5
-$as_echo "$as_me: WARNING: \"Remote monitoring disabled" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Remote monitoring disabled" >&5
+printf "%s\n" "$as_me: WARNING: \"Remote monitoring disabled" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Remote monitoring disabled" >&5
-$as_echo "$as_me: WARNING: \"Remote monitoring disabled" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Remote monitoring disabled" >&5
+printf "%s\n" "$as_me: WARNING: \"Remote monitoring disabled" >&2;}
 else
-	CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
-	CURL_LIBS=$pkg_cv_CURL_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
+        CURL_LIBS=$pkg_cv_CURL_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_CURL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CURL 1" >>confdefs.h
 
 fi
  if test -n "$CURL_LIBS"; then
@@ -8302,17 +8322,17 @@ fi
 JSON_LIBS=
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSON" >&5
-$as_echo_n "checking for JSON... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for json-c >= 0.11.99" >&5
+printf %s "checking for json-c >= 0.11.99... " >&6; }
 
 if test -n "$JSON_CFLAGS"; then
     pkg_cv_JSON_CFLAGS="$JSON_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11.99\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11.99\""; } >&5
   ($PKG_CONFIG --exists --print-errors "json-c >= 0.11.99") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "json-c >= 0.11.99" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8326,10 +8346,10 @@ if test -n "$JSON_LIBS"; then
     pkg_cv_JSON_LIBS="$JSON_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11.99\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11.99\""; } >&5
   ($PKG_CONFIG --exists --print-errors "json-c >= 0.11.99") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "json-c >= 0.11.99" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8343,8 +8363,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -8352,44 +8372,44 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-c >= 0.11.99" 2>&1`
+                JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-c >= 0.11.99" 2>&1`
         else
-	        JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-c >= 0.11.99" 2>&1`
+                JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-c >= 0.11.99" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$JSON_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$JSON_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"json-c missing\"" >&5
-$as_echo "$as_me: WARNING: \"json-c missing\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"json-c missing\"" >&5
+printf "%s\n" "$as_me: WARNING: \"json-c missing\"" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"json-c missing\"" >&5
-$as_echo "$as_me: WARNING: \"json-c missing\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"json-c missing\"" >&5
+printf "%s\n" "$as_me: WARNING: \"json-c missing\"" >&2;}
 else
-	JSON_CFLAGS=$pkg_cv_JSON_CFLAGS
-	JSON_LIBS=$pkg_cv_JSON_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        JSON_CFLAGS=$pkg_cv_JSON_CFLAGS
+        JSON_LIBS=$pkg_cv_JSON_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_JSON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_JSON 1" >>confdefs.h
 
 fi
 
 if test "$JSON_LIBS" == ""; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSON" >&5
-$as_echo_n "checking for JSON... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for json >= 0.11.99" >&5
+printf %s "checking for json >= 0.11.99... " >&6; }
 
 if test -n "$JSON_CFLAGS"; then
     pkg_cv_JSON_CFLAGS="$JSON_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json >= 0.11.99\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json >= 0.11.99\""; } >&5
   ($PKG_CONFIG --exists --print-errors "json >= 0.11.99") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "json >= 0.11.99" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8403,10 +8423,10 @@ if test -n "$JSON_LIBS"; then
     pkg_cv_JSON_LIBS="$JSON_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json >= 0.11.99\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json >= 0.11.99\""; } >&5
   ($PKG_CONFIG --exists --print-errors "json >= 0.11.99") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "json >= 0.11.99" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8420,8 +8440,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -8429,30 +8449,30 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json >= 0.11.99" 2>&1`
+                JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json >= 0.11.99" 2>&1`
         else
-	        JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json >= 0.11.99" 2>&1`
+                JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json >= 0.11.99" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$JSON_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$JSON_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"json0 missing\"" >&5
-$as_echo "$as_me: WARNING: \"json0 missing\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"json0 missing\"" >&5
+printf "%s\n" "$as_me: WARNING: \"json0 missing\"" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"json0 missing\"" >&5
-$as_echo "$as_me: WARNING: \"json0 missing\"" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"json0 missing\"" >&5
+printf "%s\n" "$as_me: WARNING: \"json0 missing\"" >&2;}
 else
-	JSON_CFLAGS=$pkg_cv_JSON_CFLAGS
-	JSON_LIBS=$pkg_cv_JSON_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        JSON_CFLAGS=$pkg_cv_JSON_CFLAGS
+        JSON_LIBS=$pkg_cv_JSON_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_JSON 1" >>confdefs.h
+printf "%s\n" "#define HAVE_JSON 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_JSON_0 1" >>confdefs.h
+printf "%s\n" "#define HAVE_JSON_0 1" >>confdefs.h
 
 fi
 fi
@@ -8472,7 +8492,7 @@ fi
 if test -n "$JSON_LIBS"; then
    if test -n "$CURL_LIBS"; then
 
-$as_echo "#define HAVE_REMOTE_SUPPORT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_REMOTE_SUPPORT 1" >>confdefs.h
 
    fi
 fi
@@ -8480,31 +8500,32 @@ fi
 # Checks NVIDIA
 # following code from sensors-applet
 # sensors-applet.sourceforge.net/
-for ac_header in NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h
+       for ac_header in NVCtrl/NVCtrl.h NVCtrl/NVCtrlLib.h
 do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
 		  #include <X11/Xlib.h>
 
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"
+then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
   HAVE_NVIDIA=true
 fi
 
 done
-
 if test -n "${X11_LIBS}"; then
 LIBS="${LIBS} -lX11 -lXext"
 
 if test "${HAVE_NVIDIA}" = "true"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XNVCTRLQueryExtension in -lXNVCtrl" >&5
-$as_echo_n "checking for XNVCTRLQueryExtension in -lXNVCtrl... " >&6; }
-if ${ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XNVCTRLQueryExtension in -lXNVCtrl" >&5
+printf %s "checking for XNVCTRLQueryExtension in -lXNVCtrl... " >&6; }
+if test ${ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXNVCtrl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8513,33 +8534,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char XNVCTRLQueryExtension ();
 int
-main ()
+main (void)
 {
 return XNVCTRLQueryExtension ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension=yes
-else
+else $as_nop
   ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension" >&5
-$as_echo "$ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension" >&6; }
-if test "x$ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension" >&5
+printf "%s\n" "$ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension" >&6; }
+if test "x$ac_cv_lib_XNVCtrl_XNVCTRLQueryExtension" = xyes
+then :
   NVIDIA_LIBS="-lXNVCtrl -lX11 -lXext"
 
-$as_echo "#define HAVE_NVIDIA 1" >>confdefs.h
+printf "%s\n" "#define HAVE_NVIDIA 1" >>confdefs.h
 
 
 fi
@@ -8560,17 +8580,17 @@ fi
 # Checks Unity
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNITY" >&5
-$as_echo_n "checking for UNITY... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unity >= 3.4.2" >&5
+printf %s "checking for unity >= 3.4.2... " >&6; }
 
 if test -n "$UNITY_CFLAGS"; then
     pkg_cv_UNITY_CFLAGS="$UNITY_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unity >= 3.4.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unity >= 3.4.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "unity >= 3.4.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_UNITY_CFLAGS=`$PKG_CONFIG --cflags "unity >= 3.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8584,10 +8604,10 @@ if test -n "$UNITY_LIBS"; then
     pkg_cv_UNITY_LIBS="$UNITY_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unity >= 3.4.2\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unity >= 3.4.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "unity >= 3.4.2") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_UNITY_LIBS=`$PKG_CONFIG --libs "unity >= 3.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8601,8 +8621,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -8610,27 +8630,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        UNITY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "unity >= 3.4.2" 2>&1`
+                UNITY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "unity >= 3.4.2" 2>&1`
         else
-	        UNITY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "unity >= 3.4.2" 2>&1`
+                UNITY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "unity >= 3.4.2" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$UNITY_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$UNITY_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unity not present" >&5
-$as_echo "$as_me: WARNING: Unity not present" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unity not present" >&5
+printf "%s\n" "$as_me: WARNING: Unity not present" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unity not present" >&5
-$as_echo "$as_me: WARNING: Unity not present" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unity not present" >&5
+printf "%s\n" "$as_me: WARNING: Unity not present" >&2;}
 else
-	UNITY_CFLAGS=$pkg_cv_UNITY_CFLAGS
-	UNITY_LIBS=$pkg_cv_UNITY_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        UNITY_CFLAGS=$pkg_cv_UNITY_CFLAGS
+        UNITY_LIBS=$pkg_cv_UNITY_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_UNITY 1" >>confdefs.h
+printf "%s\n" "#define HAVE_UNITY 1" >>confdefs.h
 
 fi
 
@@ -8647,7 +8667,8 @@ fi
 # Check libatiadl
 
 # Check whether --with-libatiadl was given.
-if test "${with_libatiadl+set}" = set; then :
+if test ${with_libatiadl+y}
+then :
   withval=$with_libatiadl;
 		   ATIADL_DIR=${withval}
 		   CPPFLAGS="${CPPFLAGS} -I${ATIADL_DIR}/include"
@@ -8657,18 +8678,18 @@ if test "${with_libatiadl+set}" = set; then :
 fi
 
 
-for ac_header in adl_defines.h
+       for ac_header in adl_defines.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "adl_defines.h" "ac_cv_header_adl_defines_h" "$ac_includes_default"
-if test "x$ac_cv_header_adl_defines_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_ADL_DEFINES_H 1
-_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ADL_Main_Control_Refresh in -latiadlxx" >&5
-$as_echo_n "checking for ADL_Main_Control_Refresh in -latiadlxx... " >&6; }
-if ${ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+  ac_fn_c_check_header_compile "$LINENO" "adl_defines.h" "ac_cv_header_adl_defines_h" "$ac_includes_default"
+if test "x$ac_cv_header_adl_defines_h" = xyes
+then :
+  printf "%s\n" "#define HAVE_ADL_DEFINES_H 1" >>confdefs.h
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ADL_Main_Control_Refresh in -latiadlxx" >&5
+printf %s "checking for ADL_Main_Control_Refresh in -latiadlxx... " >&6; }
+if test ${ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-latiadlxx  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8677,33 +8698,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
 char ADL_Main_Control_Refresh ();
 int
-main ()
+main (void)
 {
 return ADL_Main_Control_Refresh ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
   ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh=yes
-else
+else $as_nop
   ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh" >&5
-$as_echo "$ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh" >&6; }
-if test "x$ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh" = xyes; then :
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh" >&5
+printf "%s\n" "$ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh" >&6; }
+if test "x$ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh" = xyes
+then :
 
 
-$as_echo "#define HAVE_LIBATIADL 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBATIADL 1" >>confdefs.h
 
 			LIBATIADL_CFLAGS="-I${ATIADL_DIR}/include"
 			LIBATIADL_LIBS="-L/usr/lib/fglrx -L/usr/lib64/fglrx -L/usr/lib/catalyst -L/usr/lib64/catalyst -latiadlxx -ldl"
@@ -8714,7 +8734,6 @@ fi
 
 done
 
-
  if test -n "$LIBATIADL_LIBS"; then
   LIBATIADL_TRUE=
   LIBATIADL_FALSE='#'
@@ -8732,17 +8751,17 @@ fi
 LIBMICROHTTPD_LIBS=
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMICROHTTPD" >&5
-$as_echo_n "checking for LIBMICROHTTPD... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmicrohttpd" >&5
+printf %s "checking for libmicrohttpd... " >&6; }
 
 if test -n "$LIBMICROHTTPD_CFLAGS"; then
     pkg_cv_LIBMICROHTTPD_CFLAGS="$LIBMICROHTTPD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmicrohttpd\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmicrohttpd\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libmicrohttpd") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBMICROHTTPD_CFLAGS=`$PKG_CONFIG --cflags "libmicrohttpd" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8756,10 +8775,10 @@ if test -n "$LIBMICROHTTPD_LIBS"; then
     pkg_cv_LIBMICROHTTPD_LIBS="$LIBMICROHTTPD_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmicrohttpd\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmicrohttpd\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libmicrohttpd") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBMICROHTTPD_LIBS=`$PKG_CONFIG --libs "libmicrohttpd" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8773,8 +8792,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -8782,27 +8801,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBMICROHTTPD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmicrohttpd" 2>&1`
+                LIBMICROHTTPD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmicrohttpd" 2>&1`
         else
-	        LIBMICROHTTPD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmicrohttpd" 2>&1`
+                LIBMICROHTTPD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmicrohttpd" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBMICROHTTPD_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$LIBMICROHTTPD_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"libmicrohttpd not present" >&5
-$as_echo "$as_me: WARNING: \"libmicrohttpd not present" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"libmicrohttpd not present" >&5
+printf "%s\n" "$as_me: WARNING: \"libmicrohttpd not present" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"libmicrohttpd not present" >&5
-$as_echo "$as_me: WARNING: \"libmicrohttpd not present" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"libmicrohttpd not present" >&5
+printf "%s\n" "$as_me: WARNING: \"libmicrohttpd not present" >&2;}
 else
-	LIBMICROHTTPD_CFLAGS=$pkg_cv_LIBMICROHTTPD_CFLAGS
-	LIBMICROHTTPD_LIBS=$pkg_cv_LIBMICROHTTPD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        LIBMICROHTTPD_CFLAGS=$pkg_cv_LIBMICROHTTPD_CFLAGS
+        LIBMICROHTTPD_LIBS=$pkg_cv_LIBMICROHTTPD_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_LIBMICROHTTPD 1" >>confdefs.h
+printf "%s\n" "#define HAVE_LIBMICROHTTPD 1" >>confdefs.h
 
 fi
  if test -n "$LIBMICROHTTPD_LIBS"; then
@@ -8819,10 +8838,11 @@ fi
 # Check gtop2, optional
 
 # Check whether --with-gtop was given.
-if test "${with_gtop+set}" = set; then :
+if test ${with_gtop+y}
+then :
   withval=$with_gtop;
 	with_gtop=$withval
-else
+else $as_nop
 
 	with_gtop="yes"
 
@@ -8833,17 +8853,17 @@ GTOP_LIBS=
 if test "$with_gtop" = "yes"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTOP" >&5
-$as_echo_n "checking for GTOP... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgtop-2.0" >&5
+printf %s "checking for libgtop-2.0... " >&6; }
 
 if test -n "$GTOP_CFLAGS"; then
     pkg_cv_GTOP_CFLAGS="$GTOP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libgtop-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTOP_CFLAGS=`$PKG_CONFIG --cflags "libgtop-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8857,10 +8877,10 @@ if test -n "$GTOP_LIBS"; then
     pkg_cv_GTOP_LIBS="$GTOP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0\""; } >&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtop-2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libgtop-2.0") 2>&5
   ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GTOP_LIBS=`$PKG_CONFIG --libs "libgtop-2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -8874,8 +8894,8 @@ fi
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -8883,27 +8903,27 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgtop-2.0" 2>&1`
+                GTOP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgtop-2.0" 2>&1`
         else
-	        GTOP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgtop-2.0" 2>&1`
+                GTOP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgtop-2.0" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTOP_PKG_ERRORS" >&5
+        # Put the nasty error message in config.log where it belongs
+        echo "$GTOP_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gtop not present" >&5
-$as_echo "$as_me: WARNING: \"gtop not present" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"gtop not present" >&5
+printf "%s\n" "$as_me: WARNING: \"gtop not present" >&2;}
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gtop not present" >&5
-$as_echo "$as_me: WARNING: \"gtop not present" >&2;}
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"gtop not present" >&5
+printf "%s\n" "$as_me: WARNING: \"gtop not present" >&2;}
 else
-	GTOP_CFLAGS=$pkg_cv_GTOP_CFLAGS
-	GTOP_LIBS=$pkg_cv_GTOP_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+        GTOP_CFLAGS=$pkg_cv_GTOP_CFLAGS
+        GTOP_LIBS=$pkg_cv_GTOP_LIBS
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_GTOP 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GTOP 1" >>confdefs.h
 
 fi
 fi
@@ -8918,18 +8938,38 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/glade/Makefile src/lib/Makefile src/server/Makefile icons/hicolor/scalable/Makefile icons/hicolor/14x14/Makefile icons/hicolor/16x16/Makefile icons/hicolor/22x22/Makefile icons/hicolor/24x24/Makefile icons/hicolor/32x32/Makefile icons/hicolor/48x48/Makefile icons/hicolor/64x64/Makefile icons/ubuntu-mono-dark/status/22/Makefile icons/ubuntu-mono-light/status/22/Makefile icons/ubuntu-mono-dark/apps/22/Makefile www/Makefile po/Makefile.in tests/Makefile"
+# Ensure datarootdir and pkgdatadir are absolute paths
+if test "x$prefix" = "xNONE"; then
+  prefix="/usr/local"
+fi
+
+eval datarootdir="$datadir"
+if test "x$datarootdir" = "x\${datarootdir}"; then
+  datarootdir="$prefix/share"
+fi
+
+eval pkgdatadir="$datarootdir/psensor"
+
+
+
+eval localedir="$datarootdir/locale"
+
+printf "%s\n" "#define LOCALEDIR \"$localedir\"" >>confdefs.h
+
+
+ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/paths.h src/glade/Makefile src/lib/Makefile src/server/Makefile icons/hicolor/scalable/Makefile icons/hicolor/14x14/Makefile icons/hicolor/16x16/Makefile icons/hicolor/22x22/Makefile icons/hicolor/24x24/Makefile icons/hicolor/32x32/Makefile icons/hicolor/48x48/Makefile icons/hicolor/64x64/Makefile icons/ubuntu-mono-dark/status/22/Makefile icons/ubuntu-mono-light/status/22/Makefile icons/ubuntu-mono-dark/apps/22/Makefile www/Makefile po/Makefile.in tests/Makefile"
 
 
 for ac_prog in help2man
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HELP2MAN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_HELP2MAN+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$HELP2MAN"; then
   ac_cv_prog_HELP2MAN="$HELP2MAN" # Let the user override the test.
 else
@@ -8937,11 +8977,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HELP2MAN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8952,11 +8996,11 @@ fi
 fi
 HELP2MAN=$ac_cv_prog_HELP2MAN
 if test -n "$HELP2MAN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5
-$as_echo "$HELP2MAN" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5
+printf "%s\n" "$HELP2MAN" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -8974,11 +9018,12 @@ fi
 
 # Extract the first word of "asciidoc", so it can be a program name with args.
 set dummy asciidoc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ASCIIDOC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ASCIIDOC+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$ASCIIDOC"; then
   ac_cv_prog_ASCIIDOC="$ASCIIDOC" # Let the user override the test.
 else
@@ -8986,11 +9031,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_ASCIIDOC="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9001,11 +9050,11 @@ fi
 fi
 ASCIIDOC=$ac_cv_prog_ASCIIDOC
 if test -n "$ASCIIDOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ASCIIDOC" >&5
-$as_echo "$ASCIIDOC" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ASCIIDOC" >&5
+printf "%s\n" "$ASCIIDOC" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -9020,11 +9069,12 @@ fi
 
 # Extract the first word of "cppcheck", so it can be a program name with args.
 set dummy cppcheck; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_CPPCHECK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_HAVE_CPPCHECK+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
   if test -n "$HAVE_CPPCHECK"; then
   ac_cv_prog_HAVE_CPPCHECK="$HAVE_CPPCHECK" # Let the user override the test.
 else
@@ -9032,11 +9082,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
     ac_cv_prog_HAVE_CPPCHECK="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -9047,11 +9101,11 @@ fi
 fi
 HAVE_CPPCHECK=$ac_cv_prog_HAVE_CPPCHECK
 if test -n "$HAVE_CPPCHECK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_CPPCHECK" >&5
-$as_echo "$HAVE_CPPCHECK" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HAVE_CPPCHECK" >&5
+printf "%s\n" "$HAVE_CPPCHECK" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -9091,8 +9145,8 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -9122,15 +9176,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -9144,8 +9198,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;}
       fi
     fi
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -9162,7 +9216,7 @@ U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -9173,14 +9227,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+printf %s "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
+printf "%s\n" "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -9274,8 +9328,8 @@ fi
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -9298,14 +9352,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+as_nop=:
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else
+else $as_nop
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
@@ -9315,46 +9371,46 @@ esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -9363,13 +9419,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -9378,8 +9427,12 @@ case $0 in #((
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
   done
 IFS=$as_save_IFS
 
@@ -9391,30 +9444,10 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -9427,13 +9460,14 @@ as_fn_error ()
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $2" >&2
+  printf "%s\n" "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -9460,18 +9494,20 @@ as_fn_unset ()
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else
+else $as_nop
   as_fn_append ()
   {
     eval $1=\$$1\$2
@@ -9483,12 +9519,13 @@ fi # as_fn_append
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else
+else $as_nop
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
@@ -9519,7 +9556,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -9541,6 +9578,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -9554,6 +9595,12 @@ case `echo -n x` in #(((((
   ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n.  New code should use
+# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -9595,7 +9642,7 @@ as_fn_mkdir_p ()
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -9604,7 +9651,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -9667,7 +9714,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by psensor $as_me 1.2.0, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -9730,14 +9777,16 @@ Report bugs to <jeanfi@gmail.com>.
 psensor home page: <http://wpitchoune.net/psensor>."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
 psensor config.status 1.2.0
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2021 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -9777,15 +9826,15 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
+    printf "%s\n" "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
+    printf "%s\n" "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -9793,7 +9842,7 @@ do
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -9802,7 +9851,7 @@ do
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
+    printf "%s\n" "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
@@ -9830,7 +9879,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -9844,7 +9893,7 @@ exec 5>>config.log
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  $as_echo "$ac_log"
+  printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -9852,7 +9901,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
     # from automake < 1.5.
@@ -9875,6 +9924,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/paths.h") CONFIG_FILES="$CONFIG_FILES src/paths.h" ;;
     "src/glade/Makefile") CONFIG_FILES="$CONFIG_FILES src/glade/Makefile" ;;
     "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
     "src/server/Makefile") CONFIG_FILES="$CONFIG_FILES src/server/Makefile" ;;
@@ -9903,9 +9953,9 @@ done
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
+  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -10241,7 +10291,7 @@ do
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
@@ -10249,17 +10299,17 @@ do
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
+       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -10276,7 +10326,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10300,9 +10350,9 @@ $as_echo X"$ac_file" |
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -10364,8 +10414,8 @@ ac_sed_dataroot='
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -10409,9 +10459,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -10427,20 +10477,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
   #
   if test x"$ac_file" != x-; then
     {
-      $as_echo "/* $configure_input  */" \
+      printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    $as_echo "/* $configure_input  */" \
+    printf "%s\n" "/* $configure_input  */" >&1 \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
@@ -10460,7 +10510,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
+printf "%s\n" X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10480,8 +10530,8 @@ $as_echo X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -10491,29 +10541,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -10531,53 +10587,50 @@ $as_echo X"$mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+printf "%s\n" X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)$/{
+	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\).*/{
+	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  If GNU make was not used, consider
+    re-running the configure script with MAKE=\"gmake\" (or whatever is
+    necessary).  You can also try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
  ;;
     "po-directories":C)
@@ -10590,7 +10643,7 @@ $as_echo X"$file" |
       case "$ac_file" in */Makefile.in)
         # Adjust a relative srcdir.
         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
         # In autoconf-2.13 it is called $ac_given_srcdir.
         # In autoconf-2.50 it is called $srcdir.
@@ -10606,8 +10659,7 @@ $as_echo X"$file" |
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          gt_tab=`printf '\t'`
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
           POMAKEFILEDEPS="POTFILES.in"
           # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
           # on $ac_dir but don't depend on user-specified configuration
@@ -10618,12 +10670,12 @@ $as_echo X"$file" |
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
             fi
             ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assignment from automake < 1.5.
+            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -10728,7 +10780,8 @@ if test "$no_create" != yes; then
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+
diff --git a/configure.ac b/configure.ac
index add0c4e1..cdca2780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,10 +232,28 @@ AM_CONDITIONAL(GTOP, test -n "$GTOP_LIBS")
 AC_SUBST(GTOP_CFLAGS)
 AC_SUBST(GTOP_LIBS)
 
+# Ensure datarootdir and pkgdatadir are absolute paths
+if test "x$prefix" = "xNONE"; then
+  prefix="/usr/local"
+fi
+
+eval datarootdir="$datadir"
+if test "x$datarootdir" = "x\${datarootdir}"; then
+  datarootdir="$prefix/share"
+fi
+
+eval pkgdatadir="$datarootdir/psensor"
+AC_SUBST([pkgdatadir])
+AC_SUBST([datarootdir])
+
+eval localedir="$datarootdir/locale"
+AC_DEFINE_UNQUOTED([LOCALEDIR], ["$localedir"], [Location of gettext message catalogs])
+
 AC_CONFIG_FILES([
  Makefile
  doc/Makefile
  src/Makefile
+ src/paths.h
  src/glade/Makefile
  src/lib/Makefile
  src/server/Makefile
diff --git a/depcomp b/depcomp
index 4ebd5b3a..715e3431 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2013-05-30.07; # UTC
 # 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/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -783,9 +783,9 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 00000000..deb637e0
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,533 @@
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# doc/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgincludedir = $(includedir)/psensor
+pkglibdir = $(libdir)/psensor
+pkglibexecdir = $(libexecdir)/psensor
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = x86_64-pc-linux-gnu
+host_triplet = x86_64-pc-linux-gnu
+subdir = doc
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_doc_DATA) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_$(V))
+am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(docdir)"
+DATA = $(dist_doc_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = /usr/share/psensor
+ACLOCAL = ${SHELL} '/mydata/psensor/missing' aclocal-1.16
+AMTAR = $${TAR-tar}
+AM_DEFAULT_VERBOSITY = 1
+APPINDICATOR_CFLAGS = -I/usr/include/libappindicator3-0.1 -I/usr/include/libdbusmenu-glib-0.4 -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/x86_64-linux-gnu -I/usr/include/webp -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -pthread 
+APPINDICATOR_LIBS = -lappindicator3 -ldbusmenu-glib -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 
+AR = ar
+ASCIIDOC = yes
+ATASMART_CFLAGS = 
+ATASMART_LIBS = -latasmart 
+AUTOCONF = ${SHELL} '/mydata/psensor/missing' autoconf
+AUTOHEADER = ${SHELL} '/mydata/psensor/missing' autoheader
+AUTOMAKE = ${SHELL} '/mydata/psensor/missing' automake-1.16
+AWK = mawk
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2
+CPP = gcc -E
+CPPFLAGS = 
+CSCOPE = cscope
+CTAGS = ctags
+CURL_CFLAGS = -I/usr/include/x86_64-linux-gnu 
+CURL_LIBS = -lcurl 
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+ETAGS = etags
+EXEEXT = 
+GLIB_COMPILE_SCHEMAS = /usr/lib/x86_64-linux-gnu/glib-2.0/glib-compile-schemas
+GMSGFMT = /usr/bin/msgfmt
+GMSGFMT_015 = /usr/bin/msgfmt
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = 
+GTK_CFLAGS = -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/x86_64-linux-gnu -I/usr/include/webp -I/usr/include/gio-unix-2.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -pthread  -DGTK_DISABLE_SINGLE_INCLUDES  -DGDK_DISABLE_DEPRECATED  -DGSEAL_ENABLE 
+GTK_LIBS = -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 
+GTOP_CFLAGS = -I/usr/include/libgtop-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include 
+GTOP_LIBS = -lgtop-2.0 -lglib-2.0 
+HAVE_CPPCHECK = yes
+HELP2MAN = help2man
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+INTLLIBS = 
+INTL_MACOSX_LIBS = 
+JSON_CFLAGS = -I/usr/include/json-c 
+JSON_LIBS = -ljson-c 
+LDFLAGS = 
+LIBATIADL_CFLAGS = 
+LIBATIADL_LIBS = 
+LIBICONV = -liconv
+LIBINTL = 
+LIBMICROHTTPD_CFLAGS = -I/usr/include/p11-kit-1 
+LIBMICROHTTPD_LIBS = -lmicrohttpd 
+LIBNOTIFY_CFLAGS = -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libpng16 -I/usr/include/x86_64-linux-gnu -I/usr/include/webp -I/usr/include/libmount -I/usr/include/blkid -pthread 
+LIBNOTIFY_LIBS = -lnotify -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 
+LIBOBJS = 
+LIBS = -lpthread  -lX11 -lXext
+LIBUDISKS2_CFLAGS = -I/usr/include/udisks2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -pthread -I/usr/include/libmount -I/usr/include/blkid 
+LIBUDISKS2_LIBS = -ludisks2 -lgio-2.0 -lgobject-2.0 -lglib-2.0 
+LTLIBICONV = -liconv
+LTLIBINTL = 
+LTLIBOBJS = 
+MAKEINFO = ${SHELL} '/mydata/psensor/missing' makeinfo
+MKDIR_P = /usr/bin/mkdir -p
+MSGFMT = /usr/bin/msgfmt
+MSGFMT_015 = /usr/bin/msgfmt
+MSGMERGE = /usr/bin/msgmerge
+NVIDIA_CFLAGS = 
+NVIDIA_LIBS = -lXNVCtrl -lX11 -lXext
+OBJEXT = o
+PACKAGE = psensor
+PACKAGE_BUGREPORT = jeanfi@gmail.com
+PACKAGE_NAME = psensor
+PACKAGE_STRING = psensor 1.2.0
+PACKAGE_TARNAME = psensor
+PACKAGE_URL = http://wpitchoune.net/psensor
+PACKAGE_VERSION = 1.2.0
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+PKG_CONFIG_LIBDIR = 
+PKG_CONFIG_PATH = 
+POSUB = po
+PTHREAD_LIBS = -pthread
+RANLIB = ranlib
+SENSORS_LIBS = -lsensors
+SET_MAKE = 
+SHELL = /bin/bash
+STRIP = 
+UNITY_CFLAGS = -I/usr/include/unity/unity -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/dee-1.0 -I/usr/include/gio-unix-2.0 -pthread -I/usr/include/libdbusmenu-glib-0.4 
+UNITY_LIBS = -lunity -ldee-1.0 -lgthread-2.0 -pthread -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -ldbusmenu-glib 
+USE_NLS = yes
+VERSION = 1.2.0
+X11_CFLAGS = 
+X11_LIBS = -lX11 
+XEXT_CFLAGS = 
+XEXT_LIBS = -lXext 
+XGETTEXT = /usr/bin/xgettext
+XGETTEXT_015 = /usr/bin/xgettext
+XMKMF = 
+abs_builddir = /mydata/psensor/doc
+abs_srcdir = /mydata/psensor/doc
+abs_top_builddir = /mydata/psensor
+abs_top_srcdir = /mydata/psensor
+ac_ct_AR = ar
+ac_ct_CC = gcc
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = $${TAR-tar} chof - "$$tardir"
+am__untar = $${TAR-tar} xf -
+bindir = ${exec_prefix}/bin
+build = x86_64-pc-linux-gnu
+build_alias = 
+build_cpu = x86_64
+build_os = linux-gnu
+build_vendor = pc
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+gsettingsschemadir = ${datarootdir}/glib-2.0/schemas
+host = x86_64-pc-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = pc
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = ${SHELL} /mydata/psensor/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = /usr/share/locale
+localstatedir = ${prefix}/var
+mandir = ${datarootdir}/man
+mkdir_p = /usr/bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+runstatedir = ${localstatedir}/run
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+sysconfdir = ${prefix}/etc
+target_alias = 
+top_build_prefix = ../
+top_builddir = ..
+top_srcdir = ..
+dist_doc_DATA = faq.html faq.txt TODO.txt TODO.html
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu doc/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-dist_docDATA: $(dist_doc_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+	done
+
+uninstall-dist_docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(docdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_docDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_docDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dist_docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-dist_docDATA
+
+.PRECIOUS: Makefile
+
+
+faq.html: faq.txt ../www/style.css
+	asciidoc --theme style -a themedir=`pwd`/../www -n -a toc faq.txt
+
+TODO.html: faq.txt ../www/style.css
+	asciidoc --theme style -a themedir=`pwd`/../www -n -a toc TODO.txt
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 5b316bb9..ac30ce57 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(dist_doc_DATA) \
@@ -150,6 +153,7 @@ DATA = $(dist_doc_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -168,6 +172,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -176,13 +182,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -237,7 +241,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -252,7 +255,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -328,8 +330,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -367,8 +369,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/doc/TODO.html b/doc/TODO.html
index 7bc1bedd..0dbb672a 100644
--- a/doc/TODO.html
+++ b/doc/TODO.html
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
 <title>Psensor TODO</title>
 <style type="text/css">
 
@@ -378,9 +379,9 @@
 <body class="article">
 <div id="header">
 <h1>Psensor TODO</h1>
-<div id="toc">
-  <div id="toctitle">Table of Contents</div>
-  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
+<div id="toc">
+  <div id="toctitle">Table of Contents</div>
+  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
 </div>
 </div>
 <div id="content">
@@ -414,7 +415,7 @@ <h1>Psensor TODO</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2016-06-05 13:12:53 CEST
+ 2025-11-07 09:12:10 UTC
 </div>
 </div>
 </body>
diff --git a/doc/faq.html b/doc/faq.html
index 2227626b..4b83bc24 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.9" />
+<meta name="generator" content="AsciiDoc 10.2.0" />
 <title>Psensor Frequently Asked Questions</title>
 <style type="text/css">
 
@@ -378,9 +379,9 @@
 <body class="article">
 <div id="header">
 <h1>Psensor Frequently Asked Questions</h1>
-<div id="toc">
-  <div id="toctitle">Table of Contents</div>
-  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
+<div id="toc">
+  <div id="toctitle">Table of Contents</div>
+  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
 </div>
 </div>
 <div id="content">
@@ -775,7 +776,7 @@ <h2 id="S_HideSensor">18. Is it possible to hide sensors in the main window?</h2
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2016-06-05 13:12:53 CEST
+ 2025-11-07 09:12:10 UTC
 </div>
 </div>
 </body>
diff --git a/icons/hicolor/14x14/Makefile.in b/icons/hicolor/14x14/Makefile.in
index 75ebdc98..a125bb16 100644
--- a/icons/hicolor/14x14/Makefile.in
+++ b/icons/hicolor/14x14/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/hicolor/14x14
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/hicolor/16x16/Makefile.in b/icons/hicolor/16x16/Makefile.in
index dac0fc4e..6a7f3de3 100644
--- a/icons/hicolor/16x16/Makefile.in
+++ b/icons/hicolor/16x16/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/hicolor/16x16
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/hicolor/22x22/Makefile.in b/icons/hicolor/22x22/Makefile.in
index 15bc9564..4220d3cf 100644
--- a/icons/hicolor/22x22/Makefile.in
+++ b/icons/hicolor/22x22/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/hicolor/22x22
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/hicolor/24x24/Makefile.in b/icons/hicolor/24x24/Makefile.in
index 2b1ede39..9a1d3fd6 100644
--- a/icons/hicolor/24x24/Makefile.in
+++ b/icons/hicolor/24x24/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/hicolor/24x24
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/hicolor/32x32/Makefile.in b/icons/hicolor/32x32/Makefile.in
index a2581db0..36371e48 100644
--- a/icons/hicolor/32x32/Makefile.in
+++ b/icons/hicolor/32x32/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/hicolor/32x32
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/hicolor/48x48/Makefile.in b/icons/hicolor/48x48/Makefile.in
index d95067a1..0bb114c8 100644
--- a/icons/hicolor/48x48/Makefile.in
+++ b/icons/hicolor/48x48/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/hicolor/48x48
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/hicolor/64x64/Makefile.in b/icons/hicolor/64x64/Makefile.in
index e88b13ba..bfed70f9 100644
--- a/icons/hicolor/64x64/Makefile.in
+++ b/icons/hicolor/64x64/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/hicolor/64x64
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/hicolor/scalable/Makefile.in b/icons/hicolor/scalable/Makefile.in
index 396ca4f1..5b15e9ac 100644
--- a/icons/hicolor/scalable/Makefile.in
+++ b/icons/hicolor/scalable/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/hicolor/scalable
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/ubuntu-mono-dark/apps/22/Makefile.in b/icons/ubuntu-mono-dark/apps/22/Makefile.in
index eca5dea8..e6003791 100644
--- a/icons/ubuntu-mono-dark/apps/22/Makefile.in
+++ b/icons/ubuntu-mono-dark/apps/22/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/ubuntu-mono-dark/apps/22
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/ubuntu-mono-dark/status/22/Makefile.in b/icons/ubuntu-mono-dark/status/22/Makefile.in
index 8abc89de..7632e949 100644
--- a/icons/ubuntu-mono-dark/status/22/Makefile.in
+++ b/icons/ubuntu-mono-dark/status/22/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/ubuntu-mono-dark/status/22
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/icons/ubuntu-mono-light/status/22/Makefile.in b/icons/ubuntu-mono-light/status/22/Makefile.in
index 309d183e..baf99da6 100644
--- a/icons/ubuntu-mono-light/status/22/Makefile.in
+++ b/icons/ubuntu-mono-light/status/22/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons/ubuntu-mono-light/status/22
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(psensordistpix_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -332,8 +334,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -371,8 +373,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/install-sh b/install-sh
index 377bb868..ec298b53 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2020-11-14.01; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,22 +64,16 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
+# Create dirs (including intermediate dirs) using mode 755.
+# This is like GNU 'install' as of coreutils 8.32 (2020).
+mkdir_umask=22
+
+backupsuffix=
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
@@ -97,7 +87,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -114,18 +104,28 @@ Options:
      --version  display version info and exit.
 
   -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
+  -C            install only if different (preserve data modification time)
   -d            create directories instead of installing files.
   -g GROUP      $chgrpprog installed files to GROUP.
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
+  -p            pass -p to $cpprog.
   -s            $stripprog installed files.
+  -S SUFFIX     attempt to back up existing files, with suffix SUFFIX.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
   RMPROG STRIPPROG
+
+By default, rm is invoked with -f; when overridden with RMPROG,
+it's up to you to specify -f if you want it.
+
+If -S is not specified, no backups are attempted.
+
+Email bug reports to bug-automake@gnu.org.
+Automake home page: https://www.gnu.org/software/automake/
 "
 
 while test $# -ne 0; do
@@ -137,46 +137,62 @@ while test $# -ne 0; do
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
+
+    -p) cpprog="$cpprog -p";;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -S) backupsuffix="$2"
+        shift;;
 
-    -T) no_target_directory=true;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
+
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -207,6 +223,15 @@ if test $# -eq 0; then
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
 if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
@@ -223,16 +248,16 @@ if test -z "$dir_arg"; then
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -250,6 +275,10 @@ do
     dstdir=$dst
     test -d "$dstdir"
     dstdir_status=$?
+    # Don't chown directories that already exist.
+    if test $dstdir_status = 0; then
+      chowncmd=""
+    fi
   else
 
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -266,178 +295,148 @@ do
     fi
     dst=$dst_arg
 
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
+    # If destination is a directory, append the input filename.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
-      dst=$dstdir/`basename "$src"`
+      dstbase=`basename "$src"`
+      case $dst in
+	*/) dst=$dst$dstbase;;
+	*)  dst=$dst/$dstbase;;
+      esac
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
   fi
 
+  case $dstdir in
+    */) dstdirslash=$dstdir;;
+    *)  dstdirslash=$dstdir/;;
+  esac
+
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+	# The $RANDOM variable is not portable (e.g., dash).  Use it
+	# here however when possible just to lower collision chance.
+	tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+
+	trap '
+	  ret=$?
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
+	  exit $ret
+	' 0
+
+	# Because "mkdir -p" follows existing symlinks and we likely work
+	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directory is successfully created first before we actually test
+	# 'mkdir -p'.
+	if (umask $mkdir_umask &&
+	    $mkdirprog $mkdir_mode "$tmpdir" &&
+	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+	then
+	  if test -z "$dir_arg" || {
+	       # Check for POSIX incompatibilities with -m.
+	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+	       # other-writable bit of parent directory when it shouldn't.
+	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+	       test_tmpdir="$tmpdir/a"
+	       ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+	       case $ls_ld_tmpdir in
+		 d????-?r-*) different_mode=700;;
+		 d????-?--*) different_mode=755;;
+		 *) false;;
+	       esac &&
+	       $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+		 ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+		 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+	       }
+	     }
+	  then posix_mkdir=:
+	  fi
+	  rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
 	else
-	  mkdir_mode=
+	  # Remove any dirs left behind by ancient mkdir implementations.
+	  rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
 	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+	trap '' 0;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
 
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # mkdir does not conform to POSIX,
       # or it failed possibly due to a race condition.  Create the
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask $mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -450,14 +449,25 @@ do
   else
 
     # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
+    dsttmp=${dstdirslash}_inst.$$_
+    rmtmp=${dstdirslash}_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 
     # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+    (umask $cp_umask &&
+     { test -z "$stripcmd" || {
+	 # Create $dsttmp read-write so that cp doesn't create it read-only,
+	 # which would cause strip to fail.
+	 if test -z "$doit"; then
+	   : >"$dsttmp" # No need to fork-exec 'touch'.
+	 else
+	   $doit touch "$dsttmp"
+	 fi
+       }
+     } &&
+     $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -472,20 +482,24 @@ do
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
       rm -f "$dsttmp"
     else
+      # If $backupsuffix is set, and the file being installed
+      # already exists, attempt a backup.  Don't worry if it fails,
+      # e.g., if mv doesn't support -f.
+      if test -n "$backupsuffix" && test -f "$dst"; then
+        $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
+      fi
+
       # Rename the file to the real destination.
       $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
 
@@ -493,24 +507,24 @@ do
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
@@ -519,9 +533,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/make-deb.sh b/make-deb.sh
new file mode 100755
index 00000000..3b67d1ae
--- /dev/null
+++ b/make-deb.sh
@@ -0,0 +1,107 @@
+#!/bin/bash
+set -euo pipefail
+
+# Create debian directory structure
+mkdir -p debian/source
+
+# Create debian/source/format
+echo "3.0 (quilt)" > debian/source/format
+
+# Create debian/compat to set debhelper compatibility level. We avoid
+# depending on debhelper-compat in debian/control to prevent the
+# compatibility level from being specified twice which can cause dh to
+# fail in some environments.
+echo "13" > debian/compat
+
+# Create debian/control
+cat > debian/control << 'EOF'
+Source: psensor
+Section: utils
+Priority: optional
+Maintainer: thuongshoo <yuyoonshoo@gmail.com>
+Build-Depends: debhelper (>= 13),
+               cmake,
+               pkg-config,
+               libgtk-3-dev (>= 3.4),
+               libappindicator3-dev,
+               libsensors-dev,
+               libnotify-dev,
+               libglib2.0-dev,
+               libjson-c-dev,
+               libcurl4-openssl-dev,
+               libmicrohttpd-dev,
+               libatasmart-dev,
+               libunity-dev,
+               help2man,
+               gettext,
+               asciidoc
+
+Package: psensor
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: Hardware temperature monitor
+ Psensor is a graphical hardware temperature monitor for Linux.
+ .
+ It can monitor:
+  * the temperature of the motherboard and CPU sensors
+  * the temperature of the NVidia GPUs
+  * the temperature of the Hard Disk Drives
+  * the rotation speed of the fans
+  * the CPU usage
+EOF
+
+# Create debian/rules với fix cho file .mo
+cat > debian/rules << 'EOF'
+#!/usr/bin/make -f
+%:
+	dh $@ --buildsystem=cmake
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
+
+# NGĂN KHÔNG CHO NORMALIZE FILE .mo
+override_dh_strip_nondeterminism:
+	dh_strip_nondeterminism -X.mo
+EOF
+
+# Create debian/copyright
+cat > debian/copyright << 'EOF'
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: psensor
+Source: https://github.com/thuongshoo/psensor
+
+Files: *
+Copyright: 2023-2025 thuongshoo <yuyoonshoo@gmail.com>
+License: GPL-2+
+ This package 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 2 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+EOF
+
+# Create debian/changelog
+cat > debian/changelog << 'EOF'
+psensor (1.2.0-1) unstable; urgency=medium
+
+  * Initial release.
+
+ -- thuongshoo <yuyoonshoo@gmail.com>  Fri, 08 Nov 2025 17:00:00 +0000
+EOF
+
+# Make rules executable
+chmod +x debian/rules
+
+# Build the package
+dpkg-buildpackage -b -us -uc
\ No newline at end of file
diff --git a/missing b/missing
index db98974f..1fe1611f 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2013-10-28.13; # UTC
 # 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/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@ else
   exit $st
 fi
 
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
 
 program_details ()
 {
@@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
 exit $st
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/po/Makefile.in b/po/Makefile.in
index 881a1feb..5722a587 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -21,11 +21,11 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /usr/local
+prefix = /usr
 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}
-localedir = ${datarootdir}/locale
+localedir = /usr/share/locale
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = /usr/bin/install -c
@@ -34,14 +34,14 @@ INSTALL_DATA = ${INSTALL} -m 644
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /home/jporsini/work/psensor/install-sh does not start with $(SHELL), so we add it.
-# In automake >= 1.10, $(MKDIR_P) is derived from ${MKDIR_P}, which is defined
+# ${SHELL} /mydata/psensor/install-sh does not start with $(SHELL), so we add it.
+# In automake >= 1.10, /usr/bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh
-MKDIR_P = /bin/mkdir -p
-mkdir_p = $(MKDIR_P)
+mkinstalldirs = $(SHELL) ${SHELL} /mydata/psensor/install-sh -d
+install_sh = $(SHELL) ${SHELL} /mydata/psensor/install-sh
+MKDIR_P = /usr/bin/mkdir -p
+mkdir_p = /usr/bin/mkdir -p
 
 GMSGFMT_ = /usr/bin/msgfmt
 GMSGFMT_no = /usr/bin/msgfmt
diff --git a/po/de.po b/po/de.po
index fba5ecf3..0925bd67 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor 1.2.0\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2016-08-24 23:30+0200\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: German\n"
@@ -18,6 +18,27 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr "Verstecken"
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: src/ui_sensorlist.c:303
+msgid "Select sensor color"
+msgstr "Wählen Sie eine Sensorfarbe"
+
+#: src/ui_appindicator.c:148
+#, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Laden der Glade-Datei %s ist gescheitert: %s"
+
 #: src/cfg.c:501
 #, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,445 +54,96 @@ msgstr "Laden der Konfigurationsdatei %s ist gescheitert: %s"
 msgid "Failed to save configuration file %s."
 msgstr "Speichern der Konfigurationsdatei %s ist gescheitert."
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Info"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Beenden"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Sensoreinstellungen"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Temperaturüberwachung"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Sensor"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Wert"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Min."
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Max."
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Farbe"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Graph"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Anzeigen"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright © %s jeanfi@gmail.com\n"
+"Lizenz GPLv2: GNU GPL Version 2 oder neuer <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"Dies ist freie Software: Sie können Sie beliebig ändern und "
+"weiterverbreiten.\n"
+"Sie wird OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n"
 
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Links"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Oberseite"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Unterseite"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Einstellungen bearbeiten"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Keine Fensterdekorationen verwenden"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Fenster unterhalb anheften"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Menü aktivieren"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Wert im Unity Starter anzeigen"
-
-#: src/glade/psensor-pref.glade:190
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor wurde ohne Unterstützung für Unity Starter kompiliert."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor ist eine GTK+-Anwendung zur Überwachung von Hardware-Sensoren, "
+"inklusive Temperaturen und Lüftergeschwindigkeiten."
 
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Temperatureinheit:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Position der Sensorentabelle:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Benutzeroberfläche"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr "Bei Benutzeranmeldung starten"
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Fenster beim Programmstart ausblenden"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Fensterposition und -größe merken"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr "Programmstart"
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Vordergrund:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Hintergrund:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Hintergrunddeckkraft:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Farben"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Überwachungszeitraum:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Aktualisierungsintervall:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Messungen"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Min.</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Max.</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "Sekunde(n)"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "Minute(n)"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr "Sensorgraphen glätten"
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr "Sensorgraphen"
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Messintervall:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Sensorenprotokollierung aktivieren"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Sensorenprotokollierungsintervall:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "Sekunde(n)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Folgendes Script bei einem Alarm ausführen:"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Sensoren"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr "Unterstützung für lm-sensors aktivieren"
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr "Unterstützung für NVCtrl (NVidia) aktivieren"
-
-#: src/glade/psensor-pref.glade:974
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor wurde ohne Unterstützung für NVCtrl kompiliert."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr "Unterstützung für ATI ADL aktivieren"
-
-#: src/glade/psensor-pref.glade:993
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor wurde ohne Unterstützung für ATI ADL kompiliert."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr "Unterstützung für gtop2 aktivieren"
-
-#: src/glade/psensor-pref.glade:1012
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor wurde ohne Unterstützung für gtop2 kompiliert."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr "Unterstützung für den hddtemp Daemon aktivieren"
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr "Unterstützung für libatasmart aktivieren"
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor wurde ohne Unterstützung für libatasmart kompiliert."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr "Unterstützung für udisks2 aktivieren"
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor wurde ohne Unterstützung für udisks2 kompiliert."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr "Die Änderungen werden erst nach einem Neustart von psensor wirksam."
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr "Festplattenlaufwerk"
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr "Prozessor- und Arbeitsspeichernutzung"
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr "Grafikkarte mit proprietärem Treiber"
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr "Motherboard, Prozessor und Grafikkarte"
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr "Provider"
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Sensoreinstellungen bearbeiten"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Name"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Typ:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "N/V"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Name:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Optionen:"
 
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          Diese Hilfe anzeigen und beenden\n"
+"  -v, --version       Versionsinformationen anzeigen und beenden"
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr "Label"
-
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       Die Adresse (URL) von psensor-server,\n"
+"                      Beispiel: http://hostname:3131"
 
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Sensorgraphen darstellen"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Farbe:"
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr "Sensor in der Sensorenliste anzeigen"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Benachrichtigungen aktivieren"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Obere Grenze:"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
+"  -n, --new-instance  Erzeugung einer neuen Psensor-Anwendung erzwingen"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
+"  -d, --debug=STUFE   Fehlerdiagnosestufe festlegen, Ganzzahl zwischen 0 und "
+"3"
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Untere Grenze:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Sensor im Menü anzeigen"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor wurde ohne Unterstützung für AppIndicator kompiliert."
-
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
-msgstr "Sensor in der Menüleiste anzeigen (experimentell)"
-
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Programm-Indikator"
-
-#: src/graph.c:460
-msgid "No graphs enabled"
-msgstr "Keine Graphen aktiviert"
-
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: ADL-Bibliothek konnte nicht gefunden werden."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: API der ADL-Bibliothek fehlt."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: ADL-Bibliothek konnte nicht initialisiert werden."
-
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: Anzahl der Adapter konnte nicht ermittelt werden."
-
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "Anzahl der AMD/ATI-Adapter: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Programmfehler melden an: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Anzahl der aktiven AMD/ATI-Adapter: %d"
+msgid "%s home page: <%s>\n"
+msgstr "%s-Website: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr ""
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert."
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: sk_disk_open() gescheitert: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Fehlerdiagnosemodus wird aktiviert."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: Öffnen des Sockets gescheitert."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: Öffnen der Verbindung gescheitert."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Es existiert bereits eine Psensor-Instanz."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: Falsche Zeichenkette: %s."
+#: src/main.c:527
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Erzeugung eines Threads zur Sensorenüberwachung fehlgeschlagen."
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -508,26 +180,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s: Initialisierung gescheitert: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "U/min"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Protokolldatei kann nicht geöffnet werden: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "N/V"
 
 #: src/lib/nvidia.c:69
 #, c-format
@@ -559,14 +222,6 @@ msgstr "%s: Ermittlung der NVIDIA-Informationen gescheitert."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "%s: Abrufen der Lüfteranzahl gescheitert."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "U/min"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "HOME-Variable ist nicht festgelegt."
@@ -590,111 +245,86 @@ msgstr ""
 "Sensorprotokolldatei ist nicht geöffnet und kann deswegen nicht geschlossen "
 "werden."
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright © %s jeanfi@gmail.com\n"
-"Lizenz GPLv2: GNU GPL Version 2 oder neuer <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"Dies ist freie Software: Sie können Sie beliebig ändern und "
-"weiterverbreiten.\n"
-"Sie wird OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: ADL-Bibliothek konnte nicht gefunden werden."
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Aufruf: %s [OPTION]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: API der ADL-Bibliothek fehlt."
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"Psensor ist eine GTK+-Anwendung zur Überwachung von Hardware-Sensoren, "
-"inklusive Temperaturen und Lüftergeschwindigkeiten."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: ADL-Bibliothek konnte nicht initialisiert werden."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Optionen:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: Anzahl der Adapter konnte nicht ermittelt werden."
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
-msgstr ""
-"  -h, --help          Diese Hilfe anzeigen und beenden\n"
-"  -v, --version       Versionsinformationen anzeigen und beenden"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "Anzahl der AMD/ATI-Adapter: %d"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Anzahl der aktiven AMD/ATI-Adapter: %d"
+
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -u, --url=URL       Die Adresse (URL) von psensor-server,\n"
-"                      Beispiel: http://hostname:3131"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
 msgstr ""
-"  -n, --new-instance  Erzeugung einer neuen Psensor-Anwendung erzwingen"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
-"  -d, --debug=STUFE   Fehlerdiagnosestufe festlegen, Ganzzahl zwischen 0 und "
-"3"
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Programmfehler melden an: %s\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/plog.c:43
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s-Website: <%s>\n"
-
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert."
+msgid "Cannot open log file: %s"
+msgstr "Protokolldatei kann nicht geöffnet werden: %s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Fehlerdiagnosemodus wird aktiviert."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "gettimeofday ist gescheitert."
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Es existiert bereits eine Psensor-Instanz."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr ""
 
-#: src/main.c:527
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Erzeugung eines Threads zur Sensorenüberwachung fehlgeschlagen."
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
+msgstr "%s: Öffnen des Sockets gescheitert."
 
-#: src/rsensor.c:115
+#: src/lib/hdd_hddtemp.c:75
 #, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "%s: Herstellen der Verbindung mit %s gescheitert"
+msgid "%s: failed to open connection."
+msgstr "%s: Öffnen der Verbindung gescheitert."
 
-#: src/rsensor.c:152
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
 #, c-format
-msgid "%s: Invalid content: %s"
-msgstr "%s: Ungültiger Inhalt: %s"
+msgid "%s: wrong string: %s."
+msgstr "%s: Falsche Zeichenkette: %s."
 
-#: src/rsensor.c:192
+#: src/lib/hdd_atasmart.c:153
 #, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "%s: Ungültiges JSON: %s"
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: sk_disk_open() gescheitert: %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -828,26 +458,13 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Psensor-Website"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Laden des Psensor-Symbols ist gescheitert."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
-msgstr "Verstecken"
-
-#: src/ui_sensorlist.c:303
-msgid "Select sensor color"
-msgstr "Wählen Sie eine Sensorfarbe"
-
-#: src/ui_appindicator.c:148
-#, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Laden der Glade-Datei %s ist gescheitert: %s"
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "gettimeofday ist gescheitert."
+#: src/graph.c:460
+msgid "No graphs enabled"
+msgstr "Keine Graphen aktiviert"
 
 #: src/ui_notify.c:77
 msgid "Temperature alert"
@@ -857,9 +474,274 @@ msgstr "Temperaturalarm"
 msgid "Fan speed alert"
 msgstr "Lüftergeschwindigkeitsalarm"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Unbekannt"
+#: src/rsensor.c:115
+#, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "%s: Herstellen der Verbindung mit %s gescheitert"
+
+#: src/rsensor.c:152
+#, c-format
+msgid "%s: Invalid content: %s"
+msgstr "%s: Ungültiger Inhalt: %s"
+
+#: src/rsensor.c:192
+#, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "%s: Ungültiges JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "Info"
+
+#~ msgid "Quit"
+#~ msgstr "Beenden"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Sensoreinstellungen"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - Temperaturüberwachung"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Hilfe"
+
+#~ msgid "Sensor"
+#~ msgstr "Sensor"
+
+#~ msgid "Value"
+#~ msgstr "Wert"
+
+#~ msgid "Min"
+#~ msgstr "Min."
+
+#~ msgid "Max"
+#~ msgstr "Max."
+
+#~ msgid "Color"
+#~ msgstr "Farbe"
+
+#~ msgid "Graph"
+#~ msgstr "Graph"
+
+#~ msgid "Show"
+#~ msgstr "Anzeigen"
+
+#~ msgid "Left"
+#~ msgstr "Links"
+
+#~ msgid "Top"
+#~ msgstr "Oberseite"
+
+#~ msgid "Bottom"
+#~ msgstr "Unterseite"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Einstellungen bearbeiten"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Keine Fensterdekorationen verwenden"
+
+#~ msgid "Keep window below"
+#~ msgstr "Fenster unterhalb anheften"
+
+#~ msgid "Enable menu"
+#~ msgstr "Menü aktivieren"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Wert im Unity Starter anzeigen"
+
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor wurde ohne Unterstützung für Unity Starter kompiliert."
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Temperatureinheit:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Position der Sensorentabelle:"
+
+#~ msgid "Interface"
+#~ msgstr "Benutzeroberfläche"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "Bei Benutzeranmeldung starten"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Fenster beim Programmstart ausblenden"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Fensterposition und -größe merken"
+
+#~ msgid "Startup"
+#~ msgstr "Programmstart"
+
+#~ msgid "Foreground:"
+#~ msgstr "Vordergrund:"
+
+#~ msgid "Background:"
+#~ msgstr "Hintergrund:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Hintergrunddeckkraft:"
+
+#~ msgid "Colors"
+#~ msgstr "Farben"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Überwachungszeitraum:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Aktualisierungsintervall:"
+
+#~ msgid "Measures"
+#~ msgstr "Messungen"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Min.</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Max.</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "Sekunde(n)"
+
+#~ msgid "minute(s)"
+#~ msgstr "Minute(n)"
+
+#~ msgid "Smooth curves"
+#~ msgstr "Sensorgraphen glätten"
+
+#~ msgid "Curves"
+#~ msgstr "Sensorgraphen"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Messintervall:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Sensorenprotokollierung aktivieren"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Sensorenprotokollierungsintervall:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "Sekunde(n)"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Folgendes Script bei einem Alarm ausführen:"
+
+#~ msgid "Sensors"
+#~ msgstr "Sensoren"
+
+#~ msgid "Enable support of lm-sensors"
+#~ msgstr "Unterstützung für lm-sensors aktivieren"
+
+#~ msgid "Enable support of NVCtrl (NVidia)"
+#~ msgstr "Unterstützung für NVCtrl (NVidia) aktivieren"
+
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor wurde ohne Unterstützung für NVCtrl kompiliert."
+
+#~ msgid "Enable support of ATI ADL"
+#~ msgstr "Unterstützung für ATI ADL aktivieren"
+
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor wurde ohne Unterstützung für ATI ADL kompiliert."
+
+#~ msgid "Enable support of gtop2"
+#~ msgstr "Unterstützung für gtop2 aktivieren"
+
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor wurde ohne Unterstützung für gtop2 kompiliert."
+
+#~ msgid "Enable support of hddtemp daemon"
+#~ msgstr "Unterstützung für den hddtemp Daemon aktivieren"
+
+#~ msgid "Enable support of libatasmart"
+#~ msgstr "Unterstützung für libatasmart aktivieren"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor wurde ohne Unterstützung für libatasmart kompiliert."
+
+#~ msgid "Enable support of udisks2"
+#~ msgstr "Unterstützung für udisks2 aktivieren"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor wurde ohne Unterstützung für udisks2 kompiliert."
+
+#~ msgid "The changes are applied after the restart of psensor."
+#~ msgstr "Die Änderungen werden erst nach einem Neustart von psensor wirksam."
+
+#~ msgid "Hard disk drive"
+#~ msgstr "Festplattenlaufwerk"
+
+#~ msgid "CPU and memory usage"
+#~ msgstr "Prozessor- und Arbeitsspeichernutzung"
+
+#~ msgid "GPU with proprietary driver"
+#~ msgstr "Grafikkarte mit proprietärem Treiber"
+
+#~ msgid "Motherboard, CPU and GPU"
+#~ msgstr "Motherboard, Prozessor und Grafikkarte"
+
+#~ msgid "Providers"
+#~ msgstr "Provider"
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Sensoreinstellungen bearbeiten"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "Chip:"
+#~ msgstr "Chip:"
+
+#~ msgid "Name:"
+#~ msgstr "Name:"
+
+#~ msgid "Id:"
+#~ msgstr "Id:"
+
+#~ msgid "label"
+#~ msgstr "Label"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Sensorgraphen darstellen"
+
+#~ msgid "Color:"
+#~ msgstr "Farbe:"
+
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Sensor in der Sensorenliste anzeigen"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Benachrichtigungen aktivieren"
+
+#~ msgid "High threshold:"
+#~ msgstr "Obere Grenze:"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Untere Grenze:"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarm"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Sensor im Menü anzeigen"
+
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor wurde ohne Unterstützung für AppIndicator kompiliert."
+
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Sensor in der Menüleiste anzeigen (experimentell)"
+
+#~ msgid "Application Indicator"
+#~ msgstr "Programm-Indikator"
 
 #~ msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 #~ msgstr ""
diff --git a/po/el.po b/po/el.po
index 0ca5a3b1..175b91ae 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor 1.2.0\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2016-06-30 17:02+0200\n"
 "Last-Translator:  <jeanfi@gmail.com>\n"
 "Language-Team: Greek\n"
@@ -17,457 +17,116 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/cfg.c:501
-#, c-format
-msgid "Failed to create the directory %s: %s"
-msgstr ""
-
-#: src/cfg.c:548
-#, c-format
-msgid "Failed to load configuration file %s: %s"
-msgstr ""
-
-#: src/cfg.c:573
-#, c-format
-msgid "Failed to save configuration file %s."
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
 msgstr ""
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
+#: src/ui_sensorlist.c:259
+msgid "Hide"
 msgstr ""
 
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
+#: src/ui_sensorlist.c:269
 msgid "Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr ""
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr ""
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr ""
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr ""
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr ""
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr ""
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr ""
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr ""
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr ""
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr ""
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr ""
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:190
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-msgid "Psensor has not been build with NVCtrl support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-msgid "Psensor has not been build with ATI ADL support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-msgid "Psensor has not been build with gtop2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-msgid "Psensor has not been build with libatasmart support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-msgid "Psensor has not been build with udisks2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/ui_sensorlist.c:303
+msgid "Select sensor color"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/ui_appindicator.c:148
+#, c-format
+msgid "Failed to load glade file %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
+#: src/cfg.c:501
+#, c-format
+msgid "Failed to create the directory %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
+#: src/cfg.c:548
+#, c-format
+msgid "Failed to load configuration file %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
+#: src/cfg.c:573
+#, c-format
+msgid "Failed to save configuration file %s."
 msgstr ""
 
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-msgid "Psensor has not been build with AppIndicator support"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:78
+msgid "Options:"
 msgstr ""
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
 
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
 
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
+msgid "Report bugs to: %s\n"
 msgstr ""
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
+msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
+msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
+#: src/main.c:527
+msgid "Failed to create thread for monitoring sensors"
 msgstr ""
 
 #: src/lib/lmsensor.c:73
@@ -505,25 +164,16 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr ""
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
+#: src/lib/psensor.c:426
+msgid "RPM"
 msgstr ""
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
+#: src/lib/psensor.c:428
+msgid "%"
 msgstr ""
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
 msgstr ""
 
 #: src/lib/nvidia.c:69
@@ -556,14 +206,6 @@ msgstr ""
 msgid "%s: Failed to retrieve number of fans."
 msgstr ""
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr ""
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr ""
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr ""
@@ -585,95 +227,85 @@ msgstr ""
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/main.c:78
-msgid "Options:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
 msgstr ""
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
-#, c-format
-msgid "%s home page: <%s>\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
 msgstr ""
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
+#: src/lib/plog.c:43
+#, c-format
+msgid "Cannot open log file: %s"
 msgstr ""
 
-#: src/main.c:460
-msgid "Enables debug mode."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
 msgstr ""
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
+msgid "%s: cannot get the udisks2 client"
 msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
 msgstr ""
 
-#: src/main.c:527
-msgid "Failed to create thread for monitoring sensors"
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
 msgstr ""
 
-#: src/rsensor.c:115
+#: src/lib/hdd_hddtemp.c:75
 #, c-format
-msgid "%s: Fail to connect to: %s"
+msgid "%s: failed to open connection."
 msgstr ""
 
-#: src/rsensor.c:152
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
 #, c-format
-msgid "%s: Invalid content: %s"
+msgid "%s: wrong string: %s."
 msgstr ""
 
-#: src/rsensor.c:192
+#: src/lib/hdd_atasmart.c:153
 #, c-format
-msgid "%s: Invalid JSON: %s"
+msgid "%s: sk_disk_open() failure: %s."
 msgstr ""
 
 #: src/server/server.c:58
@@ -790,25 +422,12 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr ""
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr ""
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
-msgstr ""
-
-#: src/ui_sensorlist.c:303
-msgid "Select sensor color"
-msgstr ""
-
-#: src/ui_appindicator.c:148
-#, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr ""
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
 #: src/ui_notify.c:77
@@ -819,6 +438,17 @@ msgstr ""
 msgid "Fan speed alert"
 msgstr ""
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
+#: src/rsensor.c:115
+#, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr ""
+
+#: src/rsensor.c:152
+#, c-format
+msgid "%s: Invalid content: %s"
+msgstr ""
+
+#: src/rsensor.c:192
+#, c-format
+msgid "%s: Invalid JSON: %s"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 09e0995c..3da621ea 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-20 11:26+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,6 +18,28 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr ""
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Ajustes"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Seleccionar el color del primer plano"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Error al activar el registro de sensores"
+
 #: src/cfg.c:501
 #, fuzzy, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,452 +55,96 @@ msgstr "Error al activar el registro de sensores"
 msgid "Failed to save configuration file %s."
 msgstr "Error al activar el registro de sensores"
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Acerca de"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Ajustes"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Salir"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Ajustes de los Sensores"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Monitor de temperatura"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Ayuda"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Sensor"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Valor"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Mín"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Máx"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Color"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Gráfica"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Mostrar"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Derecha"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Izquierda"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Arriba"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Abajo"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Editar Ajustes"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Ocultar el marco de la ventana"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Mantener debajo del resto de ventanas"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Activar menú"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Inicio retardado al abrir sesión"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Unidad de temperatura"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Ubicación de los valores"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Interfaz"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Ocultar la ventana de gráficas al iniciar sesión."
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Restaurar tamaño y posición de la ventana"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Escalas y cuadrícula"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Fondo de gráfica"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Opacidad del fondo:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Colores"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Intervalo de la gráfica"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Intervalo de actualización:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Medidas"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Mín</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Máx</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "segundo(s)"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "minuto(s)"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Medir sensores cada:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Activar registro de sensores"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Intervalo de registro de sensores:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "segundo(s)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Sensores"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Editar Ajustes Sensores"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Nombre"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Tipo:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "No disponible"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Nombre:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Identificativo:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"Licencia GPLv2: GNU GPL versión 2 o posterior <http://www.gnu.org/licenses/"
+"old-licenses/gpl-2.0.html>\n"
+"Este programa es software libre: su modificación y difusión está aprobada y "
+"apoyada por el autor. \n"
+"No existe NINGUNA GARANTÍA hasta donde la ley lo permita.\n"
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Uso: %s [OPTION]...\n"
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor es un programa GTK+ que muestra datos de temperatura y ventiladores "
+"a través de los sensores de su hardware."
 
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Representar el sensor en la gráfica"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Color:"
-
-#: src/glade/sensor-edit.glade:448
-#, fuzzy
-msgid "Display sensor in the list of sensors"
-msgstr "Mostrar sensor en el menú de aplicaciones"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Activar notificaciones en el escritorio"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Límite superior"
+#: src/main.c:78
+msgid "Options:"
+msgstr "Opciones"
 
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help         Muestra esta ayuda. \n"
+"  -v, --versión       Muestra información sobre la versión."
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       La URL del servidor psensor,\n"
+"                      ejemplo: http://hostname:3131"
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Límite inferior"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Mostrar sensor en el menú de aplicaciones"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
-
-#: src/glade/sensor-edit.glade:719
-#, fuzzy
-msgid "Display sensor in the label (experimental)"
-msgstr "Mostrar sensor en el menú de aplicaciones"
-
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Indicador de aplicación"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
+msgstr "  -n, --new-instance  Fuerza el inicio de otro Psensor paralelo"
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
+"  -d, --debug=NIVEL   Establece el nivel de depuración con un valor entre 0 "
+"y 3"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: no se ha encontrado la librería ADL"
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: ADL's API perdidos"
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: error al iniciar ADL"
-
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: imposible listar el número de adaptadores"
-
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "Numero de adaptadores AMD/ATI: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Comunicar fallos: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Numero de adaptadores AMD/ATI: %d"
+msgid "%s home page: <%s>\n"
+msgstr "%s Página Oficial: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr ""
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: sk_disk_open() Error: %s"
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Activa el modo de depuración"
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: fallo al desplegar el conector"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Introducir `%s --ayuda' para obtener más información\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: fallo al establecer conexión"
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Ya existe un Psensor en ejecución."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: argumento erróneo:%s."
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Fallo al crear el servidor Web"
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -515,26 +181,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s: Fallo de inicialización:%s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "RPM"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Imposible abrir el archivo de registro: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "No disponible"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -566,14 +223,6 @@ msgstr "%s: Error al obtener la información de NVIDIA"
 msgid "%s: Failed to retrieve number of fans."
 msgstr "Error al obtener la información de NVIDIA"
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "RPM"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "La variable HOME no ha sido definida"
@@ -595,111 +244,86 @@ msgstr "No se abrió el archivo de registro."
 msgid "Sensor log not open, cannot close."
 msgstr "¡No existe archivo que cerrar!"
 
-#: src/main.c:61 src/server/server.c:88
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: no se ha encontrado la librería ADL"
+
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: ADL's API perdidos"
+
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: error al iniciar ADL"
+
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: imposible listar el número de adaptadores"
+
+#: src/lib/amd.c:253
 #, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"Licencia GPLv2: GNU GPL versión 2 o posterior <http://www.gnu.org/licenses/"
-"old-licenses/gpl-2.0.html>\n"
-"Este programa es software libre: su modificación y difusión está aprobada y "
-"apoyada por el autor. \n"
-"No existe NINGUNA GARANTÍA hasta donde la ley lo permita.\n"
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "Numero de adaptadores AMD/ATI: %d"
 
-#: src/main.c:72 src/server/server.c:98
+#: src/lib/amd.c:254
 #, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Uso: %s [OPTION]...\n"
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Numero de adaptadores AMD/ATI: %d"
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"Psensor es un programa GTK+ que muestra datos de temperatura y ventiladores "
-"a través de los sensores de su hardware."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Opciones"
-
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
 msgstr ""
-"  -h, --help         Muestra esta ayuda. \n"
-"  -v, --versión       Muestra información sobre la versión."
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
-"  -u, --url=URL       La URL del servidor psensor,\n"
-"                      ejemplo: http://hostname:3131"
-
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
-msgstr "  -n, --new-instance  Fuerza el inicio de otro Psensor paralelo"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:64
+msgid "memory"
 msgstr ""
-"  -d, --debug=NIVEL   Establece el nivel de depuración con un valor entre 0 "
-"y 3"
-
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Comunicar fallos: %s\n"
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/plog.c:43
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s Página Oficial: <%s>\n"
-
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
+msgid "Cannot open log file: %s"
+msgstr "Imposible abrir el archivo de registro: %s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Activa el modo de depuración"
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "Error en la adquisición del horario."
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Introducir `%s --ayuda' para obtener más información\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Ya existe un Psensor en ejecución."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr ""
 
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Fallo al crear el servidor Web"
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
+msgstr "%s: fallo al desplegar el conector"
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Error al conectar a:%s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: fallo al establecer conexión"
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Contenido no válido:%s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s: argumento erróneo:%s."
 
-#: src/rsensor.c:192
-#, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "JSON no válido:%s"
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: sk_disk_open() Error: %s"
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -833,28 +457,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Web de Psensor"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Error al cargar el icono de Psensor"
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Seleccionar el color del primer plano"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Error al activar el registro de sensores"
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "Error en la adquisición del horario."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "Alarma por temperatura."
@@ -864,9 +474,228 @@ msgstr "Alarma por temperatura."
 msgid "Fan speed alert"
 msgstr "Alarma por parada de ventilador."
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Desconocido"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Error al conectar a:%s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Contenido no válido:%s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "JSON no válido:%s"
+
+#~ msgid "About"
+#~ msgstr "Acerca de"
+
+#~ msgid "Quit"
+#~ msgstr "Salir"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Ajustes de los Sensores"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - Monitor de temperatura"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Ayuda"
+
+#~ msgid "Sensor"
+#~ msgstr "Sensor"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Min"
+#~ msgstr "Mín"
+
+#~ msgid "Max"
+#~ msgstr "Máx"
+
+#~ msgid "Color"
+#~ msgstr "Color"
+
+#~ msgid "Graph"
+#~ msgstr "Gráfica"
+
+#~ msgid "Show"
+#~ msgstr "Mostrar"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Derecha"
+
+#~ msgid "Left"
+#~ msgstr "Izquierda"
+
+#~ msgid "Top"
+#~ msgstr "Arriba"
+
+#~ msgid "Bottom"
+#~ msgstr "Abajo"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Editar Ajustes"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Ocultar el marco de la ventana"
+
+#~ msgid "Keep window below"
+#~ msgstr "Mantener debajo del resto de ventanas"
+
+#~ msgid "Enable menu"
+#~ msgstr "Activar menú"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Inicio retardado al abrir sesión"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Unidad de temperatura"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Ubicación de los valores"
+
+#~ msgid "Interface"
+#~ msgstr "Interfaz"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Ocultar la ventana de gráficas al iniciar sesión."
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Restaurar tamaño y posición de la ventana"
+
+#~ msgid "Foreground:"
+#~ msgstr "Escalas y cuadrícula"
+
+#~ msgid "Background:"
+#~ msgstr "Fondo de gráfica"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Opacidad del fondo:"
+
+#~ msgid "Colors"
+#~ msgstr "Colores"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Intervalo de la gráfica"
+
+#~ msgid "Update interval:"
+#~ msgstr "Intervalo de actualización:"
+
+#~ msgid "Measures"
+#~ msgstr "Medidas"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Mín</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Máx</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "segundo(s)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuto(s)"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Medir sensores cada:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Activar registro de sensores"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Intervalo de registro de sensores:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "segundo(s)"
+
+#~ msgid "Sensors"
+#~ msgstr "Sensores"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Editar Ajustes Sensores"
+
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
+#~ msgid "Chip:"
+#~ msgstr "Chip:"
+
+#~ msgid "Name:"
+#~ msgstr "Nombre:"
+
+#~ msgid "Id:"
+#~ msgstr "Identificativo:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Representar el sensor en la gráfica"
+
+#~ msgid "Color:"
+#~ msgstr "Color:"
+
+#, fuzzy
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Mostrar sensor en el menú de aplicaciones"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Activar notificaciones en el escritorio"
+
+#~ msgid "High threshold:"
+#~ msgstr "Límite superior"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Límite inferior"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarma"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Mostrar sensor en el menú de aplicaciones"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
+
+#, fuzzy
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Mostrar sensor en el menú de aplicaciones"
+
+#~ msgid "Application Indicator"
+#~ msgstr "Indicador de aplicación"
 
 #~ msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 #~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index f3689398..3bb1a2f8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-21 09:39+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: French <>\n"
@@ -18,472 +18,134 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 09:40+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
-#: src/cfg.c:501
-#, c-format
-msgid "Failed to create the directory %s: %s"
-msgstr ""
-
-#: src/cfg.c:548
-#, c-format
-msgid "Failed to load configuration file %s: %s"
-msgstr ""
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Inconnu"
 
-#: src/cfg.c:573
-#, c-format
-msgid "Failed to save configuration file %s."
+#: src/ui_sensorlist.c:259
+msgid "Hide"
 msgstr ""
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "À propos"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
+#: src/ui_sensorlist.c:269
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Quitter"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Préférences des capteurs"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Surveillance des températures"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr ""
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Aide"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Capteur"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Valeur"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Min"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Max"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Couleur"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Graphe"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Afficher"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Droite"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Gauche"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Haut"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Bas"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Modifier les préférences"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Cacher les décorations de la fenêtre"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Garder la fenêtre en arrière-plan"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Activer le menu"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Activer le compteur du lanceur de Unity"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr ""
-"Psensor n'a pas été compilé avec le support de surveillance à distance."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Unité de température :"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Position de la table des capteurs :"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Interface"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Cacher la fenêtre au lancement"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Rétablir la position et la taille de la fenêtre"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Avant-plan :"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Arrière-plan :"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Opacité de l'arrière-plan :"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Couleurs"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Durée de surveillance :"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Intervalle de mise à jour :"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Mesures"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Min</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Max</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "seconde(s)"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "minutes(s)"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Intervalle de mise à jour des mesures :"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Activer la journalisation des capteurs"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Interval de journallisation des capteurs :"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "seconde(s)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Capteurs"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr ""
-"Psensor n'a pas été compilé avec le support de surveillance à distance."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr ""
-"Psensor n'a pas été compilé avec le support de surveillance à distance."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr ""
-"Psensor n'a pas été compilé avec le support de surveillance à distance."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr ""
-"Psensor n'a pas été compilé avec le support de surveillance à distance."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr ""
-"Psensor n'a pas été compilé avec le support de surveillance à distance."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
+#: src/ui_sensorlist.c:303
+msgid "Select sensor color"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Préférences des capteurs"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Nom :"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Type :"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "N/A"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Puce :"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Nom :"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Id :"
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Échec du chargement de l’icône de Psensor."
 
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
+#: src/cfg.c:501
+#, c-format
+msgid "Failed to create the directory %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
+#: src/cfg.c:548
+#, c-format
+msgid "Failed to load configuration file %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
+#: src/cfg.c:573
+#, c-format
+msgid "Failed to save configuration file %s."
 msgstr ""
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright © %s wpitchoune@gmail.com\n"
+"License GPLv2 : GNU GPL version 2 ou ultérieure <http://www.gnu.org/licenses/"
+"old-licenses/gpl-2.0.html>\n"
+"Ceci est un logiciel libre, vous êtes libre de le modifier et de le \n"
+"redistribuer.\n"
+"Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n"
+"autorisées par la loi.\n"
 
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Dessiner la courbe du capteur"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Couleur :"
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Utilisation : %s [OPTION]...\n"
 
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor est une application GTK+ pour surveiller les capteurs thermiques et "
+"les vitesses de ventilateurs."
 
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Activer les notifications du bureau"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Seuil supérieur :"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Options :"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          afficher cette aide et quitter\n"
+"  -v, --version       afficher les informations de version et quitter"
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Seuil inférieur :"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Alarme"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Afficher le capteur dans le menu"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
-"Psensor n'a pas été compilé avec le support de surveillance à distance."
+"  -u, --url=URL       l'URL de psensor-server, example: http://hostname:3131"
 
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
+"  -n, --new-instance  forcer la création d'une nouvelle occurrence de "
+"l'application Psensor"
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Indicateur d'application"
-
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
+"  -d, --debug=LEVEL   assigner le niveau de débogage, nombre entier entre 0 "
+"et 3"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD : impossible de trouver la bibliothèque ADL."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD : L'interface de programmation ADL est manquante."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD : échec de l'initialisation d'ADL."
-
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD : impossible de récupérer le nombre d'adaptateurs."
-
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr ""
+msgid "Report bugs to: %s\n"
+msgstr "Signaler les bogues à: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr ""
+msgid "%s home page: <%s>\n"
+msgstr "Page d'accueil de %s : <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr "Disque"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr ""
+"Psensor n'a pas été compilé avec le support de surveillance à distance."
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s : échec de sk_disk_open() : %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Active le mode de débogage."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s : échec d'ouverture de l'interface de connexion."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Essayez « %s --help » pour plus d'informations.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s : échec de l'ouverture de la connexion."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Une instance de Psensor existe déjà."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s : mauvaise chaîne: %s."
+#: src/main.c:527
+msgid "Failed to create thread for monitoring sensors"
+msgstr ""
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -520,26 +182,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s : échec de l'initialisation: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr "Processeur"
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
-
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "Tr/mn"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Impossible d'ouvrir le journal: %s"
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
+
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "N/A"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -571,14 +224,6 @@ msgstr "%s : Échec de la récupération des information NVIDIA."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "Échec de la récupération des information NVIDIA."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "Tr/mn"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "Variable home non définie."
@@ -600,113 +245,86 @@ msgstr "Le journal des capteurs n'est pas ouvert."
 msgid "Sensor log not open, cannot close."
 msgstr "Le journal des capteurs n'est pas ouvert, il ne peut être fermé."
 
-#: src/main.c:61 src/server/server.c:88
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD : impossible de trouver la bibliothèque ADL."
+
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD : L'interface de programmation ADL est manquante."
+
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD : échec de l'initialisation d'ADL."
+
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD : impossible de récupérer le nombre d'adaptateurs."
+
+#: src/lib/amd.c:253
 #, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
-"Copyright © %s wpitchoune@gmail.com\n"
-"License GPLv2 : GNU GPL version 2 ou ultérieure <http://www.gnu.org/licenses/"
-"old-licenses/gpl-2.0.html>\n"
-"Ceci est un logiciel libre, vous êtes libre de le modifier et de le \n"
-"redistribuer.\n"
-"Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n"
-"autorisées par la loi.\n"
 
-#: src/main.c:72 src/server/server.c:98
+#: src/lib/amd.c:254
 #, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Utilisation : %s [OPTION]...\n"
-
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
+msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
-"Psensor est une application GTK+ pour surveiller les capteurs thermiques et "
-"les vitesses de ventilateurs."
-
-#: src/main.c:78
-msgid "Options:"
-msgstr "Options :"
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -h, --help          afficher cette aide et quitter\n"
-"  -v, --version       afficher les informations de version et quitter"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
-msgstr ""
-"  -u, --url=URL       l'URL de psensor-server, example: http://hostname:3131"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr "Processeur"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
-"  -n, --new-instance  forcer la création d'une nouvelle occurrence de "
-"l'application Psensor"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:64
+msgid "memory"
 msgstr ""
-"  -d, --debug=LEVEL   assigner le niveau de débogage, nombre entier entre 0 "
-"et 3"
 
-#: src/main.c:96 src/server/server.c:121
+#: src/lib/plog.c:43
 #, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Signaler les bogues à: %s\n"
+msgid "Cannot open log file: %s"
+msgstr "Impossible d'ouvrir le journal: %s"
 
-#: src/main.c:98 src/server/server.c:123
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr "Page d'accueil de %s : <%s>\n"
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "Échec de gettimeofday."
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
+#: src/lib/pudisks2.c:142
+#, c-format
+msgid "%s: cannot get the udisks2 client"
 msgstr ""
-"Psensor n'a pas été compilé avec le support de surveillance à distance."
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Active le mode de débogage."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr "Disque"
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/hdd_hddtemp.c:62
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Essayez « %s --help » pour plus d'informations.\n"
-
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Une instance de Psensor existe déjà."
-
-#: src/main.c:527
-msgid "Failed to create thread for monitoring sensors"
-msgstr ""
+msgid "%s: failed to open socket."
+msgstr "%s : échec d'ouverture de l'interface de connexion."
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Échec de la connexion à : %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s : échec de l'ouverture de la connexion."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Contenu invalide : %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s : mauvaise chaîne: %s."
 
-#: src/rsensor.c:192
-#, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "JSON invalide : %s"
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s : échec de sk_disk_open() : %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -841,27 +459,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Site internet de Psensor"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Échec du chargement de l’icône de Psensor."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
-msgstr ""
-
-#: src/ui_sensorlist.c:303
-msgid "Select sensor color"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Échec du chargement de l’icône de Psensor."
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "Échec de gettimeofday."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "Alerte thermique"
@@ -870,9 +475,224 @@ msgstr "Alerte thermique"
 msgid "Fan speed alert"
 msgstr "Alerte ventilateur"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Inconnu"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Échec de la connexion à : %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Contenu invalide : %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "JSON invalide : %s"
+
+#~ msgid "About"
+#~ msgstr "À propos"
+
+#~ msgid "Quit"
+#~ msgstr "Quitter"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Préférences des capteurs"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - Surveillance des températures"
+
+#~ msgid "_Help"
+#~ msgstr "_Aide"
+
+#~ msgid "Sensor"
+#~ msgstr "Capteur"
+
+#~ msgid "Value"
+#~ msgstr "Valeur"
+
+#~ msgid "Min"
+#~ msgstr "Min"
+
+#~ msgid "Max"
+#~ msgstr "Max"
+
+#~ msgid "Color"
+#~ msgstr "Couleur"
+
+#~ msgid "Graph"
+#~ msgstr "Graphe"
+
+#~ msgid "Show"
+#~ msgstr "Afficher"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Droite"
+
+#~ msgid "Left"
+#~ msgstr "Gauche"
+
+#~ msgid "Top"
+#~ msgstr "Haut"
+
+#~ msgid "Bottom"
+#~ msgstr "Bas"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Modifier les préférences"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Cacher les décorations de la fenêtre"
+
+#~ msgid "Keep window below"
+#~ msgstr "Garder la fenêtre en arrière-plan"
+
+#~ msgid "Enable menu"
+#~ msgstr "Activer le menu"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Activer le compteur du lanceur de Unity"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr ""
+#~ "Psensor n'a pas été compilé avec le support de surveillance à distance."
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Unité de température :"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Position de la table des capteurs :"
+
+#~ msgid "Interface"
+#~ msgstr "Interface"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Cacher la fenêtre au lancement"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Rétablir la position et la taille de la fenêtre"
+
+#~ msgid "Foreground:"
+#~ msgstr "Avant-plan :"
+
+#~ msgid "Background:"
+#~ msgstr "Arrière-plan :"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Opacité de l'arrière-plan :"
+
+#~ msgid "Colors"
+#~ msgstr "Couleurs"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Durée de surveillance :"
+
+#~ msgid "Update interval:"
+#~ msgstr "Intervalle de mise à jour :"
+
+#~ msgid "Measures"
+#~ msgstr "Mesures"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Min</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Max</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "seconde(s)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minutes(s)"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Intervalle de mise à jour des mesures :"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Activer la journalisation des capteurs"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Interval de journallisation des capteurs :"
+
+#~ msgid "seconds(s)"
+#~ msgstr "seconde(s)"
+
+#~ msgid "Sensors"
+#~ msgstr "Capteurs"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr ""
+#~ "Psensor n'a pas été compilé avec le support de surveillance à distance."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr ""
+#~ "Psensor n'a pas été compilé avec le support de surveillance à distance."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr ""
+#~ "Psensor n'a pas été compilé avec le support de surveillance à distance."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr ""
+#~ "Psensor n'a pas été compilé avec le support de surveillance à distance."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr ""
+#~ "Psensor n'a pas été compilé avec le support de surveillance à distance."
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Préférences des capteurs"
+
+#~ msgid "Name"
+#~ msgstr "Nom :"
+
+#~ msgid "Type:"
+#~ msgstr "Type :"
+
+#~ msgid "Chip:"
+#~ msgstr "Puce :"
+
+#~ msgid "Name:"
+#~ msgstr "Nom :"
+
+#~ msgid "Id:"
+#~ msgstr "Id :"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Dessiner la courbe du capteur"
+
+#~ msgid "Color:"
+#~ msgstr "Couleur :"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Activer les notifications du bureau"
+
+#~ msgid "High threshold:"
+#~ msgstr "Seuil supérieur :"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Seuil inférieur :"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarme"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Afficher le capteur dans le menu"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr ""
+#~ "Psensor n'a pas été compilé avec le support de surveillance à distance."
+
+#~ msgid "Application Indicator"
+#~ msgstr "Indicateur d'application"
 
 #~ msgid "Sensor Information"
 #~ msgstr "Informations du capteur"
diff --git a/po/hr.po b/po/hr.po
index b5cc5d3d..d1eeeacd 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-21 06:25+0000\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -18,6 +18,27 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr "Sakrij"
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Osobitosti"
+
+#: src/ui_sensorlist.c:303
+msgid "Select sensor color"
+msgstr "Odaberi boju senzora"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Neuspjelo učitavanje datoteke podešavanja %s: %s"
+
 #: src/cfg.c:501
 #, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,450 +54,94 @@ msgstr "Neuspjelo učitavanje datoteke podešavanja %s: %s"
 msgid "Failed to save configuration file %s."
 msgstr "Neuspjelo spremanje datoteke podešavanja %s."
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "O programu"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Osobitosti"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Zatvori"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Osobitosti senzora"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Nadziratelj temperature"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Senzor"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Vrijednost"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Min"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Maks"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Boja"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Grafikon"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Prikaži"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Desno"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Lijevo"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Vrh"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Dno"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Uredi osobitosti"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Sakrij ukras prozora"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Drži prozor ispod"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Omogući izbornik"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Omogući brojač Unity pokretača"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr "Celzijus"
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr "Farenhajt"
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Jedinica temperature:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Položaj okvira senzora:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Sučelje"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr "Pokreni pri pokretanju sesije"
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Sakrij prozor pri pokretanju"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Vrati položaj i veličinu prozora"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr "Pokretanje"
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Prednji plan:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Pozadina:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Prozirnost pozadine:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Boje"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Trajanje nadziranja:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Razdoblje ažuriranja:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Mjere"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Min</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Maks</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "sekunda(i)"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "minuta(e)"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr "Zaglađene krivulje"
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr "Krivulje"
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Razdoblje ažuriranja mjera:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Omogući zapisivanje sensora"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Razdoblje zapisivanja senzora:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "sekunda(i)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Skripta za izvršavanje kada se alarm upali"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Senzori"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr "Omogući podršku za lm-sensors"
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr "Omogući podršku za NVCtrl (NVidia)"
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr "Omogući podršku za ATI ADL"
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr "Omogući podršku za gtop2"
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr "Omogući podršku za hddtemp daemon"
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr "Omogući podršku za libatasmart"
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr "Omogući podršku za udisks2"
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr "Promjene će biti primjenjene nakon ponovnog pokretanja psensora."
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr "Čvrsti disk"
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr "Korištenje CPU-a i memorije"
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr "GPU s vlasničkim upravljačkim programima"
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr "Matična ploča, CPU i GPU"
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Autorsko pravo (C) %s jeanfi@gmail.com\n"
+"Licenca GPLv2: GNU GPL inačica 2 ili novija <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"Ovo je slobodan softver: slobodno ga možete mijenjati i redistribuirati.\n"
+"Ne postoji nikakvo JAMSTVO, propisano zakonom.\n"
 
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Uredi osobitosti senzora"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Naziv"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Vrsta:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "Nedostupno"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Čip:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Naziv:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Id:"
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Upotreba: %s [MOGUĆNOST]...\n"
 
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor je GTK+ aplikacija za nadziranje hardverskih senzora, koja uključuje "
+"temperature i brzinu okretaja ventilatora."
 
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Mogućnosti:"
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          prikaz pomoći\n"
+"  -v, --version       prikaz informacije inačice"
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr "Pojedinosti"
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Iscrtavaj krivulju senzora"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Boja:"
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr "Prikaži senzor u popisu senzora"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Uključi obavijesti radne površine"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Gornja granica:"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
-msgstr "0"
-
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
-msgstr "-1"
-
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Donja granica:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Prikaži senzor u izbrniku"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
-
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
-msgstr "Prikaži senzor u oznaci (eksperimentalno)"
-
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Programičić pokazivača"
-
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       URL psensor-poslužitelja,\n"
+"                      npr: http://hostname:3131"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: nemogu pronaći ADL biblioteku."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: nedostaje ADL API."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: neuspjelo pokretanje ADL-a."
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
+msgstr "  -n, --new-instance  prisili stvaranje nove Psensor aplikacije"
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: nemoguće je dobiti broj adaptera."
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+msgstr ""
+"  -d, --debug=LEVEL   postavi razinu otklanjanja greške, cijeli broj između "
+"0 i 3"
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "Broj AMD/ATI adaptera: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Prijavi grešku na: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Broj aktivnih AMD/ATI adaptera: %d"
+msgid "%s home page: <%s>\n"
+msgstr "%s početna stranica: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr "Disk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: sk_disk_open() neuspjelo: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Omogućava način otklanjanja greške."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: neuspjelo otvaranje socketa."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Pokušajte `%s --help` za više informacija.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: neuspjelo otvaranje povezivanja."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Psensor primjerak je već pokrenut."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: pogrešan string: %s."
+#: src/main.c:527
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Neuspjelo stvaranje niza za nadziranje senzora"
 
 #: src/lib/lmsensor.c:73
 #, fuzzy, c-format
@@ -513,26 +178,17 @@ msgstr "ACPI"
 msgid "%s: initialization failure: %s."
 msgstr "%s: neuspjeh pokretanja: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr "CPU"
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr "slobodna memorija"
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "Okr/min"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr "memorija"
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Nemoguće otvaranje datoteke: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "Nedostupno"
 
 #: src/lib/nvidia.c:69
 #, c-format
@@ -564,14 +220,6 @@ msgstr "%s: Neuspjelo primanje NVIDIA informacija."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "%s: NVIDIA: nuespjelo očitavanje broja ventilatora."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "Okr/min"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "HOME varijabla nije postavljena."
@@ -593,109 +241,86 @@ msgstr "Datoteka zapisa senzora nije otvorena."
 msgid "Sensor log not open, cannot close."
 msgstr "Datoteka zapisa senzora nije otvorena, nemoguće zatvaranje."
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Autorsko pravo (C) %s jeanfi@gmail.com\n"
-"Licenca GPLv2: GNU GPL inačica 2 ili novija <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"Ovo je slobodan softver: slobodno ga možete mijenjati i redistribuirati.\n"
-"Ne postoji nikakvo JAMSTVO, propisano zakonom.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: nemogu pronaći ADL biblioteku."
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Upotreba: %s [MOGUĆNOST]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: nedostaje ADL API."
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"Psensor je GTK+ aplikacija za nadziranje hardverskih senzora, koja uključuje "
-"temperature i brzinu okretaja ventilatora."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: neuspjelo pokretanje ADL-a."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Mogućnosti:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: nemoguće je dobiti broj adaptera."
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
-msgstr ""
-"  -h, --help          prikaz pomoći\n"
-"  -v, --version       prikaz informacije inačice"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "Broj AMD/ATI adaptera: %d"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Broj aktivnih AMD/ATI adaptera: %d"
+
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -u, --url=URL       URL psensor-poslužitelja,\n"
-"                      npr: http://hostname:3131"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
-msgstr "  -n, --new-instance  prisili stvaranje nove Psensor aplikacije"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr "CPU"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
-msgstr ""
-"  -d, --debug=LEVEL   postavi razinu otklanjanja greške, cijeli broj između "
-"0 i 3"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
+msgstr "slobodna memorija"
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Prijavi grešku na: %s\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr "memorija"
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/plog.c:43
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s početna stranica: <%s>\n"
-
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
+msgid "Cannot open log file: %s"
+msgstr "Nemoguće otvaranje datoteke: %s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Omogućava način otklanjanja greške."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "dobivanje-vremena-dana neuspjelo."
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Pokušajte `%s --help` za više informacija.\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Psensor primjerak je već pokrenut."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr "Disk"
 
-#: src/main.c:527
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Neuspjelo stvaranje niza za nadziranje senzora"
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
+msgstr "%s: neuspjelo otvaranje socketa."
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Neuspjelo povezivanje s: %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: neuspjelo otvaranje povezivanja."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Nevaljan sadržaj: %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s: pogrešan string: %s."
 
-#: src/rsensor.c:192
-#, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "Nevaljan JSON: %s"
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: sk_disk_open() neuspjelo: %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -826,26 +451,13 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Psensor web stranica"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Neuspjelo učitavanje ikone Psensora."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
-msgstr "Sakrij"
-
-#: src/ui_sensorlist.c:303
-msgid "Select sensor color"
-msgstr "Odaberi boju senzora"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Neuspjelo učitavanje datoteke podešavanja %s: %s"
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "dobivanje-vremena-dana neuspjelo."
+#: src/graph.c:460
+msgid "No graphs enabled"
+msgstr ""
 
 #: src/ui_notify.c:77
 msgid "Temperature alert"
@@ -855,6 +467,289 @@ msgstr "Upozorenje temperature"
 msgid "Fan speed alert"
 msgstr "Upozorenje brzine ventilatora"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Nepoznato"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Neuspjelo povezivanje s: %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Nevaljan sadržaj: %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "Nevaljan JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "O programu"
+
+#~ msgid "Quit"
+#~ msgstr "Zatvori"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Osobitosti senzora"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - Nadziratelj temperature"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Pomoć"
+
+#~ msgid "Sensor"
+#~ msgstr "Senzor"
+
+#~ msgid "Value"
+#~ msgstr "Vrijednost"
+
+#~ msgid "Min"
+#~ msgstr "Min"
+
+#~ msgid "Max"
+#~ msgstr "Maks"
+
+#~ msgid "Color"
+#~ msgstr "Boja"
+
+#~ msgid "Graph"
+#~ msgstr "Grafikon"
+
+#~ msgid "Show"
+#~ msgstr "Prikaži"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Desno"
+
+#~ msgid "Left"
+#~ msgstr "Lijevo"
+
+#~ msgid "Top"
+#~ msgstr "Vrh"
+
+#~ msgid "Bottom"
+#~ msgstr "Dno"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Uredi osobitosti"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Sakrij ukras prozora"
+
+#~ msgid "Keep window below"
+#~ msgstr "Drži prozor ispod"
+
+#~ msgid "Enable menu"
+#~ msgstr "Omogući izbornik"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Omogući brojač Unity pokretača"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
+
+#~ msgid "Celsius"
+#~ msgstr "Celzijus"
+
+#~ msgid "Fahrenheit"
+#~ msgstr "Farenhajt"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Jedinica temperature:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Položaj okvira senzora:"
+
+#~ msgid "Interface"
+#~ msgstr "Sučelje"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "Pokreni pri pokretanju sesije"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Sakrij prozor pri pokretanju"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Vrati položaj i veličinu prozora"
+
+#~ msgid "Startup"
+#~ msgstr "Pokretanje"
+
+#~ msgid "Foreground:"
+#~ msgstr "Prednji plan:"
+
+#~ msgid "Background:"
+#~ msgstr "Pozadina:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Prozirnost pozadine:"
+
+#~ msgid "Colors"
+#~ msgstr "Boje"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Trajanje nadziranja:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Razdoblje ažuriranja:"
+
+#~ msgid "Measures"
+#~ msgstr "Mjere"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Min</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Maks</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "sekunda(i)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuta(e)"
+
+#~ msgid "Smooth curves"
+#~ msgstr "Zaglađene krivulje"
+
+#~ msgid "Curves"
+#~ msgstr "Krivulje"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Razdoblje ažuriranja mjera:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Omogući zapisivanje sensora"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Razdoblje zapisivanja senzora:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "sekunda(i)"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Skripta za izvršavanje kada se alarm upali"
+
+#~ msgid "Sensors"
+#~ msgstr "Senzori"
+
+#~ msgid "Enable support of lm-sensors"
+#~ msgstr "Omogući podršku za lm-sensors"
+
+#~ msgid "Enable support of NVCtrl (NVidia)"
+#~ msgstr "Omogući podršku za NVCtrl (NVidia)"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
+
+#~ msgid "Enable support of ATI ADL"
+#~ msgstr "Omogući podršku za ATI ADL"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
+
+#~ msgid "Enable support of gtop2"
+#~ msgstr "Omogući podršku za gtop2"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
+
+#~ msgid "Enable support of hddtemp daemon"
+#~ msgstr "Omogući podršku za hddtemp daemon"
+
+#~ msgid "Enable support of libatasmart"
+#~ msgstr "Omogući podršku za libatasmart"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
+
+#~ msgid "Enable support of udisks2"
+#~ msgstr "Omogući podršku za udisks2"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
+
+#~ msgid "The changes are applied after the restart of psensor."
+#~ msgstr "Promjene će biti primjenjene nakon ponovnog pokretanja psensora."
+
+#~ msgid "Hard disk drive"
+#~ msgstr "Čvrsti disk"
+
+#~ msgid "CPU and memory usage"
+#~ msgstr "Korištenje CPU-a i memorije"
+
+#~ msgid "GPU with proprietary driver"
+#~ msgstr "GPU s vlasničkim upravljačkim programima"
+
+#~ msgid "Motherboard, CPU and GPU"
+#~ msgstr "Matična ploča, CPU i GPU"
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Uredi osobitosti senzora"
+
+#~ msgid "Name"
+#~ msgstr "Naziv"
+
+#~ msgid "Type:"
+#~ msgstr "Vrsta:"
+
+#~ msgid "Chip:"
+#~ msgstr "Čip:"
+
+#~ msgid "Name:"
+#~ msgstr "Naziv:"
+
+#~ msgid "Id:"
+#~ msgstr "Id:"
+
+#~ msgid "Details"
+#~ msgstr "Pojedinosti"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Iscrtavaj krivulju senzora"
+
+#~ msgid "Color:"
+#~ msgstr "Boja:"
+
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Prikaži senzor u popisu senzora"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Uključi obavijesti radne površine"
+
+#~ msgid "High threshold:"
+#~ msgstr "Gornja granica:"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "-1"
+#~ msgstr "-1"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Donja granica:"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarm"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Prikaži senzor u izbrniku"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor nije kompajliran s udaljenom podrškom senzora."
+
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Prikaži senzor u oznaci (eksperimentalno)"
+
+#~ msgid "Application Indicator"
+#~ msgstr "Programičić pokazivača"
diff --git a/po/hu.po b/po/hu.po
index ea89404f..8835dd29 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-20 11:26+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"
@@ -19,6 +19,28 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr ""
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Beállítások"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Előtérszín kiválasztása"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Nem sikerült a konfigurációs fájlt beolvasni: %s"
+
 #: src/cfg.c:501
 #, c-format
 msgid "Failed to create the directory %s: %s"
@@ -34,450 +56,94 @@ msgstr "Nem sikerült a konfigurációs fájlt beolvasni: %s"
 msgid "Failed to save configuration file %s."
 msgstr "Nem sikerült a konfigurációs fájlt elmenteni: %s"
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Névjegy"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Beállítások"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Kilépés"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Érzékelő beállításai"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - hőmérsékletfigyelő"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Súgó"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Érzékelő"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Érték"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Minimum"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Maximum"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Szín"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Grafikon"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Megjelenítés"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Jobbra"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Balra"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Felül"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Alul"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Beállítások szerkesztése"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Ablakdíszítés elrejtése"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Ablak alul tartása"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Menü engedélyezése"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Unity indítón lévő számláló engedélyezése"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr "Celsius"
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr "Fahrenheit"
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Hőmérséklet mértékegysége:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Érzékelőtábla pozíciója:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Felület"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr "Indítás a munkamenettel"
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Ablak elrejtése induláskor"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Ablak pozíciójának és méretének visszaállítása"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr "Indítás"
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Előtér:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Háttér:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Háttér átlátszósága:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Színek"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Figyelés hossza:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Frissítési időköz:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Mérések"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Min</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Max</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "másodperc"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "perc"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Mérések frissítési időköze:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Érzékelők naplózásának engedélyezése"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Naplózás időköze:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "másodperc"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Parancsfájl futtatás riasztáskor:"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Érzékelők"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"Licenc: GNU General Public License második (vagy bármely későbbi) változata\n"
+"<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
+"Ez egy szabad szoftver: szabadon terjesztheti és/vagy módosíthatja\n"
+"NINCS GARANCIA, a jogszabályok által megengedett mértékben.\n"
 
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Érzékelő beállításainak szerkesztése"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Név"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Típus:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "---"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Név:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Azonosító:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Használat: %s [KAPCSOLÓK]...\n"
 
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"A Psensor egy GTK+ alkalmazás a hardver érzékelőinek figyelésére, beleértve "
+"a hőmérsékleteket és a ventilátor sebességét."
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Kapcsolók:"
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          ezen súgó megjelenítése, majd kilépés\n"
+"  -v, --version         verzióinformációk megjelenítése, majd kilépés"
 
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Érzékelő görbéjének rajzolása"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Szín:"
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr "Érzékelő megjelenítése az érzékelők listáján"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Asztali értesítések bekapcsolása"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Felső küszöbérték:"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       a psensor-server URL-címe,\n"
+"                      például: http://gepnev:3131"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
-msgstr "-1"
-
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Alsó küszöbérték:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Riasztás"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Érzékelők megjelenítése az alkalmazásmenüben"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
-
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
-msgstr "Érzékelők megjelenítése a címkén (fejlesztés alatt)"
-
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Alkalmazás Indikátor"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
+msgstr "  -n, --new-instance  új Psensor alkalmazás indításának kényszerítése"
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
+"  -d, --debug=LEVEL   hibakeresési szint beállítása, egész 0 és 3 között"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: Nem sikerült betölteni az ADL programkönyvtárat."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: hiányzó ADL API."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: az ADL előkészítése meghiúsult."
-
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: adapterek számainak lekérése meghiúsult"
-
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "ADM/ATI adapterek száma: %d"
+msgid "Report bugs to: %s\n"
+msgstr "A talált hibákat itt jelentse be: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Aktív ADM/ATI adapterek száma: %d"
+msgid "%s home page: <%s>\n"
+msgstr "%s honlap: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr "Lemez"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
 
-#: src/lib/hdd_atasmart.c:153
-#, fuzzy, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: sk_disk_open() hiba: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Hibakeresési mód engedélyezése."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: foglalat megnyitása meghiúsult."
+msgid "Try `%s --help' for more information.\n"
+msgstr "További információkért adja ki a „%s --help” parancsot.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: a kapcsolat megnyitása nem sikerült."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "A Psensors egy példánya már létezik."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: rossz karakterlánc: %s."
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Nem sikerült a mappa létrehozása: %s - %s"
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -514,26 +180,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s: előkészítési hiba: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr "Processzor"
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "RPM"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "A naplófájl megnyitása sikertelen: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "---"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -565,14 +222,6 @@ msgstr "%s: NVIDIA információinak lekérése meghiúsult."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "NVIDIA információinak lekérése meghiúsult."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "RPM"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "HOME változó nincs beállítva."
@@ -594,109 +243,86 @@ msgstr "Az érzékelő naplófájlja nincs nyitva."
 msgid "Sensor log not open, cannot close."
 msgstr "Az érzékelő naplófájlja nincs nyitva, nem lehet bezárni."
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"Licenc: GNU General Public License második (vagy bármely későbbi) változata\n"
-"<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n"
-"Ez egy szabad szoftver: szabadon terjesztheti és/vagy módosíthatja\n"
-"NINCS GARANCIA, a jogszabályok által megengedett mértékben.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: Nem sikerült betölteni az ADL programkönyvtárat."
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Használat: %s [KAPCSOLÓK]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: hiányzó ADL API."
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"A Psensor egy GTK+ alkalmazás a hardver érzékelőinek figyelésére, beleértve "
-"a hőmérsékleteket és a ventilátor sebességét."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: az ADL előkészítése meghiúsult."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Kapcsolók:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: adapterek számainak lekérése meghiúsult"
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
-msgstr ""
-"  -h, --help          ezen súgó megjelenítése, majd kilépés\n"
-"  -v, --version         verzióinformációk megjelenítése, majd kilépés"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "ADM/ATI adapterek száma: %d"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Aktív ADM/ATI adapterek száma: %d"
+
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -u, --url=URL       a psensor-server URL-címe,\n"
-"                      például: http://gepnev:3131"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
-msgstr "  -n, --new-instance  új Psensor alkalmazás indításának kényszerítése"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr "Processzor"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
-"  -d, --debug=LEVEL   hibakeresési szint beállítása, egész 0 és 3 között"
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "A talált hibákat itt jelentse be: %s\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/plog.c:43
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s honlap: <%s>\n"
-
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
+msgid "Cannot open log file: %s"
+msgstr "A naplófájl megnyitása sikertelen: %s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Hibakeresési mód engedélyezése."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "gettimeofday meghiúsult."
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "További információkért adja ki a „%s --help” parancsot.\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "A Psensors egy példánya már létezik."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr "Lemez"
 
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Nem sikerült a mappa létrehozása: %s - %s"
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
+msgstr "%s: foglalat megnyitása meghiúsult."
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Nem sikerül kapcsolódni a következőhöz: %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: a kapcsolat megnyitása nem sikerült."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Érvénytelen tartalom: %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s: rossz karakterlánc: %s."
 
-#: src/rsensor.c:192
+#: src/lib/hdd_atasmart.c:153
 #, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "Érvénytelen JSON: %s"
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: sk_disk_open() hiba: %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -830,28 +456,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "A Psensor honlapja"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Nem sikerült betölteni a Psensor ikonját."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Előtérszín kiválasztása"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Nem sikerült a konfigurációs fájlt beolvasni: %s"
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "gettimeofday meghiúsult."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "Hőmérséklet riasztás"
@@ -861,9 +473,244 @@ msgstr "Hőmérséklet riasztás"
 msgid "Fan speed alert"
 msgstr "Ventilátor riasztás"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Ismeretlen"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Nem sikerül kapcsolódni a következőhöz: %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Érvénytelen tartalom: %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "Érvénytelen JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "Névjegy"
+
+#~ msgid "Quit"
+#~ msgstr "Kilépés"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Érzékelő beállításai"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - hőmérsékletfigyelő"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Súgó"
+
+#~ msgid "Sensor"
+#~ msgstr "Érzékelő"
+
+#~ msgid "Value"
+#~ msgstr "Érték"
+
+#~ msgid "Min"
+#~ msgstr "Minimum"
+
+#~ msgid "Max"
+#~ msgstr "Maximum"
+
+#~ msgid "Color"
+#~ msgstr "Szín"
+
+#~ msgid "Graph"
+#~ msgstr "Grafikon"
+
+#~ msgid "Show"
+#~ msgstr "Megjelenítés"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Jobbra"
+
+#~ msgid "Left"
+#~ msgstr "Balra"
+
+#~ msgid "Top"
+#~ msgstr "Felül"
+
+#~ msgid "Bottom"
+#~ msgstr "Alul"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Beállítások szerkesztése"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Ablakdíszítés elrejtése"
+
+#~ msgid "Keep window below"
+#~ msgstr "Ablak alul tartása"
+
+#~ msgid "Enable menu"
+#~ msgstr "Menü engedélyezése"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Unity indítón lévő számláló engedélyezése"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
+
+#~ msgid "Celsius"
+#~ msgstr "Celsius"
+
+#~ msgid "Fahrenheit"
+#~ msgstr "Fahrenheit"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Hőmérséklet mértékegysége:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Érzékelőtábla pozíciója:"
+
+#~ msgid "Interface"
+#~ msgstr "Felület"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "Indítás a munkamenettel"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Ablak elrejtése induláskor"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Ablak pozíciójának és méretének visszaállítása"
+
+#~ msgid "Startup"
+#~ msgstr "Indítás"
+
+#~ msgid "Foreground:"
+#~ msgstr "Előtér:"
+
+#~ msgid "Background:"
+#~ msgstr "Háttér:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Háttér átlátszósága:"
+
+#~ msgid "Colors"
+#~ msgstr "Színek"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Figyelés hossza:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Frissítési időköz:"
+
+#~ msgid "Measures"
+#~ msgstr "Mérések"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Min</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Max</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "másodperc"
+
+#~ msgid "minute(s)"
+#~ msgstr "perc"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Mérések frissítési időköze:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Érzékelők naplózásának engedélyezése"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Naplózás időköze:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "másodperc"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Parancsfájl futtatás riasztáskor:"
+
+#~ msgid "Sensors"
+#~ msgstr "Érzékelők"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Érzékelő beállításainak szerkesztése"
+
+#~ msgid "Name"
+#~ msgstr "Név"
+
+#~ msgid "Type:"
+#~ msgstr "Típus:"
+
+#~ msgid "Chip:"
+#~ msgstr "Chip:"
+
+#~ msgid "Name:"
+#~ msgstr "Név:"
+
+#~ msgid "Id:"
+#~ msgstr "Azonosító:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Érzékelő görbéjének rajzolása"
+
+#~ msgid "Color:"
+#~ msgstr "Szín:"
+
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Érzékelő megjelenítése az érzékelők listáján"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Asztali értesítések bekapcsolása"
+
+#~ msgid "High threshold:"
+#~ msgstr "Felső küszöbérték:"
+
+#~ msgid "-1"
+#~ msgstr "-1"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Alsó küszöbérték:"
+
+#~ msgid "Alarm"
+#~ msgstr "Riasztás"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Érzékelők megjelenítése az alkalmazásmenüben"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
+
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Érzékelők megjelenítése a címkén (fejlesztés alatt)"
+
+#~ msgid "Application Indicator"
+#~ msgstr "Alkalmazás Indikátor"
 
 #~ msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 #~ msgstr "lmsensor: lmsensor_psensor_create hiba: rossz funkciótípus."
diff --git a/po/it.po b/po/it.po
index 8370c299..3d0b7323 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-20 11:24+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Italian\n"
@@ -18,6 +18,28 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr ""
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Colore di primo piano:"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Attivazione registro dei sensori fallita."
+
 #: src/cfg.c:501
 #, fuzzy, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,451 +55,95 @@ msgstr "Attivazione registro dei sensori fallita."
 msgid "Failed to save configuration file %s."
 msgstr "Attivazione registro dei sensori fallita."
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Informazioni su..."
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Esci"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Preferenze Sensore"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Monitor temperatura"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Aiuto"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Sensore"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Valore"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Minimo"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Massimo"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Colore"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Grafico"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Mostra"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Destra"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Sinistra"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "In Alto"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "In Basso"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Modifica le preferenze"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Nascondi le decorazioni della finestra"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Mantieni la finestra sotto"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Abilita il menù"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Abilita contatore nel Launcher Unity"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr "Celsius"
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr "Fahrenheit"
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Unità di misura della temperatura"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Posizione della tabella dei sensori"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Interfaccia"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr "Lancia all'avvio"
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Nascondi la finestra all'avvio"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Ripristina posizione e dimensione della finestra"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr "Avvio"
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Primo piano:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Sfondo:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Opacità dello sfondo:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Colori"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Durata del monitoraggio:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Intervallo di aggiornamento:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Misure"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Minimo</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Massimo</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "secondo/i"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "minuto/i"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Intervallo di aggiornamento delle misure"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Abilita registrazione sensori"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Intervallo registrazione sensori:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "secondo(i)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Script eseguito quando un allarme viene attivato:"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Sensori"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"Licenza GPLv2: GNU GPL versione 2 o successiva <http://www.gnu.org/licenses/"
+"old-licenses/gpl-2.0.html>\n"
+"Questo è software libero: sei libero di modificarlo e redistribuirlo.\n"
+"NON esiste GARANZIA, per gli scopi permessi dalla legge.\n"
 
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Modifica preferenze del sensore"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Nome"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Tipo:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "N/A"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Processore:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Uso: %s [OPZIONE]...\n"
 
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor è un'applicazione GTK+ per monitorare i sensori dell'hardware, "
+"incluse temperature e velocità delle ventole."
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Opzioni:"
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help mostra questo help ed esce\n"
+"  -v, --version mostra le informazioni sulla versione ed esce"
 
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Disegna curva"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Colore:"
-
-#: src/glade/sensor-edit.glade:448
-#, fuzzy
-msgid "Display sensor in the list of sensors"
-msgstr "Mostra sensore nel menu"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Attiva le notifiche sul desktop"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Soglia verso l'alto"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL URL del server psensor,\n"
+"                      esempio: http://hostname:3131"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
-msgstr "-1"
-
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Soglia verso il basso"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Avviso"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Mostra sensore nel menu"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
-
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
+"  -n, --new-instance forza la creazione di una nuova applicazione Psensor"
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Indicatore Applicazione"
-
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
+"  -d, --debug=LEVEL imposta il livello di debug, un intero compreso tra 0 e 3"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: impossibile trovare la libreria ADL"
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: impossibile trovare l'API di ADL"
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: impossibile inizializzare ADL"
-
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: impossibile rilevare il numero di adattatori."
-
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr ""
+msgid "Report bugs to: %s\n"
+msgstr "Segnalare i bug a: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr ""
+msgid "%s home page: <%s>\n"
+msgstr "%s home page: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr "Disco"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: errore sk_disk_open(): %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Abilita la modalità debug."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: impossibile aprire il socket."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Usare '%s --help' per maggiori informazioni.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: impossibile aprire la connessione."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Esiste già un'istanza di Psensor"
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: errore di stringa: %s"
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Impossibile creare il Web server."
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -514,26 +180,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "lmsensor: inizializzazione fallita: %s"
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr "CPU"
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "RPM"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Impossibile aprire il file di log: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "N/A"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -565,14 +222,6 @@ msgstr "%s: Impossibile recuperare informazioni da NVIDIA"
 msgid "%s: Failed to retrieve number of fans."
 msgstr "Impossibile recuperare informazioni da NVIDIA"
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "RPM"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "Variabile HOME non impostata."
@@ -594,110 +243,86 @@ msgstr "File di registazione sensori non aperto."
 msgid "Sensor log not open, cannot close."
 msgstr "Registro sensori non aperto, impossibile chiuderlo."
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"Licenza GPLv2: GNU GPL versione 2 o successiva <http://www.gnu.org/licenses/"
-"old-licenses/gpl-2.0.html>\n"
-"Questo è software libero: sei libero di modificarlo e redistribuirlo.\n"
-"NON esiste GARANZIA, per gli scopi permessi dalla legge.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: impossibile trovare la libreria ADL"
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Uso: %s [OPZIONE]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: impossibile trovare l'API di ADL"
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"Psensor è un'applicazione GTK+ per monitorare i sensori dell'hardware, "
-"incluse temperature e velocità delle ventole."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: impossibile inizializzare ADL"
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Opzioni:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: impossibile rilevare il numero di adattatori."
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
-"  -h, --help mostra questo help ed esce\n"
-"  -v, --version mostra le informazioni sulla versione ed esce"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
-"  -u, --url=URL URL del server psensor,\n"
-"                      esempio: http://hostname:3131"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -n, --new-instance forza la creazione di una nuova applicazione Psensor"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr "CPU"
+
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
-"  -d, --debug=LEVEL imposta il livello di debug, un intero compreso tra 0 e 3"
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Segnalare i bug a: %s\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/plog.c:43
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s home page: <%s>\n"
-
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
+msgid "Cannot open log file: %s"
+msgstr "Impossibile aprire il file di log: %s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Abilita la modalità debug."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "gettimeofday fallito."
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Usare '%s --help' per maggiori informazioni.\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Esiste già un'istanza di Psensor"
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr "Disco"
 
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Impossibile creare il Web server."
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
+msgstr "%s: impossibile aprire il socket."
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Impossibile connettersi a: %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: impossibile aprire la connessione."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Conenuto non valido: %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s: errore di stringa: %s"
 
-#: src/rsensor.c:192
-#, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "JSON non valido: %s"
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: errore sk_disk_open(): %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -831,28 +456,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Psensor Homepage"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Impossibile caricare l'icona di Psensor."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Colore di primo piano:"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Attivazione registro dei sensori fallita."
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "gettimeofday fallito."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "Allarme temperatura"
@@ -862,9 +473,242 @@ msgstr "Allarme temperatura"
 msgid "Fan speed alert"
 msgstr "Allarme ventola"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Sconosciuto"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Impossibile connettersi a: %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Conenuto non valido: %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "JSON non valido: %s"
+
+#~ msgid "About"
+#~ msgstr "Informazioni su..."
+
+#~ msgid "Quit"
+#~ msgstr "Esci"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Preferenze Sensore"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - Monitor temperatura"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Aiuto"
+
+#~ msgid "Sensor"
+#~ msgstr "Sensore"
+
+#~ msgid "Value"
+#~ msgstr "Valore"
+
+#~ msgid "Min"
+#~ msgstr "Minimo"
+
+#~ msgid "Max"
+#~ msgstr "Massimo"
+
+#~ msgid "Color"
+#~ msgstr "Colore"
+
+#~ msgid "Graph"
+#~ msgstr "Grafico"
+
+#~ msgid "Show"
+#~ msgstr "Mostra"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Destra"
+
+#~ msgid "Left"
+#~ msgstr "Sinistra"
+
+#~ msgid "Top"
+#~ msgstr "In Alto"
+
+#~ msgid "Bottom"
+#~ msgstr "In Basso"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Modifica le preferenze"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Nascondi le decorazioni della finestra"
+
+#~ msgid "Keep window below"
+#~ msgstr "Mantieni la finestra sotto"
+
+#~ msgid "Enable menu"
+#~ msgstr "Abilita il menù"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Abilita contatore nel Launcher Unity"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
+
+#~ msgid "Celsius"
+#~ msgstr "Celsius"
+
+#~ msgid "Fahrenheit"
+#~ msgstr "Fahrenheit"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Unità di misura della temperatura"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Posizione della tabella dei sensori"
+
+#~ msgid "Interface"
+#~ msgstr "Interfaccia"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "Lancia all'avvio"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Nascondi la finestra all'avvio"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Ripristina posizione e dimensione della finestra"
+
+#~ msgid "Startup"
+#~ msgstr "Avvio"
+
+#~ msgid "Foreground:"
+#~ msgstr "Primo piano:"
+
+#~ msgid "Background:"
+#~ msgstr "Sfondo:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Opacità dello sfondo:"
+
+#~ msgid "Colors"
+#~ msgstr "Colori"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Durata del monitoraggio:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Intervallo di aggiornamento:"
+
+#~ msgid "Measures"
+#~ msgstr "Misure"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Minimo</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Massimo</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "secondo/i"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuto/i"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Intervallo di aggiornamento delle misure"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Abilita registrazione sensori"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Intervallo registrazione sensori:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "secondo(i)"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Script eseguito quando un allarme viene attivato:"
+
+#~ msgid "Sensors"
+#~ msgstr "Sensori"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Modifica preferenze del sensore"
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
+#~ msgid "Chip:"
+#~ msgstr "Processore:"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid "Id:"
+#~ msgstr "Id:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Disegna curva"
+
+#~ msgid "Color:"
+#~ msgstr "Colore:"
+
+#, fuzzy
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Mostra sensore nel menu"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Attiva le notifiche sul desktop"
+
+#~ msgid "High threshold:"
+#~ msgstr "Soglia verso l'alto"
+
+#~ msgid "-1"
+#~ msgstr "-1"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Soglia verso il basso"
+
+#~ msgid "Alarm"
+#~ msgstr "Avviso"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Mostra sensore nel menu"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
+
+#~ msgid "Application Indicator"
+#~ msgstr "Indicatore Applicazione"
 
 #~ msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 #~ msgstr "lmsensor: lmsensor_psensor_create fallito: tipo di funzione errata."
diff --git a/po/lv.po b/po/lv.po
index 0c37d0b2..3bd31bb7 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-20 11:26+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -18,6 +18,28 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Nezināms"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr ""
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Iestatījumi"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Izvēlieties priekšplāna krāsu"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Neizdevās aktivizēt sensoru žurnalēšanu."
+
 #: src/cfg.c:501
 #, fuzzy, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,452 +55,88 @@ msgstr "Neizdevās aktivizēt sensoru žurnalēšanu."
 msgid "Failed to save configuration file %s."
 msgstr "Neizdevās aktivizēt sensoru žurnalēšanu."
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Par"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Iestatījumi"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Iziet"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Sensoru iestatījumi"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - temperatūras pārraugs"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Palīdzība"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Sensors"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Vērtība"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Min."
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Maks."
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Krāsa"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Grafiks"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Rādīt"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Pa labi"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Pa kreisi"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Augšā"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Lejā"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Rediģēt iestatījumus"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Slēpt loga apdari"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Turēt logu apakšā"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Aktivizēt izvēlni"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Aktivizēt Unity palaidēja skaitītāju"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr "Celsijs"
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr "Fārenheits"
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Temperatūras mērvienība:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Sensoru tabulas novietojums:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Saskarne"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr "Palaist pieteicoties sistēmā"
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Slēpt logu pieteicoties sistēmā"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Atjaunot loga pozīciju un izmēru"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr "Palaišana"
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Priekšplāns:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Fons:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Fona necaurspīdība:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Krāsas"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Pārraudzības ilgums:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Atjaunināšanas intervāls:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Mērījumi"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Min.</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Maks.</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "sekunde(s)"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "minūte(s)"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Mērījumu atjaunināšanas intervāls:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Aktivizēt sensora žurnalēšanu"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Sensoru žurnalēšanas intervāls:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "sekunde(s)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Skrips izpildīts, kad trauksme ir aktivizēta:"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Sensori"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Rediģēt sensoru iestatījumus"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Nosaukums"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Tips:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "N/P"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Mikroshēma:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Nosaukums:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Lietošana: %s [OPCIJAS]...\n"
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor ir GTK+ lietotne aparatūras sensoru pārraudzībai, ieskaitot "
+"temperatūras un ventilatoru ātrumus."
 
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Zīmēt sensora līkni"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Krāsa:"
-
-#: src/glade/sensor-edit.glade:448
-#, fuzzy
-msgid "Display sensor in the list of sensors"
-msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Aktivizēt darbvirsmas paziņojumus"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Augsts slieksnis:"
+#: src/main.c:78
+msgid "Options:"
+msgstr "Opcijas:"
 
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          rādīt šo palīdzību un iziet\n"
+"  -v, --version       rādīt versijas informāciju un iziet"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
-msgstr "-1"
-
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Zems slieksnis:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Trauksme"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
-
-#: src/glade/sensor-edit.glade:719
-#, fuzzy
-msgid "Display sensor in the label (experimental)"
-msgstr "Attēlot sensoru etiķetē (eksperimentāls)"
-
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Aplikāciju indikators"
-
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=SAITE       psensor-server adrese,\n"
+"                      piemērs: http://saimniekdatoravārds:3131"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: nevar atrast ADL bibliotēku."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: trūkst ADL programmatūras saskarne."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: neizdevās inicializēt ADL."
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
+msgstr "  -n, --new-instance  piespiest izveidot jaunu Psensor lietotni"
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: nevar saņemt adapteru skaitu."
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+msgstr "  -d, --debug=LĪMENIS   iestatīt atkļūdošanas līmeni, starp 0 un 3"
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "AMD/ATI adapteru skaits: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Ziņojiet kļūdas uz: %s.\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Aktīvo AMD/ATI adapteru skaits: %d"
+msgid "%s home page: <%s>\n"
+msgstr "%s mājas lapa: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr "Disks"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
 
-#: src/lib/hdd_atasmart.c:153
-#, fuzzy, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "atasmart: sk_disk_open() atteice: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Aktivizēt atkļūdošanas režīmu."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: neizdevās atvērt ligzdu."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Mēģiniet `%s --help', lai iegūtu vairāk informācijas.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: neizdevās atvērt savienojumu."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Psensor instance jau eksistē."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: nepareiza virkne: %s."
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Neizdevās izveidot tīmekļa serveri."
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -515,26 +173,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s: inicializācijas kļūda: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr "CPU"
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
-
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "RPM"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Nevar atvērt žurnāla failu: %s"
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
+
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "N/P"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -566,14 +215,6 @@ msgstr "%s: Neizdevās saņemt NVIDIA informāciju."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "Neizdevās saņemt NVIDIA informāciju."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "RPM"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "HOME mainīgais nav iestatīts."
@@ -595,103 +236,86 @@ msgstr "Sensora žurnāla fails nav atvērts."
 msgid "Sensor log not open, cannot close."
 msgstr "Sensora žurnāls nav atvērts, nevar aizvērt."
 
-#: src/main.c:61 src/server/server.c:88
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: nevar atrast ADL bibliotēku."
+
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: trūkst ADL programmatūras saskarne."
+
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: neizdevās inicializēt ADL."
+
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: nevar saņemt adapteru skaitu."
+
+#: src/lib/amd.c:253
 #, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "AMD/ATI adapteru skaits: %d"
 
-#: src/main.c:72 src/server/server.c:98
+#: src/lib/amd.c:254
 #, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Lietošana: %s [OPCIJAS]...\n"
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Aktīvo AMD/ATI adapteru skaits: %d"
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"Psensor ir GTK+ lietotne aparatūras sensoru pārraudzībai, ieskaitot "
-"temperatūras un ventilatoru ātrumus."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Opcijas:"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr "CPU"
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
-"  -h, --help          rādīt šo palīdzību un iziet\n"
-"  -v, --version       rādīt versijas informāciju un iziet"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/pgtop2.c:64
+msgid "memory"
 msgstr ""
-"  -u, --url=SAITE       psensor-server adrese,\n"
-"                      piemērs: http://saimniekdatoravārds:3131"
-
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
-msgstr "  -n, --new-instance  piespiest izveidot jaunu Psensor lietotni"
-
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
-msgstr "  -d, --debug=LĪMENIS   iestatīt atkļūdošanas līmeni, starp 0 un 3"
-
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Ziņojiet kļūdas uz: %s.\n"
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/plog.c:43
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s mājas lapa: <%s>\n"
-
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
+msgid "Cannot open log file: %s"
+msgstr "Nevar atvērt žurnāla failu: %s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Aktivizēt atkļūdošanas režīmu."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "gettimeofday neizdevās."
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Mēģiniet `%s --help', lai iegūtu vairāk informācijas.\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Psensor instance jau eksistē."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr "Disks"
 
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Neizdevās izveidot tīmekļa serveri."
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
+msgstr "%s: neizdevās atvērt ligzdu."
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Neizdevās savienoties ar: %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: neizdevās atvērt savienojumu."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Nederīgs saturs: %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s: nepareiza virkne: %s."
 
-#: src/rsensor.c:192
+#: src/lib/hdd_atasmart.c:153
 #, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "Nederīgs JSON: %s"
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "atasmart: sk_disk_open() atteice: %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -823,28 +447,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Psensor mājas lapa"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Neizdevās ielādēt Psensor ikonu."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Izvēlieties priekšplāna krāsu"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Neizdevās aktivizēt sensoru žurnalēšanu."
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "gettimeofday neizdevās."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "Temperatūras trauksme"
@@ -854,9 +464,246 @@ msgstr "Temperatūras trauksme"
 msgid "Fan speed alert"
 msgstr "Ventilatora trauksme"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Nezināms"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Neizdevās savienoties ar: %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Nederīgs saturs: %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "Nederīgs JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "Par"
+
+#~ msgid "Quit"
+#~ msgstr "Iziet"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Sensoru iestatījumi"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - temperatūras pārraugs"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Palīdzība"
+
+#~ msgid "Sensor"
+#~ msgstr "Sensors"
+
+#~ msgid "Value"
+#~ msgstr "Vērtība"
+
+#~ msgid "Min"
+#~ msgstr "Min."
+
+#~ msgid "Max"
+#~ msgstr "Maks."
+
+#~ msgid "Color"
+#~ msgstr "Krāsa"
+
+#~ msgid "Graph"
+#~ msgstr "Grafiks"
+
+#~ msgid "Show"
+#~ msgstr "Rādīt"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Pa labi"
+
+#~ msgid "Left"
+#~ msgstr "Pa kreisi"
+
+#~ msgid "Top"
+#~ msgstr "Augšā"
+
+#~ msgid "Bottom"
+#~ msgstr "Lejā"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Rediģēt iestatījumus"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Slēpt loga apdari"
+
+#~ msgid "Keep window below"
+#~ msgstr "Turēt logu apakšā"
+
+#~ msgid "Enable menu"
+#~ msgstr "Aktivizēt izvēlni"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Aktivizēt Unity palaidēja skaitītāju"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
+
+#~ msgid "Celsius"
+#~ msgstr "Celsijs"
+
+#~ msgid "Fahrenheit"
+#~ msgstr "Fārenheits"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Temperatūras mērvienība:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Sensoru tabulas novietojums:"
+
+#~ msgid "Interface"
+#~ msgstr "Saskarne"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "Palaist pieteicoties sistēmā"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Slēpt logu pieteicoties sistēmā"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Atjaunot loga pozīciju un izmēru"
+
+#~ msgid "Startup"
+#~ msgstr "Palaišana"
+
+#~ msgid "Foreground:"
+#~ msgstr "Priekšplāns:"
+
+#~ msgid "Background:"
+#~ msgstr "Fons:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Fona necaurspīdība:"
+
+#~ msgid "Colors"
+#~ msgstr "Krāsas"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Pārraudzības ilgums:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Atjaunināšanas intervāls:"
+
+#~ msgid "Measures"
+#~ msgstr "Mērījumi"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Min.</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Maks.</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "sekunde(s)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minūte(s)"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Mērījumu atjaunināšanas intervāls:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Aktivizēt sensora žurnalēšanu"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Sensoru žurnalēšanas intervāls:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "sekunde(s)"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Skrips izpildīts, kad trauksme ir aktivizēta:"
+
+#~ msgid "Sensors"
+#~ msgstr "Sensori"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Rediģēt sensoru iestatījumus"
+
+#~ msgid "Name"
+#~ msgstr "Nosaukums"
+
+#~ msgid "Type:"
+#~ msgstr "Tips:"
+
+#~ msgid "Chip:"
+#~ msgstr "Mikroshēma:"
+
+#~ msgid "Name:"
+#~ msgstr "Nosaukums:"
+
+#~ msgid "Id:"
+#~ msgstr "Id:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Zīmēt sensora līkni"
+
+#~ msgid "Color:"
+#~ msgstr "Krāsa:"
+
+#, fuzzy
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Aktivizēt darbvirsmas paziņojumus"
+
+#~ msgid "High threshold:"
+#~ msgstr "Augsts slieksnis:"
+
+#~ msgid "-1"
+#~ msgstr "-1"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Zems slieksnis:"
+
+#~ msgid "Alarm"
+#~ msgstr "Trauksme"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
+
+#, fuzzy
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Attēlot sensoru etiķetē (eksperimentāls)"
+
+#~ msgid "Application Indicator"
+#~ msgstr "Aplikāciju indikators"
 
 #~ msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 #~ msgstr "lmsensor: lmsensor_psensor_create atteice: nepareis īpašības tips."
diff --git a/po/nl.po b/po/nl.po
index bdfa69cf..5c8ae93b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-20 11:25+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -18,6 +18,28 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr ""
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Voorkeuren"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Kies voorgrondkleur"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren."
+
 #: src/cfg.c:501
 #, fuzzy, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,460 +55,96 @@ msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren."
 msgid "Failed to save configuration file %s."
 msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren."
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Over"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Voorkeuren"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Afsluiten"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Sensorvoorkeuren"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Temperatuurbewaker"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Hulp"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Sensor"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Waarde"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Min"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Max"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Kleur"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Grafiek"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Tonen"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Voorkeuren bewerken"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Vensteromlijsting verbergen"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Houd venster eronder"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Menu inschakelen"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Teller voor Unity-starter inschakelen"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr ""
-"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Temperatuureenheid:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Positie van sensorentabel:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Bedieningsschil"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Venster bij opstarten verbergen"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Vensterpositie en -grootte herstellen"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Voorgrond:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Achtergrond:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Ondoorzichtigheid van achtergrond:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Kleuren"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Duur van bewaking:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Tussenpoze voor bijwerken:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Metingen"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Min</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Max</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "seconde(n)"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "minu(u)t(en)"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Tussenpoze voor bijwerken van meting:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Logboeken bijhouden inschakelen voor sensoren"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Tussenpoze voor bijhouden van logboeken voor sensoren:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "seconden(s)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Script dat wordt uitgevoerd wanneer er een alarm plaatsvindt:"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Sensoren"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr ""
-"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr ""
-"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr ""
-"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr ""
-"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr ""
-"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Sensorvoorkeuren bewerken"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Naam"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Soort:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "N.v.t."
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Naam:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Auteursrecht (C) %s jeanfi@gmail.com\n"
+"Licentie GPLv2: GNU GPL versie 2 of nieuwer <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"Dit is vrije programmatuur: u mag hem wijzigen en doorgeven.\n"
+"Er zit geen garantie op, voor zover de wet dat toestaat.\n"
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Gebruik: %s [OPTIE]...\n"
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor is een GTK+ toepassing voor het bewaken van apparatuursensoren, "
+"inclusief temperaturen en ventilatorsnelheden."
 
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Sensor-curve tekenen"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Kleur:"
-
-#: src/glade/sensor-edit.glade:448
-#, fuzzy
-msgid "Display sensor in the list of sensors"
-msgstr "Sensor tonen in het menu van de Toepassingsindicator"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Bureaubladmeldingen inschakelen"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Drempel voor hoog:"
+#: src/main.c:78
+msgid "Options:"
+msgstr "Opties:"
 
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          toon deze hulpinformatie en sluit af\n"
+"  -v, --version       toon versie-informatie en sluit af"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       het webadres van de psensor-server,\n"
+"                      voorbeeld: http://hostname:3131"
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Drempel voor laag:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Sensor tonen in het menu van de Toepassingsindicator"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
-"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
-
-#: src/glade/sensor-edit.glade:719
-#, fuzzy
-msgid "Display sensor in the label (experimental)"
-msgstr "Sensor tonen in het menu van de Toepassingsindicator"
-
-#: src/glade/sensor-edit.glade:752
-#, fuzzy
-msgid "Application Indicator"
-msgstr "Ubuntu Toepassingsindicator"
+"  -n, --new-instance  forceer het aanmaken van een nieuwe Psensor-toepassing"
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
+"  -d, --debug=LEVEL   stel het foutopsporingsniveau in, integer tussen 0 en 3"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: kan ADL-bibliotheekbestand niet vinden"
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: ontbrekende ADL's API."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: kon ADL niet initialiseren."
-
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: kan het aantal videokaarten niet bepalen."
-
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "Aantal AMD/ATI-videokaarten: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Meld fouten aan: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Aantal actieve AMD/ATI-videokaarten: %d"
+msgid "%s home page: <%s>\n"
+msgstr "Webpagina van %s: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
 msgstr ""
+"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
 
-#: src/lib/hdd_atasmart.c:153
-#, fuzzy, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "atasmart: sk_disk_open() mislukking: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Schakelt foutopsporingsmodus in."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: kon contactpunt niet openen."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Probeer '%s --help' voor meer informatie.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: kon verbinding niet openen."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Er bestaat reeds een instantie van Psensor."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: verkeerde tekenreeks: %s."
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Kon geen webserver maken."
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -523,26 +181,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s: opstartfout: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "RPM"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Kan logboekbestand niet openen: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "N.v.t."
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -574,14 +223,6 @@ msgstr "%s: Kon Nvidia-informatie niet ophalen."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "Kon Nvidia-informatie niet ophalen."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "RPM"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "Variabele voor HOME niet ingesteld."
@@ -603,111 +244,86 @@ msgstr "Logboekbestand van sensor niet geopend."
 msgid "Sensor log not open, cannot close."
 msgstr "Logboekbestand van sensor niet geopend, kan niet sluiten."
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Auteursrecht (C) %s jeanfi@gmail.com\n"
-"Licentie GPLv2: GNU GPL versie 2 of nieuwer <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"Dit is vrije programmatuur: u mag hem wijzigen en doorgeven.\n"
-"Er zit geen garantie op, voor zover de wet dat toestaat.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: kan ADL-bibliotheekbestand niet vinden"
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Gebruik: %s [OPTIE]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: ontbrekende ADL's API."
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"Psensor is een GTK+ toepassing voor het bewaken van apparatuursensoren, "
-"inclusief temperaturen en ventilatorsnelheden."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: kon ADL niet initialiseren."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Opties:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: kan het aantal videokaarten niet bepalen."
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "Aantal AMD/ATI-videokaarten: %d"
+
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Aantal actieve AMD/ATI-videokaarten: %d"
+
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -h, --help          toon deze hulpinformatie en sluit af\n"
-"  -v, --version       toon versie-informatie en sluit af"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
 msgstr ""
-"  -u, --url=URL       het webadres van de psensor-server,\n"
-"                      voorbeeld: http://hostname:3131"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
-"  -n, --new-instance  forceer het aanmaken van een nieuwe Psensor-toepassing"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:64
+msgid "memory"
 msgstr ""
-"  -d, --debug=LEVEL   stel het foutopsporingsniveau in, integer tussen 0 en 3"
 
-#: src/main.c:96 src/server/server.c:121
+#: src/lib/plog.c:43
 #, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Meld fouten aan: %s\n"
+msgid "Cannot open log file: %s"
+msgstr "Kan logboekbestand niet openen: %s"
 
-#: src/main.c:98 src/server/server.c:123
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr "Webpagina van %s: <%s>\n"
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "gettimeofday (tijdbepaling) is mislukt."
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
+#: src/lib/pudisks2.c:142
+#, c-format
+msgid "%s: cannot get the udisks2 client"
 msgstr ""
-"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Schakelt foutopsporingsmodus in."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr ""
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/hdd_hddtemp.c:62
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Probeer '%s --help' voor meer informatie.\n"
-
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Er bestaat reeds een instantie van Psensor."
-
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Kon geen webserver maken."
+msgid "%s: failed to open socket."
+msgstr "%s: kon contactpunt niet openen."
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Kon niet verbinden met: %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: kon verbinding niet openen."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Ongeldige inhoud: %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s: verkeerde tekenreeks: %s."
 
-#: src/rsensor.c:192
+#: src/lib/hdd_atasmart.c:153
 #, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "Ongeldige JSON: %s"
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "atasmart: sk_disk_open() mislukking: %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -839,28 +455,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Thuispagina van Psensor"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Kon pictogram van Psensor niet laden."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Kies voorgrondkleur"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren."
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "gettimeofday (tijdbepaling) is mislukt."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "Temperatuurwaarschuwing"
@@ -870,9 +472,226 @@ msgstr "Temperatuurwaarschuwing"
 msgid "Fan speed alert"
 msgstr "Ventilatorwaarschuwing"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Onbekend"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Kon niet verbinden met: %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Ongeldige inhoud: %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "Ongeldige JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "Over"
+
+#~ msgid "Quit"
+#~ msgstr "Afsluiten"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Sensorvoorkeuren"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - Temperatuurbewaker"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Hulp"
+
+#~ msgid "Sensor"
+#~ msgstr "Sensor"
+
+#~ msgid "Value"
+#~ msgstr "Waarde"
+
+#~ msgid "Min"
+#~ msgstr "Min"
+
+#~ msgid "Max"
+#~ msgstr "Max"
+
+#~ msgid "Color"
+#~ msgstr "Kleur"
+
+#~ msgid "Graph"
+#~ msgstr "Grafiek"
+
+#~ msgid "Show"
+#~ msgstr "Tonen"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Voorkeuren bewerken"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Vensteromlijsting verbergen"
+
+#~ msgid "Keep window below"
+#~ msgstr "Houd venster eronder"
+
+#~ msgid "Enable menu"
+#~ msgstr "Menu inschakelen"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Teller voor Unity-starter inschakelen"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr ""
+#~ "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Temperatuureenheid:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Positie van sensorentabel:"
+
+#~ msgid "Interface"
+#~ msgstr "Bedieningsschil"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Venster bij opstarten verbergen"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Vensterpositie en -grootte herstellen"
+
+#~ msgid "Foreground:"
+#~ msgstr "Voorgrond:"
+
+#~ msgid "Background:"
+#~ msgstr "Achtergrond:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Ondoorzichtigheid van achtergrond:"
+
+#~ msgid "Colors"
+#~ msgstr "Kleuren"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Duur van bewaking:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Tussenpoze voor bijwerken:"
+
+#~ msgid "Measures"
+#~ msgstr "Metingen"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Min</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Max</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "seconde(n)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minu(u)t(en)"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Tussenpoze voor bijwerken van meting:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Logboeken bijhouden inschakelen voor sensoren"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Tussenpoze voor bijhouden van logboeken voor sensoren:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "seconden(s)"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Script dat wordt uitgevoerd wanneer er een alarm plaatsvindt:"
+
+#~ msgid "Sensors"
+#~ msgstr "Sensoren"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr ""
+#~ "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr ""
+#~ "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr ""
+#~ "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr ""
+#~ "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr ""
+#~ "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Sensorvoorkeuren bewerken"
+
+#~ msgid "Name"
+#~ msgstr "Naam"
+
+#~ msgid "Type:"
+#~ msgstr "Soort:"
+
+#~ msgid "Chip:"
+#~ msgstr "Chip:"
+
+#~ msgid "Name:"
+#~ msgstr "Naam:"
+
+#~ msgid "Id:"
+#~ msgstr "Id:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Sensor-curve tekenen"
+
+#~ msgid "Color:"
+#~ msgstr "Kleur:"
+
+#, fuzzy
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Sensor tonen in het menu van de Toepassingsindicator"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Bureaubladmeldingen inschakelen"
+
+#~ msgid "High threshold:"
+#~ msgstr "Drempel voor hoog:"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Drempel voor laag:"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarm"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Sensor tonen in het menu van de Toepassingsindicator"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr ""
+#~ "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
+
+#, fuzzy
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Sensor tonen in het menu van de Toepassingsindicator"
+
+#, fuzzy
+#~ msgid "Application Indicator"
+#~ msgstr "Ubuntu Toepassingsindicator"
 
 #~ msgid "Sensor Information"
 #~ msgstr "Sensorinformatie"
diff --git a/po/pl.po b/po/pl.po
index 7d136956..a6995d06 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor 1.2.0\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2016-08-25 11:09+0200\n"
 "Last-Translator: hawkeye116477 <hawkeye116477@gmail.com>\n"
 "Language-Team: Polish\n"
@@ -17,6 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr "Ukryj"
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Preferencje"
+
+#: src/ui_sensorlist.c:303
+msgid "Select sensor color"
+msgstr "Wybierz kolor czujnika"
+
+#: src/ui_appindicator.c:148
+#, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Nie powiodło się załadowanie pliku glade %s: %s"
+
 #: src/cfg.c:501
 #, c-format
 msgid "Failed to create the directory %s: %s"
@@ -32,444 +53,94 @@ msgstr "Nie powiodło się załadowanie pliku konfiguracyjnego %s: %s"
 msgid "Failed to save configuration file %s."
 msgstr "Nie powiodło się zapisanie pliku konfiguracyjnego %s."
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "O programie"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Preferencje"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Zamknij"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Preferencje czujników"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - kontroler temperatury"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "Pomoc"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Czujnik"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Wartość"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Min"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Max"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Kolor"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Wykres"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Pokaż"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Prawo"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Lewo"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Góra"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Dół"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Edycja preferencji"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Ukryj dekorację okna"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Utrzymaj okno poniżej"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Włącz menu"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Włącz licznik Unity Launcher"
-
-#: src/glade/psensor-pref.glade:190
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor nie został zbudowany z obsługą Unity Launcher"
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr "Celsjusz"
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr "Fahrenheit"
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Jednostka temperatury:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Pozycja tabeli czujników:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Interfejs"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr "Uruchom przy starcie sesji"
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Ukryj okno przy starcie"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Przywróć pozycję i rozmiar okna"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr "Uruchamianie"
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Pierwszy plan:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Tło:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Nieprzezroczystość tła:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Kolory"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Czas trwania monitorowania:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Częstość aktualizacji:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Pomiary"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Min</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Max</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "sekund(y)"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "minut(y)"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr "Gładkie krzywe"
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr "Krzywe"
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Częstość aktualizacji pomiarów:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Włącz logowanie czujników"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Częstość logowania czujników:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "sekund(y)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Wykonywany skrypt, gdy podniesiony jest alarm:"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Czujniki"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr "Włącz obsługę lm-sensors"
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr "Włącz obsługę NVCtrl (NVidia)"
-
-#: src/glade/psensor-pref.glade:974
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor nie został zbudowany z obsługą NVCtrl"
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr "Włącz obsługę ATI ADL"
-
-#: src/glade/psensor-pref.glade:993
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor nie został zbudowany z obsługą ATI ADL"
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr "Włącz obsługę gtop2"
-
-#: src/glade/psensor-pref.glade:1012
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor nie został zbudowany z obsługą gtop2"
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr "Włącz obsługę demona hddtemp"
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr "Włącz obsługę libatasmart"
-
-#: src/glade/psensor-pref.glade:1049
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor nie został zbudowany z obsługą libatasmart "
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr "Włącz obsługę udisks2"
-
-#: src/glade/psensor-pref.glade:1068
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor nie został zbudowany z obsługą udisks2"
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr "Zmiany zostaną zatwierdzone po restarcie programu psensor"
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr "Dysk twardy"
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr "Wykorzystanie pamięci i procesora"
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr "GPU z własnościowym sterownikiem"
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr "Płyta główna, procesor (CPU) i procesor graficzny (GPU)"
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr "Dostawcy"
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Edycja preferencji czujników"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Nazwa"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Typ:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "Niedostępne"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Nazwa:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr "Min:"
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr "Max:"
-
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr "etykieta"
-
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr "Szczegóły"
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Narysuj krzywą czujnika"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Kolor:"
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr "Wyświetl czujnik na liście czujników"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Aktywuj powiadomienia na pulpicie"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Wysoki próg:"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
-msgstr "0"
-
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
-msgstr "-1"
-
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Niski próg:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Wyświetl czujnik w menu"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-msgid "Psensor has not been build with AppIndicator support"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Psensor nie został zbudowany z obsługą wskaźnika aplikacji (AppIndicator)"
+"Copyright (C) %s jeanfi@gmail.com\n"
+"Licencja GPLv2: GNU GPL wersja 2 lub nowsza <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"To jest wolne oprogramowanie: możesz je dowolnie modyfikować i "
+"rozpowszechniać.\n"
+"NIE MA GWARANCJI w zakresie dozwolonym przez prawo.\n"
 
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
-msgstr "Wyświetl czujnik w etykiecie (eksperymentalne)"
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Użycie: %s [OPCJA]...\n"
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Wskaźnik aplikacji"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
+msgstr ""
+"Psensor jest aplikacją GTK+ do monitorowania czujników sprzętowych, w tym "
+"temperatury i prędkości wentylatorów."
 
-#: src/graph.c:460
-msgid "No graphs enabled"
-msgstr "Brak wykresów"
+#: src/main.c:78
+msgid "Options:"
+msgstr "Opcje:"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: nie można znaleźć biblioteki ADL."
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
+msgstr ""
+"  -h, --help          wyświetl pomoc i wyjdź\n"
+"  -v, --version       wyświetl informacje o wersji i wyjdź"
 
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: brakuje API ADL."
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
+msgstr ""
+"  -u, --url=URL       adres URL serwera psensor,\n"
+"                      przykład: http://nazwahosta:3131"
 
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: nie powiodła się inicjalizacja ADL."
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
+msgstr "  -n, --new-instance  wymuś utworzenie nowej aplikacji Psensor"
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: nie można uzyskać ilości kart."
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+msgstr ""
+"  -d, --debug=POZIOM  ustaw poziom debugowania, liczbę całkowitą od 0 do 3"
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "Ilość kart AMD/ATI: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Zgłoś błędy do: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Ilość aktywnych kart AMD/ATI: %d"
+msgid "%s home page: <%s>\n"
+msgstr "Strona internetowa %s: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr "Dysk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor nie został skompilowany z obsługą zdalnego czujnika."
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: sk_disk_open() niepowodzenie: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Włącza tryb debugowania."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: nie udało się otworzyć gniazdo."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Spróbuj `%s --help', aby uzyskać więcej informacji.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: nie udało się otworzyć połączenie."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Instancja Psensor już istnieje."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: błędne wyrażenie: %s."
+#: src/main.c:527
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Nie powiodło się utworzenie wątku do monitorowania czujników"
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -506,26 +177,17 @@ msgstr "ACPI"
 msgid "%s: initialization failure: %s."
 msgstr "%s: nie powodzenie inicjalizacji: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr "Wykorzystanie procesora"
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr "Procesor"
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr "wolna pamięć"
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "obr./min"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr "pamięć"
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Nie można otworzyć pliku dziennika: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "Niedostępne"
 
 #: src/lib/nvidia.c:69
 #, c-format
@@ -557,14 +219,6 @@ msgstr "%s: Nie powiodło się uzyskanie informacji NVIDIA."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "%s: Nie powiodło się uzyskanie ilości wentylatorów."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "obr./min"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "Zmienna HOME nie jest ustawiona."
@@ -573,122 +227,99 @@ msgstr "Zmienna HOME nie jest ustawiona."
 msgid "Sensor log file already open."
 msgstr "Plik dziennika czujnika jest już otwarty."
 
-#: src/lib/slog.c:105
-#, c-format
-msgid "Cannot open sensor log file: %s."
-msgstr "Nie można otworzyć pliku dziennika czujnika: %s."
-
-#: src/lib/slog.c:136
-msgid "Sensor log file not open."
-msgstr "Plik dziennika czujnika nie otwarty."
-
-#: src/lib/slog.c:192
-msgid "Sensor log not open, cannot close."
-msgstr "Plik dziennika czujnika nie otwarty, nie można zamknąć."
-
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"Licencja GPLv2: GNU GPL wersja 2 lub nowsza <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"To jest wolne oprogramowanie: możesz je dowolnie modyfikować i "
-"rozpowszechniać.\n"
-"NIE MA GWARANCJI w zakresie dozwolonym przez prawo.\n"
-
-#: src/main.c:72 src/server/server.c:98
+#: src/lib/slog.c:105
 #, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Użycie: %s [OPCJA]...\n"
+msgid "Cannot open sensor log file: %s."
+msgstr "Nie można otworzyć pliku dziennika czujnika: %s."
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"Psensor jest aplikacją GTK+ do monitorowania czujników sprzętowych, w tym "
-"temperatury i prędkości wentylatorów."
+#: src/lib/slog.c:136
+msgid "Sensor log file not open."
+msgstr "Plik dziennika czujnika nie otwarty."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Opcje:"
+#: src/lib/slog.c:192
+msgid "Sensor log not open, cannot close."
+msgstr "Plik dziennika czujnika nie otwarty, nie można zamknąć."
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
-msgstr ""
-"  -h, --help          wyświetl pomoc i wyjdź\n"
-"  -v, --version       wyświetl informacje o wersji i wyjdź"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: nie można znaleźć biblioteki ADL."
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
-msgstr ""
-"  -u, --url=URL       adres URL serwera psensor,\n"
-"                      przykład: http://nazwahosta:3131"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: brakuje API ADL."
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
-msgstr "  -n, --new-instance  wymuś utworzenie nowej aplikacji Psensor"
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: nie powiodła się inicjalizacja ADL."
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
-msgstr ""
-"  -d, --debug=POZIOM  ustaw poziom debugowania, liczbę całkowitą od 0 do 3"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: nie można uzyskać ilości kart."
 
-#: src/main.c:96 src/server/server.c:121
+#: src/lib/amd.c:253
 #, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Zgłoś błędy do: %s\n"
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "Ilość kart AMD/ATI: %d"
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/amd.c:254
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "Strona internetowa %s: <%s>\n"
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Ilość aktywnych kart AMD/ATI: %d"
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor nie został skompilowany z obsługą zdalnego czujnika."
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
+msgstr "Wykorzystanie procesora"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Włącza tryb debugowania."
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr "Procesor"
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pgtop2.c:63
+msgid "free memory"
+msgstr "wolna pamięć"
+
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr "pamięć"
+
+#: src/lib/plog.c:43
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Spróbuj `%s --help', aby uzyskać więcej informacji.\n"
+msgid "Cannot open log file: %s"
+msgstr "Nie można otworzyć pliku dziennika: %s"
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Instancja Psensor już istnieje."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "gettimeofday nie powiodło się."
 
-#: src/main.c:527
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Nie powiodło się utworzenie wątku do monitorowania czujników"
+#: src/lib/pudisks2.c:142
+#, c-format
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/rsensor.c:115
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr "Dysk"
+
+#: src/lib/hdd_hddtemp.c:62
 #, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "%s: Nie udało się połączyć: %s"
+msgid "%s: failed to open socket."
+msgstr "%s: nie udało się otworzyć gniazdo."
 
-#: src/rsensor.c:152
+#: src/lib/hdd_hddtemp.c:75
 #, c-format
-msgid "%s: Invalid content: %s"
-msgstr "%s: Nieprawidłowa zawartość: %s"
+msgid "%s: failed to open connection."
+msgstr "%s: nie udało się otworzyć połączenie."
 
-#: src/rsensor.c:192
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
 #, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "%s: Nieprawidłowy JSON: %s"
+msgid "%s: wrong string: %s."
+msgstr "%s: błędne wyrażenie: %s."
+
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: sk_disk_open() niepowodzenie: %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -815,26 +446,13 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Strona internetowa programu Psensor"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Nie powiodło się załadowanie ikony programu Psensor"
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
-msgstr "Ukryj"
-
-#: src/ui_sensorlist.c:303
-msgid "Select sensor color"
-msgstr "Wybierz kolor czujnika"
-
-#: src/ui_appindicator.c:148
-#, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Nie powiodło się załadowanie pliku glade %s: %s"
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "gettimeofday nie powiodło się."
+#: src/graph.c:460
+msgid "No graphs enabled"
+msgstr "Brak wykresów"
 
 #: src/ui_notify.c:77
 msgid "Temperature alert"
@@ -844,9 +462,298 @@ msgstr "Alarm temperatury"
 msgid "Fan speed alert"
 msgstr "Alarm prędkości wentylatora"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Nieznany"
+#: src/rsensor.c:115
+#, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "%s: Nie udało się połączyć: %s"
+
+#: src/rsensor.c:152
+#, c-format
+msgid "%s: Invalid content: %s"
+msgstr "%s: Nieprawidłowa zawartość: %s"
+
+#: src/rsensor.c:192
+#, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "%s: Nieprawidłowy JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "O programie"
+
+#~ msgid "Quit"
+#~ msgstr "Zamknij"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Preferencje czujników"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - kontroler temperatury"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "Pomoc"
+
+#~ msgid "Sensor"
+#~ msgstr "Czujnik"
+
+#~ msgid "Value"
+#~ msgstr "Wartość"
+
+#~ msgid "Min"
+#~ msgstr "Min"
+
+#~ msgid "Max"
+#~ msgstr "Max"
+
+#~ msgid "Color"
+#~ msgstr "Kolor"
+
+#~ msgid "Graph"
+#~ msgstr "Wykres"
+
+#~ msgid "Show"
+#~ msgstr "Pokaż"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Prawo"
+
+#~ msgid "Left"
+#~ msgstr "Lewo"
+
+#~ msgid "Top"
+#~ msgstr "Góra"
+
+#~ msgid "Bottom"
+#~ msgstr "Dół"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Edycja preferencji"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Ukryj dekorację okna"
+
+#~ msgid "Keep window below"
+#~ msgstr "Utrzymaj okno poniżej"
+
+#~ msgid "Enable menu"
+#~ msgstr "Włącz menu"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Włącz licznik Unity Launcher"
+
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor nie został zbudowany z obsługą Unity Launcher"
+
+#~ msgid "Celsius"
+#~ msgstr "Celsjusz"
+
+#~ msgid "Fahrenheit"
+#~ msgstr "Fahrenheit"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Jednostka temperatury:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Pozycja tabeli czujników:"
+
+#~ msgid "Interface"
+#~ msgstr "Interfejs"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "Uruchom przy starcie sesji"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Ukryj okno przy starcie"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Przywróć pozycję i rozmiar okna"
+
+#~ msgid "Startup"
+#~ msgstr "Uruchamianie"
+
+#~ msgid "Foreground:"
+#~ msgstr "Pierwszy plan:"
+
+#~ msgid "Background:"
+#~ msgstr "Tło:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Nieprzezroczystość tła:"
+
+#~ msgid "Colors"
+#~ msgstr "Kolory"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Czas trwania monitorowania:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Częstość aktualizacji:"
+
+#~ msgid "Measures"
+#~ msgstr "Pomiary"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Min</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Max</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "sekund(y)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minut(y)"
+
+#~ msgid "Smooth curves"
+#~ msgstr "Gładkie krzywe"
+
+#~ msgid "Curves"
+#~ msgstr "Krzywe"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Częstość aktualizacji pomiarów:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Włącz logowanie czujników"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Częstość logowania czujników:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "sekund(y)"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Wykonywany skrypt, gdy podniesiony jest alarm:"
+
+#~ msgid "Sensors"
+#~ msgstr "Czujniki"
+
+#~ msgid "Enable support of lm-sensors"
+#~ msgstr "Włącz obsługę lm-sensors"
+
+#~ msgid "Enable support of NVCtrl (NVidia)"
+#~ msgstr "Włącz obsługę NVCtrl (NVidia)"
+
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor nie został zbudowany z obsługą NVCtrl"
+
+#~ msgid "Enable support of ATI ADL"
+#~ msgstr "Włącz obsługę ATI ADL"
+
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor nie został zbudowany z obsługą ATI ADL"
+
+#~ msgid "Enable support of gtop2"
+#~ msgstr "Włącz obsługę gtop2"
+
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor nie został zbudowany z obsługą gtop2"
+
+#~ msgid "Enable support of hddtemp daemon"
+#~ msgstr "Włącz obsługę demona hddtemp"
+
+#~ msgid "Enable support of libatasmart"
+#~ msgstr "Włącz obsługę libatasmart"
+
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor nie został zbudowany z obsługą libatasmart "
+
+#~ msgid "Enable support of udisks2"
+#~ msgstr "Włącz obsługę udisks2"
+
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor nie został zbudowany z obsługą udisks2"
+
+#~ msgid "The changes are applied after the restart of psensor."
+#~ msgstr "Zmiany zostaną zatwierdzone po restarcie programu psensor"
+
+#~ msgid "Hard disk drive"
+#~ msgstr "Dysk twardy"
+
+#~ msgid "CPU and memory usage"
+#~ msgstr "Wykorzystanie pamięci i procesora"
+
+#~ msgid "GPU with proprietary driver"
+#~ msgstr "GPU z własnościowym sterownikiem"
+
+#~ msgid "Motherboard, CPU and GPU"
+#~ msgstr "Płyta główna, procesor (CPU) i procesor graficzny (GPU)"
+
+#~ msgid "Providers"
+#~ msgstr "Dostawcy"
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Edycja preferencji czujników"
+
+#~ msgid "Name"
+#~ msgstr "Nazwa"
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "Chip:"
+#~ msgstr "Chip:"
+
+#~ msgid "Name:"
+#~ msgstr "Nazwa:"
+
+#~ msgid "Id:"
+#~ msgstr "Id:"
+
+#~ msgid "Min:"
+#~ msgstr "Min:"
+
+#~ msgid "Max:"
+#~ msgstr "Max:"
+
+#~ msgid "label"
+#~ msgstr "etykieta"
+
+#~ msgid "Details"
+#~ msgstr "Szczegóły"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Narysuj krzywą czujnika"
+
+#~ msgid "Color:"
+#~ msgstr "Kolor:"
+
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Wyświetl czujnik na liście czujników"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Aktywuj powiadomienia na pulpicie"
+
+#~ msgid "High threshold:"
+#~ msgstr "Wysoki próg:"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "-1"
+#~ msgstr "-1"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Niski próg:"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarm"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Wyświetl czujnik w menu"
+
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr ""
+#~ "Psensor nie został zbudowany z obsługą wskaźnika aplikacji (AppIndicator)"
+
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Wyświetl czujnik w etykiecie (eksperymentalne)"
+
+#~ msgid "Application Indicator"
+#~ msgstr "Wskaźnik aplikacji"
 
 #~ msgid "Copyright(c) 2010-2014 jeanfi@gmail.com"
 #~ msgstr "Copyright(c) 2010-2014 jeanfi@gmail.com"
diff --git a/po/psensor.pot b/po/psensor.pot
index 445f20da..15e7d890 100644
--- a/po/psensor.pot
+++ b/po/psensor.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\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"
@@ -17,457 +17,116 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/cfg.c:501
-#, c-format
-msgid "Failed to create the directory %s: %s"
-msgstr ""
-
-#: src/cfg.c:548
-#, c-format
-msgid "Failed to load configuration file %s: %s"
-msgstr ""
-
-#: src/cfg.c:573
-#, c-format
-msgid "Failed to save configuration file %s."
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
 msgstr ""
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
+#: src/ui_sensorlist.c:259
+msgid "Hide"
 msgstr ""
 
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
+#: src/ui_sensorlist.c:269
 msgid "Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr ""
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr ""
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr ""
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr ""
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr ""
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr ""
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr ""
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr ""
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr ""
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr ""
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr ""
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:190
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-msgid "Psensor has not been build with NVCtrl support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-msgid "Psensor has not been build with ATI ADL support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-msgid "Psensor has not been build with gtop2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-msgid "Psensor has not been build with libatasmart support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-msgid "Psensor has not been build with udisks2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/ui_sensorlist.c:303
+msgid "Select sensor color"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/ui_appindicator.c:148
+#, c-format
+msgid "Failed to load glade file %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
+#: src/cfg.c:501
+#, c-format
+msgid "Failed to create the directory %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
+#: src/cfg.c:548
+#, c-format
+msgid "Failed to load configuration file %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
+#: src/cfg.c:573
+#, c-format
+msgid "Failed to save configuration file %s."
 msgstr ""
 
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-msgid "Psensor has not been build with AppIndicator support"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:78
+msgid "Options:"
 msgstr ""
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
 
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
 
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
+msgid "Report bugs to: %s\n"
 msgstr ""
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
+msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
+msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
+#: src/main.c:527
+msgid "Failed to create thread for monitoring sensors"
 msgstr ""
 
 #: src/lib/lmsensor.c:73
@@ -505,25 +164,16 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr ""
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
+#: src/lib/psensor.c:426
+msgid "RPM"
 msgstr ""
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
+#: src/lib/psensor.c:428
+msgid "%"
 msgstr ""
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
 msgstr ""
 
 #: src/lib/nvidia.c:69
@@ -556,14 +206,6 @@ msgstr ""
 msgid "%s: Failed to retrieve number of fans."
 msgstr ""
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr ""
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr ""
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr ""
@@ -585,95 +227,85 @@ msgstr ""
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/main.c:78
-msgid "Options:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
 msgstr ""
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
-#, c-format
-msgid "%s home page: <%s>\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
 msgstr ""
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
+#: src/lib/plog.c:43
+#, c-format
+msgid "Cannot open log file: %s"
 msgstr ""
 
-#: src/main.c:460
-msgid "Enables debug mode."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
 msgstr ""
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
+msgid "%s: cannot get the udisks2 client"
 msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
 msgstr ""
 
-#: src/main.c:527
-msgid "Failed to create thread for monitoring sensors"
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
 msgstr ""
 
-#: src/rsensor.c:115
+#: src/lib/hdd_hddtemp.c:75
 #, c-format
-msgid "%s: Fail to connect to: %s"
+msgid "%s: failed to open connection."
 msgstr ""
 
-#: src/rsensor.c:152
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
 #, c-format
-msgid "%s: Invalid content: %s"
+msgid "%s: wrong string: %s."
 msgstr ""
 
-#: src/rsensor.c:192
+#: src/lib/hdd_atasmart.c:153
 #, c-format
-msgid "%s: Invalid JSON: %s"
+msgid "%s: sk_disk_open() failure: %s."
 msgstr ""
 
 #: src/server/server.c:58
@@ -790,25 +422,12 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr ""
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr ""
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
-msgstr ""
-
-#: src/ui_sensorlist.c:303
-msgid "Select sensor color"
-msgstr ""
-
-#: src/ui_appindicator.c:148
-#, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr ""
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
 #: src/ui_notify.c:77
@@ -819,6 +438,17 @@ msgstr ""
 msgid "Fan speed alert"
 msgstr ""
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
+#: src/rsensor.c:115
+#, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr ""
+
+#: src/rsensor.c:152
+#, c-format
+msgid "%s: Invalid content: %s"
+msgstr ""
+
+#: src/rsensor.c:192
+#, c-format
+msgid "%s: Invalid JSON: %s"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 357728b1..26a87bd5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-11 21:22+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -18,6 +18,28 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr ""
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Selecionar cor do primeiro plano"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Falhou ao criar servidor web."
+
 #: src/cfg.c:501
 #, fuzzy, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,443 +55,88 @@ msgstr "Falhou ao criar servidor web."
 msgid "Failed to save configuration file %s."
 msgstr ""
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Sobre"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Preferências"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Sair"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Preferências de sensores"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Monitor de temperatura"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "Ajuda"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Sensor"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Valor"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Min"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Max"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Cor"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Grafo"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Mostrar"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Editar Preferências"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Ocultar decoração da janela"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Manter janela abaixo"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Habilitar menu"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:190
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Unidade de temperatura:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Posição da tabela de sensores:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Interface"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Ocultar janela na inicialização"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Restaurar posição e tamanho da janela"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Primeiro plano:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Plano de fundo:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Opacidade do plano de fundo:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Cores"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Duração do monitoramento:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Intervalo de atualização:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Medidas"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Min</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Max</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "segundo(s)"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "minuto(s)"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Intervalo de atualização das medições:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Habilitar registro (log) de sensores"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Intervalo de registro dos sensores:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "segundo(s)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Sensores"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-msgid "Psensor has not been build with NVCtrl support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-msgid "Psensor has not been build with ATI ADL support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-msgid "Psensor has not been build with gtop2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-msgid "Psensor has not been build with libatasmart support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-msgid "Psensor has not been build with udisks2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Editar preferências do sensor"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Nome"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Tipo:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "N/D"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Nome:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "ID:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Desenhar curva do sensor"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Cor:"
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Ativar notificações de desktop"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Limite superior:"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Uso: %s [OPÇÃO]...\n"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor é um aplicativo GTK+ para monitoramento de sensores de hardware, "
+"incluindo temperatura e velocidade de ventoinhas."
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Limite inferior:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Alarme"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Opções:"
 
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-msgid "Psensor has not been build with AppIndicator support"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          exibir esta ajuda e sair\n"
+"  -v, --version       exibir informação de versão e sair"
 
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       a URL  do psensor-server,\n"
+"                      exemplo: http://hostname:3131"
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: não foi possível encontrar a biblioteca ADL."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: está faltando a API da ADL."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: falha ao iniciar ADL."
-
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: não foi possível obter número de adaptadores."
-
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "Número de adaptadores AMD/ATI: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Relatar falhas para: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Número de adaptadores AMD/ATI ativos: %d"
+msgid "%s home page: <%s>\n"
+msgstr "Página inicial de %s: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: falha em sk_disk_open(): %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Ativar o modo de depuração"
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: falha em abrir conexão."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Utilize `%s --help' para mais informações.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: falha em abrir conexão."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Uma instancia de Psensor já existe."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr ""
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Falhou ao criar servidor web."
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -506,26 +173,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s: falha na inicialização: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "RPM"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Não é possível abrir arquivo de log: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "N/D"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -557,14 +215,6 @@ msgstr "%s: Falha ao recuperar informações de NVIDIA."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "Falha ao recuperar informações de NVIDIA."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "RPM"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "Variável HOME não configurada."
@@ -586,103 +236,86 @@ msgstr "Arquivo de registros do sensor não foi aberto."
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: não foi possível encontrar a biblioteca ADL."
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Uso: %s [OPÇÃO]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: está faltando a API da ADL."
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"Psensor é um aplicativo GTK+ para monitoramento de sensores de hardware, "
-"incluindo temperatura e velocidade de ventoinhas."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: falha ao iniciar ADL."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Opções:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: não foi possível obter número de adaptadores."
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "Número de adaptadores AMD/ATI: %d"
+
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Número de adaptadores AMD/ATI ativos: %d"
+
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -h, --help          exibir esta ajuda e sair\n"
-"  -v, --version       exibir informação de versão e sair"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
 msgstr ""
-"  -u, --url=URL       a URL  do psensor-server,\n"
-"                      exemplo: http://hostname:3131"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:64
+msgid "memory"
 msgstr ""
 
-#: src/main.c:96 src/server/server.c:121
+#: src/lib/plog.c:43
 #, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Relatar falhas para: %s\n"
+msgid "Cannot open log file: %s"
+msgstr "Não é possível abrir arquivo de log: %s"
 
-#: src/main.c:98 src/server/server.c:123
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr "Página inicial de %s: <%s>\n"
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "falha em gettimeofday."
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
+#: src/lib/pudisks2.c:142
+#, c-format
+msgid "%s: cannot get the udisks2 client"
 msgstr ""
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Ativar o modo de depuração"
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr ""
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/hdd_hddtemp.c:62
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Utilize `%s --help' para mais informações.\n"
-
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Uma instancia de Psensor já existe."
-
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Falhou ao criar servidor web."
+msgid "%s: failed to open socket."
+msgstr "%s: falha em abrir conexão."
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Falha ao conectar: %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: falha em abrir conexão."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Conteúdo inválido: %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr ""
 
-#: src/rsensor.c:192
-#, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "JSON inválido: %s"
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: falha em sk_disk_open(): %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -809,28 +442,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Site do Psensor"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Falha ao carregar o ícone do Psensor."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Selecionar cor do primeiro plano"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Falhou ao criar servidor web."
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "falha em gettimeofday."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "Alerta de temperatura"
@@ -840,9 +459,170 @@ msgstr "Alerta de temperatura"
 msgid "Fan speed alert"
 msgstr "Alenta do ventilador"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Desconhecido"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Falha ao conectar: %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Conteúdo inválido: %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "JSON inválido: %s"
+
+#~ msgid "About"
+#~ msgstr "Sobre"
+
+#~ msgid "Quit"
+#~ msgstr "Sair"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Preferências de sensores"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - Monitor de temperatura"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "Ajuda"
+
+#~ msgid "Sensor"
+#~ msgstr "Sensor"
+
+#~ msgid "Value"
+#~ msgstr "Valor"
+
+#~ msgid "Min"
+#~ msgstr "Min"
+
+#~ msgid "Max"
+#~ msgstr "Max"
+
+#~ msgid "Color"
+#~ msgstr "Cor"
+
+#~ msgid "Graph"
+#~ msgstr "Grafo"
+
+#~ msgid "Show"
+#~ msgstr "Mostrar"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Editar Preferências"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Ocultar decoração da janela"
+
+#~ msgid "Keep window below"
+#~ msgstr "Manter janela abaixo"
+
+#~ msgid "Enable menu"
+#~ msgstr "Habilitar menu"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Unidade de temperatura:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Posição da tabela de sensores:"
+
+#~ msgid "Interface"
+#~ msgstr "Interface"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Ocultar janela na inicialização"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Restaurar posição e tamanho da janela"
+
+#~ msgid "Foreground:"
+#~ msgstr "Primeiro plano:"
+
+#~ msgid "Background:"
+#~ msgstr "Plano de fundo:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Opacidade do plano de fundo:"
+
+#~ msgid "Colors"
+#~ msgstr "Cores"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Duração do monitoramento:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Intervalo de atualização:"
+
+#~ msgid "Measures"
+#~ msgstr "Medidas"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Min</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Max</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "segundo(s)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minuto(s)"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Intervalo de atualização das medições:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Habilitar registro (log) de sensores"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Intervalo de registro dos sensores:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "segundo(s)"
+
+#~ msgid "Sensors"
+#~ msgstr "Sensores"
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Editar preferências do sensor"
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "Type:"
+#~ msgstr "Tipo:"
+
+#~ msgid "Chip:"
+#~ msgstr "Chip:"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid "Id:"
+#~ msgstr "ID:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Desenhar curva do sensor"
+
+#~ msgid "Color:"
+#~ msgstr "Cor:"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Ativar notificações de desktop"
+
+#~ msgid "High threshold:"
+#~ msgstr "Limite superior:"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Limite inferior:"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarme"
 
 #~ msgid "Sensor Information"
 #~ msgstr "Informações do sensor"
diff --git a/po/ru.po b/po/ru.po
index c8644629..4de81ef9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2016-02-07 23:08+0300\n"
 "Last-Translator: Grigorii Chirkov <ridgentsailor TYPE_AT_HERE gmail "
 "AND_DOT_HERE com>\n"
@@ -21,6 +21,27 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Poedit 1.8.4\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr "Скрыть"
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Параметры"
+
+#: src/ui_sensorlist.c:303
+msgid "Select sensor color"
+msgstr "Выбор цвета датчика"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Не удалось включить журналирование датчиков."
+
 #: src/cfg.c:501
 #, c-format
 msgid "Failed to create the directory %s: %s"
@@ -36,450 +57,95 @@ msgstr "Не удалось загрузить файл конфигурации
 msgid "Failed to save configuration file %s."
 msgstr "Не удалось сохранить файл конфигурации %s."
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "О программе"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Параметры"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Выход"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Параметры датчиков"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - монитор температуры"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Справка"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Датчик"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Значение"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Мин."
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Макс."
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Цвет"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Диаграмма"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Показать"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Справа"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Слева"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Сверху"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Снизу"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Изменить параметры"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Скрывать рамку окна"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Удерживать окно под другими"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Включить меню"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Включить счетчик в панели запуска Unity"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor не был собран с поддержкой удалённых датчиков."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr "Цельсия"
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr "Фаренгейта"
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Единицы измерения температуры:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Положение таблицы датчиков:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Внешний вид"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr "Запускать автоматически при старте сессии"
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Скрывать окно при запуске"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Восстанавливать положение и размер окна"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr "Автозапуск"
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Передний план:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Фон:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Непрозрачность фона:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Цвета"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Время мониторинга:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Интервал обновления:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Замеры"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Мин.</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Макс.</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "сек."
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "мин."
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr "Сглаживать графики"
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr "Графики"
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Интервал обновления замеров:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Вести журнал событий датчиков"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Интервал ведения журнала событий датчиков:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "секунд(с)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Скрипт, выполняемый при выдаче уведомления:"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Датчики"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr "Включить поддержку lm-sensors"
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr "Включить поддержку NVCtrl (NVidia)"
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor не был собран с поддержкой удалённых датчиков."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr "Включить поддержку ATI ADL"
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor не был собран с поддержкой удалённых датчиков."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr "Включить поддержку gtop2"
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor не был собран с поддержкой удалённых датчиков."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr "Включить поддержку демона hddtemp"
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr "Включить поддержку libatasmart"
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor не был собран с поддержкой удалённых датчиков."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr "Включить поддержку udisks2"
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor не был собран с поддержкой удалённых датчиков."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr "Изменения будут применены после перезапуска psensor."
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr "Жесткий диск"
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr "Использование ЦП и ОЗУ"
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr "ГП (проприетарный драйвер)"
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr "Материнская плата, ЦП и ГП"
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr "Поддержка"
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Изменить параметры датчика"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Название"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Тип:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "Н/Д"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Микросхема:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Название:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Идентификатор:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"Лицензия GPLv2: GNU GPL версии 2 или выше <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"Это свободное программное обеспечение, вы можете модифицировать и "
+"распространять его.\n"
+"На него не предоставляется никаких гарантий в мере, предусмотренной "
+"законодательством.\n"
 
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Использование: %s [КЛЮЧ]...\n"
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor — это GTK+ приложение для мониторинга аппаратных датчиков, включая "
+"температуру и скорость вентилятора."
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr "Подробности"
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Рисовать график датчика"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Цвет:"
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr "Показать датчик в списке датчиков"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Включить уведомления"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Высший порог:"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
-msgstr "0"
-
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
-msgstr "-1"
-
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Низший порог:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Уведомление"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Показать датчик в индикаторе меню приложений"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor не был собран с поддержкой удалённых датчиков."
-
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
-msgstr "Показать датчик в области уведомлений (экспериментально)"
-
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Индикатор приложения"
+#: src/main.c:78
+msgid "Options:"
+msgstr "Опции:"
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          показать эту справку и выйти\n"
+"  -v, --version      показать версию и выйти"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: библиотека ADL не найдена."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: отсутствует API ADL."
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
+msgstr ""
+"  -u, --url=URL       URL psensor-сервера, пример: http://hostname:3131"
 
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: не удалось инициализировать ADL."
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
+msgstr ""
+"  -n, --new-instance  принудительно запускает новую копию программы Psensor"
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: ошибка определения количества адаптеров."
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+msgstr "  -d, --debug=УРОВЕНЬ   установить уровень отладки, целое между 0 и 3"
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "Количество адаптеров AMD/ATI: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Сообщайте об ошибках на: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Количество активных адаптеров AMD/ATI: %d"
+msgid "%s home page: <%s>\n"
+msgstr "%s домашняя страница: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr "Диск"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor не был собран с поддержкой удалённых датчиков."
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: ошибка sk_disk_open(): %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Включает режим отладки."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: не удалось открыть сокет."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Попробуйте `%s --help' для дополнительной информации.↵\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: не удалось открыть соединение."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Копия Psensor уже запущена."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: неправильная строка: %s."
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Не удалось создать веб-сервер."
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -516,26 +182,17 @@ msgstr "ACPI"
 msgid "%s: initialization failure: %s."
 msgstr "%s: ошибка инициализации: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr "Загрузка ЦП"
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr "ЦП"
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr "Использование ОЗУ"
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "об/мин"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr "ОЗУ"
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Ошибка открытия файла журнала: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "Н/Д"
 
 #: src/lib/nvidia.c:69
 #, c-format
@@ -567,14 +224,6 @@ msgstr "%s: Не удалось получить информацию NVIDIA."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "%s: Не удалось получить информацию о количестве вентиляторов."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "об/мин"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "Переменная HOME не установлена."
@@ -585,121 +234,97 @@ msgstr "Файл журнала датчика уже открыт."
 
 #: src/lib/slog.c:105
 #, c-format
-msgid "Cannot open sensor log file: %s."
-msgstr "Не удалось открыть файл журнала датчика: %s."
-
-#: src/lib/slog.c:136
-msgid "Sensor log file not open."
-msgstr "Файл журнала датчика не открыт."
-
-#: src/lib/slog.c:192
-msgid "Sensor log not open, cannot close."
-msgstr "Файл журнала датчика не открыт, не удалось закрыть."
-
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"Лицензия GPLv2: GNU GPL версии 2 или выше <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"Это свободное программное обеспечение, вы можете модифицировать и "
-"распространять его.\n"
-"На него не предоставляется никаких гарантий в мере, предусмотренной "
-"законодательством.\n"
-
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Использование: %s [КЛЮЧ]...\n"
+msgid "Cannot open sensor log file: %s."
+msgstr "Не удалось открыть файл журнала датчика: %s."
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"Psensor — это GTK+ приложение для мониторинга аппаратных датчиков, включая "
-"температуру и скорость вентилятора."
+#: src/lib/slog.c:136
+msgid "Sensor log file not open."
+msgstr "Файл журнала датчика не открыт."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Опции:"
+#: src/lib/slog.c:192
+msgid "Sensor log not open, cannot close."
+msgstr "Файл журнала датчика не открыт, не удалось закрыть."
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
-msgstr ""
-"  -h, --help          показать эту справку и выйти\n"
-"  -v, --version      показать версию и выйти"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: библиотека ADL не найдена."
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
-msgstr ""
-"  -u, --url=URL       URL psensor-сервера, пример: http://hostname:3131"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: отсутствует API ADL."
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
-msgstr ""
-"  -n, --new-instance  принудительно запускает новую копию программы Psensor"
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: не удалось инициализировать ADL."
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
-msgstr "  -d, --debug=УРОВЕНЬ   установить уровень отладки, целое между 0 и 3"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: ошибка определения количества адаптеров."
 
-#: src/main.c:96 src/server/server.c:121
+#: src/lib/amd.c:253
 #, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Сообщайте об ошибках на: %s\n"
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "Количество адаптеров AMD/ATI: %d"
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/amd.c:254
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s домашняя страница: <%s>\n"
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Количество активных адаптеров AMD/ATI: %d"
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor не был собран с поддержкой удалённых датчиков."
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
+msgstr "Загрузка ЦП"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Включает режим отладки."
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr "ЦП"
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pgtop2.c:63
+msgid "free memory"
+msgstr "Использование ОЗУ"
+
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr "ОЗУ"
+
+#: src/lib/plog.c:43
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Попробуйте `%s --help' для дополнительной информации.↵\n"
+msgid "Cannot open log file: %s"
+msgstr "Ошибка открытия файла журнала: %s"
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Копия Psensor уже запущена."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "ошибка gettimeofday."
 
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Не удалось создать веб-сервер."
+#: src/lib/pudisks2.c:142
+#, c-format
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/rsensor.c:115
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr "Диск"
+
+#: src/lib/hdd_hddtemp.c:62
 #, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "%s: Ошибка подключения к: %s"
+msgid "%s: failed to open socket."
+msgstr "%s: не удалось открыть сокет."
 
-#: src/rsensor.c:152
+#: src/lib/hdd_hddtemp.c:75
 #, c-format
-msgid "%s: Invalid content: %s"
-msgstr "%s: Неправильное содержимое: %s"
+msgid "%s: failed to open connection."
+msgstr "%s: не удалось открыть соединение."
 
-#: src/rsensor.c:192
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
 #, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "%s: Неправильный JSON: %s"
+msgid "%s: wrong string: %s."
+msgstr "%s: неправильная строка: %s."
+
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: ошибка sk_disk_open(): %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -831,26 +456,13 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Домашняя страница Psensor"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Не удалось загрузить значок Psensor."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
-msgstr "Скрыть"
-
-#: src/ui_sensorlist.c:303
-msgid "Select sensor color"
-msgstr "Выбор цвета датчика"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Не удалось включить журналирование датчиков."
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "ошибка gettimeofday."
+#: src/graph.c:460
+msgid "No graphs enabled"
+msgstr ""
 
 #: src/ui_notify.c:77
 msgid "Temperature alert"
@@ -860,9 +472,295 @@ msgstr "Уведомление температуры"
 msgid "Fan speed alert"
 msgstr "Уведомление вентилятора"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Неизвестно"
+#: src/rsensor.c:115
+#, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "%s: Ошибка подключения к: %s"
+
+#: src/rsensor.c:152
+#, c-format
+msgid "%s: Invalid content: %s"
+msgstr "%s: Неправильное содержимое: %s"
+
+#: src/rsensor.c:192
+#, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "%s: Неправильный JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "О программе"
+
+#~ msgid "Quit"
+#~ msgstr "Выход"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Параметры датчиков"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - монитор температуры"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Справка"
+
+#~ msgid "Sensor"
+#~ msgstr "Датчик"
+
+#~ msgid "Value"
+#~ msgstr "Значение"
+
+#~ msgid "Min"
+#~ msgstr "Мин."
+
+#~ msgid "Max"
+#~ msgstr "Макс."
+
+#~ msgid "Color"
+#~ msgstr "Цвет"
+
+#~ msgid "Graph"
+#~ msgstr "Диаграмма"
+
+#~ msgid "Show"
+#~ msgstr "Показать"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Справа"
+
+#~ msgid "Left"
+#~ msgstr "Слева"
+
+#~ msgid "Top"
+#~ msgstr "Сверху"
+
+#~ msgid "Bottom"
+#~ msgstr "Снизу"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Изменить параметры"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Скрывать рамку окна"
+
+#~ msgid "Keep window below"
+#~ msgstr "Удерживать окно под другими"
+
+#~ msgid "Enable menu"
+#~ msgstr "Включить меню"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Включить счетчик в панели запуска Unity"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor не был собран с поддержкой удалённых датчиков."
+
+#~ msgid "Celsius"
+#~ msgstr "Цельсия"
+
+#~ msgid "Fahrenheit"
+#~ msgstr "Фаренгейта"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Единицы измерения температуры:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Положение таблицы датчиков:"
+
+#~ msgid "Interface"
+#~ msgstr "Внешний вид"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "Запускать автоматически при старте сессии"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Скрывать окно при запуске"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Восстанавливать положение и размер окна"
+
+#~ msgid "Startup"
+#~ msgstr "Автозапуск"
+
+#~ msgid "Foreground:"
+#~ msgstr "Передний план:"
+
+#~ msgid "Background:"
+#~ msgstr "Фон:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Непрозрачность фона:"
+
+#~ msgid "Colors"
+#~ msgstr "Цвета"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Время мониторинга:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Интервал обновления:"
+
+#~ msgid "Measures"
+#~ msgstr "Замеры"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Мин.</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Макс.</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "сек."
+
+#~ msgid "minute(s)"
+#~ msgstr "мин."
+
+#~ msgid "Smooth curves"
+#~ msgstr "Сглаживать графики"
+
+#~ msgid "Curves"
+#~ msgstr "Графики"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Интервал обновления замеров:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Вести журнал событий датчиков"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Интервал ведения журнала событий датчиков:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "секунд(с)"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Скрипт, выполняемый при выдаче уведомления:"
+
+#~ msgid "Sensors"
+#~ msgstr "Датчики"
+
+#~ msgid "Enable support of lm-sensors"
+#~ msgstr "Включить поддержку lm-sensors"
+
+#~ msgid "Enable support of NVCtrl (NVidia)"
+#~ msgstr "Включить поддержку NVCtrl (NVidia)"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor не был собран с поддержкой удалённых датчиков."
+
+#~ msgid "Enable support of ATI ADL"
+#~ msgstr "Включить поддержку ATI ADL"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor не был собран с поддержкой удалённых датчиков."
+
+#~ msgid "Enable support of gtop2"
+#~ msgstr "Включить поддержку gtop2"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor не был собран с поддержкой удалённых датчиков."
+
+#~ msgid "Enable support of hddtemp daemon"
+#~ msgstr "Включить поддержку демона hddtemp"
+
+#~ msgid "Enable support of libatasmart"
+#~ msgstr "Включить поддержку libatasmart"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor не был собран с поддержкой удалённых датчиков."
+
+#~ msgid "Enable support of udisks2"
+#~ msgstr "Включить поддержку udisks2"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor не был собран с поддержкой удалённых датчиков."
+
+#~ msgid "The changes are applied after the restart of psensor."
+#~ msgstr "Изменения будут применены после перезапуска psensor."
+
+#~ msgid "Hard disk drive"
+#~ msgstr "Жесткий диск"
+
+#~ msgid "CPU and memory usage"
+#~ msgstr "Использование ЦП и ОЗУ"
+
+#~ msgid "GPU with proprietary driver"
+#~ msgstr "ГП (проприетарный драйвер)"
+
+#~ msgid "Motherboard, CPU and GPU"
+#~ msgstr "Материнская плата, ЦП и ГП"
+
+#~ msgid "Providers"
+#~ msgstr "Поддержка"
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Изменить параметры датчика"
+
+#~ msgid "Name"
+#~ msgstr "Название"
+
+#~ msgid "Type:"
+#~ msgstr "Тип:"
+
+#~ msgid "Chip:"
+#~ msgstr "Микросхема:"
+
+#~ msgid "Name:"
+#~ msgstr "Название:"
+
+#~ msgid "Id:"
+#~ msgstr "Идентификатор:"
+
+#~ msgid "Details"
+#~ msgstr "Подробности"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Рисовать график датчика"
+
+#~ msgid "Color:"
+#~ msgstr "Цвет:"
+
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Показать датчик в списке датчиков"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Включить уведомления"
+
+#~ msgid "High threshold:"
+#~ msgstr "Высший порог:"
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "-1"
+#~ msgstr "-1"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Низший порог:"
+
+#~ msgid "Alarm"
+#~ msgstr "Уведомление"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Показать датчик в индикаторе меню приложений"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor не был собран с поддержкой удалённых датчиков."
+
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Показать датчик в области уведомлений (экспериментально)"
+
+#~ msgid "Application Indicator"
+#~ msgstr "Индикатор приложения"
 
 #~ msgid "Sensor Information"
 #~ msgstr "Информация датчика"
diff --git a/po/sl.po b/po/sl.po
index a2cbbc70..c8bbf429 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-11 21:22+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -18,457 +18,116 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
-#: src/cfg.c:501
-#, c-format
-msgid "Failed to create the directory %s: %s"
-msgstr ""
-
-#: src/cfg.c:548
-#, c-format
-msgid "Failed to load configuration file %s: %s"
-msgstr ""
-
-#: src/cfg.c:573
-#, c-format
-msgid "Failed to save configuration file %s."
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
 msgstr ""
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
+#: src/ui_sensorlist.c:259
+msgid "Hide"
 msgstr ""
 
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
+#: src/ui_sensorlist.c:269
 msgid "Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr ""
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr ""
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr ""
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr ""
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr ""
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr ""
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr ""
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr ""
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr ""
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr ""
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr ""
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:190
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-msgid "Psensor has not been build with NVCtrl support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-msgid "Psensor has not been build with ATI ADL support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-msgid "Psensor has not been build with gtop2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-msgid "Psensor has not been build with libatasmart support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-msgid "Psensor has not been build with udisks2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/ui_sensorlist.c:303
+msgid "Select sensor color"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/ui_appindicator.c:148
+#, c-format
+msgid "Failed to load glade file %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
+#: src/cfg.c:501
+#, c-format
+msgid "Failed to create the directory %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
+#: src/cfg.c:548
+#, c-format
+msgid "Failed to load configuration file %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
+#: src/cfg.c:573
+#, c-format
+msgid "Failed to save configuration file %s."
 msgstr ""
 
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-msgid "Psensor has not been build with AppIndicator support"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:78
+msgid "Options:"
 msgstr ""
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
 
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
 
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
+msgid "Report bugs to: %s\n"
 msgstr ""
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
+msgid "%s home page: <%s>\n"
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
+msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
+#: src/main.c:527
+msgid "Failed to create thread for monitoring sensors"
 msgstr ""
 
 #: src/lib/lmsensor.c:73
@@ -506,25 +165,16 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr ""
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
+#: src/lib/psensor.c:426
+msgid "RPM"
 msgstr ""
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
+#: src/lib/psensor.c:428
+msgid "%"
 msgstr ""
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
 msgstr ""
 
 #: src/lib/nvidia.c:69
@@ -557,14 +207,6 @@ msgstr ""
 msgid "%s: Failed to retrieve number of fans."
 msgstr ""
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr ""
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr ""
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr ""
@@ -586,95 +228,85 @@ msgstr ""
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/main.c:78
-msgid "Options:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
 msgstr ""
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
-#, c-format
-msgid "%s home page: <%s>\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
 msgstr ""
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
+#: src/lib/plog.c:43
+#, c-format
+msgid "Cannot open log file: %s"
 msgstr ""
 
-#: src/main.c:460
-msgid "Enables debug mode."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
 msgstr ""
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
+msgid "%s: cannot get the udisks2 client"
 msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
 msgstr ""
 
-#: src/main.c:527
-msgid "Failed to create thread for monitoring sensors"
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
 msgstr ""
 
-#: src/rsensor.c:115
+#: src/lib/hdd_hddtemp.c:75
 #, c-format
-msgid "%s: Fail to connect to: %s"
+msgid "%s: failed to open connection."
 msgstr ""
 
-#: src/rsensor.c:152
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
 #, c-format
-msgid "%s: Invalid content: %s"
+msgid "%s: wrong string: %s."
 msgstr ""
 
-#: src/rsensor.c:192
+#: src/lib/hdd_atasmart.c:153
 #, c-format
-msgid "%s: Invalid JSON: %s"
+msgid "%s: sk_disk_open() failure: %s."
 msgstr ""
 
 #: src/server/server.c:58
@@ -794,25 +426,12 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr ""
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr ""
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
-msgstr ""
-
-#: src/ui_sensorlist.c:303
-msgid "Select sensor color"
-msgstr ""
-
-#: src/ui_appindicator.c:148
-#, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr ""
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
 #: src/ui_notify.c:77
@@ -823,6 +442,17 @@ msgstr ""
 msgid "Fan speed alert"
 msgstr ""
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
+#: src/rsensor.c:115
+#, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr ""
+
+#: src/rsensor.c:152
+#, c-format
+msgid "%s: Invalid content: %s"
+msgstr ""
+
+#: src/rsensor.c:192
+#, c-format
+msgid "%s: Invalid JSON: %s"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 01b6bd4c..83682337 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-11 21:25+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -18,457 +18,117 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
-#: src/cfg.c:501
-#, c-format
-msgid "Failed to create the directory %s: %s"
-msgstr ""
-
-#: src/cfg.c:548
-#, c-format
-msgid "Failed to load configuration file %s: %s"
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
 msgstr ""
 
-#: src/cfg.c:573
-#, c-format
-msgid "Failed to save configuration file %s."
+#: src/ui_sensorlist.c:259
+msgid "Hide"
 msgstr ""
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "О програму"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
+#: src/ui_sensorlist.c:269
 msgid "Preferences"
 msgstr "Поставке"
 
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Изађи"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr ""
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr ""
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr ""
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr ""
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Сензор"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr ""
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Најмање"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Највише"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "У боји"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr ""
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Укључено"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:190
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "У боји"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Сензор"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-msgid "Psensor has not been build with NVCtrl support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-msgid "Psensor has not been build with ATI ADL support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-msgid "Psensor has not been build with gtop2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-msgid "Psensor has not been build with libatasmart support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-msgid "Psensor has not been build with udisks2 support"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "Недоступно"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
-msgstr ""
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Одаберите боју текста"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/ui_appindicator.c:148
+#, c-format
+msgid "Failed to load glade file %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
+#: src/cfg.c:501
+#, c-format
+msgid "Failed to create the directory %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
+#: src/cfg.c:548
+#, c-format
+msgid "Failed to load configuration file %s: %s"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
+#: src/cfg.c:573
+#, c-format
+msgid "Failed to save configuration file %s."
 msgstr ""
 
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-msgid "Psensor has not been build with AppIndicator support"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Употреба: %s [ОПЦИЈА]...\n"
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
 
-#: src/graph.c:460
-msgid "No graphs enabled"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Опције:"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
 
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
 
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr ""
+msgid "Report bugs to: %s\n"
+msgstr "Пријавите грешку на: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr ""
+msgid "%s home page: <%s>\n"
+msgstr "%s матична страна: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr ""
+msgid "Try `%s --help' for more information.\n"
+msgstr "Покушајте„%s --help“ за више информација.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
+#: src/main.c:527
+msgid "Failed to create thread for monitoring sensors"
 msgstr ""
 
 #: src/lib/lmsensor.c:73
@@ -506,26 +166,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr ""
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
+#: src/lib/psensor.c:426
+msgid "RPM"
 msgstr ""
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
+#: src/lib/psensor.c:428
+msgid "%"
 msgstr ""
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr ""
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "Недоступно"
 
 #: src/lib/nvidia.c:69
 #, c-format
@@ -557,14 +208,6 @@ msgstr ""
 msgid "%s: Failed to retrieve number of fans."
 msgstr ""
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr ""
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr ""
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr ""
@@ -586,95 +229,85 @@ msgstr ""
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Употреба: %s [ОПЦИЈА]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr ""
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Опције:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr ""
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
 msgstr ""
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Пријавите грешку на: %s\n"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
+msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s матична страна: <%s>\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr ""
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
+#: src/lib/plog.c:43
+#, c-format
+msgid "Cannot open log file: %s"
 msgstr ""
 
-#: src/main.c:460
-msgid "Enables debug mode."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
 msgstr ""
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Покушајте„%s --help“ за више информација.\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
 msgstr ""
 
-#: src/main.c:527
-msgid "Failed to create thread for monitoring sensors"
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
 msgstr ""
 
-#: src/rsensor.c:115
+#: src/lib/hdd_hddtemp.c:75
 #, c-format
-msgid "%s: Fail to connect to: %s"
+msgid "%s: failed to open connection."
 msgstr ""
 
-#: src/rsensor.c:152
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
 #, c-format
-msgid "%s: Invalid content: %s"
+msgid "%s: wrong string: %s."
 msgstr ""
 
-#: src/rsensor.c:192
+#: src/lib/hdd_atasmart.c:153
 #, c-format
-msgid "%s: Invalid JSON: %s"
+msgid "%s: sk_disk_open() failure: %s."
 msgstr ""
 
 #: src/server/server.c:58
@@ -794,26 +427,12 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Матична страница Псензора"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr ""
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
-msgstr ""
-
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Одаберите боју текста"
-
-#: src/ui_appindicator.c:148
-#, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr ""
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
 #: src/ui_notify.c:77
@@ -824,10 +443,48 @@ msgstr ""
 msgid "Fan speed alert"
 msgstr ""
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
+#: src/rsensor.c:115
+#, c-format
+msgid "%s: Fail to connect to: %s"
 msgstr ""
 
+#: src/rsensor.c:152
+#, c-format
+msgid "%s: Invalid content: %s"
+msgstr ""
+
+#: src/rsensor.c:192
+#, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr ""
+
+#~ msgid "About"
+#~ msgstr "О програму"
+
+#~ msgid "Quit"
+#~ msgstr "Изађи"
+
+#~ msgid "Sensor"
+#~ msgstr "Сензор"
+
+#~ msgid "Min"
+#~ msgstr "Најмање"
+
+#~ msgid "Max"
+#~ msgstr "Највише"
+
+#~ msgid "Color"
+#~ msgstr "У боји"
+
+#~ msgid "Enable menu"
+#~ msgstr "Укључено"
+
+#~ msgid "Colors"
+#~ msgstr "У боји"
+
+#~ msgid "Sensors"
+#~ msgstr "Сензор"
+
 #~ msgid "_Preferences"
 #~ msgstr "_Поставке"
 
diff --git a/po/sv.po b/po/sv.po
index 21491f8a..8d428da1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor 1.0.0.0\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-20 11:26+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Swedish\n"
@@ -21,6 +21,28 @@ msgstr ""
 "X-Generator: Launchpad (build 17196)\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Okänd"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr ""
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Välj förgrundsfärg"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Misslyckades med att tolka konfigurationsfilen: %s"
+
 #: src/cfg.c:501
 #, c-format
 msgid "Failed to create the directory %s: %s"
@@ -36,451 +58,94 @@ msgstr "Misslyckades med att tolka konfigurationsfilen: %s"
 msgid "Failed to save configuration file %s."
 msgstr "Misslyckades med att spara konfigurationsfilen %s."
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Om"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Inställningar"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Avsluta"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Sensorinställningar"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Temperaturövervakare"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Hjälp"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Sensor"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Värde"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Min"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Max"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Färg"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Graf"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Visa"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Höger"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Vänster"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Toppen"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Botten"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Redigera inställningar"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Göm fönsterdekoration"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Håll fönster under"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Aktivera meny"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Aktivera räknare för Unity-programstartare"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr "Celsius"
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr "Fahrenheit"
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Temperaturenhet:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Sensortabellens position:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Gränssnitt"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr "Starta vid sessionsuppstart"
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Göm fönster vid uppstart"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Återställ fönsterposition och storlek"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr "Uppstart"
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Förgrund:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Bakgrund:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Bakgrundsgenomskinlighet:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Färger"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Övervakningstid:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Uppdateringsintervall:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Mätningar"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Min</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Max</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "sekund(er)"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "minut(er)"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Uppdateringsintervall för mätning:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Aktivera sensorlogging"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Loggintervall för sensor:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "sekund(er)"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Skript att köra vid alarm:"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Sensorer"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"Licens GPLv2: GNU GPL version 2 eller senare <http://www.gnu.org/licenses/"
+"old-licenses/gpl-2.0.html>\n"
+"Det här är fri programvara: Du kan fritt modifiera den och distribuera den\n"
+"Det finns INGEN GARANTI i den omfattning som medges av gällande lag.\n"
 
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Redigera sensorinställningar"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Namn"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Typ:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "Ej tillgänglig"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Namn:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Användning: %s [FLAGGA]...\n"
 
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor är ett GTK+-program för att övervaka hårdvarusensorer, inklusive "
+"temperaturer och fläkthastigheter."
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Alternativ:"
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          visa denna hjälp och avsluta\n"
+"  -v, --version      visa versionsinformation och avsluta"
 
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Rita sensorkurva"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Färg:"
-
-#: src/glade/sensor-edit.glade:448
-#, fuzzy
-msgid "Display sensor in the list of sensors"
-msgstr "Visa sensor i meny"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Aktivera skrivbordsnotifiering"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Högt tröskelvärde:"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       URL för psensor-server,\n"
+"                      exempelvis: http://hostname:3131"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
-msgstr "-1"
-
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Lågt tröskelvärde:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Visa sensor i meny"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
-
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
-msgstr "Visa sensor i etiketten (experimentell)"
-
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Programindikator"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
+msgstr "  -n, --new-instance  tvinga fram att skapa ett nytt Psensor-program"
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
+"  -d, --debug=LEVEL   ställ in felsökningsnivå, heltal mellan nivå 0 och 3"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: kan inte hitta ADL-bibliotek."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: saknar ADL API."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: misslyckades med att initialisera ADL."
-
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: kan inte hämta antal adaptrar."
-
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "Antal AMD/ATI-adaptrar: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Rapportera fel till: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Antal aktiva AMD/ATI-adaptrar: %d"
+msgid "%s home page: <%s>\n"
+msgstr "%s webbplats <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr "Disk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: sk_disk_open()-fel: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Aktivera felsökningsläge."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: misslyckades med att öppna uttag."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Prova`%s --help' för mer information.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: misslyckades med att öppna anslutning."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Det finns redan en Psensor-instans."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: fel sträng: %s."
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Misslyckades med att skapa katalogen %s: %s"
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -517,26 +182,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s: initialiseringsfel: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr "CPU"
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "RPM"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Kan inte öppna loggfil: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "Ej tillgänglig"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -563,18 +219,10 @@ msgstr "%s: Kan inte öppna anslutning till X11-server."
 msgid "%s: Failed to retrieve NVIDIA information."
 msgstr "%s: Misslyckades med att hämta NVIDIA-information."
 
-#: src/lib/nvidia.c:394
-#, fuzzy, c-format
-msgid "%s: Failed to retrieve number of fans."
-msgstr "Misslyckades med att hämta NVIDIA-information."
-
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "RPM"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
+#: src/lib/nvidia.c:394
+#, fuzzy, c-format
+msgid "%s: Failed to retrieve number of fans."
+msgstr "Misslyckades med att hämta NVIDIA-information."
 
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
@@ -597,109 +245,86 @@ msgstr "Sensorloggfil ej öppen."
 msgid "Sensor log not open, cannot close."
 msgstr "Sensorloggfil ej öppen, kan inte stänga."
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"Licens GPLv2: GNU GPL version 2 eller senare <http://www.gnu.org/licenses/"
-"old-licenses/gpl-2.0.html>\n"
-"Det här är fri programvara: Du kan fritt modifiera den och distribuera den\n"
-"Det finns INGEN GARANTI i den omfattning som medges av gällande lag.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: kan inte hitta ADL-bibliotek."
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Användning: %s [FLAGGA]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: saknar ADL API."
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"Psensor är ett GTK+-program för att övervaka hårdvarusensorer, inklusive "
-"temperaturer och fläkthastigheter."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: misslyckades med att initialisera ADL."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Alternativ:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: kan inte hämta antal adaptrar."
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
-msgstr ""
-"  -h, --help          visa denna hjälp och avsluta\n"
-"  -v, --version      visa versionsinformation och avsluta"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "Antal AMD/ATI-adaptrar: %d"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Antal aktiva AMD/ATI-adaptrar: %d"
+
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -u, --url=URL       URL för psensor-server,\n"
-"                      exempelvis: http://hostname:3131"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
-msgstr "  -n, --new-instance  tvinga fram att skapa ett nytt Psensor-program"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr "CPU"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
-"  -d, --debug=LEVEL   ställ in felsökningsnivå, heltal mellan nivå 0 och 3"
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Rapportera fel till: %s\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/plog.c:43
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s webbplats <%s>\n"
-
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
+msgid "Cannot open log file: %s"
+msgstr "Kan inte öppna loggfil: %s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Aktivera felsökningsläge."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "gettimeofday misslyckades."
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Prova`%s --help' för mer information.\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Det finns redan en Psensor-instans."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr "Disk"
 
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Misslyckades med att skapa katalogen %s: %s"
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
+msgstr "%s: misslyckades med att öppna uttag."
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Misslyckades med att ansluta till: %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: misslyckades med att öppna anslutning."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Ogiltigt innehåll: %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s: fel sträng: %s."
 
-#: src/rsensor.c:192
-#, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "Ogiltig JSON: %s"
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: sk_disk_open()-fel: %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -829,28 +454,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Psensor-webbplats"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Misslyckades med att läsa in Psensor-ikon."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Välj förgrundsfärg"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Misslyckades med att tolka konfigurationsfilen: %s"
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "gettimeofday misslyckades."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "Temperaturlarm"
@@ -860,9 +471,245 @@ msgstr "Temperaturlarm"
 msgid "Fan speed alert"
 msgstr "Fläktlarm"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Okänd"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Misslyckades med att ansluta till: %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Ogiltigt innehåll: %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "Ogiltig JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "Om"
+
+#~ msgid "Quit"
+#~ msgstr "Avsluta"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Sensorinställningar"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - Temperaturövervakare"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Hjälp"
+
+#~ msgid "Sensor"
+#~ msgstr "Sensor"
+
+#~ msgid "Value"
+#~ msgstr "Värde"
+
+#~ msgid "Min"
+#~ msgstr "Min"
+
+#~ msgid "Max"
+#~ msgstr "Max"
+
+#~ msgid "Color"
+#~ msgstr "Färg"
+
+#~ msgid "Graph"
+#~ msgstr "Graf"
+
+#~ msgid "Show"
+#~ msgstr "Visa"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Höger"
+
+#~ msgid "Left"
+#~ msgstr "Vänster"
+
+#~ msgid "Top"
+#~ msgstr "Toppen"
+
+#~ msgid "Bottom"
+#~ msgstr "Botten"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Redigera inställningar"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Göm fönsterdekoration"
+
+#~ msgid "Keep window below"
+#~ msgstr "Håll fönster under"
+
+#~ msgid "Enable menu"
+#~ msgstr "Aktivera meny"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Aktivera räknare för Unity-programstartare"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
+
+#~ msgid "Celsius"
+#~ msgstr "Celsius"
+
+#~ msgid "Fahrenheit"
+#~ msgstr "Fahrenheit"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Temperaturenhet:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Sensortabellens position:"
+
+#~ msgid "Interface"
+#~ msgstr "Gränssnitt"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "Starta vid sessionsuppstart"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Göm fönster vid uppstart"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Återställ fönsterposition och storlek"
+
+#~ msgid "Startup"
+#~ msgstr "Uppstart"
+
+#~ msgid "Foreground:"
+#~ msgstr "Förgrund:"
+
+#~ msgid "Background:"
+#~ msgstr "Bakgrund:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Bakgrundsgenomskinlighet:"
+
+#~ msgid "Colors"
+#~ msgstr "Färger"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Övervakningstid:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Uppdateringsintervall:"
+
+#~ msgid "Measures"
+#~ msgstr "Mätningar"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Min</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Max</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "sekund(er)"
+
+#~ msgid "minute(s)"
+#~ msgstr "minut(er)"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Uppdateringsintervall för mätning:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Aktivera sensorlogging"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Loggintervall för sensor:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "sekund(er)"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Skript att köra vid alarm:"
+
+#~ msgid "Sensors"
+#~ msgstr "Sensorer"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Redigera sensorinställningar"
+
+#~ msgid "Name"
+#~ msgstr "Namn"
+
+#~ msgid "Type:"
+#~ msgstr "Typ:"
+
+#~ msgid "Chip:"
+#~ msgstr "Chip:"
+
+#~ msgid "Name:"
+#~ msgstr "Namn:"
+
+#~ msgid "Id:"
+#~ msgstr "Id:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Rita sensorkurva"
+
+#~ msgid "Color:"
+#~ msgstr "Färg:"
+
+#, fuzzy
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Visa sensor i meny"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Aktivera skrivbordsnotifiering"
+
+#~ msgid "High threshold:"
+#~ msgstr "Högt tröskelvärde:"
+
+#~ msgid "-1"
+#~ msgstr "-1"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Lågt tröskelvärde:"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarm"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Visa sensor i meny"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
+
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Visa sensor i etiketten (experimentell)"
+
+#~ msgid "Application Indicator"
+#~ msgstr "Programindikator"
 
 #~ msgid ""
 #~ "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU "
diff --git a/po/tr.po b/po/tr.po
index db5a050f..8184e3b6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-20 11:27+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -18,6 +18,28 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr ""
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Önplan rengini seçin"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi."
+
 #: src/cfg.c:501
 #, fuzzy, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,452 +55,95 @@ msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi."
 msgid "Failed to save configuration file %s."
 msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi."
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Hakkında"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Tercihler"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Çıkış"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Algılayıcı Tercihleri"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Sıcaklık Gözlemleyici"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr "_Psensor"
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Yardım"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Algılayıcı"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Değer"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Asgari"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Azami"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Renk"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Grafik"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Göster"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr "Sağ"
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "Sol"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "Üstte"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "Alt"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Tercihleri Düzenle"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Pencere çubuğunu gizle"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Pencereyi aşağıda tut"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Menüyü etkinleştir"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Unity Başlatıcı sayacını etkinleştir"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr "Celsius"
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr "Fahrenhayt"
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Sıcaklık birimi:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Gözlemleyici tablosunun konumu:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Arayüz"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr "Oturum başlangıcında başlat"
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Başlangıçta pencereyi gizle"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Pencere konumunu ve boyutunu yeniden yükle"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr "Başlangıç"
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Önplan:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Arkaplan:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Arkaplan saydamlığı:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Renk"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Gözlemleme süresi:"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Güncelleme aralığı:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Ölçümler"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Asgari</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Azami</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "saniye"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "dakika"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Ölçüm güncelleştirme aralığı:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "Algılayıcı günlük kaydını etkinleştir"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr "Algılayıcı günlük kaydı aralığı:"
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "saniye"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr "Alarm çaldığında betik çalıştırılır:"
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Algılayıcılar"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"Telif Hakkı (C) %s jeanfi@gmail.com\n"
+"Lisans GPLv2: GNU GPL 2. sürümü veya daha yenisi <http://www.gnu.org/"
+"licenses/old-licenses/gpl-2.0.html>\n"
+"Bu bir özgür yazılımdır: değiştirmekte ve yeniden dağıtmakta özgürsünüz.\n"
+"Yasaların izin verdiği çerçevede hiçbir garantisi YOKTUR.\n"
 
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Algılayıcı Tercihlerini Düzenle"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr "Ad"
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Tür:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "Bilinmeyen"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "Yonga:"
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "İsim:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Kimlik:"
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Kullanım: %s [SEÇENEK]...\n"
 
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
+"Psensor, sıcaklık ve fan hızı da dahil olmak üzere donanım algılayıcılarını "
+"gözlemleyen bir GTK+ uygulamasıdır."
 
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Seçenekler:"
 
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          yardımı göster ve çık\n"
+"  -v, --version       sürüm bilgisini göster ve çık"
 
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       psensor sunucusunun bağlantısı,\n"
+"                      example: http://hostname:3131"
 
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Algılayıcı eğrisini çiz"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Renk :"
-
-#: src/glade/sensor-edit.glade:448
-#, fuzzy
-msgid "Display sensor in the list of sensors"
-msgstr "Algılayıcıları menüde göster"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Masaüstü bildirimlerini etkinleştir"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Yüksek eşik:"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
 msgstr ""
+"  -n, --new-instance  yeni bir Psensor uygulaması oluşturulmasını zorla"
 
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
-msgstr "-1"
-
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Düşük eşik:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "Algılayıcıları menüde göster"
-
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
-
-#: src/glade/sensor-edit.glade:719
-#, fuzzy
-msgid "Display sensor in the label (experimental)"
-msgstr "Etikette algılayıcı göster (deneysel)"
-
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
-msgstr "Uygulama Göstergesi"
-
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
+"  -d, --debug=LEVEL   hata ayıklama seviyesin ayarla, 0 ve 3 arasında tamsayı"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD:  ADL kütüphanesi bulunamadı."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: ADL'nin API'sı kayıp."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: ADL başlatılamadı."
-
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: bağdaştırıcıların sayısı alınamadı."
-
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr "AMD/ATI bağdaştırıcı sayısı: %d"
+msgid "Report bugs to: %s\n"
+msgstr "Hataları rapor et:%s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr "Etkin AMD/ATI bağdaştırıcı sayısı: %d"
+msgid "%s home page: <%s>\n"
+msgstr "%s ana sayfa: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr "Disk"
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s: sk_disk_open() hatası: %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Hata ayıklama modunu etkinleştirir."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: yuva açılamadı"
+msgid "Try `%s --help' for more information.\n"
+msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: bağlantı açılamadı."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "Bir Psensor örneği zaten mevcut."
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: yanlış dizi: %s."
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Web sunucusu oluşturulamadı."
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -515,26 +180,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s: başlatma hatası: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr "İşlemci"
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "RPM"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Günlükleme dosyası açılamadı: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "Bilinmeyen"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -563,16 +219,8 @@ msgstr "%s: NVIDIA bilgisi alınamıyor."
 
 #: src/lib/nvidia.c:394
 #, fuzzy, c-format
-msgid "%s: Failed to retrieve number of fans."
-msgstr "NVIDIA bilgisi alınamıyor."
-
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "RPM"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
+msgid "%s: Failed to retrieve number of fans."
+msgstr "NVIDIA bilgisi alınamıyor."
 
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
@@ -595,110 +243,86 @@ msgstr "Algılayıcı günlük kaydı dosyası açık değil."
 msgid "Sensor log not open, cannot close."
 msgstr "Algılayıcı günlük kaydı açık değil, kapatılamıyor."
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"Telif Hakkı (C) %s jeanfi@gmail.com\n"
-"Lisans GPLv2: GNU GPL 2. sürümü veya daha yenisi <http://www.gnu.org/"
-"licenses/old-licenses/gpl-2.0.html>\n"
-"Bu bir özgür yazılımdır: değiştirmekte ve yeniden dağıtmakta özgürsünüz.\n"
-"Yasaların izin verdiği çerçevede hiçbir garantisi YOKTUR.\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD:  ADL kütüphanesi bulunamadı."
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Kullanım: %s [SEÇENEK]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: ADL'nin API'sı kayıp."
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr ""
-"Psensor, sıcaklık ve fan hızı da dahil olmak üzere donanım algılayıcılarını "
-"gözlemleyen bir GTK+ uygulamasıdır."
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: ADL başlatılamadı."
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Seçenekler:"
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: bağdaştırıcıların sayısı alınamadı."
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
-msgstr ""
-"  -h, --help          yardımı göster ve çık\n"
-"  -v, --version       sürüm bilgisini göster ve çık"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "AMD/ATI bağdaştırıcı sayısı: %d"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
-msgstr ""
-"  -u, --url=URL       psensor sunucusunun bağlantısı,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Etkin AMD/ATI bağdaştırıcı sayısı: %d"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -n, --new-instance  yeni bir Psensor uygulaması oluşturulmasını zorla"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr "İşlemci"
+
+#: src/lib/pgtop2.c:63
+msgid "free memory"
 msgstr ""
-"  -d, --debug=LEVEL   hata ayıklama seviyesin ayarla, 0 ve 3 arasında tamsayı"
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Hataları rapor et:%s\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/plog.c:43
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s ana sayfa: <%s>\n"
-
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
+msgid "Cannot open log file: %s"
+msgstr "Günlükleme dosyası açılamadı: %s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Hata ayıklama modunu etkinleştirir."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "gettimeofday başarısız."
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "Bir Psensor örneği zaten mevcut."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr "Disk"
 
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Web sunucusu oluşturulamadı."
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
+msgstr "%s: yuva açılamadı"
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Şuna bağlanamadı: %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: bağlantı açılamadı."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Geçersiz içerik: %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s: yanlış dizi: %s."
 
-#: src/rsensor.c:192
-#, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "Geçersiz JSON: %s"
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s: sk_disk_open() hatası: %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -833,28 +457,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Psensor Anasayfası"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Psensor simgesi yüklenemedi."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Önplan rengini seçin"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi."
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "gettimeofday başarısız."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "Sıcaklık uyarısı"
@@ -864,9 +474,246 @@ msgstr "Sıcaklık uyarısı"
 msgid "Fan speed alert"
 msgstr "Fan uyarısı"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "Bilinmeyen"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Şuna bağlanamadı: %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Geçersiz içerik: %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "Geçersiz JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "Hakkında"
+
+#~ msgid "Quit"
+#~ msgstr "Çıkış"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Algılayıcı Tercihleri"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - Sıcaklık Gözlemleyici"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "_Yardım"
+
+#~ msgid "Sensor"
+#~ msgstr "Algılayıcı"
+
+#~ msgid "Value"
+#~ msgstr "Değer"
+
+#~ msgid "Min"
+#~ msgstr "Asgari"
+
+#~ msgid "Max"
+#~ msgstr "Azami"
+
+#~ msgid "Color"
+#~ msgstr "Renk"
+
+#~ msgid "Graph"
+#~ msgstr "Grafik"
+
+#~ msgid "Show"
+#~ msgstr "Göster"
+
+#~ msgctxt "psensor"
+#~ msgid "Right"
+#~ msgstr "Sağ"
+
+#~ msgid "Left"
+#~ msgstr "Sol"
+
+#~ msgid "Top"
+#~ msgstr "Üstte"
+
+#~ msgid "Bottom"
+#~ msgstr "Alt"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Tercihleri Düzenle"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Pencere çubuğunu gizle"
+
+#~ msgid "Keep window below"
+#~ msgstr "Pencereyi aşağıda tut"
+
+#~ msgid "Enable menu"
+#~ msgstr "Menüyü etkinleştir"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Unity Başlatıcı sayacını etkinleştir"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
+
+#~ msgid "Celsius"
+#~ msgstr "Celsius"
+
+#~ msgid "Fahrenheit"
+#~ msgstr "Fahrenhayt"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Sıcaklık birimi:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Gözlemleyici tablosunun konumu:"
+
+#~ msgid "Interface"
+#~ msgstr "Arayüz"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "Oturum başlangıcında başlat"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Başlangıçta pencereyi gizle"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Pencere konumunu ve boyutunu yeniden yükle"
+
+#~ msgid "Startup"
+#~ msgstr "Başlangıç"
+
+#~ msgid "Foreground:"
+#~ msgstr "Önplan:"
+
+#~ msgid "Background:"
+#~ msgstr "Arkaplan:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Arkaplan saydamlığı:"
+
+#~ msgid "Colors"
+#~ msgstr "Renk"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Gözlemleme süresi:"
+
+#~ msgid "Update interval:"
+#~ msgstr "Güncelleme aralığı:"
+
+#~ msgid "Measures"
+#~ msgstr "Ölçümler"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Asgari</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Azami</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "saniye"
+
+#~ msgid "minute(s)"
+#~ msgstr "dakika"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Ölçüm güncelleştirme aralığı:"
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "Algılayıcı günlük kaydını etkinleştir"
+
+#~ msgid "Sensors logging interval:"
+#~ msgstr "Algılayıcı günlük kaydı aralığı:"
+
+#~ msgid "seconds(s)"
+#~ msgstr "saniye"
+
+#~ msgid "Script executed when an alarm is raised:"
+#~ msgstr "Alarm çaldığında betik çalıştırılır:"
+
+#~ msgid "Sensors"
+#~ msgstr "Algılayıcılar"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Algılayıcı Tercihlerini Düzenle"
+
+#~ msgid "Name"
+#~ msgstr "Ad"
+
+#~ msgid "Type:"
+#~ msgstr "Tür:"
+
+#~ msgid "Chip:"
+#~ msgstr "Yonga:"
+
+#~ msgid "Name:"
+#~ msgstr "İsim:"
+
+#~ msgid "Id:"
+#~ msgstr "Kimlik:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Algılayıcı eğrisini çiz"
+
+#~ msgid "Color:"
+#~ msgstr "Renk :"
+
+#, fuzzy
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "Algılayıcıları menüde göster"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Masaüstü bildirimlerini etkinleştir"
+
+#~ msgid "High threshold:"
+#~ msgstr "Yüksek eşik:"
+
+#~ msgid "-1"
+#~ msgstr "-1"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Düşük eşik:"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarm"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "Algılayıcıları menüde göster"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
+
+#, fuzzy
+#~ msgid "Display sensor in the label (experimental)"
+#~ msgstr "Etikette algılayıcı göster (deneysel)"
+
+#~ msgid "Application Indicator"
+#~ msgstr "Uygulama Göstergesi"
 
 #~ msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 #~ msgstr "lmsensor: lmsensor_psensor_create hatası: yanlış özellik tipi."
diff --git a/po/uk.po b/po/uk.po
index c52b8495..174b9740 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-11 21:23+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,6 +18,28 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr ""
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr ""
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "Налаштування"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "Оберіть колір переднього плану"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "Не вдалося створити веб-сервер."
+
 #: src/cfg.c:501
 #, fuzzy, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,450 +55,85 @@ msgstr "Не вдалося створити веб-сервер."
 msgid "Failed to save configuration file %s."
 msgstr ""
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "Про програму"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "Налаштування"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "Вихід"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "Налаштування датчиків"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr ""
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr ""
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "_Довдіка"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "Датчик"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "Значення"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "Мін."
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "Макс."
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "Колір"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "Діаграма"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "Показати"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "Редагувати налаштування"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "Сховати каркас вікна"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "Тримати вікно позаду"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "Увімкнути меню"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "Увімкнути лічильник на панелі запуску Unity"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "Одиниця температури:"
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "Положення таблиці датчиків:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "Зовнішній вигляд"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "Сховати вікно після запуску"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "Відновляти позицію і розмір вікна"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "Передній план:"
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "Тло:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "Непрозорість тла:"
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "Кольори"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "Тривалість спостереження"
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "Інтервал оновлення:"
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "Заміри"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>Мін.</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>Макс.</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "сек."
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "хв."
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "Інтервал оновлення замірів:"
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "Датчики"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "Редагувати налаштування датчика"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "Тип:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "Н/Д"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "Назва:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "Ідентифікатор:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "Малювати криву датчика"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "Колір:"
-
-#: src/glade/sensor-edit.glade:448
-msgid "Display sensor in the list of sensors"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "Увімкнути оповіщення"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "Вищий поріг:"
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "Нижчий поріг:"
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "Оповіщення"
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Використання: %s [КЛЮЧ]...\n"
 
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
 msgstr ""
 
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
-
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "Опції:"
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help          показати цю довідку і вийти\n"
+"  -v, --version       показати версію і вийти"
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       URL psensor-сервера, наприклад: http://hostname:3131"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD: не вдалося знайти бібліотеку ADL."
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD: відсутнє API ADL."
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD: не вдалося ініціалізувати ADL."
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
+msgstr "  -n, --new-instance  примусово створювати нову копію програми Psensor"
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD: не вдалося отримати кількість адаптерів."
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+msgstr "  -d, --debug=РІВЕНЬ   встановити рівень налагодження, ціле між 0 та 3"
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr ""
+msgid "Report bugs to: %s\n"
+msgstr "Звітуйте про помилки до: %s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr ""
+msgid "%s home page: <%s>\n"
+msgstr "%s домашня сторінка: <%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr ""
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
 
-#: src/lib/hdd_atasmart.c:153
-#, fuzzy, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "atasmart: помилка sk_disk_open(): %s."
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "Включає режим налагодження."
 
-#: src/lib/hdd_hddtemp.c:62
+#: src/main.c:472 src/server/server.c:422
 #, c-format
-msgid "%s: failed to open socket."
-msgstr "%s: не вдалося відкрити сокет."
+msgid "Try `%s --help' for more information.\n"
+msgstr "Спробуйте `%s --help' щоб отримати більше інформації.\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, c-format
-msgid "%s: failed to open connection."
-msgstr "%s: не вдалося встановити з'єднання."
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr ""
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, c-format
-msgid "%s: wrong string: %s."
-msgstr "%s: неправильний рядок: %s."
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Не вдалося створити веб-сервер."
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -513,26 +170,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "lmsensor: помилка ініціалізації: %s."
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "об/хв"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "Не вдалося відкрити лог-файл: %s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "Н/Д"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -564,14 +212,6 @@ msgstr "%s: Не вдалося отримати інформацію NVIDIA."
 msgid "%s: Failed to retrieve number of fans."
 msgstr "Не вдалося отримати інформацію NVIDIA."
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "об/хв"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "Змінна HOME не встановлена."
@@ -593,100 +233,86 @@ msgstr ""
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:61 src/server/server.c:88
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: не вдалося знайти бібліотеку ADL."
+
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD: відсутнє API ADL."
+
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: не вдалося ініціалізувати ADL."
+
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: не вдалося отримати кількість адаптерів."
+
+#: src/lib/amd.c:253
 #, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
+msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:72 src/server/server.c:98
+#: src/lib/amd.c:254
 #, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "Використання: %s [КЛЮЧ]...\n"
-
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
+msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "Опції:"
-
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
 msgstr ""
-"  -h, --help          показати цю довідку і вийти\n"
-"  -v, --version       показати версію і вийти"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
 msgstr ""
-"  -u, --url=URL       URL psensor-сервера, наприклад: http://hostname:3131"
-
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
-msgstr "  -n, --new-instance  примусово створювати нову копію програми Psensor"
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
-msgstr "  -d, --debug=РІВЕНЬ   встановити рівень налагодження, ціле між 0 та 3"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
+msgstr ""
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "Звітуйте про помилки до: %s\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
+#: src/lib/plog.c:43
 #, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s домашня сторінка: <%s>\n"
-
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
+msgid "Cannot open log file: %s"
+msgstr "Не вдалося відкрити лог-файл: %s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "Включає режим налагодження."
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "помилка gettimeofday."
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "Спробуйте `%s --help' щоб отримати більше інформації.\n"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:485
-msgid "A Psensor instance already exists."
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
 msgstr ""
 
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "Не вдалося створити веб-сервер."
+#: src/lib/hdd_hddtemp.c:62
+#, c-format
+msgid "%s: failed to open socket."
+msgstr "%s: не вдалося відкрити сокет."
 
-#: src/rsensor.c:115
-#, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "Не вдалося підключитися до: %s"
+#: src/lib/hdd_hddtemp.c:75
+#, c-format
+msgid "%s: failed to open connection."
+msgstr "%s: не вдалося встановити з'єднання."
 
-#: src/rsensor.c:152
-#, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "Неправильний JSON: %s"
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
+#, c-format
+msgid "%s: wrong string: %s."
+msgstr "%s: неправильний рядок: %s."
 
-#: src/rsensor.c:192
+#: src/lib/hdd_atasmart.c:153
 #, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "Неправильний JSON: %s"
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "atasmart: помилка sk_disk_open(): %s."
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -814,28 +440,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Домашня сторінка Psensor"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "Не вдалося завантажити іконку Psensor."
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "Оберіть колір переднього плану"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "Не вдалося створити веб-сервер."
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "помилка gettimeofday."
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr ""
@@ -844,9 +456,180 @@ msgstr ""
 msgid "Fan speed alert"
 msgstr ""
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr ""
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "Не вдалося підключитися до: %s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "Неправильний JSON: %s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "Неправильний JSON: %s"
+
+#~ msgid "About"
+#~ msgstr "Про програму"
+
+#~ msgid "Quit"
+#~ msgstr "Вихід"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "Налаштування датчиків"
+
+#~ msgid "_Help"
+#~ msgstr "_Довдіка"
+
+#~ msgid "Sensor"
+#~ msgstr "Датчик"
+
+#~ msgid "Value"
+#~ msgstr "Значення"
+
+#~ msgid "Min"
+#~ msgstr "Мін."
+
+#~ msgid "Max"
+#~ msgstr "Макс."
+
+#~ msgid "Color"
+#~ msgstr "Колір"
+
+#~ msgid "Graph"
+#~ msgstr "Діаграма"
+
+#~ msgid "Show"
+#~ msgstr "Показати"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "Редагувати налаштування"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "Сховати каркас вікна"
+
+#~ msgid "Keep window below"
+#~ msgstr "Тримати вікно позаду"
+
+#~ msgid "Enable menu"
+#~ msgstr "Увімкнути меню"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "Увімкнути лічильник на панелі запуску Unity"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
+
+#~ msgid "Temperature unit:"
+#~ msgstr "Одиниця температури:"
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "Положення таблиці датчиків:"
+
+#~ msgid "Interface"
+#~ msgstr "Зовнішній вигляд"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "Сховати вікно після запуску"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "Відновляти позицію і розмір вікна"
+
+#~ msgid "Foreground:"
+#~ msgstr "Передній план:"
+
+#~ msgid "Background:"
+#~ msgstr "Тло:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "Непрозорість тла:"
+
+#~ msgid "Colors"
+#~ msgstr "Кольори"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "Тривалість спостереження"
+
+#~ msgid "Update interval:"
+#~ msgstr "Інтервал оновлення:"
+
+#~ msgid "Measures"
+#~ msgstr "Заміри"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>Мін.</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>Макс.</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "сек."
+
+#~ msgid "minute(s)"
+#~ msgstr "хв."
+
+#~ msgid "Measure update interval:"
+#~ msgstr "Інтервал оновлення замірів:"
+
+#~ msgid "Sensors"
+#~ msgstr "Датчики"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "Редагувати налаштування датчика"
+
+#~ msgid "Type:"
+#~ msgstr "Тип:"
+
+#~ msgid "Name:"
+#~ msgstr "Назва:"
+
+#~ msgid "Id:"
+#~ msgstr "Ідентифікатор:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "Малювати криву датчика"
+
+#~ msgid "Color:"
+#~ msgstr "Колір:"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "Увімкнути оповіщення"
+
+#~ msgid "High threshold:"
+#~ msgstr "Вищий поріг:"
+
+#~ msgid "Low threshold:"
+#~ msgstr "Нижчий поріг:"
+
+#~ msgid "Alarm"
+#~ msgstr "Оповіщення"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
 
 #~ msgid "Sensor Information"
 #~ msgstr "Інформація датчика"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9b01cd53..824a6bf6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
-"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2016-08-24 23:30+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-07 16:40+0000\n"
 "PO-Revision-Date: 2014-09-11 21:24+0000\n"
 "Last-Translator: Jean-Philippe Orsini <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -18,6 +18,28 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n"
 "X-Generator: Launchpad (build 17196)\n"
 
+#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
+msgid "Unknown"
+msgstr "未知"
+
+#: src/ui_sensorlist.c:259
+msgid "Hide"
+msgstr "隐藏"
+
+#: src/ui_sensorlist.c:269
+msgid "Preferences"
+msgstr "首选项"
+
+#: src/ui_sensorlist.c:303
+#, fuzzy
+msgid "Select sensor color"
+msgstr "选择前景色"
+
+#: src/ui_appindicator.c:148
+#, fuzzy, c-format
+msgid "Failed to load glade file %s: %s"
+msgstr "无法激活监测器日志。"
+
 #: src/cfg.c:501
 #, fuzzy, c-format
 msgid "Failed to create the directory %s: %s"
@@ -33,451 +55,91 @@ msgstr "无法激活监测器日志。"
 msgid "Failed to save configuration file %s."
 msgstr "无法激活监测器日志。"
 
-#: src/glade/psensor.glade:6 src/glade/psensor-appindicator.glade:6
-msgid "About"
-msgstr "关于"
-
-#: src/glade/psensor.glade:10 src/glade/psensor-appindicator.glade:10
-#: src/glade/psensor-appindicator.glade:11
-#: src/glade/psensor-appindicator.glade:20 src/ui_sensorlist.c:269
-msgid "Preferences"
-msgstr "首选项"
-
-#: src/glade/psensor.glade:14 src/glade/psensor-appindicator.glade:24
-msgid "Quit"
-msgstr "退出"
-
-#: src/glade/psensor.glade:18 src/glade/psensor-appindicator.glade:15
-#: src/glade/psensor-appindicator.glade:16
-#: src/glade/psensor-appindicator.glade:28
-msgid "Sensor Preferences"
-msgstr "传感器首选项"
-
-#: src/glade/psensor.glade:99
-msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - 温度监视器"
-
-#: src/glade/psensor.glade:114
-msgid "_Psensor"
-msgstr ""
-
-#: src/glade/psensor.glade:161
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: src/glade/psensor.glade:225
-msgid "Sensor"
-msgstr "监视设备"
-
-#: src/glade/psensor.glade:236
-msgid "Value"
-msgstr "值"
-
-#: src/glade/psensor.glade:247
-msgid "Min"
-msgstr "最小值"
-
-#: src/glade/psensor.glade:258
-msgid "Max"
-msgstr "最大值"
-
-#: src/glade/psensor.glade:269
-msgid "Color"
-msgstr "颜色"
-
-#: src/glade/psensor.glade:280 src/glade/psensor-pref.glade:753
-#: src/glade/sensor-edit.glade:480
-msgid "Graph"
-msgstr "图表"
-
-#: src/glade/psensor-appindicator.glade:84
-msgid "Show"
-msgstr "显示"
-
-#: src/glade/psensor-pref.glade:24
-msgctxt "psensor"
-msgid "Right"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:27
-msgid "Left"
-msgstr "左侧"
-
-#: src/glade/psensor-pref.glade:30
-msgid "Top"
-msgstr "顶部"
-
-#: src/glade/psensor-pref.glade:33
-msgid "Bottom"
-msgstr "底部"
-
-#: src/glade/psensor-pref.glade:60
-msgid "Edit Preferences"
-msgstr "编辑首选项"
-
-#: src/glade/psensor-pref.glade:126
-msgid "Hide window decoration"
-msgstr "隐藏窗口标题栏"
-
-#: src/glade/psensor-pref.glade:146
-msgid "Keep window below"
-msgstr "保持在最底层"
-
-#: src/glade/psensor-pref.glade:166
-msgid "Enable menu"
-msgstr "启用菜单"
-
-#: src/glade/psensor-pref.glade:186
-msgid "Enable Unity Launcher counter"
-msgstr "启用 Unity 启动器计数器"
-
-#: src/glade/psensor-pref.glade:190
-#, fuzzy
-msgid "Psensor has not been build with Unity Launcher support"
-msgstr "Psensor 不支持远程传感器。"
-
-#: src/glade/psensor-pref.glade:215
-msgid "Celsius"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:216
-msgid "Fahrenheit"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:258
-msgid "Temperature unit:"
-msgstr "温度单位："
-
-#: src/glade/psensor-pref.glade:275
-msgid "Position of sensors table:"
-msgstr "监视设备列表位置:"
-
-#: src/glade/psensor-pref.glade:292
-msgid "Interface"
-msgstr "界面"
-
-#: src/glade/psensor-pref.glade:308
-msgid "Launch on session startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:327
-msgid "Hide window on startup"
-msgstr "启动时隐藏窗口"
-
-#: src/glade/psensor-pref.glade:345
-msgid "Restore window position and size"
-msgstr "恢复窗口位置和大小"
-
-#: src/glade/psensor-pref.glade:374
-msgid "Startup"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:416
-msgid "Foreground:"
-msgstr "前景："
-
-#: src/glade/psensor-pref.glade:432
-msgid "Background:"
-msgstr "背景:"
-
-#: src/glade/psensor-pref.glade:464
-msgid "Background opacity:"
-msgstr "背景透明："
-
-#: src/glade/psensor-pref.glade:480
-msgid "Colors"
-msgstr "颜色"
-
-#: src/glade/psensor-pref.glade:500
-msgid "Monitoring duration:"
-msgstr "监视持续时长："
-
-#: src/glade/psensor-pref.glade:516
-msgid "Update interval:"
-msgstr "更新间隔："
-
-#: src/glade/psensor-pref.glade:532
-msgid "Measures"
-msgstr "测量"
-
-#: src/glade/psensor-pref.glade:558
-msgid "<i>Min</i>"
-msgstr "<i>最小值</i>"
-
-#: src/glade/psensor-pref.glade:585
-msgid "<i>Max</i>"
-msgstr "<i>最大值</i>"
-
-#: src/glade/psensor-pref.glade:636 src/glade/psensor-pref.glade:813
-msgid "second(s)"
-msgstr "秒"
-
-#: src/glade/psensor-pref.glade:686
-msgid "minute(s)"
-msgstr "分钟"
-
-#: src/glade/psensor-pref.glade:702
-msgid "Smooth curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:728
-msgid "Curves"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:780
-msgid "Measure update interval:"
-msgstr "测量更新间隔："
-
-#: src/glade/psensor-pref.glade:822
-msgid "Enable sensors logging"
-msgstr "启用监测器记录"
-
-#: src/glade/psensor-pref.glade:866
-msgid "Sensors logging interval:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:881
-msgid "seconds(s)"
-msgstr "秒"
-
-#: src/glade/psensor-pref.glade:896
-msgid "Script executed when an alarm is raised:"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:934
-msgid "Sensors"
-msgstr "传感器"
-
-#: src/glade/psensor-pref.glade:952
-msgid "Enable support of lm-sensors"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:970
-msgid "Enable support of NVCtrl (NVidia)"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:974
-#, fuzzy
-msgid "Psensor has not been build with NVCtrl support"
-msgstr "Psensor 不支持远程传感器。"
-
-#: src/glade/psensor-pref.glade:989
-msgid "Enable support of ATI ADL"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:993
-#, fuzzy
-msgid "Psensor has not been build with ATI ADL support"
-msgstr "Psensor 不支持远程传感器。"
-
-#: src/glade/psensor-pref.glade:1008
-msgid "Enable support of gtop2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1012
-#, fuzzy
-msgid "Psensor has not been build with gtop2 support"
-msgstr "Psensor 不支持远程传感器。"
-
-#: src/glade/psensor-pref.glade:1027
-msgid "Enable support of hddtemp daemon"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1045
-msgid "Enable support of libatasmart"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1049
-#, fuzzy
-msgid "Psensor has not been build with libatasmart support"
-msgstr "Psensor 不支持远程传感器。"
-
-#: src/glade/psensor-pref.glade:1064
-msgid "Enable support of udisks2"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1068
-#, fuzzy
-msgid "Psensor has not been build with udisks2 support"
-msgstr "Psensor 不支持远程传感器。"
-
-#: src/glade/psensor-pref.glade:1090
-msgid "The changes are applied after the restart of psensor."
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1110
-msgid "Hard disk drive"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1131
-msgid "CPU and memory usage"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1152
-msgid "GPU with proprietary driver"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1173
-msgid "Motherboard, CPU and GPU"
-msgstr ""
-
-#: src/glade/psensor-pref.glade:1194
-msgid "Providers"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:29
-msgid "Edit Sensor Preferences"
-msgstr "编辑传感器首选项"
-
-#: src/glade/sensor-edit.glade:97
-msgid "Name"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:164
-msgid "Type:"
-msgstr "类型:"
-
-#: src/glade/sensor-edit.glade:183 src/glade/sensor-edit.glade:220
-#: src/glade/sensor-edit.glade:276 src/glade/sensor-edit.glade:575
-#: src/glade/sensor-edit.glade:630 src/lib/psensor.c:430 src/ui_notify.c:81
-msgid "N/A"
-msgstr "不可用"
-
-#: src/glade/sensor-edit.glade:202
-msgid "Chip:"
-msgstr "芯片："
-
-#: src/glade/sensor-edit.glade:239
-msgid "Name:"
-msgstr "名称:"
-
-#: src/glade/sensor-edit.glade:258
-msgid "Id:"
-msgstr "标识:"
-
-#: src/glade/sensor-edit.glade:296
-msgid "Min:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:315
-msgid "Max:"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:333 src/glade/sensor-edit.glade:351
-msgid "label"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:370
-msgid "Details"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:388
-msgid "Draw sensor curve"
-msgstr "绘制监视曲线"
-
-#: src/glade/sensor-edit.glade:417
-msgid "Color:"
-msgstr "颜色："
-
-#: src/glade/sensor-edit.glade:448
-#, fuzzy
-msgid "Display sensor in the list of sensors"
-msgstr "在应用指示器菜单中显示监视器"
-
-#: src/glade/sensor-edit.glade:499
-msgid "Activate desktop notifications"
-msgstr "激活桌面气泡提示"
-
-#: src/glade/sensor-edit.glade:528
-msgid "High threshold:"
-msgstr "高阈值："
-
-#: src/glade/sensor-edit.glade:550
-msgid "0"
-msgstr ""
-
-#: src/glade/sensor-edit.glade:604
-msgid "-1"
+#: src/main.c:61 src/server/server.c:88
+#, c-format
+msgid ""
+"Copyright (C) %s jeanfi@gmail.com\n"
+"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"版权所有(C) %s jeanfi@gmail.com\n"
+"协议 GPLv2：GNU GPL 第 2 版或更新的<http://www.gnu.org/licenses/old-licenses/"
+"gpl-2.0.html>\n"
+"本软件为自由软件：您可以自由修改并分发。\n"
+"There is NO WARRANTY, to the extent permitted by law。\n"
 
-#: src/glade/sensor-edit.glade:656
-msgid "Low threshold:"
-msgstr "低阈值："
-
-#: src/glade/sensor-edit.glade:678
-msgid "Alarm"
-msgstr "警告"
-
-#: src/glade/sensor-edit.glade:697
-msgid "Display sensor in the menu"
-msgstr "在应用指示器菜单中显示监视器"
+#: src/main.c:72 src/server/server.c:98
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "用法：%s [选项]...\n"
 
-#: src/glade/sensor-edit.glade:701 src/glade/sensor-edit.glade:723
-#, fuzzy
-msgid "Psensor has not been build with AppIndicator support"
-msgstr "Psensor 不支持远程传感器。"
+#: src/main.c:74
+msgid ""
+"Psensor is a GTK+ application for monitoring hardware sensors, including "
+"temperatures and fan speeds."
+msgstr "Psensor 是一款 GTK+ 应用程序，可监测硬件传感器，包括温度与风扇转速。"
 
-#: src/glade/sensor-edit.glade:719
-msgid "Display sensor in the label (experimental)"
-msgstr ""
+#: src/main.c:78
+msgid "Options:"
+msgstr "选项："
 
-#: src/glade/sensor-edit.glade:752
-msgid "Application Indicator"
+#: src/main.c:79
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help 显示这个帮助并退出\n"
+"  -v, --version 显示版本信息并退出"
 
-#: src/graph.c:460
-msgid "No graphs enabled"
+#: src/main.c:85
+msgid ""
+"  -u, --url=URL       the URL of the psensor-server,\n"
+"                      example: http://hostname:3131"
 msgstr ""
+"  -u, --url=URL       psensor 服务器 URL\n"
+"                      例如：http://hostname:3131"
 
-#: src/lib/amd.c:171
-msgid "AMD: cannot found ADL library."
-msgstr "AMD：未找到 ADL 库。"
-
-#: src/lib/amd.c:198
-msgid "AMD: missing ADL's API."
-msgstr "AMD：ADL 的 API 丢失。"
-
-#: src/lib/amd.c:208
-msgid "AMD: failed to initialize ADL."
-msgstr "AMD：ADL 初始化出错。"
+#: src/main.c:88
+msgid "  -n, --new-instance  force the creation of a new Psensor application"
+msgstr "  -n, --new-instance  强制创建一个新的 Psensor 例程"
 
-#: src/lib/amd.c:214
-msgid "AMD: cannot get the number of adapters."
-msgstr "AMD：无法获取适配器数目。"
+#: src/main.c:91
+msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
+msgstr "  -d，--debug=LEVEL 设置调试等级，等级为 0 到 3 之间的整数"
 
-#: src/lib/amd.c:253
+#: src/main.c:96 src/server/server.c:121
 #, c-format
-msgid "Number of AMD/ATI adapters: %d"
-msgstr ""
+msgid "Report bugs to: %s\n"
+msgstr "报告问题至：%s\n"
 
-#: src/lib/amd.c:254
+#: src/main.c:98 src/server/server.c:123
 #, c-format
-msgid "Number of active AMD/ATI adapters: %d"
-msgstr ""
+msgid "%s home page: <%s>\n"
+msgstr "%s 主页：<%s>\n"
 
-#: src/lib/hdd_atasmart.c:70 src/lib/hdd_hddtemp.c:125
-msgid "Disk"
-msgstr ""
+#: src/main.c:390
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor 不支持远程传感器。"
 
-#: src/lib/hdd_atasmart.c:153
-#, c-format
-msgid "%s: sk_disk_open() failure: %s."
-msgstr "%s：sk_disk_open() 失败：%s。"
+#: src/main.c:460
+msgid "Enables debug mode."
+msgstr "启用调试模式。"
 
-#: src/lib/hdd_hddtemp.c:62
-#, fuzzy, c-format
-msgid "%s: failed to open socket."
-msgstr "硬盘温度：无法打开套接字。"
+#: src/main.c:472 src/server/server.c:422
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "试用‘%s --help’来获得更多信息。\n"
 
-#: src/lib/hdd_hddtemp.c:75
-#, fuzzy, c-format
-msgid "%s: failed to open connection."
-msgstr "硬盘温度：无法打开连接。"
+#: src/main.c:485
+msgid "A Psensor instance already exists."
+msgstr "已存在一个 Psensor 例程。"
 
-#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
-#, fuzzy, c-format
-msgid "%s: wrong string: %s."
-msgstr "硬盘温度：错误字符：%s。"
+#: src/main.c:527
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "无法创建网络服务器。"
 
 #: src/lib/lmsensor.c:73
 #, c-format
@@ -514,26 +176,17 @@ msgstr ""
 msgid "%s: initialization failure: %s."
 msgstr "%s：初始化失败：%s。"
 
-#: src/lib/pgtop2.c:42
-msgid "CPU usage"
-msgstr ""
-
-#: src/lib/pgtop2.c:47
-msgid "CPU"
-msgstr ""
-
-#: src/lib/pgtop2.c:63
-msgid "free memory"
-msgstr ""
+#: src/lib/psensor.c:426
+msgid "RPM"
+msgstr "转速"
 
-#: src/lib/pgtop2.c:64
-msgid "memory"
-msgstr ""
+#: src/lib/psensor.c:428
+msgid "%"
+msgstr "%"
 
-#: src/lib/plog.c:43
-#, c-format
-msgid "Cannot open log file: %s"
-msgstr "无法打开日志文件：%s"
+#: src/lib/psensor.c:430 src/ui_notify.c:81
+msgid "N/A"
+msgstr "不可用"
 
 #: src/lib/nvidia.c:69
 #, fuzzy, c-format
@@ -565,14 +218,6 @@ msgstr "%s: 无法获取 NVIDIA 信息。"
 msgid "%s: Failed to retrieve number of fans."
 msgstr "无法获取 NVIDIA 信息。"
 
-#: src/lib/psensor.c:426 tests/test_psensor_type_to_unit_str.c:62
-msgid "RPM"
-msgstr "转速"
-
-#: src/lib/psensor.c:428
-msgid "%"
-msgstr "%"
-
 #: src/lib/slog.c:87
 msgid "HOME variable not set."
 msgstr "未设置 HOME 变量。"
@@ -594,106 +239,86 @@ msgstr "监测器日志文件未打开。"
 msgid "Sensor log not open, cannot close."
 msgstr "监测器日志未打开，故无法关闭。"
 
-#: src/main.c:61 src/server/server.c:88
-#, c-format
-msgid ""
-"Copyright (C) %s jeanfi@gmail.com\n"
-"License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"This is free software: you are free to change and redistribute it.\n"
-"There is NO WARRANTY, to the extent permitted by law.\n"
-msgstr ""
-"版权所有(C) %s jeanfi@gmail.com\n"
-"协议 GPLv2：GNU GPL 第 2 版或更新的<http://www.gnu.org/licenses/old-licenses/"
-"gpl-2.0.html>\n"
-"本软件为自由软件：您可以自由修改并分发。\n"
-"There is NO WARRANTY, to the extent permitted by law。\n"
+#: src/lib/amd.c:171
+msgid "AMD: cannot found ADL library."
+msgstr "AMD：未找到 ADL 库。"
 
-#: src/main.c:72 src/server/server.c:98
-#, c-format
-msgid "Usage: %s [OPTION]...\n"
-msgstr "用法：%s [选项]...\n"
+#: src/lib/amd.c:198
+msgid "AMD: missing ADL's API."
+msgstr "AMD：ADL 的 API 丢失。"
 
-#: src/main.c:74
-msgid ""
-"Psensor is a GTK+ application for monitoring hardware sensors, including "
-"temperatures and fan speeds."
-msgstr "Psensor 是一款 GTK+ 应用程序，可监测硬件传感器，包括温度与风扇转速。"
+#: src/lib/amd.c:208
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD：ADL 初始化出错。"
 
-#: src/main.c:78
-msgid "Options:"
-msgstr "选项："
+#: src/lib/amd.c:214
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD：无法获取适配器数目。"
 
-#: src/main.c:79
-msgid ""
-"  -h, --help          display this help and exit\n"
-"  -v, --version       display version information and exit"
+#: src/lib/amd.c:253
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
-"  -h, --help 显示这个帮助并退出\n"
-"  -v, --version 显示版本信息并退出"
 
-#: src/main.c:85
-msgid ""
-"  -u, --url=URL       the URL of the psensor-server,\n"
-"                      example: http://hostname:3131"
+#: src/lib/amd.c:254
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
-"  -u, --url=URL       psensor 服务器 URL\n"
-"                      例如：http://hostname:3131"
 
-#: src/main.c:88
-msgid "  -n, --new-instance  force the creation of a new Psensor application"
-msgstr "  -n, --new-instance  强制创建一个新的 Psensor 例程"
+#: src/lib/pgtop2.c:42
+msgid "CPU usage"
+msgstr ""
 
-#: src/main.c:91
-msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
-msgstr "  -d，--debug=LEVEL 设置调试等级，等级为 0 到 3 之间的整数"
+#: src/lib/pgtop2.c:47
+msgid "CPU"
+msgstr ""
 
-#: src/main.c:96 src/server/server.c:121
-#, c-format
-msgid "Report bugs to: %s\n"
-msgstr "报告问题至：%s\n"
+#: src/lib/pgtop2.c:63
+msgid "free memory"
+msgstr ""
 
-#: src/main.c:98 src/server/server.c:123
-#, c-format
-msgid "%s home page: <%s>\n"
-msgstr "%s 主页：<%s>\n"
+#: src/lib/pgtop2.c:64
+msgid "memory"
+msgstr ""
 
-#: src/main.c:390
-msgid "Psensor has not been compiled with remote sensor support."
-msgstr "Psensor 不支持远程传感器。"
+#: src/lib/plog.c:43
+#, c-format
+msgid "Cannot open log file: %s"
+msgstr "无法打开日志文件：%s"
 
-#: src/main.c:460
-msgid "Enables debug mode."
-msgstr "启用调试模式。"
+#: src/lib/pudisks2.c:62 src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "获取时间失败。"
 
-#: src/main.c:472 src/server/server.c:422
+#: src/lib/pudisks2.c:142
 #, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "试用‘%s --help’来获得更多信息。\n"
-
-#: src/main.c:485
-msgid "A Psensor instance already exists."
-msgstr "已存在一个 Psensor 例程。"
+msgid "%s: cannot get the udisks2 client"
+msgstr ""
 
-#: src/main.c:527
-#, fuzzy
-msgid "Failed to create thread for monitoring sensors"
-msgstr "无法创建网络服务器。"
+#: src/lib/pudisks2.c:193 src/lib/pudisks2.c:194 src/lib/hdd_hddtemp.c:125
+#: src/lib/hdd_atasmart.c:70
+msgid "Disk"
+msgstr ""
 
-#: src/rsensor.c:115
+#: src/lib/hdd_hddtemp.c:62
 #, fuzzy, c-format
-msgid "%s: Fail to connect to: %s"
-msgstr "无法连接到：%s"
+msgid "%s: failed to open socket."
+msgstr "硬盘温度：无法打开套接字。"
 
-#: src/rsensor.c:152
+#: src/lib/hdd_hddtemp.c:75
 #, fuzzy, c-format
-msgid "%s: Invalid content: %s"
-msgstr "无效内容：%s"
+msgid "%s: failed to open connection."
+msgstr "硬盘温度：无法打开连接。"
 
-#: src/rsensor.c:192
+#: src/lib/hdd_hddtemp.c:190 src/lib/hdd_hddtemp.c:270
 #, fuzzy, c-format
-msgid "%s: Invalid JSON: %s"
-msgstr "无效 JSON：%s"
+msgid "%s: wrong string: %s."
+msgstr "硬盘温度：错误字符：%s。"
+
+#: src/lib/hdd_atasmart.c:153
+#, c-format
+msgid "%s: sk_disk_open() failure: %s."
+msgstr "%s：sk_disk_open() 失败：%s。"
 
 #: src/server/server.c:58
 msgid "<html><body><p>Server stop requested</p></body></html>"
@@ -821,28 +446,14 @@ msgstr ""
 msgid "Psensor Homepage"
 msgstr "Psensor 主页"
 
-#: src/ui.c:363
+#: src/ui.c:367
 msgid "Failed to load Psensor icon."
 msgstr "无法加载 Psensor 图标。"
 
-#: src/ui_sensorlist.c:259
-msgid "Hide"
+#: src/graph.c:460
+msgid "No graphs enabled"
 msgstr ""
 
-#: src/ui_sensorlist.c:303
-#, fuzzy
-msgid "Select sensor color"
-msgstr "选择前景色"
-
-#: src/ui_appindicator.c:148
-#, fuzzy, c-format
-msgid "Failed to load glade file %s: %s"
-msgstr "无法激活监测器日志。"
-
-#: src/ui_notify.c:48
-msgid "gettimeofday failed."
-msgstr "获取时间失败。"
-
 #: src/ui_notify.c:77
 msgid "Temperature alert"
 msgstr "温度报警"
@@ -852,9 +463,226 @@ msgstr "温度报警"
 msgid "Fan speed alert"
 msgstr "风扇警报"
 
-#: src/ui_sensorpref.c:290 src/ui_sensorpref.c:296 src/ui_sensorpref.c:304
-msgid "Unknown"
-msgstr "未知"
+#: src/rsensor.c:115
+#, fuzzy, c-format
+msgid "%s: Fail to connect to: %s"
+msgstr "无法连接到：%s"
+
+#: src/rsensor.c:152
+#, fuzzy, c-format
+msgid "%s: Invalid content: %s"
+msgstr "无效内容：%s"
+
+#: src/rsensor.c:192
+#, fuzzy, c-format
+msgid "%s: Invalid JSON: %s"
+msgstr "无效 JSON：%s"
+
+#~ msgid "About"
+#~ msgstr "关于"
+
+#~ msgid "Quit"
+#~ msgstr "退出"
+
+#~ msgid "Sensor Preferences"
+#~ msgstr "传感器首选项"
+
+#~ msgid "Psensor - Temperature Monitor"
+#~ msgstr "Psensor - 温度监视器"
+
+#~ msgid "_Psensor"
+#~ msgstr "_Psensor"
+
+#~ msgid "_Help"
+#~ msgstr "帮助(_H)"
+
+#~ msgid "Sensor"
+#~ msgstr "监视设备"
+
+#~ msgid "Value"
+#~ msgstr "值"
+
+#~ msgid "Min"
+#~ msgstr "最小值"
+
+#~ msgid "Max"
+#~ msgstr "最大值"
+
+#~ msgid "Color"
+#~ msgstr "颜色"
+
+#~ msgid "Graph"
+#~ msgstr "图表"
+
+#~ msgid "Show"
+#~ msgstr "显示"
+
+#~ msgid "Left"
+#~ msgstr "左侧"
+
+#~ msgid "Top"
+#~ msgstr "顶部"
+
+#~ msgid "Bottom"
+#~ msgstr "底部"
+
+#~ msgid "Edit Preferences"
+#~ msgstr "编辑首选项"
+
+#~ msgid "Hide window decoration"
+#~ msgstr "隐藏窗口标题栏"
+
+#~ msgid "Keep window below"
+#~ msgstr "保持在最底层"
+
+#~ msgid "Enable menu"
+#~ msgstr "启用菜单"
+
+#~ msgid "Enable Unity Launcher counter"
+#~ msgstr "启用 Unity 启动器计数器"
+
+#~ msgid "Psensor has not been build with Unity Launcher support"
+#~ msgstr "Psensor 未编译 Unity 启动器支持。"
+
+#~ msgid "Celsius"
+#~ msgstr "摄氏"
+
+#~ msgid "Fahrenheit"
+#~ msgstr "华氏"
+
+#~ msgid "Temperature unit:"
+#~ msgstr "温度单位："
+
+#~ msgid "Position of sensors table:"
+#~ msgstr "监视设备列表位置:"
+
+#~ msgid "Interface"
+#~ msgstr "界面"
+
+#~ msgid "Launch on session startup"
+#~ msgstr "会话启动时运行"
+
+#~ msgid "Hide window on startup"
+#~ msgstr "启动时隐藏窗口"
+
+#~ msgid "Restore window position and size"
+#~ msgstr "恢复窗口位置和大小"
+
+#~ msgid "Startup"
+#~ msgstr "启动"
+
+#~ msgid "Foreground:"
+#~ msgstr "前景："
+
+#~ msgid "Background:"
+#~ msgstr "背景:"
+
+#~ msgid "Background opacity:"
+#~ msgstr "背景透明："
+
+#~ msgid "Colors"
+#~ msgstr "颜色"
+
+#~ msgid "Monitoring duration:"
+#~ msgstr "监视持续时长："
+
+#~ msgid "Update interval:"
+#~ msgstr "更新间隔："
+
+#~ msgid "Measures"
+#~ msgstr "测量"
+
+#~ msgid "<i>Min</i>"
+#~ msgstr "<i>最小值</i>"
+
+#~ msgid "<i>Max</i>"
+#~ msgstr "<i>最大值</i>"
+
+#~ msgid "second(s)"
+#~ msgstr "秒"
+
+#~ msgid "minute(s)"
+#~ msgstr "分钟"
+
+#~ msgid "Smooth curves"
+#~ msgstr "平滑曲线"
+
+#~ msgid "Curves"
+#~ msgstr "曲线"
+
+#~ msgid "Measure update interval:"
+#~ msgstr "测量更新间隔："
+
+#~ msgid "Enable sensors logging"
+#~ msgstr "启用监测器记录"
+
+#~ msgid "seconds(s)"
+#~ msgstr "秒"
+
+#~ msgid "Sensors"
+#~ msgstr "传感器"
+
+#~ msgid "Psensor has not been build with NVCtrl support"
+#~ msgstr "Psensor 未编译 NVCtrl 支持。"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with ATI ADL support"
+#~ msgstr "Psensor 不支持远程传感器。"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with gtop2 support"
+#~ msgstr "Psensor 不支持远程传感器。"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with libatasmart support"
+#~ msgstr "Psensor 不支持远程传感器。"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with udisks2 support"
+#~ msgstr "Psensor 不支持远程传感器。"
+
+#~ msgid "Edit Sensor Preferences"
+#~ msgstr "编辑传感器首选项"
+
+#~ msgid "Type:"
+#~ msgstr "类型:"
+
+#~ msgid "Chip:"
+#~ msgstr "芯片："
+
+#~ msgid "Name:"
+#~ msgstr "名称:"
+
+#~ msgid "Id:"
+#~ msgstr "标识:"
+
+#~ msgid "Draw sensor curve"
+#~ msgstr "绘制监视曲线"
+
+#~ msgid "Color:"
+#~ msgstr "颜色："
+
+#~ msgid "Display sensor in the list of sensors"
+#~ msgstr "在传感器列表中显示此传感器"
+
+#~ msgid "Activate desktop notifications"
+#~ msgstr "激活桌面气泡提示"
+
+#~ msgid "High threshold:"
+#~ msgstr "高阈值："
+
+#~ msgid "Low threshold:"
+#~ msgstr "低阈值："
+
+#~ msgid "Alarm"
+#~ msgstr "警告"
+
+#~ msgid "Display sensor in the menu"
+#~ msgstr "在应用指示器菜单中显示监视器"
+
+#, fuzzy
+#~ msgid "Psensor has not been build with AppIndicator support"
+#~ msgstr "Psensor 不支持远程传感器。"
 
 #~ msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 #~ msgstr "lmsensor：lmsensor_psensor_create 失败：错误的功能类型。"
diff --git a/psensor.desktop b/psensor.desktop
index 390e78bb..499a6bb7 100644
--- a/psensor.desktop
+++ b/psensor.desktop
@@ -2,12 +2,14 @@
 Type=Application
 Version=1.0
 Name=Psensor
-GenericName=Psensor
+GenericName=Temperature Monitor
 Comment=Psensor is a graphical temperature monitor for Linux
-Keywords=temperature;fan;monitoring;indicator;
+Keywords=temperature;fan;monitoring;indicator;sensors;hardware;
 Icon=psensor
 TryExec=psensor
 Exec=psensor
+Categories=System;Monitor;Settings;
+StartupNotify=true
 Categories=System;Monitor;
 X-GNOME-Autostart-Delay=30
 StartupNotify=true
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 00000000..9fadeed3
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,125 @@
+# Include directories for compilation
+include_directories(
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/src/lib
+    ${GTK3_INCLUDE_DIRS}
+    ${X11_INCLUDE_DIRS}
+    ${XEXT_INCLUDE_DIRS}
+    ${JSON_INCLUDE_DIRS}
+    ${CURL_INCLUDE_DIRS}
+    ${LIBMICROHTTPD_INCLUDE_DIRS}
+    ${LIBNOTIFY_INCLUDE_DIRS}
+    ${UDISKS2_INCLUDE_DIRS}
+    ${ATASMART_INCLUDE_DIRS}
+    ${APPINDICATOR3_INCLUDE_DIRS}
+)
+
+# Source files
+file(GLOB PSENSOR_SOURCES
+    "${CMAKE_SOURCE_DIR}/src/*.c"
+    "${CMAKE_SOURCE_DIR}/src/lib/*.c"
+)
+
+# Server sources (separate executable)
+file(GLOB SERVER_SOURCES
+    "${CMAKE_SOURCE_DIR}/src/server/*.c"
+    "${CMAKE_SOURCE_DIR}/src/lib/*.c"
+)
+
+# Optional gating of features: these variables are set at top-level
+if(NOT GTOP_INCLUDE_DIRS)
+    list(REMOVE_ITEM PSENSOR_SOURCES "${CMAKE_SOURCE_DIR}/src/lib/pgtop2.c")
+    list(REMOVE_ITEM SERVER_SOURCES "${CMAKE_SOURCE_DIR}/src/lib/pgtop2.c")
+else()
+    include_directories(${GTOP_INCLUDE_DIRS})
+    add_compile_definitions(HAVE_GTOP=1)
+endif()
+
+if(NOT UDISKS2_INCLUDE_DIRS)
+    list(REMOVE_ITEM PSENSOR_SOURCES "${CMAKE_SOURCE_DIR}/src/lib/pudisks2.c")
+    list(REMOVE_ITEM SERVER_SOURCES "${CMAKE_SOURCE_DIR}/src/lib/pudisks2.c")
+else()
+    include_directories(${UDISKS2_INCLUDE_DIRS})
+    add_compile_definitions(HAVE_LIBUDISKS2=1)
+endif()
+
+if(APPINDICATOR3_LIBRARIES)
+    add_compile_definitions(HAVE_APPINDICATOR=1)
+else()
+    list(REMOVE_ITEM PSENSOR_SOURCES "${CMAKE_SOURCE_DIR}/src/ui_appindicator.c")
+    list(REMOVE_ITEM SERVER_SOURCES "${CMAKE_SOURCE_DIR}/src/ui_appindicator.c")
+endif()
+
+if(UNITY_LIBRARIES)
+    add_compile_definitions(HAVE_UNITY=1)
+else()
+    list(REMOVE_ITEM PSENSOR_SOURCES "${CMAKE_SOURCE_DIR}/src/ui_unity.c")
+    list(REMOVE_ITEM SERVER_SOURCES "${CMAKE_SOURCE_DIR}/src/ui_unity.c")
+endif()
+
+# ATI/ADL optional
+find_path(LIBATIADL_INCLUDE adl_sdk.h PATHS /usr/include /usr/local/include)
+find_library(LIBATIADL_LIB atiadlxx)
+find_library(LIB_RT rt)
+if(LIBATIADL_INCLUDE AND LIBATIADL_LIB)
+    add_definitions(-DHAVE_LIBATIADL)
+    include_directories(${LIBATIADL_INCLUDE})
+    set(PSENSOR_EXTRA_LIBS ${LIBATIADL_LIB})
+else()
+    list(REMOVE_ITEM PSENSOR_SOURCES "${CMAKE_SOURCE_DIR}/src/lib/amd.c")
+    list(REMOVE_ITEM SERVER_SOURCES "${CMAKE_SOURCE_DIR}/src/lib/amd.c")
+endif()
+
+# Build GUI executable
+add_executable(psensor ${PSENSOR_SOURCES})
+
+target_link_libraries(psensor
+    ${GTK3_LIBRARIES}
+    ${X11_LIBRARIES}
+    ${XEXT_LIBRARIES}
+    ${JSON_LIBRARIES}
+    ${CURL_LIBRARIES}
+    ${LIBMICROHTTPD_LIBRARIES}
+    ${LIBNOTIFY_LIBRARIES}
+    ${UDISKS2_LIBRARIES}
+    ${ATASMART_LIBRARIES}
+    ${APPINDICATOR3_LIBRARIES}
+    ${PSENSOR_EXTRA_LIBS}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${LIB_RT}
+    m
+)
+
+# Build server executable
+add_executable(psensor-server ${SERVER_SOURCES})
+
+target_link_libraries(psensor-server
+    ${GTK3_LIBRARIES}
+    ${X11_LIBRARIES}
+    ${XEXT_LIBRARIES}
+    ${JSON_LIBRARIES}
+    ${CURL_LIBRARIES}
+    ${LIBMICROHTTPD_LIBRARIES}
+    ${LIBNOTIFY_LIBRARIES}
+    ${UDISKS2_LIBRARIES}
+    ${ATASMART_LIBRARIES}
+    ${APPINDICATOR3_LIBRARIES}
+    ${GTOP_LIBRARIES}
+    ${SENSORS_LIB}
+    ${PSENSOR_EXTRA_LIBS}
+    ${CMAKE_THREAD_LIBS_INIT}
+    m
+)
+
+if(SENSORS_LIB)
+    target_link_libraries(psensor ${SENSORS_LIB})
+endif()
+
+if(GTOP_FOUND)
+    target_link_libraries(psensor ${GTOP_LIBRARIES})
+endif()
+
+if(WITH_NVIDIA AND NVIDIA_LIB)
+    target_link_libraries(psensor ${NVIDIA_LIB})
+endif()
diff --git a/src/Makefile.am b/src/Makefile.am
index 8779d9e8..22929fec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,6 +115,7 @@ gsettings_SCHEMAS=psensor.gschema.xml
 
 EXTRA_DIST = description.txt\
 	$(gsettings_SCHEMAS)\
+	paths.h.in\
 	rsensor.c\
 	ui_appindicator.c\
 	ui_notify.c\
diff --git a/src/Makefile.in b/src/Makefile.in
index 88177dcd..f84ffaf5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -113,13 +112,17 @@ host_triplet = @host@
 @CURL_TRUE@@JSON_TRUE@am__append_22 = $(CURL_CFLAGS) $(JSON_CFLAGS)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = paths.h
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -156,7 +159,15 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/cfg.Po ./$(DEPDIR)/graph.Po \
+	./$(DEPDIR)/main.Po ./$(DEPDIR)/notify_cmd.Po \
+	./$(DEPDIR)/pxdg.Po ./$(DEPDIR)/rsensor.Po ./$(DEPDIR)/ui.Po \
+	./$(DEPDIR)/ui_appindicator.Po ./$(DEPDIR)/ui_color.Po \
+	./$(DEPDIR)/ui_graph.Po ./$(DEPDIR)/ui_notify.Po \
+	./$(DEPDIR)/ui_pref.Po ./$(DEPDIR)/ui_sensorlist.Po \
+	./$(DEPDIR)/ui_sensorpref.Po ./$(DEPDIR)/ui_status.Po \
+	./$(DEPDIR)/ui_unity.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -222,7 +233,7 @@ am__recursive_targets = \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@@ -240,11 +251,9 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 DIST_SUBDIRS = lib glade server
 am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
+	$(srcdir)/paths.h.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -271,6 +280,7 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -289,6 +299,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -297,13 +309,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -361,7 +371,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -376,7 +385,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -454,6 +462,7 @@ AM_CPPFLAGS = -Wall -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
 gsettings_SCHEMAS = psensor.gschema.xml
 EXTRA_DIST = description.txt\
 	$(gsettings_SCHEMAS)\
+	paths.h.in\
 	rsensor.c\
 	ui_appindicator.c\
 	ui_notify.c\
@@ -480,8 +489,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -492,6 +501,8 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+paths.h: $(top_builddir)/config.status $(srcdir)/paths.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -545,22 +556,28 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify_cmd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pxdg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rsensor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_appindicator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_color.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_graph.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_notify.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_pref.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_sensorlist.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_sensorpref.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_status.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_unity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notify_cmd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pxdg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rsensor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_appindicator.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_color.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_graph.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_notify.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_pref.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_sensorlist.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_sensorpref.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_status.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_unity.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -717,8 +734,10 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -816,7 +835,22 @@ clean: clean-recursive
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/cfg.Po
+	-rm -f ./$(DEPDIR)/graph.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/notify_cmd.Po
+	-rm -f ./$(DEPDIR)/pxdg.Po
+	-rm -f ./$(DEPDIR)/rsensor.Po
+	-rm -f ./$(DEPDIR)/ui.Po
+	-rm -f ./$(DEPDIR)/ui_appindicator.Po
+	-rm -f ./$(DEPDIR)/ui_color.Po
+	-rm -f ./$(DEPDIR)/ui_graph.Po
+	-rm -f ./$(DEPDIR)/ui_notify.Po
+	-rm -f ./$(DEPDIR)/ui_pref.Po
+	-rm -f ./$(DEPDIR)/ui_sensorlist.Po
+	-rm -f ./$(DEPDIR)/ui_sensorpref.Po
+	-rm -f ./$(DEPDIR)/ui_status.Po
+	-rm -f ./$(DEPDIR)/ui_unity.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -862,7 +896,22 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/cfg.Po
+	-rm -f ./$(DEPDIR)/graph.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/notify_cmd.Po
+	-rm -f ./$(DEPDIR)/pxdg.Po
+	-rm -f ./$(DEPDIR)/rsensor.Po
+	-rm -f ./$(DEPDIR)/ui.Po
+	-rm -f ./$(DEPDIR)/ui_appindicator.Po
+	-rm -f ./$(DEPDIR)/ui_color.Po
+	-rm -f ./$(DEPDIR)/ui_graph.Po
+	-rm -f ./$(DEPDIR)/ui_notify.Po
+	-rm -f ./$(DEPDIR)/ui_pref.Po
+	-rm -f ./$(DEPDIR)/ui_sensorlist.Po
+	-rm -f ./$(DEPDIR)/ui_sensorpref.Po
+	-rm -f ./$(DEPDIR)/ui_status.Po
+	-rm -f ./$(DEPDIR)/ui_unity.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -884,20 +933,21 @@ uninstall-man: uninstall-man1
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-binPROGRAMS clean-generic cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-man uninstall-man1
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-am clean clean-binPROGRAMS \
+	clean-generic cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-man \
+	uninstall-man1
 
 .PRECIOUS: Makefile
 
diff --git a/src/cfg.c b/src/cfg.c
index d94f256a..b4f0678e 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -31,7 +31,7 @@
 
 #include <cfg.h>
 #include <graph.h>
-#include <pio.h>
+#include <io.h>
 #include <plog.h>
 
 /* Properties of each sensor */
@@ -94,8 +94,11 @@ static const char *KEY_INTERFACE_WINDOW_Y = "interface-window-y";
 static const char *KEY_INTERFACE_WINDOW_W = "interface-window-w";
 static const char *KEY_INTERFACE_WINDOW_H = "interface-window-h";
 
-static const char *KEY_INTERFACE_WINDOW_DIVIDER_POS
-= "interface-window-divider-pos";
+static const char *KEY_INTERFACE_WINDOW_VERTICAL_DIVIDER_POS
+= "interface-window-vertical-divider-pos";
+
+static const char *KEY_INTERFACE_WINDOW_HORIZONTAL_DIVIDER_POS
+= "interface-window-horizontal-divider-pos";
 
 static const char *KEY_INTERFACE_TEMPERATURE_UNIT
 = "interface-temperature-unit";
@@ -174,6 +177,11 @@ static int get_int(const char *k)
 	return g_settings_get_int(settings, k);
 }
 
+static unsigned int get_uint(const char *k)
+{
+	return g_settings_get_uint(settings, k);
+}
+
 char *config_get_notif_script(void)
 {
 	char *str;
@@ -303,7 +311,7 @@ static void slog_enabled_changed_cbk(GSettings *settings,
 
 void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data)
 {
-	log_fct_enter();
+	log_functionname_enter();
 
 	slog_enabled_cbk = cbk;
 
@@ -312,7 +320,7 @@ void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data)
 			       G_CALLBACK(slog_enabled_changed_cbk),
 			       data);
 
-	log_fct_exit();
+	log_functionname_exit();
 }
 
 int config_get_slog_interval(void)
@@ -370,12 +378,12 @@ static bool config_get_default_sensor_alarm_enabled(void)
 
 static void init(void)
 {
-	log_fct_enter();
+	log_functionname_enter();
 
 	if (!settings)
 		settings = g_settings_new("psensor");
 
-	log_fct_exit();
+	log_functionname_exit();
 }
 
 void config_cleanup(void)
@@ -435,6 +443,7 @@ struct config *config_load(void)
 	if (c->graph_monitoring_duration < 1)
 		c->graph_monitoring_duration = 10;
 
+	c->hide_on_startup = get_bool(KEY_INTERFACE_HIDE_ON_STARTUP);
 	c->window_restore_enabled
 		= get_bool(KEY_INTERFACE_WINDOW_RESTORE_ENABLED);
 
@@ -443,8 +452,12 @@ struct config *config_load(void)
 	c->window_w = get_int(KEY_INTERFACE_WINDOW_W);
 	c->window_h = get_int(KEY_INTERFACE_WINDOW_H);
 
-	c->window_divider_pos = get_int(KEY_INTERFACE_WINDOW_DIVIDER_POS);
-
+	c->window_vertical_divider_pos = get_int(KEY_INTERFACE_WINDOW_VERTICAL_DIVIDER_POS);
+	c->window_horizontal_divider_pos = get_int(KEY_INTERFACE_WINDOW_HORIZONTAL_DIVIDER_POS);
+	// printf("load pos=%s vert=%d hori=%d \n", 
+	// 	config_get_sensorlist_position_str(config_get_sensorlist_position()),
+	// 	c->window_vertical_divider_pos,
+	// 	c->window_horizontal_divider_pos);
 	if (!c->window_restore_enabled || !c->window_w || !c->window_h) {
 		c->window_w = 800;
 		c->window_h = 200;
@@ -455,7 +468,7 @@ struct config *config_load(void)
 	return c;
 }
 
-void config_save(const struct config *c)
+void config_save_to_g_file(const struct config *c)
 {
 	set_alpha_channeld_enabled(c->alpha_channel_enabled);
 	set_background_color(c->graph_bgcolor);
@@ -479,15 +492,20 @@ void config_save(const struct config *c)
 	set_int(KEY_INTERFACE_WINDOW_Y, c->window_y);
 	set_int(KEY_INTERFACE_WINDOW_W, c->window_w);
 	set_int(KEY_INTERFACE_WINDOW_H, c->window_h);
-
-	set_int(KEY_INTERFACE_WINDOW_DIVIDER_POS, c->window_divider_pos);
+	
+	// printf("save pos=%s vert=%d hori=%d \n", 
+	// 	config_get_sensorlist_position_str(config_get_sensorlist_position()),
+	// 	c->window_vertical_divider_pos,
+	// 	c->window_horizontal_divider_pos);
+	set_int(KEY_INTERFACE_WINDOW_VERTICAL_DIVIDER_POS, c->window_vertical_divider_pos);
+	set_int(KEY_INTERFACE_WINDOW_HORIZONTAL_DIVIDER_POS, c->window_horizontal_divider_pos);
 }
 
 const char *get_psensor_user_dir(void)
 {
 	const char *home;
 
-	log_fct_enter();
+	log_functionname_enter();
 
 	if (!user_dir) {
 		home = getenv("HOME");
@@ -507,7 +525,7 @@ const char *get_psensor_user_dir(void)
 		}
 	}
 
-	log_fct_exit();
+	log_functionname_exit();
 
 	return user_dir;
 }
@@ -528,7 +546,7 @@ static const char *get_sensor_config_path(void)
 
 static GKeyFile *get_sensor_key_file(void)
 {
-	int ret;
+	
 	GError *err;
 	const char *path;
 
@@ -538,7 +556,7 @@ static GKeyFile *get_sensor_key_file(void)
 		key_file = g_key_file_new();
 
 		err = NULL;
-		ret = g_key_file_load_from_file(key_file,
+		int ret = g_key_file_load_from_file(key_file,
 						path,
 						G_KEY_FILE_KEEP_COMMENTS
 						| G_KEY_FILE_KEEP_TRANSLATIONS,
@@ -561,7 +579,7 @@ static void save_sensor_key_file(void)
 	const char *path;
 	char *data;
 
-	log_fct_enter();
+	log_functionname_enter();
 
 	kfile = get_sensor_key_file();
 
@@ -574,16 +592,16 @@ static void save_sensor_key_file(void)
 
 	free(data);
 
-	log_fct_exit();
+	log_functionname_exit();
 }
 
 void config_sync(void)
 {
-	log_fct_enter();
+	log_functionname_enter();
 	if (settings)
 		g_settings_sync();
 	save_sensor_key_file();
-	log_fct_exit();
+	log_functionname_exit();
 }
 
 static void sensor_set_str(const char *sid, const char *att, const char *str)
@@ -743,7 +761,7 @@ GdkRGBA *config_get_sensor_color(const char *sid)
 {
 	GdkRGBA rgba;
 	char *str;
-	gboolean ret;
+	gboolean ret = FALSE;
 
 	str = sensor_get_str(sid, ATT_SENSOR_COLOR);
 
@@ -952,3 +970,21 @@ void config_set_count_visible(bool visible)
 {
 	set_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED, !visible);
 }
+
+const char *config_get_sensorlist_position_str(enum sensorlist_position pos)
+{
+	switch (pos)
+	{
+	case SENSORLIST_POSITION_RIGHT:
+		return "right";
+	case SENSORLIST_POSITION_LEFT:
+		return "left";
+	case SENSORLIST_POSITION_TOP:
+		return "top";
+	case SENSORLIST_POSITION_BOTTOM:
+		return "bottom";
+	default:
+		return "don't know";
+	}
+	
+}
diff --git a/src/cfg.h b/src/cfg.h
index 524e5139..867132fc 100644
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_CONFIG_H_
-#define _PSENSOR_CONFIG_H_
+#ifndef PSENSOR_CONFIG_H
+#define PSENSOR_CONFIG_H
 
 #include <gdk/gdk.h>
 
@@ -35,16 +35,11 @@ enum sensorlist_position {
 	SENSORLIST_POSITION_TOP,
 	SENSORLIST_POSITION_BOTTOM
 };
+const char *config_get_sensorlist_position_str(enum sensorlist_position pos);
 
 struct config {
 	struct color *graph_bgcolor;
 	struct color *graph_fgcolor;
-
-	double graph_bg_alpha;
-
-	bool alpha_channel_enabled;
-
-	bool window_restore_enabled;
 	/* Last saved position of the window. */
 	int window_x;
 	int window_y;
@@ -52,24 +47,24 @@ struct config {
 	int window_w;
 	int window_h;
 	/* Last saved position of the window divider. */
-	int window_divider_pos;
-
+	int window_vertical_divider_pos;
+	int window_horizontal_divider_pos;
+	int hide_on_startup;
 	int graph_update_interval;
 	int graph_monitoring_duration;
-
-	int sensor_values_max_length;
+	unsigned int sensor_values_max_length;
 	int sensor_update_interval;
-
-	int hide_on_startup;
-
-	bool slog_enabled;
 	int slog_interval;
+	double graph_bg_alpha;
+	bool alpha_channel_enabled;
+	bool window_restore_enabled;
+	bool slog_enabled;
 };
 
 /* Loads psensor configuration */
 struct config *config_load(void);
 
-void config_save(const struct config *);
+void config_save_to_g_file(const struct config *);
 
 void config_cleanup(void);
 
diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in
index 385178e5..2e115a43 100644
--- a/src/glade/Makefile.in
+++ b/src/glade/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = src/glade
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(glade_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -334,8 +336,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -373,8 +375,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
diff --git a/src/glade/psensor-pref.glade b/src/glade/psensor-pref.glade
index 903776dd..92c0f1c8 100644
--- a/src/glade/psensor-pref.glade
+++ b/src/glade/psensor-pref.glade
@@ -661,7 +661,7 @@
                         <property name="margin_top">4</property>
                         <property name="margin_bottom">4</property>
                         <property name="invisible_char">•</property>
-                        <property name="width_chars">4</property>
+                        <property name="width_chars">8</property>
                         <property name="xalign">1</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
diff --git a/src/glade/psensor.glade b/src/glade/psensor.glade
index dbee7ef9..875cd9df 100644
--- a/src/glade/psensor.glade
+++ b/src/glade/psensor.glade
@@ -208,6 +208,7 @@
                 <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkTreeView" id="sensors_tree">
+                    <property name="width-request">10</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="halign">start</property>
diff --git a/src/graph.c b/src/graph.c
index 71090aa4..41402a0b 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -83,7 +83,7 @@ static struct psensor **list_filter_graph_enabled(struct psensor **sensors)
 		return NULL;
 
 	n = psensor_list_size(sensors);
-	result = malloc((n+1) * sizeof(struct psensor *));
+	result = (struct psensor **)malloc((n+1) * sizeof(struct psensor *));
 
 	for (cur = sensors, i = 0; *cur; cur++) {
 		s = *cur;
@@ -110,7 +110,7 @@ static time_t get_graph_end_time_s(struct psensor **sensors)
 	int i, n;
 
 	ret = 0;
-	while (*sensors) {
+	while (sensors && *sensors) {
 		s = *sensors;
 		measures = s->measures;
 
@@ -120,7 +120,7 @@ static time_t get_graph_end_time_s(struct psensor **sensors)
 			n = 0;
 
 		for (i = s->values_max_length - 1; i >= 0; i--) {
-			if (measures[i].value != UNKNOWN_DBL_VALUE) {
+			if (measures[i].value != UNKNOWN_DOUBLE_VALUE) {
 				if (!n) {
 					t = measures[i].time.tv_sec;
 
@@ -146,7 +146,7 @@ static time_t get_graph_begin_time_s(struct config *cfg, time_t etime)
 	if (!etime)
 		return 0;
 
-	return etime - cfg->graph_monitoring_duration * 60;
+	return etime - ((time_t)cfg->graph_monitoring_duration * (time_t)60);
 }
 
 static double
@@ -299,8 +299,165 @@ static void draw_background_lines(cairo_t *cr,
  * measure which has been used as the start point of a Bezier curve.
  */
 static GHashTable *times;
+static GHashTable *measure_times;
+/* search the index of the first measure used as a start point
+ * of a Bezier curve. The start and end points of the Bezier
+ * curves must be preserved to ensure the same overall shape
+ * of the graph.
+ */
+static unsigned int find_first_measured_index(struct psensor *sensor,
+	unsigned int measure_index,
+	time_t *stimes)
+{
+	int found;
+	while (measure_index < sensor->values_max_length) {
+			time_t t = sensor->measures[measure_index].time.tv_sec;
+			double v = sensor->measures[measure_index].value;
+
+			found = 0;
+			if (v != UNKNOWN_DOUBLE_VALUE && t) {
+				int time_index = 0;
+				while (stimes[time_index]) {
+					if (t == stimes[time_index]) {
+						found = 1;
+						break;
+					}
+					time_index++;
+				}
+			}
+
+			if (found)
+				break;
+
+			measure_index++;
+	}
+	return measure_index;
+}
+
+static void draw_sensor_smooth_curve(struct psensor *sensor,
+				     cairo_t *cr,
+				     double min,
+				     double max,
+				     time_t begin_time,
+				     int end_time,
+				     struct graph_info *info)
+{
+	time_t dt, vdt;
+	int k;
+	double x[4], y[4];
+	time_t t0, *sensor_times;
+	GdkRGBA *color;
+
+	if (!measure_times)
+		measure_times = g_hash_table_new_full(g_str_hash,
+					      g_str_equal,
+					      free,
+					      free);
+
+	sensor_times = g_hash_table_lookup(measure_times, sensor->id);
+
+	color = config_get_sensor_color(sensor->id);
+
+	cairo_set_source_rgb(cr,
+			     color->red,
+			     color->green,
+			     color->blue);
+	gdk_rgba_free(color);
+
+	/* search the index of the first measure used as a start point
+	 * of a Bezier curve. The start and end points of the Bezier
+	 * curves must be preserved to ensure the same overall shape
+	 * of the graph.
+	 */
+	unsigned int i = 0;
+	if (sensor_times) {
+		i = find_first_measured_index(sensor, i, sensor_times);
+	}
+
+	sensor_times = calloc((sensor->values_max_length + 1),  sizeof(time_t));
+	g_hash_table_insert(measure_times, strdup(sensor->id), sensor_times);
+
+	if (i == sensor->values_max_length)
+		i = 0;
+
+	k = 0;
+	dt = end_time - begin_time;
+	
+	/* Main loop: process all sensor measurements */
+	while (i < sensor->values_max_length) {
+		int bezier_point_index = 0;
+		time_t t = 0;
+		
+		/* SECOND WHILE LOOP EXPLANATION:
+		 * This inner loop collects 4 consecutive valid data points to form a Bezier curve segment.
+		 * - i: current index in sensor measurements array
+		 * - bezier_point_index: counter for valid points collected (0-3 for 4 points needed per Bezier curve)
+		 * 
+		 * Conditions:
+		 * - i < sensor->values_max_length: prevent array overflow
+		 * - bezier_point_index < 4: collect exactly 4 points for one Bezier cubic curve
+		 * 
+		 * Each Bezier cubic curve requires:
+		 * - Point 0: start point
+		 * - Point 1: first control point  
+		 * - Point 2: second control point
+		 * - Point 3: end point
+		 */
+		while (i < sensor->values_max_length && bezier_point_index < 4) {
+			/* Get current measurement time and value */
+			t = sensor->measures[i].time.tv_sec;
+			double v = sensor->measures[i].value;
+
+			/* Skip invalid measurements (unknown value or zero timestamp) */
+			if (v == UNKNOWN_DOUBLE_VALUE || !t) {
+				i++;
+				continue;
+			}
+
+			/* Calculate relative time position within graph bounds */
+			vdt = t - begin_time;
+
+			/* Convert to graph coordinates:
+			 * x-coordinate: map time to horizontal position
+			 * y-coordinate: map sensor value to vertical position
+			 */
+			x[0 + bezier_point_index] = ((double)vdt * info->g_width) / dt + info->g_xoff;
+			y[0 + bezier_point_index] = compute_y(v, min, max, info->g_height, info->g_yoff);
+
+			/* Store the timestamp of the first point for curve continuity */
+			if (bezier_point_index == 0)
+				t0 = t;
+
+			/* Move to next measurement and increment point counter */
+			i++;
+			bezier_point_index++;
+		}
+
+		/* If we successfully collected 4 points, draw the Bezier curve */
+		if (bezier_point_index == 4) {
+			/* Move to start point */
+			cairo_move_to(cr, x[0], y[0]);
+			/* Draw cubic Bezier curve: 
+			 * (x0,y0) = start point
+			 * (x1,y1) = first control point
+			 * (x2,y2) = second control point  
+			 * (x3,y3) = end point
+			 */
+			cairo_curve_to(cr, x[1], y[1], x[2], y[3], x[3], y[3]);
+			
+			/* Store start time of this curve segment for future reference */
+			sensor_times[k++] = t0;
+			
+			/* Decrement i to make the end point of current curve 
+			 * potentially become the start point of next curve */
+			i--;
+		}
+	}
 
-static void draw_sensor_smooth_curve(struct psensor *s,
+	cairo_stroke(cr);
+}
+#if 0
+static void draw_sensor_smooth_curve1(struct psensor *s,
 				     cairo_t *cr,
 				     double min,
 				     double max,
@@ -341,7 +498,7 @@ static void draw_sensor_smooth_curve(struct psensor *s,
 			v = s->measures[i].value;
 
 			found = 0;
-			if (v != UNKNOWN_DBL_VALUE && t) {
+			if (v != UNKNOWN_DOUBLE_VALUE && t) {
 				k = 0;
 				while (stimes[k]) {
 					if (t == stimes[k]) {
@@ -375,7 +532,7 @@ static void draw_sensor_smooth_curve(struct psensor *s,
 			t = s->measures[i].time.tv_sec;
 			v = s->measures[i].value;
 
-			if (v == UNKNOWN_DBL_VALUE || !t) {
+			if (v == UNKNOWN_DOUBLE_VALUE || !t) {
 				i++;
 				continue;
 			}
@@ -407,7 +564,7 @@ static void draw_sensor_smooth_curve(struct psensor *s,
 
 	cairo_stroke(cr);
 }
-
+#endif
 static void draw_sensor_curve(struct psensor *s,
 			      cairo_t *cr,
 			      double min,
@@ -433,7 +590,7 @@ static void draw_sensor_curve(struct psensor *s,
 		t = s->measures[i].time.tv_sec;
 		v = s->measures[i].value;
 
-		if (v == UNKNOWN_DBL_VALUE || !t)
+		if (v == UNKNOWN_DOUBLE_VALUE || !t)
 			continue;
 
 		vdt = t - bt;
@@ -471,17 +628,50 @@ static void display_no_graphs_warning(cairo_t *cr, int x, int y)
 	free(msg);
 }
 
+// static cairo_surface_t *cst = NULL;
+// static cairo_t *cr = NULL;
+// static cairo_t *cr_pixmap = NULL;
+// static cairo_font_face_t *cached_font = NULL;
+// void graph_init(int width, int height, GtkWidget *w_graph)
+// {
+// 	if (cst == NULL) {
+// 		cst = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
+// 		cr = cairo_create(cst);
+// 		cached_font = cairo_toy_font_face_create("sans-serif",
+//                         CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+// 		// cairo_select_font_face(cr,
+// 		// 			"sans-serif",
+// 		// 			CAIRO_FONT_SLANT_NORMAL,
+// 		// 			CAIRO_FONT_WEIGHT_NORMAL);
+// 		cairo_set_font_face(cr, cached_font);
+// 		cairo_set_font_size(cr, 10.0);
+// 		cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph));
+// 	}
+// }
+void graph_cleanup()
+{
+	// if (cst) {
+	// 	cairo_destroy(cr_pixmap);
+	// 	cairo_destroy(cr);
+	// 	cairo_surface_destroy(cst);
+	// 	cairo_font_face_destroy(cached_font);
+	// }
+	if (times) {
+        g_hash_table_destroy(times);
+        times = NULL;
+    }
+}
 void
 graph_update(struct psensor **sensors,
 	     GtkWidget *w_graph,
 	     struct config *config,
 	     GtkWidget *window)
 {
-	int et, bt, width, height, g_width, g_height;
+	int et, width, height, g_width, g_height;
 	double min_rpm, max_rpm, mint, maxt, min, max;
 	char *strmin, *strmax;
 	/* horizontal and vertical offset of the graph */
-	int g_xoff, g_yoff, no_graphs, use_celsius;
+	int g_xoff, g_yoff, no_graphs;
 	cairo_surface_t *cst;
 	cairo_t *cr, *cr_pixmap;
 	char *str_btime, *str_etime;
@@ -501,10 +691,11 @@ graph_update(struct psensor **sensors,
 	min_rpm = get_min_rpm(enabled_sensors);
 	max_rpm = get_max_rpm(enabled_sensors);
 
+	unsigned int use_celsius;
 	if (config_get_temperature_unit() == CELSIUS)
-		use_celsius = 1;
+		use_celsius = 1U;
 	else
-		use_celsius = 0;
+		use_celsius = 0U;
 
 	mint = get_min_temp(enabled_sensors);
 	strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, mint, use_celsius);
@@ -513,9 +704,9 @@ graph_update(struct psensor **sensors,
 	strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, maxt, use_celsius);
 
 	et = get_graph_end_time_s(enabled_sensors);
-	bt = get_graph_begin_time_s(config, et);
+	time_t begin_time = get_graph_begin_time_s(config, et);
 
-	str_btime = time_to_str(bt);
+	str_btime = time_to_str(begin_time);
 	str_etime = time_to_str(et);
 
 	gtk_widget_get_allocation(w_graph, &galloc);
@@ -524,10 +715,8 @@ graph_update(struct psensor **sensors,
 	height = galloc.height;
 	info.height = height;
 
-
 	cst = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
 	cr = cairo_create(cst);
-
 	cairo_select_font_face(cr,
 			       "sans-serif",
 			       CAIRO_FONT_SLANT_NORMAL,
@@ -583,7 +772,7 @@ graph_update(struct psensor **sensors,
 	draw_background_lines(cr, mint, maxt, config, &info);
 
 	/* .. and finaly draws the temperature graphs */
-	if (bt && et) {
+	if (begin_time && et) {
 		sensor_cur = enabled_sensors;
 
 		cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
@@ -608,12 +797,12 @@ graph_update(struct psensor **sensors,
 			if (is_smooth_curves_enabled)
 				draw_sensor_smooth_curve(s, cr,
 							 min, max,
-							 bt, et,
+							 begin_time, et,
 							 &info);
 			else
 				draw_sensor_curve(s, cr,
 						  min, max,
-						  bt, et,
+						  begin_time, et,
 						  &info);
 
 			sensor_cur++;
@@ -638,13 +827,18 @@ graph_update(struct psensor **sensors,
 	cairo_show_text(cr, strmax);
 	free(strmax);
 
-	cairo_move_to(cr,
-		      GRAPH_H_PADDING, height - (te_min.height / 2) - g_yoff);
+	cairo_move_to(cr, GRAPH_H_PADDING, height - (te_min.height / 2) - g_yoff);
 	cairo_show_text(cr, strmin);
 	free(strmin);
 
-	cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph));
-
+	// cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph));
+    GdkWindow *graph_window = gtk_widget_get_window(w_graph);
+    // Sử dụng phương pháp mới
+    GdkDrawingContext *drawing_context;
+    cairo_region_t *region = cairo_region_create();
+    
+    drawing_context = gdk_window_begin_draw_frame(graph_window, region);
+    cr_pixmap = gdk_drawing_context_get_cairo_context(drawing_context);
 	if (cr_pixmap) {
 		if (config->alpha_channel_enabled)
 			cairo_set_operator(cr_pixmap, CAIRO_OPERATOR_SOURCE);
@@ -652,22 +846,41 @@ graph_update(struct psensor **sensors,
 		cairo_set_source_surface(cr_pixmap, cst, 0, 0);
 		cairo_paint(cr_pixmap);
 	}
+	// Kết thúc
+    gdk_window_end_draw_frame(graph_window, drawing_context);
+    cairo_region_destroy(region);
 
-	free(enabled_sensors);
-
-	cairo_destroy(cr_pixmap);
-	cairo_surface_destroy(cst);
+//	cairo_destroy(cr_pixmap);
 	cairo_destroy(cr);
+	cairo_surface_destroy(cst);
+
+	free(enabled_sensors);
 }
 
-int compute_values_max_length(struct config *c)
-{
-	int n, duration, interval;
+// unsigned int compute_values_max_length(struct config *c)
+// {
+// 	int n, duration, interval;
 
-	duration = c->graph_monitoring_duration * 60;
-	interval = c->sensor_update_interval;
+// 	duration = c->graph_monitoring_duration * 60;
+// 	interval = c->sensor_update_interval;
 
-	n = 3 + ceil((((double)duration) / interval) + 0.5) + 3;
+// 	n = 3 + ceil((((double)duration) / interval) + 0.5) + 3;
 
-	return n;
-}
+// 	return n;
+// }
+unsigned int compute_values_max_length(struct config *c)
+{
+    unsigned int duration, interval, n;
+    
+    if (!c || c->sensor_update_interval == 0) {
+        return 10;
+    }
+    
+    duration = c->graph_monitoring_duration * 60;
+    interval = c->sensor_update_interval;
+    
+    // Làm tròn lên: (duration + interval/2) / interval
+    n = 6 + (duration + interval / 2) / interval;
+    
+    return n;
+}
\ No newline at end of file
diff --git a/src/graph.h b/src/graph.h
index 236b4ea0..61a99e61 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_GRAPH_H_
-#define _PSENSOR_GRAPH_H_
+#ifndef PSENSOR_GRAPH_H
+#define PSENSOR_GRAPH_H
 
 #include <gtk/gtk.h>
 
@@ -32,6 +32,6 @@ void graph_update(struct psensor **sensors,
 		  GtkWidget *window);
 
 /* Compute the number of measures which must be kept. */
-int compute_values_max_length(struct config *);
+unsigned int compute_values_max_length(struct config *);
 
 #endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 6c4dd7c2..723415b3 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -14,7 +14,7 @@ libpsensor_a_SOURCES = \
 	pmutex.h pmutex.c\
 	psensor.h psensor.c\
 	ptime.h ptime.c\
-	pio.h pio.c\
+	io.h io.c\
 	pudisks2.h\
 	slog.c slog.h\
 	temperature.c temperature.h\
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 7f292935..5e6b1661 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -108,7 +107,11 @@ host_triplet = @host@
 @LIBUDISKS2_TRUE@am__append_18 = $(LIBUDISKS2_CFLAGS)
 subdir = src/lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -127,7 +130,7 @@ libpsensor_a_LIBADD =
 am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c hdd.h \
 	hdd_hddtemp.c lmsensor.h measure.h measure.c nvidia.h parray.h \
 	pgtop2.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
-	ptime.h ptime.c pio.h pio.c pudisks2.h slog.c slog.h \
+	ptime.h ptime.c io.h io.c pudisks2.h slog.c slog.h \
 	temperature.c temperature.h url.c url.h lmsensor.c \
 	hdd_atasmart.c nvidia.c amd.c pgtop2.c psensor_json.h \
 	psensor_json.c pudisks2.c
@@ -140,7 +143,7 @@ am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c hdd.h \
 @LIBUDISKS2_TRUE@am__objects_7 = pudisks2.$(OBJEXT)
 am_libpsensor_a_OBJECTS = color.$(OBJEXT) hdd_hddtemp.$(OBJEXT) \
 	measure.$(OBJEXT) plog.$(OBJEXT) pmutex.$(OBJEXT) \
-	psensor.$(OBJEXT) ptime.$(OBJEXT) pio.$(OBJEXT) slog.$(OBJEXT) \
+	psensor.$(OBJEXT) ptime.$(OBJEXT) io.$(OBJEXT) slog.$(OBJEXT) \
 	temperature.$(OBJEXT) url.$(OBJEXT) $(am__objects_1) \
 	$(am__objects_2) $(am__objects_3) $(am__objects_4) \
 	$(am__objects_5) $(am__objects_6) $(am__objects_7)
@@ -159,7 +162,16 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/amd.Po ./$(DEPDIR)/color.Po \
+	./$(DEPDIR)/hdd_atasmart.Po ./$(DEPDIR)/hdd_hddtemp.Po \
+	./$(DEPDIR)/io.Po ./$(DEPDIR)/lmsensor.Po \
+	./$(DEPDIR)/measure.Po ./$(DEPDIR)/nvidia.Po \
+	./$(DEPDIR)/pgtop2.Po ./$(DEPDIR)/plog.Po \
+	./$(DEPDIR)/pmutex.Po ./$(DEPDIR)/psensor.Po \
+	./$(DEPDIR)/psensor_json.Po ./$(DEPDIR)/ptime.Po \
+	./$(DEPDIR)/pudisks2.Po ./$(DEPDIR)/slog.Po \
+	./$(DEPDIR)/temperature.Po ./$(DEPDIR)/url.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -197,10 +209,9 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -219,6 +230,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -227,13 +240,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -289,7 +300,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -304,7 +314,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -363,7 +372,7 @@ noinst_LIBRARIES = libpsensor.a
 libpsensor_a_SOURCES = amd.h bool.h color.h color.c hdd.h \
 	hdd_hddtemp.c lmsensor.h measure.h measure.c nvidia.h parray.h \
 	pgtop2.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
-	ptime.h ptime.c pio.h pio.c pudisks2.h slog.c slog.h \
+	ptime.h ptime.c io.h io.c pudisks2.h slog.c slog.h \
 	temperature.c temperature.h url.c url.h $(am__append_1) \
 	$(am__append_3) $(am__append_6) $(am__append_9) \
 	$(am__append_10) $(am__append_13) $(am__append_16)
@@ -398,8 +407,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -425,24 +434,30 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdd_atasmart.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdd_hddtemp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmsensor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/measure.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvidia.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgtop2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmutex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor_json.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pudisks2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/temperature.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdd_atasmart.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdd_hddtemp.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lmsensor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/measure.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvidia.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pgtop2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmutex.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor_json.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptime.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pudisks2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slog.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/temperature.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -509,8 +524,10 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -579,7 +596,24 @@ clean: clean-am
 clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/amd.Po
+	-rm -f ./$(DEPDIR)/color.Po
+	-rm -f ./$(DEPDIR)/hdd_atasmart.Po
+	-rm -f ./$(DEPDIR)/hdd_hddtemp.Po
+	-rm -f ./$(DEPDIR)/io.Po
+	-rm -f ./$(DEPDIR)/lmsensor.Po
+	-rm -f ./$(DEPDIR)/measure.Po
+	-rm -f ./$(DEPDIR)/nvidia.Po
+	-rm -f ./$(DEPDIR)/pgtop2.Po
+	-rm -f ./$(DEPDIR)/plog.Po
+	-rm -f ./$(DEPDIR)/pmutex.Po
+	-rm -f ./$(DEPDIR)/psensor.Po
+	-rm -f ./$(DEPDIR)/psensor_json.Po
+	-rm -f ./$(DEPDIR)/ptime.Po
+	-rm -f ./$(DEPDIR)/pudisks2.Po
+	-rm -f ./$(DEPDIR)/slog.Po
+	-rm -f ./$(DEPDIR)/temperature.Po
+	-rm -f ./$(DEPDIR)/url.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -625,7 +659,24 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/amd.Po
+	-rm -f ./$(DEPDIR)/color.Po
+	-rm -f ./$(DEPDIR)/hdd_atasmart.Po
+	-rm -f ./$(DEPDIR)/hdd_hddtemp.Po
+	-rm -f ./$(DEPDIR)/io.Po
+	-rm -f ./$(DEPDIR)/lmsensor.Po
+	-rm -f ./$(DEPDIR)/measure.Po
+	-rm -f ./$(DEPDIR)/nvidia.Po
+	-rm -f ./$(DEPDIR)/pgtop2.Po
+	-rm -f ./$(DEPDIR)/plog.Po
+	-rm -f ./$(DEPDIR)/pmutex.Po
+	-rm -f ./$(DEPDIR)/psensor.Po
+	-rm -f ./$(DEPDIR)/psensor_json.Po
+	-rm -f ./$(DEPDIR)/ptime.Po
+	-rm -f ./$(DEPDIR)/pudisks2.Po
+	-rm -f ./$(DEPDIR)/slog.Po
+	-rm -f ./$(DEPDIR)/temperature.Po
+	-rm -f ./$(DEPDIR)/url.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -645,18 +696,18 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-noinstLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
diff --git a/src/lib/amd.c b/src/lib/amd.c
index 72a807e6..38b777a7 100644
--- a/src/lib/amd.c
+++ b/src/lib/amd.c
@@ -80,7 +80,7 @@ static double get_temp(struct psensor *sensor)
 	if (adl_od5_temperature_get(sensor->amd_id, 0, &v) == ADL_OK)
 		return v.iTemperature/1000;
 
-	return UNKNOWN_DBL_VALUE;
+	return UNKNOWN_DOUBLE_VALUE;
 }
 
 static double get_fanspeed(struct psensor *sensor)
@@ -94,7 +94,7 @@ static double get_fanspeed(struct psensor *sensor)
 	if (adl_od5_fanspeed_get(sensor->amd_id, 0, &v) == ADL_OK)
 		return v.iFanSpeed;
 
-	return UNKNOWN_DBL_VALUE;
+	return UNKNOWN_DOUBLE_VALUE;
 }
 
 static double get_usage(struct psensor *sensor)
@@ -106,10 +106,10 @@ static double get_usage(struct psensor *sensor)
 	if (adl_od5_currentactivity_get(sensor->amd_id, &v) == ADL_OK)
 		return v.iActivityPercent;
 
-	return UNKNOWN_DBL_VALUE;
+	return UNKNOWN_DOUBLE_VALUE;
 }
 
-static struct psensor *create_sensor(int id, int type, int values_len)
+static struct psensor *create_sensor(int id, int type, unsigned int values_len)
 {
 	char name[200];
 	char *sid;
diff --git a/src/lib/amd.h b/src/lib/amd.h
index 682f8ebf..109d55f9 100644
--- a/src/lib/amd.h
+++ b/src/lib/amd.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_AMD_H_
-#define _PSENSOR_AMD_H_
+#ifndef PSENSOR_AMD_H
+#define PSENSOR_AMD_H
 
 #include <bool.h>
 #include <psensor.h>
@@ -36,7 +36,7 @@ void amd_cleanup(void);
 static inline bool amd_is_supported(void) { return false; }
 
 static inline void amd_psensor_list_update(struct psensor **s) {}
-static inline void amd_psensor_list_append(struct psensor ***s, int n) {}
+static inline void amd_psensor_list_append(struct psensor ***s, unsigned int n) {}
 static inline void amd_cleanup(void) {}
 
 #endif
diff --git a/src/lib/bool.h b/src/lib/bool.h
index c2ad2056..d038cf31 100644
--- a/src/lib/bool.h
+++ b/src/lib/bool.h
@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_BOOL_H_
-#define _PSENSOR_BOOL_H_
+#ifndef PSENSOR_BOOL_H
+#define PSENSOR_BOOL_H
 
 #include "config.h"
 
-#if HAVE_STDBOOL_H
+#if HAVE_STDBOOL_H == 1
 #include <stdbool.h>
 #else
 #define bool char
diff --git a/src/lib/color.c b/src/lib/color.c
index 6ec2ec68..ef48adb4 100644
--- a/src/lib/color.c
+++ b/src/lib/color.c
@@ -88,12 +88,14 @@ struct color *str_to_color(const char *str)
 
 char *color_to_str(const struct color *color)
 {
-	char *str = malloc(1 + 12 + 1);
+	char *str = NULL;;
 
-	sprintf(str, "#%.4x%.4x%.4x",
+	int result = asprintf(&str, "#%.4x%.4x%.4x",
 		(int)(65535 * color->red),
 		(int)(65535 * color->green),
 		(int)(65535 * color->blue));
-
+	if (result == -1) {
+        return NULL;
+    }
 	return str;
 }
diff --git a/src/lib/color.h b/src/lib/color.h
index 7636b656..16a4a34e 100644
--- a/src/lib/color.h
+++ b/src/lib/color.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_COLOR_H_
-#define _PSENSOR_COLOR_H_
+#ifndef PSENSOR_COLOR_H
+#define PSENSOR_COLOR_H
 
 /* Represents a RGB color. */
 struct color {
diff --git a/src/lib/common.h b/src/lib/common.h
new file mode 100644
index 00000000..68066647
--- /dev/null
+++ b/src/lib/common.h
@@ -0,0 +1,30 @@
+#ifndef PSENSOR_COMMON_H
+#define PSENSOR_COMMON_H
+
+#if defined(_MSC_VER)
+    // MSVC specific pragmas
+    #define PACK_STRUCT(n) __pragma(pack(push, n))
+    #define UNPACK_STRUCT() __pragma(pack(pop))
+    #define ALIGNED(n)
+#elif defined(__clang__)
+    // Clang specific attributes (must be checked first)
+    #define PACK_STRUCT(n)
+    #define UNPACK_STRUCT()
+    #define ALIGNED(n) __attribute__((aligned(n)))
+#elif defined(__GNUC__)
+    // GCC specific attributes
+    // #define PACK_STRUCT(n)
+    // #define UNPACK_STRUCT()
+    // #define ALIGNED(n) __attribute__((aligned(n)))
+
+    #define PACK_STRUCT(n)
+    #define UNPACK_STRUCT()
+    #define ALIGNED(n) __attribute__((aligned(n)))
+#else
+    //#error "Compiler not supported for structure packing"
+    #define PACK_STRUCT(n)
+    #define UNPACK_STRUCT()
+    #define ALIGNED(n) __attribute__((aligned(n)))
+#endif
+
+#endif /* PSENSOR_COMMON_H */
\ No newline at end of file
diff --git a/src/lib/hdd.h b/src/lib/hdd.h
index c24ceb5c..f4f088d4 100644
--- a/src/lib/hdd.h
+++ b/src/lib/hdd.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_HDD_H_
-#define _PSENSOR_HDD_H_
+#ifndef PSENSOR_HDD_H
+#define PSENSOR_HDD_H
 
 #include <bool.h>
 #include <config.h>
@@ -27,19 +27,19 @@
 
 static inline bool atasmart_is_supported(void) { return true; }
 
-void atasmart_psensor_list_append(struct psensor ***, int);
+void atasmart_psensor_list_append(struct psensor ***, unsigned int);
 void atasmart_psensor_list_update(struct psensor **);
 
 #else
 
 static inline bool atasmart_is_supported(void) { return false; }
 
-static inline void atasmart_psensor_list_append(struct psensor ***s, int n) {}
+static inline void atasmart_psensor_list_append(struct psensor ***s, unsigned int n) {}
 static inline void atasmart_psensor_list_update(struct psensor **s) {}
 
 #endif
 
-void hddtemp_psensor_list_append(struct psensor ***sensors, int values_length);
+void hddtemp_psensor_list_append(struct psensor ***sensors, unsigned int values_length);
 void hddtemp_psensor_list_update(struct psensor **sensors);
 
 #endif
diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c
index 402c92ee..0459cbd5 100644
--- a/src/lib/hdd_atasmart.c
+++ b/src/lib/hdd_atasmart.c
@@ -36,7 +36,7 @@
 #include <atasmart.h>
 #include <linux/fs.h>
 
-#include <pio.h>
+#include "io.h"
 #include <hdd.h>
 #include <plog.h>
 
@@ -58,7 +58,7 @@ static SkDisk *get_disk(struct psensor *s)
 }
 
 static struct psensor *
-create_sensor(char *id, char *name, SkDisk *disk, int values_max_length)
+create_sensor(char *id, char *name, SkDisk *disk, unsigned int values_max_length)
 {
 	struct psensor *s;
 	int t;
@@ -86,34 +86,34 @@ static void analyze_disk(const char *dname)
 	struct stat st;
 	uint64_t size;
 
-	log_fct("Analyze %s", dname);
+	log_functionname("Analyze %s", dname);
 
 	f = open(dname, O_RDONLY|O_NOCTTY|O_NONBLOCK|O_CLOEXEC);
 
 	if (f < 0) {
-		log_fct("Could not open file %s: %s", dname, strerror(errno));
+		log_functionname("Could not open file %s: %s", dname, strerror(errno));
 		goto fail;
 	}
 
 	if (fstat(f, &st) < 0) {
-		log_fct("fstat fails %s: %s", dname, strerror(errno));
+		log_functionname("fstat fails %s: %s", dname, strerror(errno));
 		goto fail;
 	}
 
 	if (!S_ISBLK(st.st_mode)) {
-		log_fct("!S_ISBLK fails %s", dname);
+		log_functionname("!S_ISBLK fails %s", dname);
 		goto fail;
 	}
 
 	size = (uint64_t)-1;
 	/* So, it's a block device. Let's make sure the ioctls work */
 	if (ioctl(f, BLKGETSIZE64, &size) < 0) {
-		log_fct("ioctl fails %s: %s", dname, strerror(errno));
+		log_functionname("ioctl fails %s: %s", dname, strerror(errno));
 		goto fail;
 	}
 
 	if (size <= 0 || size == (uint64_t) -1) {
-		log_fct("ioctl wrong size %s: %ld", dname, size);
+		log_functionname("ioctl wrong size %s: %ld", dname, size);
 		goto fail;
 	}
 
@@ -122,19 +122,19 @@ static void analyze_disk(const char *dname)
 }
 
 void
-atasmart_psensor_list_append(struct psensor ***sensors, int values_max_length)
+atasmart_psensor_list_append(struct psensor ***sensors, unsigned int values_max_length)
 {
 	char **paths, **tmp, *id;
 	SkDisk *disk;
 	struct psensor *sensor;
 
-	log_fct_enter();
+	log_functionname_enter();
 
 	paths = dir_list("/dev", filter_sd);
 
 	tmp = paths;
 	while (*tmp) {
-		log_fct("Open %s", *tmp);
+		log_functionname("Open %s", *tmp);
 
 		if (!sk_disk_open(*tmp, &disk)) {
 			id = malloc(strlen(PROVIDER_NAME)
@@ -161,7 +161,7 @@ atasmart_psensor_list_append(struct psensor ***sensors, int values_max_length)
 
 	paths_free(paths);
 
-	log_fct_exit();
+	log_functionname_exit();
 }
 
 void atasmart_psensor_list_update(struct psensor **sensors)
@@ -191,7 +191,7 @@ void atasmart_psensor_list_update(struct psensor **sensors)
 				if (!ret) {
 					c = (kelvin - 273150) / 1000;
 					psensor_set_current_value(s, c);
-					log_fct("%s %.2f", s->id, c);
+					log_functionname("%s %.2f", s->id, c);
 				}
 			}
 		}
diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c
index 68797e19..c631162a 100644
--- a/src/lib/hdd_hddtemp.c
+++ b/src/lib/hdd_hddtemp.c
@@ -41,22 +41,20 @@ static const char *PROVIDER_NAME = "hddtemp";
 
 static const char *HDDTEMP_SERVER_IP_ADDRESS = "127.0.0.1";
 static const int HDDTEMP_PORT_NUMBER = 7634;
-static const int HDDTEMP_OUTPUT_BUFFER_LENGTH = 4048;
+static const size_t HDDTEMP_OUTPUT_BUFFER_LENGTH = 4048;
 
 struct hdd_info {
-	char *name;
 	int temp;
+	char *name;
 };
 
 static char *fetch(void)
 {
-	int sockfd, output_length;
-	ssize_t n = 1;
+	int sockfd;
+	size_t n = 1, output_length = 0;
 	char *pc, *buffer;
 	struct sockaddr_in address;
 
-	output_length = 0;
-
 	sockfd = socket(AF_INET, SOCK_STREAM, 0);
 	if (sockfd == -1) {
 		log_err(_("%s: failed to open socket."), PROVIDER_NAME);
@@ -116,9 +114,9 @@ static int str_index(char *str, char d)
 }
 
 static struct psensor *
-create_sensor(char *id, char *name, int values_max_length)
+create_sensor(char *id, char *name, unsigned int values_max_length)
 {
-	int t;
+	unsigned int t;
 
 	t = SENSOR_TYPE_HDD | SENSOR_TYPE_HDDTEMP | SENSOR_TYPE_TEMP;
 
@@ -175,7 +173,7 @@ static char *next_hdd_info(char *string, struct hdd_info *info)
 }
 
 void
-hddtemp_psensor_list_append(struct psensor ***sensors, int values_max_length)
+hddtemp_psensor_list_append(struct psensor ***sensors, unsigned int values_max_length)
 {
 	char *hddtemp_output, *c, *id;
 	struct hdd_info info;
@@ -192,7 +190,6 @@ hddtemp_psensor_list_append(struct psensor ***sensors, int values_max_length)
 			hddtemp_output);
 
 		free(hddtemp_output);
-
 		return;
 	}
 
diff --git a/src/lib/pio.c b/src/lib/io.c
similarity index 95%
rename from src/lib/pio.c
rename to src/lib/io.c
index ef0c9013..9a3e65fe 100644
--- a/src/lib/pio.c
+++ b/src/lib/io.c
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 
 #include <plog.h>
-#include <pio.h>
+#include <io.h>
 
 /* Directory separator is \ when cross-compiling for MS Windows
  * systems
@@ -38,7 +38,7 @@
 #define DIRSEP '/'
 #endif
 
-#define FCOPY_BUF_SZ 4096
+//#define FCOPY_BUF_SZ 4096
 
 int is_dir(const char *path)
 {
@@ -67,7 +67,7 @@ int is_file(const char *path)
 static char *dir_normalize(const char *dpath)
 {
 	char *npath;
-	int n;
+	size_t n;
 
 	if (!dpath || !strlen(dpath))
 		return NULL;
@@ -86,7 +86,7 @@ static char **paths_add(char **paths, int n, char *path)
 {
 	char **result;
 
-	result = malloc((n+1) * sizeof(void *));
+	result = (char **)malloc((n+1) * sizeof(void *));
 
 	memcpy(result + 1, paths, n * sizeof(void *));
 
@@ -108,7 +108,7 @@ char **dir_list(const char *dpath, int (*filter) (const char *))
 		return NULL;
 
 	n = 1;
-	paths = malloc(sizeof(void *));
+	paths = (char **)malloc(sizeof(void *));
 	*paths = NULL;
 
 	while ((ent = readdir(dir)) != NULL) {
@@ -241,7 +241,7 @@ file_copy(const char *src, const char *dst)
 	FILE *fsrc, *fdst;
 	int ret = 0;
 
-	log_fct("copy %s to %s", src, dst);
+	log_functionname("copy %s to %s", src, dst);
 
 	fsrc = fopen(src, "r");
 
@@ -295,7 +295,7 @@ void mkdirs(const char *dirs, mode_t mode)
 	char *c, *dir;
 	int i;
 
-	log_fct("mkdirs %s", dirs);
+	log_functionname("mkdirs %s", dirs);
 
 	c = (char *)dirs;
 	dir = malloc(strlen(dirs) + 1);
diff --git a/src/lib/pio.h b/src/lib/io.h
similarity index 98%
rename from src/lib/pio.h
rename to src/lib/io.h
index 13eb70ed..9be7fe6e 100644
--- a/src/lib/pio.h
+++ b/src/lib/io.h
@@ -17,8 +17,8 @@
  *   02110-1301 USA
  */
 
-#ifndef _P_IO_H
-#define _P_IO_H
+#ifndef PSENSOR_IO_H
+#define PSENSOR_IO_H
 
 #define P_IO_VER 6
 
diff --git a/src/lib/lmsensor.c b/src/lib/lmsensor.c
index 6f3845d9..c8f97c99 100644
--- a/src/lib/lmsensor.c
+++ b/src/lib/lmsensor.c
@@ -74,7 +74,7 @@ static double get_value(const sensors_chip_name *name,
 			PROVIDER_NAME,
 			sub->name,
 			sensors_strerror(err));
-		val = UNKNOWN_DBL_VALUE;
+		val = UNKNOWN_DOUBLE_VALUE;
 	}
 	return val;
 }
@@ -96,7 +96,7 @@ static double get_temp_input(struct psensor *sensor)
 	if (sf)
 		return get_value(chip, sf);
 
-	return UNKNOWN_DBL_VALUE;
+	return UNKNOWN_DOUBLE_VALUE;
 }
 
 static double get_fan_input(struct psensor *sensor)
@@ -116,7 +116,7 @@ static double get_fan_input(struct psensor *sensor)
 	if (sf)
 		return get_value(chip, sf);
 
-	return UNKNOWN_DBL_VALUE;
+	return UNKNOWN_DOUBLE_VALUE;
 }
 
 void lmsensor_psensor_list_update(struct psensor **sensors)
@@ -138,7 +138,7 @@ void lmsensor_psensor_list_update(struct psensor **sensors)
 			else /* s->type & SENSOR_TYPE_RPM */
 				v = get_fan_input(s);
 
-			if (v != UNKNOWN_DBL_VALUE)
+			if (v != UNKNOWN_DOUBLE_VALUE)
 				psensor_set_current_value(s, v);
 		}
 
@@ -149,7 +149,7 @@ void lmsensor_psensor_list_update(struct psensor **sensors)
 static struct psensor *
 lmsensor_psensor_create(const sensors_chip_name *chip,
 			const sensors_feature *feature,
-			int values_max_length)
+			unsigned int values_max_length)
 {
 	char name[200];
 	const sensors_subfeature *sf;
@@ -227,7 +227,7 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
 	lmsensor_data_set(psensor, chip, feature);
 
 	if (feature->type == SENSORS_FEATURE_TEMP
-	    && (get_temp_input(psensor) == UNKNOWN_DBL_VALUE)) {
+	    && (get_temp_input(psensor) == UNKNOWN_DOUBLE_VALUE)) {
 		free(psensor);
 		return NULL;
 	}
@@ -251,7 +251,7 @@ static void lmsensor_init(void)
 	}
 }
 
-void lmsensor_psensor_list_append(struct psensor ***sensors, int vn)
+void lmsensor_psensor_list_append(struct psensor ***sensors, unsigned int values_max_length)
 {
 	const sensors_chip_name *chip;
 	int chip_nr, i;
@@ -272,7 +272,7 @@ void lmsensor_psensor_list_append(struct psensor ***sensors, int vn)
 			if (feature->type == SENSORS_FEATURE_TEMP
 			    || feature->type == SENSORS_FEATURE_FAN) {
 
-				s = lmsensor_psensor_create(chip, feature, vn);
+				s = lmsensor_psensor_create(chip, feature, values_max_length);
 
 				if (s)
 					psensor_list_append(sensors, s);
diff --git a/src/lib/lmsensor.h b/src/lib/lmsensor.h
index 90d58f3f..8c59401d 100644
--- a/src/lib/lmsensor.h
+++ b/src/lib/lmsensor.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_LMSENSOR_H_
-#define _PSENSOR_LMSENSOR_H_
+#ifndef PSENSOR_LMSENSOR_H
+#define PSENSOR_LMSENSOR_H
 
 #include <bool.h>
 #include <psensor.h>
@@ -27,7 +27,7 @@
 static inline bool lmsensor_is_supported(void) { return true; }
 
 void lmsensor_psensor_list_update(struct psensor **);
-void lmsensor_psensor_list_append(struct psensor ***, int);
+void lmsensor_psensor_list_append(struct psensor ***, unsigned int);
 void lmsensor_cleanup(void);
 
 #else
@@ -35,7 +35,7 @@ void lmsensor_cleanup(void);
 static inline bool lmsensor_is_supported(void) { return false; }
 
 static inline void lmsensor_psensor_list_update(struct psensor **s) {}
-static inline void lmsensor_psensor_list_append(struct psensor ***s, int n) {}
+static inline void lmsensor_psensor_list_append(struct psensor ***s, unsigned int n) {}
 static inline void lmsensor_cleanup(void) {}
 
 #endif
diff --git a/src/lib/measure.c b/src/lib/measure.c
index 39727d37..502a4c04 100644
--- a/src/lib/measure.c
+++ b/src/lib/measure.c
@@ -22,15 +22,15 @@
 
 #include "measure.h"
 
-struct measure *measures_dbl_create(int size)
+struct measure *measures_double_create(size_t size)
 {
-	int i;
+	size_t i;
 	struct measure *result;
 
-	result = malloc(size * sizeof(struct measure));
+	result = (struct measure *)malloc(size * sizeof(struct measure));
 
 	for (i = 0; i < size; i++) {
-		result[i].value = UNKNOWN_DBL_VALUE;
+		result[i].value = UNKNOWN_DOUBLE_VALUE;
 		timerclear(&result[i].time);
 	}
 
diff --git a/src/lib/measure.h b/src/lib/measure.h
index 9bf848b3..f7c4752f 100644
--- a/src/lib/measure.h
+++ b/src/lib/measure.h
@@ -16,14 +16,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_MEASURE_H_
-#define _PSENSOR_MEASURE_H_
+#ifndef PSENSOR_MEASURE_H
+#define PSENSOR_MEASURE_H
 
 #include <sys/time.h>
 #include <float.h>
 #include <stdint.h>
+#include <math.h>
 
-#define UNKNOWN_DBL_VALUE DBL_MIN
+#define UNKNOWN_DOUBLE_VALUE DBL_MIN
 
 struct measure {
 	double value;
@@ -33,7 +34,7 @@ struct measure {
 
 void measure_copy(struct measure *src, struct measure *dst);
 
-struct measure *measures_dbl_create(int size);
+struct measure *measures_double_create(size_t size);
 
 void measures_free(struct measure *measures);
 
diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c
index 685f97da..7b71265a 100644
--- a/src/lib/nvidia.c
+++ b/src/lib/nvidia.c
@@ -38,14 +38,14 @@ static Display *display;
 
 static const char *PROVIDER_NAME = "nvctrl";
 
-static void set_nvidia_id(struct psensor *s, int id)
+static void set_nvidia_id(struct psensor *s, unsigned int id)
 {
-	*(int *)s->provider_data = id;
+	*(unsigned int *)s->provider_data = id;
 }
 
 static int get_nvidia_id(struct psensor *s)
 {
-	return *(int *)s->provider_data;
+	return *(unsigned int *)s->provider_data;
 }
 
 static char *get_product_name(int id, int type)
@@ -80,7 +80,7 @@ static char *get_product_name(int id, int type)
 	return strdup("NVIDIA");
 }
 
-static double get_att(int target, int id, int att)
+static double get_att(int target, int id, unsigned int att)
 {
 	Bool res;
 	int temp;
@@ -90,7 +90,7 @@ static double get_att(int target, int id, int att)
 	if (res == True)
 		return temp;
 
-	return UNKNOWN_DBL_VALUE;
+	return UNKNOWN_DOUBLE_VALUE;
 }
 
 static double get_usage_att(char *atts, const char *att)
@@ -101,7 +101,7 @@ static double get_usage_att(char *atts, const char *att)
 
 	c = atts;
 
-	v = UNKNOWN_DBL_VALUE;
+	v = UNKNOWN_DOUBLE_VALUE;
 	while (*c) {
 		s = c;
 		n = 0;
@@ -133,7 +133,7 @@ static double get_usage_att(char *atts, const char *att)
 		free(key);
 		free(strv);
 
-		if (v != UNKNOWN_DBL_VALUE)
+		if (v != UNKNOWN_DOUBLE_VALUE)
 			break;
 
 		while (*c && (*c == ' ' || *c == ','))
@@ -143,7 +143,7 @@ static double get_usage_att(char *atts, const char *att)
 	return v;
 }
 
-static const char *get_nvidia_type_str(int type)
+static const char *get_nvidia_type_str(unsigned int type)
 {
 	if (type & SENSOR_TYPE_GRAPHICS)
 		return "graphics";
@@ -173,7 +173,7 @@ static const char *get_nvidia_type_str(int type)
 	return "unknown";
 }
 
-static double get_usage(int id, int type)
+static double get_usage(int id, unsigned int type)
 {
 	const char *stype;
 	char *atts;
@@ -183,7 +183,7 @@ static double get_usage(int id, int type)
 	stype = get_nvidia_type_str(type);
 
 	if (!stype)
-		return UNKNOWN_DBL_VALUE;
+		return UNKNOWN_DOUBLE_VALUE;
 
 	res = XNVCTRLQueryTargetStringAttribute(display,
 						NV_CTRL_TARGET_TYPE_GPU,
@@ -193,7 +193,7 @@ static double get_usage(int id, int type)
 						&atts);
 
 	if (res != True)
-		return UNKNOWN_DBL_VALUE;
+		return UNKNOWN_DOUBLE_VALUE;
 
 	v = get_usage_att(atts, stype);
 
@@ -202,15 +202,15 @@ static double get_usage(int id, int type)
 	return v;
 }
 
-static double get_value(int id, int type)
+static double get_value(int id, unsigned int type)
 {
-	int att;
+	unsigned int att;
 
 	if (type & SENSOR_TYPE_TEMP) {
 		if (type & SENSOR_TYPE_AMBIENT)
-			att = NV_CTRL_AMBIENT_TEMPERATURE;
+			att = (unsigned int)NV_CTRL_AMBIENT_TEMPERATURE;
 		else
-			att = NV_CTRL_GPU_CORE_TEMPERATURE;
+			att = (unsigned int)NV_CTRL_GPU_CORE_TEMPERATURE;
 
 		return get_att(NV_CTRL_TARGET_TYPE_GPU, id, att);
 	} else if (type & SENSOR_TYPE_FAN) {
@@ -236,7 +236,7 @@ static void update(struct psensor *sensor)
 
 	v = get_value(id, sensor->type);
 
-	if (v == UNKNOWN_DBL_VALUE)
+	if (v == UNKNOWN_DOUBLE_VALUE)
 		log_err(_("%s: Failed to retrieve measure of type %x "
 			  "for NVIDIA GPU %d"),
 			PROVIDER_NAME,
@@ -245,34 +245,31 @@ static void update(struct psensor *sensor)
 	psensor_set_current_value(sensor, v);
 }
 
-static int check_sensor(int id, int type)
+static int check_sensor(unsigned int id, unsigned int type)
 {
-	return get_value(id, type) != UNKNOWN_DBL_VALUE;
+	return get_value(id, type) != UNKNOWN_DOUBLE_VALUE;
 }
 
-static char *i2str(int i)
+static char *unsigned2str(unsigned int i)
 {
-	char *str;
-	size_t n;
-
 	/* second +1 to avoid issue about the conversion of a double
 	 * to a lower int
 	 */
-	n = 1 + (ceil(log10(INT_MAX)) + 1) + 1;
-
-	str = malloc(n);
-	snprintf(str, n, "%d", i);
+	const size_t n = (i == 0) ? 2 : (ceil(log10(UINT_MAX)) + 1) + 1;
 
-	return str;
+	char *str = malloc(n);
+    if (str) {
+        snprintf(str, n, "%u", i);
+    }
+    return str;
 }
 
-static struct psensor *create_nvidia_sensor(int id, int subtype, int value_len)
+static struct psensor *create_nvidia_sensor(unsigned int id, unsigned int subtype, unsigned int value_len)
 {
 	char *pname, *name, *strnid, *sid;
 	const char *stype;
-	int type;
-	size_t n;
-	struct psensor *s;
+	unsigned int type;
+	struct psensor *new_sensor;
 	double v;
 
 	type = SENSOR_TYPE_NVCTRL | subtype;
@@ -281,30 +278,39 @@ static struct psensor *create_nvidia_sensor(int id, int subtype, int value_len)
 		return NULL;
 
 	pname = get_product_name(id, type);
-	strnid = i2str(id);
+	strnid = unsigned2str(id);
 	stype = get_nvidia_type_str(type);
 
-	n = strlen(pname) + 1 + strlen(strnid) + 1 + strlen(stype) + 1;
-	name = malloc(n);
-	sprintf(name, "%s %s %s", pname, strnid, stype);
+	int result = asprintf(&name, "%s %s %s", pname, strnid, stype);
+	if (result == -1)
+	{
+		free(strnid);
+		free(pname);
+		return NULL;
+	}
 
-	sid = malloc(strlen(PROVIDER_NAME) + 1 + strlen(name) + 1);
-	sprintf(sid, "%s %s", PROVIDER_NAME, name);
+	result = asprintf(&sid, "%s %s", PROVIDER_NAME, name);
+	if (result == -1) {
+		free(strnid);
+		free(pname);
+		free(name);
+		return NULL;
+	}
 
-	s = psensor_create(sid, name, pname, type, value_len);
-	s->provider_data = malloc(sizeof(int));
-	set_nvidia_id(s, id);
+	new_sensor = psensor_create(sid, name, pname, type, value_len);
+	new_sensor->provider_data = malloc(sizeof(unsigned int));
+	set_nvidia_id(new_sensor, id);
 
 	if ((type & SENSOR_TYPE_GPU) && (type & SENSOR_TYPE_TEMP)) {
 		v = get_att(NV_CTRL_TARGET_TYPE_GPU,
 			    id,
 			    NV_CTRL_GPU_CORE_THRESHOLD);
-		s->max = v;
+		new_sensor->max = v;
 	}
 
 	free(strnid);
 
-	return s;
+	return new_sensor;
 }
 
 static int init(void)
@@ -343,7 +349,7 @@ void nvidia_psensor_list_update(struct psensor **sensors)
 	}
 }
 
-static void add(struct psensor ***sensors, int id, int type, int values_len)
+static void add(struct psensor ***sensors, unsigned int id, unsigned int type, unsigned int values_len)
 {
 	struct psensor *s;
 
@@ -353,16 +359,18 @@ static void add(struct psensor ***sensors, int id, int type, int values_len)
 		psensor_list_append(sensors, s);
 }
 
-void nvidia_psensor_list_append(struct psensor ***ss, int values_len)
+void nvidia_psensor_list_append(struct psensor ***ss, unsigned int values_len)
 {
-	int i, n, utype;
+	size_t i, n, utype;
 	Bool ret;
 
 	if (!init())
 		return;
 
-	ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_GPU, &n);
+	int value;
+	ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_GPU, &value);
 	if (ret == True) {
+		n = (size_t)value;
 		for (i = 0; i < n; i++) {
 			add(ss,
 			    i,
@@ -378,9 +386,10 @@ void nvidia_psensor_list_append(struct psensor ***ss, int values_len)
 		}
 	}
 
-	ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_COOLER, &n);
+	ret = XNVCTRLQueryTargetCount(display, NV_CTRL_TARGET_TYPE_COOLER, &value);
 	if (ret == True) {
-		log_fct("%s: Number of fans: %d", PROVIDER_NAME, n);
+		n = (size_t)value;
+		log_functionname("%s: Number of fans: %d", PROVIDER_NAME, n);
 		for (i = 0; i < n; i++) {
 			utype = SENSOR_TYPE_FAN | SENSOR_TYPE_RPM;
 			if (check_sensor(i, utype))
diff --git a/src/lib/nvidia.h b/src/lib/nvidia.h
index cf7f0746..b3f68bb5 100644
--- a/src/lib/nvidia.h
+++ b/src/lib/nvidia.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_NVIDIA_H_
-#define _PSENSOR_NVIDIA_H_
+#ifndef PSENSOR_NVIDIA_H
+#define PSENSOR_NVIDIA_H
 
 #include <bool.h>
 #include <psensor.h>
@@ -28,7 +28,7 @@
 static inline bool nvidia_is_supported(void) { return true; }
 
 void nvidia_psensor_list_update(struct psensor **);
-void nvidia_psensor_list_append(struct psensor ***, int);
+void nvidia_psensor_list_append(struct psensor ***, unsigned int);
 void nvidia_cleanup(void);
 
 #else
@@ -36,7 +36,7 @@ void nvidia_cleanup(void);
 static inline bool nvidia_is_supported(void) { return false; }
 
 static inline void nvidia_psensor_list_update(struct psensor **s) {}
-static inline void nvidia_psensor_list_append(struct psensor ***s, int n) {}
+static inline void nvidia_psensor_list_append(struct psensor ***s, unsigned int n) {}
 static inline void nvidia_cleanup(void) {}
 
 #endif
diff --git a/src/lib/parray.h b/src/lib/parray.h
index 4b02c177..ecfb9279 100644
--- a/src/lib/parray.h
+++ b/src/lib/parray.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  *   02110-1301 USA
  */
-#ifndef _P_ARRAY_H_
-#define _P_ARRAY_H_
+#ifndef PSENSOR_ARRAY_H
+#define PSENSOR_ARRAY_H
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
diff --git a/src/lib/pgtop2.c b/src/lib/pgtop2.c
index ff0e28df..323152fc 100644
--- a/src/lib/pgtop2.c
+++ b/src/lib/pgtop2.c
@@ -32,10 +32,10 @@ static float last_total;
 
 static const char *PROVIDER_NAME = "gtop2";
 
-struct psensor *create_cpu_usage_sensor(int measures_len)
+struct psensor *create_cpu_usage_sensor(unsigned int measures_len)
 {
 	char *label, *id;
-	int type;
+	unsigned int type;
 	struct psensor *psensor;
 
 	id = g_strdup_printf("%s cpu usage", PROVIDER_NAME);
@@ -51,10 +51,10 @@ struct psensor *create_cpu_usage_sensor(int measures_len)
 	return psensor;
 }
 
-static struct psensor *create_mem_free_sensor(int measures_len)
+static struct psensor *create_mem_free_sensor(unsigned int measures_len)
 {
 	char *id;
-	int type;
+	unsigned int type;
 
 	id = g_strdup_printf("%s mem free", PROVIDER_NAME);
 	type = SENSOR_TYPE_GTOP | SENSOR_TYPE_MEMORY | SENSOR_TYPE_PERCENT;
@@ -81,7 +81,7 @@ static double get_usage(void)
 	if (dt)
 		cpu_rate = 100.0 * (used - last_used) / dt;
 	else
-		cpu_rate = UNKNOWN_DBL_VALUE;
+		cpu_rate = UNKNOWN_DOUBLE_VALUE;
 
 	last_used = used;
 	last_total = cpu.total;
@@ -100,7 +100,7 @@ static double get_mem_free(void)
 	return v;
 }
 
-void gtop2_psensor_list_append(struct psensor ***sensors, int measures_len)
+void gtop2_psensor_list_append(struct psensor ***sensors, unsigned int measures_len)
 {
 	psensor_list_append(sensors, create_cpu_usage_sensor(measures_len));
 	psensor_list_append(sensors, create_mem_free_sensor(measures_len));
@@ -112,7 +112,7 @@ void cpu_usage_sensor_update(struct psensor *s)
 
 	v = get_usage();
 
-	if (v != UNKNOWN_DBL_VALUE)
+	if (v != UNKNOWN_DOUBLE_VALUE)
 		psensor_set_current_value(s, v);
 }
 
@@ -122,7 +122,7 @@ static void mem_free_sensor_update(struct psensor *s)
 
 	v = get_mem_free();
 
-	if (v != UNKNOWN_DBL_VALUE)
+	if (v != UNKNOWN_DOUBLE_VALUE)
 		psensor_set_current_value(s, v);
 }
 
diff --git a/src/lib/pgtop2.h b/src/lib/pgtop2.h
index e24ef501..9bcc4fd0 100644
--- a/src/lib/pgtop2.h
+++ b/src/lib/pgtop2.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_PGTOP2_H_
-#define _PSENSOR_PGTOP2_H_
+#ifndef PSENSOR_PGTOP2_H
+#define PSENSOR_PGTOP2_H
 
 #include <bool.h>
 #include <psensor.h>
@@ -26,11 +26,11 @@
 
 static inline bool gtop2_is_supported(void) { return true; }
 
-struct psensor *create_cpu_usage_sensor(int);
+struct psensor *create_cpu_usage_sensor(unsigned int);
 void cpu_usage_sensor_update(struct psensor *);
 
 void gtop2_psensor_list_update(struct psensor **);
-void gtop2_psensor_list_append(struct psensor ***, int);
+void gtop2_psensor_list_append(struct psensor ***, unsigned int);
 
 #else
 
@@ -40,7 +40,7 @@ static inline struct psensor *create_cpu_usage_sensor(int n) { return NULL; }
 static inline void cpu_usage_sensor_update(struct psensor *s) {}
 
 static inline void gtop2_psensor_list_update(struct psensor **s) {}
-static inline void gtop2_psensor_list_append(struct psensor ***s, int n) {}
+static inline void gtop2_psensor_list_append(struct psensor ***s, unsigned int n) {}
 
 #endif
 
diff --git a/src/lib/plog.c b/src/lib/plog.c
index 2b6ffd11..c6c113a0 100644
--- a/src/lib/plog.c
+++ b/src/lib/plog.c
@@ -1,4 +1,5 @@
 /*
+ * plog.c - psensor log, Simple logging functions
  * Copyright (C) 2010-2016 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
@@ -54,7 +55,7 @@ void log_close(void)
 }
 
 
-#define LOG_BUFFER 4096
+#define LOG_BUFFER 4096U
 static void vlogf(int lvl, const char *fct, const char *fmt, va_list ap)
 {
 	char buffer[1 + LOG_BUFFER];
@@ -88,6 +89,8 @@ static void vlogf(int lvl, const char *fct, const char *fmt, va_list ap)
 	if (!t)
 		return;
 
+	char * original_t = t; // Save original pointer to free later
+
 	if (file && lvl <= log_level) {
 		if (fct)
 			fprintf(file,
@@ -112,7 +115,7 @@ static void vlogf(int lvl, const char *fct, const char *fmt, va_list ap)
 			fprintf(stdf, "[%s] %s %s\n", t, lvl_str, buffer);
 	}
 
-	free(t);
+	free(original_t);
 }
 
 void log_printf(int lvl, const char *fmt, ...)
@@ -163,7 +166,7 @@ void log_info(const char *fmt, ...)
 	va_end(ap);
 }
 
-void _log(const char *fct, const char *fmt, ...)
+void psensor_log(const char *fct, const char *fmt, ...)
 {
 	va_list ap;
 
diff --git a/src/lib/plog.h b/src/lib/plog.h
index 2e229754..25c4558b 100644
--- a/src/lib/plog.h
+++ b/src/lib/plog.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  *   02110-1301 USA
  */
-#ifndef _P_LOG_H_
-#define _P_LOG_H_
+#ifndef PSENSOR_LOG_H
+#define PSENSOR_LOG_H
 
 #define P_LOG_VER 3
 
@@ -37,11 +37,11 @@ void log_err(const char *fmt, ...);
 void log_info(const char *fmt, ...);
 void log_warn(const char *fmt, ...);
 
-void _log(const char *fct, const char *fmt, ...);
+void psensor_log(const char *fct, const char *fmt, ...);
 
-#define log_fct(...) _log(__func__, __VA_ARGS__)
-#define log_fct_enter() log_fct("ENTER")
-#define log_fct_exit() log_fct("EXIT")
+#define log_functionname(...) psensor_log(__func__, __VA_ARGS__)
+#define log_functionname_enter() log_functionname("ENTER")
+#define log_functionname_exit() log_functionname("EXIT")
 
 /* level of the log file. */
 extern int log_level;
diff --git a/src/lib/pmutex.h b/src/lib/pmutex.h
index 7b3de9b3..ec349d7c 100644
--- a/src/lib/pmutex.h
+++ b/src/lib/pmutex.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _P_PMUTEX_H_
-#define _P_PMUTEX_H_
+#ifndef PSENSOR_PMUTEX_H
+#define PSENSOR_PMUTEX_H
 
 #include <pthread.h>
 
diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index f8c0a83a..9d10f6b4 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -30,10 +30,10 @@
 #include <temperature.h>
 
 struct psensor *psensor_create(char *id,
-			       char *name,
-			       char *chip,
-			       unsigned int type,
-			       int values_max_length)
+							   char *name,
+							   char *chip,
+							   unsigned int type,
+							   unsigned int values_max_length)
 {
 	struct psensor *psensor;
 
@@ -42,21 +42,24 @@ struct psensor *psensor_create(char *id,
 	psensor->id = id;
 	psensor->name = name;
 	psensor->chip = chip;
-	psensor->sess_lowest = UNKNOWN_DBL_VALUE;
-	psensor->sess_highest = UNKNOWN_DBL_VALUE;
+	psensor->sess_lowest = UNKNOWN_DOUBLE_VALUE;
+	psensor->sess_highest = UNKNOWN_DOUBLE_VALUE;
 
-	if (type & SENSOR_TYPE_PERCENT) {
+	if (type & SENSOR_TYPE_PERCENT)
+	{
 		psensor->min = 0;
 		psensor->max = 100;
-	} else {
-		psensor->min = UNKNOWN_DBL_VALUE;
-		psensor->max = UNKNOWN_DBL_VALUE;
+	}
+	else
+	{
+		psensor->min = UNKNOWN_DOUBLE_VALUE;
+		psensor->max = UNKNOWN_DOUBLE_VALUE;
 	}
 
 	psensor->type = type;
 
 	psensor->values_max_length = values_max_length;
-	psensor->measures = measures_dbl_create(values_max_length);
+	psensor->measures = measures_double_create(values_max_length);
 
 	psensor->alarm_high_threshold = 0;
 	psensor->alarm_low_threshold = 0;
@@ -71,21 +74,22 @@ struct psensor *psensor_create(char *id,
 	return psensor;
 }
 
-void psensor_values_resize(struct psensor *s, int new_size)
+void psensor_values_resize(struct psensor *s, unsigned new_size)
 {
 	struct measure *new_ms, *cur_ms;
-	int cur_size;
+	unsigned int cur_size;
 
 	cur_size = s->values_max_length;
 	cur_ms = s->measures;
-	new_ms = measures_dbl_create(new_size);
+	new_ms = measures_double_create(new_size);
 
-	if (cur_ms) {
-		int i;
+	if (cur_ms)
+	{
+		unsigned int i;
 
 		for (i = 0; i < new_size - 1 && i < cur_size - 1; i++)
 			measure_copy(&cur_ms[cur_size - i - 1],
-				     &new_ms[new_size - i - 1]);
+						 &new_ms[new_size - i - 1]);
 
 		measures_free(s->measures);
 	}
@@ -119,10 +123,12 @@ void psensor_list_free(struct psensor **sensors)
 {
 	struct psensor **sensor_cur;
 
-	if (sensors) {
+	if (sensors)
+	{
 		sensor_cur = sensors;
 
-		while (*sensor_cur) {
+		while (*sensor_cur)
+		{
 			psensor_free(*sensor_cur);
 
 			sensor_cur++;
@@ -134,64 +140,75 @@ void psensor_list_free(struct psensor **sensors)
 	}
 }
 
-int psensor_list_size(struct psensor **sensors)
+size_t psensor_list_size(struct psensor **sensors)
 {
-	int size;
-	struct psensor **sensor_cur;
-
 	if (!sensors)
 		return 0;
 
-	size = 0;
-	sensor_cur = sensors;
+	size_t size = 0;
+	struct psensor **sensor_cur = sensors;
 
-	while (*sensor_cur) {
+	while (*sensor_cur)
+	{
 		size++;
 		sensor_cur++;
 	}
 	return size;
 }
-
-struct psensor **psensor_list_add(struct psensor **sensors,
-				  struct psensor *sensor)
+/*
+ * Return a new sensors list with 'sensor' added at the end of
+ * 'sensors'. Layout: old items + new item + null termination
+ */
+static struct psensor **psensor_list_add(struct psensor **sensors,
+								  struct psensor *sensor)
 {
-	int size;
-	struct psensor **result;
-
-	size = psensor_list_size(sensors);
-
-	result = malloc((size + 1 + 1) * sizeof(struct psensor *));
+	struct psensor **new_sensor_list = NULL;
 
 	if (sensors)
-		memcpy(result, sensors, size * sizeof(struct psensor *));
+	{
+		size_t size = psensor_list_size(sensors);
+        // allocate new list with one more entry
+		new_sensor_list = malloc((size + 1 + 1) * sizeof(struct psensor *));
 
-	result[size] = sensor;
-	result[size + 1] = NULL;
+		memcpy(new_sensor_list, sensors, size * sizeof(struct psensor *));
 
-	return result;
+		new_sensor_list[size] = sensor;
+		// null terminate the list
+		new_sensor_list[size + 1] = NULL;
+	}
+	return new_sensor_list;
 }
 
-void psensor_list_append(struct psensor ***sensors, struct psensor *sensor)
+/// @brief append sensor to sensors list
+/// @param sensors
+/// @param sensor
+void psensor_list_append(struct psensor ***list_sensors, struct psensor *sensor)
 {
 	struct psensor **tmp;
 
 	if (!sensor)
 		return;
 
-	tmp = psensor_list_add(*sensors, sensor);
+	tmp = psensor_list_add(*list_sensors, sensor);
+	if (tmp != NULL)
+	{
+		// free old sensors list
+		free(*list_sensors);
+		// update sensors pointer
+		*list_sensors = tmp;
+	}
+	else
+	{
 
-	if (tmp != *sensors) {
-		free(*sensors);
-		*sensors = tmp;
 	}
 }
 
-
 struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id)
 {
 	struct psensor **sensors_cur = sensors;
 
-	while (*sensors_cur) {
+	while (*sensors_cur)
+	{
 		if (!strcmp((*sensors_cur)->id, id))
 			return *sensors_cur;
 
@@ -201,13 +218,13 @@ struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id)
 	return NULL;
 }
 
-int is_temp_type(unsigned int type)
+unsigned int is_temp_type(unsigned int type)
 {
 	return type & SENSOR_TYPE_TEMP;
 }
 
 char *
-psensor_value_to_str(unsigned int type, double value, int use_celsius)
+psensor_value_to_str(unsigned int type, double value, unsigned int use_celsius)
 {
 	char *str;
 	const char *unit;
@@ -216,22 +233,23 @@ psensor_value_to_str(unsigned int type, double value, int use_celsius)
 	 * should not be possible to exceed 20 characters with temp or
 	 * rpm values the .x part is never displayed
 	 */
-	str = malloc(20);
+	const int MAX_STR_LEN = 20;
+	str = malloc(MAX_STR_LEN);
 
 	unit = psensor_type_to_unit_str(type, use_celsius);
 
 	if (is_temp_type(type) && !use_celsius)
 		value = celsius_to_fahrenheit(value);
 
-	sprintf(str, "%.0f%s", value, unit);
+	snprintf(str, MAX_STR_LEN, "%.0f%s", value, unit);
 
 	return str;
 }
 
 char *
 psensor_measure_to_str(const struct measure *m,
-		       unsigned int type,
-		       unsigned int use_celsius)
+					   unsigned int type,
+					   unsigned int use_celsius)
 {
 	return psensor_value_to_str(type, m->value, use_celsius);
 }
@@ -249,24 +267,28 @@ void psensor_set_current_value(struct psensor *sensor, double value)
 void psensor_set_current_measure(struct psensor *s, double v, struct timeval tv)
 {
 	memmove(s->measures,
-		&s->measures[1],
-		(s->values_max_length - 1) * sizeof(struct measure));
+			&s->measures[1],
+			(s->values_max_length - 1) * sizeof(struct measure));
 
 	s->measures[s->values_max_length - 1].value = v;
 	s->measures[s->values_max_length - 1].time = tv;
 
-	if (s->sess_lowest == UNKNOWN_DBL_VALUE || v < s->sess_lowest)
+	if (s->sess_lowest == UNKNOWN_DOUBLE_VALUE || v < s->sess_lowest)
 		s->sess_lowest = v;
 
-	if (s->sess_highest == UNKNOWN_DBL_VALUE || v > s->sess_highest)
+	if (s->sess_highest == UNKNOWN_DOUBLE_VALUE || v > s->sess_highest)
 		s->sess_highest = v;
 
-	if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) {
-		if (!s->alarm_raised && s->cb_alarm_raised) {
+	if (v > s->alarm_high_threshold || v < s->alarm_low_threshold)
+	{
+		if (!s->alarm_raised && s->cb_alarm_raised)
+		{
 			s->alarm_raised = true;
 			s->cb_alarm_raised(s, s->cb_alarm_raised_data);
 		}
-	} else {
+	}
+	else
+	{
 		s->alarm_raised = false;
 	}
 }
@@ -285,25 +307,28 @@ struct measure *psensor_get_current_measure(struct psensor *sensor)
  * Returns the minimal value of a given 'type' (SENSOR_TYPE_TEMP or
  * SENSOR_TYPE_FAN)
  */
-static double get_min_value(struct psensor **sensors, int type)
+static double get_min_value(struct psensor **sensors, unsigned int type)
 {
-	double m = UNKNOWN_DBL_VALUE;
+	double m = UNKNOWN_DOUBLE_VALUE;
 	struct psensor **s = sensors;
 
-	while (*s) {
+	while (*s)
+	{
 		struct psensor *sensor = *s;
 
-		if (sensor->type & type) {
-			int i;
+		if (sensor->type & type)
+		{
+			unsigned int i;
 			double t;
 
-			for (i = 0; i < sensor->values_max_length; i++) {
+			for (i = 0; i < sensor->values_max_length; i++)
+			{
 				t = sensor->measures[i].value;
 
-				if (t == UNKNOWN_DBL_VALUE)
+				if (t == UNKNOWN_DOUBLE_VALUE)
 					continue;
 
-				if (m == UNKNOWN_DBL_VALUE || t < m)
+				if (m == UNKNOWN_DOUBLE_VALUE || t < m)
 					m = t;
 			}
 		}
@@ -317,25 +342,28 @@ static double get_min_value(struct psensor **sensors, int type)
  * Returns the maximal value of a given 'type' (SENSOR_TYPE_TEMP or
  * SENSOR_TYPE_FAN)
  */
-double get_max_value(struct psensor **sensors, int type)
+double get_max_value(struct psensor **sensors, unsigned int type)
 {
-	double m = UNKNOWN_DBL_VALUE;
+	double m = UNKNOWN_DOUBLE_VALUE;
 	struct psensor **s = sensors;
 
-	while (*s) {
+	while (*s)
+	{
 		struct psensor *sensor = *s;
 
-		if (sensor->type & type) {
-			int i;
+		if (sensor->type & type)
+		{
+			unsigned int i;
 			double t;
 
-			for (i = 0; i < sensor->values_max_length; i++) {
+			for (i = 0; i < sensor->values_max_length; i++)
+			{
 				t = sensor->measures[i].value;
 
-				if (t == UNKNOWN_DBL_VALUE)
+				if (t == UNKNOWN_DOUBLE_VALUE)
 					continue;
 
-				if (m == UNKNOWN_DBL_VALUE || t > m)
+				if (m == UNKNOWN_DOUBLE_VALUE || t > m)
 					m = t;
 			}
 		}
@@ -367,7 +395,8 @@ double get_max_temp(struct psensor **sensors)
 
 const char *psensor_type_to_str(unsigned int type)
 {
-	if (type & SENSOR_TYPE_NVCTRL) {
+	if (type & SENSOR_TYPE_NVCTRL)
+	{
 		if (type & SENSOR_TYPE_TEMP)
 			return "Temperature";
 		else if (type & SENSOR_TYPE_GRAPHICS)
@@ -382,7 +411,8 @@ const char *psensor_type_to_str(unsigned int type)
 		return "NVIDIA GPU";
 	}
 
-	if (type & SENSOR_TYPE_ATIADL) {
+	if (type & SENSOR_TYPE_ATIADL)
+	{
 		if (type & SENSOR_TYPE_TEMP)
 			return "AMD GPU Temperature";
 		else if (type & SENSOR_TYPE_RPM)
@@ -415,16 +445,20 @@ const char *psensor_type_to_str(unsigned int type)
 	return "N/A";
 }
 
-
 const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
 {
-	if (is_temp_type(type)) {
+	if (is_temp_type(type))
+	{
 		if (use_celsius)
 			return "\302\260C";
 		return "\302\260F";
-	} else if (type & SENSOR_TYPE_RPM) {
+	}
+	else if (type & SENSOR_TYPE_RPM)
+	{
 		return _("RPM");
-	} else if (type & SENSOR_TYPE_PERCENT) {
+	}
+	else if (type & SENSOR_TYPE_PERCENT)
+	{
 		return _("%");
 	}
 	return _("N/A");
@@ -432,14 +466,16 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
 
 void psensor_log_measures(struct psensor **sensors)
 {
-	if (log_level == LOG_DEBUG) {
+	if (log_level == LOG_DEBUG)
+	{
 		if (!sensors)
 			return;
 
-		while (*sensors) {
+		while (*sensors)
+		{
 			log_debug("Measure: %s %.2f",
-				   (*sensors)->name,
-				   psensor_get_current_value(*sensors));
+					  (*sensors)->name,
+					  psensor_get_current_value(*sensors));
 
 			sensors++;
 		}
@@ -449,10 +485,10 @@ void psensor_log_measures(struct psensor **sensors)
 struct psensor **psensor_list_copy(struct psensor **sensors)
 {
 	struct psensor **result;
-	int n, i;
+	size_t n, i;
 
 	n = psensor_list_size(sensors);
-	result = malloc((n+1) * sizeof(struct psensor *));
+	result = malloc((n + 1) * sizeof(struct psensor *));
 	for (i = 0; i < n; i++)
 		result[i] = sensors[i];
 	result[n] = NULL;
@@ -464,6 +500,6 @@ char *
 psensor_current_value_to_str(const struct psensor *s, unsigned int use_celsius)
 {
 	return psensor_value_to_str(s->type,
-				    psensor_get_current_value(s),
-				    use_celsius);
+								psensor_get_current_value(s),
+								use_celsius);
 }
diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 111976b5..5923b096 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_PSENSOR_H_
-#define _PSENSOR_PSENSOR_H_
+#ifndef PSENSOR_PSENSOR_H
+#define PSENSOR_PSENSOR_H
 
 #include <config.h>
 
@@ -27,33 +27,33 @@
 
 enum psensor_type {
 	/* type of sensor values */
-	SENSOR_TYPE_TEMP = 0x00001,
-	SENSOR_TYPE_RPM = 0x00002,
-	SENSOR_TYPE_PERCENT = 0x00004,
+	SENSOR_TYPE_TEMP = 0x00001U,
+	SENSOR_TYPE_RPM = 0x00002U,
+	SENSOR_TYPE_PERCENT = 0x00004U,
 
 	/* Whether the sensor is remote */
-	SENSOR_TYPE_REMOTE = 0x00008,
+	SENSOR_TYPE_REMOTE = 0x00008U,
 
 	/* Libraries used for retrieving sensor information */
-	SENSOR_TYPE_LMSENSOR = 0x00100,
-	SENSOR_TYPE_NVCTRL = 0x00200,
-	SENSOR_TYPE_GTOP = 0x00400,
-	SENSOR_TYPE_ATIADL = 0x00800,
-	SENSOR_TYPE_ATASMART = 0x01000,
-	SENSOR_TYPE_HDDTEMP = 0x02000,
-	SENSOR_TYPE_UDISKS2 = 0x800000,
+	SENSOR_TYPE_LMSENSOR = 0x00100U,
+	SENSOR_TYPE_NVCTRL = 0x00200U,
+	SENSOR_TYPE_GTOP = 0x00400U,
+	SENSOR_TYPE_ATIADL = 0x00800U,
+	SENSOR_TYPE_ATASMART = 0x01000U,
+	SENSOR_TYPE_HDDTEMP = 0x02000U,
+	SENSOR_TYPE_UDISKS2 = 0x800000U,
 
 	/* Type of HW component */
-	SENSOR_TYPE_HDD = 0x04000,
-	SENSOR_TYPE_CPU = 0x08000,
-	SENSOR_TYPE_GPU = 0x10000,
-	SENSOR_TYPE_FAN = 0x20000,
+	SENSOR_TYPE_HDD = 0x04000U,
+	SENSOR_TYPE_CPU = 0x08000U,
+	SENSOR_TYPE_GPU = 0x10000U,
+	SENSOR_TYPE_FAN = 0x20000U,
 
-	SENSOR_TYPE_GRAPHICS = 0x40000,
-	SENSOR_TYPE_VIDEO = 0x80000,
-	SENSOR_TYPE_PCIE = 0x100000,
-	SENSOR_TYPE_MEMORY = 0x200000,
-	SENSOR_TYPE_AMBIENT = 0x400000,
+	SENSOR_TYPE_GRAPHICS = 0x40000U,
+	SENSOR_TYPE_VIDEO = 0x80000U,
+	SENSOR_TYPE_PCIE = 0x100000U,
+	SENSOR_TYPE_MEMORY = 0x200000U,
+	SENSOR_TYPE_AMBIENT = 0x400000U,
 
 	/* Combinations */
 	SENSOR_TYPE_HDD_TEMP = (SENSOR_TYPE_HDD | SENSOR_TYPE_TEMP),
@@ -63,70 +63,64 @@ enum psensor_type {
 struct psensor {
 	/* Human readable name of the sensor.  It may not be uniq. */
 	char *name;
-
 	/* Uniq id of the sensor */
 	char *id;
-
 	/* Name of the chip. */
 	char *chip;
+	/* Whether an alarm is raised for this sensor */
+	bool alarm_raised;
 
 	/* Maximum length of 'values' */
-	int values_max_length;
-
+	unsigned int values_max_length;
+	/* see psensor_type */
+	unsigned int type;
 	/*
 	 * Last registered measures of the sensor.  Index 0 for the
 	 * oldest measure.
 	 */
 	struct measure *measures;
 
-	/* see psensor_type */
-	unsigned int type;
+	void (*cb_alarm_raised)(struct psensor *, void *);
+	void *cb_alarm_raised_data;
 
-	double max;
+	void *provider_data;
+	void (*provider_data_free_fct)(void *);
+	#ifdef HAVE_LIBATIADL
+	/* AMD id for the aticonfig */
+	int amd_id;
+	#endif
 
+	/* maximium value */
+	double max;
+	/* minimium value */
 	double min;
-
 	/* The highest value detected during this session. */
 	double sess_highest;
-
 	/* The lowest value detected during this session. */
 	double sess_lowest;
-
 	double alarm_high_threshold;
 	double alarm_low_threshold;
 
-	/* Whether an alarm is raised for this sensor */
-	bool alarm_raised;
-
-	void (*cb_alarm_raised)(struct psensor *, void *);
-	void *cb_alarm_raised_data;
-
-#ifdef HAVE_LIBATIADL
-	/* AMD id for the aticonfig */
-	int amd_id;
-#endif
-
-	void *provider_data;
-	void (*provider_data_free_fct)(void *);
 };
+//UNPACK_STRUCT()
 
 struct psensor *psensor_create(char *id,
 			       char *name,
 			       char *chip,
 			       unsigned int type,
-			       int values_max_length);
+			       unsigned int values_max_length);
 
-void psensor_values_resize(struct psensor *s, int new_size);
+void psensor_values_resize(struct psensor *s, unsigned int new_size);
 
 void psensor_free(struct psensor *sensor);
 
 void psensor_list_free(struct psensor **sensors);
-int psensor_list_size(struct psensor **sensors);
+size_t psensor_list_size(struct psensor **sensors);
 
 struct psensor *psensor_list_get_by_id(struct psensor **sensors,
 				       const char *id);
 
-int is_temp_type(unsigned int type);
+unsigned int is_temp_type(unsigned int type);
 
 double get_min_temp(struct psensor **sensors);
 double get_max_temp(struct psensor **sensors);
@@ -142,14 +136,14 @@ double get_max_rpm(struct psensor **sensors);
  */
 char *psensor_value_to_str(unsigned int type,
 			   double value,
-			   int use_celsius);
+			   unsigned int use_celsius);
 
 char *psensor_measure_to_str(const struct measure *m,
 			     unsigned int type,
 			     unsigned int use_celsius);
 
-struct psensor **psensor_list_add(struct psensor **sensors,
-				  struct psensor *sensor);
+// struct psensor **psensor_list_add(struct psensor **sensors,
+// 				  struct psensor *sensor);
 
 void psensor_list_append(struct psensor ***sensors, struct psensor *sensor);
 
@@ -168,7 +162,7 @@ const char *psensor_type_to_str(unsigned int type);
 
 const char *psensor_type_to_unit_str(unsigned int type, int use_celsius);
 
-double get_max_value(struct psensor **sensors, int type);
+double get_max_value(struct psensor **sensors, unsigned int type);
 
 char *psensor_current_value_to_str(const struct psensor *, unsigned int);
 
diff --git a/src/lib/psensor_json.c b/src/lib/psensor_json.c
index 14e69e01..53ce4f6d 100644
--- a/src/lib/psensor_json.c
+++ b/src/lib/psensor_json.c
@@ -115,24 +115,26 @@ char *sensor_to_json_string(struct psensor *s)
 
 char *sensors_to_json_string(struct psensor **sensors)
 {
-	struct psensor **sensors_cur;
+    // struct psensor **sensors_cur; // Remove this pointer
 	char *str;
 	json_object *obj = json_object_new_array();
 
 	if (sensors) {
-		sensors_cur = sensors;
+        // sensors_cur = sensors; // Not needed
+        size_t i = 0; // Use an index
 
-		while (*sensors_cur) {
-			struct psensor *s = *sensors_cur;
+        // Access via index
+        while (sensors[i] != NULL) {
+            struct psensor *s = sensors[i];
 
 			json_object_array_add(obj, sensor_to_json(s));
 
-			sensors_cur++;
+            // sensors_cur++; // Remove the unsafe pointer increment
+            i++; // Increment the index instead
 		}
 	}
 
 	str = strdup(json_object_to_json_string(obj));
-
 	json_object_put(obj);
 
 	return str;
@@ -140,7 +142,7 @@ char *sensors_to_json_string(struct psensor **sensors)
 
 struct psensor *psensor_new_from_json(json_object *o,
 				      const char *sensors_url,
-				      int values_max_length)
+				      unsigned int values_max_length)
 {
 	json_object *oid, *oname, *otype;
 	struct psensor *s;
@@ -151,8 +153,12 @@ struct psensor *psensor_new_from_json(json_object *o,
 	json_object_object_get_ex(o, "type", &otype);
 
 	eid = url_encode(json_object_get_string(oid));
-	url = malloc(strlen(sensors_url) + 1 + strlen(eid) + 1);
-	sprintf(url, "%s/%s", sensors_url, eid);
+	
+	int result = asprintf(&url, "%s/%s", sensors_url, eid);
+	if (result == -1) {
+		free(eid);
+		return NULL;
+	}
 
 	s = psensor_create(strdup(url),
 			   strdup(json_object_get_string(oname)),
diff --git a/src/lib/psensor_json.h b/src/lib/psensor_json.h
index 14c97949..34f84c0c 100644
--- a/src/lib/psensor_json.h
+++ b/src/lib/psensor_json.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_PSENSOR_JSON_H_
-#define _PSENSOR_PSENSOR_JSON_H_
+#ifndef PSENSOR_PSENSOR_JSON_H
+#define PSENSOR_PSENSOR_JSON_H
 
 #include "config.h"
 
@@ -38,5 +38,5 @@ char *sensors_to_json_string(struct psensor **sensors);
  */
 struct psensor *psensor_new_from_json(json_object *o,
 				      const char *sensors_url,
-				      int values_max_length);
+				      unsigned int values_max_length);
 #endif
diff --git a/src/lib/ptime.h b/src/lib/ptime.h
index 1a6f5a59..6d41009b 100644
--- a/src/lib/ptime.h
+++ b/src/lib/ptime.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _P_TIME_H
-#define _P_TIME_H
+#ifndef PSENSOR_TIME_H
+#define PSENSOR_TIME_H
 
 #include <time.h>
 
diff --git a/src/lib/pudisks2.c b/src/lib/pudisks2.c
index 7111174d..370328ab 100644
--- a/src/lib/pudisks2.c
+++ b/src/lib/pudisks2.c
@@ -68,7 +68,7 @@ static void smart_update(struct psensor *s, UDisksDriveAta *ata)
 	    (t.tv_sec - data->last_smart_update.tv_sec < SMART_UPDATE_INTERVAL))
 		return;
 
-	log_fct("%s: update SMART data for %s", PROVIDER_NAME, data->path);
+	log_functionname("%s: update SMART data for %s", PROVIDER_NAME, data->path);
 
 	variant = g_variant_new_parsed("{'nowakeup': %v}",
 				       g_variant_new_boolean(TRUE));
@@ -78,12 +78,12 @@ static void smart_update(struct psensor *s, UDisksDriveAta *ata)
 						      NULL,
 						      NULL);
 
-	if (!ret)
-		log_fct("%s: SMART update failed for %s",
+	if (!ret) {
+		log_functionname("%s: SMART update failed for %s",
 			PROVIDER_NAME,
 			data->path);
-
-		data->last_smart_update = t;
+	}
+	data->last_smart_update = t;
 }
 
 void udisks2_psensor_list_update(struct psensor **sensors)
@@ -122,7 +122,7 @@ void udisks2_psensor_list_update(struct psensor **sensors)
 	}
 }
 
-void udisks2_psensor_list_append(struct psensor ***sensors, int values_length)
+void udisks2_psensor_list_append(struct psensor ***sensors, unsigned int values_length)
 {
 	UDisksClient *client;
 	GList *objects, *cur;
@@ -134,13 +134,13 @@ void udisks2_psensor_list_append(struct psensor ***sensors, int values_length)
 	struct psensor *s;
 	struct udisks_data *data;
 
-	log_fct_enter();
+	log_functionname_enter();
 
 	client = udisks_client_new_sync(NULL, NULL);
 
 	if (!client) {
 		log_err(_("%s: cannot get the udisks2 client"), PROVIDER_NAME);
-		log_fct_exit();
+		log_functionname_exit();
 		return;
 	}
 
@@ -158,22 +158,22 @@ void udisks2_psensor_list_append(struct psensor ***sensors, int values_length)
 			     NULL);
 
 		if (!drive) {
-			log_fct("Not a drive: %s", path);
+			log_functionname("Not a drive: %s", path);
 			continue;
 		}
 
 		if (!drive_ata) {
-			log_fct("Not an ATA drive: %s", path);
+			log_functionname("Not an ATA drive: %s", path);
 			continue;
 		}
 
 		if (!udisks_drive_ata_get_smart_enabled(drive_ata)) {
-			log_fct("SMART not enabled: %s", path);
+			log_functionname("SMART not enabled: %s", path);
 			continue;
 		}
 
 		if (!udisks_drive_ata_get_smart_temperature(drive_ata)) {
-			log_fct("No temperature available: %s", path);
+			log_functionname("No temperature available: %s", path);
 			continue;
 		}
 
@@ -212,5 +212,5 @@ void udisks2_psensor_list_append(struct psensor ***sensors, int values_length)
 
 	g_list_free(objects);
 
-	log_fct_exit();
+	log_functionname_exit();
 }
diff --git a/src/lib/pudisks2.h b/src/lib/pudisks2.h
index 1c969d6f..24ffa08c 100644
--- a/src/lib/pudisks2.h
+++ b/src/lib/pudisks2.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UDISKS2_H_
-#define _PSENSOR_UDISKS2_H_
+#ifndef PSENSOR_UDISKS2_H
+#define PSENSOR_UDISKS2_H
 
 #include <psensor.h>
 
@@ -25,7 +25,7 @@
 
 static inline bool udisks2_is_supported(void) { return true; }
 
-void udisks2_psensor_list_append(struct psensor ***, int);
+void udisks2_psensor_list_append(struct psensor ***, unsigned int);
 void udisks2_psensor_list_update(struct psensor **);
 
 #else
@@ -33,7 +33,7 @@ void udisks2_psensor_list_update(struct psensor **);
 static inline bool udisks2_is_supported(void) { return false; }
 
 static inline void
-udisks2_psensor_list_append(struct psensor ***s, int n) {}
+udisks2_psensor_list_append(struct psensor ***s, unsigned int n) {}
 
 static inline void
 udisks2_psensor_list_update(struct psensor **s) {}
diff --git a/src/lib/slog.c b/src/lib/slog.c
index d6c4bc2e..cdbea9ec 100644
--- a/src/lib/slog.c
+++ b/src/lib/slog.c
@@ -1,4 +1,5 @@
 /*
+ * slog.c - logging functions for sensors
  * Copyright (C) 2010-2014 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
@@ -16,6 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+#define _GNU_SOURCE
+#include <pthread.h>
+
 #define _LARGEFILE_SOURCE 1
 #include "config.h"
 
@@ -39,12 +43,13 @@
 #include "slog.h"
 
 static FILE *file;
-static double *last_values;
-static int period;
-static struct psensor **sensors;
+static double *s_last_values;
+static unsigned int period;
+static struct psensor **s_sensors;
 static pthread_mutex_t *sensors_mutex;
 static pthread_t thread;
 static time_t st;
+static volatile int slog_thread_running = 1;
 
 static const char *DEFAULT_FILENAME = "sensors.log";
 
@@ -72,14 +77,15 @@ static char *get_default_path(void)
 	home = getenv("HOME");
 
 	if (home) {
-		dir = malloc(strlen(home)+1+strlen(".psensor")+1);
-		sprintf(dir, "%s/%s", home, ".psensor");
+		int result = asprintf(&dir, "%s/%s", home, ".psensor");
+		if (result == -1 )
+			return NULL;
 		mkdir(dir, 0777);
 
-		path = malloc(strlen(dir)+1+strlen(DEFAULT_FILENAME)+1);
-		sprintf(path, "%s/%s", dir, DEFAULT_FILENAME);
-
+		result = asprintf(&path, "%s/%s", dir, DEFAULT_FILENAME);		
 		free(dir);
+		if (result == -1 ) 
+			return NULL;
 
 		return path;
 	}
@@ -105,15 +111,15 @@ static bool slog_open(const char *path, struct psensor **sensors)
 		log_err(_("Cannot open sensor log file: %s."), lpath);
 
 	if (!path)
-		free((char *)lpath);
+		free(lpath);
 
 	if (!file)
 		return 0;
 
 	st = time(NULL);
 	t = time_to_str(&st);
-
 	fprintf(file, "I,%s,%s\n", t, VERSION);
+	free(t);
 
 	while (*sensors) {
 		fprintf(file, "S,%s,%x\n", (*sensors)->id,  (*sensors)->type);
@@ -127,7 +133,7 @@ static bool slog_open(const char *path, struct psensor **sensors)
 
 static void slog_write_sensors(struct psensor **sensors)
 {
-	int count, i;
+	size_t count, i;
 	double v;
 	struct timeval tv;
 	bool first_call;
@@ -141,23 +147,23 @@ static void slog_write_sensors(struct psensor **sensors)
 
 	count = psensor_list_size(sensors);
 
-	if (last_values) {
+	if (s_last_values) {
 		first_call = 0;
 	} else {
 		first_call = 1;
-		last_values = malloc(count * sizeof(double));
+		s_last_values = malloc(count * sizeof(double));
 	}
 
 	fprintf(file, "%ld", (long int)(tv.tv_sec - st));
 	for (i = 0; i < count; i++) {
 		v = psensor_get_current_value(sensors[i]);
 
-		if (!first_call && last_values[i] == v)
+		if (!first_call && s_last_values[i] == v)
 			fputc(',', file);
 		else
 			fprintf(file, ",%.1f", v);
 
-		last_values[i] = v;
+		s_last_values[i] = v;
 	}
 
 	fputc('\n', file);
@@ -167,27 +173,27 @@ static void slog_write_sensors(struct psensor **sensors)
 
 static void *slog_routine(void *data)
 {
-	while (1) {
+	while (slog_thread_running) {
 		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
 		pmutex_lock(sensors_mutex);
-		slog_write_sensors(sensors);
+		slog_write_sensors(s_sensors);
 		pmutex_unlock(sensors_mutex);
 		pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
 		sleep(period);
 	}
-
-	pthread_exit(NULL);
+	return NULL;
 }
 
 void slog_close(void)
 {
 	if (file) {
-		pthread_cancel(thread);
+		slog_thread_running = 0;  // signal to stop thread
+        pthread_join(thread, NULL);  // wait for thread to finish
 
 		fclose(file);
 		file = NULL;
-		free(last_values);
-		last_values = NULL;
+		free(s_last_values);
+		s_last_values = NULL;
 	} else {
 		log_debug(_("Sensor log not open, cannot close."));
 	}
@@ -196,16 +202,16 @@ void slog_close(void)
 bool slog_activate(const char *path,
 		   struct psensor **ss,
 		   pthread_mutex_t *mutex,
-		   int p)
+		   unsigned int p)
 {
 	bool ret;
 
-	sensors = ss;
+	s_sensors = ss;
 	sensors_mutex = mutex;
 	period = p;
 
 	pthread_mutex_lock(mutex);
-	ret = slog_open(path, sensors);
+	ret = slog_open(path, s_sensors);
 	pthread_mutex_unlock(mutex);
 
 	if (ret)
diff --git a/src/lib/slog.h b/src/lib/slog.h
index 4a39461a..3d212ef6 100644
--- a/src/lib/slog.h
+++ b/src/lib/slog.h
@@ -16,14 +16,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_SLOG_H_
-#define _PSENSOR_SLOG_H_
+#ifndef PSENSOR_SLOG_H
+#define PSENSOR_SLOG_H
 
 #include <pthread.h>
 
 #include "psensor.h"
 
-bool slog_activate(const char *, struct psensor **, pthread_mutex_t *, int s);
+bool slog_activate(const char *, struct psensor **, pthread_mutex_t *, unsigned int s);
 void slog_close(void);
 
 #endif
diff --git a/src/lib/temperature.h b/src/lib/temperature.h
index cb3e4c45..1fb375be 100644
--- a/src/lib/temperature.h
+++ b/src/lib/temperature.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_TEMPERATURE_H_
-#define _PSENSOR_TEMPERATURE_H_
+#ifndef PSENSOR_TEMPERATURE_H
+#define PSENSOR_TEMPERATURE_H
 
 double celsius_to_fahrenheit(double c);
 double fahrenheit_to_celsius(double c);
diff --git a/src/lib/url.c b/src/lib/url.c
index c586a2ac..0eb5c244 100644
--- a/src/lib/url.c
+++ b/src/lib/url.c
@@ -29,7 +29,7 @@
 
 char *url_normalize(const char *url)
 {
-	int n = strlen(url);
+	size_t n = strlen(url);
 	char *ret = strdup(url);
 
 	if (url[n - 1] == '/')
@@ -51,7 +51,7 @@ char *url_encode(const char *str)
 {
 	char *c, *buf, *pbuf;
 
-	buf = malloc(strlen(str) * 3 + 1);
+	buf = (char *)malloc(strlen(str) * 3 + 1);
 	pbuf = buf;
 
 	c = (char *)str;
diff --git a/src/lib/url.h b/src/lib/url.h
index a37d5cab..e58ca83b 100644
--- a/src/lib/url.h
+++ b/src/lib/url.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PLIB_URL_H_
-#define _PLIB_URL_H_
+#ifndef PSENSOR_PLIB_URL_H
+#define PSENSOR_PLIB_URL_H
 
 char *url_encode(const char *str);
 char *url_normalize(const char *url);
diff --git a/src/main.c b/src/main.c
index 5686f5be..4834cd88 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,8 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+#define _GNU_SOURCE  // Thêm này ở đầu file, trước mọi #include
 #include <locale.h>
 
+#include <sched.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -145,7 +147,7 @@ static void *update_measures(void *data)
 		atasmart_psensor_list_update(sensors);
 		hddtemp_psensor_list_update(sensors);
 
-		psensor_log_measures(sensors);
+		//psensor_log_measures(sensors);
 
 		period = cfg->sensor_update_interval;
 
@@ -241,7 +243,7 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 			(s->id, &s->alarm_high_threshold);
 
 		if (!ret) {
-			if (s->max == UNKNOWN_DBL_VALUE) {
+			if (s->max == UNKNOWN_DOUBLE_VALUE) {
 				if (s->type & SENSOR_TYPE_TEMP)
 					s->alarm_high_threshold = high_temp;
 			} else {
@@ -252,7 +254,7 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 		ret = config_get_sensor_alarm_low_threshold
 			(s->id, &s->alarm_low_threshold);
 
-		if (!ret && s->min != UNKNOWN_DBL_VALUE)
+		if (!ret && s->min != UNKNOWN_DOUBLE_VALUE)
 			s->alarm_low_threshold = s->min;
 
 		sensors++;
@@ -288,8 +290,7 @@ static void log_init(void)
 	if (!dir)
 		return;
 
-	path = malloc(strlen(dir)+1+strlen("log")+1);
-	sprintf(path, "%s/%s", dir, "log");
+	asprintf(&path, "%s/%s", dir, "log");
 
 	log_open(path);
 
@@ -310,12 +311,10 @@ static gboolean initial_window_show(gpointer data)
 	struct ui_psensor *ui;
 
 	log_debug("initial_window_show()");
-
 	ui = (struct ui_psensor *)data;
 
 	log_debug("is_status_supported: %d", is_status_supported());
-	log_debug("is_appindicator_supported: %d",
-		   is_appindicator_supported());
+	log_debug("is_appindicator_supported: %d", is_appindicator_supported());
 	log_debug("hide_on_startup: %d", ui->config->hide_on_startup);
 
 	if (!ui->config->hide_on_startup
@@ -370,6 +369,10 @@ static void cleanup(struct ui_psensor *ui)
 
 	config_cleanup();
 
+	free(ui->config->graph_fgcolor);
+	free(ui->config->graph_bgcolor);
+	free(ui->config);
+
 	log_debug("Cleanup done, closing log");
 }
 
@@ -380,12 +383,13 @@ static void cleanup(struct ui_psensor *ui)
  */
 static struct psensor **create_sensors_list(const char *url)
 {
+	const unsigned int measures_len = 600;
 	struct psensor **sensors;
 
 	if (url) {
 		if (rsensor_is_supported()) {
 			rsensor_init();
-			sensors = get_remote_sensors(url, 600);
+			sensors = get_remote_sensors(url, measures_len);
 		} else {
 			log_err(_("Psensor has not been compiled with remote "
 				  "sensor support."));
@@ -396,25 +400,25 @@ static struct psensor **create_sensors_list(const char *url)
 		*sensors = NULL;
 
 		if (config_is_lmsensor_enabled())
-			lmsensor_psensor_list_append(&sensors, 600);
+			lmsensor_psensor_list_append(&sensors, measures_len);
 
 		if (config_is_hddtemp_enabled())
-			hddtemp_psensor_list_append(&sensors, 600);
+			hddtemp_psensor_list_append(&sensors, measures_len);
 
 		if (config_is_libatasmart_enabled())
-			atasmart_psensor_list_append(&sensors, 600);
+			atasmart_psensor_list_append(&sensors, measures_len);
 
 		if (config_is_nvctrl_enabled())
-			nvidia_psensor_list_append(&sensors, 600);
+			nvidia_psensor_list_append(&sensors, measures_len);
 
 		if (config_is_atiadlsdk_enabled())
-			amd_psensor_list_append(&sensors, 600);
+			amd_psensor_list_append(&sensors, measures_len);
 
 		if (config_is_gtop2_enabled())
-			gtop2_psensor_list_append(&sensors, 600);
+			gtop2_psensor_list_append(&sensors, measures_len);
 
 		if (config_is_udisks2_enabled())
-			udisks2_psensor_list_append(&sensors, 600);
+			udisks2_psensor_list_append(&sensors, measures_len);
 	}
 
 	associate_preferences(sensors);
@@ -430,13 +434,29 @@ int main(int argc, char **argv)
 	char *url = NULL;
 	GApplication *app;
 
+	// cpu_set_t mask;
+	// CPU_ZERO(&mask);
+	// CPU_SET(0, &mask);  // Chỉ dùng CPU 0
+	// sched_setaffinity(0, sizeof(mask), &mask);
+
 	program_name = argv[0];
 
-	setlocale(LC_ALL, "");
+	printf("DATE TIME: %s %s \n", __TIME__, __DATE__);
+	// char *current_locale = setlocale(LC_ALL, "");
+	// printf("Current locale: %s\n", current_locale ? current_locale : "NULL");
+	// printf("LANGUAGE=%s\n", getenv("LANGUAGE") ? getenv("LANGUAGE") : "NULL");
+	// printf("LANG=%s\n", getenv("LANG") ? getenv("LANG") : "NULL");
+	// printf("LC_ALL=%s\n", getenv("LC_ALL") ? getenv("LC_ALL") : "NULL");
 
 #if ENABLE_NLS
+        //printf("PACKAGE: %s, LOCALEDIR: %s\n", PACKAGE, LOCALEDIR);
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
+        // char *bound_dir = bindtextdomain(PACKAGE, NULL);
+        // printf("Bound directory: %s\n", bound_dir ? bound_dir : "NULL");
+        // printf("Current textdomain: %s\n", textdomain(NULL));
+#else
+        printf("NLS not enabled\n");
 #endif
 
 	new_instance = 0;
@@ -446,14 +466,21 @@ int main(int argc, char **argv)
 				   &opti)) != -1) {
 		switch (optc) {
 		case 'u':
-			if (optarg)
+			if (optarg) {
+				if (url)
+					free(url);
 				url = strdup(optarg);
+			}
 			break;
 		case 'h':
 			print_help();
+			if (url)
+				free(url);
 			exit(EXIT_SUCCESS);
 		case 'v':
 			print_version();
+			if (url)
+				free(url);
 			exit(EXIT_SUCCESS);
 		case 'd':
 			log_level = atoi(optarg);
@@ -471,6 +498,8 @@ int main(int argc, char **argv)
 	if (!cmdok || optind != argc) {
 		fprintf(stderr, _("Try `%s --help' for more information.\n"),
 			program_name);
+		if (url)
+			free(url);
 		exit(EXIT_FAILURE);
 	}
 
@@ -483,6 +512,8 @@ int main(int argc, char **argv)
 	if (!new_instance && g_application_get_is_remote(app)) {
 		g_application_activate(app);
 		log_warn(_("A Psensor instance already exists."));
+		if (url)
+			free(url);
 		exit(EXIT_SUCCESS);
 	}
 
@@ -513,8 +544,8 @@ int main(int argc, char **argv)
 			      &ui.sensors_mutex,
 			      config_get_slog_interval());
 
-	ui_status_init(&ui);
-	ui_status_set_visible(1);
+	// ui_status_init(&ui);
+	// ui_status_set_visible(1);
 
 	/* main window */
 	ui_window_create(&ui);
@@ -522,7 +553,6 @@ int main(int argc, char **argv)
 	ui_enable_alpha_channel(&ui);
 
 	ret = pthread_create(&thread, NULL, update_measures, &ui);
-
 	if (ret)
 		log_err(_("Failed to create thread for monitoring sensors"));
 
@@ -535,26 +565,34 @@ int main(int argc, char **argv)
 
 	gdk_notify_startup_complete();
 
-	/*
-	 * hack, did not find a cleaner solution.
-	 * wait 30s to ensure that the status icon is attempted to be
-	 * drawn before determining whether the main window must be
-	 * show.
-	 */
+	// /*
+	//  * hack, did not find a cleaner solution.
+	//  * wait 30s to ensure that the status icon is attempted to be
+	//  * drawn before determining whether the main window must be
+	//  * show.
+	//  */
 	if  (ui.config->hide_on_startup)
-		g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui);
+	{
+		g_timeout_add(1000, (GSourceFunc)initial_window_show, &ui);
+	}
 	else
+	{
 		initial_window_show(&ui);
+	}
 
 	/* main loop */
 	gtk_main();
 
-	g_object_unref(app);
 	cleanup(&ui);
+	pthread_join(thread, NULL);
+
+	//graph_cleanup();
 
 	log_debug("Quitting...");
 	log_close();
 
+	g_object_unref(app);
+
 	if (url)
 		free(url);
 
diff --git a/src/notify_cmd.c b/src/notify_cmd.c
index 89f8b505..df7adf8f 100644
--- a/src/notify_cmd.c
+++ b/src/notify_cmd.c
@@ -34,22 +34,19 @@ void notify_cmd(struct psensor *s)
 	if (script) {
 		v = psensor_current_value_to_str(s, 1);
 
-		cmd = malloc(strlen(script)
-			     + 1
-			     + 1
-			     + strlen(s->id)
-			     + 1
-			     + 1
-			     + strlen(v)
-			     + 1);
+		int result = asprintf(&cmd, "%s \"%s\" %s", script, s->id, v);
+		if (result == -1) {
+			log_functionname("cannot allote memory when trying to execute cmd: %s", cmd);
+			if (v) free(v);
+			free(script);
+			return;
+		}
 
-		sprintf(cmd, "%s \"%s\" %s", script, s->id, v);
-
-		log_fct("execute cmd: %s", cmd);
+		log_functionname("execute cmd: %s", cmd);
 
 		ret = system(cmd);
 
-		log_fct("cmd returns: %d", ret);
+		log_functionname("cmd returns: %d", ret);
 
 		free(cmd);
 		free(v);
diff --git a/src/notify_cmd.h b/src/notify_cmd.h
index 6ad5782b..41324692 100644
--- a/src/notify_cmd.h
+++ b/src/notify_cmd.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_NOTIFY_CMD_H_
-#define _PSENSOR_NOTIFY_CMD_H_
+#ifndef PSENSOR_NOTIFY_CMD_H
+#define PSENSOR_NOTIFY_CMD_H
 
 #include "psensor.h"
 
diff --git a/src/paths.h.in b/src/paths.h.in
new file mode 100644
index 00000000..0b16baba
--- /dev/null
+++ b/src/paths.h.in
@@ -0,0 +1,93 @@
+#ifndef PSENSOR_PATHS_H
+#define PSENSOR_PATHS_H
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <slog.h>
+
+#define PACKAGE_DATA_DIR "@pkgdatadir@"
+
+/*
+ * get_data_path attempts to find the installed data directory in this order:
+ * 1) PSENSOR_DATA_DIR environment variable (absolute path)
+ * 2) PACKAGE_DATA_DIR if it exists as given (absolute or relative path)
+ * 3) If PACKAGE_DATA_DIR is relative, try resolving it relative to the
+ *    executable directory
+ * 4) Default locations relative to the executable (../share/psensor, src/glade)
+ * 5) Fallback to PACKAGE_DATA_DIR as given
+ */
+static inline char *get_data_path(void) {
+    char *path;
+    char selfpath[1024];
+    ssize_t len;
+    const char *env_data_dir;
+
+    /* 1) Environment override */
+    env_data_dir = getenv("PSENSOR_DATA_DIR");
+    if (env_data_dir && access(env_data_dir, F_OK) == 0) {
+        return strdup(env_data_dir);
+    }
+
+    /* 2) Try PACKAGE_DATA_DIR as provided (may be absolute or relative) */
+    if (PACKAGE_DATA_DIR[0] != '\0') {
+        if (access(PACKAGE_DATA_DIR "/psensor.glade", F_OK) == 0) {
+            return strdup(PACKAGE_DATA_DIR);
+        }
+    }
+
+    /* Get executable directory once for subsequent checks */
+    len = readlink("/proc/self/exe", selfpath, sizeof(selfpath) - 1);
+    if (len != -1) {
+        selfpath[len] = '\0';
+        char *last_slash = strrchr(selfpath, '/');
+        if (last_slash) {
+            *last_slash = '\0';
+
+            /* 3) If PACKAGE_DATA_DIR is relative, try <exe_dir>/<PACKAGE_DATA_DIR> */
+            if (PACKAGE_DATA_DIR[0] != '/' && PACKAGE_DATA_DIR[0] != '\0') {
+                size_t need = strlen(selfpath) + 1 + strlen(PACKAGE_DATA_DIR) + 1;
+                path = (char *)malloc(need);
+                if (!path) return NULL;
+                snprintf(path, need, "%s/%s", selfpath, PACKAGE_DATA_DIR);
+
+                /* build full glade path to test presence */
+                size_t glade_need = strlen(path) + sizeof("/psensor.glade");
+                char *glade = (char *)malloc(glade_need);
+                if (glade) {
+                    snprintf(glade, glade_need, "%s/psensor.glade", path);
+                    if (access(glade, F_OK) == 0) {
+                        free(glade);
+                        return path;
+                    }
+                    free(glade);
+                }
+                free(path);
+            }
+
+            /* 4) Try common locations relative to executable */
+            path = (char *)malloc(strlen(selfpath) + 32);
+            if (!path) return NULL;
+            snprintf(path, strlen(selfpath) + 32, "%s/share/psensor", selfpath);
+            if (access(path, F_OK) == 0) {
+                return path;
+            }
+            free(path);
+
+            /* Try src/glade in source tree (useful for running from a source copy) */
+            path = (char *)malloc(strlen(selfpath) + 32);
+            if (!path) return NULL;
+            snprintf(path, strlen(selfpath) + 32, "%s/src/glade", selfpath);
+            if (access(path, F_OK) == 0) {
+                return path;
+            }
+            free(path);
+        }
+    }
+
+    /* 5) Fallback: return PACKAGE_DATA_DIR (may be absolute or relative) */
+    return strdup(PACKAGE_DATA_DIR);
+}
+
+#endif
\ No newline at end of file
diff --git a/src/psensor.1 b/src/psensor.1
new file mode 100644
index 00000000..46ad91f3
--- /dev/null
+++ b/src/psensor.1
@@ -0,0 +1,47 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
+.TH DATE "1" "November 2025" "DATE TIME: 13:48:03 Nov 17 2025" "User Commands"
+.SH NAME
+DATE \- Temperature monitoring application
+.SH SYNOPSIS
+.B psensor
+[\fI\,OPTION\/\fR]...
+.SH DESCRIPTION
+
+.PP
+DATE TIME: 13:48:03 Nov 17 2025
+.PP
+Psensor is a GTK+ application for monitoring hardware sensors, including temperatures and fan speeds.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+display version information and exit
+.TP
+\fB\-u\fR, \fB\-\-url\fR=\fI\,URL\/\fR
+the URL of the psensor\-server,
+example: http://hostname:3131
+.TP
+\fB\-n\fR, \fB\-\-new\-instance\fR
+force the creation of a new Psensor application
+.TP
+\fB\-d\fR, \fB\-\-debug\fR=\fI\,LEVEL\/\fR
+set the debug level, integer between 0 and 3
+.SH "REPORTING BUGS"
+Report bugs to: jeanfi@gmail.com
+.PP
+psensor home page: <http://wpitchoune.net/psensor>
+.PP
+psensor 1.2.0
+.br
+Copyright \(co 2010\-2014 jeanfi@gmail.com
+.br
+License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old\-licenses/gpl\-2.0.html>
+.br
+This is free software: you are free to change and redistribute it.
+.br
+There is NO WARRANTY, to the extent permitted by law.
+.SH "SEE ALSO"
+
+psensor\-server(1), sensors(1), sensors\-detect(8), hddtemp(8)
diff --git a/src/psensor.gschema.xml b/src/psensor.gschema.xml
index 671a9985..fb022582 100644
--- a/src/psensor.gschema.xml
+++ b/src/psensor.gschema.xml
@@ -103,12 +103,22 @@
       <description>Whether the position and size of the graph window
       are restored</description>
     </key>
-    <key name="interface-window-divider-pos" type="i">
+    <key name="interface-window-horizontal-divider-pos" type="i">
       <default>0</default>
-      <summary>Position of the divider between the graph window and
-      the list of sensors</summary>
-      <description>Position of the divider between the graph window
-      and the list of sensors</description>
+      <summary>Position of the divider between the graph and sensor list 
+      when sensors are positioned to the right or left of the graph</summary>
+      <description>Position of the divider between the graph window 
+      and the sensor list when sensors are displayed to the right 
+      or left of the graph area</description>
+    </key>
+
+    <key name="interface-window-vertical-divider-pos" type="i">
+        <default>0</default>
+        <summary>Position of the divider between the graph and sensor list 
+        when sensors are positioned above or below the graph</summary>
+        <description>Position of the divider between the graph window 
+        and the sensor list when sensors are displayed above 
+        or below the graph area</description>
     </key>
     <key name="interface-window-w" type="i">
       <default>800</default>
diff --git a/src/pxdg.c b/src/pxdg.c
index a43d0752..9ba38647 100644
--- a/src/pxdg.c
+++ b/src/pxdg.c
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include <pio.h>
+#include <io.h>
 #include <plog.h>
 #include <pxdg.h>
 
@@ -37,7 +37,7 @@ static char *get_user_autostart_dir(void)
 
 	xdg_cfg_dir = g_get_user_config_dir();
 
-	log_fct("g_user_config_dir(): %s", xdg_cfg_dir);
+	log_functionname("g_user_config_dir(): %s", xdg_cfg_dir);
 
 	return path_append(xdg_cfg_dir, "autostart");
 }
@@ -102,21 +102,21 @@ static int is_user_desktop_autostarted(GKeyFile *f)
 int pxdg_is_autostarted(void)
 {
 	char *user_desktop;
-	unsigned int ret;
+	int ret;
 	GKeyFile *kfile;
 
-	log_fct_enter();
+	log_functionname_enter();
 
 	user_desktop = get_user_desktop_file();
 
-	log_fct("user desktop file: %s", user_desktop);
+	log_functionname("user desktop file: %s", user_desktop);
 
 	ret = is_file_exists(user_desktop);
 
 	if (!ret) {
-		log_fct("user desktop file does not exist.");
+		log_functionname("user desktop file does not exist.");
 	} else {
-		log_fct("user desktop file exist.");
+		log_functionname("user desktop file exist.");
 		if (ret) {
 			kfile = get_key_file(user_desktop);
 			if (kfile)
@@ -129,7 +129,7 @@ int pxdg_is_autostarted(void)
 
 	free(user_desktop);
 
-	log_fct_exit();
+	log_functionname_exit();
 
 	return ret;
 }
@@ -151,7 +151,7 @@ static void enable_gnome_autostart(const char *path)
 					       TRUE);
 		data = g_key_file_to_data(f, NULL, NULL);
 		g_file_set_contents(path, data, -1, NULL);
-
+		g_free(data);					
 		g_key_file_free(f);
 	} else {
 		log_err("Fail to enable %s", KEY_GNOME_AUTOSTART);
@@ -162,13 +162,13 @@ void pxdg_set_autostart(unsigned int enable)
 {
 	char *user_desktop, *dir;
 
-	log_fct_enter();
+	log_functionname_enter();
 
 	user_desktop = get_user_desktop_file();
 
-	log_fct("user desktop file: %s", user_desktop);
+	log_functionname("user desktop file: %s", user_desktop);
 
-	log_fct("desktop file: %s", get_desktop_file());
+	log_functionname("desktop file: %s", get_desktop_file());
 
 	if (enable) {
 		if (!is_file_exists(user_desktop)) {
@@ -185,7 +185,7 @@ void pxdg_set_autostart(unsigned int enable)
 		remove(user_desktop);
 	}
 
-	log_fct_exit();
+	log_functionname_exit();
 
 	free(user_desktop);
 }
diff --git a/src/pxdg.h b/src/pxdg.h
index 98fd9149..4d767fa4 100644
--- a/src/pxdg.h
+++ b/src/pxdg.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PXDG_H_
-#define _PXDG_H_
+#ifndef PSENSOR_PXDG_H
+#define PSENSOR_PXDG_H
 
 /*
  * returns:
diff --git a/src/rsensor.c b/src/rsensor.c
index f42ab76f..1daa77c2 100644
--- a/src/rsensor.c
+++ b/src/rsensor.c
@@ -53,7 +53,12 @@ static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp)
 	realsize = size * nmemb;
 	mem = (struct ucontent *)userp;
 
-	mem->data = realloc(mem->data, mem->len + realsize + 1);
+	char *tmp_char = realloc(mem->data, mem->len + realsize + 1);
+    if (!tmp_char) {
+		log_err(_("%s: Not enough memory for CURL data"), PROVIDER_NAME);
+		return 0;
+	}
+	mem->data = tmp_char;
 
 	memcpy(&(mem->data[mem->len]), buffer, realsize);
 	mem->len += realsize;
@@ -65,7 +70,7 @@ static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp)
 static char *create_api_1_1_sensors_url(const char *base_url)
 {
 	char *nurl, *ret;
-	int n;
+	size_t n;
 
 	nurl = url_normalize(base_url);
 	n = strlen(nurl) + strlen(URL_BASE_API_1_1_SENSORS) + 1;
@@ -107,7 +112,7 @@ static json_object *get_json_object(const char *url)
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cbk_curl);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
 
-	log_fct("%s: HTTP request %s", PROVIDER_NAME, url);
+	log_functionname("%s: HTTP request %s", PROVIDER_NAME, url);
 
 	if (curl_easy_perform(curl) == CURLE_OK)
 		obj = json_tokener_parse(chunk.data);
@@ -125,7 +130,7 @@ struct psensor **get_remote_sensors(const char *server_url,
 	struct psensor **sensors, *s;
 	char *url;
 	json_object *obj;
-	int i, n;
+	size_t i, n;
 
 	sensors = NULL;
 
@@ -133,7 +138,7 @@ struct psensor **get_remote_sensors(const char *server_url,
 
 	obj = get_json_object(url);
 
-	if (obj && !is_error(obj)) {
+	if (obj) {
 		n = json_object_array_length(obj);
 		sensors = malloc((n + 1) * sizeof(struct psensor *));
 
@@ -168,12 +173,12 @@ static void remote_psensor_update(struct psensor *s)
 
 	obj = get_json_object(get_url(s));
 
-	if (obj && !is_error(obj)) {
+	if (obj) {
 		json_object *om;
 
 		json_object_object_get_ex(obj, "last_measure", &om);
 
-		if (!is_error(obj)) {
+		if (obj) {
 			json_object *ov, *ot;
 			struct timeval tv;
 
diff --git a/src/rsensor.h b/src/rsensor.h
index 3178e3fc..a84be526 100644
--- a/src/rsensor.h
+++ b/src/rsensor.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_RSENSOR_H_
-#define _PSENSOR_RSENSOR_H_
+#ifndef PSENSOR_RSENSOR_H
+#define PSENSOR_RSENSOR_H
 
 #include <psensor.h>
 
diff --git a/src/server/Makefile.in b/src/server/Makefile.in
index 31e88a07..dd87dbf6 100644
--- a/src/server/Makefile.in
+++ b/src/server/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -96,7 +95,11 @@ bin_PROGRAMS = psensor-server$(EXEEXT)
 @ATASMART_TRUE@am__append_5 = $(ATASMART_LIBS)
 subdir = src/server
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -126,7 +129,8 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/server.Po ./$(DEPDIR)/sysinfo.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -194,11 +198,10 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -217,6 +220,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -225,13 +230,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -288,7 +291,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -303,7 +305,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -387,8 +388,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -452,8 +453,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -563,8 +570,10 @@ cscopelist-am: $(am__tagged_files)
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -636,7 +645,8 @@ clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/server.Po
+	-rm -f ./$(DEPDIR)/sysinfo.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -682,7 +692,8 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/server.Po
+	-rm -f ./$(DEPDIR)/sysinfo.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -704,7 +715,7 @@ uninstall-man: uninstall-man1
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
 	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
 	distclean distclean-compile distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
diff --git a/src/server/psensor-server.1 b/src/server/psensor-server.1
new file mode 100644
index 00000000..b16c2a0a
--- /dev/null
+++ b/src/server/psensor-server.1
@@ -0,0 +1,146 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
+.TH PSENSOR-SERVER "1" "November 2025" "psensor-server 1.2.0" "User Commands"
+.SH NAME
+psensor-server \- Temperature and system monitoring Web server
+.SH SYNOPSIS
+.B psensor-server
+[\fI\,OPTION\/\fR]...
+.SH DESCRIPTION
+
+.PP
+psensor\-server is an HTTP server for monitoring hardware sensors remotely.
+.PP
+
+It provides a JSON Web service which can be used by psensor(1) to
+monitor remotely the hardware sensors of a computer.
+
+It can provide information about:
+  * the temperature of the motherboard and CPU sensors (using lm\-sensors).
+  * the temperature of the Hard Disk Drives (using hddtemp).
+  * the rotation speed of the fans (using lm\-sensors).
+
+It is also possible to connect to the psensor\-server with a browser, a
+simple Web page is displaying the sensors information and the CPU
+usage.
+
+The URL http://hostname:3131/api/1.0/sensors/[id] returns a JSON
+object containing all information about a sensor. [id] is the uniq
+identifier of the sensor.
+
+Here is an example of the JSON object of type 'sensor':
+
+{ "id": "lmsensor acpitz\-virtual\-0 temp1", 
+  "name": "temp1", 
+  "type": 257, 
+  "min": 47.800000, 
+  "max": 60.800000,
+  "measures": [ { "value": 47.800000, "time": 1311374873 },
+                { "value": 49.800000, "time": 1311374878 },
+                { "value": 49.800000, "time": 1311374883 } ],
+  "last_measure": { "value": 49.800000, "time": 1311374883 }
+}
+
+Fields of the type 'sensor':
+
+   * id: the uniq identifier of the sensor.
+   * name: a humean readable name of the sensor (might not be uniq).
+   * type: the type of sensor. Look at src/lib/psensor.h for the
+     different types.
+   * min: the minimal value of the sensor.
+   * max: the maximal value of the sensor.
+   * measures: all measures of the sensor.
+   * last_measure: the last value of the sensor.
+   * time: the time of a measure as the number of seconds since
+     1970/01/01.
+
+The URL http://hostname:3131/api/1.0/sensors returns a JSON array
+containing all JSON objects of type 'sensor'.
+
+psensor\-server can be stopped by sending an HTTP
+request with the URL 'http://hostname:port/api/1.0/server/stop'.
+.SH OPTIONS
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+display this help and exit
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+display version information and exit
+.TP
+\fB\-p\fR,\-\-port=PORT
+webserver port
+.TP
+\fB\-w\fR,\-\-wdir=DIR
+directory containing webserver pages
+.TP
+\fB\-d\fR, \fB\-\-debug\fR=\fI\,LEVEL\/\fR
+set the debug level, integer between 0 and 3
+.TP
+\fB\-l\fR, \fB\-\-log\-file\fR=\fI\,PATH\/\fR
+set the log file to PATH
+.HP
+\fB\-\-sensor\-log\-file\fR=\fI\,PATH\/\fR set the sensor log file to PATH
+.HP
+\fB\-\-sensor\-log\-interval\fR=\fI\,S\/\fR set the sensor log interval to S (seconds)
+.SH "SENSOR LOG FILE"
+
+Sensors can be logged using the \-\-sensor-log-file option.
+
+It is using a text format, each line is terminated with a NEWLINE
+char.
+
+The first line is: I,%D,%V
+
+%D is the starting time of the log expressed as the number of seconds
+since EPOC.
+
+%V is the version of psensor-server.
+
+Following lines gives the ordered list of sensors: S,%I,%T
+
+%I is the uniq identifier of the sensor.
+
+%T is the hexadecimal representation of the sensor type.
+
+Then, the values of all sensors are written: %D,%V...
+
+%D is the number of seconds elapsed since the starting time of the
+log.
+
+%V... is the list separated by a comma of the current value of all
+sensors. The ordering is the same than the list of sensor identifiers.
+
+The value is expressed as a float with one digit precision. Temperatures
+are using Celsius unit.
+
+The value is written only if it has changed.
+
+Example:
+I,1345974927,0.7.0.4
+S,lmsensor coretemp-isa-0000 Physical id 0,101
+S,lmsensor coretemp-isa-0000 Core 0,101
+S,lmsensor coretemp-isa-0000 Core 1,101
+0,37.0,37.0,36.0
+5,36.0,,36.0
+
+Five seconds after the log starts, the temperature of the second
+sensor (Core 0) is still 37C.
+.SH WARNING
+
+psensor\-server does not provide any way to restrict the connection to
+the HTTP server, worst, no effort has been made against malicious HTTP
+attacks.  You should make the psensor\-server port available only to a
+network or computer you trust by using the usual network security
+tools of the system (for example, iptables(8) ).
+.SH "REPORTING BUGS"
+Report bugs to: jeanfi@gmail.com
+.PP
+psensor home page: <http://wpitchoune.net/psensor>
+.SH COPYRIGHT
+Copyright \(co 2010\-2012 jeanfi@gmail.com
+License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old\-licenses/gpl\-2.0.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+.SH "SEE ALSO"
+
+psensor(1), sensors(1), sensors\-detect(8)
diff --git a/src/server/server.c b/src/server/server.c
index fb6b63c3..f31b010d 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -305,7 +305,7 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code)
 					       MHD_RESPMEM_MUST_FREE);
 }
 
-static int cbk_http_request(void *cls,
+static enum MHD_Result cbk_http_request(void *cls,
 			    struct MHD_Connection *connection,
 			    const char *url,
 			    const char *method,
diff --git a/src/server/server.h b/src/server/server.h
index 7226979c..4d86f060 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_SERVER_H_
-#define _PSENSOR_SERVER_H_
+#ifndef PSENSOR_SERVER_H
+#define PSENSOR_SERVER_H
 
 #include "config.h"
 
diff --git a/src/server/sysinfo.c b/src/server/sysinfo.c
index 9c371d56..1f288ab7 100644
--- a/src/server/sysinfo.c
+++ b/src/server/sysinfo.c
@@ -43,7 +43,7 @@ void sysinfo_update(struct psysinfo *info)
 
 	/* cpu */
 	if (!cpu)
-		cpu = malloc(sizeof(glibtop_cpu));
+		cpu = (glibtop_cpu *)malloc(sizeof(glibtop_cpu));
 
 	glibtop_get_cpu(cpu);
 
diff --git a/src/server/sysinfo.h b/src/server/sysinfo.h
index 1d0537a3..bd22ba79 100644
--- a/src/server/sysinfo.h
+++ b/src/server/sysinfo.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_SYSINFO_H_
-#define _PSENSOR_SYSINFO_H_
+#ifndef PSENSOR_SYSINFO_H
+#define PSENSOR_SYSINFO_H
 
 #include <config.h>
 #include <glibtop/loadavg.h>
diff --git a/src/ui.c b/src/ui.c
index 041e8d8b..afefad70 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 
 #include <cfg.h>
+#include <paths.h>
 #include <slog.h>
 #include <ui.h>
 #include <ui_appindicator.h>
@@ -33,53 +34,159 @@ static GtkWidget *w_graph;
 static GtkContainer *w_sensor_box;
 static GtkContainer *w_main_box;
 
-static void update_layout(void)
+static enum sensorlist_position last_sensorlist_position;
+
+enum psensor_layout {
+	PSENSOR_LAYOUT_HORIZONTAL,
+	PSENSOR_LAYOUT_VERTICAL
+};
+
+static bool is_horizontal_layout(enum sensorlist_position sensorlist_pos)
 {
-	enum sensorlist_position sensorlist_pos;
+	if (   sensorlist_pos == SENSORLIST_POSITION_TOP
+	    || sensorlist_pos == SENSORLIST_POSITION_BOTTOM)
+	{
+		return false;
+	}
 
-	g_object_ref(w_sensors_scrolled_tree);
-	g_object_ref(w_graph);
+	return true;
+}
 
-	gtk_container_remove(w_sensor_box,
-			     w_sensors_scrolled_tree);
+bool is_sensorlist_first(enum sensorlist_position sensorlist_pos)
+{
+	// Returns true if the sensorlist is on the left or on the top
+	// of the main window.
+	if (   sensorlist_pos == SENSORLIST_POSITION_LEFT
+	    || sensorlist_pos == SENSORLIST_POSITION_TOP)
+	{
+		return true;
+	}
 
-	gtk_container_remove(w_sensor_box, w_graph);
+	return false;
+}
 
-	gtk_container_remove(w_main_box, GTK_WIDGET(w_sensor_box));
+static const int MINIMUM_SIZE = 40 + 1;
+static const int PERCENT_FOR_VISIBLE_SLIDER_SIZE = 8;
+static int calculate_slider_position_level_2(int old_width_or_height,
+									         int slider_position,
+									         enum sensorlist_position sensorlist_pos)
+{
+	int new_width_or_height = old_width_or_height - slider_position;
+    // adjustment to avoid too small sensorlist area
+	if (new_width_or_height < MINIMUM_SIZE && is_sensorlist_first(sensorlist_pos))
+	{
+		new_width_or_height = old_width_or_height / PERCENT_FOR_VISIBLE_SLIDER_SIZE;
+	}
+	else if ( (old_width_or_height - new_width_or_height) < MINIMUM_SIZE)
+	{
+		new_width_or_height =  old_width_or_height- (old_width_or_height / PERCENT_FOR_VISIBLE_SLIDER_SIZE);
+	}
+	return new_width_or_height;
+}
+
+static void calculate_slider_position(struct ui_psensor *ui, enum sensorlist_position sensorlist_pos)
+{
+	GtkAllocation paned_alloc;
+	gtk_widget_get_allocation(GTK_WIDGET(w_sensor_box), &paned_alloc);
+
+	int slider_position  = gtk_paned_get_position(GTK_PANED(w_sensor_box));
+	if (is_horizontal_layout(sensorlist_pos))
+	{
+		ui->config->window_horizontal_divider_pos = calculate_slider_position_level_2(paned_alloc.width,
+													slider_position,
+													sensorlist_pos);
+	}
+	else
+	{
+		ui->config->window_vertical_divider_pos = calculate_slider_position_level_2(paned_alloc.height,
+													slider_position,
+													sensorlist_pos);
+	}
+	// printf("pos2=%s slider=%d lastV=%d lastH=%d \n", 
+	// 	config_get_sensorlist_position_str(sensorlist_pos), 
+	// 	slider_position, 
+	// 	ui->config->window_vertical_divider_pos, 
+	// 	ui->config->window_horizontal_divider_pos);
+}
 
-	sensorlist_pos = config_get_sensorlist_position();
-	if (sensorlist_pos == SENSORLIST_POSITION_RIGHT
-	    || sensorlist_pos == SENSORLIST_POSITION_LEFT)
+static void pack_widgets_with_new_layout()
+{
+	if (is_horizontal_layout(last_sensorlist_position))
+	{
 		w_sensor_box
 			= GTK_CONTAINER(gtk_paned_new
 					(GTK_ORIENTATION_HORIZONTAL));
-	else
+	}
+    else
+	{
 		w_sensor_box
 			= GTK_CONTAINER(gtk_paned_new
 					(GTK_ORIENTATION_VERTICAL));
-
+	}
 	gtk_box_pack_end(GTK_BOX(w_main_box),
 			 GTK_WIDGET(w_sensor_box), TRUE, TRUE, 2);
 
-	if (sensorlist_pos == SENSORLIST_POSITION_RIGHT
-	    || sensorlist_pos == SENSORLIST_POSITION_BOTTOM) {
-		gtk_paned_pack1(GTK_PANED(w_sensor_box), w_graph, TRUE, TRUE);
-		gtk_paned_pack2(GTK_PANED(w_sensor_box),
-				w_sensors_scrolled_tree,
-				FALSE,
-				TRUE);
-	} else {
-		gtk_paned_pack1(GTK_PANED(w_sensor_box),
-				w_sensors_scrolled_tree,
-				FALSE,
-				TRUE);
-		gtk_paned_pack2(GTK_PANED(w_sensor_box), w_graph, TRUE, TRUE);
+	if (is_sensorlist_first(last_sensorlist_position))
+	{
+		gtk_paned_pack1(GTK_PANED(w_sensor_box),w_sensors_scrolled_tree,FALSE,TRUE);
+		gtk_paned_pack2(GTK_PANED(w_sensor_box), w_graph, FALSE, TRUE);	
+	} else
+	{
+		gtk_paned_pack1(GTK_PANED(w_sensor_box), w_graph, FALSE, TRUE);
+		gtk_paned_pack2(GTK_PANED(w_sensor_box),w_sensors_scrolled_tree,TRUE,TRUE);
 	}
+}
 
+static void update_layout(struct ui_psensor *ui)
+{
+	// printf("pos1=%s slider=%d lastV=%d lastH=%d \n", 
+	// 	config_get_sensorlist_position_str(last_sensorlist_position), 
+	// 	gtk_paned_get_position(GTK_PANED(w_sensor_box)), 
+	// 	ui->config->window_vertical_divider_pos, 
+	// 	ui->config->window_horizontal_divider_pos);
+	last_sensorlist_position = config_get_sensorlist_position();	
+	
+    //
+    if (GTK_IS_WIDGET(w_sensors_scrolled_tree))
+	{
+        GtkAllocation allocated_size_and_position;
+        gtk_widget_get_allocation(w_sensors_scrolled_tree, &allocated_size_and_position);
+        if (   allocated_size_and_position.width > MINIMUM_SIZE 
+			&& allocated_size_and_position.height > MINIMUM_SIZE)
+		{
+			calculate_slider_position(ui, last_sensorlist_position);
+        }
+    }
+	
+	g_object_ref(w_sensors_scrolled_tree);
+	g_object_ref(w_graph);
+
+	gtk_container_remove(w_sensor_box, w_sensors_scrolled_tree);
+	gtk_container_remove(w_sensor_box, w_graph);
+	gtk_container_remove(w_main_box, GTK_WIDGET(w_sensor_box));
+
+	pack_widgets_with_new_layout();
+    
 	g_object_unref(w_sensors_scrolled_tree);
 	g_object_unref(w_graph);
 
 	gtk_widget_show_all(GTK_WIDGET(w_sensor_box));
+    //
+	if (is_horizontal_layout(last_sensorlist_position))
+	{
+		gtk_paned_set_position(GTK_PANED(w_sensor_box),
+										ui->config->window_horizontal_divider_pos);
+	}
+	else
+	{
+        gtk_paned_set_position(GTK_PANED(w_sensor_box),
+										ui->config->window_vertical_divider_pos);
+    }
+	// printf("pos3=%s slider=%d lastV=%d lastH=%d \n", 
+	// 	config_get_sensorlist_position_str(last_sensorlist_position), 
+	// 	gtk_paned_get_position(GTK_PANED(w_sensor_box)), 
+	// 	ui->config->window_vertical_divider_pos, 
+	// 	ui->config->window_horizontal_divider_pos);
 }
 
 static void set_decoration(GtkWindow *win)
@@ -121,12 +228,12 @@ menu_bar_changed_cbk(GSettings *settings, gchar *key, gpointer data)
 static void
 sensorlist_position_changed_cbk(GSettings *settings, gchar *key, gpointer data)
 {
-	update_layout();
+	update_layout((struct ui_psensor *)data);
 }
 
-static void connect_cbks(GtkWindow *win, GtkWidget *menu_bar)
+static void connect_cbks(GtkWindow *win, GtkWidget *menu_bar, struct ui_psensor *ui)
 {
-	log_fct_enter();
+	log_functionname_enter();
 
 	g_signal_connect_after(config_get_GSettings(),
 			       "changed::interface-window-decoration-disabled",
@@ -146,25 +253,21 @@ static void connect_cbks(GtkWindow *win, GtkWidget *menu_bar)
 	g_signal_connect_after(config_get_GSettings(),
 			       "changed::interface-sensorlist-position",
 			       G_CALLBACK(sensorlist_position_changed_cbk),
-			       menu_bar);
+			       ui);
 
-
-	log_fct_exit();
+	log_functionname_exit();
 }
 
-static void save_window_pos(struct ui_psensor *ui)
+static void save_window_position_to_config(struct ui_psensor *ui)
 {
-	gboolean visible;
-	GtkWindow *win;
-	struct config *cfg;
-
-	visible = gtk_widget_get_visible(ui->main_window);
+	gboolean visible = gtk_widget_get_visible(ui->main_window);
 	log_debug("Window visible: %d", visible);
 
-	if (visible == TRUE) {
-		cfg = ui->config;
+	if (visible == TRUE)
+	{
+		struct config *cfg = ui->config;
 
-		win = GTK_WINDOW(ui->main_window);
+		GtkWindow *win = GTK_WINDOW(ui->main_window);
 
 		gtk_window_get_position(win, &cfg->window_x, &cfg->window_y);
 		log_debug("Window position: %d %d",
@@ -176,10 +279,14 @@ static void save_window_pos(struct ui_psensor *ui)
 				    &cfg->window_h);
 		log_debug("Window size: %d %d", cfg->window_w, cfg->window_h);
 
-		cfg->window_divider_pos
-			= gtk_paned_get_position(GTK_PANED(w_sensor_box));
+		int slider_position = gtk_paned_get_position(GTK_PANED(w_sensor_box));
+		enum sensorlist_position sensorlist_position = config_get_sensorlist_position();
+		if (is_horizontal_layout(sensorlist_position))
+			cfg->window_horizontal_divider_pos = slider_position;
+		else	
+			cfg->window_vertical_divider_pos = slider_position;
 
-		config_save(cfg);
+		config_save_to_g_file(cfg);
 	}
 }
 
@@ -188,7 +295,7 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
 	struct ui_psensor *ui = data;
 
-	save_window_pos(ui);
+	save_window_position_to_config(ui);
 
 	log_debug("is_status_supported: %d\n", is_status_supported());
 
@@ -202,12 +309,11 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 
 void ui_show_about_dialog(GtkWindow *parent)
 {
-	static const char *const authors[] = { "jeanfi@gmail.com", NULL };
+	static const char *const authors[] = {"jeanfi@gmail.com", "Le Hoai Thanh yuyoonshoo@gmail.com", NULL};
 
-	log_fct("parent=%p", parent);
+	log_functionname("parent=%p", parent);
 
-	gtk_show_about_dialog
-		(parent,
+	gtk_show_about_dialog(parent,
 		 "authors", authors,
 		 "comments",
 		 _("Psensor is a GTK+ application for monitoring hardware "
@@ -234,7 +340,7 @@ void ui_cb_about(GtkAction *a, gpointer data)
 
 	ui = (struct ui_psensor *)data;
 
-	log_fct("ui=%p", ui);
+	log_functionname("ui=%p", ui);
 
 	if (ui)
 		parent = ui->main_window;
@@ -264,7 +370,7 @@ void ui_cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
 
 void ui_psensor_quit(struct ui_psensor *ui)
 {
-	save_window_pos(ui);
+	save_window_position_to_config(ui);
 
 	log_debug("Destroy main window");
 	gtk_widget_destroy(ui->main_window);
@@ -283,16 +389,22 @@ void ui_enable_alpha_channel(struct ui_psensor *ui)
 
 	log_debug("Config alpha channel enabled: %d",
 		  cfg->alpha_channel_enabled);
-	if (cfg->alpha_channel_enabled && gdk_screen_is_composited(screen)) {
+	if (cfg->alpha_channel_enabled && gdk_screen_is_composited(screen))
+	{
 		log_debug("Screen is composited");
 		visual = gdk_screen_get_rgba_visual(screen);
-		if (visual) {
+		if (visual)
+		{
 			gtk_widget_set_visual(ui->main_window, visual);
-		} else {
+		}
+		else
+		{
 			cfg->alpha_channel_enabled = 0;
 			log_err("Enable alpha channel has failed");
 		}
-	} else {
+	}
+	else
+	{
 		cfg->alpha_channel_enabled = 0;
 	}
 }
@@ -325,17 +437,27 @@ void ui_window_create(struct ui_psensor *ui)
 	GtkBuilder *builder;
 	GError *error;
 
-	log_fct("ui=%p", ui);
+	log_functionname("ui=%p", ui);
 
 	builder = gtk_builder_new();
-
 	error = NULL;
-	ok = gtk_builder_add_from_file
-		(builder,
-		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor.glade",
-		 &error);
-
-	if (!ok) {
+	char *data_path = get_data_path();
+	//log_printf(LOG_INFO, "Data path: %s", data_path);
+	const char *str_format = "%s/psensor.glade";
+	char *glade_path;
+	asprintf(&glade_path, str_format, data_path);
+	//log_printf(LOG_INFO, "Loading glade file: %s", glade_path);
+	
+	// Test translation
+	// log_printf(LOG_INFO, "Testing translation of 'About Psensor': %s", _("About Psensor"));
+	// log_printf(LOG_INFO, "Testing translation of 'Failed to load Psensor icon.': %s", _("Failed to load Psensor icon."));
+	
+	ok = gtk_builder_add_from_file(builder, glade_path, &error);
+	free(glade_path);
+	free(data_path);
+
+	if (!ok)
+	{
 		log_printf(LOG_ERR, error->message);
 		g_error_free(error);
 		return;
@@ -349,6 +471,8 @@ void ui_window_create(struct ui_psensor *ui)
 				cfg->window_x,
 				cfg->window_y);
 
+    last_sensorlist_position = config_get_sensorlist_position();
+
 	config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui);
 
 	gtk_window_set_default_size(GTK_WINDOW(window),
@@ -379,20 +503,16 @@ void ui_window_create(struct ui_psensor *ui)
 
 	w_sensor_box = GTK_CONTAINER(gtk_builder_get_object(builder,
 							    "sensor_box"));
-	ui->sensors_store = GTK_LIST_STORE(gtk_builder_get_object
-					   (builder, "sensors_store"));
-	ui->sensors_tree = GTK_TREE_VIEW(gtk_builder_get_object
-					 (builder, "sensors_tree"));
-	w_sensors_scrolled_tree
-		= GTK_WIDGET(gtk_builder_get_object
-			     (builder, "sensors_scrolled_tree"));
+	ui->sensors_store = GTK_LIST_STORE(gtk_builder_get_object(builder, "sensors_store"));
+	ui->sensors_tree = GTK_TREE_VIEW(gtk_builder_get_object(builder, "sensors_tree"));
+	w_sensors_scrolled_tree = GTK_WIDGET(gtk_builder_get_object(builder, "sensors_scrolled_tree"));
 
 	ui_sensorlist_create(ui);
 
-	connect_cbks(GTK_WINDOW(window), menu_bar);
+	connect_cbks(GTK_WINDOW(window), menu_bar, ui);
 
 	log_debug("ui_window_create(): show_all");
-	update_layout();
+	update_layout(ui);
 	gtk_widget_show_all(GTK_WIDGET(w_main_box));
 	set_menu_bar_enabled(menu_bar);
 
@@ -403,15 +523,6 @@ void ui_window_create(struct ui_psensor *ui)
 
 void ui_window_update(struct ui_psensor *ui)
 {
-	struct config *cfg;
-
-	log_debug("ui_window_update()");
-
-	cfg = ui->config;
-
-	if (cfg->window_restore_enabled)
-		gtk_paned_set_position(GTK_PANED(w_sensor_box),
-				       cfg->window_divider_pos);
 
 }
 
diff --git a/src/ui.h b/src/ui.h
index 95135d64..3884bc4c 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -16,10 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UI_H_
-#define _PSENSOR_UI_H_
+#ifndef PSENSOR_UI_H
+#define PSENSOR_UI_H
 
-#include "config.h"
+#include <config.h>
+#include <paths.h>
 
 #include <pthread.h>
 
diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index ed4cc641..95b17d43 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -30,12 +30,13 @@
 #include <ui_sensorpref.h>
 #include <ui_status.h>
 #include <ui_pref.h>
+#include <paths.h>
 
 static const char *ICON = "psensor_normal";
 static const char *ATTENTION_ICON = "psensor_hot";
 
-static const char *GLADE_FILE
-= PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor-appindicator.glade";
+/* Build GLADE path at runtime using get_data_path() so the installed
+ * data directory is resolved the same way as the main UI. */
 
 static struct psensor **sensors;
 static GtkMenuItem **menu_items;
@@ -92,7 +93,7 @@ static void update_menu_items(int use_celsius)
 static void
 create_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
 {
-	int i, j, n, celsius;
+	int celsius;
 	const char *name;
 	struct psensor **sorted_sensors;
 
@@ -102,11 +103,13 @@ create_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
 		celsius = 0;
 
 	sorted_sensors = ui_get_sensors_ordered_by_position(ui->sensors);
-	n = psensor_list_size(sorted_sensors);
-	menu_items = malloc((n + 1) * sizeof(GtkWidget *));
+	size_t n = psensor_list_size(sorted_sensors);
+	menu_items = malloc((n + 1) * sizeof(GtkMenuItem *));
 
 	sensors = malloc((n + 1) * sizeof(struct psensor *));
-	for (i = 0, j = 0; i < n; i++) {
+
+	size_t i, j;
+	for ( i = 0, j = 0; i < n; i++) {
 		if (config_is_appindicator_enabled(sorted_sensors[i]->id)) {
 			sensors[j] = sorted_sensors[i];
 			name = sensors[j]->name;
@@ -137,21 +140,32 @@ static GtkMenu *load_menu(struct ui_psensor *ui)
 	guint ok;
 	GtkBuilder *builder;
 
-	log_fct_enter();
+	log_functionname_enter();
 
 	builder = gtk_builder_new();
+	gtk_builder_set_translation_domain(builder, "psensor");
 
 	error = NULL;
-	ok = gtk_builder_add_from_file(builder, GLADE_FILE, &error);
+	/* Build the glade file path at runtime so it matches get_data_path()
+	 * used elsewhere (handles PSENSOR_DATA_DIR overrides, relative paths, etc.) */
+	char *data_path = get_data_path();
+	gchar *glade_file = g_strdup_printf("%s%spsensor-appindicator.glade",
+					    data_path, G_DIR_SEPARATOR_S);
+	ok = gtk_builder_add_from_file(builder, glade_file, &error);
 
 	if (!ok) {
 		log_err(_("Failed to load glade file %s: %s"),
-			GLADE_FILE,
+			glade_file,
 			error->message);
 		g_error_free(error);
+		g_free(glade_file);
+		free(data_path);
 		return NULL;
 	}
 
+	g_free(glade_file);
+	free(data_path);
+
 	menu = GTK_MENU(gtk_builder_get_object(builder, "appindicator_menu"));
 	create_sensor_menu_items(ui, menu);
 	gtk_builder_connect_signals(builder, ui);
@@ -159,7 +173,7 @@ static GtkMenu *load_menu(struct ui_psensor *ui)
 	g_object_ref(G_OBJECT(menu));
 	g_object_unref(G_OBJECT(builder));
 
-	log_fct_exit();
+	log_functionname_exit();
 
 	return menu;
 }
@@ -167,10 +181,11 @@ static GtkMenu *load_menu(struct ui_psensor *ui)
 static void update_label(struct ui_psensor *ui)
 {
 	char *label, *str, *tmp, *guide;
-	struct psensor **p;
+	struct psensor **p, **original_sensors;
 	int use_celsius;
 
 	p =  ui_get_sensors_ordered_by_position(ui->sensors);
+	original_sensors = p;
 	label = NULL;
 	guide = NULL;
 
@@ -186,11 +201,13 @@ static void update_label(struct ui_psensor *ui)
 			if (label == NULL) {
 				label = str;
 			} else {
+				size_t len;
+				len = strlen(label) + strlen(str) + 2;
 				tmp = malloc(strlen(label)
 					     + 1
 					     + strlen(str)
 					     + 1);
-				sprintf(tmp, "%s %s", label, str);
+				snprintf(tmp, len, "%s %s", label, str);
 				free(label);
 				free(str);
 				label = tmp;
@@ -206,11 +223,7 @@ static void update_label(struct ui_psensor *ui)
 			if (guide == NULL) {
 				guide = strdup(str);
 			} else {
-				tmp = malloc(strlen(guide)
-					     + 1
-					     + strlen(str)
-					     + 1);
-				sprintf(tmp, "%sW%s", guide, str);
+				asprintf(&tmp, "%sW%s", guide, str);
 				free(guide);
 				guide = tmp;
 			}
@@ -220,6 +233,9 @@ static void update_label(struct ui_psensor *ui)
 	}
 
 	app_indicator_set_label(indicator, label, guide);
+	free(label);
+	free(guide);
+	free(original_sensors);
 }
 
 void ui_appindicator_update(struct ui_psensor *ui, bool attention)
@@ -247,31 +263,6 @@ void ui_appindicator_update(struct ui_psensor *ui, bool attention)
 		update_menu_items(0);
 }
 
-static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
-{
-	GtkStatusIcon *ico;
-
-	log_debug("ui_appindicator.unity_fallback()");
-
-	appindicator_supported = false;
-
-	ico = ui_status_get_icon(ui_psensor);
-
-	ui_status_set_visible(1);
-
-	return ico;
-}
-
-static void
-unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon)
-{
-	log_debug("ui_appindicator.unity_unfallback()");
-
-	ui_status_set_visible(0);
-
-	appindicator_supported = true;
-}
-
 static void remove_sensor_menu_items(GtkMenu *menu)
 {
 	GtkMenuItem **items;
@@ -315,15 +306,12 @@ void ui_appindicator_update_menu(struct ui_psensor *ui)
 void ui_appindicator_init(struct ui_psensor *ui)
 {
 	ui_psensor = ui;
-
+	log_debug("ui_appindicator_init()");
 	indicator = app_indicator_new
 		("psensor",
 		 ICON,
 		 APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
-	APP_INDICATOR_GET_CLASS(indicator)->fallback = unity_fallback;
-	APP_INDICATOR_GET_CLASS(indicator)->unfallback = unity_unfallback;
-
 	app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE);
 	app_indicator_set_attention_icon(indicator, ATTENTION_ICON);
 
diff --git a/src/ui_appindicator.h b/src/ui_appindicator.h
index c808aa6d..f5ea8d4b 100644
--- a/src/ui_appindicator.h
+++ b/src/ui_appindicator.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UI_APPINDICATOR_H_
-#define _PSENSOR_UI_APPINDICATOR_H_
+#ifndef PSENSOR_UI_APPINDICATOR_H
+#define PSENSOR_UI_APPINDICATOR_H
 
 #include <config.h>
 
diff --git a/src/ui_color.h b/src/ui_color.h
index 3c41b783..c9100ee1 100644
--- a/src/ui_color.h
+++ b/src/ui_color.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UI_COLOR_H_
-#define _PSENSOR_UI_COLOR_H_
+#ifndef PSENSOR_UI_COLOR_H
+#define PSENSOR_UI_COLOR_H
 
 #include <bool.h>
 
diff --git a/src/ui_graph.c b/src/ui_graph.c
index 577e83a3..981c60ad 100644
--- a/src/ui_graph.c
+++ b/src/ui_graph.c
@@ -22,12 +22,14 @@
 static int
 on_graph_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-	if (event->type != GDK_BUTTON_PRESS)
+	if (event->type != GDK_BUTTON_PRESS) {
 		return FALSE;
-
-	gtk_menu_popup(GTK_MENU(((struct ui_psensor *)data)->popup_menu),
-		       NULL, NULL, NULL, NULL,
-		       event->button, event->time);
+	}
+	// gtk_menu_popup(GTK_MENU(((struct ui_psensor *)data)->popup_menu),
+	// 	       NULL, NULL, NULL, NULL,
+	// 	       event->button, event->time);
+	gtk_menu_popup_at_pointer(GTK_MENU(((struct ui_psensor *)data)->popup_menu),
+	                         (const GdkEvent*)event);
 
 	return TRUE;
 }
@@ -50,7 +52,7 @@ static void smooth_curves_enabled_changed_cbk(void *data)
 	is_smooth_curves_enabled = config_is_smooth_curves_enabled();
 }
 
-void ui_graph_create(struct ui_psensor *ui)
+void ui_graph_create(struct ui_psensor *sensor_context)
 {
 	GtkWidget *w_graph;
 
@@ -67,13 +69,13 @@ void ui_graph_create(struct ui_psensor *ui)
 	g_signal_connect(GTK_WIDGET(w_graph),
 			 "draw",
 			 G_CALLBACK(on_expose_event),
-			 ui);
+			 sensor_context);
 
 	gtk_widget_add_events(w_graph, GDK_BUTTON_PRESS_MASK);
 
 	g_signal_connect(GTK_WIDGET(w_graph),
 			 "button_press_event",
-			 (GCallback) on_graph_clicked, ui);
+			 (GCallback) on_graph_clicked, sensor_context);
 
 	log_debug("ui_graph_create() ends");
 }
diff --git a/src/ui_graph.h b/src/ui_graph.h
index a316075d..5d5d83a4 100644
--- a/src/ui_graph.h
+++ b/src/ui_graph.h
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UI_GRAPH_H_
-#define _PSENSOR_UI_GRAPH_H_
+#ifndef PSENSOR_UI_GRAPH_H
+#define PSENSOR_UI_GRAPH_H
 
 #include <gtk/gtk.h>
 
 #include "ui.h"
 
-void ui_graph_create(struct ui_psensor *ui);
+void ui_graph_create(struct ui_psensor *sensor_context);
 
 #endif
diff --git a/src/ui_notify.c b/src/ui_notify.c
index 719f5021..e40a1def 100644
--- a/src/ui_notify.c
+++ b/src/ui_notify.c
@@ -69,8 +69,7 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui)
 			 sensor->type,
 			 use_celsius);
 
-		body = malloc(strlen(sensor->name) + 3 + strlen(svalue) + 1);
-		sprintf(body, "%s : %s", sensor->name, svalue);
+		asprintf(&body, "%s : %s", sensor->name, svalue);
 		free(svalue);
 
 		if (is_temp_type(sensor->type))
@@ -96,6 +95,7 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui)
 
 		notify_notification_show(notif, NULL);
 
+		free(body);
 		g_object_unref(notif);
 	} else {
 		log_err("notify not initialized");
diff --git a/src/ui_notify.h b/src/ui_notify.h
index 51dc3d15..4257c229 100644
--- a/src/ui_notify.h
+++ b/src/ui_notify.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UI_NOTIFY_H_
-#define _PSENSOR_UI_NOTIFY_H_
+#ifndef PSENSOR_UI_NOTIFY_H
+#define PSENSOR_UI_NOTIFY_H
 
 #include <ui.h>
 
diff --git a/src/ui_pref.c b/src/ui_pref.c
index cbdcb665..589c4007 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -103,6 +103,7 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	cfg = ui->config;
 
 	builder = gtk_builder_new();
+	gtk_builder_set_translation_domain(builder, "psensor");
 
 	ok = gtk_builder_add_from_file
 		(builder,
@@ -367,7 +368,7 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
 		cfg->sensor_values_max_length = compute_values_max_length(cfg);
 
-		config_save(cfg);
+		config_save_to_g_file(cfg);
 
 		config_set_smooth_curves_enabled
 			(gtk_toggle_button_get_active(w_smooth_curves));
diff --git a/src/ui_pref.h b/src/ui_pref.h
index 54cf2e11..a2684a68 100644
--- a/src/ui_pref.h
+++ b/src/ui_pref.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UI_PREF_H_
-#define _PSENSOR_UI_PREF_H_
+#ifndef PSENSOR_UI_PREF_H
+#define PSENSOR_UI_PREF_H
 
 #include "ui.h"
 
diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 9d4b7487..efc1c9fa 100644
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -99,7 +99,7 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	gboolean valid;
-	int use_celsius;
+	
 	GtkListStore *store;
 
 	if (complete)
@@ -110,6 +110,7 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
 
 	store = ui->sensors_store;
 
+	unsigned int use_celsius;
 	if (config_get_temperature_unit() == CELSIUS)
 		use_celsius = 1;
 	else
@@ -162,6 +163,7 @@ get_sensor_at_pos(GtkTreeView *view, int x, int y, struct ui_psensor *ui)
 	if (path) {
 		if (gtk_tree_model_get_iter(model, &iter, path)) {
 			gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
+			gtk_tree_path_free(path);
 			return s;
 		}
 	}
@@ -187,14 +189,16 @@ static int get_col_index_at_pos(GtkTreeView *view, int x)
 		checkcol = (GtkTreeViewColumn *)node->data;
 
 		if (x >= colx
-		    && x < (colx + gtk_tree_view_column_get_width(checkcol)))
+		    && x < (colx + gtk_tree_view_column_get_width(checkcol))) {
+			g_list_free(cols);
 			return coli;
+		}
 
 		colx += gtk_tree_view_column_get_width(checkcol);
 
 		coli++;
 	}
-
+	g_list_free(cols);
 	return -1;
 }
 
@@ -215,7 +219,7 @@ static void hide_activated_cbk(GtkWidget *menu_item, gpointer data)
 	struct cb_data *cb_data;
 	gboolean valid;
 
-	log_fct_enter();
+	log_functionname_enter();
 
 	cb_data = data;
 	s = cb_data->sensor;
@@ -239,7 +243,7 @@ static void hide_activated_cbk(GtkWidget *menu_item, gpointer data)
 
 	free(cb_data);
 
-	log_fct_exit();
+	log_functionname_exit();
 }
 
 static GtkWidget *
@@ -293,7 +297,7 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data)
 	ui = (struct ui_psensor *)data;
 	view = ui->sensors_tree;
 
-	s = get_sensor_at_pos(view, event->x, event->y, ui);
+	s = get_sensor_at_pos(view, (int)event->x, (int)event->y, ui);
 
 	if (s) {
 		coli = col_index_to_col(get_col_index_at_pos(view, event->x));
@@ -312,8 +316,9 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data)
 		} else if (coli >= 0 && coli != COL_GRAPH_ENABLED) {
 			menu = create_sensor_popup(ui, s);
 
-			gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
-				       event->button, event->time);
+			// gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
+			// 	       event->button, event->time);
+			 gtk_menu_popup_at_pointer(GTK_MENU(menu), (const GdkEvent*)event);
 			return TRUE;
 		}
 
@@ -368,7 +373,7 @@ void ui_sensorlist_create(struct ui_psensor *ui)
 {
 	GtkTreeModel *fmodel, *model;
 
-	log_fct_enter();
+	log_functionname_enter();
 
 	model = gtk_tree_view_get_model(ui->sensors_tree);
 	fmodel = gtk_tree_model_filter_new(model, NULL);
@@ -382,5 +387,5 @@ void ui_sensorlist_create(struct ui_psensor *ui)
 
 	ui_sensorlist_update(ui, 1);
 
-	log_fct_exit();
+	log_functionname_exit();
 }
diff --git a/src/ui_sensorlist.h b/src/ui_sensorlist.h
index 953bbcd6..f78568bd 100644
--- a/src/ui_sensorlist.h
+++ b/src/ui_sensorlist.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UI_SENSORLIST_H_
-#define _PSENSOR_UI_SENSORLIST_H_
+#ifndef PSENSOR_UI_SENSORLIST_H
+#define PSENSOR_UI_SENSORLIST_H
 
 #include <gtk/gtk.h>
 
diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 92438aea..e3152952 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -270,8 +270,6 @@ ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
 
 static void update_pref(struct psensor *s)
 {
-	int use_celsius, threshold;
-	GdkRGBA *color;
 	const char *chip;
 	char *smin, *smax;
 
@@ -290,9 +288,9 @@ static void update_pref(struct psensor *s)
 		chip = _("Unknown");
 	gtk_label_set_text(w_sensor_chipname, chip);
 
-	use_celsius = config_get_temperature_unit() == CELSIUS ? 1 : 0;
+	unsigned int use_celsius = config_get_temperature_unit() == CELSIUS ? 1U : 0U;
 
-	if (s->min == UNKNOWN_DBL_VALUE)
+	if (s->min == UNKNOWN_DOUBLE_VALUE)
 		smin = strdup(_("Unknown"));
 	else
 		smin = psensor_value_to_str(s->type, s->min, use_celsius);
@@ -300,7 +298,7 @@ static void update_pref(struct psensor *s)
 	gtk_label_set_text(w_sensor_min, smin);
 	free(smin);
 
-	if (s->max == UNKNOWN_DBL_VALUE)
+	if (s->max == UNKNOWN_DOUBLE_VALUE)
 		smax = strdup(_("Unknown"));
 	else
 		smax = psensor_value_to_str(s->type, s->max, use_celsius);
@@ -313,7 +311,7 @@ static void update_pref(struct psensor *s)
 	gtk_toggle_button_set_active(w_sensor_display,
 				     config_is_sensor_enabled(s->id));
 
-	color = config_get_sensor_color(s->id);
+	GdkRGBA *color = config_get_sensor_color(s->id);
 	gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_sensor_color), color);
 	gdk_rgba_free(color);
 
@@ -341,7 +339,7 @@ static void update_pref(struct psensor *s)
 	gtk_toggle_button_set_active(w_sensor_alarm,
 				     config_get_sensor_alarm_enabled(s->id));
 
-	threshold = s->alarm_high_threshold;
+	int threshold = s->alarm_high_threshold;
 	if (!use_celsius)
 		threshold = celsius_to_fahrenheit(threshold);
 	gtk_spin_button_set_value(w_sensor_high_threshold, threshold);
@@ -414,6 +412,7 @@ static GtkBuilder *load_ui(struct ui_psensor *ui)
 	error = NULL;
 
 	builder = gtk_builder_new();
+	gtk_builder_set_translation_domain(builder, "psensor");
 	ok = gtk_builder_add_from_file
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "sensor-edit.glade",
diff --git a/src/ui_sensorpref.h b/src/ui_sensorpref.h
index 692dedc1..2ddf4b09 100644
--- a/src/ui_sensorpref.h
+++ b/src/ui_sensorpref.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UI_SENSORPREF_H_
-#define _PSENSOR_UI_SENSORPREF_H_
+#ifndef PSENSOR_UI_SENSORPREF_H
+#define PSENSOR_UI_SENSORPREF_H
 
 #include <ui.h>
 
diff --git a/src/ui_unity.c b/src/ui_unity.c
index b2884472..15edecc7 100644
--- a/src/ui_unity.c
+++ b/src/ui_unity.c
@@ -43,14 +43,14 @@ static double get_max_current_value(struct psensor **sensors, unsigned int type)
 	double m, v;
 	struct psensor *s;
 
-	m = UNKNOWN_DBL_VALUE;
+	m = UNKNOWN_DOUBLE_VALUE;
 	while (*sensors) {
 		s = *sensors;
 
 		if ((s->type & type) && config_is_sensor_graph_enabled(s->id)) {
 			v = psensor_get_current_value(s);
 
-			if (m == UNKNOWN_DBL_VALUE || v > m)
+			if (m == UNKNOWN_DOUBLE_VALUE || v > m)
 				m = v;
 		}
 
@@ -69,7 +69,7 @@ void ui_unity_launcher_entry_update(struct psensor **sensors)
 
 	v = get_max_current_value(sensors, SENSOR_TYPE_TEMP);
 
-	if (v != UNKNOWN_DBL_VALUE) {
+	if (v != UNKNOWN_DOUBLE_VALUE) {
 		if (config_get_temperature_unit() == FAHRENHEIT)
 			v = celsius_to_fahrenheit(v);
 
diff --git a/src/ui_unity.h b/src/ui_unity.h
index 52e51d98..8232ae5c 100644
--- a/src/ui_unity.h
+++ b/src/ui_unity.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#ifndef _PSENSOR_UI_UNITY_H_
-#define _PSENSOR_UI_UNITY_H_
+#ifndef PSENSOR_UI_UNITY_H
+#define PSENSOR_UI_UNITY_H
 
 #include <bool.h>
 #include <psensor.h>
diff --git a/test-driver b/test-driver
index d3060566..be73b80a 100755
--- a/test-driver
+++ b/test-driver
@@ -1,9 +1,9 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@ scriptversion=2013-07-13.22; # UTC
 # 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/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -42,11 +42,13 @@ print_usage ()
 {
   cat <<END
 Usage:
-  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
-              [--expect-failure={yes|no}] [--color-tests={yes|no}]
-              [--enable-hard-errors={yes|no}] [--]
+  test-driver --test-name NAME --log-file PATH --trs-file PATH
+              [--expect-failure {yes|no}] [--color-tests {yes|no}]
+              [--enable-hard-errors {yes|no}] [--]
               TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+See the GNU Automake documentation for information.
 END
 }
 
@@ -103,14 +105,20 @@ trap "st=130; $do_exit" 2
 trap "st=141; $do_exit" 13
 trap "st=143; $do_exit" 15
 
-# Test script is run here.
-"$@" >$log_file 2>&1
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
 estatus=$?
+
 if test $enable_hard_errors = no && test $estatus -eq 99; then
-  estatus=1
+  tweaked_estatus=1
+else
+  tweaked_estatus=$estatus
 fi
 
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
   0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
   0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
   77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
@@ -119,6 +127,12 @@ case $estatus:$expect_failure in
   *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
 esac
 
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
+
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"
 
@@ -131,9 +145,9 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/tests/Makefile.in b/tests/Makefile.in
index b4a54911..34285921 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -69,7 +69,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -99,7 +98,11 @@ TESTS = test-io-dir-list.sh test-psensor-type-to-unit-str$(EXEEXT) \
 @CPPCHECK_TRUE@am__append_3 = test-cppcheck.sh
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -145,7 +148,12 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/test_io_dir_list.Po \
+	./$(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po \
+	./$(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po \
+	./$(DEPDIR)/test_url_encode.Po \
+	./$(DEPDIR)/test_url_normalize.Po
 am__mv = mv -f
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -193,8 +201,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__tty_colors_dummy = \
   mgn= red= grn= lgn= blu= brg= std=; \
   am__color_tests=no
@@ -377,6 +383,7 @@ am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
 AM_RECURSIVE_TARGETS = check recheck
 TEST_SUITE_LOG = test-suite.log
@@ -402,6 +409,7 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
 	$(top_srcdir)/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -420,6 +428,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -428,13 +438,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -490,7 +498,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -505,7 +512,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -594,8 +600,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -636,11 +642,17 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_io_dir_list.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_url_encode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_url_normalize.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_io_dir_list.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_url_encode.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_url_normalize.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -843,7 +855,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
@@ -856,7 +868,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	fi;								\
 	$$success || exit 1
 
-check-TESTS:
+check-TESTS: $(check_PROGRAMS)
 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -933,8 +945,10 @@ test-cppcheck.sh.log: test-cppcheck.sh
 @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1008,7 +1022,11 @@ clean: clean-am
 clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/test_io_dir_list.Po
+	-rm -f ./$(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po
+	-rm -f ./$(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po
+	-rm -f ./$(DEPDIR)/test_url_encode.Po
+	-rm -f ./$(DEPDIR)/test_url_normalize.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1054,7 +1072,11 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/test_io_dir_list.Po
+	-rm -f ./$(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po
+	-rm -f ./$(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po
+	-rm -f ./$(DEPDIR)/test_url_encode.Po
+	-rm -f ./$(DEPDIR)/test_url_normalize.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1074,8 +1096,8 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am \
-	check-local clean clean-checkPROGRAMS clean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+	check-am check-local clean clean-checkPROGRAMS clean-generic \
 	cscopelist-am ctags ctags-am distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
diff --git a/tests/test_io_dir_list.c b/tests/test_io_dir_list.c
index 1d3ec177..3ff84615 100644
--- a/tests/test_io_dir_list.c
+++ b/tests/test_io_dir_list.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../src/lib/pio.h"
+#include "../src/lib/io.h"
 
 static int test_empty_dir(void)
 {
diff --git a/tests/test_psensor_value_to_str.c b/tests/test_psensor_value_to_str.c
index 5d088672..914f1436 100644
--- a/tests/test_psensor_value_to_str.c
+++ b/tests/test_psensor_value_to_str.c
@@ -30,7 +30,7 @@
 static int
 test_psensor_value_to_str(unsigned int type,
 			  double value,
-			  int celsius,
+			  unsigned int celsius,
 			  const char *ref)
 {
 	char *str;
@@ -43,18 +43,19 @@ test_psensor_value_to_str(unsigned int type,
 		return 0;
 	}
 }
-
+#define USE_CELSIUS 1U
+#define USE_FAHRENHEIT 0U
 int main(int argc, char **argv)
 {
 	int errs;
 
-	errs = test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13, 1,
+	errs = test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13, USE_CELSIUS,
 					 "13"CELSIUS);
-	errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13, 0,
+	errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13, USE_FAHRENHEIT,
 					  "55"FAHRENHEIT);
-	errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13.4, 1,
+	errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13.4, USE_CELSIUS,
 					  "13"CELSIUS);
-	errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13.5, 1,
+	errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13.5, USE_FAHRENHEIT,
 					  "14"CELSIUS);
 
 	if (errs) 
diff --git a/www/Makefile.in b/www/Makefile.in
index 3b9d8c15..05a999da 100644
--- a/www/Makefile.in
+++ b/www/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,7 +70,6 @@ am__make_running_with_option = \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -90,7 +89,11 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = www
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,6 +152,7 @@ DATA = $(defaultwww_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -167,6 +171,8 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CURL_CFLAGS = @CURL_CFLAGS@
 CURL_LIBS = @CURL_LIBS@
 CYGPATH_W = @CYGPATH_W@
@@ -175,13 +181,11 @@ DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTK_CFLAGS = @GTK_CFLAGS@
 GTK_LIBS = @GTK_LIBS@
@@ -236,7 +240,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
-SED = @SED@
 SENSORS_LIBS = @SENSORS_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -251,7 +254,6 @@ XEXT_CFLAGS = @XEXT_CFLAGS@
 XEXT_LIBS = @XEXT_LIBS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XMKMF = @XMKMF@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -339,8 +341,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -378,8 +380,10 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \