From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 2 Jun 2014 20:02:16 +0000 (+0200)
Subject: Imported Upstream version 1.0.1
X-Git-Tag: upstream/1.0.1^0
X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=commitdiff_plain;h=e248180cc4ebc258fdd5778a26c08287089165b1

Imported Upstream version 1.0.1
---

diff --git a/INSTALL b/INSTALL
index a1e89e1..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   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
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
@@ -309,9 +309,10 @@ 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 bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -367,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index c4e3e53..e199b72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,9 +23,6 @@ dist_doc_DATA = AUTHORS \
 	README \
 	README.html
 
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA = psensor.desktop
-
 desktopdir = $(datadir)/applications
 desktop_DATA = psensor.desktop
 
diff --git a/Makefile.in b/Makefile.in
index 9101fde..74ac73c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,9 +109,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(autostartdir)" \
-	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"
-DATA = $(autostart_DATA) $(desktop_DATA) $(dist_doc_DATA)
+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=) \
@@ -246,6 +245,7 @@ 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@
@@ -338,8 +338,6 @@ dist_doc_DATA = AUTHORS \
 	README \
 	README.html
 
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA = psensor.desktop
 desktopdir = $(datadir)/applications
 desktop_DATA = psensor.desktop
 EXTRA_DIST = $(desktop_DATA) $(autostart_DATA)
@@ -396,27 +394,6 @@ $(srcdir)/config.h.in:  $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-install-autostartDATA: $(autostart_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(autostartdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(autostartdir)" || 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)$(autostartdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(autostartdir)" || exit $$?; \
-	done
-
-uninstall-autostartDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(autostartdir)'; $(am__uninstall_files_from_dir)
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
@@ -787,7 +764,7 @@ check: check-recursive
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"; do \
+	for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -841,8 +818,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-autostartDATA install-desktopDATA \
-	install-dist_docDATA
+install-data-am: install-desktopDATA install-dist_docDATA
 
 install-dvi: install-dvi-recursive
 
@@ -888,8 +864,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-autostartDATA uninstall-desktopDATA \
-	uninstall-dist_docDATA
+uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
 	ctags-recursive install-am install-strip tags-recursive
@@ -901,15 +876,14 @@ uninstall-am: uninstall-autostartDATA uninstall-desktopDATA \
 	distcheck distclean distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-autostartDATA 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-recursive uninstall uninstall-am uninstall-autostartDATA \
+	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-recursive uninstall uninstall-am \
 	uninstall-desktopDATA uninstall-dist_docDATA
 
 
diff --git a/NEWS b/NEWS
index 75ffc7f..6b32544 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,32 @@
 Psensor NEWS
 ============
 
+v1.0.1
+------
+
+* Smaller and more consistent with ubuntu themes appindicator icons.
+* Sensors displayed directly in the top bar (experimental).
+* Improved status icon in hicolor theme to fit well with white
+  background. (LP: #1310323).
+* Psensor not autostarted by default.
+* Added a setting to launch psensor on session startup. (Closes:
+  #728754)
+* Fixed minor GUI bugs (widget alignments, padding, layout policy,
+  etc).
+* Fixed missing translatable strings.
+* Fixed FTBFS due to deprecation of json_object_object_get. (Closes:
+  #746145)
+* Fixed typo (Celcius/Celsius).
+* Merged german translation from LP.
+* Merged turkish translation from LP (İbrahim Çelik).
+* Merged chinese translation from LP.
+* Merged hungarian translation from LP.
+* Merged russian translation from LP (Dmitry Serov).
+* Added support of swedish translation (Josef Andersson).
+* Fixed NVIDIA strings.
+* Fixed default sensor color which was always black.
+* Fixed compilation on ppc64. (Closes: #749110)
+
 v0.8.0.6
 --------
 
@@ -153,7 +179,7 @@ v0.7.0.1
 * psensor: used the foreground color defined by the theme for the
    font of the graph legend.
 * psensor: used tab layout for psensor preferences.
-* psensor: temperature unit choice (celcius/fahrenheit).
+* psensor: temperature unit choice (celsius/fahrenheit).
 * +psensor-server+: fixed --wdir option.
 * +psensor-server+: added log level to -d option.
 * +psensor-server+: added --log-file option.
@@ -194,7 +220,7 @@ v0.6.2.19
 v0.6.2.18
 ---------
 
-* added degree sign for celcius (Closes LP: #1021900).
+* added degree sign for celsius (Closes LP: #1021900).
 * added russian, brazilian, hungarian, serbian, slovenian,
    italian, ukrainian and german translation files.
 * merged translations from LP.
diff --git a/NEWS.html b/NEWS.html
index ba5f0c6..7714441 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -3,7 +3,7 @@
 <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.7" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title>Psensor NEWS</title>
 <style type="text/css">
 
@@ -177,6 +177,8 @@ table {
     -webkit-box-shadow: 0 2px 2px 0 #C2C2C2;
     box-shadow: 0 2px 2px 0 #C2C2C2;
 }
+
+
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -379,6 +381,131 @@ asciidoc.install();
 </div>
 <div id="content">
 <div class="sect1">
+<h2 id="_v1_0_1">v1.0.1</h2>
+<div class="sectionbody">
+<div class="ulist"><ul>
+<li>
+<p>
+Smaller and more consistent with ubuntu themes appindicator icons.
+</p>
+</li>
+<li>
+<p>
+Sensors displayed directly in the top bar (experimental).
+</p>
+</li>
+<li>
+<p>
+Improved status icon in hicolor theme to fit well with white
+  background. (LP: #1310323).
+</p>
+</li>
+<li>
+<p>
+Psensor not autostarted by default.
+</p>
+</li>
+<li>
+<p>
+Added a setting to launch psensor on session startup. (Closes:
+  #728754)
+</p>
+</li>
+<li>
+<p>
+Fixed minor GUI bugs (widget alignments, padding, layout policy,
+  etc).
+</p>
+</li>
+<li>
+<p>
+Fixed missing translatable strings.
+</p>
+</li>
+<li>
+<p>
+Fixed FTBFS due to deprecation of json_object_object_get. (Closes:
+  #746145)
+</p>
+</li>
+<li>
+<p>
+Fixed typo (Celcius/Celsius).
+</p>
+</li>
+<li>
+<p>
+Merged german translation from LP.
+</p>
+</li>
+<li>
+<p>
+Merged turkish translation from LP (İbrahim Çelik).
+</p>
+</li>
+<li>
+<p>
+Merged chinese translation from LP.
+</p>
+</li>
+<li>
+<p>
+Merged hungarian translation from LP.
+</p>
+</li>
+<li>
+<p>
+Merged russian translation from LP (Dmitry Serov).
+</p>
+</li>
+<li>
+<p>
+Added support of swedish translation (Josef Andersson).
+</p>
+</li>
+<li>
+<p>
+Fixed NVIDIA strings.
+</p>
+</li>
+<li>
+<p>
+Fixed default sensor color which was always black.
+</p>
+</li>
+<li>
+<p>
+Fixed compilation on ppc64. (Closes: #749110)
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_v0_8_0_6">v0.8.0.6</h2>
+<div class="sectionbody">
+<div class="ulist"><ul>
+<li>
+<p>
+Updated jquery and jqplot to last version.
+</p>
+</li>
+<li>
+<p>
+Removed excanvas for copyright reason (apache license not compatible
+  with GPLv2 license).
+</p>
+</li>
+<li>
+<p>
+Use non-minimized version of .js and .css to avoid lintian errors
+  (source-is-missing).
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_v0_8_0_5">v0.8.0.5</h2>
 <div class="sectionbody">
 <div class="ulist"><ul>
@@ -394,7 +521,7 @@ Converted NEWS file to asciidoc.
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>:
+<code>psensor-server</code>:
 </p>
 <div class="ulist"><ul>
 <li>
@@ -518,7 +645,7 @@ Switched to GtkColorChooserDialog instead of the
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: fixed compilation without gtop2 lib.
+<code>psensor-server</code>: fixed compilation without gtop2 lib.
 </p>
 </li>
 </ul></div>
@@ -568,7 +695,7 @@ added support of sensors log interval.
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: protocole changes, API version incremented.
+<code>psensor-server</code>: protocole changes, API version incremented.
 </p>
 </li>
 <li>
@@ -688,7 +815,7 @@ psensor: added an option to enable logging of sensors
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: added sensors logging (--sensor-log-file).
+<code>psensor-server</code>: added sensors logging (--sensor-log-file).
 </p>
 </li>
 <li>
@@ -877,27 +1004,27 @@ psensor: used tab layout for psensor preferences.
 </li>
 <li>
 <p>
-psensor: temperature unit choice (celcius/fahrenheit).
+psensor: temperature unit choice (celsius/fahrenheit).
 </p>
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: fixed --wdir option.
+<code>psensor-server</code>: fixed --wdir option.
 </p>
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: added log level to -d option.
+<code>psensor-server</code>: added log level to -d option.
 </p>
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: added --log-file option.
+<code>psensor-server</code>: added --log-file option.
 </p>
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: logged measures when log level is 3.
+<code>psensor-server</code>: logged measures when log level is 3.
 </p>
 </li>
 <li>
@@ -1016,7 +1143,7 @@ psensor: fixed size of the icon hicolor/48x48/psensor_hot.png.
 <div class="ulist"><ul>
 <li>
 <p>
-added degree sign for celcius (Closes LP: #1021900).
+added degree sign for celsius (Closes LP: #1021900).
 </p>
 </li>
 <li>
@@ -1087,7 +1214,7 @@ psensor: removed -pedantic and ignores deprecation warnings
 <div class="ulist"><ul>
 <li>
 <p>
-<tt>psensor-server</tt>: uses glibtop instead of <em>sysinfo</em> which is not
+<code>psensor-server</code>: uses glibtop instead of <em>sysinfo</em> which is not
    available on kfreebsd. It fixes Debian bug #650533.
 </p>
 </li>
@@ -1110,7 +1237,7 @@ psensor: inner space of the graph using the theme background color
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: fixed compilation with microhttpd &gt;=0x90200 and
+<code>psensor-server</code>: fixed compilation with microhttpd &gt;=0x90200 and
    64bits.
 </p>
 </li>
@@ -1122,7 +1249,7 @@ added some information in the README (mostly about compilation on
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: support of symbolic links to webfiles.
+<code>psensor-server</code>: support of symbolic links to webfiles.
 </p>
 </li>
 </ul></div>
@@ -1161,7 +1288,7 @@ psensor: fixed typo in french translation file.
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: fixed compilation with microhttpd &gt;= 0.9.2 (version
+<code>psensor-server</code>: fixed compilation with microhttpd &gt;= 0.9.2 (version
    used by Fedora15) which introduced incompatible API changes.
 </p>
 </li>
@@ -1289,13 +1416,13 @@ psensor: added X-GNOME-Autostart-Delay in .desktop file to
 <div class="ulist"><ul>
 <li>
 <p>
-<tt>psensor-server</tt>: added network, cpu load and memory information in
+<code>psensor-server</code>: added network, cpu load and memory information in
    JSON web interface.
 </p>
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: added monitor.html and details.html using jquery
+<code>psensor-server</code>: added monitor.html and details.html using jquery
    and retrieving monitoring data from the JSON web interface.
 </p>
 </li>
@@ -1311,7 +1438,7 @@ psensor: added support of CPU usage monitoring.
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: display graph of sensors (web server).
+<code>psensor-server</code>: display graph of sensors (web server).
 </p>
 </li>
 <li>
@@ -1423,7 +1550,7 @@ psensor: escaped - in manpage.
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: escaped - in manpage.
+<code>psensor-server</code>: escaped - in manpage.
 </p>
 </li>
 <li>
@@ -1607,12 +1734,12 @@ psensor: the value of the first detected sensor is displayed in the
 <div class="ulist"><ul>
 <li>
 <p>
-<tt>psensor-server</tt>: new global variable <em>psensor_version</em> for lua template
+<code>psensor-server</code>: new global variable <em>psensor_version</em> for lua template
 </p>
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: /index.html replaced by /index.lua
+<code>psensor-server</code>: /index.html replaced by /index.lua
 </p>
 </li>
 <li>
@@ -1629,22 +1756,22 @@ avoid useless lib linkage by using --as-needed
 <div class="ulist"><ul>
 <li>
 <p>
-<tt>psensor-server</tt>: web server support binary files
+<code>psensor-server</code>: web server support binary files
 </p>
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: added favicon.ico
+<code>psensor-server</code>: added favicon.ico
 </p>
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: moved index.lua to monitor.lua
+<code>psensor-server</code>: moved index.lua to monitor.lua
 </p>
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: added index.html (welcome page)
+<code>psensor-server</code>: added index.html (welcome page)
 </p>
 </li>
 </ul></div>
@@ -1763,7 +1890,7 @@ psensor: escaped - in manpage
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>: escaped - in manpage
+<code>psensor-server</code>: escaped - in manpage
 </p>
 </li>
 </ul></div>
@@ -1969,7 +2096,7 @@ added Simplified Chinese Language (from DaBao &lt;<a href="mailto:linux.dabao@gm
 </li>
 <li>
 <p>
-<tt>psensor-server</tt>:
+<code>psensor-server</code>:
 </p>
 <div class="ulist"><ul>
 <li>
@@ -2474,7 +2601,7 @@ Fixed BR1: crash when no temperature sensor is available
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-04-10 08:44:57 CEST
+Last updated 2014-06-02 10:11:58 CEST
 </div>
 </div>
 </body>
diff --git a/aclocal.m4 b/aclocal.m4
index bc03ac0..98b09d0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -65,8 +65,8 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
   AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
 ])
 
-# gettext.m4 serial 63 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+# gettext.m4 serial 66 (gettext-0.18.2)
+dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -102,7 +102,7 @@ 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    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
@@ -164,7 +164,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
-  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
   gt_INTL_MACOSX
 
   dnl Set USE_NLS.
@@ -224,12 +224,18 @@ changequote([,])dnl
         fi
 
         AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_TRY_LINK([#include <libintl.h>
+         [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],
+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"])])
 
@@ -250,35 +256,47 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
+            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 ("")],
+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_TRY_LINK([#include <libintl.h>
+              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"
-               ])
+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"])
@@ -449,8 +467,8 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED],
 dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
-# iconv.m4 serial 11 (gettext-0.18.1)
-dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
+# iconv.m4 serial 18 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -481,27 +499,35 @@ AC_DEFUN([AM_ICONV_LINK],
   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_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  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_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
+    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_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
+      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"
@@ -509,16 +535,19 @@ AC_DEFUN([AM_ICONV_LINK],
   ])
   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, HP-UX 11.11, Solaris 10.
+      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
-      AC_TRY_RUN([
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
 #include <iconv.h>
 #include <string.h>
 int main ()
 {
+  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
@@ -535,7 +564,8 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
       }
   }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -554,7 +584,27 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          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 const char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &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.  */
@@ -573,7 +623,8 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #endif
@@ -587,13 +638,19 @@ int main ()
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
-}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
-        [case "$host_os" in
+    result |= 16;
+  return result;
+}]])],
+        [am_cv_func_iconv_works=yes],
+        [am_cv_func_iconv_works=no],
+        [
+changequote(,)dnl
+         case "$host_os" in
            aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
            *)            am_cv_func_iconv_works="guessing yes" ;;
-         esac])
+         esac
+changequote([,])dnl
+        ])
       LIBS="$am_save_LIBS"
     ])
     case "$am_cv_func_iconv_works" in
@@ -634,38 +691,53 @@ m4_define([gl_iconv_AC_DEFUN],
   m4_version_prereq([2.64],
     [[AC_DEFUN_ONCE(
         [$1], [$2])]],
-    [[AC_DEFUN(
-        [$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_TRY_COMPILE([
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[
 #include <stdlib.h>
 #include <iconv.h>
 extern
 #ifdef __cplusplus
 "C"
 #endif
-#if defined(__STDC__) || defined(__cplusplus)
+#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_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 3 (gettext-0.18)
-dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
+# intlmacosx.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -679,35 +751,40 @@ dnl by the GNU Library General Public License, and the rest of the GNU
 dnl gettext package package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
-dnl Checks for special options needed on MacOS X.
+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 MacOS X 10.2.
+  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_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
+     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 MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+      [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
   fi
-  dnl Check for API introduced in MacOS X 10.3.
+  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_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
+     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 MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+      [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
@@ -716,53 +793,59 @@ AC_DEFUN([gt_INTL_MACOSX],
   AC_SUBST([INTL_MACOSX_LIBS])
 ])
 
-# lib-ld.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
+# lib-ld.m4 serial 6
+dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with 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-1.4. Sets the variable with_gnu_ld to yes or no.
+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 ld's only accept -v.
+[# 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=yes
+  ;;
 *)
-  acl_cv_prog_gnu_ld=no ;;
+  acl_cv_prog_gnu_ld=no
+  ;;
 esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
-dnl From libtool-1.4. Sets the variable LD.
+dnl From libtool-2.4. Sets the variable LD.
 AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
+[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
-  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
+  # 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 GCC])
+  AC_MSG_CHECKING([for ld used by $CC])
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -772,11 +855,11 @@ if test "$GCC" = yes; then
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [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
+    [[\\/]]* | ?:[[\\/]]*)
+      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"
@@ -797,23 +880,26 @@ else
 fi
 AC_CACHE_VAL([acl_cv_path_LD],
 [if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  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 GNU ld's only accept -v.
+      # 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
+      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="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi])
@@ -827,8 +913,8 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_LIB_PROG_LD_GNU
 ])
 
-# lib-link.m4 serial 21 (gettext-0.18)
-dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
+# lib-link.m4 serial 26 (gettext-0.18.2)
+dnl Copyright (C) 2001-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -847,9 +933,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[translit([$1],[./-], [___])])
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  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"
@@ -887,9 +973,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 [
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
-  pushdef([Name],[translit([$1],[./-], [___])])
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  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.
@@ -914,7 +1000,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
       *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
       *)       LIBS="$LIB[]NAME $LIBS" ;;
     esac
-    AC_TRY_LINK([$3], [$4],
+    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"
@@ -944,6 +1031,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 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,
@@ -986,15 +1075,15 @@ 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],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   define([acl_frompackage_]NAME, [$2])
   popdef([NAME])
   pushdef([PACK],[$2])
-  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
-                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
+                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   define([acl_libsinpackage_]PACKUP,
-    m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
+    m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
   popdef([PACKUP])
   popdef([PACK])
 ])
@@ -1007,14 +1096,14 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
   AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
+                                   [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
   pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
-  pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
-                                  [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  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],[translit(PACK,[.],[_])],PACK)])
+  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([
@@ -1071,7 +1160,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
         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___|'`
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
         eval value=\"\$HAVE_LIB$uppername\"
         if test -n "$value"; then
           if test "$value" = yes; then
@@ -1603,7 +1692,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
 ])
 
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -1828,7 +1917,7 @@ sixtyfour bits
 ])
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 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,
@@ -2020,8 +2109,8 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# po.m4 serial 17 (gettext-0.18)
-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
+# po.m4 serial 21 (gettext-0.18.3)
+dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -2039,14 +2128,15 @@ dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
-AC_PREREQ([2.50])
+AC_PREREQ([2.60])
 
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
 [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  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
@@ -2124,7 +2214,7 @@ changequote([,])dnl
       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.
@@ -2140,7 +2230,8 @@ changequote([,])dnl
         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"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$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
@@ -2151,12 +2242,12 @@ changequote([,])dnl
               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 assigment from automake < 1.5.
+            # 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 assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -2248,7 +2339,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
 changequote(,)dnl
   # 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.
@@ -2276,6 +2367,7 @@ EOT
   fi
 
   # 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
@@ -2283,9 +2375,9 @@ s/P/P/
 x
 ta
 # Yes it was empty. Look if we have the expected variable definition.
-/^[	 ]*VARIABLE[	 ]*=/{
+/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
   # Seen the first line of the variable definition.
-  s/^[	 ]*VARIABLE[	 ]*=//
+  s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
   ba
 }
 bd
@@ -2337,7 +2429,7 @@ changequote([,])dnl
     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 assigment from automake < 1.5.
+  # Hide the ALL_LINGUAS assignment from automake < 1.5.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -2427,14 +2519,15 @@ changequote([,])dnl
   fi
 
   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
-	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${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
@@ -2444,8 +2537,8 @@ EOF
       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
-	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+${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
@@ -2470,8 +2563,8 @@ AC_DEFUN([AM_XGETTEXT_OPTION],
   XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
 ])
 
-# progtest.m4 serial 6 (gettext-0.18)
-dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -2499,15 +2592,14 @@ AC_DEFUN([AM_PATH_PROG_WITH_TEST],
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  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
+  # 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
 
 # Find out how to test for executable files. Don't use a zero-byte file,
diff --git a/ar-lib b/ar-lib
index 0f62c6f..fe2301e 100755
--- a/ar-lib
+++ b/ar-lib
@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2012-03-01.08; # UTC
 
-# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2010-2013 Free Software Foundation, Inc.
 # Written by Peter Rosin <peda@lysator.liu.se>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/compile b/compile
index 862a14e..531136b 100755
--- a/compile
+++ b/compile
@@ -1,10 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-03-05.13; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -113,6 +112,11 @@ func_cl_dashl ()
       lib=$dir/$lib.lib
       break
     fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
   done
   IFS=$save_IFS
 
diff --git a/config.guess b/config.guess
index d622a44..b79252d 100755
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2013-06-10'
 
 # 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 2 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
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # 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
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=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
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
@@ -852,21 +874,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *: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/[-(].*//'`-gnu
+	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 ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	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 ;;
     arm*:Linux:*:*)
 	eval $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-gnu
+	    echo ${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-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -950,54 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     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-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1227,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1227,19 +1256,21 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$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
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$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
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1287,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,9 +1361,6 @@ EOF
 	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
diff --git a/config.h.in b/config.h.in
index a45b4a7..8f456ae 100644
--- a/config.h.in
+++ b/config.h.in
@@ -16,11 +16,11 @@
 /* Use libatasmart */
 #undef HAVE_ATASMART
 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
 
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
 #undef HAVE_CFPREFERENCESCOPYAPPVALUE
 
diff --git a/config.sub b/config.sub
index 6205f84..9633db7 100755
--- a/config.sub
+++ b/config.sub
@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-04-18'
+timestamp='2013-08-10'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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 2 of the License, or
+# 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
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-04-18'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 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."
@@ -123,7 +116,7 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@ case $os in
 	-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)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -259,10 +252,12 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -273,7 +268,7 @@ case $basic_machine in
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -291,16 +286,17 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -370,13 +366,13 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -389,7 +385,8 @@ case $basic_machine in
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -407,12 +404,13 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| orion-* \
@@ -788,11 +786,15 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -828,7 +830,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1019,7 +1021,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1346,21 +1352,21 @@ case $os in
 	-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* \
+	      | -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* \
-	      | -openbsd* | -solidbsd* \
+	      | -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* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+	      | -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* \
@@ -1492,9 +1498,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1543,6 +1546,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1586,6 +1592,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/configure b/configure
index b0f41cb..e5d44ca 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for psensor 0.8.0.6.
+# Generated by GNU Autoconf 2.69 for psensor 1.0.1.
 #
 # Report bugs to <jeanfi@gmail.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='psensor'
 PACKAGE_TARNAME='psensor'
-PACKAGE_VERSION='0.8.0.6'
-PACKAGE_STRING='psensor 0.8.0.6'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='psensor 1.0.1'
 PACKAGE_BUGREPORT='jeanfi@gmail.com'
 PACKAGE_URL='http://wpitchoune.net/psensor'
 
@@ -721,6 +721,7 @@ GMSGFMT
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
+SED
 LIBOBJS
 EGREP
 GREP
@@ -1401,7 +1402,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures psensor 0.8.0.6 to adapt to many kinds of systems.
+\`configure' configures psensor 1.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1475,7 +1476,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of psensor 0.8.0.6:";;
+     short | recursive ) echo "Configuration of psensor 1.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1495,7 +1496,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
@@ -1624,7 +1625,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-psensor configure 0.8.0.6
+psensor configure 1.0.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2047,7 +2048,7 @@ 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 0.8.0.6, which was
+It was created by psensor $as_me 1.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2864,7 +2865,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='psensor'
- VERSION='0.8.0.6'
+ VERSION='1.0.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4046,7 +4047,7 @@ 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 << 62) - 1 + ((off_t) 1 << 62))
+#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];
@@ -4092,7 +4093,7 @@ 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 << 62) - 1 + ((off_t) 1 << 62))
+#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];
@@ -4116,7 +4117,7 @@ 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 << 62) - 1 + ((off_t) 1 << 62))
+#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];
@@ -4161,7 +4162,7 @@ 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 << 62) - 1 + ((off_t) 1 << 62))
+#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];
@@ -4185,7 +4186,7 @@ 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 << 62) - 1 + ((off_t) 1 << 62))
+#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];
@@ -5253,6 +5254,75 @@ 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;;
+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; }
@@ -5277,15 +5347,14 @@ $as_echo "$USE_NLS" >&6; }
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  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
+  # 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
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -5400,15 +5469,14 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  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
+  # 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
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -5478,15 +5546,14 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  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
+  # 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
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -5641,6 +5708,7 @@ 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 :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -5651,21 +5719,21 @@ fi
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  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
+  # 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.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
-$as_echo_n "checking for ld used by GCC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -5675,11 +5743,11 @@ $as_echo_n "checking for ld used by GCC... " >&6; }
   esac
   case $ac_prog in
     # Accept absolute paths.
-    [\\/]* | [A-Za-z]:[\\/]*)
+    [\\/]* | ?:[\\/]*)
       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
+      # 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"
@@ -5704,23 +5772,26 @@ if ${acl_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  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 GNU ld's only accept -v.
+      # 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
+      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="$ac_save_ifs"
+  IFS="$acl_save_ifs"
 else
   acl_cv_path_LD="$LD" # Let the user override the test with a path.
 fi
@@ -5740,12 +5811,14 @@ $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 ld's only accept -v.
+  # 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=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
@@ -5928,7 +6001,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
@@ -6457,15 +6530,19 @@ if eval \${$gt_func_gnugettext_libc+:} false; then :
 else
   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 ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+
   ;
   return 0;
 }
@@ -6523,14 +6600,16 @@ else
     am_cv_lib_iconv=no
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 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;
 }
@@ -6545,14 +6624,16 @@ rm -f core conftest.err conftest.$ac_objext \
       LIBS="$LIBS $LIBICONV"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
 #include <stdlib.h>
 #include <iconv.h>
+
 int
 main ()
 {
 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;
 }
@@ -6576,15 +6657,17 @@ if ${am_cv_func_iconv_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-            am_save_LIBS="$LIBS"
+                  am_save_LIBS="$LIBS"
       if test $am_cv_lib_iconv = yes; then
         LIBS="$LIBS $LIBICONV"
       fi
       if test "$cross_compiling" = yes; then :
-  case "$host_os" in
+
+         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.  */
@@ -6593,6 +6676,7 @@ else
 #include <string.h>
 int main ()
 {
+  int result = 0;
   /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
      returns.  */
   {
@@ -6609,7 +6693,8 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          result |= 1;
+        iconv_close (cd_utf8_to_88591);
       }
   }
   /* Test against Solaris 10 bug: Failures are not distinguishable from
@@ -6628,7 +6713,27 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if (res == 0)
-          return 1;
+          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 const char input[] = "\304";
+        static char buf[2] = { (char)0xDE, (char)0xAD };
+        const char *inptr = input;
+        size_t inbytesleft = 1;
+        char *outptr = buf;
+        size_t outbytesleft = 1;
+        size_t res = iconv (cd_88591_to_utf8,
+                            (char **) &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.  */
@@ -6647,7 +6752,8 @@ int main ()
                             (char **) &inptr, &inbytesleft,
                             &outptr, &outbytesleft);
         if ((int)res > 0)
-          return 1;
+          result |= 8;
+        iconv_close (cd_88591_to_utf8);
       }
   }
 #endif
@@ -6661,8 +6767,8 @@ int main ()
       && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
       /* Try HP-UX names.  */
       && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
-    return 1;
-  return 0;
+    result |= 16;
+  return result;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -6779,7 +6885,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
@@ -7177,6 +7283,7 @@ else
             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;
@@ -7185,11 +7292,14 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+
   ;
   return 0;
 }
@@ -7205,6 +7315,7 @@ rm -f core conftest.err conftest.$ac_objext \
               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;
@@ -7213,19 +7324,22 @@ extern
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+
 int
 main ()
 {
+
 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 :
   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 \
@@ -9835,7 +9949,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by psensor $as_me 0.8.0.6, which was
+This file was extended by psensor $as_me 1.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9902,7 +10016,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-psensor config.status 0.8.0.6
+psensor config.status 1.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -10761,7 +10875,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.
@@ -10777,7 +10891,8 @@ $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"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$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
@@ -10788,12 +10903,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 assigment from automake < 1.5.
+            # 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 assigment from automake < 1.5.
+            # Hide the ALL_LINGUAS assignment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
diff --git a/configure.ac b/configure.ac
index fc28ac0..e37c81e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([psensor], [0.8.0.6],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [1.0.1],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
-AM_INIT_AUTOMAKE([-Wall -Werror gnu])
+AM_INIT_AUTOMAKE([-Wall gnu])
 
 AC_CONFIG_SRCDIR([src/ui.c])
 AC_CONFIG_HEADERS([config.h])
diff --git a/depcomp b/depcomp
index 25a39e6..4ebd5b3 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2012-03-27.16; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@ scriptversion=2012-03-27.16; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -57,11 +56,65 @@ EOF
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
 # A tabulation character.
 tab='	'
 # A newline character.
 nl='
 '
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
 
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
@@ -75,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -86,32 +142,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
 fi
 
 if test "$depmode" = xlc; then
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
-   gccflag=-qmakedep=gcc,-MF
-   depmode=gcc
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -134,8 +190,7 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -143,13 +198,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -157,15 +216,14 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the "deleted header file" problem.
@@ -174,15 +232,15 @@ gcc)
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' "$nl" < "$tmpdepfile" |
 ## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -200,8 +258,7 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -209,7 +266,6 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
@@ -217,19 +273,15 @@ sgi)
     # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
     tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr "$nl" ' ' >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
-
     # The second pass generates a dummy entry for each header file.
     tr ' ' "$nl" < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
@@ -247,9 +299,8 @@ aix)
   # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -262,9 +313,7 @@ aix)
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -273,65 +322,113 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # '$object: dependent.h' and one to simply 'dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
-  # However on
-  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\':
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-  # tcc 0.9.26 (FIXME still under development at the moment of writing)
-  # will emit a similar output, but also prepend the continuation lines
-  # with horizontal tabulation characters.
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form 'foo.o: dependent.h',
-  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # '$object: dependent.h' and one to simply 'dependent.h:'.
-  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
-    < "$tmpdepfile" > "$depfile"
-  sed '
-    s/[ '"$tab"'][ '"$tab"']*/ /g
-    s/^ *//
-    s/ *\\*$//
-    s/^[^:]*: *//
-    /^$/d
-    /:$/d
-    s/$/ :/
-  ' < "$tmpdepfile" >> "$depfile"
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -342,9 +439,8 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -355,8 +451,7 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -366,76 +461,61 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add 'dependent.h:' lines.
     sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in 'foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
 
 msvc7)
   if test "$libtool" = yes; then
@@ -446,8 +526,7 @@ msvc7)
   "$@" $showIncludes > "$tmpdepfile"
   stat=$?
   grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -473,6 +552,7 @@ $ {
   G
   p
 }' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
@@ -524,13 +604,14 @@ dashmstdout)
   # in the target name.  This is to cope with DOS-style filenames:
   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' "$nl" < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -583,10 +664,12 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -622,10 +705,10 @@ cpp)
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -657,15 +740,15 @@ msvisualcpp)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
   "$@" -E 2>/dev/null |
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6c769d4..370c8ff 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -185,6 +185,7 @@ 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@
diff --git a/doc/faq.html b/doc/faq.html
index 3d6de15..1ae0908 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -3,7 +3,7 @@
 <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.7" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title>Psensor Frequently Asked Questions</title>
 <style type="text/css">
 
@@ -177,6 +177,8 @@ table {
     -webkit-box-shadow: 0 2px 2px 0 #C2C2C2;
     box-shadow: 0 2px 2px 0 #C2C2C2;
 }
+
+
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -382,6 +384,11 @@ asciidoc.install(2);
 </div>
 </div>
 <div id="content">
+<div id="preamble">
+<div class="sectionbody">
+<div class="paragraph"><p>The last version of this FAQ is available at <a href="http://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=doc/faq.html;hb=HEAD">http://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=doc/faq.html;hb=HEAD</a>.</p></div>
+</div>
+</div>
 <div class="sect1">
 <h2 id="S_NoSensors">1. No sensors or only cpu usage is displayed</h2>
 <div class="sectionbody">
@@ -391,8 +398,8 @@ asciidoc.install(2);
 <p>
 motherboard and CPUs sensors: the information is retrieved
           from the lm-sensors library, it requires that
-          ‘sensors-detect’ has been run and the kernel module
-          correctly installed. ‘sensors’ can be used for checking.
+          <code>sensors-detect</code> has been run and the kernel module
+          correctly installed. <code>sensors</code> can be used for checking.
 </p>
 </li>
 <li>
@@ -410,13 +417,13 @@ Opensource drivers (nouveau for Nvidia GPUs or
 </li>
 <li>
 <p>
-proprietary driver Nvidia: run ‘nvidia-settings’ to
+proprietary driver Nvidia: run <code>nvidia-settings</code> to
                   check that it supports sensors monitoring.
 </p>
 </li>
 <li>
 <p>
-proprietary driver Catalyst/fglx: use ‘aticonfig’ to
+proprietary driver Catalyst/fglx: use <code>aticonfig</code> to
                   check that it supports sensors monitoring. Important
                   note: it requires that you are using a Psensor
                   binary compiled with the ATI support.
@@ -426,11 +433,11 @@ proprietary driver Catalyst/fglx: use ‘aticonfig’ to
 </li>
 <li>
 <p>
-HDDs: it uses the hddtemp daemon. Verifies that it is
-          correctly reporting temperature by using the ‘sudo hddtemp
-          /dev/sd?’ command. If hddtemp does not support your disk,
+HDDs: it uses the hddtemp daemon. Verify that it is
+          correctly reporting temperature by using the command: <code>sudo
+          hddtemp /dev/sda</code>. If hddtemp does not support your disk,
           you may want to try using the libatasmart support instead
-          (option –use-libatasmart option).
+          (option <code>--use-libatasmart</code>).
 </p>
 </li>
 </ul></div>
@@ -450,7 +457,7 @@ any Linux distribution.</p></div>
 <div class="paragraph"><p>Unfortunely, due to the license of this library, I cannot provide a
 compiled version of Psensor, even in a Ubuntu PPA or Ubuntu/Debian
 standard repositories. You have to compile Psensor sensor. You can
-find the instructions in the section “ATI/AMD GPU Support” of the
+find the instructions in the section <code>ATI/AMD GPU Support</code> of the
 README file available in the Psensor source archives.</p></div>
 <div class="paragraph"><p>If you are using the ATI OpenSource driver, it is not needed to
 compile Psensor with this proprietary library.</p></div>
@@ -491,8 +498,8 @@ the goal of the sensor is to allow the system to
 <p>
 It is only a bug in Psensor if the underlying libraries
           report a different information than Psensor (use the
-          appropriate command or software: ‘sensors’, ‘aticonfig’ or
-          ‘hddtemp’ to check). In this case, please report a bug.
+          appropriate command or software: <code>sensors</code>, <code>aticonfig</code> or
+          <code>hddtemp</code> to check). In this case, please report a bug.
 </p>
 </li>
 </ul></div>
@@ -509,32 +516,32 @@ starting with:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-‘lmsensor coretemp’: Intel CPU.
+<code>lmsensor coretemp</code>: Intel CPU.
 </p>
 </li>
 <li>
 <p>
-‘lmsensor k10temp’,'lmsensor k8temp’,'lmsensor fam15h_power’: AMD CPU.
+<code>lmsensor k10temp</code>, <code>lmsensor k8temp</code>, <code>lmsensor fam15h_power</code>: AMD CPU.
 </p>
 </li>
 <li>
 <p>
-‘nvidia’ or ‘lmsensor nouveau’: NVIDIA GPU.
+<code>nvidia</code> or <code>lmsensor nouveau</code>: NVIDIA GPU.
 </p>
 </li>
 <li>
 <p>
-‘hdd’: hard disk drive.
+<code>hdd</code>: hard disk drive.
 </p>
 </li>
 <li>
 <p>
-‘amd’: AMD GPU.
+<code>amd</code>: AMD GPU.
 </p>
 </li>
 <li>
 <p>
-‘lmsensor C B’: C is the name of the chip, B the name of the adapter.
+<code>lmsensor C B</code>: C is the name of the chip, B the name of the adapter.
 </p>
 </li>
 </ul></div>
@@ -568,10 +575,10 @@ or <a href="mailto:jeanfi@gmail.com">jeanfi@gmail.com</a>.
 </li>
 </ul></div>
 <div class="paragraph"><p>If the bug is concerning Debian or Ubuntu derivatives distribution,
-please add in its description the output of the command ‘apt-cache
-policy psensor’.</p></div>
+please add in its description the output of the command: <code>apt-cache
+policy psensor</code>.</p></div>
 <div class="paragraph"><p>If it is related to the Psensor source compilation, please add the
-full output of the ‘configure’ command.</p></div>
+full output of the <code>configure</code> command.</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -593,13 +600,17 @@ or send an email directly to me: <a href="mailto:jeanfi@gmail.com">jeanfi@gmail.
 <div class="sect1">
 <h2 id="S_UbuntuInstall">8. How to install Psensor on Ubuntu?</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Psensor is in the official repository, search “psensor” in the software center and install it. More information at: <a href="http://wpitchoune.net/blog/psensor/ubuntu-integration/">http://wpitchoune.net/blog/psensor/ubuntu-integration/</a>.</p></div>
+<div class="paragraph"><p>Psensor is in the official repository, search <code>psensor</code> in the
+software center and install it. More information at:
+<a href="http://wpitchoune.net/blog/psensor/ubuntu-integration/">http://wpitchoune.net/blog/psensor/ubuntu-integration/</a>.</p></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="S_DebianInstall">9. How to install Psensor on Debian?</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Psensor will be in the official repository since Debian 7.0. You can get the last packaged version from the sid repository. More information at: <a href="http://packages.qa.debian.org/p/psensor.html">http://packages.qa.debian.org/p/psensor.html</a>.</p></div>
+<div class="paragraph"><p>Psensor is in the official repository since Debian 7.0. You can get
+the last packaged version from the sid repository. More information
+at: <a href="http://packages.qa.debian.org/p/psensor.html">http://packages.qa.debian.org/p/psensor.html</a>.</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -608,19 +619,19 @@ or send an email directly to me: <a href="mailto:jeanfi@gmail.com">jeanfi@gmail.
 <div class="ulist"><ul>
 <li>
 <p>
-ppa:jfi/ppa: last stable version.
+<code>ppa:jfi/ppa</code>: last stable version.
 </p>
 </li>
 <li>
 <p>
-ppa:jfi/psensor-unstable: last development version, no major
-          bug is expected.
+<code>ppa:jfi/psensor-unstable</code>: last development version, no
+          major bug is expected.
 </p>
 </li>
 <li>
 <p>
-ppa:jfi/psensor-daily-trunk: build each day directly from
-          the SVN source repository. It may contain major bugs or
+<code>ppa:jfi/psensor-daily-trunk</code>: build each day directly from
+          the GIT source repository. It may contain major bugs or
           incomplete features. Useful for contributors or testing
           whether a bug is fixed.
 </p>
@@ -640,8 +651,8 @@ ppa:jfi/psensor-daily-trunk: build each day directly from
 <div class="paragraph"><p>Psensor packages are available in the standard repositories of Ubuntu
 (since Oneiric) and Debian (since v7) distributions.</p></div>
 <div class="paragraph"><p>For other distributions, you will find the compilation and
-installation instructions in the section ‘Installation from source
-archive’ in the README file of the source archive. Psensor should
+installation instructions in the section <code>Installation from source
+archive</code> in the README file of the source archive. Psensor should
 compile in any modern distribution.</p></div>
 </div>
 </div>
@@ -649,22 +660,57 @@ compile in any modern distribution.</p></div>
 <h2 id="S_LOG">13. How to log sensors temperatures?</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>The best way is probably to use sensord or a custom script based on
-the output of the different commands like sensors.</p></div>
+the output of the different commands like <code>sensors</code>.</p></div>
 <div class="paragraph"><p>Anyway, as I received several requests about such feature, since the
 0.7.0.4 release it is implemented in both psensor ( menu preferences &gt;
-sensors &gt; enable log of measures) and psensor-server (–sensor-log-file
-option).</p></div>
+sensors &gt; enable log of measures) and psensor-server
+(<code>--sensor-log-file</code> option).</p></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="S_NO_GRAPH_DISPLAYED">14. No graphs are displayed, but the table of the main window is displaying sensors</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>In the sensors table of the main window, switch on the checkbox of the last
-column (named "Enabled" or "Graph" depending on the Psensor version).</p></div>
+column (named <code>Enabled</code> or <code>Graph</code> depending on the Psensor version).</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_autostart">15. Launch Psensor automaticaly on session startup</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Since the version 1.0.1, Psensor is no more started automaticaly by default.</p></div>
+<div class="paragraph"><p>Open the <code>Preferences</code> window, select the <code>Startup</code> tab and switch on
+the option <code>Launch on session startup</code>.</p></div>
+<div class="paragraph"><p>This feature is requiring that the Desktop Environment supports the
+<a href="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG
+specification</a>.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_disk">16. How to monitor the temperature of a disk?</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>By default, Psensor is using <code>hddtemp</code> to retrieve the temperature of
+the disks.</p></div>
+<div class="paragraph"><p>If <code>hddtemp</code> is installed but no disk temperature is reported, check
+that the daemon is running by using for example the command <code>ps
+-eaf|grep hddtemp</code>.
+It should output something like:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>root      1433     1  0 May28 ?        00:00:21 /usr/sbin/hddtemp -d -l 127.0.0.1 -p 7634 -s | /dev/sdb</code></pre>
+</div></div>
+<div class="paragraph"><p>Since recent Ubuntu releases, installing the <code>hddtemp</code> package is not
+enough, it is required to manually allow the <code>hddtemp</code> daemon. Edit the
+file <code>/etc/default/hddtemp</code> and set <code>RUN_DAEMON</code> to <code>"true"</code>.</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code># hddtemp network daemon switch. If set to true, hddtemp will listen
+# for incoming connections.
+RUN_DAEMON="true"</code></pre>
+</div></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="S_SimilarSoft">15. Is there any other similar softwares?</h2>
+<h2 id="S_SimilarSoft">17. Is there any other similar softwares?</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Here is a list of few well-known sensors monitoring softwares:</p></div>
 <div class="ulist"><ul>
@@ -696,7 +742,7 @@ more general, but can be configured to display sensors
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-04-10 01:57:33 CEST
+Last updated 2014-06-02 09:02:02 CEST
 </div>
 </div>
 </body>
diff --git a/doc/faq.txt b/doc/faq.txt
index 434472d..1de2f69 100644
--- a/doc/faq.txt
+++ b/doc/faq.txt
@@ -1,6 +1,8 @@
 Psensor Frequently Asked Questions
 ==================================
 
+The last version of this FAQ is available at http://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=doc/faq.html;hb=HEAD.
+
 [[S_NoSensors]]
 No sensors or only cpu usage is displayed
 -----------------------------------------
@@ -9,8 +11,8 @@ Psensor is relying on few libraries or softwares for retrieving the information
 
 	- motherboard and CPUs sensors: the information is retrieved
           from the lm-sensors library, it requires that
-          ‘sensors-detect’ has been run and the kernel module
-          correctly installed. ‘sensors’ can be used for checking.
+          +sensors-detect+ has been run and the kernel module
+          correctly installed. +sensors+ can be used for checking.
 
 	- GPUs: it depends on which driver you are using:
 
@@ -19,19 +21,19 @@ Psensor is relying on few libraries or softwares for retrieving the information
             	  monitoring for your GPU, the information is using
             	  lm-sensors, same steps than above.
 
-		* proprietary driver Nvidia: run ‘nvidia-settings’ to
+		* proprietary driver Nvidia: run +nvidia-settings+ to
 		  check that it supports sensors monitoring.
 
-		* proprietary driver Catalyst/fglx: use ‘aticonfig’ to
+		* proprietary driver Catalyst/fglx: use +aticonfig+ to
                   check that it supports sensors monitoring. Important
                   note: it requires that you are using a Psensor
                   binary compiled with the ATI support.
 
-	- HDDs: it uses the hddtemp daemon. Verifies that it is
-          correctly reporting temperature by using the ‘sudo hddtemp
-          /dev/sd?’ command. If hddtemp does not support your disk,
+	- HDDs: it uses the hddtemp daemon. Verify that it is
+          correctly reporting temperature by using the command: +sudo
+          hddtemp /dev/sda+. If hddtemp does not support your disk,
           you may want to try using the libatasmart support instead
-          (option –use-libatasmart option).
+          (option +--use-libatasmart+).
 
 If the underlying software is reporting sensors which are not
 displayed by Psensor, it is probably a bug in Psensor, so please
@@ -50,7 +52,7 @@ any Linux distribution.
 Unfortunely, due to the license of this library, I cannot provide a
 compiled version of Psensor, even in a Ubuntu PPA or Ubuntu/Debian
 standard repositories. You have to compile Psensor sensor. You can
-find the instructions in the section “ATI/AMD GPU Support” of the
+find the instructions in the section +ATI/AMD GPU Support+ of the
 README file available in the Psensor source archives.
 
 If you are using the ATI OpenSource driver, it is not needed to
@@ -79,8 +81,8 @@ temperature, etc):
 
 	- It is only a bug in Psensor if the underlying libraries
           report a different information than Psensor (use the
-          appropriate command or software: ‘sensors’, ‘aticonfig’ or
-          ‘hddtemp’ to check). In this case, please report a bug.
+          appropriate command or software: +sensors+, +aticonfig+ or
+          +hddtemp+ to check). In this case, please report a bug.
 
 [[S_WhatIsTheSensor]]
 What is the sensors XXXX?
@@ -93,12 +95,12 @@ look at the Chip field.
 For older Psensor releases, look at the Id field, if the string is
 starting with:
 
-	- ‘lmsensor coretemp’: Intel CPU.
-	- ‘lmsensor k10temp’,'lmsensor k8temp’,'lmsensor fam15h_power’: AMD CPU.
-	- ‘nvidia’ or ‘lmsensor nouveau’: NVIDIA GPU.
-	- ‘hdd’: hard disk drive.
-	- ‘amd’: AMD GPU.
-	- ‘lmsensor C B’: C is the name of the chip, B the name of the adapter.
+	- +lmsensor coretemp+: Intel CPU.
+	- +lmsensor k10temp+, +lmsensor k8temp+, +lmsensor fam15h_power+: AMD CPU.
+	- +nvidia+ or +lmsensor nouveau+: NVIDIA GPU.
+	- +hdd+: hard disk drive.
+	- +amd+: AMD GPU.
+	- +lmsensor C B+: C is the name of the chip, B the name of the adapter.
 
 For more information about lmsensor devices, see
 http://lm-sensors.org/wiki/Devices.
@@ -124,11 +126,11 @@ email to:
       - or jeanfi@gmail.com.
 
 If the bug is concerning Debian or Ubuntu derivatives distribution,
-please add in its description the output of the command ‘apt-cache
-policy psensor’.
+please add in its description the output of the command: +apt-cache
+policy psensor+.
 
 If it is related to the Psensor source compilation, please add the
-full output of the ‘configure’ command.
+full output of the +configure+ command.
 
 [[S_SubmitIdea]]
 How to send ideas, questions or comments?
@@ -152,25 +154,29 @@ See http://wpitchoune.net/blog/psensor/how-to-contribute/.
 How to install Psensor on Ubuntu?
 ---------------------------------
 
-Psensor is in the official repository, search “psensor” in the software center and install it. More information at: http://wpitchoune.net/blog/psensor/ubuntu-integration/.
+Psensor is in the official repository, search +psensor+ in the
+software center and install it. More information at:
+http://wpitchoune.net/blog/psensor/ubuntu-integration/.
 
 [[S_DebianInstall]]
 How to install Psensor on Debian?
 ---------------------------------
 
-Psensor will be in the official repository since Debian 7.0. You can get the last packaged version from the sid repository. More information at: http://packages.qa.debian.org/p/psensor.html.
+Psensor is in the official repository since Debian 7.0. You can get
+the last packaged version from the sid repository. More information
+at: http://packages.qa.debian.org/p/psensor.html.
 
 [[S_PPA]]
 What is the difference between the 3 Ubuntu PPAs?
 -------------------------------------------------
 
-	- ppa:jfi/ppa: last stable version.
+	- +ppa:jfi/ppa+: last stable version.
 
-	- ppa:jfi/psensor-unstable: last development version, no major
-          bug is expected.
+	- +ppa:jfi/psensor-unstable+: last development version, no
+          major bug is expected.
 
-	- ppa:jfi/psensor-daily-trunk: build each day directly from
-          the SVN source repository. It may contain major bugs or
+	- +ppa:jfi/psensor-daily-trunk+: build each day directly from
+          the GIT source repository. It may contain major bugs or
           incomplete features. Useful for contributors or testing
           whether a bug is fixed.
 
@@ -188,8 +194,8 @@ Psensor packages are available in the standard repositories of Ubuntu
 (since Oneiric) and Debian (since v7) distributions.
 
 For other distributions, you will find the compilation and
-installation instructions in the section ‘Installation from source
-archive’ in the README file of the source archive. Psensor should
+installation instructions in the section +Installation from source
+archive+ in the README file of the source archive. Psensor should
 compile in any modern distribution.
 
 [[S_LOG]]
@@ -197,12 +203,12 @@ How to log sensors temperatures?
 --------------------------------
 
 The best way is probably to use sensord or a custom script based on
-the output of the different commands like sensors.
+the output of the different commands like +sensors+.
 
 Anyway, as I received several requests about such feature, since the
 0.7.0.4 release it is implemented in both psensor ( menu preferences >
-sensors > enable log of measures) and psensor-server (–sensor-log-file
-option).  
+sensors > enable log of measures) and psensor-server
+(+--sensor-log-file+ option).
 
 [[S_NO_GRAPH_DISPLAYED]]
 
@@ -210,7 +216,47 @@ No graphs are displayed, but the table of the main window is displaying sensors
 -------------------------------------------------------------------------------
 
 In the sensors table of the main window, switch on the checkbox of the last
-column (named "Enabled" or "Graph" depending on the Psensor version).
+column (named +Enabled+ or +Graph+ depending on the Psensor version).
+
+[[S_autostart]]
+Launch Psensor automaticaly on session startup
+----------------------------------------------
+
+Since the version 1.0.1, Psensor is no more started automaticaly by default.
+
+Open the +Preferences+ window, select the +Startup+ tab and switch on
+the option +Launch on session startup+.
+
+This feature is requiring that the Desktop Environment supports the
+http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html[XDG
+specification].
+
+[[S_disk]]
+How to monitor the temperature of a disk?
+-----------------------------------------
+
+By default, Psensor is using +hddtemp+ to retrieve the temperature of
+the disks.
+
+If +hddtemp+ is installed but no disk temperature is reported, check
+that the daemon is running by using for example the command +ps
+-eaf|grep hddtemp+.
+It should output something like:
+
+---------------------
+root      1433     1  0 May28 ?        00:00:21 /usr/sbin/hddtemp -d -l 127.0.0.1 -p 7634 -s | /dev/sdb
+---------------------
+
+Since recent Ubuntu releases, installing the +hddtemp+ package is not
+enough, it is required to manually allow the +hddtemp+ daemon. Edit the
+file +/etc/default/hddtemp+ and set +RUN_DAEMON+ to +"true"+.
+
+------------------
+# hddtemp network daemon switch. If set to true, hddtemp will listen
+# for incoming connections.
+RUN_DAEMON="true"
+------------------
+
 
 [[S_SimilarSoft]]
 Is there any other similar softwares?
diff --git a/icons/hicolor/14x14/Makefile.in b/icons/hicolor/14x14/Makefile.in
index b20199e..e569095 100644
--- a/icons/hicolor/14x14/Makefile.in
+++ b/icons/hicolor/14x14/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/hicolor/16x16/Makefile.in b/icons/hicolor/16x16/Makefile.in
index 7a22a7d..54cd6ed 100644
--- a/icons/hicolor/16x16/Makefile.in
+++ b/icons/hicolor/16x16/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/hicolor/22x22/Makefile.in b/icons/hicolor/22x22/Makefile.in
index 4e610e6..1dcd3a0 100644
--- a/icons/hicolor/22x22/Makefile.in
+++ b/icons/hicolor/22x22/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/hicolor/24x24/Makefile.in b/icons/hicolor/24x24/Makefile.in
index fe5a02c..9c669b9 100644
--- a/icons/hicolor/24x24/Makefile.in
+++ b/icons/hicolor/24x24/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/hicolor/32x32/Makefile.in b/icons/hicolor/32x32/Makefile.in
index 68f51f5..ab3755f 100644
--- a/icons/hicolor/32x32/Makefile.in
+++ b/icons/hicolor/32x32/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/hicolor/48x48/Makefile.in b/icons/hicolor/48x48/Makefile.in
index ad87a44..85dc9b5 100644
--- a/icons/hicolor/48x48/Makefile.in
+++ b/icons/hicolor/48x48/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/hicolor/64x64/Makefile.in b/icons/hicolor/64x64/Makefile.in
index 58be39f..583f909 100644
--- a/icons/hicolor/64x64/Makefile.in
+++ b/icons/hicolor/64x64/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/hicolor/scalable/Makefile.in b/icons/hicolor/scalable/Makefile.in
index e46072c..ba51e7c 100644
--- a/icons/hicolor/scalable/Makefile.in
+++ b/icons/hicolor/scalable/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/hicolor/scalable/psensor_hot.svg b/icons/hicolor/scalable/psensor_hot.svg
index 9fa2646..1fff1a4 100644
--- a/icons/hicolor/scalable/psensor_hot.svg
+++ b/icons/hicolor/scalable/psensor_hot.svg
@@ -7,41 +7,12 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3920"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="dark-psensor-hot-outline.svg">
+   width="22"
+   height="22"
+   id="svg3920">
   <defs
      id="defs3922" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="8.0517702"
-     inkscape:cy="10.150813"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1068"
-     inkscape:window-height="829"
-     inkscape:window-x="461"
-     inkscape:window-y="109"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="1,0"
-       position="7.9910715,8.6160715"
-       id="guide4142" />
-  </sodipodi:namedview>
   <metadata
      id="metadata3925">
     <rdf:RDF>
@@ -55,19 +26,15 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
+     transform="translate(0,-1030.3622)"
+     id="layer1">
     <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 7.1245753,1038.3895 c -1.4323258,0 -2.5937498,1.1614 -2.5937498,2.5938 l 0,6.9687 c -0.686446,0.6856 -1.1875,1.5722 -1.1875,2.625 0,2.0937 1.718759,3.8125 3.8124998,3.8125 2.093741,0 3.8125007,-1.7188 3.8125007,-3.8125 0,-1.0573 -0.523629,-1.9349 -1.2187507,-2.625 -7.17e-4,-0.7438 -9.27e-4,-1.3598 0,-2 a 1.0043849,1.0043849 0 0 0 0.0625,0 l 1.8125007,0 a 1.0001,1.0001 0 1 0 0,-2 l -1.8125007,0 a 1.0001,1.0001 0 0 0 -0.0625,0 c 3.43e-4,-0.3034 3.3e-5,-0.653 0,-0.9687 a 1.0043849,1.0043849 0 0 0 0.0625,0 l 1.8125007,0 a 1.0001,1.0001 0 1 0 0,-2 l -1.8125007,0 a 1.0001,1.0001 0 0 0 -0.0625,0 c 7e-6,-1.4538 -1.192674,-2.5938 -2.625,-2.5938 z m 0,2 c 0.27199,0 0.625001,0.3432 0.625,0.5938 0.01108,2.799 -0.0038,4.4747 0,7.2812 l 0,0.5313 0.4375,0.2812 c 0.472666,0.3299 0.78125,0.8867 0.78125,1.5 0,1.0129 -0.799639,1.8125 -1.8125,1.8125 -1.0128608,0 -1.8124998,-0.7996 -1.8124998,-1.8125 0,-0.6006 0.316404,-1.1338 0.78125,-1.4687 l 0.4062498,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.32176,-0.5938 0.59375,-0.5938 z"
-       id="path3008-6-8-8-6-4-6"
-       inkscape:connector-curvature="0" />
+       d="m 10.067832,1034.3622 c -1.540883,0 -2.790331,1.1614 -2.790331,2.5938 l 0,6.9687 C 6.539029,1044.6103 6,1045.4969 6,1046.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.31112,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.94987,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.94987,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.94987,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.94987,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283067,-2.5938 -2.823949,-2.5938 z m 0,2 c 0.292604,0 0.67237,0.3432 0.672369,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.508489,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860244,1.8125 -1.94987,1.8125 -1.089626,0 -1.94987,-0.7996 -1.94987,-1.8125 0,-0.6006 0.340385,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.346147,-0.5938 0.638751,-0.5938 z"
+       id="path3008-6-89-2"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
     <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 7.1245753,1036.3895 c -1.4323258,0 -2.5937498,1.1614 -2.5937498,2.5938 l 0,6.9687 c -0.686446,0.6856 -1.1875,1.5722 -1.1875,2.625 0,2.0937 1.718759,3.8125 3.8124998,3.8125 2.093741,0 3.8125007,-1.7188 3.8125007,-3.8125 0,-1.0573 -0.523629,-1.9349 -1.2187507,-2.625 -7.17e-4,-0.7438 -9.27e-4,-1.3598 0,-2 a 1.0043849,1.0043849 0 0 0 0.0625,0 l 1.8125007,0 a 1.0001,1.0001 0 1 0 0,-2 l -1.8125007,0 a 1.0001,1.0001 0 0 0 -0.0625,0 c 3.43e-4,-0.3034 3.3e-5,-0.653 0,-0.9687 a 1.0043849,1.0043849 0 0 0 0.0625,0 l 1.8125007,0 a 1.0001,1.0001 0 1 0 0,-2 l -1.8125007,0 a 1.0001,1.0001 0 0 0 -0.0625,0 c 7e-6,-1.4538 -1.192674,-2.5938 -2.625,-2.5938 z m 0,2 c 0.27199,0 0.625001,0.3432 0.625,0.5938 0.01108,2.799 -0.0038,4.4747 0,7.2812 l 0,0.5313 0.4375,0.2812 c 0.472666,0.3299 0.78125,0.8867 0.78125,1.5 0,1.0129 -0.799639,1.8125 -1.8125,1.8125 -1.0128608,0 -1.8124998,-0.7996 -1.8124998,-1.8125 0,-0.6006 0.316404,-1.1338 0.78125,-1.4687 l 0.4062498,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.32176,-0.5938 0.59375,-0.5938 z"
-       id="path3008-6-8-8-7-4"
-       inkscape:connector-curvature="0" />
+       d="m 10.067832,1033.3622 c -1.5408828,0 -2.7903312,1.1614 -2.7903312,2.5938 l 0,6.9687 C 6.5390289,1043.6103 6,1044.4969 6,1045.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.311121,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283066,-2.5938 -2.823948,-2.5938 z m 0,2 c 0.292604,0 0.672369,0.3432 0.672368,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.50849,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860243,1.8125 -1.949869,1.8125 -1.0896257,0 -1.9498697,-0.7996 -1.9498697,-1.8125 0,-0.6006 0.3403842,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.3461463,-0.5938 0.6387507,-0.5938 z"
+       id="path3008-6-89"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#df382c;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
   </g>
 </svg>
diff --git a/icons/hicolor/scalable/psensor_normal.svg b/icons/hicolor/scalable/psensor_normal.svg
index 50a43bf..463c424 100644
--- a/icons/hicolor/scalable/psensor_normal.svg
+++ b/icons/hicolor/scalable/psensor_normal.svg
@@ -7,41 +7,12 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3920"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="light-psensor.svg">
+   width="22"
+   height="22"
+   id="svg3920">
   <defs
      id="defs3922" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="8.0517702"
-     inkscape:cy="8.3650983"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1068"
-     inkscape:window-height="829"
-     inkscape:window-x="461"
-     inkscape:window-y="109"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="1,0"
-       position="7.9910715,8.6160715"
-       id="guide4142" />
-  </sodipodi:namedview>
   <metadata
      id="metadata3925">
     <rdf:RDF>
@@ -55,19 +26,11 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
+     transform="translate(0,-1030.3622)"
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 7.1156467,1038.3979 c -1.4323263,0 -2.5937503,1.1614 -2.5937503,2.5938 l 0,6.9687 c -0.686446,0.6856 -1.1875,1.5722 -1.1875,2.625 0,2.0937 1.718759,3.8125 3.8125003,3.8125 2.093741,0 3.8125003,-1.7188 3.8125003,-3.8125 0,-1.0573 -0.523629,-1.9349 -1.2187503,-2.625 -7.2e-4,-0.7438 -9.24e-4,-1.3598 0,-2 a 1.0043849,1.0043849 0 0 0 0.0625,0 l 1.8125003,0 a 1.0001,1.0001 0 1 0 0,-2 l -1.8125003,0 a 1.0001,1.0001 0 0 0 -0.0625,0 c 3.43e-4,-0.3034 3.2e-5,-0.653 0,-0.9687 a 1.0043849,1.0043849 0 0 0 0.0625,0 l 1.8125003,0 a 1.0001,1.0001 0 1 0 0,-2 l -1.8125003,0 a 1.0001,1.0001 0 0 0 -0.0625,0 c 6e-6,-1.4538 -1.192674,-2.5938 -2.625,-2.5938 z m 0,2 c 0.27199,0 0.625001,0.3432 0.625,0.5938 0.01105,2.799 -0.0038,4.4747 0,7.2812 l 0,0.5313 0.4375,0.2812 c 0.472666,0.3299 0.78125,0.8867 0.78125,1.5 0,1.0129 -0.799639,1.8125 -1.8125,1.8125 -1.012861,0 -1.8125003,-0.7996 -1.8125003,-1.8125 0,-0.6006 0.316404,-1.1338 0.78125,-1.4687 l 0.4062503,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.32176,-0.5938 0.59375,-0.5938 z"
-       id="path3008-6-89-2" />
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dfdbd2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-       d="m 7.1156467,1036.3979 c -1.4323263,0 -2.5937503,1.1614 -2.5937503,2.5938 l 0,6.9687 c -0.686446,0.6856 -1.1875,1.5722 -1.1875,2.625 0,2.0937 1.718759,3.8125 3.8125003,3.8125 2.093741,0 3.8125003,-1.7188 3.8125003,-3.8125 0,-1.0573 -0.523629,-1.9349 -1.2187503,-2.625 -7.2e-4,-0.7438 -9.24e-4,-1.3598 0,-2 a 1.0043849,1.0043849 0 0 0 0.0625,0 l 1.8125003,0 a 1.0001,1.0001 0 1 0 0,-2 l -1.8125003,0 a 1.0001,1.0001 0 0 0 -0.0625,0 c 3.43e-4,-0.3034 3.2e-5,-0.653 0,-0.9687 a 1.0043849,1.0043849 0 0 0 0.0625,0 l 1.8125003,0 a 1.0001,1.0001 0 1 0 0,-2 l -1.8125003,0 a 1.0001,1.0001 0 0 0 -0.0625,0 c 6e-6,-1.4538 -1.192674,-2.5938 -2.625,-2.5938 z m 0,2 c 0.27199,0 0.625001,0.3432 0.625,0.5938 0.01105,2.799 -0.0038,4.4747 0,7.2812 l 0,0.5313 0.4375,0.2812 c 0.472666,0.3299 0.78125,0.8867 0.78125,1.5 0,1.0129 -0.799639,1.8125 -1.8125,1.8125 -1.012861,0 -1.8125003,-0.7996 -1.8125003,-1.8125 0,-0.6006 0.316404,-1.1338 0.78125,-1.4687 l 0.4062503,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.32176,-0.5938 0.59375,-0.5938 z"
-       id="path3008-6-89" />
+       d="m 10.067832,1033.3622 c -1.5408828,0 -2.7903312,1.1614 -2.7903312,2.5938 l 0,6.9687 C 6.5390289,1043.6103 6,1044.4969 6,1045.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.311121,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283066,-2.5938 -2.823948,-2.5938 z m 0,2 c 0.292604,0 0.672369,0.3432 0.672368,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.50849,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860243,1.8125 -1.949869,1.8125 -1.0896257,0 -1.9498697,-0.7996 -1.9498697,-1.8125 0,-0.6006 0.3403842,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.3461463,-0.5938 0.6387507,-0.5938 z"
+       id="path3008-6-89"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dfdbd2;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-miterlimit:2;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
   </g>
 </svg>
diff --git a/icons/ubuntu-mono-dark/apps/22/Makefile.in b/icons/ubuntu-mono-dark/apps/22/Makefile.in
index eb49932..55f3e39 100644
--- a/icons/ubuntu-mono-dark/apps/22/Makefile.in
+++ b/icons/ubuntu-mono-dark/apps/22/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/ubuntu-mono-dark/status/22/Makefile.in b/icons/ubuntu-mono-dark/status/22/Makefile.in
index 127db98..799c68a 100644
--- a/icons/ubuntu-mono-dark/status/22/Makefile.in
+++ b/icons/ubuntu-mono-dark/status/22/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/ubuntu-mono-dark/status/22/psensor_hot.svg b/icons/ubuntu-mono-dark/status/22/psensor_hot.svg
index 6c3d71f..1fff1a4 100644
--- a/icons/ubuntu-mono-dark/status/22/psensor_hot.svg
+++ b/icons/ubuntu-mono-dark/status/22/psensor_hot.svg
@@ -25,8 +25,16 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <path
-     d="M 10.067832,2 C 8.526949,2 7.2775,3.3065749 7.2775,4.9180249 l 0,7.8397861 C 6.539029,13.529111 6,14.52654 6,15.71094 6,18.066351 7.849024,20 10.10145,20 c 2.252426,0 4.101451,-1.933649 4.101451,-4.28906 0,-1.189463 -0.563315,-2.176763 -1.31112,-2.953129 -7.74e-4,-0.836771 -9.94e-4,-1.529771 0,-2.249995 a 1.0805074,1.1299329 0 0 0 0.06724,0 l 1.94987,0 a 1.0758978,1.1251123 0 1 0 0,-2.2500039 l -1.94987,0 a 1.0758978,1.1251123 0 0 0 -0.06724,0 c 3.69e-4,-0.3413246 3.5e-5,-0.7346246 0,-1.0897873 a 1.0805074,1.1299329 0 0 0 0.06724,0 l 1.94987,0 a 1.0758978,1.1251123 0 1 0 0,-2.2499999 l -1.94987,0 a 1.0758978,1.1251123 0 0 0 -0.06724,0 C 12.891788,3.2825 11.608714,2 10.067832,2 z m 0,2.2499999 c 0.292603,0 0.67237,0.3861 0.672369,0.668025 0.01189,3.1488749 -0.0041,5.0340358 0,8.1913521 l 0,0.597713 0.470658,0.31635 c 0.50849,0.371137 0.840461,0.997537 0.840461,1.6875 0,1.139511 -0.860244,2.03906 -1.94987,2.03906 -1.089626,0 -1.94987,-0.899549 -1.94987,-2.03906 0,-0.67568 0.340384,-1.275529 0.840461,-1.652289 l 0.43704,-0.351561 0,-0.5625 0,-8.2265651 c 0,-0.306 0.346146,-0.668025 0.638751,-0.668025 z"
-     id="path3008-6-89"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <g
+     transform="translate(0,-1030.3622)"
+     id="layer1">
+    <path
+       d="m 10.067832,1034.3622 c -1.540883,0 -2.790331,1.1614 -2.790331,2.5938 l 0,6.9687 C 6.539029,1044.6103 6,1045.4969 6,1046.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.31112,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.94987,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.94987,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.94987,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.94987,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283067,-2.5938 -2.823949,-2.5938 z m 0,2 c 0.292604,0 0.67237,0.3432 0.672369,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.508489,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860244,1.8125 -1.94987,1.8125 -1.089626,0 -1.94987,-0.7996 -1.94987,-1.8125 0,-0.6006 0.340385,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.346147,-0.5938 0.638751,-0.5938 z"
+       id="path3008-6-89-2"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       d="m 10.067832,1033.3622 c -1.5408828,0 -2.7903312,1.1614 -2.7903312,2.5938 l 0,6.9687 C 6.5390289,1043.6103 6,1044.4969 6,1045.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.311121,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283066,-2.5938 -2.823948,-2.5938 z m 0,2 c 0.292604,0 0.672369,0.3432 0.672368,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.50849,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860243,1.8125 -1.949869,1.8125 -1.0896257,0 -1.9498697,-0.7996 -1.9498697,-1.8125 0,-0.6006 0.3403842,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.3461463,-0.5938 0.6387507,-0.5938 z"
+       id="path3008-6-89"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#df382c;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  </g>
 </svg>
diff --git a/icons/ubuntu-mono-dark/status/22/psensor_normal.svg b/icons/ubuntu-mono-dark/status/22/psensor_normal.svg
index f323be9..65476a1 100644
--- a/icons/ubuntu-mono-dark/status/22/psensor_normal.svg
+++ b/icons/ubuntu-mono-dark/status/22/psensor_normal.svg
@@ -7,12 +7,41 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="22"
    height="22"
-   id="svg3920">
+   id="svg3920"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="psensor_normal.svg">
   <defs
      id="defs3922" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="0.75266306"
+     inkscape:cy="8.3650983"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1462"
+     inkscape:window-height="824"
+     inkscape:window-x="91"
+     inkscape:window-y="318"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="7.9910715,8.6160715"
+       id="guide4142" />
+  </sodipodi:namedview>
   <metadata
      id="metadata3925">
     <rdf:RDF>
@@ -25,8 +54,20 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <path
-     d="M 10.067832,2 C 8.526949,2 7.2775,3.3065749 7.2775,4.9180249 l 0,7.8397861 C 6.539029,13.529111 6,14.52654 6,15.71094 6,18.066351 7.849024,20 10.10145,20 c 2.252426,0 4.101451,-1.933649 4.101451,-4.28906 0,-1.189463 -0.563315,-2.176763 -1.31112,-2.953129 -7.74e-4,-0.836771 -9.94e-4,-1.529771 0,-2.249995 a 1.0805074,1.1299329 0 0 0 0.06724,0 l 1.94987,0 a 1.0758978,1.1251123 0 1 0 0,-2.2500039 l -1.94987,0 a 1.0758978,1.1251123 0 0 0 -0.06724,0 c 3.69e-4,-0.3413246 3.5e-5,-0.7346246 0,-1.0897873 a 1.0805074,1.1299329 0 0 0 0.06724,0 l 1.94987,0 a 1.0758978,1.1251123 0 1 0 0,-2.2499999 l -1.94987,0 a 1.0758978,1.1251123 0 0 0 -0.06724,0 C 12.891788,3.2825 11.608714,2 10.067832,2 z m 0,2.2499999 c 0.292603,0 0.67237,0.3861 0.672369,0.668025 0.01189,3.1488749 -0.0041,5.0340358 0,8.1913521 l 0,0.597713 0.470658,0.31635 c 0.50849,0.371137 0.840461,0.997537 0.840461,1.6875 0,1.139511 -0.860244,2.03906 -1.94987,2.03906 -1.089626,0 -1.94987,-0.899549 -1.94987,-2.03906 0,-0.67568 0.340384,-1.275529 0.840461,-1.652289 l 0.43704,-0.351561 0,-0.5625 0,-8.2265651 c 0,-0.306 0.346146,-0.668025 0.638751,-0.668025 z"
-     id="path3008-6-89"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dfdbd2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1030.3622)">
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 10.067832,1034.3622 c -1.540883,0 -2.790331,1.1614 -2.790331,2.5938 l 0,6.9687 C 6.539029,1044.6103 6,1045.4969 6,1046.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.31112,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.94987,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.94987,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.94987,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.94987,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283067,-2.5938 -2.823949,-2.5938 z m 0,2 c 0.292604,0 0.67237,0.3432 0.672369,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.508489,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860244,1.8125 -1.94987,1.8125 -1.089626,0 -1.94987,-0.7996 -1.94987,-1.8125 0,-0.6006 0.340385,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.346147,-0.5938 0.638751,-0.5938 z"
+       id="path3008-6-89-2" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#dfdbd2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 10.067832,1033.3622 c -1.5408828,0 -2.7903312,1.1614 -2.7903312,2.5938 l 0,6.9687 C 6.5390289,1043.6103 6,1044.4969 6,1045.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.311121,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283066,-2.5938 -2.823948,-2.5938 z m 0,2 c 0.292604,0 0.672369,0.3432 0.672368,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.50849,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860243,1.8125 -1.949869,1.8125 -1.0896257,0 -1.9498697,-0.7996 -1.9498697,-1.8125 0,-0.6006 0.3403842,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.3461463,-0.5938 0.6387507,-0.5938 z"
+       id="path3008-6-89" />
+  </g>
 </svg>
diff --git a/icons/ubuntu-mono-light/status/22/Makefile.in b/icons/ubuntu-mono-light/status/22/Makefile.in
index 853e2b3..a1ed921 100644
--- a/icons/ubuntu-mono-light/status/22/Makefile.in
+++ b/icons/ubuntu-mono-light/status/22/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/icons/ubuntu-mono-light/status/22/psensor_hot.svg b/icons/ubuntu-mono-light/status/22/psensor_hot.svg
index 6c3d71f..1fff1a4 100644
--- a/icons/ubuntu-mono-light/status/22/psensor_hot.svg
+++ b/icons/ubuntu-mono-light/status/22/psensor_hot.svg
@@ -25,8 +25,16 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <path
-     d="M 10.067832,2 C 8.526949,2 7.2775,3.3065749 7.2775,4.9180249 l 0,7.8397861 C 6.539029,13.529111 6,14.52654 6,15.71094 6,18.066351 7.849024,20 10.10145,20 c 2.252426,0 4.101451,-1.933649 4.101451,-4.28906 0,-1.189463 -0.563315,-2.176763 -1.31112,-2.953129 -7.74e-4,-0.836771 -9.94e-4,-1.529771 0,-2.249995 a 1.0805074,1.1299329 0 0 0 0.06724,0 l 1.94987,0 a 1.0758978,1.1251123 0 1 0 0,-2.2500039 l -1.94987,0 a 1.0758978,1.1251123 0 0 0 -0.06724,0 c 3.69e-4,-0.3413246 3.5e-5,-0.7346246 0,-1.0897873 a 1.0805074,1.1299329 0 0 0 0.06724,0 l 1.94987,0 a 1.0758978,1.1251123 0 1 0 0,-2.2499999 l -1.94987,0 a 1.0758978,1.1251123 0 0 0 -0.06724,0 C 12.891788,3.2825 11.608714,2 10.067832,2 z m 0,2.2499999 c 0.292603,0 0.67237,0.3861 0.672369,0.668025 0.01189,3.1488749 -0.0041,5.0340358 0,8.1913521 l 0,0.597713 0.470658,0.31635 c 0.50849,0.371137 0.840461,0.997537 0.840461,1.6875 0,1.139511 -0.860244,2.03906 -1.94987,2.03906 -1.089626,0 -1.94987,-0.899549 -1.94987,-2.03906 0,-0.67568 0.340384,-1.275529 0.840461,-1.652289 l 0.43704,-0.351561 0,-0.5625 0,-8.2265651 c 0,-0.306 0.346146,-0.668025 0.638751,-0.668025 z"
-     id="path3008-6-89"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <g
+     transform="translate(0,-1030.3622)"
+     id="layer1">
+    <path
+       d="m 10.067832,1034.3622 c -1.540883,0 -2.790331,1.1614 -2.790331,2.5938 l 0,6.9687 C 6.539029,1044.6103 6,1045.4969 6,1046.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.31112,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.94987,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.94987,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.94987,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.94987,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283067,-2.5938 -2.823949,-2.5938 z m 0,2 c 0.292604,0 0.67237,0.3432 0.672369,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.508489,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860244,1.8125 -1.94987,1.8125 -1.089626,0 -1.94987,-0.7996 -1.94987,-1.8125 0,-0.6006 0.340385,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.346147,-0.5938 0.638751,-0.5938 z"
+       id="path3008-6-89-2"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+    <path
+       d="m 10.067832,1033.3622 c -1.5408828,0 -2.7903312,1.1614 -2.7903312,2.5938 l 0,6.9687 C 6.5390289,1043.6103 6,1044.4969 6,1045.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.311121,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283066,-2.5938 -2.823948,-2.5938 z m 0,2 c 0.292604,0 0.672369,0.3432 0.672368,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.50849,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860243,1.8125 -1.949869,1.8125 -1.0896257,0 -1.9498697,-0.7996 -1.9498697,-1.8125 0,-0.6006 0.3403842,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.3461463,-0.5938 0.6387507,-0.5938 z"
+       id="path3008-6-89"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#df382c;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  </g>
 </svg>
diff --git a/icons/ubuntu-mono-light/status/22/psensor_normal.svg b/icons/ubuntu-mono-light/status/22/psensor_normal.svg
index 6dc2a05..634a7a6 100644
--- a/icons/ubuntu-mono-light/status/22/psensor_normal.svg
+++ b/icons/ubuntu-mono-light/status/22/psensor_normal.svg
@@ -25,8 +25,12 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <path
-     d="M 10.067832,2 C 8.526949,2 7.2775,3.3065749 7.2775,4.9180249 l 0,7.8397861 C 6.539029,13.529111 6,14.52654 6,15.71094 6,18.066351 7.849024,20 10.10145,20 c 2.252426,0 4.101451,-1.933649 4.101451,-4.28906 0,-1.189463 -0.563315,-2.176763 -1.31112,-2.953129 -7.74e-4,-0.836771 -9.94e-4,-1.529771 0,-2.249995 a 1.0805074,1.1299329 0 0 0 0.06724,0 l 1.94987,0 a 1.0758978,1.1251123 0 1 0 0,-2.2500039 l -1.94987,0 a 1.0758978,1.1251123 0 0 0 -0.06724,0 c 3.69e-4,-0.3413246 3.5e-5,-0.7346246 0,-1.0897873 a 1.0805074,1.1299329 0 0 0 0.06724,0 l 1.94987,0 a 1.0758978,1.1251123 0 1 0 0,-2.2499999 l -1.94987,0 a 1.0758978,1.1251123 0 0 0 -0.06724,0 C 12.891788,3.2825 11.608714,2 10.067832,2 z m 0,2.2499999 c 0.292603,0 0.67237,0.3861 0.672369,0.668025 0.01189,3.1488749 -0.0041,5.0340358 0,8.1913521 l 0,0.597713 0.470658,0.31635 c 0.50849,0.371137 0.840461,0.997537 0.840461,1.6875 0,1.139511 -0.860244,2.03906 -1.94987,2.03906 -1.089626,0 -1.94987,-0.899549 -1.94987,-2.03906 0,-0.67568 0.340384,-1.275529 0.840461,-1.652289 l 0.43704,-0.351561 0,-0.5625 0,-8.2265651 c 0,-0.306 0.346146,-0.668025 0.638751,-0.668025 z"
-     id="path3008-6-89"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#3c3c3c;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <g
+     transform="translate(0,-1030.3622)"
+     id="layer1">
+    <path
+       d="m 10.067832,1033.3622 c -1.5408828,0 -2.7903312,1.1614 -2.7903312,2.5938 l 0,6.9687 C 6.5390289,1043.6103 6,1044.4969 6,1045.5497 c 0,2.0937 1.849024,3.8125 4.10145,3.8125 2.252426,0 4.101451,-1.7188 4.101451,-3.8125 0,-1.0573 -0.563315,-1.9349 -1.311121,-2.625 -7.74e-4,-0.7438 -9.94e-4,-1.3598 0,-2 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 3.69e-4,-0.3034 3.5e-5,-0.653 0,-0.9687 a 1.0805074,1.0043849 0 0 0 0.06724,0 l 1.949871,0 a 1.0758977,1.0001 0 1 0 0,-2 l -1.949871,0 a 1.0758977,1.0001 0 0 0 -0.06724,0 c 7e-6,-1.4538 -1.283066,-2.5938 -2.823948,-2.5938 z m 0,2 c 0.292604,0 0.672369,0.3432 0.672368,0.5938 0.01189,2.799 -0.0041,4.4747 0,7.2812 l 0,0.5313 0.470658,0.2812 c 0.50849,0.3299 0.840461,0.8867 0.840461,1.5 0,1.0129 -0.860243,1.8125 -1.949869,1.8125 -1.0896257,0 -1.9498697,-0.7996 -1.9498697,-1.8125 0,-0.6006 0.3403842,-1.1338 0.840461,-1.4687 l 0.43704,-0.3125 0,-0.5 0,-7.3125 c 0,-0.272 0.3461463,-0.5938 0.6387507,-0.5938 z"
+       id="path3008-6-89"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#3c3c3c;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  </g>
 </svg>
diff --git a/install-sh b/install-sh
index a9244eb..377bb86 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
+	# Protect names problematic for 'test' and other utilities.
 	case $dst_arg in
 	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
 	esac
@@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
+    # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@ fi
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@ do
 	      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-writeable bit of parent directory when it shouldn't.
+		   # 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
diff --git a/missing b/missing
index 86a8fc3..db98974 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 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
 # it under the terms of the GNU General Public License as published by
@@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -99,228 +70,141 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
     ;;
-esac
-
-exit 0
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/po/LINGUAS b/po/LINGUAS
index 4c32efc..3240975 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -17,6 +17,7 @@ pt_BR
 ru
 sl
 sr
+sv
 tr
 uk
 zh_CN
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3101cb6..abf0ea6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,7 +6,7 @@ src/lib/cpu.c
 src/lib/hdd_atasmart.c
 src/lib/hdd_hddtemp.c
 src/lib/lmsensor.c
-src/lib/log.c
+src/lib/plog.c
 src/lib/nvidia.c
 src/lib/psensor.c
 src/lib/slog.c
diff --git a/po/de.gmo b/po/de.gmo
index 43829d4..0298a82 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 7cff987..adf7336 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,260 +7,305 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
-"PO-Revision-Date: 2013-10-20 09:56+0000\n"
-"Last-Translator: Dennis Baudys <Unknown>\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"PO-Revision-Date: 2014-04-30 16:48+0100\n"
+"Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
 "Language-Team: German\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "Info"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Sensoreinstellungen"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Anzeigen"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor – Temperaturüberwachung"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr "_Psensor"
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: src/glade/psensor-pref.glade:7
+#: src/glade/psensor-pref.glade:24
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: 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:72
-msgid "Position of sensors table:"
-msgstr "Position der Sensorentabelle:"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Keine Fensterdekorationen verwenden"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Fenster unterhalb anheften"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Menü aktivieren"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Wert im Starter von Unity anzeigen"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Fenster beim Programmstart ausblenden"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Fensterposition und -größe merken"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Temperatureinheit:"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Position der Sensorentabelle:"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Benutzeroberfläche"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Fenster beim Programmstart ausblenden"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Fensterposition und -größe merken"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Vordergrund:"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Hintergrund:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Hintergrunddeckkraft:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Min.</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Max.</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Farben"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Überwachungszeitraum:"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "Minute(n)"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "Sekunde(n)"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Aktualisierungsintervall:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Messungen"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Graph"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Messintervall:"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Sensorenprotokollierung aktivieren"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Sensoren-Protokollierungsintervall"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "Sekunde(n)"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
-msgstr "Bei Alarm auszuführendes Skript"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Sensoren"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Sensoreinstellungen bearbeiten"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr "Name"
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "N/V"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Sensorinformationen"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Chip:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Name:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Id:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Sensorgraphen darstellen"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Farbe:"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Benachrichtigungen aktivieren"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Sensorinformationen"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Sensorgraphen darstellen"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Obere Grenze:"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Untere Grenze:"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
-msgstr "Ubuntu-Anwendungsindikator"
-
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
-msgstr "Sensor im Indikatormenü für Anwendungen zeigen"
-
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Chip:"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Id:"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Details"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Name:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: ADL-Bibliothek konnte nicht gefunden werden."
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: API der ADL-Bibliothek fehlt."
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: ADL-Bibliothek konnte nicht initialisiert werden."
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: Anzahl der Adapter konnte nicht ermittelt werden."
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr "Anzahl der AMD/ATI-Adapter: %d"
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr "Anzahl der aktiven AMD/ATI-Adapter: %d"
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,69 +333,85 @@ msgstr "lmsensor: Wert der Unterfunktion %s kann nicht ermittelt werden: %s."
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create gescheitert: Falscher Funktionstyp."
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: Initialisierung gescheitert: %s."
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "Protokolldatei kann nicht geöffnet werden: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 "Entweder wird kein proprietärer NVIDIA-Treiber verwendet oder die NVIDIA-GPU-"
 "Temperatur kann nicht ermittelt werden."
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Verbindung zum X11-Server konnte nicht hergestellt werden."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Ermittlung der NVIDIA-Informationen gescheitert."
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "U/min"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "HOME-Variable ist nicht festgelegt."
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "Sensorprotokolldatei ist bereits geöffnet."
 
-#: src/lib/slog.c:87
-#, fuzzy, c-format
+#: src/lib/slog.c:105
+#, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "Sensorprotokolldatei kann nicht geöffnet werden: %s."
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "Sensorprotokolldatei ist nicht geöffnet."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr ""
 "Sensorprotokolldatei ist nicht geöffnet und kann deswegen nicht geschlossen "
 "werden."
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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"
@@ -465,22 +526,6 @@ msgstr ""
 "<html><body><p>Seite nicht gefunden – Gehen Sie zurück zur <a "
 "href='/'>Startseite</a></p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -620,27 +665,6 @@ msgstr "Temperaturalarm"
 msgid "Fan alert"
 msgstr "Lüfteralarm"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "Unbekannt"
-
-#~ msgid "_Show"
-#~ msgstr "_Anzeigen"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Einstellungen"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "_Sensoreinstellungen"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "Sensoreinstellungen"
-
-#~ msgid "_About"
-#~ msgstr "_Info"
-
-#~ msgid "_Quit"
-#~ msgstr "_Beenden"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "Erstellen der Menüs ist gescheitert: %s"
diff --git a/po/es.gmo b/po/es.gmo
index b450a0c..f39bc28 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index a3e0f4e..94ab010 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2013-05-12 22:16+0000\n"
 "Last-Translator: Javier <buik8roadmaster@hotmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,249 +18,295 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
 "X-Generator: Launchpad (build 16799)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "Acerca de"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Ajustes"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Ajustes de los Sensores"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Salir"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - Monitor de temperatura"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr "_Psensor"
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: src/glade/psensor-pref.glade:7
+#: 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:72
-msgid "Position of sensors table:"
-msgstr "Ubicación de los valores"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Ocultar el marco de la ventana"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Mantener debajo del resto de ventanas"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Activar menú"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Inicio retardado al abrir sesión"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Ocultar la ventana de gráficas al iniciar sesión."
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Restaurar tamaño y posición de la ventana"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Unidad de temperatura"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Ubicación de los valores"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Ocultar la ventana de gráficas al iniciar sesión."
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Restaurar tamaño y posición de la ventana"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Escalas y cuadrícula"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Fondo de gráfica"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Opacidad del fondo:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Mín</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Máx</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Colores"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Intervalo de la gráfica"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Intervalo de actualización:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Medidas"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Gráfica"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Medir sensores cada:"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Activar registro de sensores"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Intervalo de registro de sensores"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Intervalo de registro de sensores:"
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "segundo(s)"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Sensores"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Editar Ajustes Sensores"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr "Nombre"
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "No disponible"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Información del sensor"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Chip:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Nombre:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Identificativo:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Representar el sensor en la gráfica"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Color:"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Activar notificaciones en el escritorio"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Información del sensor"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Representar el sensor en la gráfica"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Límite superior"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Límite inferior"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
-msgstr "Indicador de aplicación de Ubuntu"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
+msgstr "Indicador de aplicación"
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr "Mostrar sensor en el menú de aplicaciones"
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Identificativo:"
-
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Detalles"
+#: src/glade/sensor-edit.glade:429
+#, fuzzy
+msgid "Display sensor in the label (experimental)"
+msgstr "Mostrar sensor en el menú de aplicaciones"
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Nombre:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: no se ha encontrado la librería ADL"
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: ADL's API perdidos"
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: error al iniciar ADL"
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: imposible listar el número de adaptadores"
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr "Numero de adaptadores AMD/ATI: %d"
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr "Numero de adaptadores AMD/ATI: %d"
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,74 +334,90 @@ msgstr "lmsensor: imposible obtener el valor de subcaracterística %s:%s"
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create Fallo: tipo de funcion equivocada."
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: Fallo de inicialización:%s."
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "Imposible abrir el archivo de registro: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 "Controlador propietario de NVIDIA no activado ó incapaz de obtener la "
 "temperatura de la GPU"
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Imposible establecer conexión con el servidor X11."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Error al obtener la información de NVIDIA"
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "La variable HOME no ha sido definida"
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "Ya existe un registro de sensores abierto"
 
-#: src/lib/slog.c:87
-#, fuzzy, c-format
+#: src/lib/slog.c:105
+#, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "No se puede abrir el archivo de registro: %s."
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "No se abrió el archivo de registro."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr "¡No existe archivo que cerrar!"
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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á autorizada "
-"y apoyada por su autor.\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/main.c:88 src/server/server.c:94
@@ -406,8 +468,8 @@ msgstr "  -n, --new-instance  Fuerza el inicio de otro Psensor paralelo"
 #: src/main.c:110
 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"
+"  -d, --debug=NIVEL   Establece el nivel de depuración con un valor entre 0 "
+"y 3"
 
 #: src/main.c:115 src/server/server.c:117
 #, c-format
@@ -462,22 +524,6 @@ msgstr ""
 "<html><body><p>Página no encontrada- Ir a <a href='/'>Página Principal</a></"
 "p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -619,71 +665,6 @@ msgstr "Alarma por temperatura."
 msgid "Fan alert"
 msgstr "Alarma por parada de ventilador."
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "Desconocido"
-
-#~ msgid "_Show"
-#~ msgstr "_Mostrar"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Ajustes"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "Ajust_es del sensores"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "Ajustes del sensor"
-
-#~ msgid "_About"
-#~ msgstr "_Acerca de"
-
-#~ msgid "_Quit"
-#~ msgstr "_Salir"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "Error al construir los menús :%s"
-
-#~ msgid ""
-#~ "Copyright(c) 2010-2012\n"
-#~ "jeanfi@gmail.com"
-#~ msgstr ""
-#~ "Copyright(c) 2010-2012\n"
-#~ "jeanfi@gmail.com"
-
-#~ msgid "Enabled"
-#~ msgstr "Activado."
-
-#~ msgid "Sensor Name"
-#~ msgstr "Nombre del sensor"
-
-#~ msgid ""
-#~ "Copyright (C) %s wpitchoune@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"
-#~ "Licencia GPLv2: GNU GPL versión 2 o posterior <http://www.gnu.org/"
-#~ "licenses/old-licenses/gpl-2.0.html>\n"
-#~ "Esto es software libre: es libre de modificarlo y redistribuirlo.\n"
-#~ "NO HAY GARANTÍA, en la medida en que lo permita la ley.\n"
-
-#~ msgid "Current"
-#~ msgstr "Actual"
-
-#~ msgid "Left"
-#~ msgstr "Izquierda"
-
-#~ msgid "Bottom"
-#~ msgstr "Abajo"
-
-#~ msgid "Temperature limit:"
-#~ msgstr "Límite de temperatura:"
-
-#~ msgid "Right"
-#~ msgstr "Derecha"
-
-#~ msgid "Top"
-#~ msgstr "Arriba"
diff --git a/po/fr.gmo b/po/fr.gmo
index 05b956a..cabf2dd 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index a2b8b77..84221ad 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2013-06-29 15:14+0000\n"
 "Last-Translator: londumas <helion331990@gmail.com>\n"
 "Language-Team: French <>\n"
@@ -18,256 +18,300 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
 "X-Generator: Launchpad (build 16799)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "À propos"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Préférences des capteurs"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Afficher"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - Surveillance des températures"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr ""
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Aide"
 
-#: src/glade/psensor-pref.glade:7
+#: 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:72
-msgid "Position of sensors table:"
-msgstr "Position de la table des capteurs :"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Cacher les décorations de la fenêtre"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Garder la fenêtre en arrière-plan"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Activer le menu"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Activer le compteur du lanceur de Unity"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Cacher la fenêtre au lancement"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Rétablir la position et la taille de la fenêtre"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Unité de température :"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Position de la table des capteurs :"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Interface"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Cacher la fenêtre au lancement"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Rétablir la position et la taille de la fenêtre"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Avant-plan :"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Arrière-plan :"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Opacité de l'arrière-plan :"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Min</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Max</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Durée de surveillance :"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "minutes(s)"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "seconde(s)"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Intervalle de mise à jour :"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Mesures"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Graphe"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Intervalle de mise à jour des mesures :"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Activer la journalisation des capteurs"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Intervalle de journallisation des capteurs"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Interval de journallisation des capteurs :"
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "seconde(s)"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Capteurs"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Préférences des capteurs"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr "Nom :"
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Type :"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "N/A"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Informations du capteur"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Puce :"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Nom :"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Id :"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Dessiner la courbe du capteur"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Couleur :"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Alarme"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Activer les notifications du bureau"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Informations du capteur"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Dessiner la courbe du capteur"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Seuil supérieur :"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Seuil inférieur :"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
-msgstr "Indicateur d'application d'Ubuntu"
-
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
-msgstr "Afficher le capteur dans le menu de l'indicateur d'application"
-
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Puce :"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
+msgstr "Indicateur d'application"
 
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Id :"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
+msgstr "Afficher le capteur dans le menu"
 
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Détails"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Nom :"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD : impossible de trouver la bibliothèque ADL."
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD : L'interface de programmation ADL est manquante."
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD : échec de l'initialisation d'ADL."
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD : impossible de récupérer le nombre d'adaptateurs."
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr "Processeur"
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr "Disque"
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart : échec de sk_disk_open() : %s."
 
 #: src/lib/hdd_hddtemp.c:59
-#, fuzzy
 msgid "hddtemp: failed to open socket."
 msgstr "hddtemp : échec d'ouverture de l'interface de connexion."
 
@@ -291,73 +335,89 @@ msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 "lmsensor : échec de lmsensor_psensor_create : mauvais type de fonction."
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr "Processeur Intel"
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr "Processeur graphique NVIDIA"
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor : échec de l'initialisation: %s."
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "Impossible d'ouvrir le journal: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr "Échec de la récupération des températures NVIDIA."
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Impossible d'ouvrir la connexion au serveur X11."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Échec de la récupération des information NVIDIA."
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "Tr/mn"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "Variable home non définie."
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "Le journal des capteurs est déjà ouvert."
 
-#: src/lib/slog.c:87
-#, fuzzy, c-format
+#: src/lib/slog.c:105
+#, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "Ne peut ouvrir le journal : %s."
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "Le journal des capteurs n'est pas ouvert."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr "Le journal des capteurs n'est pas ouvert, il ne peut être fermé."
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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"
-"Licence GPLv2 : GNU GPL version 3 ou ultérieure <http://www.gnu.org/licenses/"
+"License GPLv2 : GNU GPL version 3 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"
+"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"
+"Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n"
 "autorisées par la loi.\n"
 
 #: src/main.c:88 src/server/server.c:94
@@ -466,23 +526,6 @@ msgstr ""
 "<html><body><p>Page introuvable - Allez à <a href='/'>Main page</a></p></"
 "body>"
 
-#: src/server/server.c:84
-#, 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 3 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -625,27 +668,6 @@ msgstr "Alerte thermique"
 msgid "Fan alert"
 msgstr "Alerte ventilateur"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "Inconnu"
-
-#~ msgid "_Show"
-#~ msgstr "_Afficher"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Préférences"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "Préférences des capteurs"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "Configuration des capteurs"
-
-#~ msgid "_About"
-#~ msgstr "À _propos"
-
-#~ msgid "_Quit"
-#~ msgstr "_Quitter"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "La construction des menus a échouée : %s"
diff --git a/po/hu.gmo b/po/hu.gmo
index c4e8aa2..acda171 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 1de2b8c..8b95e70 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2012-10-29 09:41+0000\n"
 "Last-Translator: Bence Lukács <Unknown>\n"
 "Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"
@@ -19,249 +19,295 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-01-21 09:32+0000\n"
 "X-Generator: Launchpad (build 16430)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "Névjegy"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Érzékelő beállításai"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Megjelenítés"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - hőmérsékletfigyelő"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr ""
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Súgó"
 
-#: src/glade/psensor-pref.glade:7
+#: src/glade/psensor-pref.glade:24
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:27
+msgid "Left"
+msgstr "Balra"
+
+#: src/glade/psensor-pref.glade:30
+msgid "Top"
+msgstr "Tetejére"
+
+#: src/glade/psensor-pref.glade:33
+msgid "Bottom"
+msgstr "Aljára"
+
+#: src/glade/psensor-pref.glade:60
 msgid "Edit Preferences"
 msgstr "Beállítások szerkesztése"
 
-#: src/glade/psensor-pref.glade:72
-msgid "Position of sensors table:"
-msgstr "Érzékelőtábla pozíciója:"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Ablakdíszítés elrejtése"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Ablak alul tartása"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Menü engedélyezése"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Unity indítón lévő számláló engedélyezése"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Ablak elrejtése induláskor"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-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:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Hőmérséklet mértékegysége:"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Érzékelőtábla pozíciója:"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Felület"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Ablak elrejtése induláskor"
+
+#: src/glade/psensor-pref.glade:340
+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:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Előtér:"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Háttér:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Háttér átlátszósága:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Min</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Max</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Színek"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Figyelés hossza:"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "perc"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "s"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Frissítési időköz:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Mérések"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Grafikon"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Mérések frissítési időköze:"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Érzékelők naplózásának engedélyezése"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Naplózás időköze"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Naplózás időköze:"
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "másodperc(ek)"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Érzékelők"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Érzékelő beállításainak szerkesztése"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Típus:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "---"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Érzékelő információi"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Chip:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Név:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Id:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Érzékelő görbéjének rajzolása"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Szín:"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Riasztás"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Asztali értesítések bekapcsolása"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Érzékelő információi"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Érzékelő görbéjének rajzolása"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Felső küszöbérték:"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Alsó küszöbérték:"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
-msgstr "Ubuntu Alkalmazásmenü"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr "Érzékelők megjelenítése az alkalmazásmenüben"
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Részletek"
+#: src/glade/sensor-edit.glade:429
+#, fuzzy
+msgid "Display sensor in the label (experimental)"
+msgstr "Érzékelők megjelenítése az alkalmazásmenüben"
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Név:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: Nem sikerült betölteni az ADL programkönyvtárat."
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: hiányzó ADL API."
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: az ADL előkészítése meghiúsult."
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: adapterek számainak lekérése meghiúsult"
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -289,65 +335,81 @@ msgstr "lmsensor: alfunkció értékének lekérdezése meghiúsult %s: %s."
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create hiba: rossz funkciótípus."
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: előkészítési hiba: %s."
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "A naplófájl megnyitása sikertelen: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Nem lehet létrehozni a kapcsolatot az X11 kiszolgálóval."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "NVIDIA információinak lekérése meghiúsult."
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "HOME változó nincs beállítva."
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "Az érzékelő naplófájlja már meg van nyitva."
 
-#: src/lib/slog.c:87
+#: src/lib/slog.c:105
 #, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "%s érzékelő naplófájlját nem lehet megnyitni"
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "Az érzékelő naplófájlja nincs nyitva."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr "Az érzékelő naplófájlja nincs nyitva, nem lehet bezárni."
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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"
@@ -460,21 +522,6 @@ msgstr ""
 "<html><body><p>Az oldal nem található - Ugrás a <a href='/'>Főoldalra</a></"
 "p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -615,53 +662,6 @@ msgstr "Hőmérséklet riasztás"
 msgid "Fan alert"
 msgstr "Ventilátor riasztás"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "Ismeretlen"
-
-#~ msgid "_Show"
-#~ msgstr "_Megjelenítés"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Beállítások"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "_Érzékelő beállításai"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "Érzékelőbeállítások"
-
-#~ msgid "_About"
-#~ msgstr "_Névjegy"
-
-#~ msgid "_Quit"
-#~ msgstr "_Kilépés"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "menük építése meghiúsult: %s"
-
-#~ msgid "Sensor Name"
-#~ msgstr "Érzékelő neve"
-
-#~ msgid "Enabled"
-#~ msgstr "Engedélyezés"
-
-#, fuzzy
-#~ msgid "Enable log of measures"
-#~ msgstr "Menü engedélyezése"
-
-#, fuzzy
-#~ msgid "slog_init: cannot open sensor log file: %s"
-#~ msgstr "A naplófájl megnyitása sikertelen: %s"
-
-#, fuzzy
-#~ msgid "slog_init: gettimeofday failed."
-#~ msgstr "gettimeofday meghiúsult."
-
-#, fuzzy
-#~ msgid "slog_write_sensors: gettimeofday failed."
-#~ msgstr "gettimeofday meghiúsult."
-
-#, fuzzy
-#~ msgid "Enable indicator"
-#~ msgstr "Engedélyezés"
diff --git a/po/it.gmo b/po/it.gmo
index 68bbf7d..c1b43c8 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 56315bc..441a95f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2013-04-14 16:06+0000\n"
 "Last-Translator: Diego Pierotto <Unknown>\n"
 "Language-Team: Italian\n"
@@ -18,249 +18,294 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-04-20 08:36+0000\n"
 "X-Generator: Launchpad (build 16567)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "Informazioni su..."
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Sensor Preferenze"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Esci"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Mostra"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - Monitor temperatura"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr "_Psensor"
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: src/glade/psensor-pref.glade:7
+#: src/glade/psensor-pref.glade:24
+msgctxt "psensor"
+msgid "Right"
+msgstr "Diritto"
+
+#: src/glade/psensor-pref.glade:27
+msgid "Left"
+msgstr "Sinestra"
+
+#: 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 "Modifica le preferenze"
 
-#: src/glade/psensor-pref.glade:72
-msgid "Position of sensors table:"
-msgstr "Posizione della tabella dei sensori"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Nascondi le decorazioni della finestra"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Mantieni la finestra sotto"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Abilita il menù"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Abilita contatore nel Launcher Unity"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Nascondi la finestra all'avvio"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Ripristina posizione e dimensione della finestra"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Unità di misura della temperatura"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Posizione della tabella dei sensori"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Nascondi la finestra all'avvio"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Ripristina posizione e dimensione della finestra"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Primo piano:"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Sfondo:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Opacità dello sfondo:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Minimo</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Massimo</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Colori"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Durata del monitoraggio:"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "minuto/i"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "secondo/i"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Intervallo di aggiornamento:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Misure"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Grafico"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Intervallo di aggiornamento delle misure"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Abilita registrazione sensori"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Intervallo registrazione sensori"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Intervallo registrazione sensori:"
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "secondo(i)"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Sensori"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Modifica preferenze del sensore"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr "Nome"
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "N/A"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Informazioni sul Sensore"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Processore:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Id:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Disegna curva"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Colore:"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Avviso"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Attiva le notifiche sul desktop"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Informazioni sul Sensore"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Disegna curva"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Soglia verso l'alto"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Soglia verso il basso"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
-msgstr "Indicatore Applicazione Ubuntu"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
+msgstr "Indicatore Applicazione"
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
-msgstr "Mostra sensore nel menu indicatore Applicazione"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
+msgstr "Mostra sensore nel menu"
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Processore:"
-
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Dettagli"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Nome:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: impossibile trovare la libreria ADL"
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: impossibile trovare l'API di ADL"
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: impossibile inizializzare ADL"
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: impossibile rilevare il numero di adattatori."
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,74 +333,89 @@ msgstr "lmsensor: impossibile rilevare il valore della sotto funzione %s: %s."
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create fallito: tipo di funzione errata."
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: inizializzazione fallita: %s"
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "Impossibile aprire il file di log: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 "Driver proprietario NVIDIA non usato o impossibile rilevare la temperatura "
 "della GPU NVIDIA."
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Impossibile connettersi al server X11."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Impossibile recuperare informazioni da NVIDIA"
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "Variabile HOME non impostata."
 
-#: src/lib/slog.c:78
-#, fuzzy
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "File di registazione sensori già aperto."
 
-#: src/lib/slog.c:87
-#, fuzzy, c-format
+#: src/lib/slog.c:105
+#, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "Impossibile aprire il file di registrazione sensori: %s."
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "File di registazione sensori non aperto."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr "Registro sensori non aperto, impossibile chiuderlo."
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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 ridistribuirlo.\n"
+"Questo è software libero: sei libero di modificarlo e redistribuirlo.\n"
 "NON esiste GARANZIA, per gli scopi permessi dalla legge.\n"
 
 #: src/main.c:88 src/server/server.c:94
@@ -463,21 +523,6 @@ msgstr ""
 "<html><body><p>Pagina non trovata - Vai a <a href='/'>Pagina principale</a></"
 "p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -618,49 +663,6 @@ msgstr "Allarme temperatura"
 msgid "Fan alert"
 msgstr "Allarme ventola"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "Sconosciuto"
-
-#~ msgid "_Show"
-#~ msgstr "_Mostra"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Preferenze"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "S_ensor Preferenze"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "SensorPreferenze"
-
-#~ msgid "_About"
-#~ msgstr "_Informazioni"
-
-#~ msgid "_Quit"
-#~ msgstr "_Esci"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "costruzione dei menù fallita: %s"
-
-#~ msgid "Sensor Name"
-#~ msgstr "Nome sensore"
-
-#~ msgid "Enabled"
-#~ msgstr "Abilitato"
-
-#, fuzzy
-#~ msgid "Enable log of measures"
-#~ msgstr "Abilita il menù"
-
-#, fuzzy
-#~ msgid "slog_init: cannot open sensor log file: %s"
-#~ msgstr "Impossibile aprire il file di log: %s"
-
-#, fuzzy
-#~ msgid "slog_init: gettimeofday failed."
-#~ msgstr "gettimeofday fallito."
-
-#, fuzzy
-#~ msgid "slog_write_sensors: gettimeofday failed."
-#~ msgstr "gettimeofday fallito."
diff --git a/po/lv.gmo b/po/lv.gmo
index 9de9380..007b43a 100644
Binary files a/po/lv.gmo and b/po/lv.gmo differ
diff --git a/po/lv.po b/po/lv.po
index 2b7b70a..78ba9d8 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2013-10-24 12:32+0000\n"
 "Last-Translator: tuxmaniack <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -18,249 +18,295 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "Par"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Sensoru iestatījumi"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Iziet"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Rādīt"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - temperatūras pārraugs"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr "_Psensor"
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Palīdzība"
 
-#: src/glade/psensor-pref.glade:7
+#: 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 "Rediģēt iestatījumus"
 
-#: src/glade/psensor-pref.glade:72
-msgid "Position of sensors table:"
-msgstr "Sensoru tabulas novietojums:"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Slēpt loga apdari"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Turēt logu apakšā"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Aktivizēt izvēlni"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Aktivizēt Unity palaidēja skaitītāju"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Slēpt logu pieteicoties sistēmā"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Atjaunot loga pozīciju un izmēru"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Temperatūras mērvienība:"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Sensoru tabulas novietojums:"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Saskarne"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Slēpt logu pieteicoties sistēmā"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Atjaunot loga pozīciju un izmēru"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Priekšplāns:"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Fons:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Fona necaurspīdība:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Min.</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Maks.</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Krāsas"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Pārraudzības ilgums:"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "minūte(s)"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "sekunde(s)"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Atjaunināšanas intervāls:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Mērījumi"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Grafiks"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Mērījumu atjaunināšanas intervāls:"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Aktivizēt sensora žurnalēšanu"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Sensoru žurnalēšanas intervāls"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Sensoru žurnalēšanas intervāls:"
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "sekunde(s)"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
-msgstr "Skrips izpildīts, kad trauksme ir aktivizēta"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
+msgstr "Skrips izpildīts, kad trauksme ir aktivizēta:"
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Sensori"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Rediģēt sensoru iestatījumus"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr "Nosaukums"
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Tips:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "N/P"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Sensora informācija"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Mikroshēma:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Nosaukums:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Id:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Zīmēt sensora līkni"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Krāsa:"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Trauksme"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Aktivizēt darbvirsmas paziņojumus"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Sensora informācija"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Zīmēt sensora līkni"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Augsts slieksnis:"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Zems slieksnis:"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
-msgstr "Ubuntu aplikāciju indikators"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
+msgstr "Aplikāciju indikators"
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Mikroshēma:"
-
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Detaļas"
+#: src/glade/sensor-edit.glade:429
+#, fuzzy
+msgid "Display sensor in the label (experimental)"
+msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Nosaukums:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: nevar atrast ADL bibliotēku."
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: trūkst ADL programmatūras saskarne."
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: neizdevās inicializēt ADL."
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: nevar saņemt adapteru skaitu."
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,65 +334,81 @@ msgstr "lmsensor: nevar iegūt vērtību no apakšīpašības %s: %s."
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create atteice: nepareis īpašības tips."
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: inicializācijas kļūda: %s."
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "Nevar atvērt žurnāla failu: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Nevar atvērt savienojumu ar X11 server."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Neizdevās saņemt NVIDIA informāciju."
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "HOME mainīgais nav iestatīts."
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "Sensora žurnāla fails jau ir atvērts."
 
-#: src/lib/slog.c:87
+#: src/lib/slog.c:105
 #, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "Nevar atvērt sensora žurnāla failu: %s."
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "Sensora žurnāla fails nav atvērts."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr "Sensora žurnāls nav atvērts, nevar aizvērt."
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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 ""
 
@@ -452,16 +514,6 @@ msgstr ""
 "<html><body><p>Lapa nav atrasta - dodieties uz <a href='/'>galveno lapu</a></"
 "p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -600,27 +652,6 @@ msgstr "Temperatūras trauksme"
 msgid "Fan alert"
 msgstr "Ventilatora trauksme"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "Nezināms"
-
-#~ msgid "_Show"
-#~ msgstr "_Rādīt"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Iestatījumi"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "S_ensoru iestatījumi"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "SensoraIestatījumi"
-
-#~ msgid "_About"
-#~ msgstr "P_ar"
-
-#~ msgid "_Quit"
-#~ msgstr "_Iziet"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "neizdevās izveidot izvēlnes: %s"
diff --git a/po/nl.gmo b/po/nl.gmo
index 3dc58bc..b8382a3 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index da18789..684df73 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2014-04-07 08:50+0000\n"
 "Last-Translator: Pjotr12345 <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -18,249 +18,296 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-04-09 22:52+0000\n"
 "X-Generator: Launchpad (build 16976)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "Over"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Sensorvoorkeuren"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Tonen"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - Temperatuurbewaker"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr "_Psensor"
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Hulp"
 
-#: src/glade/psensor-pref.glade:7
+#: 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:72
-msgid "Position of sensors table:"
-msgstr "Positie van sensorentabel:"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Vensteromlijsting verbergen"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Houd venster eronder"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Menu inschakelen"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Teller voor Unity-starter inschakelen"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Venster bij opstarten verbergen"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Vensterpositie en -grootte herstellen"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Temperatuureenheid:"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Positie van sensorentabel:"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Bedieningsschil"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Venster bij opstarten verbergen"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Vensterpositie en -grootte herstellen"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Voorgrond:"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Achtergrond:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Ondoorzichtigheid van achtergrond:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Min</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Max</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Duur van bewaking:"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "minu(u)t(en)"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "seconde(n)"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Tussenpoze voor bijwerken:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Metingen"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Grafiek"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Tussenpoze voor bijwerken van meting:"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Logboeken bijhouden inschakelen voor sensoren"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Tussenpoze voor bijhouden van logboeken voor sensoren"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Tussenpoze voor bijhouden van logboeken voor sensoren:"
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "seconden(s)"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
-msgstr "Script dat wordt uitgevoerd wanneer er een alarm plaatsvindt"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
+msgstr "Script dat wordt uitgevoerd wanneer er een alarm plaatsvindt:"
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Sensoren"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Sensorvoorkeuren bewerken"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr "Naam"
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Soort:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "N.v.t."
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Sensorinformatie"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Chip:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Naam:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Id:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Sensor-curve tekenen"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Kleur:"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Bureaubladmeldingen inschakelen"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Sensorinformatie"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Sensor-curve tekenen"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Drempel voor hoog:"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Drempel voor laag:"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#: src/glade/sensor-edit.glade:397
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Ubuntu Toepassingsindicator"
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr "Sensor tonen in het menu van de Toepassingsindicator"
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Id:"
-
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Bijzonderheden"
+#: src/glade/sensor-edit.glade:429
+#, fuzzy
+msgid "Display sensor in the label (experimental)"
+msgstr "Sensor tonen in het menu van de Toepassingsindicator"
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Naam:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: kan ADL-bibliotheekbestand niet vinden"
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: ontbrekende ADL's API."
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: kon ADL niet initialiseren."
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: kan het aantal videokaarten niet bepalen."
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr "Aantal AMD/ATI-videokaarten: %d"
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr "Aantal actieve AMD/ATI-videokaarten: %d"
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,67 +335,83 @@ msgstr "lmsensor: kan waarde van subfunctie %s niet bepalen: %s."
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create failure: verkeerd functietype."
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: opstartfout: %s."
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "Kan logboekbestand niet openen: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 "Het niet-vrije Nvidia-stuurprogramma wordt niet gebruikt of het kan de "
 "temperatuur van de grafische Nvidia-chip niet bepalen."
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Kan verbinding met X11-server niet openen."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Kon Nvidia-informatie niet ophalen."
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "Variabele voor HOME niet ingesteld."
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "Logboekbestand van sensor is al geopend."
 
-#: src/lib/slog.c:87
+#: src/lib/slog.c:105
 #, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "Kan logboekbestand van sensor niet openen: %s."
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "Logboekbestand van sensor niet geopend."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr "Logboekbestand van sensor niet geopend, kan niet sluiten."
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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"
@@ -463,21 +526,6 @@ msgstr ""
 "<html><body><p>Pagina niet gevonden - ga naar <a href='/'>Hoofdpagina</a></"
 "p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -618,27 +666,6 @@ msgstr "Temperatuurwaarschuwing"
 msgid "Fan alert"
 msgstr "Ventilatorwaarschuwing"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "Onbekend"
-
-#~ msgid "_Show"
-#~ msgstr "_Tonen"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Voorkeuren"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "Sensorvoorkeuren"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "Sensorvoorkeuren"
-
-#~ msgid "_About"
-#~ msgstr "_Over"
-
-#~ msgid "_Quit"
-#~ msgstr "_Afsluiten"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "opbouwen van menu's is mislukt: %s"
diff --git a/po/psensor.pot b/po/psensor.pot
index e66f88f..f1f02ab 100644
--- a/po/psensor.pot
+++ b/po/psensor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,249 +17,294 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr ""
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr ""
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr ""
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr ""
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:7
-msgid "Edit Preferences"
+#: src/glade/psensor-pref.glade:24
+msgctxt "psensor"
+msgid "Right"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:72
-msgid "Position of sensors table:"
+#: 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:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:187
-msgid "Color:"
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:201
-msgid "Alarm"
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:216
-msgid "Activate desktop notifications"
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:249
+#: src/glade/sensor-edit.glade:278
 msgid "Draw sensor curve"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:333
-msgid "High threshold:"
+#: src/glade/sensor-edit.glade:300
+msgid "Color:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:348
-msgid "Low threshold:"
+#: src/glade/sensor-edit.glade:331
+msgid "Alarm"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#: src/glade/sensor-edit.glade:345
+msgid "Activate desktop notifications"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:367
+msgid "High threshold:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
+#: src/glade/sensor-edit.glade:382
+msgid "Low threshold:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr ""
+
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
 msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -287,65 +332,81 @@ msgstr ""
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr ""
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr ""
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr ""
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr ""
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr ""
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr ""
 
-#: src/lib/slog.c:87
+#: src/lib/slog.c:105
 #, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr ""
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr ""
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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 ""
 
@@ -441,16 +502,6 @@ msgid ""
 "<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
 msgstr ""
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -579,6 +630,6 @@ msgstr ""
 msgid "Fan alert"
 msgstr ""
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr ""
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index b2be0d9..725ab3a 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index aac7c6b..72a05bc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2013-09-01 18:54+0000\n"
 "Last-Translator: Celio Alves <Unknown>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -18,249 +18,294 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
 "X-Generator: Launchpad (build 16799)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "Sobre"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Preferências"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Preferências de sensores"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Sair"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - Monitor de temperatura"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr "_Psensor"
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "Ajuda"
 
-#: src/glade/psensor-pref.glade:7
+#: 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:72
-msgid "Position of sensors table:"
-msgstr "Posição da tabela de sensores:"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Ocultar decoração da janela"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Manter janela abaixo"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Habilitar menu"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Ocultar janela na inicialização"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Restaurar posição e tamanho da janela"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Unidade de temperatura:"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Posição da tabela de sensores:"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Interface"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Ocultar janela na inicialização"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Restaurar posição e tamanho da janela"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Primeiro plano:"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Plano de fundo:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Opacidade do plano de fundo:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Min</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Max</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Cores"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Duração do monitoramento:"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "minuto(s)"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "segundo(s)"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Intervalo de atualização:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Medidas"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Grafo"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Intervalo de atualização das medições:"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Habilitar registro (log) de sensores"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Intervalo de registro dos sensores"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Intervalo de registro dos sensores:"
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "segundo(s)"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Sensores"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Editar preferências do sensor"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr "Nome"
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "N/D"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Informações do sensor"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Chip:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Nome:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "ID:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Desenhar curva do sensor"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Cor:"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Alarme"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Ativar notificações de desktop"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Informações do sensor"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Desenhar curva do sensor"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Limite superior:"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Limite inferior:"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Chip:"
-
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "ID:"
-
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Detalhes"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Nome:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: não foi possível encontrar a biblioteca ADL."
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: está faltando a API da ADL."
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: falha ao iniciar ADL."
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: não foi possível obter número de adaptadores."
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr "Número de adaptadores AMD/ATI: %d"
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr "Número de adaptadores AMD/ATI ativos: %d"
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,72 +333,83 @@ msgstr "lmsensor: não foi possível obter valor do sub-recurso %s: %s."
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: falha na inicialização: %s."
 
-#: src/lib/log.c:43
+#: 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/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Não é possível abrir conexão com o servidor X11."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Falha ao recuperar informações de NVIDIA."
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "Variável HOME não configurada."
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "Arquivo de registro do sensor já está aberto."
 
-#: src/lib/slog.c:87
+#: src/lib/slog.c:105
 #, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "Não é possível abrir arquivo de log do sensor: %s."
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "Arquivo de registros do sensor não foi aberto."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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"
-"Licença GPLv2: GNU GPL versão 2 ou superior <http://www.gnu.org/licenses/old-"
-"licenses/gpl-2.0.html>\n"
-"Este é um software livre: você é livre para modificar e  redistribuir.\n"
-"Não há NENHUMA GARANTIA, na medida do permitido por lei.\n"
 
 #: src/main.c:88 src/server/server.c:94
 #, c-format
@@ -455,16 +511,6 @@ msgstr ""
 "<html><body><p>Página não encontrada - Ir para a <a href='/'>página inicial</"
 "a></p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -597,38 +643,6 @@ msgstr "Alerta de temperatura"
 msgid "Fan alert"
 msgstr "Alenta do ventilador"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "Desconhecido"
-
-#~ msgid "_Show"
-#~ msgstr "Mo_strar"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Preferências"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "Preferências do Sensor"
-
-#~ msgid "_About"
-#~ msgstr "Sobre"
-
-#~ msgid "_Quit"
-#~ msgstr "Sair"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "falha na montagem dos menus: %s"
-
-#~ msgid "Sensor Name"
-#~ msgstr "Nome do sensor"
-
-#~ msgid "Enabled"
-#~ msgstr "Habilitado"
-
-#, fuzzy
-#~ msgid "Enable log of measures"
-#~ msgstr "Habilitar menu"
-
-#, fuzzy
-#~ msgid "Enable indicator"
-#~ msgstr "Habilitado"
diff --git a/po/ru.gmo b/po/ru.gmo
index 96ab4c1..3da0d82 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 136eb23..c5df1e2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,265 +2,311 @@
 # Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the psensor package.
 # Maintained by Jean-Philippe Orsini <jeanfi@gmail.com>
-#
+# Translators:
+# Dmitry Serov, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
-"PO-Revision-Date: 2014-01-27 16:37+0000\n"
-"Last-Translator: Dmitry <dmitri.s93@gmail.com>\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"PO-Revision-Date: 2014-05-20 05:14+0000\n"
+"Last-Translator: Dmitry Serov <dmitri.s93@gmail.com>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "О программе"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Параметры"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Параметры датчиков"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Выход"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Показать"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - монитор температуры"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr ""
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Справка"
 
-#: src/glade/psensor-pref.glade:7
+#: 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:72
-msgid "Position of sensors table:"
-msgstr "Положение таблицы датчиков:"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Спрятать рамку окна"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Держать окно позади"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Включить меню"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Включить счётчик в панеле запуска Unity"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Скрыть окно при запуске"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Восстанавливать положение и размер окна"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Единица измерения температуры:"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Положение таблицы датчиков:"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Внешний вид"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Скрыть окно при запуске"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Восстанавливать положение и размер окна"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Передний план:"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Фон:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Непрозрачность фона:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Мин.</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Макс.</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Время мониторинга:"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "мин."
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "сек."
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Интервал обновления:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Замеры"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Диаграмма"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Интервал обновления замеров:"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Вести журнал событий датчиков"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Интервал ведения журнала событий датчиков"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Интервал ведения журнала событий датчиков:"
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "секунд(с)"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Датчики"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Изменить параметры датчика"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr "Название"
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "Н/Д"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Информация датчика"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Микросхема:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Название:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Идентификатор:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Рисовать график датчика"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Цвет:"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Уведомление"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Включить уведомления"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Информация датчика"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Рисовать график датчика"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Высший порог:"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Нижний порог:"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
 msgstr "Индикатор приложения"
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr "Показать датчик в индикаторе меню приложений"
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Микросхема:"
-
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Идентификатор:"
-
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Сведения"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Название:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: библиотека ADL не найдена."
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: отсутствует API ADL."
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: не удалось инициализировать ADL."
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: ошибка определения количества адаптеров."
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,65 +334,81 @@ msgstr ""
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: ошибка инициализации: %s."
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "Ошибка открытия файла журнала: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Ошибка открытия соединения к серверу X11."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Не удалось получить информацию NVIDIA."
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "об/мин"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "Переменная HOME не установлена."
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "Файл журнала датчика уже открыт."
 
-#: src/lib/slog.c:87
-#, fuzzy, c-format
+#: src/lib/slog.c:105
+#, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "Не удалось открыть файл журнала датчика: %s."
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "Файл журнала датчика не открыт."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr "Файл журнала датчика не открыт, не удалось закрыть."
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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 ""
 
@@ -452,16 +514,6 @@ msgstr ""
 "<html><body><p>Страница не найдена - Перейти к <a href='/'>Главной странице</"
 "a></p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -598,24 +650,6 @@ msgstr "Уведомление температуры"
 msgid "Fan alert"
 msgstr "Уведомление вентилятора"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr ""
-
-#~ msgid "_Show"
-#~ msgstr "_Показать"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Параметры"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "Параметры д_атчика"
-
-#~ msgid "_About"
-#~ msgstr "_О программе"
-
-#~ msgid "_Quit"
-#~ msgstr "_Выход"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "не удалось создать меню: %s"
diff --git a/po/sl.gmo b/po/sl.gmo
index f06c32e..22830de 100644
Binary files a/po/sl.gmo and b/po/sl.gmo differ
diff --git a/po/sl.po b/po/sl.po
index 1d43487..396987d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2012-04-14 21:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
@@ -18,249 +18,294 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-07-02 08:28+0000\n"
 "X-Generator: Launchpad (build 15520)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr ""
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr ""
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr ""
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr ""
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:7
-msgid "Edit Preferences"
+#: src/glade/psensor-pref.glade:24
+msgctxt "psensor"
+msgid "Right"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:72
-msgid "Position of sensors table:"
+#: 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:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:187
-msgid "Color:"
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:201
-msgid "Alarm"
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:216
-msgid "Activate desktop notifications"
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:249
+#: src/glade/sensor-edit.glade:278
 msgid "Draw sensor curve"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:333
-msgid "High threshold:"
+#: src/glade/sensor-edit.glade:300
+msgid "Color:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:348
-msgid "Low threshold:"
+#: src/glade/sensor-edit.glade:331
+msgid "Alarm"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#: src/glade/sensor-edit.glade:345
+msgid "Activate desktop notifications"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:367
+msgid "High threshold:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
+#: src/glade/sensor-edit.glade:382
+msgid "Low threshold:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr ""
+
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
 msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,65 +333,81 @@ msgstr ""
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr ""
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr ""
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr ""
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr ""
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr ""
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr ""
 
-#: src/lib/slog.c:87
+#: src/lib/slog.c:105
 #, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr ""
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr ""
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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 ""
 
@@ -442,16 +503,6 @@ msgid ""
 "<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
 msgstr ""
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -580,6 +631,6 @@ msgstr ""
 msgid "Fan alert"
 msgstr ""
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr ""
diff --git a/po/sr.gmo b/po/sr.gmo
index 4b24017..66c9da6 100644
Binary files a/po/sr.gmo and b/po/sr.gmo differ
diff --git a/po/sr.po b/po/sr.po
index dd28403..347465f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2012-05-03 02:31+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -18,249 +18,294 @@ msgstr ""
 "X-Launchpad-Export-Date: 2012-07-02 08:28+0000\n"
 "X-Generator: Launchpad (build 15520)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "О програму"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Поставке"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr ""
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Изађи"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr ""
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr ""
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:7
-msgid "Edit Preferences"
+#: src/glade/psensor-pref.glade:24
+msgctxt "psensor"
+msgid "Right"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:72
-msgid "Position of sensors table:"
+#: 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:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Укључено"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "У боји"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Сензор"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "Недоступно"
 
-#: src/glade/sensor-edit.glade:187
-msgid "Color:"
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:201
-msgid "Alarm"
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:216
-msgid "Activate desktop notifications"
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:249
+#: src/glade/sensor-edit.glade:278
 msgid "Draw sensor curve"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:333
-msgid "High threshold:"
+#: src/glade/sensor-edit.glade:300
+msgid "Color:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:348
-msgid "Low threshold:"
+#: src/glade/sensor-edit.glade:331
+msgid "Alarm"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#: src/glade/sensor-edit.glade:345
+msgid "Activate desktop notifications"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:367
+msgid "High threshold:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
+#: src/glade/sensor-edit.glade:382
+msgid "Low threshold:"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr ""
+
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
 msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,65 +333,81 @@ msgstr ""
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr ""
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr ""
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr ""
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr ""
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr ""
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr ""
 
-#: src/lib/slog.c:87
+#: src/lib/slog.c:105
 #, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr ""
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr ""
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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 ""
 
@@ -442,16 +503,6 @@ msgid ""
 "<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
 msgstr ""
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -580,7 +631,7 @@ msgstr ""
 msgid "Fan alert"
 msgstr ""
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr ""
 
diff --git a/po/sv.gmo b/po/sv.gmo
new file mode 100644
index 0000000..3dc465a
Binary files /dev/null and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
new file mode 100644
index 0000000..4cb8332
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,666 @@
+# Swedish translations for psensor package.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the psensor package.
+# Jean-Philippe Orsini <jeanfi@gmail.com>
+# Translators:
+# Josef Andersson <josef.andersson@fripost.org>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: psensor 1.0.0.0\n"
+"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"PO-Revision-Date: 2014-06-01 13:09+0000\n"
+"Last-Translator: Josef Andersson <Unknown>\n"
+"Language-Team: Swedish\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/glade/psensor.glade:6
+msgid "About"
+msgstr "Om"
+
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
+msgid "Sensor Preferences"
+msgstr "Sensorinställningar"
+
+#: src/glade/psensor.glade:24
+msgid "Quit"
+msgstr "Avsluta"
+
+#: src/glade/psensor.glade:84
+msgid "Show"
+msgstr "Visa"
+
+#: src/glade/psensor.glade:184
+msgid "Psensor - Temperature Monitor"
+msgstr "Psensor - Temperaturövervakare"
+
+#: src/glade/psensor.glade:199
+msgid "_Psensor"
+msgstr "_Psensor"
+
+#: src/glade/psensor.glade:246
+msgid "_Help"
+msgstr "_Hjälp"
+
+#: 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:121
+msgid "Hide window decoration"
+msgstr "Göm fönsterdekoration"
+
+#: src/glade/psensor-pref.glade:141
+msgid "Keep window below"
+msgstr "Håll fönster under"
+
+#: src/glade/psensor-pref.glade:161
+msgid "Enable menu"
+msgstr "Aktivera meny"
+
+#: src/glade/psensor-pref.glade:181
+msgid "Enable Unity Launcher counter"
+msgstr "Aktivera räknare för Unity-programstartare"
+
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr "Celsius"
+
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr "Fahrenheit"
+
+#: src/glade/psensor-pref.glade:254
+msgid "Temperature unit:"
+msgstr "Temperaturenheter:"
+
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Sensortabellens position:"
+
+#: src/glade/psensor-pref.glade:287
+msgid "Interface"
+msgstr "Gränssnitt"
+
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr "Starta vid sessionsuppstart"
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Göm fönster vid uppstart"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Återställ fönsterposition och storlek"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr "Uppstart"
+
+#: src/glade/psensor-pref.glade:405
+msgid "Foreground:"
+msgstr "Förgrund:"
+
+#: src/glade/psensor-pref.glade:420
+msgid "Background:"
+msgstr "Bakgrund:"
+
+#: src/glade/psensor-pref.glade:454
+msgid "Background opacity:"
+msgstr "Bakgrundsgenomskinlighet:"
+
+#: src/glade/psensor-pref.glade:477
+msgid "<i>Min</i>"
+msgstr "<i>Min</i>"
+
+#: src/glade/psensor-pref.glade:504
+msgid "<i>Max</i>"
+msgstr "<i>Min</i>"
+
+#: src/glade/psensor-pref.glade:530
+msgid "Colors"
+msgstr "Färger"
+
+#: src/glade/psensor-pref.glade:548
+msgid "Monitoring duration:"
+msgstr "Övervakningstid:"
+
+#: src/glade/psensor-pref.glade:585
+msgid "minute(s)"
+msgstr "minut(er)"
+
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
+msgid "second(s)"
+msgstr "sekund(er)"
+
+#: src/glade/psensor-pref.glade:637
+msgid "Update interval:"
+msgstr "Uppdateringsintervall:"
+
+#: src/glade/psensor-pref.glade:655
+msgid "Measures"
+msgstr "Mätningar"
+
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
+#: src/ui_sensorlist.c:334
+msgid "Graph"
+msgstr "Graf"
+
+#: src/glade/psensor-pref.glade:715
+msgid "Measure update interval:"
+msgstr "Uppdateringsintervall för mätning:"
+
+#: src/glade/psensor-pref.glade:763
+msgid "Enable sensors logging"
+msgstr "Aktivera sensorlogging"
+
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Loggintervall för sensor:"
+
+#: src/glade/psensor-pref.glade:827
+msgid "seconds(s)"
+msgstr "sekund(er)"
+
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
+msgstr "Skript att köra vid alarm:"
+
+#: src/glade/psensor-pref.glade:877
+msgid "Sensors"
+msgstr "Sensorer"
+
+#: src/glade/sensor-edit.glade:28
+msgid "Edit Sensor Preferences"
+msgstr "Redigera sensorinställningar"
+
+#: src/glade/sensor-edit.glade:96
+msgid "Name"
+msgstr "Namn"
+
+#: src/glade/sensor-edit.glade:140
+msgid "Type:"
+msgstr "Typ:"
+
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+msgid "N/A"
+msgstr "Ej tillgänglig"
+
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Sensorinformation"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Chip:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Namn:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Id:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Rita sensorkurva"
+
+#: src/glade/sensor-edit.glade:300
+msgid "Color:"
+msgstr "Färg:"
+
+#: src/glade/sensor-edit.glade:331
+msgid "Alarm"
+msgstr "Alarm"
+
+#: src/glade/sensor-edit.glade:345
+msgid "Activate desktop notifications"
+msgstr "Aktivera skrivbordsnotifiering"
+
+#: src/glade/sensor-edit.glade:367
+msgid "High threshold:"
+msgstr "Högt tröskelvärde:"
+
+#: src/glade/sensor-edit.glade:382
+msgid "Low threshold:"
+msgstr "Lågt tröskelvärde:"
+
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
+msgstr "Programindikator"
+
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
+msgstr "Visa sensor i meny"
+
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr "Visa sensor i etiketten (exprimentiell)"
+
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr "-1"
+
+#: src/lib/amd.c:168
+msgid "AMD: cannot found ADL library."
+msgstr "AMD: kan inte hitta ADL-bibliotek."
+
+#: src/lib/amd.c:195
+msgid "AMD: missing ADL's API."
+msgstr "AMD: saknar ADL API."
+
+#: src/lib/amd.c:205
+msgid "AMD: failed to initialize ADL."
+msgstr "AMD: misslyckades med att initialisera ADL."
+
+#: src/lib/amd.c:211
+msgid "AMD: cannot get the number of adapters."
+msgstr "AMD: kan inte hämta antal adaptrar."
+
+#: src/lib/amd.c:250
+#, c-format
+msgid "Number of AMD/ATI adapters: %d"
+msgstr "Antal AMD/ATI-adaptrar: %d"
+
+#: src/lib/amd.c:251
+#, c-format
+msgid "Number of active AMD/ATI adapters: %d"
+msgstr "Antal aktiva AMD/ATI-adaptrar: %d"
+
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr "CPU"
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr "Disk"
+
+#: src/lib/hdd_atasmart.c:152
+#, c-format
+msgid "atasmart: sk_disk_open() failure: %s."
+msgstr "atasmart: sk_disk_open() fel: %s."
+
+#: src/lib/hdd_hddtemp.c:59
+msgid "hddtemp: failed to open socket."
+msgstr "hddtemp: misslyckades med att öppna uttag."
+
+#: src/lib/hdd_hddtemp.c:72
+msgid "hddtemp: failed to open connection."
+msgstr "hddtemp: misslyckades med att öppna anslutning."
+
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:256
+#, c-format
+msgid "hddtemp: wrong string: %s."
+msgstr "hddtemp: fel sträng: %s."
+
+#: src/lib/lmsensor.c:42
+#, c-format
+msgid "lmsensor: cannot get value of subfeature %s: %s."
+msgstr "lmsensor: kan inte hämta värdet för underegenskap %s: %s."
+
+#: src/lib/lmsensor.c:123
+msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
+msgstr "lmsensor: lmsensor_psensor_create fel: fel egenskapstyp."
+
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr "Intel CPU"
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr "AMD CPU"
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr "NVIDIA GPU"
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr "VIA CPU"
+
+#: src/lib/lmsensor.c:218
+#, c-format
+msgid "lmsensor: initialization failure: %s."
+msgstr "lmsensor: initialiseringsfel: %s."
+
+#: src/lib/plog.c:43
+#, c-format
+msgid "Cannot open log file: %s"
+msgstr "Kan inte öppna loggfil: %s"
+
+#: src/lib/nvidia.c:52
+msgid ""
+"NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
+msgstr ""
+"Properitär NVIDIA-drivrutin ej använd, eller kan inte hämta NVIDIA GPU-"
+"temperatur."
+
+#: src/lib/nvidia.c:95
+msgid "Cannot open connection to X11 server."
+msgstr "Kan inte öppna anslutning till X11-server."
+
+#: src/lib/nvidia.c:103
+msgid "Failed to retrieve NVIDIA information."
+msgstr "Misslyckades med att hämta NVIDIA-information."
+
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+msgid "RPM"
+msgstr "RPM"
+
+#: src/lib/psensor.c:488
+msgid "%"
+msgstr "%"
+
+#: src/lib/slog.c:86
+msgid "HOME variable not set."
+msgstr "HOME-variabel inte inställd."
+
+#: src/lib/slog.c:96
+msgid "Sensor log file already open."
+msgstr "Sensorloggfil redan öppen."
+
+#: src/lib/slog.c:105
+#, c-format
+msgid "Cannot open sensor log file: %s."
+msgstr "Kan inte öppna sensorloggfil: %s"
+
+#: src/lib/slog.c:136
+msgid "Sensor log file not open."
+msgstr "Sensorloggfil ej öppen."
+
+#: src/lib/slog.c:192
+msgid "Sensor log not open, cannot close."
+msgstr "Sensorloggfil ej öppen, kan inte stänga."
+
+#: src/main.c:77 src/server/server.c:84
+#, 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/main.c:88 src/server/server.c:94
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "Användning: %s [OPTION]...\n"
+
+#: src/main.c:90
+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/main.c:94
+msgid "Options:"
+msgstr "Alternativ:"
+
+#: src/main.c:95
+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/main.c:101
+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/main.c:104
+msgid ""
+"  --use-libatasmart   use atasmart library for disk monitoring instead of\n"
+"                      hddtemp daemon"
+msgstr ""
+"  --use-libatasmart   använd atasmart library för diskövervakning istället "
+"för\n"
+"                      hddtemp-demon"
+
+#: src/main.c:107
+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/main.c:110
+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/main.c:115 src/server/server.c:117
+#, c-format
+msgid "Report bugs to: %s\n"
+msgstr "Rapportera fel till: %s\n"
+
+#: src/main.c:117 src/server/server.c:119
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s webbplats <%s>\n"
+
+#: src/main.c:454
+msgid "Psensor has not been compiled with remote sensor support."
+msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
+
+#: src/main.c:517
+msgid "Enables debug mode."
+msgstr "Aktivera felsökningsläge."
+
+#: src/main.c:529 src/server/server.c:380
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Prova`%s --help' för mer information.\n"
+
+#: src/main.c:542
+msgid "A Psensor instance already exists."
+msgstr "Det finns redan en Psensor-instans."
+
+#: src/rsensor.c:107
+#, c-format
+msgid "Fail to connect to: %s"
+msgstr "Misslyckades med att ansluta till: %s"
+
+#: src/rsensor.c:144
+#, c-format
+msgid "Invalid content: %s"
+msgstr "Ogiltigt innehåll: %s"
+
+#: src/rsensor.c:184
+#, c-format
+msgid "Invalid JSON: %s"
+msgstr "Ogiltig JSON: %s"
+
+#: src/server/server.c:54
+msgid "<html><body><p>Server stop requested</p></body></html>"
+msgstr "<html><body><p>Begärde serverstopp</p></body></html>"
+
+#: src/server/server.c:60
+msgid ""
+"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
+msgstr ""
+"<html><body><p>Hittade inte sida - GÃ¥ till <a href='/'>Huvudsida</a></p></"
+"body>"
+
+#: src/server/server.c:96
+msgid ""
+"psensor-server is an HTTP server for monitoring hardware sensors remotely."
+msgstr ""
+"psensor-server är en HTTP-server för att fjärrövervaka hårdvarusensorer."
+
+#: src/server/server.c:101
+msgid ""
+"  -h, --help\t\tdisplay this help and exit\n"
+"  -v, --version\t\tdisplay version information and exit"
+msgstr ""
+"  -h, --help\t\tvisa denna hjälp och avsluta\n"
+"  -v, --version\t\tvisa versionsinformation och avsluta"
+
+#: src/server/server.c:105
+msgid ""
+"  -p,--port=PORT\twebserver port\n"
+"  -w,--wdir=DIR\t\tdirectory containing webserver pages"
+msgstr ""
+"  -p,--port=PORT\twebbserverport\n"
+"  -w,--wdir=DIR\t\tkatalog som innehåller webbserversidor"
+
+#: src/server/server.c:109
+msgid "  -d, --debug=LEVEL     set the debug level, integer between 0 and 3"
+msgstr "  -d, --debug=LEVEL     ställ in felsökningnivån mellan 0 and 3"
+
+#: src/server/server.c:111
+msgid "  -l, --log-file=PATH   set the log file to PATH"
+msgstr "  -l, --log-file=PATH   ställ in loggfilen till PATH"
+
+#: src/server/server.c:112
+msgid "  --sensor-log-file=PATH set the sensor log file to PATH"
+msgstr "  --sensor-log-file=PATH ställ in loggintervall för sensor till PATH"
+
+#: src/server/server.c:113
+msgid "  --sensor-log-interval=S set the sensor log interval to S (seconds)"
+msgstr ""
+"  --sensor-log-interval=S ställ in loggintervall för sensor till S (sekunder)"
+
+#: src/server/server.c:297
+#, c-format
+msgid "HTTP Request: %s"
+msgstr "HTTP-begäran: %s"
+
+#: src/server/server.c:360
+#, c-format
+msgid "Enables debug mode: %d"
+msgstr "Aktivera felsökningsläge: %d"
+
+#: src/server/server.c:402
+msgid "No sensors detected."
+msgstr "Inga sensorer hittades."
+
+#: src/server/server.c:409
+msgid "Failed to create Web server."
+msgstr "Misslyckades med att skapa webbserver."
+
+#: src/server/server.c:413
+#, c-format
+msgid "Web server started on port: %d"
+msgstr "Webbserver startade på port: %d"
+
+#: src/server/server.c:414
+#, c-format
+msgid "WWW directory: %s"
+msgstr "WWW-katalog: %s"
+
+#: src/server/server.c:415
+#, c-format
+msgid "URL: http://localhost:%d"
+msgstr "URL: http://localhost:%d"
+
+#: src/server/server.c:425
+msgid "Failed to activate logging of sensors."
+msgstr "Misslyckades med att aktivera sensorloggning."
+
+#: src/ui.c:84
+msgid "Psensor is a GTK+ application for monitoring hardware sensors"
+msgstr "Psensor är ett GTK+-program för att övervaka hårdvarusensorer"
+
+#: src/ui.c:87
+msgid ""
+"Copyright(c) 2010-2014\n"
+"jeanfi@gmail.com"
+msgstr ""
+"Copyright(c) 2010-2014\n"
+"jeanfi@gmail.com"
+
+#: src/ui.c:90
+msgid "About Psensor"
+msgstr "Om Psensor"
+
+#: src/ui.c:93
+msgid "Psensor Homepage"
+msgstr "Psensor-webbplats"
+
+#: src/ui.c:217
+msgid "Failed to load Psensor icon."
+msgstr "Misslyckades med att läsa in Psensor-ikon."
+
+#: src/ui_sensorlist.c:245
+msgid "Select foreground color"
+msgstr "Välj förgrundsfärg"
+
+#: src/ui_sensorlist.c:297
+msgid "Sensor"
+msgstr "Sensor"
+
+#: src/ui_sensorlist.c:303
+msgid "Value"
+msgstr "Värde"
+
+#: src/ui_sensorlist.c:309
+msgid "Min"
+msgstr "Min"
+
+#: src/ui_sensorlist.c:315
+msgid "Max"
+msgstr "Max"
+
+#: src/ui_sensorlist.c:322
+msgid "Color"
+msgstr "Färg"
+
+#: src/ui_notify.c:48
+msgid "gettimeofday failed."
+msgstr "gettimeofday misslyckades."
+
+#: src/ui_notify.c:77
+msgid "Temperature alert"
+msgstr "Temperaturlarm"
+
+#: src/ui_notify.c:79
+msgid "Fan alert"
+msgstr "Fläktlarm"
+
+#: src/ui_sensorpref.c:234
+msgid "Unknown"
+msgstr "Okänd"
diff --git a/po/tr.gmo b/po/tr.gmo
index da73e07..6c3dc45 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index c10ab06..7a1d690 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2013-11-24 08:42+0000\n"
 "Last-Translator: İbrahim Çelik <ibrahimcelik89@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -18,249 +18,295 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n"
 "X-Generator: Launchpad (build 16916)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "Hakkında"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Algılayıcı Tercihleri"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Göster"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - Sıcaklık Gözlemleyici"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr "_Psensor"
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Yardım"
 
-#: src/glade/psensor-pref.glade:7
+#: 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:72
-msgid "Position of sensors table:"
-msgstr "Gözlemleyici tablosunun konumu:"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Pencere çubuğunu gizle"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Pencereyi aşağıda tut"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Menüyü etkinleştir"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Unity Başlatıcı sayacını etkinleştir"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Başlangıçta pencereyi gizle"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Pencere konumunu ve boyutunu yeniden yükle"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr "Fahrenhayt"
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Sıcaklık birimi:"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Gözlemleyici tablosunun konumu:"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Başlangıçta pencereyi gizle"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Pencere konumunu ve boyutunu yeniden yükle"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Önplan:"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Arkaplan:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Arkaplan saydamlığı:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Asgari</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Azami</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Renk"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Gözlemleme süresi:"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "dakika"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "saniye"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Güncelleme aralığı:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Ölçümler"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Grafik"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Ölçüm güncelleştirme aralığı:"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "Algılayıcı günlük kaydını etkinleştir"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "Algılayıcı günlük kaydı aralığı"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr "Algılayıcı günlük kaydı aralığı:"
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "saniye"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
-msgstr "Alarm çaldığında betik çalıştırılır"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
+msgstr "Alarm çaldığında betik çalıştırılır:"
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Algılayıcılar"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Algılayıcı Tercihlerini Düzenle"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr "Ad"
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Tür:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "Bilinmeyen"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Algılayıcı Bilgisi"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "Yonga:"
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Ä°sim:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Kimlik:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Algılayıcı eğrisini çiz"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Renk :"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Masaüstü bildirimlerini etkinleştir"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Algılayıcı Bilgisi"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Algılayıcı eğrisini çiz"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Yüksek eşik:"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Düşük eşik:"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
-msgstr "Ubuntu Uygulama Göstergesi"
-
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
-msgstr "Algılayıcıyı Uygulama Göstergesi menüsünde göster"
-
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "Yonga:"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
+msgstr "Uygulama Göstergesi"
 
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Kimlik:"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
+msgstr "Algılayıcıları menüde göster"
 
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Ayrıntılar"
+#: src/glade/sensor-edit.glade:429
+#, fuzzy
+msgid "Display sensor in the label (experimental)"
+msgstr "Algılayıcıyı Uygulama Göstergesi menüsünde göster"
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Ä°sim:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD:  ADL kütüphanesi bulunamadı."
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: ADL'nin API'sı kayıp."
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: ADL başlatılamadı."
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 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:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr "AMD/ATI bağdaştırıcı sayısı: %d"
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr "Etkin AMD/ATI bağdaştırıcı sayısı: %d"
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,67 +334,83 @@ msgstr "lmsensor: %s alt özelliğinin değeri alınamıyor: %s."
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create hatası: yanlış özellik tipi."
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: başlatma hatası: %s."
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "Günlükleme dosyası açılamadı: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 "NVIDIA kapalı kaynak sürücüsü kullanılmıyor veya NVIDIA ekran kartı "
 "sıcaklığı alınamıyor."
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "X11 sunucusu bağlantısı açılamıyor."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "NVIDIA bilgisi alınamıyor."
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "HOME değişkeni ayarlanmamış."
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "Algılayıcı günlük kaydı dosyası zaten açık."
 
-#: src/lib/slog.c:87
+#: src/lib/slog.c:105
 #, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "Algılayıcı günlük kaydı dosyası açılamıyor: %s."
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "Algılayıcı günlük kaydı dosyası açık değil."
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 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:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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"
@@ -461,21 +523,6 @@ msgstr ""
 "<html><body><p>Sayfa bulunamadı - Şuraya gidin <a href='/'>Main page</a></"
 "p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -618,27 +665,6 @@ msgstr "Sıcaklık uyarısı"
 msgid "Fan alert"
 msgstr "Fan uyarısı"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "Bilinmeyen"
-
-#~ msgid "_Show"
-#~ msgstr "_Göster"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Tercihler"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "A_lgılayıcı Tercihleri"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "AlgılayıcıTercihleri"
-
-#~ msgid "_About"
-#~ msgstr "_Hakkında"
-
-#~ msgid "_Quit"
-#~ msgstr "_Çıkış"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "menüler inşaa edilemedi: %s"
diff --git a/po/uk.gmo b/po/uk.gmo
index 1016506..0c29caf 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index efd7b09..761b599 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
 "PO-Revision-Date: 2012-10-13 16:24+0000\n"
 "Last-Translator: Ilya Volchanetskiy <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,249 +18,294 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-01-21 09:32+0000\n"
 "X-Generator: Launchpad (build 16430)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "Про програму"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "Налаштування"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "Налаштування датчиків"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "Вихід"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "Показати"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr ""
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "_Довдіка"
 
-#: src/glade/psensor-pref.glade:7
+#: 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:72
-msgid "Position of sensors table:"
-msgstr "Положення таблиці датчиків:"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "Сховати каркас вікна"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "Тримати вікно позаду"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "Увімкнути меню"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "Увімкнути лічильник на панелі запуску Unity"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "Сховати вікно після запуску"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "Відновляти позицію і розмір вікна"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "Одиниця температури:"
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "Положення таблиці датчиків:"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "Зовнішній вигляд"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "Сховати вікно після запуску"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "Відновляти позицію і розмір вікна"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "Передній план:"
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "Тло:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "Непрозорість тла:"
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>Мін.</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>Макс.</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "Тривалість спостереження"
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "хв."
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "сек."
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "Інтервал оновлення:"
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "Заміри"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "Діаграма"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "Інтервал оновлення замірів:"
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "Датчики"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "Редагувати налаштування датчика"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "Н/Д"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "Інформація датчика"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr ""
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "Назва:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "Ідентифікатор:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "Малювати криву датчика"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "Колір:"
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "Оповіщення"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "Увімкнути оповіщення"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "Інформація датчика"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "Малювати криву датчика"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "Вищий поріг:"
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "Нижчий поріг:"
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "Ідентифікатор:"
-
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "Подробиці"
-
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "Назва:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: не вдалося знайти бібліотеку ADL."
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: відсутнє API ADL."
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: не вдалося ініціалізувати ADL."
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: не вдалося отримати кількість адаптерів."
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,65 +333,81 @@ msgstr ""
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: помилка ініціалізації: %s."
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "Не вдалося відкрити лог-файл: %s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "Не вдалося встановити з'єднання до сервера X11."
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Не вдалося отримати інформацію NVIDIA."
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "об/хв"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "Змінна HOME не встановлена."
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr ""
 
-#: src/lib/slog.c:87
+#: src/lib/slog.c:105
 #, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr ""
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr ""
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr ""
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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 ""
 
@@ -449,16 +510,6 @@ msgstr ""
 "<html><body><p>Сторінка не знайдена - Перейти до <a href='/'>Головної "
 "сторінки</a></p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -593,46 +644,6 @@ msgstr ""
 msgid "Fan alert"
 msgstr ""
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr ""
-
-#~ msgid "_Show"
-#~ msgstr "Пок_азати"
-
-#~ msgid "_Preferences"
-#~ msgstr "_Налаштування"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "Налаштув_ання датчиків"
-
-#~ msgid "_About"
-#~ msgstr "_Про програму"
-
-#~ msgid "_Quit"
-#~ msgstr "_Вихід"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "не вдалося створити меню: %s"
-
-#~ msgid "Sensor Name"
-#~ msgstr "Назва датчика"
-
-#~ msgid "Enabled"
-#~ msgstr "Увімкнен"
-
-#, fuzzy
-#~ msgid "slog_init: cannot open sensor log file: %s"
-#~ msgstr "Не вдалося відкрити лог-файл: %s"
-
-#, fuzzy
-#~ msgid "slog_init: gettimeofday failed."
-#~ msgstr "помилка gettimeofday."
-
-#, fuzzy
-#~ msgid "slog_write_sensors: gettimeofday failed."
-#~ msgstr "помилка gettimeofday."
-
-#, fuzzy
-#~ msgid "Enable indicator"
-#~ msgstr "Увімкнен"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 5ee4395..70db6d9 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 95788fc..9e3b2b8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,260 +7,305 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-04-10 08:17+0200\n"
-"PO-Revision-Date: 2013-01-15 12:24+0000\n"
+"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"PO-Revision-Date: 2014-05-01 13:23+0000\n"
 "Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-21 09:32+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
 
-#: src/glade/psensor.glade:5
+#: src/glade/psensor.glade:6
 msgid "About"
 msgstr "关于"
 
-#: src/glade/psensor.glade:9 src/glade/psensor.glade:10
-#: src/glade/psensor.glade:19 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
 msgid "Preferences"
 msgstr "首选项"
 
-#: src/glade/psensor.glade:14 src/glade/psensor.glade:15
-#: src/glade/psensor.glade:27
+#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
+#: src/glade/psensor.glade:28
 msgid "Sensor Preferences"
 msgstr "传感器首选项"
 
-#: src/glade/psensor.glade:23
+#: src/glade/psensor.glade:24
 msgid "Quit"
 msgstr "退出"
 
-#: src/glade/psensor.glade:31
+#: src/glade/psensor.glade:84
 msgid "Show"
 msgstr "显示"
 
-#: src/glade/psensor.glade:180
+#: src/glade/psensor.glade:184
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - 温度监视器"
 
-#: src/glade/psensor.glade:195
+#: src/glade/psensor.glade:199
 msgid "_Psensor"
 msgstr ""
 
-#: src/glade/psensor.glade:242
+#: src/glade/psensor.glade:246
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: src/glade/psensor-pref.glade:7
+#: 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:72
-msgid "Position of sensors table:"
-msgstr "监视设备列表位置:"
-
-#: src/glade/psensor-pref.glade:81
+#: src/glade/psensor-pref.glade:121
 msgid "Hide window decoration"
 msgstr "隐藏窗口标题栏"
 
-#: src/glade/psensor-pref.glade:98
+#: src/glade/psensor-pref.glade:141
 msgid "Keep window below"
 msgstr "保持在最底层"
 
-#: src/glade/psensor-pref.glade:115
+#: src/glade/psensor-pref.glade:161
 msgid "Enable menu"
 msgstr "启用菜单"
 
-#: src/glade/psensor-pref.glade:132
+#: src/glade/psensor-pref.glade:181
 msgid "Enable Unity Launcher counter"
 msgstr "启用 Unity 启动器计数器"
 
-#: src/glade/psensor-pref.glade:149
-msgid "Hide window on startup"
-msgstr "启动时隐藏窗口"
+#: src/glade/psensor-pref.glade:209
+msgid "Celsius"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:166
-msgid "Restore window position and size"
-msgstr "恢复窗口位置和大小"
+#: src/glade/psensor-pref.glade:210
+msgid "Fahrenheit"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:186
+#: src/glade/psensor-pref.glade:254
 msgid "Temperature unit:"
 msgstr "温度单位："
 
-#: src/glade/psensor-pref.glade:238
+#: src/glade/psensor-pref.glade:272
+msgid "Position of sensors table:"
+msgstr "监视设备列表位置:"
+
+#: src/glade/psensor-pref.glade:287
 msgid "Interface"
 msgstr "界面"
 
-#: src/glade/psensor-pref.glade:276
+#: src/glade/psensor-pref.glade:299
+msgid "Launch on session startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:320
+msgid "Hide window on startup"
+msgstr "启动时隐藏窗口"
+
+#: src/glade/psensor-pref.glade:340
+msgid "Restore window position and size"
+msgstr "恢复窗口位置和大小"
+
+#: src/glade/psensor-pref.glade:367
+msgid "Startup"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:405
 msgid "Foreground:"
 msgstr "前景："
 
-#: src/glade/psensor-pref.glade:291
+#: src/glade/psensor-pref.glade:420
 msgid "Background:"
 msgstr "背景:"
 
-#: src/glade/psensor-pref.glade:325
+#: src/glade/psensor-pref.glade:454
 msgid "Background opacity:"
 msgstr "背景透明："
 
-#: src/glade/psensor-pref.glade:348
+#: src/glade/psensor-pref.glade:477
 msgid "<i>Min</i>"
 msgstr "<i>最小值</i>"
 
-#: src/glade/psensor-pref.glade:375
+#: src/glade/psensor-pref.glade:504
 msgid "<i>Max</i>"
 msgstr "<i>最大值</i>"
 
-#: src/glade/psensor-pref.glade:401
+#: src/glade/psensor-pref.glade:530
 msgid "Colors"
 msgstr "颜色"
 
-#: src/glade/psensor-pref.glade:419
+#: src/glade/psensor-pref.glade:548
 msgid "Monitoring duration:"
 msgstr "监视持续时长："
 
-#: src/glade/psensor-pref.glade:457
+#: src/glade/psensor-pref.glade:585
 msgid "minute(s)"
 msgstr "分钟"
 
-#: src/glade/psensor-pref.glade:474 src/glade/psensor-pref.glade:626
+#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
 msgid "second(s)"
 msgstr "秒"
 
-#: src/glade/psensor-pref.glade:510
+#: src/glade/psensor-pref.glade:637
 msgid "Update interval:"
 msgstr "更新间隔："
 
-#: src/glade/psensor-pref.glade:528
+#: src/glade/psensor-pref.glade:655
 msgid "Measures"
 msgstr "测量"
 
-#: src/glade/psensor-pref.glade:564 src/glade/sensor-edit.glade:169
+#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
 #: src/ui_sensorlist.c:334
 msgid "Graph"
 msgstr "图表"
 
-#: src/glade/psensor-pref.glade:588
+#: src/glade/psensor-pref.glade:715
 msgid "Measure update interval:"
 msgstr "测量更新间隔："
 
-#: src/glade/psensor-pref.glade:637
+#: src/glade/psensor-pref.glade:763
 msgid "Enable sensors logging"
 msgstr "启用监测器记录"
 
-#: src/glade/psensor-pref.glade:684
-msgid "Sensors logging interval"
-msgstr "监测器记录间隔"
+#: src/glade/psensor-pref.glade:810
+msgid "Sensors logging interval:"
+msgstr ""
 
-#: src/glade/psensor-pref.glade:701
+#: src/glade/psensor-pref.glade:827
 msgid "seconds(s)"
 msgstr "秒"
 
-#: src/glade/psensor-pref.glade:718
-msgid "Script executed when an alarm is raised"
+#: src/glade/psensor-pref.glade:844
+msgid "Script executed when an alarm is raised:"
 msgstr ""
 
-#: src/glade/psensor-pref.glade:751
+#: src/glade/psensor-pref.glade:877
 msgid "Sensors"
 msgstr "传感器"
 
-#: src/glade/sensor-edit.glade:19
+#: src/glade/sensor-edit.glade:28
 msgid "Edit Sensor Preferences"
 msgstr "编辑传感器首选项"
 
-#: src/glade/sensor-edit.glade:87
+#: src/glade/sensor-edit.glade:96
 msgid "Name"
 msgstr ""
 
-#: src/glade/sensor-edit.glade:138
+#: src/glade/sensor-edit.glade:140
 msgid "Type:"
 msgstr "类型:"
 
-#: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
-#: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
+#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
 msgid "N/A"
 msgstr "不可用"
 
-#: src/glade/sensor-edit.glade:187
+#: src/glade/sensor-edit.glade:170
+msgid "Sensor Information"
+msgstr "传感器信息"
+
+#: src/glade/sensor-edit.glade:188
+msgid "Chip:"
+msgstr "芯片："
+
+#: src/glade/sensor-edit.glade:217
+msgid "Name:"
+msgstr "名称:"
+
+#: src/glade/sensor-edit.glade:232
+msgid "Id:"
+msgstr "标识:"
+
+#: src/glade/sensor-edit.glade:278
+msgid "Draw sensor curve"
+msgstr "绘制监视曲线"
+
+#: src/glade/sensor-edit.glade:300
 msgid "Color:"
 msgstr "颜色："
 
-#: src/glade/sensor-edit.glade:201
+#: src/glade/sensor-edit.glade:331
 msgid "Alarm"
 msgstr "警告"
 
-#: src/glade/sensor-edit.glade:216
+#: src/glade/sensor-edit.glade:345
 msgid "Activate desktop notifications"
 msgstr "激活桌面气泡提示"
 
-#: src/glade/sensor-edit.glade:236
-msgid "Sensor Information"
-msgstr "传感器信息"
-
-#: src/glade/sensor-edit.glade:249
-msgid "Draw sensor curve"
-msgstr "绘制监视曲线"
-
-#: src/glade/sensor-edit.glade:333
+#: src/glade/sensor-edit.glade:367
 msgid "High threshold:"
 msgstr "高阈值："
 
-#: src/glade/sensor-edit.glade:348
+#: src/glade/sensor-edit.glade:382
 msgid "Low threshold:"
 msgstr "低阈值："
 
-#: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
-msgstr "Ubuntu 应用指示器"
+#: src/glade/sensor-edit.glade:397
+msgid "Application Indicator"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#: src/glade/sensor-edit.glade:411
+msgid "Display sensor in the menu"
 msgstr "在应用指示器菜单中显示监视器"
 
-#: src/glade/sensor-edit.glade:444
-msgid "Chip:"
-msgstr "芯片："
-
-#: src/glade/sensor-edit.glade:489
-msgid "Id:"
-msgstr "标识:"
-
-#: src/glade/sensor-edit.glade:523
-msgid "Details"
-msgstr "详情"
+#: src/glade/sensor-edit.glade:429
+msgid "Display sensor in the label (experimental)"
+msgstr ""
 
-#: src/glade/sensor-edit.glade:541
-msgid "Name:"
-msgstr "名称:"
+#: src/glade/sensor-edit.glade:500
+msgid "-1"
+msgstr ""
 
-#: src/lib/amd.c:170
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD：未找到 ADL 库。"
 
-#: src/lib/amd.c:197
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD：ADL 的 API 丢失。"
 
-#: src/lib/amd.c:207
+#: src/lib/amd.c:205
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD：ADL 初始化出错。"
 
-#: src/lib/amd.c:213
+#: src/lib/amd.c:211
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD：无法获取适配器数目。"
 
-#: src/lib/amd.c:252
+#: src/lib/amd.c:250
 #, c-format
 msgid "Number of AMD/ATI adapters: %d"
 msgstr ""
 
-#: src/lib/amd.c:253
+#: src/lib/amd.c:251
 #, c-format
 msgid "Number of active AMD/ATI adapters: %d"
 msgstr ""
 
+#: src/lib/cpu.c:46
+msgid "CPU"
+msgstr ""
+
+#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
+msgid "Disk"
+msgstr ""
+
 #: src/lib/hdd_atasmart.c:152
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
@@ -288,71 +333,87 @@ msgstr "lmsensor：无法获取子功能%s的值：%s。"
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor：lmsensor_psensor_create 失败：错误的功能类型。"
 
+#: src/lib/lmsensor.c:148
+msgid "Intel CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:152
+msgid "AMD CPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
+msgid "NVIDIA GPU"
+msgstr ""
+
+#: src/lib/lmsensor.c:156
+msgid "VIA CPU"
+msgstr ""
+
 #: src/lib/lmsensor.c:218
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor：初始化失败：%s。"
 
-#: src/lib/log.c:43
+#: src/lib/plog.c:43
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr "无法打开日志文件：%s"
 
-#: src/lib/nvidia.c:54
+#: src/lib/nvidia.c:52
 msgid ""
 "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:97
+#: src/lib/nvidia.c:95
 msgid "Cannot open connection to X11 server."
 msgstr "无法打开到 X11 服务器的连接。"
 
-#: src/lib/nvidia.c:105
+#: src/lib/nvidia.c:103
 msgid "Failed to retrieve NVIDIA information."
 msgstr "无法获取 NVIDIA 信息。"
 
-#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "转速"
 
-#: src/lib/psensor.c:484
+#: src/lib/psensor.c:488
 msgid "%"
 msgstr "%"
 
-#: src/lib/slog.c:68
+#: src/lib/slog.c:86
 msgid "HOME variable not set."
 msgstr "未设置 HOME 变量。"
 
-#: src/lib/slog.c:78
+#: src/lib/slog.c:96
 msgid "Sensor log file already open."
 msgstr "已经打开监测器日志文件。"
 
-#: src/lib/slog.c:87
-#, fuzzy, c-format
+#: src/lib/slog.c:105
+#, c-format
 msgid "Cannot open sensor log file: %s."
 msgstr "无法打开监测器日志文件：%s。"
 
-#: src/lib/slog.c:118
+#: src/lib/slog.c:136
 msgid "Sensor log file not open."
 msgstr "监测器日志文件未打开。"
 
-#: src/lib/slog.c:174
+#: src/lib/slog.c:192
 msgid "Sensor log not open, cannot close."
 msgstr "监测器日志未打开，故无法关闭。"
 
-#: src/main.c:77
+#: src/main.c:77 src/server/server.c:84
 #, 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"
+"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"
+"协议 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/main.c:88 src/server/server.c:94
@@ -453,21 +514,6 @@ msgid ""
 "<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
 msgstr "<html><body><p>未找到页面 - 请访问<a href='/'>主页</a></p></body>"
 
-#: src/server/server.c:84
-#, 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/server/server.c:96
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
@@ -602,53 +648,6 @@ msgstr "温度报警"
 msgid "Fan alert"
 msgstr "风扇警报"
 
-#: src/ui_sensorpref.c:248
+#: src/ui_sensorpref.c:234
 msgid "Unknown"
 msgstr "未知"
-
-#~ msgid "_Show"
-#~ msgstr "显示(_S)"
-
-#~ msgid "_Preferences"
-#~ msgstr "首选项(_P)"
-
-#~ msgid "S_ensor Preferences"
-#~ msgstr "传感器首选项(_E)"
-
-#~ msgid "SensorPreferences"
-#~ msgstr "传感器首选项"
-
-#~ msgid "_About"
-#~ msgstr "关于(_A)"
-
-#~ msgid "_Quit"
-#~ msgstr "退出(_Q)"
-
-#~ msgid "building menus failed: %s"
-#~ msgstr "创建菜单失败：%s"
-
-#~ msgid "Sensor Name"
-#~ msgstr "传感器名称"
-
-#~ msgid "Enabled"
-#~ msgstr "激活"
-
-#, fuzzy
-#~ msgid "Enable log of measures"
-#~ msgstr "启用菜单"
-
-#, fuzzy
-#~ msgid "slog_init: cannot open sensor log file: %s"
-#~ msgstr "无法打开日志文件：%s"
-
-#, fuzzy
-#~ msgid "slog_init: gettimeofday failed."
-#~ msgstr "获取时间失败。"
-
-#, fuzzy
-#~ msgid "slog_write_sensors: gettimeofday failed."
-#~ msgstr "获取时间失败。"
-
-#, fuzzy
-#~ msgid "Enable indicator"
-#~ msgstr "激活"
diff --git a/src/Makefile.am b/src/Makefile.am
index f484916..0f64275 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,7 +10,9 @@ endif
 endif
 
 # -no-deprecated-declarations to avoid some glib deprecation warnings
-AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
+AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
+	-DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
+	-DDATADIR=\""$(datadir)"\"\
 	-I$(top_srcdir)/src/lib \
 	-I$(top_srcdir)/src/unity \
 	$(GTK_CFLAGS)\
@@ -49,7 +51,8 @@ psensor_SOURCES = \
 	ui_pref.h ui_pref.c \
 	ui_sensorlist.h ui_sensorlist.c \
 	ui_sensorpref.h ui_sensorpref.c \
-	ui_status.h ui_status.c
+	ui_status.h ui_status.c \
+	pxdg.h pxdg.c
 
 if GTOP
 AM_CPPFLAGS += $(GTOP_CFLAGS)
diff --git a/src/Makefile.in b/src/Makefile.in
index 85c76fa..9d13b6d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -93,9 +93,9 @@ am__psensor_SOURCES_DIST = cfg.h cfg.c notify_cmd.c notify_cmd.h \
 	graph.h graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \
 	ui_color.c ui_graph.h ui_graph.c ui_pref.h ui_pref.c \
 	ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \
-	ui_sensorpref.c ui_status.h ui_status.c ui_notify.h \
-	ui_notify.c ui_appindicator.c ui_unity.h ui_unity.c rsensor.h \
-	rsensor.c
+	ui_sensorpref.c ui_status.h ui_status.c pxdg.h pxdg.c \
+	ui_notify.h ui_notify.c ui_appindicator.c ui_unity.h \
+	ui_unity.c rsensor.h rsensor.c
 @LIBNOTIFY_TRUE@am__objects_1 = ui_notify.$(OBJEXT)
 @APPINDICATOR_TRUE@am__objects_2 = ui_appindicator.$(OBJEXT)
 @UNITY_TRUE@am__objects_3 = ui_unity.$(OBJEXT)
@@ -103,8 +103,9 @@ am__psensor_SOURCES_DIST = cfg.h cfg.c notify_cmd.c notify_cmd.h \
 am_psensor_OBJECTS = cfg.$(OBJEXT) notify_cmd.$(OBJEXT) \
 	graph.$(OBJEXT) main.$(OBJEXT) ui.$(OBJEXT) ui_color.$(OBJEXT) \
 	ui_graph.$(OBJEXT) ui_pref.$(OBJEXT) ui_sensorlist.$(OBJEXT) \
-	ui_sensorpref.$(OBJEXT) ui_status.$(OBJEXT) $(am__objects_1) \
-	$(am__objects_2) $(am__objects_3) $(am__objects_4)
+	ui_sensorpref.$(OBJEXT) ui_status.$(OBJEXT) pxdg.$(OBJEXT) \
+	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
+	$(am__objects_4)
 psensor_OBJECTS = $(am_psensor_OBJECTS)
 psensor_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -283,6 +284,7 @@ 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@
@@ -358,18 +360,19 @@ AM_LDFLAGS = -Wl,--as-needed -export-dynamic
 # -no-deprecated-declarations to avoid some glib deprecation warnings
 AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
 	-DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
-	-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \
-	$(GTK_CFLAGS) $(GCONF_CFLAGS) $(SENSORS_CFLAGS) \
-	$(am__append_2) $(am__append_6) $(am__append_9) \
-	$(am__append_10) $(am__append_12) $(am__append_14) \
-	$(am__append_17) $(am__append_21)
+	-DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/src/lib \
+	-I$(top_srcdir)/src/unity $(GTK_CFLAGS) $(GCONF_CFLAGS) \
+	$(SENSORS_CFLAGS) $(am__append_2) $(am__append_6) \
+	$(am__append_9) $(am__append_10) $(am__append_12) \
+	$(am__append_14) $(am__append_17) $(am__append_21)
 @GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1
 psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \
 	graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \
 	ui_color.c ui_graph.h ui_graph.c ui_pref.h ui_pref.c \
 	ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \
-	ui_sensorpref.c ui_status.h ui_status.c $(am__append_4) \
-	$(am__append_7) $(am__append_16) $(am__append_19)
+	ui_sensorpref.c ui_status.h ui_status.c pxdg.h pxdg.c \
+	$(am__append_4) $(am__append_7) $(am__append_16) \
+	$(am__append_19)
 EXTRA_DIST = description.txt psensor.schemas
 @GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR)
 @GCONF_TRUE@schema_DATA = psensor.schemas
@@ -461,6 +464,7 @@ distclean-compile:
 @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@
diff --git a/src/cfg.c b/src/cfg.c
index 55f3c8e..a5014ff 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -22,7 +22,7 @@
 #include <ctype.h>
 
 #include "cfg.h"
-#include "log.h"
+#include <plog.h>
 
 static const char *KEY_SENSORS = "/apps/psensor/sensors";
 
@@ -33,6 +33,9 @@ static const char *ATT_SENSOR_COLOR = "color";
 static const char *ATT_SENSOR_ENABLED = "enabled";
 static const char *ATT_SENSOR_NAME = "name";
 static const char *ATT_SENSOR_APPINDICATOR_DISABLED = "appindicator/disabled";
+static const char *ATT_SENSOR_APPINDICATOR_LABEL_ENABLED
+= "appindicator/menu/enabled";
+
 static const char *ATT_SENSOR_POSITION = "position";
 
 static const char *KEY_SENSOR_UPDATE_INTERVAL
@@ -434,6 +437,27 @@ void config_set_appindicator_enabled(const char *sid, bool enabled)
 	free(key);
 }
 
+bool config_is_appindicator_label_enabled(const char *sid)
+{
+	char *key;
+	gboolean b;
+
+	key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);
+	b = gconf_client_get_bool(client, key, NULL);
+	free(key);
+
+	return b;
+}
+
+void config_set_appindicator_label_enabled(const char *sid, bool enabled)
+{
+	char *key;
+
+	key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);
+	gconf_client_set_bool(client, key, enabled, NULL);
+	free(key);
+}
+
 bool is_slog_enabled()
 {
 	return gconf_client_get_bool(client, KEY_SLOG_ENABLED, NULL);
diff --git a/src/cfg.h b/src/cfg.h
index 9a9fce1..a63bcb0 100644
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -25,7 +25,7 @@
 #include "color.h"
 
 enum temperature_unit {
-	CELCIUS,
+	CELSIUS,
 	FAHRENHEIT
 };
 
@@ -109,6 +109,9 @@ void config_set_sensor_name(const char *, const char *);
 bool config_is_appindicator_enabled(const char *);
 void config_set_appindicator_enabled(const char *, bool);
 
+bool config_is_appindicator_label_enabled(const char *);
+void config_set_appindicator_label_enabled(const char *, bool);
+
 void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data);
 bool is_slog_enabled();
 
diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in
index 52f75a3..f77b250 100644
--- a/src/glade/Makefile.in
+++ b/src/glade/Makefile.in
@@ -184,6 +184,7 @@ 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@
diff --git a/src/glade/psensor-pref.glade b/src/glade/psensor-pref.glade
index 4a784be..d6da46b 100644
--- a/src/glade/psensor-pref.glade
+++ b/src/glade/psensor-pref.glade
@@ -1,6 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.4"/>
+  <object class="GtkAdjustment" id="mins">
+    <property name="lower">1</property>
+    <property name="upper">65535</property>
+    <property name="value">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="opacity">
+    <property name="upper">1</property>
+    <property name="step_increment">0.01</property>
+    <property name="page_increment">0.10000000000000001</property>
+  </object>
+  <object class="GtkListStore" id="position_list_store">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes" context="psensor">Right</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Left</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Top</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Bottom</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkAdjustment" id="secs">
+    <property name="lower">1</property>
+    <property name="upper">256</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="secs2">
+    <property name="lower">1</property>
+    <property name="upper">256</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="slog_interval_adjustment">
+    <property name="lower">1</property>
+    <property name="upper">6500</property>
+    <property name="value">300</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkDialog" id="dialog1">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -59,38 +112,28 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <object class="GtkTable" id="table1">
+              <object class="GtkGrid" id="table1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="n_rows">8</property>
-                <property name="n_columns">3</property>
-                <child>
-                  <object class="GtkLabel" id="label14">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Position of sensors table:</property>
-                  </object>
-                  <packing>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
-                  </packing>
-                </child>
+                <property name="column_homogeneous">True</property>
                 <child>
                   <object class="GtkCheckButton" id="hide_window_decoration">
                     <property name="label" translatable="yes">Hide window decoration</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -99,15 +142,18 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -116,15 +162,18 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -133,111 +182,192 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">4</property>
-                    <property name="bottom_attach">5</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="hide_on_startup">
-                    <property name="label" translatable="yes">Hide window on startup</property>
+                  <object class="GtkComboBoxText" id="temperature_unit">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
+                    <items>
+                      <item translatable="yes">Celsius</item>
+                      <item translatable="yes">Fahrenheit</item>
+                    </items>
                   </object>
                   <packing>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="restore_window">
-                    <property name="label" translatable="yes">Restore window position and size</property>
+                  <object class="GtkComboBox" id="sensors_list_position">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
+                    <property name="model">position_list_store</property>
+                    <property name="active">0</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                      <attributes>
+                        <attribute name="text">0</attribute>
+                      </attributes>
+                    </child>
                   </object>
                   <packing>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">6</property>
-                    <property name="bottom_attach">7</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="temperature_unit_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Temperature unit:</property>
                   </object>
                   <packing>
-                    <property name="top_attach">7</property>
-                    <property name="bottom_attach">8</property>
-                    <property name="x_padding">14</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBoxText" id="temperature_unit">
+                  <object class="GtkLabel" id="label14">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="id_column">1</property>
-                    <items>
-                      <item translatable="yes">Celcius</item>
-                      <item translatable="yes">Fahrenheit</item>
-                    </items>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Position of sensors table:</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">3</property>
-                    <property name="top_attach">7</property>
-                    <property name="bottom_attach">8</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="Interface">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Interface</property>
+              </object>
+              <packing>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid" id="grid4">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkComboBox" id="sensors_list_position">
+                  <object class="GtkCheckButton" id="autostart">
+                    <property name="label" translatable="yes">Launch on session startup</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="model">position_list_store</property>
-                    <property name="active">0</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0.49000000953674316</property>
+                    <property name="draw_indicator">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">3</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="hide_on_startup">
+                    <property name="label" translatable="yes">Hide window on startup</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="restore_window">
+                    <property name="label" translatable="yes">Restore window position and size</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
             </child>
             <child type="tab">
-              <object class="GtkLabel" id="Interface">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Interface</property>
+                <property name="label" translatable="yes">Startup</property>
               </object>
               <packing>
+                <property name="position">1</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -270,7 +400,6 @@
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="valign">start</property>
                     <property name="margin_left">14</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Foreground:</property>
@@ -278,7 +407,7 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
-                    <property name="width">2</property>
+                    <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
                 </child>
@@ -293,7 +422,7 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
-                    <property name="width">2</property>
+                    <property name="width">1</property>
                     <property name="height">1</property>
                   </packing>
                 </child>
@@ -434,7 +563,6 @@
                     <property name="margin_top">4</property>
                     <property name="margin_bottom">4</property>
                     <property name="invisible_char">•</property>
-                    <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">mins</property>
@@ -489,7 +617,6 @@
                     <property name="margin_top">4</property>
                     <property name="margin_bottom">4</property>
                     <property name="invisible_char">•</property>
-                    <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">secs</property>
@@ -554,7 +681,7 @@
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child type="tab">
@@ -564,7 +691,7 @@
                 <property name="label" translatable="yes">Graph</property>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="position">2</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -603,7 +730,6 @@
                     <property name="margin_top">4</property>
                     <property name="margin_bottom">4</property>
                     <property name="invisible_char">•</property>
-                    <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">secs2</property>
@@ -681,7 +807,7 @@
                     <property name="margin_right">4</property>
                     <property name="margin_top">4</property>
                     <property name="margin_bottom">4</property>
-                    <property name="label" translatable="yes">Sensors logging interval</property>
+                    <property name="label" translatable="yes">Sensors logging interval:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -715,7 +841,7 @@
                     <property name="margin_right">4</property>
                     <property name="margin_top">4</property>
                     <property name="margin_bottom">4</property>
-                    <property name="label" translatable="yes">Script executed when an alarm is raised</property>
+                    <property name="label" translatable="yes">Script executed when an alarm is raised:</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -740,7 +866,7 @@
                 </child>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">3</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -751,7 +877,7 @@
                 <property name="label" translatable="yes">Sensors</property>
               </object>
               <packing>
-                <property name="position">2</property>
+                <property name="position">3</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
@@ -775,56 +901,4 @@
       <action-widget response="0">button2</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAdjustment" id="mins">
-    <property name="lower">1</property>
-    <property name="upper">65535</property>
-    <property name="value">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="opacity">
-    <property name="upper">1</property>
-    <property name="step_increment">0.01</property>
-    <property name="page_increment">0.10000000000000001</property>
-  </object>
-  <object class="GtkListStore" id="position_list_store">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="psensor">Right</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Left</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Top</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Bottom</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkAdjustment" id="secs2">
-    <property name="lower">1</property>
-    <property name="upper">256</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="secs">
-    <property name="lower">1</property>
-    <property name="upper">256</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="slog_interval_adjustment">
-    <property name="lower">1</property>
-    <property name="upper">6500</property>
-    <property name="value">300</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
 </interface>
diff --git a/src/glade/psensor.glade b/src/glade/psensor.glade
index 25b2109..7c9703a 100644
--- a/src/glade/psensor.glade
+++ b/src/glade/psensor.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.4"/>
   <object class="GtkAction" id="AboutAction">
     <property name="label" translatable="yes">About</property>
     <signal name="activate" handler="ui_cb_about" swapped="no"/>
@@ -27,58 +28,68 @@
     <property name="label" translatable="yes">Sensor Preferences</property>
     <signal name="activate" handler="ui_cb_sensor_preferences" swapped="no"/>
   </object>
-  <object class="GtkAction" id="ShowAction">
-    <property name="label" translatable="yes">Show</property>
-    <signal name="activate" handler="cb_menu_show" swapped="no"/>
-  </object>
-  <object class="GtkMenu" id="appindicator_menu">
+  <object class="GtkMenu" id="popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkImageMenuItem" id="menuitem8">
-        <property name="related_action">ShowAction</property>
+      <object class="GtkImageMenuItem" id="popup_pref">
+        <property name="related_action">PreferencesAction</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
         <property name="use_stock">True</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="menuitem9">
+      <object class="GtkImageMenuItem" id="popup_sensorpref">
+        <property name="related_action">SensorPreferencesAction</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="menuitem1">
-        <property name="related_action">AppIndicatorPreferencesAction</property>
+      <object class="GtkSeparatorMenuItem" id="separatoritem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_stock">True</property>
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="menuitem2">
-        <property name="related_action">AppIndicatorSensorPreferencesAction</property>
+      <object class="GtkImageMenuItem" id="popup_about">
+        <property name="related_action">AboutAction</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
         <property name="use_stock">True</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="menuitem3">
+      <object class="GtkSeparatorMenuItem" id="separatoritem1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="menuitem4">
+      <object class="GtkImageMenuItem" id="popup_quit">
+        <property name="related_action">QuitAction</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="use_underline">True</property>
+        <property name="use_stock">True</property>
       </object>
     </child>
+  </object>
+  <object class="GtkAction" id="ShowAction">
+    <property name="label" translatable="yes">Show</property>
+    <signal name="activate" handler="cb_menu_show" swapped="no"/>
+  </object>
+  <object class="GtkMenu" id="appindicator_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkImageMenuItem" id="menuitem5">
-        <property name="related_action">AboutAction</property>
+      <object class="GtkImageMenuItem" id="menuitem8">
+        <property name="related_action">ShowAction</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
@@ -86,27 +97,23 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="menuitem6">
+      <object class="GtkSeparatorMenuItem" id="menuitem9">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="menuitem7">
-        <property name="related_action">QuitAction</property>
+      <object class="GtkImageMenuItem" id="menuitem1">
+        <property name="related_action">AppIndicatorPreferencesAction</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
         <property name="use_stock">True</property>
       </object>
     </child>
-  </object>
-  <object class="GtkMenu" id="popup_menu">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <child>
-      <object class="GtkImageMenuItem" id="popup_pref">
-        <property name="related_action">PreferencesAction</property>
+      <object class="GtkImageMenuItem" id="menuitem2">
+        <property name="related_action">AppIndicatorSensorPreferencesAction</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_underline">True</property>
@@ -114,22 +121,19 @@
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="popup_sensorpref">
-        <property name="related_action">SensorPreferencesAction</property>
+      <object class="GtkSeparatorMenuItem" id="menuitem3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separatoritem">
+      <object class="GtkSeparatorMenuItem" id="menuitem4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="popup_about">
+      <object class="GtkImageMenuItem" id="menuitem5">
         <property name="related_action">AboutAction</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
@@ -138,13 +142,13 @@
       </object>
     </child>
     <child>
-      <object class="GtkSeparatorMenuItem" id="separatoritem1">
+      <object class="GtkSeparatorMenuItem" id="menuitem6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkImageMenuItem" id="popup_quit">
+      <object class="GtkImageMenuItem" id="menuitem7">
         <property name="related_action">QuitAction</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
diff --git a/src/glade/sensor-edit.glade b/src/glade/sensor-edit.glade
index 777e930..f04905b 100644
--- a/src/glade/sensor-edit.glade
+++ b/src/glade/sensor-edit.glade
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.4"/>
   <object class="GtkAdjustment" id="alarm_high_threshold_value">
     <property name="lower">-9999</property>
     <property name="upper">9999</property>
@@ -13,6 +14,14 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkListStore" id="sensors_liststore">
+    <columns>
+      <!-- column-name Name -->
+      <column type="gchararray"/>
+      <!-- column-name Sensor -->
+      <column type="gpointer"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="dialog1">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -68,7 +77,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHPaned" id="hpaned1">
+          <object class="GtkPaned" id="hpaned1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
@@ -96,37 +105,29 @@
               </object>
               <packing>
                 <property name="resize">False</property>
-                <property name="shrink">True</property>
+                <property name="shrink">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkTable" id="table1">
+              <object class="GtkGrid" id="table1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="n_rows">15</property>
-                <property name="n_columns">2</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="row_spacing">4</property>
+                <property name="column_spacing">4</property>
                 <child>
                   <object class="GtkEntry" id="sensor_name">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
-                    <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
+                    <signal name="changed" handler="ui_sensorpref_name_changed_cb" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -135,14 +136,15 @@
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0.49000000953674316</property>
+                    <property name="xpad">4</property>
                     <property name="label" translatable="yes">Type:</property>
                     <property name="justify">fill</property>
                   </object>
                   <packing>
+                    <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -154,11 +156,103 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="ypad">4</property>
+                    <property name="label" translatable="yes">Sensor Information</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="chip_name_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="xpad">4</property>
+                    <property name="label" translatable="yes">Chip:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="chip_name">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">N/A</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="xpad">4</property>
+                    <property name="label" translatable="yes">Name:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="xpad">4</property>
+                    <property name="label" translatable="yes">Id:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="sensor_id">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
+                    <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">N/A</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -166,17 +260,35 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
+                    <property name="ypad">4</property>
                     <property name="label" translatable="yes">Graph</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="sensor_draw">
+                    <property name="label" translatable="yes">Draw sensor curve</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="ui_sensorpref_draw_toggled_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
                     <property name="top_attach">6</property>
-                    <property name="bottom_attach">7</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -184,13 +296,30 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
+                    <property name="xpad">4</property>
                     <property name="label" translatable="yes">Color:</property>
                   </object>
                   <packing>
-                    <property name="top_attach">8</property>
-                    <property name="bottom_attach">9</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">7</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkColorButton" id="sensor_color">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="halign">start</property>
+                    <property name="xalign">0</property>
+                    <signal name="color-set" handler="ui_sensorpref_color_set_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">7</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -198,17 +327,17 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
+                    <property name="ypad">4</property>
                     <property name="label" translatable="yes">Alarm</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">9</property>
-                    <property name="bottom_attach">10</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">8</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -217,52 +346,104 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="ui_sensorpref_alarm_toggled_cb" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">9</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="alarm_high_threshold_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0.0099999997764825821</property>
+                    <property name="xpad">4</property>
+                    <property name="label" translatable="yes">High threshold:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
                     <property name="top_attach">10</property>
-                    <property name="bottom_attach">11</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label1">
+                  <object class="GtkLabel" id="alarm_low_threshold_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0.0099999997764825821</property>
+                    <property name="xpad">4</property>
+                    <property name="label" translatable="yes">Low threshold:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">11</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="indicator_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Sensor Information</property>
+                    <property name="ypad">4</property>
+                    <property name="label" translatable="yes">Application Indicator</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">12</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="sensor_draw">
-                    <property name="label" translatable="yes">Draw sensor curve</property>
+                  <object class="GtkCheckButton" id="indicator_checkbox">
+                    <property name="label" translatable="yes">Display sensor in the menu</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="ui_sensorpref_appindicator_menu_toggled_cb" swapped="no"/>
                   </object>
                   <packing>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">7</property>
-                    <property name="bottom_attach">8</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">13</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox1">
+                  <object class="GtkCheckButton" id="indicator_label_checkbox">
+                    <property name="label" translatable="yes">Display sensor in the label (experimental)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="receives_default">False</property>
+                    <property name="margin_left">4</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="ui_sensorpref_appindicator_label_toggled_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">14</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -270,7 +451,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">•</property>
-                        <property name="invisible_char_set">True</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
                         <property name="adjustment">alarm_high_threshold_value</property>
@@ -278,6 +458,7 @@
                         <property name="snap_to_ticks">True</property>
                         <property name="numeric">True</property>
                         <property name="update_policy">if-valid</property>
+                        <signal name="value-changed" handler="ui_sensorpref_alarm_high_threshold_changed_cb" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -289,7 +470,7 @@
                       <object class="GtkLabel" id="sensor_alarm_high_threshold_unit">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="valign">start</property>
+                        <property name="valign">center</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">N/A</property>
                       </object>
@@ -302,61 +483,13 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">11</property>
-                    <property name="bottom_attach">12</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkColorButton" id="sensor_color">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="xalign">0</property>
-                    <property name="color">#000000000000</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">8</property>
-                    <property name="bottom_attach">9</property>
-                    <property name="x_options"/>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="alarm_high_threshold_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0.0099999997764825821</property>
-                    <property name="label" translatable="yes">High threshold:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">11</property>
-                    <property name="bottom_attach">12</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="alarm_low_threshold_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0.0099999997764825821</property>
-                    <property name="label" translatable="yes">Low threshold:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">12</property>
-                    <property name="bottom_attach">13</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
+                    <property name="top_attach">10</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="alarm_low_threshold_box">
+                  <object class="GtkBox" id="box20">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -364,7 +497,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">•</property>
-                        <property name="invisible_char_set">True</property>
+                        <property name="text" translatable="yes">-1</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
                         <property name="adjustment">alarm_low_threshold_value</property>
@@ -372,6 +505,8 @@
                         <property name="snap_to_ticks">True</property>
                         <property name="numeric">True</property>
                         <property name="update_policy">if-valid</property>
+                        <property name="value">-1</property>
+                        <signal name="value-changed" handler="ui_sensorpref_alarm_low_threshold_changed_cb" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -383,7 +518,7 @@
                       <object class="GtkLabel" id="sensor_alarm_low_threshold_unit">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="valign">start</property>
+                        <property name="valign">center</property>
                         <property name="xalign">0</property>
                         <property name="label" translatable="yes">N/A</property>
                       </object>
@@ -396,156 +531,9 @@
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">12</property>
-                    <property name="bottom_attach">13</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="indicator_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Ubuntu Application Indicator</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                  <packing>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">13</property>
-                    <property name="bottom_attach">14</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="indicator_checkbox">
-                    <property name="label" translatable="yes">Display sensor in the Application Indicator menu</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="xalign">0</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">14</property>
-                    <property name="bottom_attach">15</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="chip_name_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Chip:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="chip_name">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">N/A</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkExpander" id="expander1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <child>
-                      <object class="GtkGrid" id="grid1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">4</property>
-                        <property name="margin_right">4</property>
-                        <property name="margin_top">4</property>
-                        <property name="margin_bottom">4</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Id:</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="sensor_id">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">4</property>
-                            <property name="margin_right">4</property>
-                            <property name="margin_top">4</property>
-                            <property name="margin_bottom">4</property>
-                            <property name="hexpand">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">N/A</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="details_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Details</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
-                    <property name="x_padding">14</property>
-                    <property name="y_padding">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="xpad">10</property>
-                    <property name="label" translatable="yes">Name:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
-                    <property name="x_padding">4</property>
-                    <property name="y_padding">4</property>
+                    <property name="top_attach">11</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -568,12 +556,4 @@
       <action-widget response="0">btn_cancel</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkListStore" id="sensors_liststore">
-    <columns>
-      <!-- column-name Name -->
-      <column type="gchararray"/>
-      <!-- column-name Sensor -->
-      <column type="gpointer"/>
-    </columns>
-  </object>
 </interface>
diff --git a/src/graph.c b/src/graph.c
index d8ca848..7205e63 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -25,7 +25,7 @@
 #include <gtk/gtk.h>
 
 #include "cfg.h"
-#include "log.h"
+#include <plog.h>
 #include "psensor.h"
 
 /* horizontal padding */
@@ -266,12 +266,12 @@ graph_update(struct psensor **sensors,
 	mint = get_min_temp(enabled_sensors);
 	strmin = psensor_value_to_str(SENSOR_TYPE_TEMP,
 				      mint,
-				      config->temperature_unit == CELCIUS);
+				      config->temperature_unit == CELSIUS);
 
 	maxt = get_max_temp(enabled_sensors);
 	strmax = psensor_value_to_str(SENSOR_TYPE_TEMP,
 				      maxt,
-				      config->temperature_unit == CELCIUS);
+				      config->temperature_unit == CELSIUS);
 
 	str_btime = time_to_str(get_graph_begin_time_s(config));
 	str_etime = time_to_str(get_graph_end_time_s());
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 03ffdc8..df0c5eb 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -7,7 +7,7 @@ libpsensor_a_SOURCES = \
 	cpu.h \
 	hdd.h hdd_hddtemp.c\
 	lmsensor.h lmsensor.c \
-	log.h log.c \
+	plog.h plog.c \
 	measure.h measure.c \
 	ptime.h ptime.c \
 	nvidia.h \
@@ -49,4 +49,4 @@ endif
 EXTRA_DIST=$(libpsensor_a_SOURCES) \
 	amd.c \
 	cpu.c \
-	nvidia.c
\ No newline at end of file
+	nvidia.c
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index d366e16..d9cd76d 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -79,7 +79,7 @@ ARFLAGS = cru
 libpsensor_a_AR = $(AR) $(ARFLAGS)
 libpsensor_a_LIBADD =
 am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c cpu.h \
-	hdd.h hdd_hddtemp.c lmsensor.h lmsensor.c log.h log.c \
+	hdd.h hdd_hddtemp.c lmsensor.h lmsensor.c plog.h plog.c \
 	measure.h measure.c ptime.h ptime.c nvidia.h psensor.h \
 	psensor.c pio.h pio.c slog.c slog.h url.c url.h hdd_atasmart.c \
 	nvidia.c amd.c cpu.c psensor_json.h psensor_json.c
@@ -89,7 +89,7 @@ am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c cpu.h \
 @GTOP_TRUE@am__objects_4 = cpu.$(OBJEXT)
 @JSON_TRUE@am__objects_5 = psensor_json.$(OBJEXT)
 am_libpsensor_a_OBJECTS = color.$(OBJEXT) hdd_hddtemp.$(OBJEXT) \
-	lmsensor.$(OBJEXT) log.$(OBJEXT) measure.$(OBJEXT) \
+	lmsensor.$(OBJEXT) plog.$(OBJEXT) measure.$(OBJEXT) \
 	ptime.$(OBJEXT) psensor.$(OBJEXT) pio.$(OBJEXT) slog.$(OBJEXT) \
 	url.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
 	$(am__objects_3) $(am__objects_4) $(am__objects_5)
@@ -199,6 +199,7 @@ 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@
@@ -268,7 +269,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libpsensor.a
 libpsensor_a_SOURCES = amd.h bool.h color.h color.c cpu.h hdd.h \
-	hdd_hddtemp.c lmsensor.h lmsensor.c log.h log.c measure.h \
+	hdd_hddtemp.c lmsensor.h lmsensor.c plog.h plog.c measure.h \
 	measure.c ptime.h ptime.c nvidia.h psensor.h psensor.c pio.h \
 	pio.c slog.c slog.h url.c url.h $(am__append_1) \
 	$(am__append_4) $(am__append_7) $(am__append_8) \
@@ -334,10 +335,10 @@ distclean-compile:
 @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)/log.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)/pio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plog.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@
diff --git a/src/lib/amd.c b/src/lib/amd.c
index 0cc2b35..e83f5f1 100644
--- a/src/lib/amd.c
+++ b/src/lib/amd.c
@@ -69,9 +69,7 @@ static void *getprocaddress(void *plibrary, const char *name)
 	return dlsym(plibrary, name);
 }
 
-/*
-  Returns the temperature (Celcius) of an AMD/ATI GPU.
-*/
+/* Returns the temperature (Celsius) of an AMD/ATI GPU. */
 static double get_temp(struct psensor *sensor)
 {
 	ADLTemperature v;
diff --git a/src/lib/cpu.c b/src/lib/cpu.c
index e7704f2..9f26db9 100644
--- a/src/lib/cpu.c
+++ b/src/lib/cpu.c
@@ -41,7 +41,11 @@ struct psensor *create_cpu_usage_sensor(int measures_len)
 	label = strdup("cpu usage");
 	type = SENSOR_TYPE_CPU_USAGE;
 
-	psensor = psensor_create(id, label, strdup("CPU"), type, measures_len);
+	psensor = psensor_create(id,
+				 label,
+				 strdup(_("CPU")),
+				 type,
+				 measures_len);
 
 	return psensor;
 }
diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c
index 8da5c85..f3e6619 100644
--- a/src/lib/hdd_atasmart.c
+++ b/src/lib/hdd_atasmart.c
@@ -37,7 +37,7 @@
 
 #include "pio.h"
 #include "hdd.h"
-#include "log.h"
+#include <plog.h>
 
 static int filter_sd(const char *p)
 {
@@ -54,7 +54,7 @@ create_sensor(char *id, char *name, SkDisk *disk, int values_max_length)
 
 	s = psensor_create(id,
 			   strdup(name),
-			   strdup("HDD"),
+			   strdup(_("Disk")),
 			   t,
 			   values_max_length);
 
diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c
index 613b701..3e692f0 100644
--- a/src/lib/hdd_hddtemp.c
+++ b/src/lib/hdd_hddtemp.c
@@ -119,7 +119,7 @@ create_sensor(char *id, char *name, int values_max_length)
 
 	t = SENSOR_TYPE_HDD | SENSOR_TYPE_HDDTEMP | SENSOR_TYPE_TEMP;
 
-	return psensor_create(id, name, strdup("HDD"),
+	return psensor_create(id, name, strdup(_("Disk")),
 			      t,
 			      values_max_length);
 }
diff --git a/src/lib/lmsensor.c b/src/lib/lmsensor.c
index 99ce552..1708f18 100644
--- a/src/lib/lmsensor.c
+++ b/src/lib/lmsensor.c
@@ -145,15 +145,15 @@ lmsensor_psensor_create(const sensors_chip_name *chip,
 	sprintf(id, "lmsensor %s %s", name, label);
 
 	if (!strcmp(chip->prefix, "coretemp"))
-		cname = strdup("Intel CPU");
+		cname = strdup(_("Intel CPU"));
 	else if (!strcmp(chip->prefix, "k10temp")
 		 || !strcmp(chip->prefix, "k8temp")
 		 || !strcmp(chip->prefix, "fam15h_power"))
-		cname = strdup("AMD CPU");
+		cname = strdup(_("AMD CPU"));
 	else if (!strcmp(chip->prefix, "nouveau"))
-		cname = strdup("Nvidia GPU");
+		cname = strdup(_("NVIDIA GPU"));
 	else if (!strcmp(chip->prefix, "via-cputemp"))
-		cname = strdup("VIA CPU");
+		cname = strdup(_("VIA CPU"));
 	else
 		cname = strdup(chip->prefix);
 
diff --git a/src/lib/log.c b/src/lib/log.c
deleted file mode 100644
index 9df4629..0000000
--- a/src/lib/log.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#define _LARGEFILE_SOURCE 1
-#include "config.h"
-
-#include <locale.h>
-#include <libintl.h>
-#define _(str) gettext(str)
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <time.h>
-
-#include "log.h"
-#include "ptime.h"
-
-static FILE *file;
-int log_level =  LOG_WARN;
-
-void log_open(const char *path)
-{
-	file = fopen(path, "a");
-
-	if (!file)
-		log_printf(LOG_ERR, _("Cannot open log file: %s"), path);
-}
-
-void log_close()
-{
-	if (!file)
-		return ;
-
-	fclose(file);
-
-	file = NULL;
-}
-
-
-#define LOG_BUFFER 4096
-static void vlogf(int lvl, const char *fmt, va_list ap)
-{
-	char buffer[1 + LOG_BUFFER];
-	char *lvl_str, *t;
-	FILE *stdf;
-
-	if (lvl > LOG_INFO && (!file || lvl > log_level))
-		return ;
-
-	vsnprintf(buffer, LOG_BUFFER, fmt, ap);
-	buffer[LOG_BUFFER] = '\0';
-
-	switch (lvl) {
-	case LOG_WARN:
-		lvl_str = "[WARN]";
-		break;
-	case LOG_ERR:
-		lvl_str = "[ERR]";
-		break;
-	case LOG_DEBUG:
-		lvl_str = "[DEBUG]";
-		break;
-	case LOG_INFO:
-		lvl_str = "[INFO]";
-		break;
-	default:
-		lvl_str = "[??]";
-	}
-
-	t = get_time_str();
-	if (!t)
-		return ;
-
-	if (file && lvl <= log_level) {
-		fprintf(file, "[%s] %s %s\n", t, lvl_str, buffer);
-		fflush(file);
-	} else {
-		t = NULL;
-	}
-
-	if (lvl <= LOG_INFO) {
-		if (lvl == LOG_WARN || lvl == LOG_ERR)
-			stdf = stderr;
-		else
-			stdf = stdout;
-
-
-		fprintf(stdf, "[%s] %s %s\n", t, lvl_str, buffer);
-	}
-
-	free(t);
-}
-
-void log_printf(int lvl, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vlogf(lvl, fmt, ap);
-	va_end(ap);
-}
-
-void log_debug(const char *fmt, ...)
-{
-	va_list ap;
-
-	if (log_level < LOG_DEBUG)
-		return ;
-
-	va_start(ap, fmt);
-	vlogf(LOG_DEBUG, fmt, ap);
-	va_end(ap);
-}
-
-void log_err(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vlogf(LOG_ERR, fmt, ap);
-	va_end(ap);
-}
-
-void log_warn(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vlogf(LOG_WARN, fmt, ap);
-	va_end(ap);
-}
-
-void log_info(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vlogf(LOG_INFO, fmt, ap);
-	va_end(ap);
-}
diff --git a/src/lib/log.h b/src/lib/log.h
deleted file mode 100644
index 30a904b..0000000
--- a/src/lib/log.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#ifndef _PSENSOR_LOG_H_
-#define _PSENSOR_LOG_H_
-
-enum log_level {
-	LOG_ERR ,
-	LOG_WARN,
-	LOG_INFO,
-	LOG_DEBUG
-};
-
-void log_open(const char *path);
-
-void log_printf(int lvl, const char *fmt, ...);
-void log_debug(const char *fmt, ...);
-void log_err(const char *fmt, ...);
-void log_info(const char *fmt, ...);
-void log_warn(const char *fmt, ...);
-
-void log_close();
-
-/* level of the log file. */
-extern int log_level;
-
-#endif
diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c
index 9910521..4f411e9 100644
--- a/src/lib/nvidia.c
+++ b/src/lib/nvidia.c
@@ -33,9 +33,7 @@
 
 Display *display;
 
-/*
-  Returns the temperature (Celcius) of a NVidia GPU.
-*/
+/* Returns the temperature (Celsius) of a NVIDIA GPU. */
 static int get_temp(struct psensor *sensor)
 {
 	int temp;
@@ -65,14 +63,14 @@ static struct psensor *create_sensor(int id, int values_len)
 
 	sprintf(name, "GPU%d", id);
 
-	sid = malloc(strlen("nvidia") + 1 + strlen(name) + 1);
-	sprintf(sid, "nvidia %s", name);
+	sid = malloc(strlen("NVIDIA") + 1 + strlen(name) + 1);
+	sprintf(sid, "NVIDIA %s", name);
 
 	t = SENSOR_TYPE_NVCTRL | SENSOR_TYPE_GPU | SENSOR_TYPE_TEMP;
 
 	s = psensor_create(sid,
 			   strdup(name),
-			   strdup("Nvidia GPU"),
+			   strdup(_("NVIDIA GPU")),
 			   t,
 			   values_len);
 
@@ -83,9 +81,9 @@ static struct psensor *create_sensor(int id, int values_len)
 
 /*
   Opens connection to X server and returns the number
-  of NVidia GPUs.
+  of NVIDIA GPUs.
 
-  Return 0 if no NVidia gpus or cannot get information.
+  Return 0 if no NVIDIA gpus or cannot get information.
 */
 static int init()
 {
diff --git a/src/lib/pio.c b/src/lib/pio.c
index cf92139..4a1a6ce 100644
--- a/src/lib/pio.c
+++ b/src/lib/pio.c
@@ -19,25 +19,66 @@
 #define _LARGEFILE_SOURCE 1
 #include "config.h"
 
-#include <stdlib.h>
+#include <dirent.h>
 #include <stdio.h>
-#include <sys/stat.h>
+#include <stdlib.h>
 #include <string.h>
-#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <plog.h>
+#include <pio.h>
 
-#include "pio.h"
+/* Directory separator is \ when cross-compiling for MS Windows
+   systems */
+#if defined(__MINGW32__)
+#define DIRSEP ('\\')
+#else
+#define DIRSEP '/'
+#endif
 
-static char *path_append(const char *dir, const char *path)
+#define FCOPY_BUF_SZ 4096
+
+int is_dir(const char *path)
 {
-	char *result;
+	struct stat st;
 
-	result = malloc(strlen(dir) + 1 + strlen(path) + 1);
+	int ret = lstat(path, &st);
 
-	strcpy(result, dir);
-	strcat(result, "/");
-	strcat(result, path);
+	if (ret == 0 && S_ISDIR(st.st_mode))
+		return 1;
 
-	return result;
+	return 0;
+}
+
+int is_file(const char *path)
+{
+	struct stat st;
+
+	int ret = lstat(path, &st);
+
+	if (ret == 0 && S_ISREG(st.st_mode))
+		return 1;
+
+	return 0;
+}
+
+char *dir_normalize(const char *dpath)
+{
+	char *npath;
+	int n;
+
+	if (!dpath || !strlen(dpath))
+		return NULL;
+
+	npath = strdup(dpath);
+
+	n = strlen(npath);
+
+	if (n > 1 && npath[n - 1] == '/')
+		npath[n - 1] = '\0';
+
+	return npath;
 }
 
 static char **paths_add(char **paths, int n, char *path)
@@ -106,3 +147,197 @@ void paths_free(char **paths)
 
 	free(paths);
 }
+
+char *file_get_content(const char *fpath)
+{
+	long size;
+
+	char *page;
+
+	size = file_get_size(fpath);
+	if (size == -1) {
+		page = NULL;
+
+	} else if (size == 0) {
+		page = malloc(1);
+		*page = '\0';
+
+	} else {
+		FILE *fp = fopen(fpath, "rb");
+		if (fp) {
+			page = malloc(size + 1);
+			if (!page || size != fread(page, 1, size, fp)) {
+				free(page);
+				return NULL;
+			}
+
+			*(page + size) = '\0';
+
+			fclose(fp);
+		} else {
+			page = NULL;
+		}
+	}
+
+	return page;
+}
+
+long file_get_size(const char *path)
+{
+	FILE *fp;
+
+	if (!is_file(path))
+		return -1;
+
+	fp = fopen(path, "rb");
+	if (fp) {
+		long size;
+
+		if (fseek(fp, 0, SEEK_END) == -1)
+			return -1;
+
+		size = ftell(fp);
+
+		fclose(fp);
+
+		return size;
+	}
+
+	return -1;
+}
+
+#define FCOPY_BUF_SZ 4096
+static int FILE_copy(FILE *src, FILE *dst)
+{
+	int ret = 0;
+	char *buf = malloc(FCOPY_BUF_SZ);
+	int n;
+
+	if (!buf)
+		return FILE_COPY_ERROR_ALLOC_BUFFER;
+
+	while (!ret) {
+		n = fread(buf, 1, FCOPY_BUF_SZ, src);
+		if (n) {
+			if (fwrite(buf, 1, n, dst) != n)
+				ret = FILE_COPY_ERROR_WRITE;
+		} else {
+			if (!feof(src))
+				ret = FILE_COPY_ERROR_READ;
+			else
+				break;
+		}
+	}
+
+	free(buf);
+
+	return ret;
+}
+
+int
+file_copy(const char *src, const char *dst)
+{
+	FILE *fsrc, *fdst;
+	int ret = 0;
+
+	log_fct("copy %s to %s", src, dst);
+
+	fsrc = fopen(src, "r");
+
+	if (fsrc) {
+		fdst = fopen(dst, "w+");
+
+		if (fdst) {
+			ret = FILE_copy(fsrc, fdst);
+			fclose(fdst);
+		} else {
+			ret = FILE_COPY_ERROR_OPEN_DST;
+		}
+
+		fclose(fsrc);
+	} else {
+		ret = FILE_COPY_ERROR_OPEN_SRC;
+	}
+
+	return ret;
+}
+
+char *path_append(const char *dir, const char *path)
+{
+	char *ret, *ndir;
+
+	ndir = dir_normalize(dir);
+
+	if (!ndir && (!path || !strlen(path)))
+		ret = NULL;
+
+	else if (!ndir) {
+		ret = strdup(path);
+
+	} else if (!path || !strlen(path)) {
+		return ndir;
+
+	} else {
+		ret = malloc(strlen(ndir) + 1 + strlen(path) + 1);
+		strcpy(ret, ndir);
+		strcat(ret, "/");
+		strcat(ret, path);
+	}
+
+	free(ndir);
+
+	return ret;
+}
+
+void mkdirs(const char *dirs, mode_t mode)
+{
+	char *c, *dir;
+	int i;
+
+	log_fct("mkdirs %s", dirs);
+
+	c = (char *)dirs;
+	dir = malloc(strlen(dirs) + 1);
+
+	i = 0;
+	while (*c) {
+		if ((*c == DIRSEP || *c == '\0') && c != dirs) {
+			strncpy(dir, dirs, i);
+			dir[i] = '\0';
+			mkdir(dir, mode);
+		}
+
+		c++;
+		i++;
+	}
+
+	mkdir(dirs, mode);
+
+	free(dir);
+}
+
+void
+file_copy_print_error(int code, const char *src, const char *dst)
+{
+	switch (code) {
+	case 0:
+		break;
+	case FILE_COPY_ERROR_OPEN_SRC:
+		printf("File copy error: failed to open %s.\n", src);
+		break;
+	case FILE_COPY_ERROR_OPEN_DST:
+		printf("File copy error: failed to open %s.\n", dst);
+		break;
+	case FILE_COPY_ERROR_READ:
+		printf("File copy error: failed to read %s.\n", src);
+		break;
+	case FILE_COPY_ERROR_WRITE:
+		printf("File copy error: failed to write %s.\n", src);
+		break;
+	case FILE_COPY_ERROR_ALLOC_BUFFER:
+		printf("File copy error: failed to allocate buffer.\n");
+		break;
+	default:
+		printf("File copy error: unknown error %d.\n", code);
+	}
+}
diff --git a/src/lib/pio.h b/src/lib/pio.h
index 808a0cc..26867f8 100644
--- a/src/lib/pio.h
+++ b/src/lib/pio.h
@@ -1,25 +1,77 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
+    Copyright (C) 2010-2014 jeanfi@gmail.com
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA
+*/
+
 #ifndef _P_IO_H
 #define _P_IO_H
 
+#define P_IO_VER 3
+
+/* Returns '1' if a given 'path' denotates a directory else returns
+   0 */
+int is_dir(const char *path);
+
+/* Returns '1' if a given 'path' denotates a file else returns
+   0 */
+int is_file(const char *path);
+
+/*  Returns a normalized path */
+char *path_normalize(const char *dpath);
+
+/*  Returns the null-terminated entries of a directory */
 char **dir_list(const char *dpath, int (*filter) (const char *path));
 void paths_free(char **paths);
 
+char *path_append(const char *dir, const char *path);
+
+/*
+   Returns the size of a file.
+   Returns '-1' if the size cannot be retrieved or not a file.
+*/
+long file_get_size(const char *path);
+
+/*
+   Returns the content of a file.
+   Returns 'NULL' if the file cannot be read or failed to allocate
+   enough memory.
+   Returns an empty string if the file exists but is empty.
+*/
+char *file_get_content(const char *path);
+
+enum file_copy_error {
+	FILE_COPY_ERROR_OPEN_SRC = 1,
+	FILE_COPY_ERROR_OPEN_DST,
+	FILE_COPY_ERROR_READ,
+	FILE_COPY_ERROR_WRITE,
+	FILE_COPY_ERROR_ALLOC_BUFFER
+};
+
+void file_copy_print_error(int code, const char *src, const char *dst);
+
+/*
+  Copy a file.
+
+  Returns '0' if sucessfull, otherwise return the error code.
+*/
+int file_copy(const char *src, const char *dst);
+
+int dir_rcopy(const char *, const char *);
+
+void mkdirs(const char *dirs, mode_t mode);
+
 #endif
diff --git a/src/lib/plog.c b/src/lib/plog.c
new file mode 100644
index 0000000..21427a9
--- /dev/null
+++ b/src/lib/plog.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#define _LARGEFILE_SOURCE 1
+#include "config.h"
+
+#include <locale.h>
+#include <libintl.h>
+#define _(str) gettext(str)
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <time.h>
+
+#include <plog.h>
+#include <ptime.h>
+
+static FILE *file;
+int log_level =  LOG_WARN;
+
+void log_open(const char *path)
+{
+	file = fopen(path, "a");
+
+	if (!file)
+		log_printf(LOG_ERR, _("Cannot open log file: %s"), path);
+}
+
+void log_close()
+{
+	if (!file)
+		return ;
+
+	fclose(file);
+
+	file = NULL;
+}
+
+
+#define LOG_BUFFER 4096
+static void vlogf(int lvl, const char *fct, const char *fmt, va_list ap)
+{
+	char buffer[1 + LOG_BUFFER];
+	char *lvl_str, *t;
+	FILE *stdf;
+
+	if (lvl > LOG_INFO && (!file || lvl > log_level))
+		return ;
+
+	vsnprintf(buffer, LOG_BUFFER, fmt, ap);
+	buffer[LOG_BUFFER] = '\0';
+
+	switch (lvl) {
+	case LOG_WARN:
+		lvl_str = "[WARN]";
+		break;
+	case LOG_ERR:
+		lvl_str = "[ERR]";
+		break;
+	case LOG_DEBUG:
+		lvl_str = "[DEBUG]";
+		break;
+	case LOG_INFO:
+		lvl_str = "[INFO]";
+		break;
+	default:
+		lvl_str = "[??]";
+	}
+
+	t = get_current_ISO8601_time();
+	if (!t)
+		return ;
+
+	if (file && lvl <= log_level) {
+		if (fct)
+			fprintf(file,
+				"[%s] %s %s(): %s\n", t, lvl_str, fct, buffer);
+		else
+			fprintf(file, "[%s] %s %s\n", t, lvl_str, buffer);
+		fflush(file);
+	} else {
+		t = NULL;
+	}
+
+	if (lvl <= LOG_INFO) {
+		if (lvl == LOG_WARN || lvl == LOG_ERR)
+			stdf = stderr;
+		else
+			stdf = stdout;
+
+		if (fct)
+			fprintf(file,
+				"[%s] %s %s(): %s\n", t, lvl_str, fct, buffer);
+		else
+			fprintf(stdf, "[%s] %s %s\n", t, lvl_str, buffer);
+	}
+
+	free(t);
+}
+
+void log_printf(int lvl, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vlogf(lvl, NULL, fmt, ap);
+	va_end(ap);
+}
+
+void log_debug(const char *fmt, ...)
+{
+	va_list ap;
+
+	if (log_level < LOG_DEBUG)
+		return ;
+
+	va_start(ap, fmt);
+	vlogf(LOG_DEBUG, NULL, fmt, ap);
+	va_end(ap);
+}
+
+void log_err(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vlogf(LOG_ERR, NULL, fmt, ap);
+	va_end(ap);
+}
+
+void log_warn(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vlogf(LOG_WARN, NULL, fmt, ap);
+	va_end(ap);
+}
+
+void log_info(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vlogf(LOG_INFO, NULL, fmt, ap);
+	va_end(ap);
+}
+
+void _log(const char *fct, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vlogf(LOG_DEBUG, fct, fmt, ap);
+	va_end(ap);
+}
diff --git a/src/lib/plog.h b/src/lib/plog.h
new file mode 100644
index 0000000..29880e9
--- /dev/null
+++ b/src/lib/plog.h
@@ -0,0 +1,49 @@
+/*
+  Copyright (C) 2010-2014 jeanfi@gmail.com
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301 USA
+ */
+#ifndef _P_LOG_H_
+#define _P_LOG_H_
+
+#define P_LOG_VER 2
+
+enum log_level {
+	LOG_ERR ,
+	LOG_WARN,
+	LOG_INFO,
+	LOG_DEBUG
+};
+
+void log_open(const char *path);
+void log_close();
+
+void log_printf(int lvl, const char *fmt, ...);
+void log_debug(const char *fmt, ...);
+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, ...);
+
+#define log_fct(...) _log(__func__, __VA_ARGS__)
+#define log_fct_enter() log_fct("ENTER")
+#define log_fct_exit() log_fct("EXIT")
+
+/* level of the log file. */
+extern int log_level;
+
+#endif
diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 8b92c01..348885a 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -209,18 +209,18 @@ int is_fan_type(unsigned int type)
 	return type & SENSOR_TYPE_FAN;
 }
 
-double celcius_to_fahrenheit(double c)
+double celsius_to_fahrenheit(double c)
 {
 	return c * (9.0/5.0) + 32;
 }
 
-double fahrenheit_to_celcius(double f)
+double fahrenheit_to_celsius(double f)
 {
 	return (f - 32) * (5.0/9.0);
 }
 
 char *
-psensor_value_to_str(unsigned int type, double value, int use_celcius)
+psensor_value_to_str(unsigned int type, double value, int use_celsius)
 {
 	char *str;
 	const char *unit;
@@ -231,10 +231,10 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius)
 	 */
 	str = malloc(20);
 
-	unit = psensor_type_to_unit_str(type, use_celcius);
+	unit = psensor_type_to_unit_str(type, use_celsius);
 
-	if (is_temp_type(type) && !use_celcius)
-		value = celcius_to_fahrenheit(value);
+	if (is_temp_type(type) && !use_celsius)
+		value = celsius_to_fahrenheit(value);
 
 	sprintf(str, "%.0f%s", value, unit);
 
@@ -244,9 +244,9 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius)
 char *
 psensor_measure_to_str(const struct measure *m,
 		       unsigned int type,
-		       unsigned int use_celcius)
+		       unsigned int use_celsius)
 {
-	return psensor_value_to_str(type, m->value, use_celcius);
+	return psensor_value_to_str(type, m->value, use_celsius);
 }
 
 void psensor_set_current_value(struct psensor *sensor, double value)
@@ -437,8 +437,12 @@ struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
 
 const char *psensor_type_to_str(unsigned int type)
 {
-	if (type & SENSOR_TYPE_NVCTRL)
-		return "NVidia GPU";
+	if (type & SENSOR_TYPE_NVCTRL) {
+		if (type & SENSOR_TYPE_TEMP)
+			return "NVIDIA GPU Temperature";
+		else
+			return "NVIDIA GPU";
+	}
 
 	if (type & SENSOR_TYPE_ATIADL) {
 		if (type & SENSOR_TYPE_TEMP)
@@ -471,10 +475,10 @@ const char *psensor_type_to_str(unsigned int type)
 }
 
 
-const char *psensor_type_to_unit_str(unsigned int type, int use_celcius)
+const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
 {
 	if (is_temp_type(type)) {
-		if (use_celcius)
+		if (use_celsius)
 			return "\302\260C";
 		else
 			return "\302\260F";
@@ -541,11 +545,11 @@ struct psensor **psensor_list_copy(struct psensor **sensors)
 }
 
 char *
-psensor_current_value_to_str(const struct psensor *s, unsigned int celcius)
+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),
-				    celcius);
+				    use_celsius);
 }
 
 struct psensor **psensor_list_filter_graph_enabled(struct psensor **sensors)
diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 292525a..cb30cb9 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -28,7 +28,7 @@
 
 #include "bool.h"
 #include "color.h"
-#include "log.h"
+#include <plog.h>
 #include "measure.h"
 
 enum psensor_type {
@@ -169,11 +169,11 @@ psensor_get_max_current_value(struct psensor **sensors, unsigned int type);
 */
 char *psensor_value_to_str(unsigned int type,
 			   double value,
-			   int use_celcius);
+			   int use_celsius);
 
 char *psensor_measure_to_str(const struct measure *m,
 			     unsigned int type,
-			     unsigned int use_celcius);
+			     unsigned int use_celsius);
 
 struct psensor **get_all_sensors(int use_libatasmart, int values_max_length);
 
@@ -195,7 +195,7 @@ struct measure *psensor_get_current_measure(struct psensor *sensor);
 */
 const char *psensor_type_to_str(unsigned int type);
 
-const char *psensor_type_to_unit_str(unsigned int type, int use_celcius);
+const char *psensor_type_to_unit_str(unsigned int type, int use_celsius);
 
 void psensor_list_update_measures(struct psensor **sensors);
 
@@ -205,8 +205,8 @@ void psensor_cleanup();
 
 double get_max_value(struct psensor **sensors, int type);
 
-double celcius_to_fahrenheit(double c);
-double fahrenheit_to_celcius(double c);
+double celsius_to_fahrenheit(double c);
+double fahrenheit_to_celsius(double c);
 
 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 d97a620..2402c1a 100644
--- a/src/lib/psensor_json.c
+++ b/src/lib/psensor_json.c
@@ -140,9 +140,9 @@ struct psensor *psensor_new_from_json(json_object *o,
 	struct psensor *s;
 	char *eid, *url;
 
-	oid = json_object_object_get(o, "id");
-	oname = json_object_object_get(o, "name");
-	otype = json_object_object_get(o, "type");
+	json_object_object_get_ex(o, "id", &oid);
+	json_object_object_get_ex(o, "name", &oname);
+	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);
diff --git a/src/lib/ptime.c b/src/lib/ptime.c
index 95c3342..2c06c7c 100644
--- a/src/lib/ptime.c
+++ b/src/lib/ptime.c
@@ -1,36 +1,74 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
+  Copyright (C) 2010-2014 jeanfi@gmail.com
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301 USA
  */
 #include <stdlib.h>
+#include <string.h>
+
+#include <ptime.h>
+
+const int P_TIME_VER = 2;
+
+static const int ISO8601_TIME_LENGTH = 19; /* YYYY-MM-DDThh:mm:ss */
+static const int ISO8601_DATE_LENGTH = 10; /* YYYY-MM-DD */
+
+char *time_to_ISO8601_time(time_t *t)
+{
+	struct tm lt;
 
-#include "ptime.h"
+	memset(&lt, 0, sizeof(struct tm));
+	if (!gmtime_r(t, &lt))
+		return NULL;
 
-char *time_to_str(time_t *t)
+	return tm_to_ISO8601_time(&lt);
+}
+
+char *time_to_ISO8601_date(time_t *t)
 {
 	struct tm lt;
+
+	memset(&lt, 0, sizeof(struct tm));
+	if (!gmtime_r(t, &lt))
+		return NULL;
+
+	return tm_to_ISO8601_date(&lt);
+}
+
+char *tm_to_ISO8601_date(struct tm *tm)
+{
 	char *str;
 
-	if (!localtime_r(t, &lt))
+	str = malloc(ISO8601_DATE_LENGTH + 1);
+
+	if (strftime(str, ISO8601_DATE_LENGTH + 1, "%F", tm)) {
+		return str;
+	} else {
+		free(str);
 		return NULL;
+	}
+}
+
+char *tm_to_ISO8601_time(struct tm *tm)
+{
+	char *str;
 
-	str = malloc(64);
+	str = malloc(ISO8601_TIME_LENGTH + 1);
 
-	if (strftime(str, 64, "%s", &lt)) {
+	if (strftime(str, ISO8601_TIME_LENGTH + 1, "%FT%T", tm)) {
 		return str;
 	} else {
 		free(str);
@@ -38,10 +76,10 @@ char *time_to_str(time_t *t)
 	}
 }
 
-char *get_time_str()
+char *get_current_ISO8601_time()
 {
 	time_t t;
 
 	t = time(NULL);
-	return time_to_str(&t);
+	return time_to_ISO8601_time(&t);
 }
diff --git a/src/lib/ptime.h b/src/lib/ptime.h
index 63e1e80..eac7342 100644
--- a/src/lib/ptime.h
+++ b/src/lib/ptime.h
@@ -21,7 +21,14 @@
 
 #include <time.h>
 
-char *get_time_str();
-char *time_to_str(time_t *t);
+extern const int P_TIME_VER;
+
+char *get_current_ISO8601_time();
+
+char *time_to_ISO8601_time(time_t *);
+char *time_to_ISO8601_date(time_t *);
+
+char *tm_to_ISO8601_date(struct tm *);
+char *tm_to_ISO8601_time(struct tm *);
 
 #endif
diff --git a/src/lib/slog.c b/src/lib/slog.c
index cb2b124..99eb536 100644
--- a/src/lib/slog.c
+++ b/src/lib/slog.c
@@ -33,7 +33,7 @@
 
 #include "bool.h"
 #include "config.h"
-#include "log.h"
+#include <plog.h>
 #include "ptime.h"
 #include "slog.h"
 
@@ -47,6 +47,24 @@ static time_t st;
 
 static const char *DEFAULT_FILENAME = "sensors.log";
 
+static char *time_to_str(time_t *t)
+{
+	struct tm lt;
+	char *str;
+
+	if (!localtime_r(t, &lt))
+		return NULL;
+
+	str = malloc(64);
+
+	if (strftime(str, 64, "%s", &lt)) {
+		return str;
+	} else {
+		free(str);
+		return NULL;
+	}
+}
+
 static char *get_default_path()
 {
 	char *home, *path, *dir;
diff --git a/src/main.c b/src/main.c
index 89a2177..99d249e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -77,7 +77,7 @@ static void print_version()
 	printf(_("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 "
+		 "This is free software: you are free to change and"
 		 " redistribute it.\n"
 		 "There is NO WARRANTY, to the extent permitted by law.\n"),
 	       "2010-2014");
@@ -219,7 +219,7 @@ gboolean ui_refresh_thread(gpointer data)
 #ifdef HAVE_UNITY
 	ui_unity_launcher_entry_update(ui->sensors,
 				       !cfg->unity_launcher_count_disabled,
-				       cfg->temperature_unit == CELCIUS);
+				       cfg->temperature_unit == CELSIUS);
 #endif
 
 	if (ui->graph_update_interval != cfg->graph_update_interval) {
@@ -266,7 +266,7 @@ static void associate_colors(struct psensor **sensors)
 	int i;
 	struct color c;
 
-	for (cur = sensors, i = 0; *cur; cur++) {
+	for (cur = sensors, i = 0; *cur; cur++, i++) {
 		color_set(&c,
 			  colors[i % COLORS_COUNT][0],
 			  colors[i % COLORS_COUNT][1],
diff --git a/src/notify_cmd.c b/src/notify_cmd.c
index 84b12d5..dfc1be1 100644
--- a/src/notify_cmd.c
+++ b/src/notify_cmd.c
@@ -20,14 +20,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "notify_cmd.h"
-#include "cfg.h"
+#include <notify_cmd.h>
+#include <cfg.h>
 
 void notify_cmd(struct psensor *s)
 {
-	char *script;
-	char *v;
-	char *cmd;
+	char *script, *v, *cmd;
 	int ret;
 
 	script = config_get_notif_script();
@@ -35,14 +33,21 @@ 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+strlen(v)+1);
+		cmd = malloc(strlen(script)
+			     + 1
+			     + 1
+			     + strlen(s->id)
+			     + 1
+			     + strlen(v)
+			     + 1);
+
 		sprintf(cmd, "%s \"%s\" %s", script, s->id, v);
 
-		log_debug("execute cmd: %s", cmd);
+		log_fct("execute cmd: %s", cmd);
 
 		ret = system(cmd);
 
-		log_debug("cmd returns: %d", ret);
+		log_fct("cmd returns: %d", ret);
 
 		free(cmd);
 		free(v);
diff --git a/src/psensor.1 b/src/psensor.1
index 20560d3..696b918 100644
--- a/src/psensor.1
+++ b/src/psensor.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH PSENSOR "1" "April 2014" "psensor 0.8.0.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH PSENSOR "1" "June 2014" "psensor 1.0.1" "User Commands"
 .SH NAME
 psensor \- Temperature monitoring application
 .SH SYNOPSIS
@@ -38,7 +38,7 @@ psensor home page: <http://wpitchoune.net/psensor>
 Copyright \(co 2010\-2014 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.
+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"
 
diff --git a/src/psensor.schemas b/src/psensor.schemas
index fac4391..70c81fc 100644
--- a/src/psensor.schemas
+++ b/src/psensor.schemas
@@ -175,7 +175,7 @@
       <default>0</default>
       <locale name="C">
 	<short>The displayed temperature unit</short>
-	<long>The displayed temperature unit, '0' for Celcius, '1' for Fahenrenheit.</long>
+        <long>The displayed temperature unit, '0' for Celsius, '1' for Fahenrenheit.</long>
       </locale>
     </schema>    
 
diff --git a/src/pxdg.c b/src/pxdg.c
new file mode 100644
index 0000000..7c3cffa
--- /dev/null
+++ b/src/pxdg.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <glib.h>
+
+#include <pio.h>
+#include <plog.h>
+
+static const char *KEY_GNOME_AUTOSTART = "X-GNOME-Autostart-enabled";
+
+static char *get_user_autostart_dir()
+{
+	const char *xdg_cfg_dir;
+
+	xdg_cfg_dir = g_get_user_config_dir();
+
+	log_fct("g_user_config_dir(): %s", xdg_cfg_dir);
+
+	return path_append(xdg_cfg_dir, "autostart");
+}
+
+static char *get_user_desktop_file()
+{
+	char *dir, *path;
+
+	dir = get_user_autostart_dir();
+	path = path_append(dir, "psensor.desktop");
+
+	free(dir);
+
+	return path;
+}
+
+static const char *get_desktop_file()
+{
+	return DATADIR"/applications/psensor.desktop";
+}
+
+static int is_file_exists(const char *path)
+{
+	struct stat st;
+
+	return stat(path, &st) == 0;
+}
+
+static GKeyFile *get_key_file(const char *path)
+{
+	GKeyFile *kfile;
+	int ret;
+
+	kfile = g_key_file_new();
+	ret = g_key_file_load_from_file(kfile,
+					path,
+					G_KEY_FILE_KEEP_COMMENTS
+					| G_KEY_FILE_KEEP_TRANSLATIONS,
+					NULL);
+
+	if (ret) {
+		return kfile;
+	} else {
+		log_err("Failed to parse: %s", path);
+
+		g_key_file_free(kfile);
+		return NULL;
+	}
+}
+
+static int is_user_desktop_autostarted(GKeyFile *f)
+{
+	return (!g_key_file_has_key(f,
+				    G_KEY_FILE_DESKTOP_GROUP,
+				    KEY_GNOME_AUTOSTART,
+				    NULL))
+		|| g_key_file_get_boolean(f,
+					  G_KEY_FILE_DESKTOP_GROUP,
+					  KEY_GNOME_AUTOSTART,
+					  NULL);
+}
+
+int pxdg_is_autostarted()
+{
+	char *user_desktop;
+	unsigned int ret;
+	GKeyFile *kfile;
+
+	log_fct_enter();
+
+	user_desktop = get_user_desktop_file();
+
+	log_fct("user desktop file: %s", user_desktop);
+
+	ret = is_file_exists(user_desktop);
+
+	if (!ret) {
+		log_fct("user desktop file does not exist.");
+	} else {
+		log_fct("user desktop file exist.");
+		if (ret) {
+			kfile = get_key_file(user_desktop);
+			if (kfile)
+				ret = is_user_desktop_autostarted(kfile);
+			else
+				ret = -1;
+		}
+		g_key_file_free(kfile);
+	}
+
+	free(user_desktop);
+
+	log_fct_exit();
+
+	return ret;
+}
+
+static void enable_gnome_autostart(const char *path)
+{
+	GKeyFile *f;
+	char *data;
+
+	f = get_key_file(path);
+	if (f) {
+		if (g_key_file_has_key(f,
+				       G_KEY_FILE_DESKTOP_GROUP,
+				       KEY_GNOME_AUTOSTART,
+				       NULL))
+			g_key_file_set_boolean(f,
+					       G_KEY_FILE_DESKTOP_GROUP,
+					       KEY_GNOME_AUTOSTART,
+					       TRUE);
+		data = g_key_file_to_data(f, NULL, NULL);
+		g_file_set_contents(path, data, -1, NULL);
+
+		g_key_file_free(f);
+	} else {
+		log_err("Fail to enable %s", KEY_GNOME_AUTOSTART);
+	}
+}
+
+void pxdg_set_autostart(unsigned int enable)
+{
+	char *user_desktop;
+
+	log_fct_enter();
+
+	user_desktop = get_user_desktop_file();
+
+	log_fct("user desktop file: %s", user_desktop);
+
+	log_fct("desktop file: %s", get_desktop_file());
+
+	if (enable) {
+		if (!is_file_exists(user_desktop))
+			file_copy(get_desktop_file(), user_desktop);
+		enable_gnome_autostart(user_desktop);
+	} else {
+		/* because X-GNOME-Autostart-enabled does not turn off
+		 * autostart on all Desktop Envs. */
+		remove(user_desktop);
+	}
+
+	log_fct_exit();
+
+	free(user_desktop);
+}
diff --git a/src/pxdg.h b/src/pxdg.h
new file mode 100644
index 0000000..78aa571
--- /dev/null
+++ b/src/pxdg.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#ifndef _PXDG_H_
+#define _PXDG_H_
+
+/*
+ * returns:
+ *  - 1 if psensor is currently launch during session startup.
+ *  - 0 if psensor is not currently launch during session startup.
+ *  - -1 if it cannot be determined.
+ */
+int pxdg_is_autostarted();
+void pxdg_set_autostart(unsigned int);
+
+#endif
diff --git a/src/server/Makefile.in b/src/server/Makefile.in
index 0e05ef3..f240f32 100644
--- a/src/server/Makefile.in
+++ b/src/server/Makefile.in
@@ -212,6 +212,7 @@ 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@
diff --git a/src/server/description.txt b/src/server/description.txt
index 744dc8c..a0b2cd8 100644
--- a/src/server/description.txt
+++ b/src/server/description.txt
@@ -79,7 +79,7 @@ log.
 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 Celcius unit.
+are using Celsius unit.
 
 The value is written only if it has changed.
 
diff --git a/src/server/psensor-server.1 b/src/server/psensor-server.1
index e149839..b2f6593 100644
--- a/src/server/psensor-server.1
+++ b/src/server/psensor-server.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH PSENSOR-SERVER "1" "April 2014" "psensor-server 0.8.0.6" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH PSENSOR-SERVER "1" "June 2014" "psensor-server 1.0.1" "User Commands"
 .SH NAME
 psensor-server \- Temperature and system monitoring Web server
 .SH SYNOPSIS
@@ -110,7 +110,7 @@ log.
 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 Celcius unit.
+are using Celsius unit.
 
 The value is written only if it has changed.
 
diff --git a/src/server/server.c b/src/server/server.c
index f4557d8..55649b8 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -42,7 +42,7 @@
 #include "cpu.h"
 #endif
 
-#include "log.h"
+#include <plog.h>
 #include "psensor_json.h"
 #include "url.h"
 #include "server.h"
diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 49ca58f..c8887c2 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -75,12 +75,12 @@ void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
 }
 
 static void
-update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius)
+update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celsius)
 {
 	gchar *str;
 	char *v;
 
-	v = psensor_current_value_to_str(s, use_celcius);
+	v = psensor_current_value_to_str(s, use_celsius);
 
 	str = g_strdup_printf("%s: %s", s->name, v);
 
@@ -90,7 +90,7 @@ update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius)
 	g_free(str);
 }
 
-static void update_menu_items(int use_celcius)
+static void update_menu_items(int use_celsius)
 {
 	struct psensor **s;
 	GtkMenuItem **m;
@@ -99,20 +99,19 @@ static void update_menu_items(int use_celcius)
 		return ;
 
 	for (s = sensors, m = menu_items; *s; s++, m++)
-		update_menu_item(*m, *s, use_celcius);
+		update_menu_item(*m, *s, use_celsius);
 }
 
 static void
-build_sensor_menu_items(const struct ui_psensor *ui,
-			GtkMenu *menu)
+build_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
 {
-	int i, j, n, celcius;
+	int i, j, n, celsius;
 	const char *name;
 	struct psensor **sorted_sensors;
 
 	free(menu_items);
 
-	celcius  = ui->config->temperature_unit == CELCIUS;
+	celsius  = ui->config->temperature_unit == CELSIUS;
 
 	sorted_sensors = ui_get_sensors_ordered_by_position(ui);
 	n = psensor_list_size(sorted_sensors);
@@ -130,7 +129,7 @@ build_sensor_menu_items(const struct ui_psensor *ui,
 					      GTK_WIDGET(menu_items[j]),
 					      j+2);
 
-			update_menu_item(menu_items[j], sensors[j], celcius);
+			update_menu_item(menu_items[j], sensors[j], celsius);
 
 			j++;
 		}
@@ -172,6 +171,58 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 	return GTK_WIDGET(menu);
 }
 
+static void update_label(struct ui_psensor *ui)
+{
+	char *label, *str, *tmp, *guide;
+	struct psensor **p;
+
+	p =  ui_get_sensors_ordered_by_position(ui);
+	label = NULL;
+	guide = NULL;
+	while (*p) {
+		if (config_is_appindicator_label_enabled((*p)->id)) {
+			str = psensor_current_value_to_str
+				(*p, ui->config->temperature_unit == CELSIUS);
+
+			if (label == NULL) {
+				label = str;
+			} else {
+				tmp = malloc(strlen(label)
+					     + 1
+					     + strlen(str)
+					     + 1);
+				sprintf(tmp, "%s %s", label, str);
+				free(label);
+				free(str);
+				label = tmp;
+			}
+
+			if (is_temp_type((*p)->type))
+				str = "999UUU";
+			else if (is_fan_type((*p)->type))
+				str = "999UUU";
+			else /* cpu load */
+				str = "999%";
+
+			if (guide == NULL) {
+				guide = strdup(str);
+			} else {
+				tmp = malloc(strlen(guide)
+					     + 1
+					     + strlen(str)
+					     + 1);
+				sprintf(tmp, "%sW%s", guide, str);
+				free(guide);
+				guide = tmp;
+			}
+
+		}
+		p++;
+	}
+
+	app_indicator_set_label(indicator, label, guide);
+}
+
 void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
 {
 	AppIndicatorStatus status;
@@ -179,6 +230,8 @@ void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
 	if (!indicator)
 		return;
 
+	update_label(ui);
+
 	status = app_indicator_get_status(indicator);
 
 	if (!attention && status == APP_INDICATOR_STATUS_ATTENTION)
@@ -189,7 +242,7 @@ void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
 		app_indicator_set_status(indicator,
 					 APP_INDICATOR_STATUS_ATTENTION);
 
-	update_menu_items(ui->config->temperature_unit == CELCIUS);
+	update_menu_items(ui->config->temperature_unit == CELSIUS);
 }
 
 static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
diff --git a/src/ui_notify.c b/src/ui_notify.c
index 7e7217d..6361f06 100644
--- a/src/ui_notify.c
+++ b/src/ui_notify.c
@@ -40,7 +40,7 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui)
 	char *body, *svalue;
 	const char *summary;
 	NotifyNotification *notif;
-	unsigned int use_celcius;
+	unsigned int use_celsius;
 
 	log_debug("last_notification %d", last_notification_tv.tv_sec);
 
@@ -59,15 +59,15 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui)
 		notify_init("psensor");
 
 	if (notify_is_initted() == TRUE) {
-		if (ui->config->temperature_unit == CELCIUS)
-			use_celcius = 1;
+		if (ui->config->temperature_unit == CELSIUS)
+			use_celsius = 1;
 		else
-			use_celcius = 0;
+			use_celsius = 0;
 
 		svalue = psensor_measure_to_str
 			(psensor_get_current_measure(sensor),
 			 sensor->type,
-			 use_celcius);
+			 use_celsius);
 
 		body = malloc(strlen(sensor->name) + 3 + strlen(svalue) + 1);
 		sprintf(body, "%s : %s", sensor->name, svalue);
diff --git a/src/ui_pref.c b/src/ui_pref.c
index aae6556..4dd4bf8 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -23,6 +23,7 @@
 #include "cfg.h"
 #include "ui_pref.h"
 #include "ui_color.h"
+#include <pxdg.h>
 
 GdkColor *color_to_gdkcolor(struct color *color)
 {
@@ -51,7 +52,7 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	GtkComboBox *w_sensorlist_pos;
 	GtkToggleButton *w_hide_window_decoration, *w_keep_window_below,
 		*w_enable_menu, *w_enable_launcher_counter, *w_hide_on_startup,
-		*w_win_restore, *w_slog_enabled;
+		*w_win_restore, *w_slog_enabled, *w_autostart;
 	GtkComboBoxText *w_temp_unit;
 	GtkEntry *w_notif_script;
 	char *notif_script;
@@ -126,6 +127,10 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	gtk_toggle_button_set_active(w_keep_window_below,
 				     cfg->window_keep_below_enabled);
 
+	w_autostart = GTK_TOGGLE_BUTTON
+		(gtk_builder_get_object(builder, "autostart"));
+	gtk_toggle_button_set_active(w_autostart, pxdg_is_autostarted());
+
 	w_enable_menu = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "enable_menu"));
 	gtk_toggle_button_set_active(w_enable_menu, !cfg->menu_bar_disabled);
@@ -240,6 +245,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
 		config_save(cfg);
 
+		pxdg_set_autostart(gtk_toggle_button_get_active(w_autostart));
+
 		pthread_mutex_unlock(&ui->sensors_mutex);
 
 		ui_window_update(ui);
diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 1a0aa83..f7200c1 100644
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -95,7 +95,7 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	gboolean valid;
-	int use_celcius;
+	int use_celsius;
 	GtkListStore *store;
 
 	if (complete)
@@ -104,7 +104,7 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
 	model = gtk_tree_view_get_model(ui->sensors_tree);
 	store = ui->sensors_store;
 
-	use_celcius = ui->config->temperature_unit == CELCIUS;
+	use_celsius = ui->config->temperature_unit == CELSIUS;
 
 	valid = gtk_tree_model_get_iter_first(model, &iter);
 	while (valid) {
@@ -112,9 +112,9 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
 
 		value = psensor_value_to_str(s->type,
 					     psensor_get_current_value(s),
-					     use_celcius);
-		min = psensor_value_to_str(s->type, s->min, use_celcius);
-		max = psensor_value_to_str(s->type, s->max, use_celcius);
+					     use_celsius);
+		min = psensor_value_to_str(s->type, s->min, use_celsius);
+		max = psensor_value_to_str(s->type, s->max, use_celsius);
 
 		gtk_list_store_set(store, &iter,
 				   COL_TEMP, value,
diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 4337c53..463deda 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -44,6 +44,7 @@ struct sensor_pref {
 	int alarm_high_threshold;
 	int alarm_low_threshold;
 	unsigned int appindicator_enabled;
+	unsigned int appindicator_label_enabled;
 };
 
 struct cb_data {
@@ -64,17 +65,19 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
 	p->alarm_enabled = s->alarm_enabled;
 	p->color = color_dup(s->color);
 
-	if (cfg->temperature_unit == CELCIUS) {
+	if (cfg->temperature_unit == CELSIUS) {
 		p->alarm_high_threshold = s->alarm_high_threshold;
 		p->alarm_low_threshold = s->alarm_low_threshold;
 	} else {
 		p->alarm_high_threshold
-			= celcius_to_fahrenheit(s->alarm_high_threshold);
+			= celsius_to_fahrenheit(s->alarm_high_threshold);
 		p->alarm_low_threshold
-			= celcius_to_fahrenheit(s->alarm_low_threshold);
+			= celsius_to_fahrenheit(s->alarm_low_threshold);
 	}
 
 	p->appindicator_enabled = s->appindicator_enabled;
+	p->appindicator_label_enabled
+		= config_is_appindicator_label_enabled(s->id);
 
 	return p;
 }
@@ -106,7 +109,7 @@ static struct sensor_pref *get_selected_sensor_pref(GtkTreeView *tree)
 	return pref;
 }
 
-static void on_name_changed(GtkEntry *entry, gpointer data)
+void ui_sensorpref_name_changed_cb(GtkEntry *entry, gpointer data)
 {
 	struct sensor_pref *p;
 	const char *str;
@@ -121,7 +124,7 @@ static void on_name_changed(GtkEntry *entry, gpointer data)
 	}
 }
 
-static void on_drawed_toggled(GtkToggleButton *btn, gpointer data)
+void ui_sensorpref_draw_toggled_cb(GtkToggleButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -131,7 +134,7 @@ static void on_drawed_toggled(GtkToggleButton *btn, gpointer data)
 		p->enabled = gtk_toggle_button_get_active(btn);
 }
 
-static void on_alarm_toggled(GtkToggleButton *btn, gpointer data)
+void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -141,7 +144,8 @@ static void on_alarm_toggled(GtkToggleButton *btn, gpointer data)
 		p->alarm_enabled = gtk_toggle_button_get_active(btn);
 }
 
-static void on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
+void
+ui_sensorpref_appindicator_menu_toggled_cb(GtkToggleButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -151,7 +155,19 @@ static void on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
 		p->appindicator_enabled = gtk_toggle_button_get_active(btn);
 }
 
-static void on_color_set(GtkColorButton *widget, gpointer data)
+void
+ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data)
+{
+	struct sensor_pref *p;
+
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+
+	if (p)
+		p->appindicator_label_enabled
+			= gtk_toggle_button_get_active(btn);
+}
+
+void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data)
 {
 	struct sensor_pref *p;
 	GdkColor color;
@@ -164,7 +180,8 @@ static void on_color_set(GtkColorButton *widget, gpointer data)
 	}
 }
 
-static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
+void
+ui_sensorpref_alarm_high_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -174,7 +191,8 @@ static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
 		p->alarm_high_threshold = gtk_spin_button_get_value(btn);
 }
 
-static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data)
+void
+ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -184,51 +202,19 @@ static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data)
 		p->alarm_low_threshold = gtk_spin_button_get_value(btn);
 }
 
-static void connect_signals(GtkBuilder *builder, GtkTreeView *tree)
-{
-	g_signal_connect(gtk_builder_get_object(builder, "sensor_name"),
-			 "changed", G_CALLBACK(on_name_changed), tree);
-
-	g_signal_connect(gtk_builder_get_object(builder, "sensor_draw"),
-			 "toggled", G_CALLBACK(on_drawed_toggled), tree);
-
-	g_signal_connect(gtk_builder_get_object(builder, "sensor_color"),
-			 "color-set", G_CALLBACK(on_color_set), tree);
-
-	g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"),
-			 "toggled", G_CALLBACK(on_alarm_toggled), tree);
-
-	g_signal_connect(gtk_builder_get_object(builder,
-						"sensor_alarm_high_threshold"),
-			 "value-changed",
-			 G_CALLBACK(on_alarm_high_threshold_changed),
-			 tree);
-
-	g_signal_connect(gtk_builder_get_object(builder,
-						"sensor_alarm_low_threshold"),
-			 "value-changed",
-			 G_CALLBACK(on_alarm_low_threshold_changed),
-			 tree);
-
-	g_signal_connect(gtk_builder_get_object(builder,
-						"indicator_checkbox"),
-			 "toggled",
-			 G_CALLBACK(on_appindicator_toggled),
-			 tree);
-}
-
 static void
 update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 {
 	GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit,
 		*w_chipname;
 	GtkEntry *w_name;
-	GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled;
+	GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled,
+		*w_appindicator_label_enabled;
 	GtkColorButton *w_color;
 	GtkSpinButton *w_high_threshold, *w_low_threshold;
 	GdkColor *color;
 	struct psensor *s;
-	int use_celcius;
+	int use_celsius;
 
 	s = p->sensor;
 
@@ -272,16 +258,19 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 					(builder,
 					 "sensor_alarm_low_threshold_unit"));
 
-	use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0;
+	use_celsius = cfg->temperature_unit == CELSIUS ? 1 : 0;
 	gtk_label_set_text(w_high_threshold_unit,
 			   psensor_type_to_unit_str(s->type,
-						    use_celcius));
+						    use_celsius));
 	gtk_label_set_text(w_low_threshold_unit,
 			   psensor_type_to_unit_str(s->type,
-						    use_celcius));
+						    use_celsius));
 
 	w_appindicator_enabled = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "indicator_checkbox"));
+	w_appindicator_label_enabled = GTK_TOGGLE_BUTTON
+		(gtk_builder_get_object(builder, "indicator_label_checkbox"));
+
 
 	if (is_temp_type(s->type) || is_fan_type(s->type)) {
 		gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
@@ -303,6 +292,9 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 
 	gtk_toggle_button_set_active(w_appindicator_enabled,
 				     p->appindicator_enabled);
+
+	gtk_toggle_button_set_active(w_appindicator_label_enabled,
+				     p->appindicator_label_enabled);
 }
 
 static void on_changed(GtkTreeSelection *selection, gpointer data)
@@ -359,9 +351,9 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
 
 	if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {
 		s->alarm_high_threshold
-			= fahrenheit_to_celcius(p->alarm_high_threshold);
+			= fahrenheit_to_celsius(p->alarm_high_threshold);
 		s->alarm_low_threshold
-			= fahrenheit_to_celcius(p->alarm_low_threshold);
+			= fahrenheit_to_celsius(p->alarm_low_threshold);
 	} else {
 		s->alarm_high_threshold = p->alarm_high_threshold;
 		s->alarm_low_threshold = p->alarm_low_threshold;
@@ -383,6 +375,9 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
 		config_set_appindicator_enabled(s->id, s->appindicator_enabled);
 	}
 
+	config_set_appindicator_label_enabled(s->id,
+					      p->appindicator_label_enabled);
+
 	config_set_sensor_position(s->id, pos);
 }
 
@@ -440,7 +435,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 	w_sensors_list
 		= GTK_TREE_VIEW(gtk_builder_get_object(builder,
 						       "sensors_list"));
-	connect_signals(builder, w_sensors_list);
+	gtk_builder_connect_signals(builder, w_sensors_list);
 
 	store = GTK_LIST_STORE(gtk_builder_get_object(builder,
 						      "sensors_liststore"));
diff --git a/src/ui_status.c b/src/ui_status.c
index ddaf75c..60814d6 100644
--- a/src/ui_status.c
+++ b/src/ui_status.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
-#include "log.h"
+#include <plog.h>
 #include "ui_status.h"
 
 static const char *ICON = "psensor_normal";
diff --git a/src/ui_unity.c b/src/ui_unity.c
index adeacc0..17ee29d 100644
--- a/src/ui_unity.c
+++ b/src/ui_unity.c
@@ -18,7 +18,7 @@
  */
 #include <unity.h>
 
-#include "psensor.h"
+#include <ui_unity.h>
 
 static int initialized;
 static UnityLauncherEntry *psensor_entry;
@@ -26,11 +26,10 @@ static unsigned int last_visible = -1;
 
 void ui_unity_launcher_entry_update(struct psensor **sensors,
 				    unsigned int show,
-				    int use_celcius)
+				    int use_celsius)
 {
 	double v;
 
-
 	if (!initialized) {
 		psensor_entry = unity_launcher_entry_get_for_desktop_file
 			("psensor.desktop");
@@ -52,8 +51,8 @@ void ui_unity_launcher_entry_update(struct psensor **sensors,
 	if (sensors && *sensors) {
 		v = psensor_get_max_current_value(sensors, SENSOR_TYPE_TEMP);
 
-		if (!use_celcius)
-			v = celcius_to_fahrenheit(v);
+		if (!use_celsius)
+			v = celsius_to_fahrenheit(v);
 
 		unity_launcher_entry_set_count(psensor_entry, v);
 	}
diff --git a/src/ui_unity.h b/src/ui_unity.h
index 15045e8..d4c79a5 100644
--- a/src/ui_unity.h
+++ b/src/ui_unity.h
@@ -19,10 +19,10 @@
 #ifndef _PSENSOR_UI_UNITY_H_
 #define _PSENSOR_UI_UNITY_H_
 
-#include "psensor.h"
+#include <psensor.h>
 
 void ui_unity_launcher_entry_update(struct psensor **sensors,
 				    unsigned int show,
-				    int use_celcius);
+				    int use_celsius);
 
 #endif
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 554305d..332c0a2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,7 +29,9 @@ endif
 
 test_io_dir_list_SOURCES = test_io_dir_list.c
 test_psensor_type_to_unit_str_SOURCES = test_psensor_type_to_unit_str.c
+test_psensor_type_to_unit_str_CFLAGS = -I$(top_srcdir)/src/lib
 test_psensor_value_to_str_SOURCES = test_psensor_value_to_str.c
+test_psensor_value_to_str_CFLAGS = -I$(top_srcdir)/src/lib
 test_url_encode_SOURCES = test_url_encode.c
 test_url_normalize_SOURCES = test_url_normalize.c
 
@@ -41,4 +43,4 @@ TESTS = test-io-dir-list.sh \
 
 if CPPCHECK
 TESTS += test-cppcheck.sh
-endif
\ No newline at end of file
+endif
diff --git a/tests/Makefile.in b/tests/Makefile.in
index fa88ff7..d896f52 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -73,16 +73,21 @@ CONFIG_CLEAN_VPATH_FILES =
 am_test_io_dir_list_OBJECTS = test_io_dir_list.$(OBJEXT)
 test_io_dir_list_OBJECTS = $(am_test_io_dir_list_OBJECTS)
 test_io_dir_list_LDADD = $(LDADD)
-am_test_psensor_type_to_unit_str_OBJECTS =  \
-	test_psensor_type_to_unit_str.$(OBJEXT)
+am_test_psensor_type_to_unit_str_OBJECTS = test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.$(OBJEXT)
 test_psensor_type_to_unit_str_OBJECTS =  \
 	$(am_test_psensor_type_to_unit_str_OBJECTS)
 test_psensor_type_to_unit_str_LDADD = $(LDADD)
+test_psensor_type_to_unit_str_LINK = $(CCLD) \
+	$(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_test_psensor_value_to_str_OBJECTS =  \
-	test_psensor_value_to_str.$(OBJEXT)
+	test_psensor_value_to_str-test_psensor_value_to_str.$(OBJEXT)
 test_psensor_value_to_str_OBJECTS =  \
 	$(am_test_psensor_value_to_str_OBJECTS)
 test_psensor_value_to_str_LDADD = $(LDADD)
+test_psensor_value_to_str_LINK = $(CCLD) \
+	$(test_psensor_value_to_str_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_test_url_encode_OBJECTS = test_url_encode.$(OBJEXT)
 test_url_encode_OBJECTS = $(am_test_url_encode_OBJECTS)
 test_url_encode_LDADD = $(LDADD)
@@ -202,6 +207,7 @@ 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@
@@ -276,7 +282,9 @@ EXTRA_DIST = checkpatch.pl \
 AM_CPPFLAGS = -Wall -Werror
 test_io_dir_list_SOURCES = test_io_dir_list.c
 test_psensor_type_to_unit_str_SOURCES = test_psensor_type_to_unit_str.c
+test_psensor_type_to_unit_str_CFLAGS = -I$(top_srcdir)/src/lib
 test_psensor_value_to_str_SOURCES = test_psensor_value_to_str.c
+test_psensor_value_to_str_CFLAGS = -I$(top_srcdir)/src/lib
 test_url_encode_SOURCES = test_url_encode.c
 test_url_normalize_SOURCES = test_url_normalize.c
 all: all-am
@@ -321,10 +329,10 @@ test-io-dir-list$(EXEEXT): $(test_io_dir_list_OBJECTS) $(test_io_dir_list_DEPEND
 	$(LINK) $(test_io_dir_list_OBJECTS) $(test_io_dir_list_LDADD) $(LIBS)
 test-psensor-type-to-unit-str$(EXEEXT): $(test_psensor_type_to_unit_str_OBJECTS) $(test_psensor_type_to_unit_str_DEPENDENCIES) $(EXTRA_test_psensor_type_to_unit_str_DEPENDENCIES) 
 	@rm -f test-psensor-type-to-unit-str$(EXEEXT)
-	$(LINK) $(test_psensor_type_to_unit_str_OBJECTS) $(test_psensor_type_to_unit_str_LDADD) $(LIBS)
+	$(test_psensor_type_to_unit_str_LINK) $(test_psensor_type_to_unit_str_OBJECTS) $(test_psensor_type_to_unit_str_LDADD) $(LIBS)
 test-psensor-value-to-str$(EXEEXT): $(test_psensor_value_to_str_OBJECTS) $(test_psensor_value_to_str_DEPENDENCIES) $(EXTRA_test_psensor_value_to_str_DEPENDENCIES) 
 	@rm -f test-psensor-value-to-str$(EXEEXT)
-	$(LINK) $(test_psensor_value_to_str_OBJECTS) $(test_psensor_value_to_str_LDADD) $(LIBS)
+	$(test_psensor_value_to_str_LINK) $(test_psensor_value_to_str_OBJECTS) $(test_psensor_value_to_str_LDADD) $(LIBS)
 test-url-encode$(EXEEXT): $(test_url_encode_OBJECTS) $(test_url_encode_DEPENDENCIES) $(EXTRA_test_url_encode_DEPENDENCIES) 
 	@rm -f test-url-encode$(EXEEXT)
 	$(LINK) $(test_url_encode_OBJECTS) $(test_url_encode_LDADD) $(LIBS)
@@ -339,8 +347,8 @@ 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.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_psensor_value_to_str.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@
 
@@ -358,6 +366,34 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
+test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o: test_psensor_type_to_unit_str.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c
+
+test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj: test_psensor_type_to_unit_str.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi`
+
+test_psensor_value_to_str-test_psensor_value_to_str.o: test_psensor_value_to_str.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.o -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c
+
+test_psensor_value_to_str-test_psensor_value_to_str.obj: test_psensor_value_to_str.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi`
+
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
diff --git a/tests/test_psensor_type_to_unit_str.c b/tests/test_psensor_type_to_unit_str.c
index ddd2abe..981e90d 100644
--- a/tests/test_psensor_type_to_unit_str.c
+++ b/tests/test_psensor_type_to_unit_str.c
@@ -29,11 +29,11 @@
 #include "../src/lib/psensor.h"
 
 static int
-test_fct(unsigned int type, int use_celcius, const char *ref)
+test_fct(unsigned int type, int use_celsius, const char *ref)
 {
 	const char *u;
 
-	u = psensor_type_to_unit_str(type, use_celcius);
+	u = psensor_type_to_unit_str(type, use_celsius);
 	if (strcmp(ref, u)) {
 		fprintf(stderr, "returns: %s expected: %s\n", u, ref);
 		return 0;
diff --git a/tests/test_psensor_value_to_str.c b/tests/test_psensor_value_to_str.c
index 780c815..5d08867 100644
--- a/tests/test_psensor_value_to_str.c
+++ b/tests/test_psensor_value_to_str.c
@@ -24,18 +24,18 @@
 
 #include "../src/lib/psensor.h"
 
-#define CELCIUS "\302\260C"
+#define CELSIUS "\302\260C"
 #define FAHRENHEIT "\302\260F"
 
 static int
 test_psensor_value_to_str(unsigned int type,
 			  double value,
-			  int celcius,
+			  int celsius,
 			  const char *ref)
 {
 	char *str;
 
-	str = psensor_value_to_str(type, value, celcius);
+	str = psensor_value_to_str(type, value, celsius);
 	if (strcmp(ref, str)) {
 		fprintf(stderr, "returns: %s expected: %s\n", str, ref);
 		return 1;
@@ -49,13 +49,13 @@ int main(int argc, char **argv)
 	int errs;
 
 	errs = test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13, 1,
-					 "13"CELCIUS);
+					 "13"CELSIUS);
 	errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13, 0,
 					  "55"FAHRENHEIT);
 	errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13.4, 1,
-					  "13"CELCIUS);
+					  "13"CELSIUS);
 	errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13.5, 1,
-					  "14"CELCIUS);
+					  "14"CELSIUS);
 
 	if (errs) 
 		exit(EXIT_FAILURE);
diff --git a/www/Makefile.in b/www/Makefile.in
index dbffe57..1c1ad73 100644
--- a/www/Makefile.in
+++ b/www/Makefile.in
@@ -184,6 +184,7 @@ 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@