From: Jean-Philippe Orsini Date: Mon, 29 Sep 2014 16:29:06 +0000 (+0200) Subject: avoid macro in code X-Git-Tag: v1.2.0~95 X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=2cec0f33f19afafe8a9dd28fc3af3db27796c76b avoid macro in code --- diff --git a/po/Makefile.in b/po/Makefile.in index 923e5b6..ac38b05 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 597cc0e..c3e99c4 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: German\n" @@ -579,7 +579,7 @@ msgstr "" "Sensorprotokolldatei ist nicht geöffnet und kann deswegen nicht geschlossen " "werden." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -595,12 +595,12 @@ msgstr "" "weiterverbreiten.\n" "Sie wird OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Aufruf: %s [OPTION] …\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -608,11 +608,11 @@ msgstr "" "Psensor ist eine GTK+-Anwendung zur Überwachung von Hardware-Sensoren, " "inklusive Temperaturen und Lüftergeschwindigkeiten." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Optionen:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -620,7 +620,7 @@ msgstr "" " -h, --help Diese Hilfe anzeigen und beenden\n" " -v, --version Versionsinformationen anzeigen und beenden" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -628,50 +628,50 @@ msgstr "" " -u, --url=URL Die Adresse (URL) von psensor-server,\n" " Beispiel: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance Erzeugung einer neuen Psensor-Anwendung erzwingen" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=STUFE Fehlerdiagnosestufe festlegen, Ganzzahl zwischen 0 und " "3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Programmfehler melden an: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s-Website: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Fehlerdiagnosemodus wird aktiviert." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Es existiert bereits eine Psensor-Instanz." -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Erzeugen des Webservers ist gescheitert." -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/es.po b/po/es.po index 5db5188..5817896 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Spanish \n" @@ -579,7 +579,7 @@ msgstr "No se abrió el archivo de registro." msgid "Sensor log not open, cannot close." msgstr "¡No existe archivo que cerrar!" -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -595,12 +595,12 @@ msgstr "" "apoyada por el autor. \n" "No existe NINGUNA GARANTÍA hasta donde la ley lo permita.\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPTION]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -608,11 +608,11 @@ msgstr "" "Psensor es un programa GTK+ que muestra datos de temperatura y ventiladores " "a través de los sensores de su hardware." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Opciones" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -620,7 +620,7 @@ msgstr "" " -h, --help Muestra esta ayuda. \n" " -v, --versión Muestra información sobre la versión." -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -628,49 +628,49 @@ msgstr "" " -u, --url=URL La URL del servidor psensor,\n" " ejemplo: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance Fuerza el inicio de otro Psensor paralelo" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=NIVEL Establece el nivel de depuración con un valor entre 0 " "y 3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Comunicar fallos: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s Página Oficial: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor no ha sido compilado con soporte para sensores remotos." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Activa el modo de depuración" -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Introducir `%s --ayuda' para obtener más información\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Ya existe un Psensor en ejecución." -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Fallo al crear el servidor Web" -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/fr.po b/po/fr.po index 7e73a53..a5b6172 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-21 09:39+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: French <>\n" @@ -584,7 +584,7 @@ msgstr "Le journal des capteurs n'est pas ouvert." msgid "Sensor log not open, cannot close." msgstr "Le journal des capteurs n'est pas ouvert, il ne peut être fermé." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -601,12 +601,12 @@ msgstr "" "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" "autorisées par la loi.\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilisation : %s [OPTION]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -614,11 +614,11 @@ msgstr "" "Psensor est une application GTK+ pour surveiller les capteurs thermiques et " "les vitesses de ventilateurs." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Options :" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -626,58 +626,58 @@ msgstr "" " -h, --help afficher cette aide et quitter\n" " -v, --version afficher les informations de version et quitter" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" " -u, --url=URL l'URL de psensor-server, example: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance forcer la création d'une nouvelle occurrence de " "l'application Psensor" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL assigner le niveau de débogage, nombre entier entre 0 " "et 3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Signaler les bogues à: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "Page d'accueil de %s : <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "" "Psensor n'a pas été compilé avec le support de surveillance à distance." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Active le mode de débogage." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez « %s --help » pour plus d'informations.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Une instance de Psensor existe déjà." -#: src/main.c:569 +#: src/main.c:563 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/hr.po b/po/hr.po index 4719edf..3b1cfe0 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-21 06:25+0000\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" @@ -577,7 +577,7 @@ msgstr "Datoteka zapisa senzora nije otvorena." msgid "Sensor log not open, cannot close." msgstr "Datoteka zapisa senzora nije otvorena, nemoguće zatvaranje." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -592,12 +592,12 @@ msgstr "" "Ovo je slobodan softver: slobodno ga možete mijenjati i redistribuirati.\n" "Ne postoji nikakvo JAMSTVO, propisano zakonom.\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Upotreba: %s [MOGUĆNOST]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -605,11 +605,11 @@ msgstr "" "Psensor je GTK+ aplikacija za nadziranje hardverskih senzora, koja uključuje " "temperature i brzinu okretaja ventilatora." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Mogućnosti:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -617,7 +617,7 @@ msgstr "" " -h, --help prikaz pomoći\n" " -v, --version prikaz informacije inačice" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -625,48 +625,48 @@ msgstr "" " -u, --url=URL URL psensor-poslužitelja,\n" " npr: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance prisili stvaranje nove Psensor aplikacije" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL postavi razinu otklanjanja greške, cijeli broj između " "0 i 3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Prijavi grešku na: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s početna stranica: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Omogućava način otklanjanja greške." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pokušajte `%s --help` za više informacija.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Psensor primjerak je već pokrenut." -#: src/main.c:569 +#: src/main.c:563 msgid "Failed to create thread for monitoring sensors" msgstr "Neuspjelo stvaranje niza za nadziranje senzora" -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/hu.po b/po/hu.po index 95e0ca5..883de4e 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Hungarian \n" @@ -578,7 +578,7 @@ msgstr "Az érzékelő naplófájlja nincs nyitva." msgid "Sensor log not open, cannot close." msgstr "Az érzékelő naplófájlja nincs nyitva, nem lehet bezárni." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -593,12 +593,12 @@ msgstr "" "Ez egy szabad szoftver: szabadon terjesztheti és/vagy módosíthatja\n" "NINCS GARANCIA, a jogszabályok által megengedett mértékben.\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Használat: %s [KAPCSOLÓK]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -606,11 +606,11 @@ msgstr "" "A Psensor egy GTK+ alkalmazás a hardver érzékelőinek figyelésére, beleértve " "a hőmérsékleteket és a ventilátor sebességét." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Kapcsolók:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -618,7 +618,7 @@ msgstr "" " -h, --help ezen súgó megjelenítése, majd kilépés\n" " -v, --version verzióinformációk megjelenítése, majd kilépés" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -626,48 +626,48 @@ msgstr "" " -u, --url=URL a psensor-server URL-címe,\n" " például: http://gepnev:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance új Psensor alkalmazás indításának kényszerítése" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL hibakeresési szint beállítása, egész 0 és 3 között" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "A talált hibákat itt jelentse be: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s honlap: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Hibakeresési mód engedélyezése." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "További információkért adja ki a „%s --help” parancsot.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "A Psensors egy példánya már létezik." -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Nem sikerült a mappa létrehozása: %s - %s" -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/it.po b/po/it.po index f81afa0..209617d 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-20 11:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Italian\n" @@ -578,7 +578,7 @@ msgstr "File di registazione sensori non aperto." msgid "Sensor log not open, cannot close." msgstr "Registro sensori non aperto, impossibile chiuderlo." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -593,12 +593,12 @@ msgstr "" "Questo è software libero: sei libero di modificarlo e redistribuirlo.\n" "NON esiste GARANZIA, per gli scopi permessi dalla legge.\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPZIONE]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -606,11 +606,11 @@ msgstr "" "Psensor è un'applicazione GTK+ per monitorare i sensori dell'hardware, " "incluse temperature e velocità delle ventole." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Opzioni:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -618,7 +618,7 @@ msgstr "" " -h, --help mostra questo help ed esce\n" " -v, --version mostra le informazioni sulla versione ed esce" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -626,49 +626,49 @@ msgstr "" " -u, --url=URL URL del server psensor,\n" " esempio: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance forza la creazione di una nuova applicazione Psensor" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL imposta il livello di debug, un intero compreso tra 0 e 3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Segnalare i bug a: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s home page: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor è stato compilato senza il supporto per sensori remoti." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Abilita la modalità debug." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Usare '%s --help' per maggiori informazioni.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Esiste già un'istanza di Psensor" -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Impossibile creare il Web server." -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/lv.po b/po/lv.po index ef48d65..87ad891 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Latvian \n" @@ -579,7 +579,7 @@ msgstr "Sensora žurnāla fails nav atvērts." msgid "Sensor log not open, cannot close." msgstr "Sensora žurnāls nav atvērts, nevar aizvērt." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -589,12 +589,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Lietošana: %s [OPCIJAS]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -602,11 +602,11 @@ msgstr "" "Psensor ir GTK+ lietotne aparatūras sensoru pārraudzībai, ieskaitot " "temperatūras un ventilatoru ātrumus." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Opcijas:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -614,7 +614,7 @@ msgstr "" " -h, --help rādīt šo palīdzību un iziet\n" " -v, --version rādīt versijas informāciju un iziet" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -622,47 +622,47 @@ msgstr "" " -u, --url=SAITE psensor-server adrese,\n" " piemērs: http://saimniekdatoravārds:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance piespiest izveidot jaunu Psensor lietotni" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=LĪMENIS iestatīt atkļūdošanas līmeni, starp 0 un 3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Ziņojiet kļūdas uz: %s.\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s mājas lapa: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Aktivizēt atkļūdošanas režīmu." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Mēģiniet `%s --help', lai iegūtu vairāk informācijas.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Psensor instance jau eksistē." -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Neizdevās izveidot tīmekļa serveri." -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/nl.po b/po/nl.po index 996a90e..fde5d85 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Dutch \n" @@ -587,7 +587,7 @@ msgstr "Logboekbestand van sensor niet geopend." msgid "Sensor log not open, cannot close." msgstr "Logboekbestand van sensor niet geopend, kan niet sluiten." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -602,12 +602,12 @@ msgstr "" "Dit is vrije programmatuur: u mag hem wijzigen en doorgeven.\n" "Er zit geen garantie op, voor zover de wet dat toestaat.\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Gebruik: %s [OPTIE]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -615,11 +615,11 @@ msgstr "" "Psensor is een GTK+ toepassing voor het bewaken van apparatuursensoren, " "inclusief temperaturen en ventilatorsnelheden." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Opties:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -627,7 +627,7 @@ msgstr "" " -h, --help toon deze hulpinformatie en sluit af\n" " -v, --version toon versie-informatie en sluit af" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -635,50 +635,50 @@ msgstr "" " -u, --url=URL het webadres van de psensor-server,\n" " voorbeeld: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance forceer het aanmaken van een nieuwe Psensor-toepassing" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL stel het foutopsporingsniveau in, integer tussen 0 en 3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Meld fouten aan: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "Webpagina van %s: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "" "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Schakelt foutopsporingsmodus in." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer '%s --help' voor meer informatie.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Er bestaat reeds een instantie van Psensor." -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Kon geen webserver maken." -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/psensor.pot b/po/psensor.pot index 09f0999..e1f9f48 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -569,7 +569,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -579,73 +579,73 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "" -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:569 +#: src/main.c:563 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 84ed715..ab42193 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Brazilian Portuguese\n" @@ -570,7 +570,7 @@ msgstr "Arquivo de registros do sensor não foi aberto." msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -580,12 +580,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPÇÃO]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -593,11 +593,11 @@ msgstr "" "Psensor é um aplicativo GTK+ para monitoramento de sensores de hardware, " "incluindo temperatura e velocidade de ventoinhas." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Opções:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -605,7 +605,7 @@ msgstr "" " -h, --help exibir esta ajuda e sair\n" " -v, --version exibir informação de versão e sair" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -613,47 +613,47 @@ msgstr "" " -u, --url=URL a URL do psensor-server,\n" " exemplo: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Relatar falhas para: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "Página inicial de %s: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Ativar o modo de depuração" -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Utilize `%s --help' para mais informações.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Uma instancia de Psensor já existe." -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Falhou ao criar servidor web." -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/ru.po b/po/ru.po index 6b34b59..2e928bb 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Russian\n" @@ -579,7 +579,7 @@ msgstr "Файл журнала датчика не открыт." msgid "Sensor log not open, cannot close." msgstr "Файл журнала датчика не открыт, не удалось закрыть." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -589,12 +589,12 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Использование: %s [КЛЮЧ]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -602,11 +602,11 @@ msgstr "" "Psensor — это GTK+ приложение для мониторинга аппаратных датчиков, включая " "температуру и скорость вентилятора." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Опции:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -614,55 +614,55 @@ msgstr "" " -h, --help показать эту справку и выйти\n" " -v, --version показать версию и выйти" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" " -u, --url=URL URL psensor-сервера, пример: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance принудительно запускает новую копию программы Psensor" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=УРОВЕНЬ установить уровень отладки, целое между 0 и 3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Сообщайте об ошибках на: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашняя страница: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor не был собран с поддержкой удалённых датчиков." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Включает режим отладки." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Попробуйте `%s --help' для дополнительной информации.↵\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Копия Psensor уже запущена." -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Не удалось создать веб-сервер." -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/sl.po b/po/sl.po index 252b759..0f79a29 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Slovenian \n" @@ -570,7 +570,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -580,73 +580,73 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "" -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:569 +#: src/main.c:563 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/sr.po b/po/sr.po index bf26f10..e05221c 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-11 21:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Serbian \n" @@ -570,7 +570,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -580,73 +580,73 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Употреба: %s [ОПЦИЈА]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Опције:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Пријавите грешку на: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s матична страна: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "" -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Покушајте„%s --help“ за више информација.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:569 +#: src/main.c:563 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/sv.po b/po/sv.po index 59b766f..0b844cb 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Swedish\n" @@ -581,7 +581,7 @@ msgstr "Sensorloggfil ej öppen." msgid "Sensor log not open, cannot close." msgstr "Sensorloggfil ej öppen, kan inte stänga." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -596,12 +596,12 @@ msgstr "" "Det här är fri programvara: Du kan fritt modifiera den och distribuera den\n" "Det finns INGEN GARANTI i den omfattning som medges av gällande lag.\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Användning: %s [FLAGGA]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -609,11 +609,11 @@ msgstr "" "Psensor är ett GTK+-program för att övervaka hårdvarusensorer, inklusive " "temperaturer och fläkthastigheter." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Alternativ:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -621,7 +621,7 @@ msgstr "" " -h, --help visa denna hjälp och avsluta\n" " -v, --version visa versionsinformation och avsluta" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -629,48 +629,48 @@ msgstr "" " -u, --url=URL URL för psensor-server,\n" " exempelvis: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance tvinga fram att skapa ett nytt Psensor-program" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL ställ in felsökningsnivå, heltal mellan nivå 0 och 3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Rapportera fel till: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s webbplats <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor har inte kompilerats med fjärrsensorstöd." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Aktivera felsökningsläge." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prova`%s --help' för mer information.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Det finns redan en Psensor-instans." -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Misslyckades med att skapa katalogen %s: %s" -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/tr.po b/po/tr.po index e63623a..1545e7a 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-20 11:27+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Turkish \n" @@ -579,7 +579,7 @@ msgstr "Algılayıcı günlük kaydı dosyası açık değil." msgid "Sensor log not open, cannot close." msgstr "Algılayıcı günlük kaydı açık değil, kapatılamıyor." -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -594,12 +594,12 @@ msgstr "" "Bu bir özgür yazılımdır: değiştirmekte ve yeniden dağıtmakta özgürsünüz.\n" "Yasaların izin verdiği çerçevede hiçbir garantisi YOKTUR.\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kullanım: %s [SEÇENEK]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." @@ -607,11 +607,11 @@ msgstr "" "Psensor, sıcaklık ve fan hızı da dahil olmak üzere donanım algılayıcılarını " "gözlemleyen bir GTK+ uygulamasıdır." -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Seçenekler:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -619,7 +619,7 @@ msgstr "" " -h, --help yardımı göster ve çık\n" " -v, --version sürüm bilgisini göster ve çık" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -627,49 +627,49 @@ msgstr "" " -u, --url=URL psensor sunucusunun bağlantısı,\n" " example: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance yeni bir Psensor uygulaması oluşturulmasını zorla" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --debug=LEVEL hata ayıklama seviyesin ayarla, 0 ve 3 arasında tamsayı" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Hataları rapor et:%s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfa: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Hata ayıklama modunu etkinleştirir." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "Bir Psensor örneği zaten mevcut." -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Web sunucusu oluşturulamadı." -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/uk.po b/po/uk.po index d699b28..4062889 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Ukrainian \n" @@ -577,7 +577,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -587,22 +587,22 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Використання: %s [КЛЮЧ]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "Опції:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -610,54 +610,54 @@ msgstr "" " -h, --help показати цю довідку і вийти\n" " -v, --version показати версію і вийти" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" " -u, --url=URL URL psensor-сервера, наприклад: http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance примусово створювати нову копію програми Psensor" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=РІВЕНЬ встановити рівень налагодження, ціле між 0 та 3" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Звітуйте про помилки до: %s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашня сторінка: <%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "Включає режим налагодження." -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Спробуйте `%s --help' щоб отримати більше інформації.\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Не вдалося створити веб-сервер." -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1ca8654..fe88cc5 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-29 14:35+0200\n" +"POT-Creation-Date: 2014-09-29 18:27+0200\n" "PO-Revision-Date: 2014-09-11 21:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Chinese (simplified)\n" @@ -578,7 +578,7 @@ msgstr "监测器日志文件未打开。" msgid "Sensor log not open, cannot close." msgstr "监测器日志未打开,故无法关闭。" -#: src/main.c:64 src/server/server.c:87 +#: src/main.c:63 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -593,22 +593,22 @@ msgstr "" "本软件为自由软件:您可以自由修改并分发。\n" "There is NO WARRANTY, to the extent permitted by law。\n" -#: src/main.c:75 src/server/server.c:97 +#: src/main.c:74 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法:%s [选项]...\n" -#: src/main.c:77 +#: src/main.c:76 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "Psensor 是一款 GTK+ 应用程序,可监测硬件传感器,包括温度与风扇转速。" -#: src/main.c:81 +#: src/main.c:80 msgid "Options:" msgstr "选项:" -#: src/main.c:82 +#: src/main.c:81 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -616,7 +616,7 @@ msgstr "" " -h, --help 显示这个帮助并退出\n" " -v, --version 显示版本信息并退出" -#: src/main.c:88 +#: src/main.c:87 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -624,47 +624,47 @@ msgstr "" " -u, --url=URL psensor 服务器 URL\n" " 例如:http://hostname:3131" -#: src/main.c:91 +#: src/main.c:90 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance 强制创建一个新的 Psensor 例程" -#: src/main.c:94 +#: src/main.c:93 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d,--debug=LEVEL 设置调试等级,等级为 0 到 3 之间的整数" -#: src/main.c:99 src/server/server.c:120 +#: src/main.c:98 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "报告问题至:%s\n" -#: src/main.c:101 src/server/server.c:122 +#: src/main.c:100 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 主页:<%s>\n" -#: src/main.c:431 +#: src/main.c:425 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor 不支持远程传感器。" -#: src/main.c:502 +#: src/main.c:496 msgid "Enables debug mode." msgstr "启用调试模式。" -#: src/main.c:514 src/server/server.c:386 +#: src/main.c:508 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "试用‘%s --help’来获得更多信息。\n" -#: src/main.c:527 +#: src/main.c:521 msgid "A Psensor instance already exists." msgstr "已存在一个 Psensor 例程。" -#: src/main.c:569 +#: src/main.c:563 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "无法创建网络服务器。" -#: src/main.c:590 src/ui.c:97 +#: src/main.c:584 src/ui.c:97 msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" diff --git a/src/Makefile.am b/src/Makefile.am index 2e4bb19..26883d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,7 @@ psensor_SOURCES = \ graph.h graph.c \ main.c \ pxdg.h pxdg.c \ + rsensor.h \ ui.h ui.c \ ui_appindicator.h \ ui_color.h ui_color.c \ @@ -98,7 +99,7 @@ endif if CURL if JSON -psensor_SOURCES += rsensor.h rsensor.c +psensor_SOURCES += rsensor.c LIBS += $(CURL_LIBS) $(JSON_LIBS) AM_CPPFLAGS += $(CURL_CFLAGS) $(JSON_CFLAGS) endif @@ -112,7 +113,7 @@ gsettings_SCHEMAS=psensor.gschema.xml EXTRA_DIST = description.txt\ $(gsettings_SCHEMAS)\ - rsensor.h rsensor.c\ + rsensor.c\ ui_appindicator.c\ ui_notify.c\ ui_unity.c diff --git a/src/Makefile.in b/src/Makefile.in index 3343f82..95be670 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -98,7 +98,7 @@ host_triplet = @host@ @UNITY_TRUE@am__append_17 = ui_unity.c @UNITY_TRUE@am__append_18 = $(UNITY_CFLAGS) @UNITY_TRUE@am__append_19 = $(UNITY_LIBS) -@CURL_TRUE@@JSON_TRUE@am__append_20 = rsensor.h rsensor.c +@CURL_TRUE@@JSON_TRUE@am__append_20 = rsensor.c @CURL_TRUE@@JSON_TRUE@am__append_21 = $(CURL_LIBS) $(JSON_LIBS) @CURL_TRUE@@JSON_TRUE@am__append_22 = $(CURL_CFLAGS) $(JSON_CFLAGS) subdir = src @@ -119,12 +119,12 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) am__psensor_SOURCES_DIST = cfg.h cfg.c notify_cmd.c notify_cmd.h \ - graph.h graph.c main.c pxdg.h pxdg.c ui.h ui.c \ + graph.h graph.c main.c pxdg.h pxdg.c rsensor.h ui.h ui.c \ ui_appindicator.h ui_color.h ui_color.c ui_graph.h ui_graph.c \ ui_notify.h ui_pref.h ui_pref.c ui_sensorlist.h \ ui_sensorlist.c ui_sensorpref.h ui_sensorpref.c ui_status.h \ ui_status.c ui_unity.h ui_notify.c ui_appindicator.c \ - ui_unity.c rsensor.h rsensor.c + ui_unity.c rsensor.c @LIBNOTIFY_TRUE@am__objects_1 = ui_notify.$(OBJEXT) @APPINDICATOR_TRUE@am__objects_2 = ui_appindicator.$(OBJEXT) @UNITY_TRUE@am__objects_3 = ui_unity.$(OBJEXT) @@ -422,12 +422,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = lib glade $(am__append_1) psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \ - graph.c main.c pxdg.h pxdg.c ui.h ui.c ui_appindicator.h \ - ui_color.h ui_color.c ui_graph.h ui_graph.c ui_notify.h \ - ui_pref.h ui_pref.c ui_sensorlist.h ui_sensorlist.c \ - ui_sensorpref.h ui_sensorpref.c ui_status.h ui_status.c \ - ui_unity.h $(am__append_4) $(am__append_7) $(am__append_17) \ - $(am__append_20) + graph.c main.c pxdg.h pxdg.c rsensor.h ui.h ui.c \ + ui_appindicator.h ui_color.h ui_color.c ui_graph.h ui_graph.c \ + ui_notify.h ui_pref.h ui_pref.c ui_sensorlist.h \ + ui_sensorlist.c ui_sensorpref.h ui_sensorpref.c ui_status.h \ + ui_status.c ui_unity.h $(am__append_4) $(am__append_7) \ + $(am__append_17) $(am__append_20) # -export-dynamic is need for defining handlers in the glade file. AM_LDFLAGS = -Wl,--as-needed -export-dynamic @@ -443,7 +443,7 @@ AM_CPPFLAGS = -Wall -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ gsettings_SCHEMAS = psensor.gschema.xml EXTRA_DIST = description.txt\ $(gsettings_SCHEMAS)\ - rsensor.h rsensor.c\ + rsensor.c\ ui_appindicator.c\ ui_notify.c\ ui_unity.c diff --git a/src/main.c b/src/main.c index 759f47d..ad4b06d 100644 --- a/src/main.c +++ b/src/main.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -52,9 +53,7 @@ #include #include -#ifdef HAVE_REMOTE_SUPPORT -#include "rsensor.h" -#endif + static const char *program_name; @@ -140,9 +139,7 @@ static void *update_measures(void *data) lmsensor_psensor_list_update(sensors); -#ifdef HAVE_REMOTE_SUPPORT remote_psensor_list_update(sensors); -#endif nvidia_psensor_list_update(sensors); amd_psensor_list_update(sensors); udisks2_psensor_list_update(sensors); @@ -395,10 +392,7 @@ static void cleanup(struct ui_psensor *ui) nvidia_cleanup(); amd_cleanup(); - -#ifdef HAVE_REMOTE_SUPPORT rsensor_cleanup(); -#endif psensor_list_free(ui->sensors); ui->sensors = NULL; @@ -424,14 +418,14 @@ static struct psensor **create_sensors_list(const char *url) struct psensor **sensors; if (url) { -#ifdef HAVE_REMOTE_SUPPORT - rsensor_init(); - sensors = get_remote_sensors(url, 600); -#else - log_err(_("Psensor has not been compiled with remote " - "sensor support.")); - exit(EXIT_FAILURE); -#endif + if (rsensor_is_supported()) { + rsensor_init(); + sensors = get_remote_sensors(url, 600); + } else { + log_err(_("Psensor has not been compiled with remote " + "sensor support.")); + exit(EXIT_FAILURE); + } } else { sensors = malloc(sizeof(struct psensor *)); *sensors = NULL; diff --git a/src/rsensor.h b/src/rsensor.h index e770fcd..afb9d65 100644 --- a/src/rsensor.h +++ b/src/rsensor.h @@ -21,12 +21,25 @@ #include -struct psensor **get_remote_sensors(const char *server_url, - int values_max_length); +#if defined(HAVE_REMOTE_SUPPORT) && HAVE_REMOTE_SUPPORT -void remote_psensor_list_update(struct psensor **sensors); +static inline bool rsensor_is_supported(void) { return true; } +struct psensor **get_remote_sensors(const char *, int); +void remote_psensor_list_update(struct psensor **); void rsensor_init(void); void rsensor_cleanup(void); +#else + +static inline bool rsensor_is_supported(void) { return false; } + +static inline struct psensor ** +get_remote_sensors(const char *url, int n) { return NULL; } +static inline void remote_psensor_list_update(struct psensor **s) {} +static inline void rsensor_init(void) {} +static inline void rsensor_cleanup(void) {} + +#endif + #endif