From d019b476f28501c1f180d662fae0ca279e57e719 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Sun, 21 Sep 2014 17:14:01 +0200 Subject: [PATCH] avoid to fetch hddtemp daemon if no hddtemp sensors --- po/de.po | 10 +++++----- po/es.po | 10 +++++----- po/fr.po | 10 +++++----- po/hr.po | 10 +++++----- po/hu.po | 10 +++++----- po/it.po | 10 +++++----- po/lv.po | 10 +++++----- po/nl.po | 10 +++++----- po/psensor.pot | 10 +++++----- po/pt_BR.po | 10 +++++----- po/ru.po | 10 +++++----- po/sl.po | 10 +++++----- po/sr.po | 10 +++++----- po/sv.po | 10 +++++----- po/tr.po | 10 +++++----- po/uk.po | 10 +++++----- po/zh_CN.po | 10 +++++----- src/lib/hdd_hddtemp.c | 21 +++++++++++++++++++++ src/lib/psensor.c | 14 -------------- src/lib/psensor.h | 4 ---- 20 files changed, 106 insertions(+), 103 deletions(-) diff --git a/po/de.po b/po/de.po index efc6879..d2bb212 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: German\n" @@ -307,7 +307,7 @@ msgstr "Typ:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "N/V" @@ -420,7 +420,7 @@ msgstr "%s: Öffnen des Sockets gescheitert." msgid "%s: failed to open connection." msgstr "%s: Öffnen der Verbindung gescheitert." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: Falsche Zeichenkette: %s." @@ -511,11 +511,11 @@ msgstr "%s: Ermittlung der NVIDIA-Informationen gescheitert." msgid "%s: Failed to retrieve number of fans." msgstr "Ermittlung der NVIDIA-Informationen gescheitert." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "U/min" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/es.po b/po/es.po index ac83dba..eec8d39 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Spanish \n" @@ -307,7 +307,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "No disponible" @@ -422,7 +422,7 @@ msgstr "%s: fallo al desplegar el conector" msgid "%s: failed to open connection." msgstr "%s: fallo al establecer conexión" -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: argumento erróneo:%s." @@ -513,11 +513,11 @@ msgstr "%s: Error al obtener la información de NVIDIA" msgid "%s: Failed to retrieve number of fans." msgstr "Error al obtener la información de NVIDIA" -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/fr.po b/po/fr.po index 5266003..d6b6318 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-21 09:39+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: French <>\n" @@ -307,7 +307,7 @@ msgstr "Type :" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "N/A" @@ -420,7 +420,7 @@ msgstr "%s : échec d'ouverture de l'interface de connexion." msgid "%s: failed to open connection." msgstr "%s : échec de l'ouverture de la connexion." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s : mauvaise chaîne: %s." @@ -511,11 +511,11 @@ msgstr "%s : Échec de la récupération des information NVIDIA." msgid "%s: Failed to retrieve number of fans." msgstr "Échec de la récupération des information NVIDIA." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "Tr/mn" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/hr.po b/po/hr.po index 69b6b09..de14ce9 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-21 06:25+0000\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" @@ -307,7 +307,7 @@ msgstr "Vrsta:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "Nedostupno" @@ -420,7 +420,7 @@ msgstr "%s: neuspjelo otvaranje socketa." msgid "%s: failed to open connection." msgstr "%s: neuspjelo otvaranje povezivanja." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: pogrešan string: %s." @@ -511,11 +511,11 @@ msgstr "%s: Neuspjelo primanje NVIDIA informacija." msgid "%s: Failed to retrieve number of fans." msgstr "%s: NVIDIA: nuespjelo očitavanje broja ventilatora." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "Okr/min" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/hu.po b/po/hu.po index 19a9daa..fa26393 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Hungarian \n" @@ -308,7 +308,7 @@ msgstr "Típus:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "---" @@ -421,7 +421,7 @@ msgstr "%s: foglalat megnyitása meghiúsult." msgid "%s: failed to open connection." msgstr "%s: a kapcsolat megnyitása nem sikerült." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: rossz karakterlánc: %s." @@ -512,11 +512,11 @@ msgstr "%s: NVIDIA információinak lekérése meghiúsult." msgid "%s: Failed to retrieve number of fans." msgstr "NVIDIA információinak lekérése meghiúsult." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/it.po b/po/it.po index fe1b9c6..b33f51e 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-20 11:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Italian\n" @@ -307,7 +307,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "N/A" @@ -421,7 +421,7 @@ msgstr "%s: impossibile aprire il socket." msgid "%s: failed to open connection." msgstr "%s: impossibile aprire la connessione." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: errore di stringa: %s" @@ -512,11 +512,11 @@ msgstr "%s: Impossibile recuperare informazioni da NVIDIA" msgid "%s: Failed to retrieve number of fans." msgstr "Impossibile recuperare informazioni da NVIDIA" -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/lv.po b/po/lv.po index bb2058c..386f202 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Latvian \n" @@ -307,7 +307,7 @@ msgstr "Tips:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "N/P" @@ -422,7 +422,7 @@ msgstr "%s: neizdevās atvērt ligzdu." msgid "%s: failed to open connection." msgstr "%s: neizdevās atvērt savienojumu." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: nepareiza virkne: %s." @@ -513,11 +513,11 @@ msgstr "%s: Neizdevās saņemt NVIDIA informāciju." msgid "%s: Failed to retrieve number of fans." msgstr "Neizdevās saņemt NVIDIA informāciju." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/nl.po b/po/nl.po index 55b32b0..d9ea715 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Dutch \n" @@ -307,7 +307,7 @@ msgstr "Soort:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "N.v.t." @@ -423,7 +423,7 @@ msgstr "%s: kon contactpunt niet openen." msgid "%s: failed to open connection." msgstr "%s: kon verbinding niet openen." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: verkeerde tekenreeks: %s." @@ -514,11 +514,11 @@ msgstr "%s: Kon Nvidia-informatie niet ophalen." msgid "%s: Failed to retrieve number of fans." msgstr "Kon Nvidia-informatie niet ophalen." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/psensor.pot b/po/psensor.pot index 364d300..2959ccb 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -306,7 +306,7 @@ msgstr "" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "" @@ -419,7 +419,7 @@ msgstr "" msgid "%s: failed to open connection." msgstr "" -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "" @@ -510,11 +510,11 @@ msgstr "" msgid "%s: Failed to retrieve number of fans." msgstr "" -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 88b4014..ed1612b 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Brazilian Portuguese\n" @@ -307,7 +307,7 @@ msgstr "Tipo:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "N/D" @@ -420,7 +420,7 @@ msgstr "%s: falha em abrir conexão." msgid "%s: failed to open connection." msgstr "%s: falha em abrir conexão." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "" @@ -511,11 +511,11 @@ msgstr "%s: Falha ao recuperar informações de NVIDIA." msgid "%s: Failed to retrieve number of fans." msgstr "Falha ao recuperar informações de NVIDIA." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/ru.po b/po/ru.po index 06485c6..73b4f7e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Russian\n" @@ -308,7 +308,7 @@ msgstr "Тип:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "Н/Д" @@ -422,7 +422,7 @@ msgstr "%s: не удалось открыть сокет." msgid "%s: failed to open connection." msgstr "%s: не удалось открыть соединение." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: неправильная строка: %s." @@ -513,11 +513,11 @@ msgstr "%s: Не удалось получить информацию NVIDIA." msgid "%s: Failed to retrieve number of fans." msgstr "Не удалось получить информацию NVIDIA." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "об/мин" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/sl.po b/po/sl.po index 4e87481..c3fa47e 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Slovenian \n" @@ -307,7 +307,7 @@ msgstr "" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "" @@ -420,7 +420,7 @@ msgstr "" msgid "%s: failed to open connection." msgstr "" -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "" @@ -511,11 +511,11 @@ msgstr "" msgid "%s: Failed to retrieve number of fans." msgstr "" -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "" diff --git a/po/sr.po b/po/sr.po index 40736c7..306873f 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-11 21:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Serbian \n" @@ -307,7 +307,7 @@ msgstr "" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "Недоступно" @@ -420,7 +420,7 @@ msgstr "" msgid "%s: failed to open connection." msgstr "" -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "" @@ -511,11 +511,11 @@ msgstr "" msgid "%s: Failed to retrieve number of fans." msgstr "" -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "" diff --git a/po/sv.po b/po/sv.po index 85bc447..27dd241 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 1.0.0.0\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2014-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Swedish\n" @@ -310,7 +310,7 @@ msgstr "Typ:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "Ej tillgänglig" @@ -424,7 +424,7 @@ msgstr "%s: misslyckades med att öppna uttag." msgid "%s: failed to open connection." msgstr "%s: misslyckades med att öppna anslutning." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: fel sträng: %s." @@ -515,11 +515,11 @@ msgstr "%s: Misslyckades med att hämta NVIDIA-information." msgid "%s: Failed to retrieve number of fans." msgstr "Misslyckades med att hämta NVIDIA-information." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/tr.po b/po/tr.po index 8a1b822..df90c17 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-20 11:27+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Turkish \n" @@ -307,7 +307,7 @@ msgstr "Tür:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "Bilinmeyen" @@ -422,7 +422,7 @@ msgstr "%s: yuva açılamadı" msgid "%s: failed to open connection." msgstr "%s: bağlantı açılamadı." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: yanlış dizi: %s." @@ -513,11 +513,11 @@ msgstr "%s: NVIDIA bilgisi alınamıyor." msgid "%s: Failed to retrieve number of fans." msgstr "NVIDIA bilgisi alınamıyor." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "RPM" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/uk.po b/po/uk.po index 2b58f09..5e0d177 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Ukrainian \n" @@ -307,7 +307,7 @@ msgstr "Тип:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "Н/Д" @@ -420,7 +420,7 @@ msgstr "%s: не вдалося відкрити сокет." msgid "%s: failed to open connection." msgstr "%s: не вдалося встановити з'єднання." -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, c-format msgid "%s: wrong string: %s." msgstr "%s: неправильний рядок: %s." @@ -511,11 +511,11 @@ msgstr "%s: Не вдалося отримати інформацію NVIDIA." msgid "%s: Failed to retrieve number of fans." msgstr "Не вдалося отримати інформацію NVIDIA." -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "об/хв" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/po/zh_CN.po b/po/zh_CN.po index 704791d..db949ae 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-09-21 17:09+0200\n" +"POT-Creation-Date: 2014-09-21 17:11+0200\n" "PO-Revision-Date: 2014-09-11 21:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Chinese (simplified)\n" @@ -307,7 +307,7 @@ msgstr "类型:" #: src/glade/sensor-edit.glade:193 src/glade/sensor-edit.glade:230 #: src/glade/sensor-edit.glade:282 src/glade/sensor-edit.glade:507 -#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:471 src/ui_notify.c:81 +#: src/glade/sensor-edit.glade:562 src/lib/psensor.c:457 src/ui_notify.c:81 msgid "N/A" msgstr "不可用" @@ -421,7 +421,7 @@ msgstr "硬盘温度：无法打开套接字。" msgid "%s: failed to open connection." msgstr "硬盘温度：无法打开连接。" -#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:251 +#: src/lib/hdd_hddtemp.c:189 src/lib/hdd_hddtemp.c:272 #, fuzzy, c-format msgid "%s: wrong string: %s." msgstr "硬盘温度：错误字符：%s。" @@ -512,11 +512,11 @@ msgstr "%s: 无法获取 NVIDIA 信息。" msgid "%s: Failed to retrieve number of fans." msgstr "无法获取 NVIDIA 信息。" -#: src/lib/psensor.c:467 tests/test_psensor_type_to_unit_str.c:62 +#: src/lib/psensor.c:453 tests/test_psensor_type_to_unit_str.c:62 msgid "RPM" msgstr "转速" -#: src/lib/psensor.c:469 +#: src/lib/psensor.c:455 msgid "%" msgstr "%" diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c index e693bf4..91ef103 100644 --- a/src/lib/hdd_hddtemp.c +++ b/src/lib/hdd_hddtemp.c @@ -225,10 +225,31 @@ static void update(struct psensor **sensors, struct hdd_info *info) } } +static bool contains_hddtemp_sensor(struct psensor **sensors) +{ + struct psensor *s; + + if (!sensors) + return false; + + while (*sensors) { + s = *sensors; + if (!(s->type & SENSOR_TYPE_REMOTE) + && (s->type & SENSOR_TYPE_HDDTEMP)) + return true; + sensors++; + } + + return false; +} + void hddtemp_psensor_list_update(struct psensor **sensors) { char *hddtemp_output; + if (!contains_hddtemp_sensor(sensors)) + return; + hddtemp_output = fetch(); if (!hddtemp_output) diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 8a1d443..b9da81d 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -155,20 +155,6 @@ int psensor_list_size(struct psensor **sensors) return size; } -bool psensor_list_contains_type(struct psensor **sensors, unsigned int type) -{ - if (!sensors) - return false; - - while (*sensors) { - if (((*sensors)->type & type) == type) - return true; - sensors++; - } - - return false; -} - struct psensor **psensor_list_add(struct psensor **sensors, struct psensor *sensor) { diff --git a/src/lib/psensor.h b/src/lib/psensor.h index be25b72..cec6d0f 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -153,10 +153,6 @@ struct psensor **psensor_list_filter_graph_enabled(struct psensor **); struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id); -/* Return true if there is at least one sensor of a given type, else - * returns false */ -bool psensor_list_contains_type(struct psensor **sensors, unsigned int type); - int is_temp_type(unsigned int type); double get_min_temp(struct psensor **sensors); -- 2.7.4