From 77fbc451078b7c4bf9cd4884814f0f087e87dd77 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Sat, 19 Apr 2014 11:18:46 +0200
Subject: [PATCH] sensors displayed directly in the top bar.

---
 NEWS                        |  6 +++
 NEWS.html                   | 95 ++++++++++++++++++++++++++++++++-------------
 po/Makefile.in              |  6 +--
 po/de.po                    | 38 ++++++++++++++++--
 po/es.po                    | 51 +++++++++++++++++-------
 po/fr.po                    | 38 ++++++++++++++++--
 po/hu.po                    | 38 ++++++++++++++++--
 po/it.po                    | 38 ++++++++++++++++--
 po/lv.po                    | 38 ++++++++++++++++--
 po/nl.po                    | 38 ++++++++++++++++--
 po/psensor.pot              | 35 +++++++++++++++--
 po/pt_BR.po                 | 35 +++++++++++++++--
 po/ru.po                    | 38 ++++++++++++++++--
 po/sl.po                    | 35 +++++++++++++++--
 po/sr.po                    | 35 +++++++++++++++--
 po/tr.po                    | 38 ++++++++++++++++--
 po/uk.po                    | 35 +++++++++++++++--
 po/zh_CN.po                 | 38 ++++++++++++++++--
 src/cfg.c                   | 24 ++++++++++++
 src/cfg.h                   |  3 ++
 src/glade/sensor-edit.glade | 53 ++++++++++++++++++-------
 src/ui_appindicator.c       | 30 ++++++++++----
 src/ui_sensorpref.c         | 79 ++++++++++++++++++-------------------
 23 files changed, 714 insertions(+), 150 deletions(-)
diff --git a/NEWS b/NEWS
index 75ffc7f..936da9b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 Psensor NEWS
 ============
 
+v0.8.0.7
+--------
+
+* smaller and more consistent with ubuntu themes appindicator icons.
+* sensors displayed directly in the top bar.
+
 v0.8.0.6
 --------
 
diff --git a/NEWS.html b/NEWS.html
index ba5f0c6..d35053d 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,47 @@ asciidoc.install();
 </div>
 <div id="content">
 <div class="sect1">
+<h2 id="_v0_8_0_7">v0.8.0.7</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.
+</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 +437,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 +561,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 +611,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 +731,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>
@@ -882,22 +925,22 @@ psensor: temperature unit choice (celcius/fahrenheit).
 </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>
@@ -1087,7 +1130,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 +1153,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 +1165,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 +1204,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 +1332,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 +1354,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 +1466,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 +1650,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 +1672,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 +1806,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 +2012,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 +2517,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-04-19 11:17:37 CEST
 </div>
 </div>
 </body>
diff --git a/po/Makefile.in b/po/Makefile.in
index 0ea07b3..9da54e6 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /home/jporsini/work/psensor/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work.local/psensor/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/psensor/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/psensor/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 
diff --git a/po/de.po b/po/de.po
index 7cff987..d9910da 100644
--- a/po/de.po
+++ b/po/de.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-04-19 10:21+0200\n"
 "PO-Revision-Date: 2013-10-20 09:56+0000\n"
 "Last-Translator: Dennis Baudys <Unknown>\n"
 "Language-Team: German\n"
@@ -88,6 +88,14 @@ msgstr "Fensterposition und -grÃ¶Ãe merken"
 msgid "Temperature unit:"
 msgstr "Temperatureinheit:"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "BenutzeroberflÃ¤che"
@@ -165,6 +173,23 @@ msgstr "Bei Alarm auszufÃ¼hrendes Skript"
 msgid "Sensors"
 msgstr "Sensoren"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "Sensoreinstellungen bearbeiten"
@@ -212,11 +237,13 @@ msgid "Low threshold:"
 msgstr "Untere Grenze:"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Ubuntu-Anwendungsindikator"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "Sensor im IndikatormenÃ¼ fÃ¼r Anwendungen zeigen"
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +262,11 @@ msgstr "Details"
 msgid "Name:"
 msgstr "Name:"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Sensor im IndikatormenÃ¼ fÃ¼r Anwendungen zeigen"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: ADL-Bibliothek konnte nicht gefunden werden."
diff --git a/po/es.po b/po/es.po
index a3e0f4e..9d0dc00 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-04-19 10:21+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"
@@ -88,6 +88,14 @@ msgstr "Restaurar tamaÃ±o y posiciÃ³n de la ventana"
 msgid "Temperature unit:"
 msgstr "Unidad de temperatura"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "Interfaz"
@@ -165,6 +173,24 @@ msgstr ""
 msgid "Sensors"
 msgstr "Sensores"
 
+#: src/glade/psensor-pref.glade:797
+#, fuzzy
+msgctxt "psensor"
+msgid "Right"
+msgstr "Derecha"
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr "Izquierda"
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr "Arriba"
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr "Abajo"
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "Editar Ajustes Sensores"
@@ -212,11 +238,13 @@ msgid "Low threshold:"
 msgstr "LÃ­mite inferior"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Indicador de aplicaciÃ³n de Ubuntu"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "Mostrar sensor en el menÃº de aplicaciones"
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +263,11 @@ msgstr "Detalles"
 msgid "Name:"
 msgstr "Nombre:"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Mostrar sensor en el menÃº de aplicaciones"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: no se ha encontrado la librerÃ­a ADL"
@@ -673,17 +706,5 @@ msgstr "Desconocido"
 #~ 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.po b/po/fr.po
index a2b8b77..3fafb73 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-04-19 10:21+0200\n"
 "PO-Revision-Date: 2013-06-29 15:14+0000\n"
 "Last-Translator: londumas <helion331990@gmail.com>\n"
 "Language-Team: French <>\n"
@@ -88,6 +88,14 @@ msgstr "RÃ©tablir la position et la taille de la fenÃªtre"
 msgid "Temperature unit:"
 msgstr "UnitÃ© de tempÃ©rature :"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "Interface"
@@ -165,6 +173,23 @@ msgstr ""
 msgid "Sensors"
 msgstr "Capteurs"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "PrÃ©fÃ©rences des capteurs"
@@ -212,11 +237,13 @@ msgid "Low threshold:"
 msgstr "Seuil infÃ©rieur :"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Indicateur d'application d'Ubuntu"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "Afficher le capteur dans le menu de l'indicateur d'application"
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +262,11 @@ msgstr "DÃ©tails"
 msgid "Name:"
 msgstr "Nom :"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Afficher le capteur dans le menu de l'indicateur d'application"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD : impossible de trouver la bibliothÃ¨que ADL."
diff --git a/po/hu.po b/po/hu.po
index 1de2b8c..47de701 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-04-19 10:21+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"
@@ -89,6 +89,14 @@ msgstr "Ablak pozÃ­ciÃ³jÃ¡nak Ã©s mÃ©retÃ©nek visszaÃ¡llÃ­tÃ¡sa"
 msgid "Temperature unit:"
 msgstr "HÅmÃ©rsÃ©klet mÃ©rtÃ©kegysÃ©ge:"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "FelÃ¼let"
@@ -166,6 +174,23 @@ msgstr ""
 msgid "Sensors"
 msgstr "ÃrzÃ©kelÅk"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "ÃrzÃ©kelÅ beÃ¡llÃ­tÃ¡sainak szerkesztÃ©se"
@@ -213,11 +238,13 @@ msgid "Low threshold:"
 msgstr "AlsÃ³ kÃ¼szÃ¶bÃ©rtÃ©k:"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Ubuntu AlkalmazÃ¡smenÃ¼"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "ÃrzÃ©kelÅk megjelenÃ­tÃ©se az alkalmazÃ¡smenÃ¼ben"
 
 #: src/glade/sensor-edit.glade:444
@@ -236,6 +263,11 @@ msgstr "RÃ©szletek"
 msgid "Name:"
 msgstr "NÃ©v:"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "ÃrzÃ©kelÅk megjelenÃ­tÃ©se az alkalmazÃ¡smenÃ¼ben"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: Nem sikerÃ¼lt betÃ¶lteni az ADL programkÃ¶nyvtÃ¡rat."
diff --git a/po/it.po b/po/it.po
index 56315bc..4a14e7b 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-04-19 10:21+0200\n"
 "PO-Revision-Date: 2013-04-14 16:06+0000\n"
 "Last-Translator: Diego Pierotto <Unknown>\n"
 "Language-Team: Italian\n"
@@ -88,6 +88,14 @@ msgstr "Ripristina posizione e dimensione della finestra"
 msgid "Temperature unit:"
 msgstr "UnitÃ  di misura della temperatura"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "Interfaccia"
@@ -165,6 +173,23 @@ msgstr ""
 msgid "Sensors"
 msgstr "Sensori"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "Modifica preferenze del sensore"
@@ -212,11 +237,13 @@ msgid "Low threshold:"
 msgstr "Soglia verso il basso"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Indicatore Applicazione Ubuntu"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "Mostra sensore nel menu indicatore Applicazione"
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +262,11 @@ msgstr "Dettagli"
 msgid "Name:"
 msgstr "Nome:"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Mostra sensore nel menu indicatore Applicazione"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: impossibile trovare la libreria ADL"
diff --git a/po/lv.po b/po/lv.po
index 2b7b70a..a47a6ea 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-04-19 10:21+0200\n"
 "PO-Revision-Date: 2013-10-24 12:32+0000\n"
 "Last-Translator: tuxmaniack <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -88,6 +88,14 @@ msgstr "Atjaunot loga pozÄ«ciju un izmÄru"
 msgid "Temperature unit:"
 msgstr "TemperatÅ«ras mÄrvienÄ«ba:"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "Saskarne"
@@ -165,6 +173,23 @@ msgstr "Skrips izpildÄ«ts, kad trauksme ir aktivizÄta"
 msgid "Sensors"
 msgstr "Sensori"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "RediÄ£Ät sensoru iestatÄ«jumus"
@@ -212,11 +237,13 @@ msgid "Low threshold:"
 msgstr "Zems slieksnis:"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Ubuntu aplikÄciju indikators"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "RÄdÄ«t sensoru aplikÄciju indikatora izvÄlnÄ"
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +262,11 @@ msgstr "DetaÄ¼as"
 msgid "Name:"
 msgstr "Nosaukums:"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "RÄdÄ«t sensoru aplikÄciju indikatora izvÄlnÄ"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: nevar atrast ADL bibliotÄku."
diff --git a/po/nl.po b/po/nl.po
index da18789..d0db5b4 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-04-19 10:21+0200\n"
 "PO-Revision-Date: 2014-04-07 08:50+0000\n"
 "Last-Translator: Pjotr12345 <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -88,6 +88,14 @@ msgstr "Vensterpositie en -grootte herstellen"
 msgid "Temperature unit:"
 msgstr "Temperatuureenheid:"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "Bedieningsschil"
@@ -165,6 +173,23 @@ msgstr "Script dat wordt uitgevoerd wanneer er een alarm plaatsvindt"
 msgid "Sensors"
 msgstr "Sensoren"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "Sensorvoorkeuren bewerken"
@@ -212,11 +237,13 @@ msgid "Low threshold:"
 msgstr "Drempel voor laag:"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Ubuntu Toepassingsindicator"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "Sensor tonen in het menu van de Toepassingsindicator"
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +262,11 @@ msgstr "Bijzonderheden"
 msgid "Name:"
 msgstr "Naam:"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "Sensor tonen in het menu van de Toepassingsindicator"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: kan ADL-bibliotheekbestand niet vinden"
diff --git a/po/psensor.pot b/po/psensor.pot
index e66f88f..6a568c0 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-04-19 10:21+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"
@@ -87,6 +87,14 @@ msgstr ""
 msgid "Temperature unit:"
 msgstr ""
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr ""
@@ -164,6 +172,23 @@ msgstr ""
 msgid "Sensors"
 msgstr ""
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr ""
@@ -211,11 +236,11 @@ msgid "Low threshold:"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:444
@@ -234,6 +259,10 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index aac7c6b..d5e9c3d 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-04-19 10:21+0200\n"
 "PO-Revision-Date: 2013-09-01 18:54+0000\n"
 "Last-Translator: Celio Alves <Unknown>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -88,6 +88,14 @@ msgstr "Restaurar posiÃ§Ã£o e tamanho da janela"
 msgid "Temperature unit:"
 msgstr "Unidade de temperatura:"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "Interface"
@@ -165,6 +173,23 @@ msgstr ""
 msgid "Sensors"
 msgstr "Sensores"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "Editar preferÃªncias do sensor"
@@ -212,11 +237,11 @@ msgid "Low threshold:"
 msgstr "Limite inferior:"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +260,10 @@ msgstr "Detalhes"
 msgid "Name:"
 msgstr "Nome:"
 
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: nÃ£o foi possÃ­vel encontrar a biblioteca ADL."
diff --git a/po/ru.po b/po/ru.po
index 136eb23..d7022ce 100644
--- a/po/ru.po
+++ b/po/ru.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-04-19 10:21+0200\n"
 "PO-Revision-Date: 2014-01-27 16:37+0000\n"
 "Last-Translator: Dmitry <dmitri.s93@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -88,6 +88,14 @@ msgstr "ÐÐ¾ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð¸ ÑÐ°Ð·Ð¼ÐµÑ Ð¾ÐºÐ½
 msgid "Temperature unit:"
 msgstr "ÐÐ´Ð¸Ð½Ð¸ÑÐ° Ð¸Ð·Ð¼ÐµÑÐµÐ½Ð¸Ñ ÑÐµÐ¼Ð¿ÐµÑÐ°ÑÑÑÑ:"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "ÐÐ½ÐµÑÐ½Ð¸Ð¹ Ð²Ð¸Ð´"
@@ -165,6 +173,23 @@ msgstr ""
 msgid "Sensors"
 msgstr "ÐÐ°ÑÑÐ¸ÐºÐ¸"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð´Ð°ÑÑÐ¸ÐºÐ°"
@@ -212,11 +237,13 @@ msgid "Low threshold:"
 msgstr "ÐÐ¸Ð¶Ð½Ð¸Ð¹ Ð¿Ð¾ÑÐ¾Ð³:"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "ÐÐ½Ð´Ð¸ÐºÐ°ÑÐ¾Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð´Ð°ÑÑÐ¸Ðº Ð² Ð¸Ð½Ð´Ð¸ÐºÐ°ÑÐ¾ÑÐµ Ð¼ÐµÐ½Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹"
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +262,11 @@ msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ"
 msgid "Name:"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ:"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð´Ð°ÑÑÐ¸Ðº Ð² Ð¸Ð½Ð´Ð¸ÐºÐ°ÑÐ¾ÑÐµ Ð¼ÐµÐ½Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: Ð±Ð¸Ð±Ð»Ð¸Ð¾ÑÐµÐºÐ° ADL Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°."
diff --git a/po/sl.po b/po/sl.po
index 1d43487..9e82a6e 100644
--- a/po/sl.po
+++ b/po/sl.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-04-19 10:21+0200\n"
 "PO-Revision-Date: 2012-04-14 21:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -88,6 +88,14 @@ msgstr ""
 msgid "Temperature unit:"
 msgstr ""
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr ""
@@ -165,6 +173,23 @@ msgstr ""
 msgid "Sensors"
 msgstr ""
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr ""
@@ -212,11 +237,11 @@ msgid "Low threshold:"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +260,10 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index dd28403..0df2563 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-04-19 10:21+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"
@@ -88,6 +88,14 @@ msgstr ""
 msgid "Temperature unit:"
 msgstr ""
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr ""
@@ -165,6 +173,23 @@ msgstr ""
 msgid "Sensors"
 msgstr "Ð¡ÐµÐ½Ð·Ð¾Ñ"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr ""
@@ -212,11 +237,11 @@ msgid "Low threshold:"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +260,10 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index c10ab06..641b745 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-04-19 10:21+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"
@@ -88,6 +88,14 @@ msgstr "Pencere konumunu ve boyutunu yeniden yÃ¼kle"
 msgid "Temperature unit:"
 msgstr "SÄ±caklÄ±k birimi:"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "ArayÃ¼z"
@@ -165,6 +173,23 @@ msgstr "Alarm Ã§aldÄ±ÄÄ±nda betik Ã§alÄ±ÅtÄ±rÄ±lÄ±r"
 msgid "Sensors"
 msgstr "AlgÄ±layÄ±cÄ±lar"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "AlgÄ±layÄ±cÄ± Tercihlerini DÃ¼zenle"
@@ -212,11 +237,13 @@ msgid "Low threshold:"
 msgstr "DÃ¼ÅÃ¼k eÅik:"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Ubuntu Uygulama GÃ¶stergesi"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "AlgÄ±layÄ±cÄ±yÄ± Uygulama GÃ¶stergesi menÃ¼sÃ¼nde gÃ¶ster"
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +262,11 @@ msgstr "AyrÄ±ntÄ±lar"
 msgid "Name:"
 msgstr "Ä°sim:"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "AlgÄ±layÄ±cÄ±yÄ± Uygulama GÃ¶stergesi menÃ¼sÃ¼nde gÃ¶ster"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD:  ADL kÃ¼tÃ¼phanesi bulunamadÄ±."
diff --git a/po/uk.po b/po/uk.po
index efd7b09..8272b91 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-04-19 10:21+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"
@@ -88,6 +88,14 @@ msgstr "ÐÑÐ´Ð½Ð¾Ð²Ð»ÑÑÐ¸ Ð¿Ð¾Ð·Ð¸ÑÑÑ Ñ ÑÐ¾Ð·Ð¼ÑÑ Ð²ÑÐºÐ½Ð°"
 msgid "Temperature unit:"
 msgstr "ÐÐ´Ð¸Ð½Ð¸ÑÑ ÑÐµÐ¼Ð¿ÐµÑÐ°ÑÑÑÐ¸:"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "ÐÐ¾Ð²Ð½ÑÑÐ½ÑÐ¹ Ð²Ð¸Ð³Ð»ÑÐ´"
@@ -165,6 +173,23 @@ msgstr ""
 msgid "Sensors"
 msgstr "ÐÐ°ÑÑÐ¸ÐºÐ¸"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð°ÑÑÐ¸ÐºÐ°"
@@ -212,11 +237,11 @@ msgid "Low threshold:"
 msgstr "ÐÐ¸Ð¶ÑÐ¸Ð¹ Ð¿Ð¾ÑÑÐ³:"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+msgid "Application Indicator"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+msgid "Display sensor in the menu"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +260,10 @@ msgstr "ÐÐ¾Ð´ÑÐ¾Ð±Ð¸ÑÑ"
 msgid "Name:"
 msgstr "ÐÐ°Ð·Ð²Ð°:"
 
+#: src/glade/sensor-edit.glade:553
+msgid "Display sensor in the label"
+msgstr ""
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð±ÑÐ±Ð»ÑÐ¾ÑÐµÐºÑ ADL."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 95788fc..e78f82b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.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-04-19 10:21+0200\n"
 "PO-Revision-Date: 2013-01-15 12:24+0000\n"
 "Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -88,6 +88,14 @@ msgstr "æ¢å¤çªå£ä½ç½®åå¤§å°"
 msgid "Temperature unit:"
 msgstr "æ¸©åº¦åä½ï¼"
 
+#: src/glade/psensor-pref.glade:201
+msgid "Celcius"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:202
+msgid "Fahrenheit"
+msgstr ""
+
 #: src/glade/psensor-pref.glade:238
 msgid "Interface"
 msgstr "çé¢"
@@ -165,6 +173,23 @@ msgstr ""
 msgid "Sensors"
 msgstr "ä¼ æå¨"
 
+#: src/glade/psensor-pref.glade:797
+msgctxt "psensor"
+msgid "Right"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:800
+msgid "Left"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:803
+msgid "Top"
+msgstr ""
+
+#: src/glade/psensor-pref.glade:806
+msgid "Bottom"
+msgstr ""
+
 #: src/glade/sensor-edit.glade:19
 msgid "Edit Sensor Preferences"
 msgstr "ç¼è¾ä¼ æå¨é¦éé¡¹"
@@ -212,11 +237,13 @@ msgid "Low threshold:"
 msgstr "ä½éå¼ï¼"
 
 #: src/glade/sensor-edit.glade:409
-msgid "Ubuntu Application Indicator"
+#, fuzzy
+msgid "Application Indicator"
 msgstr "Ubuntu åºç¨æç¤ºå¨"
 
 #: src/glade/sensor-edit.glade:424
-msgid "Display sensor in the Application Indicator menu"
+#, fuzzy
+msgid "Display sensor in the menu"
 msgstr "å¨åºç¨æç¤ºå¨èåä¸­æ¾ç¤ºçè§å¨"
 
 #: src/glade/sensor-edit.glade:444
@@ -235,6 +262,11 @@ msgstr "è¯¦æ"
 msgid "Name:"
 msgstr "åç§°:"
 
+#: src/glade/sensor-edit.glade:553
+#, fuzzy
+msgid "Display sensor in the label"
+msgstr "å¨åºç¨æç¤ºå¨èåä¸­æ¾ç¤ºçè§å¨"
+
 #: src/lib/amd.c:170
 msgid "AMD: cannot found ADL library."
 msgstr "AMDï¼æªæ¾å° ADL åºã"
diff --git a/src/cfg.c b/src/cfg.c
index 55f3c8e..26c026c 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -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..728ed51 100644
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -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/sensor-edit.glade b/src/glade/sensor-edit.glade
index 777e930..229c122 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.0"/>
   <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>
@@ -103,7 +112,7 @@
               <object class="GtkTable" id="table1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="n_rows">15</property>
+                <property name="n_rows">16</property>
                 <property name="n_columns">2</property>
                 <child>
                   <placeholder/>
@@ -116,9 +125,9 @@
                     <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>
@@ -219,6 +228,7 @@
                     <property name="receives_default">False</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>
@@ -252,6 +262,7 @@
                     <property name="receives_default">False</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="right_attach">2</property>
@@ -270,7 +281,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 +288,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>
@@ -314,6 +325,7 @@
                     <property name="receives_default">True</property>
                     <property name="xalign">0</property>
                     <property name="color">#000000000000</property>
+                    <signal name="color-set" handler="ui_sensorpref_color_set_cb" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -364,7 +376,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_low_threshold_value</property>
@@ -372,6 +383,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_low_threshold_changed_cb" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -406,7 +418,7 @@
                     <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>
+                    <property name="label" translatable="yes">Application Indicator</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
                     </attributes>
@@ -421,12 +433,13 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="indicator_checkbox">
-                    <property name="label" translatable="yes">Display sensor in the Application Indicator menu</property>
+                    <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="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>
@@ -548,6 +561,24 @@
                     <property name="y_padding">4</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkCheckButton" id="indicator_label_checkbox">
+                    <property name="label" translatable="yes">Display sensor in the label</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="receives_default">False</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="right_attach">2</property>
+                    <property name="top_attach">15</property>
+                    <property name="bottom_attach">16</property>
+                    <property name="x_padding">14</property>
+                    <property name="y_padding">4</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="resize">True</property>
@@ -568,12 +599,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/ui_appindicator.c b/src/ui_appindicator.c
index c6b3f52..29244b5 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -175,21 +175,37 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
 {
 	AppIndicatorStatus status;
-	char *label;
-	double v;
+	char *label, *str, *tmp;
+	struct psensor **p;
 
 	if (!indicator)
 		return;
 
 	status = app_indicator_get_status(indicator);
 
-	v = psensor_get_max_current_value(ui->sensors, SENSOR_TYPE_TEMP);
-	if (v != UNKNOWN_DBL_VALUE) {
-		label = psensor_value_to_str(SENSOR_TYPE_TEMP, v, 1);
-		app_indicator_set_label(indicator, label, NULL);
-		free(label);
+	p =  ui_get_sensors_ordered_by_position(ui);
+	label = NULL;
+	while (*p) {
+		if (config_is_appindicator_label_enabled((*p)->id)) {
+			str = psensor_current_value_to_str(*p, 1);
+			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;
+			}
+		}
+		p++;
 	}
 
+	app_indicator_set_label(indicator, label, NULL);
+
 	if (!attention && status == APP_INDICATOR_STATUS_ATTENTION)
 		app_indicator_set_status(indicator,
 					 APP_INDICATOR_STATUS_ACTIVE);
diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 4337c53..f073c04 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 {
@@ -75,6 +76,8 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
 	}
 
 	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,46 +202,14 @@ 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;
@@ -282,6 +268,9 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 
 	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)
@@ -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"));
-- 
2.7.4

