removed amd_id useless var

added support of AMD GPU usage (contribution of MestreLion)
some cleanup and normalization of the code
regenerated translation files

diff --git a/NEWS b/NEWS
index 24fcb32..3e0a6ae 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+* v0.8.0.1
+
+** added AMD GPU usage sensor (Contribution from MestreLion).
+
 * v0.7.0.4
 
 ** added Spanish translation from LP (Javier and Eduardo Alberto

diff --git a/po/Makefile.in b/po/Makefile.in
index 92bf0ff..4941017 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -21,7 +21,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /usr/local
+prefix = /tmp/p
 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}
@@ -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/wpitchoune/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/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/wpitchoune/svnpub/psensor/trunk/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 

diff --git a/po/de.po b/po/de.po
index e47d0a0..0ec4bd9 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-10-11 21:21+0000\n"
 "Last-Translator: Dennis Baudys <Unknown>\n"
 "Language-Team: German\n"
@@ -138,7 +138,7 @@ msgstr "Typ:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -196,23 +196,23 @@ msgstr "Details"
 msgid "Name:"
 msgstr "Name:"
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: ADL-Bibliothek konnte nicht gefunden werden."
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: API der ADL-Bibliothek fehlt."
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: ADL-Bibliothek konnte nicht initialisiert werden."
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: Anzahl der Adapter konnte nicht ermittelt werden."
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart: sk_disk_open() gescheitert: %s."
@@ -225,7 +225,7 @@ msgstr "hddtemp: Öffnen des Sockets gescheitert."
 msgid "hddtemp: failed to open connection."
 msgstr "hddtemp: Öffnen der Verbindung gescheitert."
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr "hddtemp: Falsche Zeichenkette: %s."
@@ -235,11 +235,11 @@ msgstr "hddtemp: Falsche Zeichenkette: %s."
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr "lmsensor: Wert der Unterfunktion %s kann nicht ermittelt werden: %s."
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create gescheitert: Falscher Funktionstyp."
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: Initialisierung gescheitert: %s."
@@ -253,19 +253,19 @@ msgstr "Protokolldatei kann nicht geöffnet werden: %s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "Ermittlung der NVIDIA-Temperatur gescheitert."
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "Verbindung zum X11-Server konnte nicht hergestellt werden."
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Ermittlung der NVIDIA-Informationen gescheitert."
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "U/min"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/po/es.po b/po/es.po
index 7e632fe..6cfa79f 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-11-07 14:42+0000\n"
 "Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -137,7 +137,7 @@ msgstr "Tipo:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -195,23 +195,23 @@ msgstr "Detalles"
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/lib/amd.c:148
+#: 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:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: ADL's API perdidos"
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: error al iniciar ADL"
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: imposible listar el número de adaptadores"
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart: sk_disk_open() Error: %s"
@@ -224,7 +224,7 @@ msgstr "hddtemp: fallo al desplegar el conector"
 msgid "hddtemp: failed to open connection."
 msgstr "hddtemp: fallo al establecer conexión"
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr "hddtemp: argumento erróneo:%s."
@@ -234,11 +234,11 @@ msgstr "hddtemp: argumento erróneo:%s."
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr "lmsensor: imposible obtener el valor de subcaracterística %s:%s"
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create Fallo: error en la escritura."
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: Fallo de inicialización:%s."
@@ -252,19 +252,19 @@ msgstr "Imposible abrir el archivo de registro: %s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "Error al obtener la temperatura de NVIDIA."
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "Imposible establecer conexión con el servidor X11."
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Error al obtener la información de NVIDIA"
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/po/fr.po b/po/fr.po
index 2455701..c8a1e43 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-12-13 15:00+0000\n"
 "Last-Translator: Alain-OIivier Breysse <Unknown>\n"
 "Language-Team: French <>\n"
@@ -138,7 +138,7 @@ msgstr "Type:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -196,23 +196,23 @@ msgstr "Détails"
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: impossible de trouver la bibliothèque ADL."
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: L'interface de programmation ADL est manquante."
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: échec de l'initialisation d'ADL."
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: impossible de récupérer le nombre d'adaptateurs."
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart: échec de sk_disk_open(): %s."
@@ -225,7 +225,7 @@ msgstr "hddtemp: échec d'ouverture de l'interface de connexion."
 msgid "hddtemp: failed to open connection."
 msgstr "hddtemp: échec de l'ouverture de la connexion."
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr "hddtemp: mauvaise chaîne : %s."
@@ -236,11 +236,11 @@ msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr ""
 "lmsensor: impossible de récupérer la valeur de la sous-fonction %s: %s."
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: échec de lmsensor_psensor_create : mauvais type de fonction."
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: échec de l'initialisation: %s."
@@ -254,19 +254,19 @@ msgstr "Impossible d'ouvrir le journal: %s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "Échec de la récupération des températures NVIDIA."
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "Impossible d'ouvrir la connexion au serveur X11."
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Échec de la récupération des information NVIDIA."
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "Tr/min"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/po/hu.po b/po/hu.po
index a5f700c..9c11f1c 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\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"
@@ -138,7 +138,7 @@ msgstr "Típus:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -196,23 +196,23 @@ msgstr "Részletek"
 msgid "Name:"
 msgstr "Név:"
 
-#: src/lib/amd.c:148
+#: 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:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: hiányzó ADL API."
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: az ADL előkészítése meghiúsult."
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: adapterek számainak lekérése meghiúsult"
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart: sk_disk_open() hiba: %s."
@@ -225,7 +225,7 @@ msgstr "hddtemp: foglalat megnyitása meghiúsult."
 msgid "hddtemp: failed to open connection."
 msgstr "hddtemp: a kapcsolat megnyitása nem sikerült."
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr "hddtemp: rossz karakterlánc: %s."
@@ -235,11 +235,11 @@ msgstr "hddtemp: rossz karakterlánc: %s."
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr "lmsensor: alfunkció értékének lekérdezése meghiúsult %s: %s."
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create hiba: rossz funkciótípus."
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: előkészítési hiba: %s."
@@ -253,19 +253,19 @@ msgstr "A naplófájl megnyitása sikertelen: %s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "NVIDIA hőmérsékletének lekérése meghiúsult."
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "Nem lehet létrehozni a kapcsolatot az X11 kiszolgálóval."
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "NVIDIA információinak lekérése meghiúsult."
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/po/it.po b/po/it.po
index b78c16c..3a537f2 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-08-13 08:20+0000\n"
 "Last-Translator: Andrea Bernini <andrea.bernini@gmail.com>\n"
 "Language-Team: Italian\n"
@@ -138,7 +138,7 @@ msgstr "Tipo:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -196,23 +196,23 @@ msgstr ""
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: impossibile trovare la libreria ADL"
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: impossibile trovare l'API di ADL"
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: impossibile inizializzare ADL"
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart: errore sk_disk_open(): %s."
@@ -225,7 +225,7 @@ msgstr "hddtemp: impossibile aprire il socket."
 msgid "hddtemp: failed to open connection."
 msgstr "hddtemp: impossibile aprire la connessione."
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr "hddtemp: errore di stringa: %s"
@@ -235,11 +235,11 @@ msgstr "hddtemp: errore di stringa: %s"
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr ""
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: inizializzazione fallita: %s"
@@ -253,19 +253,19 @@ msgstr "Impossibile aprire il file di log: %s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "Impossibile leggere la temperatura da NVIDIA"
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "Impossibile connettersi al server X11."
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Impossibile recuperare informazioni da NVIDIA"
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/po/lv.po b/po/lv.po
index 746bb8c..599d3d0 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-11-11 10:38+0000\n"
 "Last-Translator: tuxmaniack <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -137,7 +137,7 @@ msgstr "Tips:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -195,23 +195,23 @@ msgstr "Detaļas"
 msgid "Name:"
 msgstr "Nosaukums:"
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: nevar atrast ADL bibliotēku."
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: trūkst ADL programmatūras saskarne."
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: neizdevās inicializēt ADL."
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: nevar saņemt adapteru skaitu."
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart: sk_disk_open() atteice: %s."
@@ -224,7 +224,7 @@ msgstr "hddtemp: neizdevās atvērt ligzdu."
 msgid "hddtemp: failed to open connection."
 msgstr "hddtemp: neizdevās atvērt savienojumu."
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr "hddtemp: nepareiza virkne: %s."
@@ -234,11 +234,11 @@ msgstr "hddtemp: nepareiza virkne: %s."
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr "lmsensor: nevar iegūt vērtību no apakšīpašības %s: %s."
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor: lmsensor_psensor_create atteice: nepareis īpašības tips."
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: inicializācijas kļūda: %s."
@@ -252,19 +252,19 @@ msgstr "Nevar atvērt žurnāla failu: %s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "Neizdevās saņemt NVIDIA temperatūtu."
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "Nevar atvērt savienojumu ar X11 server."
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Neizdevās saņemt NVIDIA informāciju."
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/po/psensor.pot b/po/psensor.pot
index 1230508..c274d77 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\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"
@@ -136,7 +136,7 @@ msgstr ""
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -194,23 +194,23 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr ""
@@ -223,7 +223,7 @@ msgstr ""
 msgid "hddtemp: failed to open connection."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr ""
@@ -233,11 +233,11 @@ msgstr ""
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr ""
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr ""
@@ -251,19 +251,19 @@ msgstr ""
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr ""
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr ""
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr ""
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index fcebd05..ae23bfa 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-09-10 04:01+0000\n"
 "Last-Translator: Daniel Serafim <daniel.serafim@gmail.com>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -138,7 +138,7 @@ msgstr "Tipo:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -196,23 +196,23 @@ msgstr ""
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr ""
@@ -225,7 +225,7 @@ msgstr ""
 msgid "hddtemp: failed to open connection."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr ""
@@ -235,11 +235,11 @@ msgstr ""
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr ""
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr ""
@@ -253,19 +253,19 @@ msgstr "Não é possível abrir arquivo de log: %s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "Falha ao recuperar temperatura de NVIDIA."
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "Não é possível abrir conexão com o servidor X11."
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Falha ao recuperar informações de NVIDIA."
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "RPM"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/po/ru.po b/po/ru.po
index 7946f55..62057d5 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-12-25 06:05+0000\n"
 "Last-Translator: Ilya Volchanetskiy <Unknown>\n"
 "Language-Team: Russian\n"
@@ -137,7 +137,7 @@ msgstr "Тип:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -195,23 +195,23 @@ msgstr "Сведения"
 msgid "Name:"
 msgstr "Название:"
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: библиотека ADL не найдена."
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: отсутствует API ADL."
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: не удалось инициализировать ADL."
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: ошибка определения количества адаптеров."
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart: ошибка sk_disk_open(): %s."
@@ -224,7 +224,7 @@ msgstr "hddtemp: не удалось открыть сокет."
 msgid "hddtemp: failed to open connection."
 msgstr "hddtemp: не удалось открыть соединение."
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr "hddtemp: неправильная строка: %s."
@@ -234,11 +234,11 @@ msgstr "hddtemp: неправильная строка: %s."
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr ""
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: ошибка инициализации: %s."
@@ -252,19 +252,19 @@ msgstr "Ошибка открытия файла журнала: %s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "Не удалось получить температуру NVIDIA."
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "Ошибка открытия соединения к серверу X11."
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Не удалось получить информацию NVIDIA."
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "об/мин"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/po/sl.po b/po/sl.po
index 2c6e774..925fda8 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\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"
@@ -137,7 +137,7 @@ msgstr ""
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -195,23 +195,23 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr ""
@@ -224,7 +224,7 @@ msgstr ""
 msgid "hddtemp: failed to open connection."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr ""
@@ -234,11 +234,11 @@ msgstr ""
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr ""
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr ""
@@ -252,19 +252,19 @@ msgstr ""
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr ""
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr ""
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr ""
 

diff --git a/po/sr.po b/po/sr.po
index 506ad1e..1b2d02b 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-05-03 02:31+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -137,7 +137,7 @@ msgstr ""
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -195,23 +195,23 @@ msgstr ""
 msgid "Name:"
 msgstr ""
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr ""
@@ -224,7 +224,7 @@ msgstr ""
 msgid "hddtemp: failed to open connection."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr ""
@@ -234,11 +234,11 @@ msgstr ""
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr ""
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr ""
@@ -252,19 +252,19 @@ msgstr ""
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr ""
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr ""
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr ""
 

diff --git a/po/tr.po b/po/tr.po
index 928f686..6c2390a 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-04-28 11:24+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -137,7 +137,7 @@ msgstr "Tür:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -195,23 +195,23 @@ msgstr ""
 msgid "Name:"
 msgstr "İsim:"
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr ""
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr ""
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr ""
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr ""
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr ""
@@ -224,7 +224,7 @@ msgstr ""
 msgid "hddtemp: failed to open connection."
 msgstr ""
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr ""
@@ -234,11 +234,11 @@ msgstr ""
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr ""
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr ""
@@ -252,19 +252,19 @@ msgstr ""
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr ""
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr ""
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr ""
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr ""
 

diff --git a/po/uk.po b/po/uk.po
index 25cd6ad..54d8849 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2012-10-13 16:24+0000\n"
 "Last-Translator: Ilya Volchanetskiy <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -137,7 +137,7 @@ msgstr "Тип:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -195,23 +195,23 @@ msgstr "Подробиці"
 msgid "Name:"
 msgstr "Назва:"
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD: не вдалося знайти бібліотеку ADL."
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD: відсутнє API ADL."
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD: не вдалося ініціалізувати ADL."
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD: не вдалося отримати кількість адаптерів."
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart: помилка sk_disk_open(): %s."
@@ -224,7 +224,7 @@ msgstr "hddtemp: не вдалося відкрити сокет."
 msgid "hddtemp: failed to open connection."
 msgstr "hddtemp: не вдалося встановити з'єднання."
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr "hddtemp: неправильний рядок: %s."
@@ -234,11 +234,11 @@ msgstr "hddtemp: неправильний рядок: %s."
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr ""
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr ""
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor: помилка ініціалізації: %s."
@@ -252,19 +252,19 @@ msgstr "Не вдалося відкрити лог-файл: %s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "Не вдалося отримати температуру NVIDIA."
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "Не вдалося встановити з'єднання до сервера X11."
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Не вдалося отримати інформацію NVIDIA."
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "об/хв"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 04e6abc..cfee267 100644 (file)
--- 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: 2013-03-14 08:47+0100\n"
+"POT-Creation-Date: 2013-03-15 10:15+0100\n"
 "PO-Revision-Date: 2013-01-15 12:24+0000\n"
 "Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -137,7 +137,7 @@ msgstr "类型:"
 
 #: src/glade/sensor-edit.glade:136 src/glade/sensor-edit.glade:281
 #: src/glade/sensor-edit.glade:377 src/glade/sensor-edit.glade:450
-#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:482
+#: src/glade/sensor-edit.glade:499 src/lib/psensor.c:488
 #: src/ui_sensorlist.c:378 src/ui_sensorlist.c:379 src/ui_sensorlist.c:380
 #: src/ui_notify.c:81
 msgid "N/A"
@@ -195,23 +195,23 @@ msgstr "详情"
 msgid "Name:"
 msgstr "名称:"
 
-#: src/lib/amd.c:148
+#: src/lib/amd.c:168
 msgid "AMD: cannot found ADL library."
 msgstr "AMD：未找到 ADL 库。"
 
-#: src/lib/amd.c:172
+#: src/lib/amd.c:195
 msgid "AMD: missing ADL's API."
 msgstr "AMD：ADL 的 API 丢失。"
 
-#: src/lib/amd.c:177
+#: src/lib/amd.c:203
 msgid "AMD: failed to initialize ADL."
 msgstr "AMD：ADL 初始化出错。"
 
-#: src/lib/amd.c:183
+#: src/lib/amd.c:209
 msgid "AMD: cannot get the number of adapters."
 msgstr "AMD：无法获取适配器数目。"
 
-#: src/lib/hdd_atasmart.c:145
+#: src/lib/hdd_atasmart.c:149
 #, c-format
 msgid "atasmart: sk_disk_open() failure: %s."
 msgstr "atasmart：sk_disk_open() 失败：%s。"
@@ -224,7 +224,7 @@ msgstr "硬盘温度：无法打开套接字。"
 msgid "hddtemp: failed to open connection."
 msgstr "硬盘温度：无法打开连接。"
 
-#: src/lib/hdd_hddtemp.c:182 src/lib/hdd_hddtemp.c:251
+#: src/lib/hdd_hddtemp.c:186 src/lib/hdd_hddtemp.c:255
 #, c-format
 msgid "hddtemp: wrong string: %s."
 msgstr "硬盘温度：错误字符：%s。"
@@ -234,11 +234,11 @@ msgstr "硬盘温度：错误字符：%s。"
 msgid "lmsensor: cannot get value of subfeature %s: %s."
 msgstr "lmsensor：无法获取子功能%s的值：%s。"
 
-#: src/lib/lmsensor.c:123
+#: src/lib/lmsensor.c:122
 msgid "lmsensor: lmsensor_psensor_create failure: wrong feature type."
 msgstr "lmsensor：lmsensor_psensor_create 失败：错误的功能类型。"
 
-#: src/lib/lmsensor.c:218
+#: src/lib/lmsensor.c:217
 #, c-format
 msgid "lmsensor: initialization failure: %s."
 msgstr "lmsensor：初始化失败：%s。"
@@ -252,19 +252,19 @@ msgstr "无法打开日志文件：%s"
 msgid "Failed to retrieve NVIDIA temperature."
 msgstr "无法获取 NVIDIA 温度。"
 
-#: src/lib/nvidia.c:93
+#: src/lib/nvidia.c:96
 msgid "Cannot open connection to X11 server."
 msgstr "无法打开到 X11 服务器的连接。"
 
-#: src/lib/nvidia.c:101
+#: src/lib/nvidia.c:104
 msgid "Failed to retrieve NVIDIA information."
 msgstr "无法获取 NVIDIA 信息。"
 
-#: src/lib/psensor.c:478 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:484 tests/test_psensor_type_to_unit_str.c:62
 msgid "RPM"
 msgstr "转速"
 
-#: src/lib/psensor.c:480
+#: src/lib/psensor.c:486
 msgid "%"
 msgstr "%"
 

diff --git a/src/lib/amd.c b/src/lib/amd.c
index e702e1a..8d65438 100644 (file)
--- a/src/lib/amd.c
+++ b/src/lib/amd.c
@@ -2,6 +2,8 @@
  * Copyright (C) 2010-2011 thgreasi@gmail.com, jeanfi@gmail.com
  * Copyright (C) 2010-2013 jeanfi@gmail.com
  *
+ * GPU usage is a contribution of MestreLion
+ *
  * 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
@@ -20,10 +22,6 @@
 #ifndef LINUX
 #define LINUX 1
 #endif
-#ifdef HAVE_LIBATIADL
-       /* AMD id for the aticonfig */
-       int amd_id;
-#endif
 
 #include <locale.h>
 #include <libintl.h>
@@ -43,16 +41,18 @@ typedef int (*ADL_MAIN_CONTROL_DESTROY)();
 typedef int (*ADL_ADAPTER_NUMBEROFADAPTERS_GET) (int *);
 typedef int (*ADL_ADAPTER_ADAPTERINFO_GET) (LPAdapterInfo, int);
 typedef int (*ADL_ADAPTER_ACTIVE_GET) (int, int*);
-typedef int (*ADL_OVERDRIVE5_TEMPERATURE_GET) (int, int, ADLTemperature*);
-typedef int (*ADL_OVERDRIVE5_FANSPEED_GET) (int, int, ADLFanSpeedValue*);
-
-static ADL_MAIN_CONTROL_CREATE            adl_main_control_create;
-static ADL_MAIN_CONTROL_DESTROY           adl_main_control_destroy;
-static ADL_ADAPTER_NUMBEROFADAPTERS_GET   adl_adapter_numberofadapters_get;
-static ADL_ADAPTER_ADAPTERINFO_GET        adl_adapter_adapterinfo_get;
-static ADL_ADAPTER_ACTIVE_GET             adl_adapter_active_get;
-static ADL_OVERDRIVE5_TEMPERATURE_GET     adl_overdrive5_temperature_get;
-static ADL_OVERDRIVE5_FANSPEED_GET        adl_overdrive5_fanspeed_get;
+typedef int (*ADL_OD5_TEMPERATURE_GET) (int, int, ADLTemperature*);
+typedef int (*ADL_OD5_FANSPEED_GET) (int, int, ADLFanSpeedValue*);
+typedef int (*ADL_OD5_CURRENTACTIVITY_GET) (int, ADLPMActivity*);
+
+static ADL_MAIN_CONTROL_CREATE adl_main_control_create;
+static ADL_MAIN_CONTROL_DESTROY adl_main_control_destroy;
+static ADL_ADAPTER_NUMBEROFADAPTERS_GET adl_adapter_numberofadapters_get;
+static ADL_ADAPTER_ADAPTERINFO_GET adl_adapter_adapterinfo_get;
+static ADL_ADAPTER_ACTIVE_GET adl_adapter_active_get;
+static ADL_OD5_TEMPERATURE_GET adl_od5_temperature_get;
+static ADL_OD5_FANSPEED_GET adl_od5_fanspeed_get;
+static ADL_OD5_CURRENTACTIVITY_GET adl_od5_currentactivity_get;
 
 static void *hdll;
 static int adl_main_control_done;
@@ -70,62 +70,80 @@ static void *getprocaddress(void *plibrary, const char *name)
 }
 
 /*
-  Returns the temperature (Celcius) of an AMD/Ati GPU.
+  Returns the temperature (Celcius) of an AMD/ATI GPU.
 */
 static double get_temp(struct psensor *sensor)
 {
-       ADLTemperature temperature;
+       ADLTemperature v;
 
-       temperature.iSize = sizeof(ADLTemperature);
-       temperature.iTemperature = -273;
-       if (ADL_OK != adl_overdrive5_temperature_get(sensor->amd_id,
-                0, &temperature))
+       v.iSize = sizeof(ADLTemperature);
+       v.iTemperature = -273;
+       if (ADL_OK == adl_od5_temperature_get(sensor->amd_id, 0, &v))
+               return v.iTemperature/1000;
+       else
                return UNKNOWN_DBL_VALUE;
-
-       return temperature.iTemperature/1000;
 }
 
 static double get_fanspeed(struct psensor *sensor)
 {
-       ADLFanSpeedValue fanspeedvalue;
-
-       fanspeedvalue.iSize = sizeof(ADLFanSpeedValue);
-       fanspeedvalue.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_RPM;
-       fanspeedvalue.iFanSpeed = -1;
-       if (ADL_OK != adl_overdrive5_fanspeed_get(sensor->amd_id,
-                0, &fanspeedvalue))
+       ADLFanSpeedValue v;
+
+       v.iSize = sizeof(ADLFanSpeedValue);
+       v.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_RPM;
+       v.iFanSpeed = -1;
+       if (ADL_OK == adl_od5_fanspeed_get(sensor->amd_id, 0, &v))
+               return v.iFanSpeed;
+       else
                return UNKNOWN_DBL_VALUE;
+}
+
+static double get_usage(struct psensor *sensor)
+{
+       ADLPMActivity v;
 
-       return fanspeedvalue.iFanSpeed;
+       v.iSize = sizeof(ADLPMActivity);
+       if (ADL_OK == adl_od5_currentactivity_get(sensor->amd_id, &v))
+               return v.iActivityPercent;
+       else
+               return UNKNOWN_DBL_VALUE;
 }
 
-static struct psensor *create_sensor(int id, int values_len)
+static struct psensor *create_sensor(int id, int type, int values_len)
 {
        char name[200];
        char *sid;
        int sensor_type;
-
        struct psensor *s;
 
-       if (id & 1) {/* odd number ids represent fan sensors */
-               id = id >> 1;
-               sprintf(name, "GPU%dfan", id);
-               sensor_type = SENSOR_TYPE_ATIADL
-                       | SENSOR_TYPE_FAN
-                       | SENSOR_TYPE_RPM;
-       } else {/* even number ids represent temperature sensors */
-               id = id >> 1;
-               sprintf(name, "GPU%dtemp", id);
-               sensor_type = SENSOR_TYPE_ATIADL
-                       | SENSOR_TYPE_GPU
-                       | SENSOR_TYPE_TEMP;
+       sensor_type = SENSOR_TYPE_ATIADL;
+       switch (type) {
+       /* Fan rotation speed */
+       case 0:
+               sprintf(name, "AMD GPU%d Fan", id);
+               sensor_type |= SENSOR_TYPE_FAN | SENSOR_TYPE_RPM;
+               break;
+
+       /* Temperature */
+       case 1:
+               sprintf(name, "AMD GPU%d Temperature", id);
+               sensor_type |= SENSOR_TYPE_GPU | SENSOR_TYPE_TEMP;
+               break;
+
+       /* GPU Usage (Activity/Load %) */
+       case 2:
+               sprintf(name, "AMD GPU%d Usage", id);
+               sensor_type |= SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE;
+               break;
        }
 
        sid = malloc(strlen("amd") + 1 + strlen(name) + 1);
        sprintf(sid, "amd %s", name);
 
-       s = psensor_create(sid, strdup(name), strdup("ATI GPU"),
-                          sensor_type, values_len);
+       s = psensor_create(sid,
+                          strdup(name),
+                          strdup("AMD/ATI GPU"),
+                          sensor_type,
+                          values_len);
 
        s->amd_id = active_adapters[id];
 
@@ -133,50 +151,58 @@ static struct psensor *create_sensor(int id, int values_len)
 }
 
 /*
-  Returns the number of AMD/Ati GPU sensors (temperature and fan
-  speed).
+  Returns the number of active AMD/ATI GPU adapters
 
-  Return 0 if no AMD/Ati gpus or cannot get information.
+  Return 0 if no AMD/ATI GPUs or cannot get information.
 */
 static int init()
 {
-       LPAdapterInfo lpadapterinfo = NULL;
-       int i, inumberadapters, inumberadaptersactive = 0;
-       int lpstatus, iadapterindex;
+       LPAdapterInfo lpadapterinfo;
+       int i, inumberadapters, inumberadaptersactive, lpstatus, iadapterindex;
 
        adl_main_control_done = 0;
+       inumberadaptersactive = 0;
        active_adapters = NULL;
-       hdll = dlopen("libatiadlxx.so", RTLD_LAZY|RTLD_GLOBAL);
+       lpadapterinfo = NULL;
 
+       hdll = dlopen("libatiadlxx.so", RTLD_LAZY|RTLD_GLOBAL);
        if (!hdll) {
-               log_err(_("AMD: cannot found ADL library."));
+               log_debug(_("AMD: cannot found ADL library."));
                return 0;
        }
 
        adl_main_control_create = (ADL_MAIN_CONTROL_CREATE)
-                getprocaddress(hdll, "ADL_Main_Control_Create");
+               getprocaddress(hdll, "ADL_Main_Control_Create");
        adl_main_control_destroy = (ADL_MAIN_CONTROL_DESTROY)
-                getprocaddress(hdll, "ADL_Main_Control_Destroy");
+               getprocaddress(hdll, "ADL_Main_Control_Destroy");
        adl_adapter_numberofadapters_get = (ADL_ADAPTER_NUMBEROFADAPTERS_GET)
-                getprocaddress(hdll, "ADL_Adapter_NumberOfAdapters_Get");
+               getprocaddress(hdll, "ADL_Adapter_NumberOfAdapters_Get");
        adl_adapter_adapterinfo_get = (ADL_ADAPTER_ADAPTERINFO_GET)
-                getprocaddress(hdll, "ADL_Adapter_AdapterInfo_Get");
+               getprocaddress(hdll, "ADL_Adapter_AdapterInfo_Get");
        adl_adapter_active_get = (ADL_ADAPTER_ACTIVE_GET)
-                getprocaddress(hdll, "ADL_Adapter_Active_Get");
-       adl_overdrive5_temperature_get = (ADL_OVERDRIVE5_TEMPERATURE_GET)
-                getprocaddress(hdll, "ADL_Overdrive5_Temperature_Get");
-       adl_overdrive5_fanspeed_get = (ADL_OVERDRIVE5_FANSPEED_GET)
-                getprocaddress(hdll, "ADL_Overdrive5_FanSpeed_Get");
-       if (!adl_main_control_create ||
-               !adl_main_control_destroy ||
-               !adl_adapter_numberofadapters_get ||
-               !adl_adapter_adapterinfo_get ||
-               !adl_overdrive5_temperature_get ||
-               !adl_overdrive5_fanspeed_get) {
+               getprocaddress(hdll, "ADL_Adapter_Active_Get");
+       adl_od5_temperature_get = (ADL_OD5_TEMPERATURE_GET)
+               getprocaddress(hdll, "ADL_Overdrive5_Temperature_Get");
+       adl_od5_fanspeed_get = (ADL_OD5_FANSPEED_GET)
+               getprocaddress(hdll, "ADL_Overdrive5_FanSpeed_Get");
+       adl_od5_currentactivity_get = (ADL_OD5_CURRENTACTIVITY_GET)
+               getprocaddress(hdll, "ADL_Overdrive5_CurrentActivity_Get");
+       if (!adl_main_control_create
+           || !adl_main_control_destroy
+           || !adl_adapter_numberofadapters_get
+           || !adl_adapter_adapterinfo_get
+           || !adl_od5_temperature_get
+           || !adl_od5_fanspeed_get
+           || !adl_od5_currentactivity_get) {
                log_err(_("AMD: missing ADL's API."));
                return 0;
        }
 
+       /*
+          1 in 2nd parameter means retrieve adapter information only
+          for adapters that are physically present and enabled in the
+          system
+        */
        if (ADL_OK != adl_main_control_create(adl_main_memory_alloc, 1)) {
                log_err(_("AMD: failed to initialize ADL."));
                return 0;
@@ -223,10 +249,10 @@ static int init()
 
        free(lpadapterinfo);
 
-       /* Each Adapter has one temperature sensor and one fan */
-       return 2*inumberadaptersactive;
+       return inumberadaptersactive;
 }
 
+/* Called regularly to update sensors values */
 void amd_psensor_list_update(struct psensor **sensors)
 {
        struct psensor **ss, *s;
@@ -238,33 +264,37 @@ void amd_psensor_list_update(struct psensor **sensors)
                if (s->type & SENSOR_TYPE_ATIADL) {
                        if (s->type & SENSOR_TYPE_TEMP)
                                psensor_set_current_value(s, get_temp(s));
-                       else if (s->type & SENSOR_TYPE_FAN)
+                       else if (s->type & SENSOR_TYPE_RPM)
                                psensor_set_current_value(s, get_fanspeed(s));
+                       else if (s->type & SENSOR_TYPE_USAGE)
+                               psensor_set_current_value(s, get_usage(s));
                }
-                       
-                       ss++;
+
+               ss++;
        }
 }
 
+/* Entry point for AMD sensors */
 struct psensor * *
 amd_psensor_list_add(struct psensor **sensors, int values_len)
 {
-       int i, n;
+       int i, j, n;
        struct psensor **tmp, **ss, *s;
 
        n = init();
 
        ss = sensors;
-       for (i = 0; i < n; i++) {
-               s = create_sensor(i, values_len);
-
-               tmp = psensor_list_add(ss, s);
+       for (i = 0; i < n; i++)
+               /* Each GPU Adapter has 3 sensors: temp, fan speed and usage */
+               for (j = 0; j < 3; j++) {
+                       s = create_sensor(i, j, values_len);
+                       tmp = psensor_list_add(ss, s);
 
-               if (ss != tmp)
-                       free(ss);
+                       if (ss != tmp)
+                               free(ss);
 
-               ss = tmp;
-       }
+                       ss = tmp;
+               }
 
        return ss;
 }