From de58b641143d1fb9622fa4021c2dd1ab50149dee Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Wed, 1 Oct 2014 00:54:51 +0200 Subject: [PATCH] avoid configuration (color) field in psensor struct --- po/Makefile.in | 6 ++-- po/de.po | 58 +++++++++++++++++------------------ po/es.po | 56 +++++++++++++++++----------------- po/fr.po | 54 ++++++++++++++++----------------- po/hr.po | 52 ++++++++++++++++---------------- po/hu.po | 56 +++++++++++++++++----------------- po/it.po | 56 +++++++++++++++++----------------- po/lv.po | 52 ++++++++++++++++---------------- po/nl.po | 52 ++++++++++++++++---------------- po/psensor.pot | 46 ++++++++++++++-------------- po/pt_BR.po | 58 +++++++++++++++++------------------ po/ru.po | 56 +++++++++++++++++----------------- po/sl.po | 52 ++++++++++++++++---------------- po/sr.po | 52 ++++++++++++++++---------------- po/sv.po | 52 ++++++++++++++++---------------- po/tr.po | 54 ++++++++++++++++----------------- po/uk.po | 54 ++++++++++++++++----------------- po/zh_CN.po | 56 +++++++++++++++++----------------- src/cfg.c | 87 +++++++++++++++++++++++++++++++++++++++-------------- src/cfg.h | 6 ++-- src/graph.c | 19 ++++++++---- src/lib/psensor.c | 5 --- src/lib/psensor.h | 4 --- src/main.c | 49 ------------------------------ src/ui_color.c | 44 ++++++--------------------- src/ui_color.h | 9 ++---- src/ui_sensorlist.c | 18 +++++------ src/ui_sensorpref.c | 24 +++++---------- 28 files changed, 569 insertions(+), 618 deletions(-) diff --git a/po/Makefile.in b/po/Makefile.in index ac38b05..923e5b6 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.local/psensor/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work/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.local/psensor/install-sh -d -install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/psensor/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/po/de.po b/po/de.po index 14bbcaa..3134036 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: German\n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "Erzeugen des Webservers ist gescheitert." -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert." -#: src/cfg.c:580 +#: src/cfg.c:579 #, fuzzy, c-format msgid "Failed to save configuration file %s." msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert." @@ -579,7 +579,7 @@ msgstr "" "Sensorprotokolldatei ist nicht geöffnet und kann deswegen nicht geschlossen " "werden." -#: src/main.c:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Aufruf: %s [OPTION] …\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Optionen:" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -628,59 +628,49 @@ msgstr "" " -u, --url=URL Die Adresse (URL) von psensor-server,\n" " Beispiel: http://hostname:3131" -#: src/main.c:90 +#: src/main.c:88 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:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Programmfehler melden an: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s-Website: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Fehlerdiagnosemodus wird aktiviert." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Es existiert bereits eine Psensor-Instanz." -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Erzeugen des Webservers ist gescheitert." -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Daniel Winzen https://launchpad.net/~q-d\n" -" Dennis Baudys https://launchpad.net/~thecondordb\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" Michael Egger https://launchpad.net/~michael-egger\n" -" Veit https://launchpad.net/~shoutbox" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -798,6 +788,16 @@ msgstr "Copyright © 2010-2014jeanfi@gmail.com" msgid "About Psensor" msgstr "Info zu Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Daniel Winzen https://launchpad.net/~q-d\n" +" Dennis Baudys https://launchpad.net/~thecondordb\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" Michael Egger https://launchpad.net/~michael-egger\n" +" Veit https://launchpad.net/~shoutbox" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Psensor-Website" diff --git a/po/es.po b/po/es.po index db8ef24..412f6f0 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Spanish \n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "Fallo al crear el servidor Web" -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Error al activar el registro de sensores" -#: src/cfg.c:580 +#: src/cfg.c:579 #, fuzzy, c-format msgid "Failed to save configuration file %s." msgstr "Error al activar el registro de sensores" @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPTION]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Opciones" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -628,57 +628,48 @@ msgstr "" " -u, --url=URL La URL del servidor psensor,\n" " ejemplo: http://hostname:3131" -#: src/main.c:90 +#: src/main.c:88 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:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Comunicar fallos: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s Página Oficial: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor no ha sido compilado con soporte para sensores remotos." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Activa el modo de depuración" -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Ya existe un Psensor en ejecución." -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Fallo al crear el servidor Web" -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Adolfo Jayme https://launchpad.net/~fitojb\n" -" Eduardo Alberto Calvo https://launchpad.net/~edu5800\n" -" Javier https://launchpad.net/~buik8roadmaster\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -797,6 +788,15 @@ msgstr "Copyright(c) 2010-2014 jeanfi@gmail.com" msgid "About Psensor" msgstr "Sobre Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Adolfo Jayme https://launchpad.net/~fitojb\n" +" Eduardo Alberto Calvo https://launchpad.net/~edu5800\n" +" Javier https://launchpad.net/~buik8roadmaster\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Web de Psensor" diff --git a/po/fr.po b/po/fr.po index cda058c..2ef64c3 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-21 09:39+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: French <>\n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 09:40+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, c-format msgid "Failed to create the directory %s: %s" msgstr "" -#: src/cfg.c:557 +#: src/cfg.c:556 #, c-format msgid "Failed to load configuration file %s: %s" msgstr "" -#: src/cfg.c:580 +#: src/cfg.c:579 #, c-format msgid "Failed to save configuration file %s." msgstr "" @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilisation : %s [OPTION]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Options :" -#: src/main.c:81 +#: src/main.c:79 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -626,65 +626,57 @@ msgstr "" " -h, --help afficher cette aide et quitter\n" " -v, --version afficher les informations de version et quitter" -#: src/main.c:87 +#: src/main.c:85 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:90 +#: src/main.c:88 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:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Signaler les bogues à: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "Page d'accueil de %s : <%s>\n" -#: src/main.c:425 +#: src/main.c:423 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:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Active le mode de débogage." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Une instance de Psensor existe déjà." -#: src/main.c:563 +#: src/main.c:561 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" Ubuntu-QC-1 https://launchpad.net/~aobreyss\n" -" londumas https://launchpad.net/~helion331990" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -805,6 +797,14 @@ msgstr "Copyright © 2010-2014 jeanfi@gmail.com" msgid "About Psensor" msgstr "À propos de Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" Ubuntu-QC-1 https://launchpad.net/~aobreyss\n" +" londumas https://launchpad.net/~helion331990" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Site internet de Psensor" diff --git a/po/hr.po b/po/hr.po index f8e1795..bd99005 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-21 06:25+0000\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, c-format msgid "Failed to create the directory %s: %s" msgstr "Neuspjelo stvaranje direktorija %s: %s" -#: src/cfg.c:557 +#: src/cfg.c:556 #, c-format msgid "Failed to load configuration file %s: %s" msgstr "Neuspjelo učitavanje datoteke podešavanja %s: %s" -#: src/cfg.c:580 +#: src/cfg.c:579 #, c-format msgid "Failed to save configuration file %s." msgstr "Neuspjelo spremanje datoteke podešavanja %s." @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Upotreba: %s [MOGUĆNOST]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Mogućnosti:" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -625,54 +625,47 @@ msgstr "" " -u, --url=URL URL psensor-poslužitelja,\n" " npr: http://hostname:3131" -#: src/main.c:90 +#: src/main.c:88 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance prisili stvaranje nove Psensor aplikacije" -#: src/main.c:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Prijavi grešku na: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s početna stranica: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor nije kompajliran s udaljenom podrškom senzora." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Omogućava način otklanjanja greške." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Psensor primjerak je već pokrenut." -#: src/main.c:563 +#: src/main.c:561 msgid "Failed to create thread for monitoring sensors" msgstr "Neuspjelo stvaranje niza za nadziranje senzora" -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" gogo https://launchpad.net/~trebelnik-stefina" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -790,6 +783,13 @@ msgstr "Autorsko pravo(c) 2010-2014 jeanfi@gmail.com" msgid "About Psensor" msgstr "O Psensoru" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" gogo https://launchpad.net/~trebelnik-stefina" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Psensor web stranica" diff --git a/po/hu.po b/po/hu.po index c062a60..7037b3a 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Hungarian \n" @@ -19,17 +19,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, c-format msgid "Failed to create the directory %s: %s" msgstr "Nem sikerült a mappa létrehozása: %s - %s" -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Nem sikerült a konfigurációs fájlt beolvasni: %s" -#: src/cfg.c:580 +#: src/cfg.c:579 #, c-format msgid "Failed to save configuration file %s." msgstr "Nem sikerült a konfigurációs fájlt elmenteni: %s" @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Használat: %s [KAPCSOLÓK]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Kapcsolók:" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -626,56 +626,47 @@ msgstr "" " -u, --url=URL a psensor-server URL-címe,\n" " például: http://gepnev:3131" -#: src/main.c:90 +#: src/main.c:88 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:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 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:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s honlap: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 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:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Hibakeresési mód engedélyezése." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "A Psensors egy példánya már létezik." -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Nem sikerült a mappa létrehozása: %s - %s" -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Bence Lukács https://launchpad.net/~lukacs-bence1\n" -" Gabor Kelemen https://launchpad.net/~kelemeng\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" Richard Somlói https://launchpad.net/~ricsipontaz" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -794,6 +785,15 @@ msgstr "Copyright(c) 2010-2014 jeanfi@gmail.com" msgid "About Psensor" msgstr "A Psensor névjegye" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Bence Lukács https://launchpad.net/~lukacs-bence1\n" +" Gabor Kelemen https://launchpad.net/~kelemeng\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" Richard Somlói https://launchpad.net/~ricsipontaz" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "A Psensor honlapja" diff --git a/po/it.po b/po/it.po index 53f2131..2d9a80a 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-20 11:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Italian\n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "Impossibile creare il Web server." -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Attivazione registro dei sensori fallita." -#: src/cfg.c:580 +#: src/cfg.c:579 #, fuzzy, c-format msgid "Failed to save configuration file %s." msgstr "Attivazione registro dei sensori fallita." @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPZIONE]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Opzioni:" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -626,57 +626,48 @@ msgstr "" " -u, --url=URL URL del server psensor,\n" " esempio: http://hostname:3131" -#: src/main.c:90 +#: src/main.c:88 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:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Segnalare i bug a: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s home page: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor è stato compilato senza il supporto per sensori remoti." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Abilita la modalità debug." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Esiste già un'istanza di Psensor" -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Impossibile creare il Web server." -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Andrea Bernini https://launchpad.net/~andrea-bernini\n" -" Diego Pierotto https://launchpad.net/~gringo\n" -" Gabriele https://launchpad.net/~deepdown23\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -795,6 +786,15 @@ msgstr "Copyright(c) 2010-2014 jeanfi@gmail.com" msgid "About Psensor" msgstr "Informazioni su Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Andrea Bernini https://launchpad.net/~andrea-bernini\n" +" Diego Pierotto https://launchpad.net/~gringo\n" +" Gabriele https://launchpad.net/~deepdown23\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Psensor Homepage" diff --git a/po/lv.po b/po/lv.po index 2ada3b0..338d8fd 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Latvian \n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "Neizdevās izveidot tīmekļa serveri." -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Neizdevās aktivizēt sensoru žurnalēšanu." -#: src/cfg.c:580 +#: src/cfg.c:579 #, fuzzy, c-format msgid "Failed to save configuration file %s." msgstr "Neizdevās aktivizēt sensoru žurnalēšanu." @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Lietošana: %s [OPCIJAS]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Opcijas:" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -622,53 +622,46 @@ msgstr "" " -u, --url=SAITE psensor-server adrese,\n" " piemērs: http://saimniekdatoravārds:3131" -#: src/main.c:90 +#: src/main.c:88 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance piespiest izveidot jaunu Psensor lietotni" -#: src/main.c:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Ziņojiet kļūdas uz: %s.\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s mājas lapa: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Aktivizēt atkļūdošanas režīmu." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Psensor instance jau eksistē." -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Neizdevās izveidot tīmekļa serveri." -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" tuxmaniack https://launchpad.net/~tuxmaniack" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -788,6 +781,13 @@ msgstr "" msgid "About Psensor" msgstr "Par Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" tuxmaniack https://launchpad.net/~tuxmaniack" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Psensor mājas lapa" diff --git a/po/nl.po b/po/nl.po index efbc6bf..3417018 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Dutch \n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "Kon geen webserver maken." -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren." -#: src/cfg.c:580 +#: src/cfg.c:579 #, fuzzy, c-format msgid "Failed to save configuration file %s." msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren." @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Gebruik: %s [OPTIE]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Opties:" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -635,56 +635,49 @@ msgstr "" " -u, --url=URL het webadres van de psensor-server,\n" " voorbeeld: http://hostname:3131" -#: src/main.c:90 +#: src/main.c:88 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:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Meld fouten aan: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "Webpagina van %s: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "" "Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Schakelt foutopsporingsmodus in." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Er bestaat reeds een instantie van Psensor." -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Kon geen webserver maken." -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" Pjotr12345 https://launchpad.net/~computertip" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -803,6 +796,13 @@ msgstr "Auteursrecht(c) 2010-2014 jeanfi@gmail.com" msgid "About Psensor" msgstr "Over Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" Pjotr12345 https://launchpad.net/~computertip" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Thuispagina van Psensor" diff --git a/po/psensor.pot b/po/psensor.pot index d69e82c..857968d 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,17 +17,17 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, c-format msgid "Failed to create the directory %s: %s" msgstr "" -#: src/cfg.c:557 +#: src/cfg.c:556 #, c-format msgid "Failed to load configuration file %s: %s" msgstr "" -#: src/cfg.c:580 +#: src/cfg.c:579 #, c-format msgid "Failed to save configuration file %s." msgstr "" @@ -569,7 +569,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:63 src/server/server.c:87 +#: src/main.c:61 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -579,76 +579,72 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:76 +#: src/main.c:74 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:80 +#: src/main.c:78 msgid "Options:" msgstr "" -#: src/main.c:81 +#: src/main.c:79 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:90 +#: src/main.c:88 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:93 +#: src/main.c:91 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "" -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:563 +#: src/main.c:561 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" - #: src/rsensor.c:115 #, c-format msgid "%s: Fail to connect to: %s" @@ -755,6 +751,10 @@ msgstr "" msgid "About Psensor" msgstr "" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8748341..e27c191 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Brazilian Portuguese\n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "Falhou ao criar servidor web." -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Falhou ao criar servidor web." -#: src/cfg.c:580 +#: src/cfg.c:579 #, c-format msgid "Failed to save configuration file %s." msgstr "" @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPÇÃO]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Opções:" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -613,56 +613,46 @@ msgstr "" " -u, --url=URL a URL do psensor-server,\n" " exemplo: http://hostname:3131" -#: src/main.c:90 +#: src/main.c:88 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:93 +#: src/main.c:91 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Relatar falhas para: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "Página inicial de %s: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Ativar o modo de depuração" -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Uma instancia de Psensor já existe." -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Falhou ao criar servidor web." -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Celio Alves https://launchpad.net/~celio.alves\n" -" Daniel Serafim https://launchpad.net/~daniel-serafim\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" MestreLion https://launchpad.net/~mestrelion\n" -" Rafael Neri https://launchpad.net/~rafepel" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -773,6 +763,16 @@ msgstr "Copyright(c) 2010-2014 jeanfi@gmail.com" msgid "About Psensor" msgstr "Sobre o Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Celio Alves https://launchpad.net/~celio.alves\n" +" Daniel Serafim https://launchpad.net/~daniel-serafim\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" MestreLion https://launchpad.net/~mestrelion\n" +" Rafael Neri https://launchpad.net/~rafepel" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Site do Psensor" diff --git a/po/ru.po b/po/ru.po index 51d3bda..28c3323 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Russian\n" @@ -19,17 +19,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "Не удалось создать веб-сервер." -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Не удалось включить журналирование датчиков." -#: src/cfg.c:580 +#: src/cfg.c:579 #, fuzzy, c-format msgid "Failed to save configuration file %s." msgstr "Не удалось включить журналирование датчиков." @@ -579,7 +579,7 @@ msgstr "Файл журнала датчика не открыт." msgid "Sensor log not open, cannot close." msgstr "Файл журнала датчика не открыт, не удалось закрыть." -#: src/main.c:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Использование: %s [КЛЮЧ]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Опции:" -#: src/main.c:81 +#: src/main.c:79 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -614,63 +614,54 @@ msgstr "" " -h, --help показать эту справку и выйти\n" " -v, --version показать версию и выйти" -#: src/main.c:87 +#: src/main.c:85 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:90 +#: src/main.c:88 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" " -n, --new-instance принудительно запускает новую копию программы Psensor" -#: src/main.c:93 +#: src/main.c:91 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=УРОВЕНЬ установить уровень отладки, целое между 0 и 3" -#: src/main.c:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Сообщайте об ошибках на: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашняя страница: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor не был собран с поддержкой удалённых датчиков." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Включает режим отладки." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Попробуйте `%s --help' для дополнительной информации.↵\n" -#: src/main.c:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Копия Psensor уже запущена." -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Не удалось создать веб-сервер." -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Dmitry Serov https://launchpad.net/~dmitri-s93\n" -" Eugene Marshal https://launchpad.net/~lowrider\n" -" Ilya Volchanetskiy https://launchpad.net/~volchanetskiy\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -787,6 +778,15 @@ msgstr "" msgid "About Psensor" msgstr "О Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Dmitry Serov https://launchpad.net/~dmitri-s93\n" +" Eugene Marshal https://launchpad.net/~lowrider\n" +" Ilya Volchanetskiy https://launchpad.net/~volchanetskiy\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Домашняя страница Psensor" diff --git a/po/sl.po b/po/sl.po index 9459855..03c2546 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Slovenian \n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, c-format msgid "Failed to create the directory %s: %s" msgstr "" -#: src/cfg.c:557 +#: src/cfg.c:556 #, c-format msgid "Failed to load configuration file %s: %s" msgstr "" -#: src/cfg.c:580 +#: src/cfg.c:579 #, c-format msgid "Failed to save configuration file %s." msgstr "" @@ -570,7 +570,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:63 src/server/server.c:87 +#: src/main.c:61 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -580,79 +580,72 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" -#: src/main.c:76 +#: src/main.c:74 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:80 +#: src/main.c:78 msgid "Options:" msgstr "" -#: src/main.c:81 +#: src/main.c:79 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:90 +#: src/main.c:88 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:93 +#: src/main.c:91 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "" -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:563 +#: src/main.c:561 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" Sasa Batistic https://launchpad.net/~sasa-batistic" - #: src/rsensor.c:115 #, c-format msgid "%s: Fail to connect to: %s" @@ -759,6 +752,13 @@ msgstr "" msgid "About Psensor" msgstr "" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" Sasa Batistic https://launchpad.net/~sasa-batistic" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "" diff --git a/po/sr.po b/po/sr.po index 8efe44a..31fae70 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-11 21:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Serbian \n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, c-format msgid "Failed to create the directory %s: %s" msgstr "" -#: src/cfg.c:557 +#: src/cfg.c:556 #, c-format msgid "Failed to load configuration file %s: %s" msgstr "" -#: src/cfg.c:580 +#: src/cfg.c:579 #, c-format msgid "Failed to save configuration file %s." msgstr "" @@ -570,7 +570,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:63 src/server/server.c:87 +#: src/main.c:61 src/server/server.c:87 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -580,79 +580,72 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Употреба: %s [ОПЦИЈА]...\n" -#: src/main.c:76 +#: src/main.c:74 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:80 +#: src/main.c:78 msgid "Options:" msgstr "Опције:" -#: src/main.c:81 +#: src/main.c:79 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" msgstr "" -#: src/main.c:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" msgstr "" -#: src/main.c:90 +#: src/main.c:88 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr "" -#: src/main.c:93 +#: src/main.c:91 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Пријавите грешку на: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s матична страна: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "" -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "" -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Покушајте„%s --help“ за више информација.\n" -#: src/main.c:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:563 +#: src/main.c:561 msgid "Failed to create thread for monitoring sensors" msgstr "" -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" Мирослав Николић https://launchpad.net/~lipek" - #: src/rsensor.c:115 #, c-format msgid "%s: Fail to connect to: %s" @@ -759,6 +752,13 @@ msgstr "" msgid "About Psensor" msgstr "О Псензору" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" Мирослав Николић https://launchpad.net/~lipek" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Матична страница Псензора" diff --git a/po/sv.po b/po/sv.po index 67d705f..d6e0d2b 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Swedish\n" @@ -21,17 +21,17 @@ msgstr "" "X-Generator: Launchpad (build 17196)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, c-format msgid "Failed to create the directory %s: %s" msgstr "Misslyckades med att skapa katalogen %s: %s" -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Misslyckades med att tolka konfigurationsfilen: %s" -#: src/cfg.c:580 +#: src/cfg.c:579 #, c-format msgid "Failed to save configuration file %s." msgstr "Misslyckades med att spara konfigurationsfilen %s." @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Användning: %s [FLAGGA]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Alternativ:" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -629,54 +629,47 @@ msgstr "" " -u, --url=URL URL för psensor-server,\n" " exempelvis: http://hostname:3131" -#: src/main.c:90 +#: src/main.c:88 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:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Rapportera fel till: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s webbplats <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor har inte kompilerats med fjärrsensorstöd." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Aktivera felsökningsläge." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Det finns redan en Psensor-instans." -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Misslyckades med att skapa katalogen %s: %s" -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" Josef Andersson https://launchpad.net/~northar" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -794,6 +787,13 @@ msgstr "" msgid "About Psensor" msgstr "Om Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" Josef Andersson https://launchpad.net/~northar" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Psensor-webbplats" diff --git a/po/tr.po b/po/tr.po index 9fe8dc9..c3a1fb6 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-20 11:27+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Turkish \n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "Web sunucusu oluşturulamadı." -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi." -#: src/cfg.c:580 +#: src/cfg.c:579 #, fuzzy, c-format msgid "Failed to save configuration file %s." msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi." @@ -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:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kullanım: %s [SEÇENEK]...\n" -#: src/main.c:76 +#: src/main.c:74 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:80 +#: src/main.c:78 msgid "Options:" msgstr "Seçenekler:" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -627,56 +627,48 @@ msgstr "" " -u, --url=URL psensor sunucusunun bağlantısı,\n" " example: http://hostname:3131" -#: src/main.c:90 +#: src/main.c:88 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:93 +#: src/main.c:91 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:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Hataları rapor et:%s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfa: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Hata ayıklama modunu etkinleştirir." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 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:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "Bir Psensor örneği zaten mevcut." -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Web sunucusu oluşturulamadı." -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" zeugma https://launchpad.net/~sunder67\n" -" İbrahim Çelik https://launchpad.net/~ibrahimcelik89" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -797,6 +789,14 @@ msgstr "Telif Hakkı(c) 2010-2014 jeanfi@gmail.com" msgid "About Psensor" msgstr "Psensor Hakkında" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" zeugma https://launchpad.net/~sunder67\n" +" İbrahim Çelik https://launchpad.net/~ibrahimcelik89" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Psensor Anasayfası" diff --git a/po/uk.po b/po/uk.po index d5995b4..ee01da3 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Ukrainian \n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "Не вдалося створити веб-сервер." -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "Не вдалося створити веб-сервер." -#: src/cfg.c:580 +#: src/cfg.c:579 #, c-format msgid "Failed to save configuration file %s." msgstr "" @@ -577,7 +577,7 @@ msgstr "" msgid "Sensor log not open, cannot close." msgstr "" -#: src/main.c:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Використання: %s [КЛЮЧ]...\n" -#: src/main.c:76 +#: src/main.c:74 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "" -#: src/main.c:80 +#: src/main.c:78 msgid "Options:" msgstr "Опції:" -#: src/main.c:81 +#: src/main.c:79 msgid "" " -h, --help display this help and exit\n" " -v, --version display version information and exit" @@ -610,61 +610,53 @@ msgstr "" " -h, --help показати цю довідку і вийти\n" " -v, --version показати версію і вийти" -#: src/main.c:87 +#: src/main.c:85 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:90 +#: src/main.c:88 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance примусово створювати нову копію програми Psensor" -#: src/main.c:93 +#: src/main.c:91 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=РІВЕНЬ встановити рівень налагодження, ціле між 0 та 3" -#: src/main.c:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "Звітуйте про помилки до: %s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашня сторінка: <%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor не був зібраний з підтримкою віддалених датчиків." -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "Включає режим налагодження." -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Спробуйте `%s --help' щоб отримати більше інформації.\n" -#: src/main.c:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "" -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "Не вдалося створити веб-сервер." -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Ilya Volchanetskiy https://launchpad.net/~volchanetskiy\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" VPIP https://launchpad.net/~tymbood" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -779,6 +771,14 @@ msgstr "" msgid "About Psensor" msgstr "Про Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Ilya Volchanetskiy https://launchpad.net/~volchanetskiy\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" VPIP https://launchpad.net/~tymbood" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Домашня сторінка Psensor" diff --git a/po/zh_CN.po b/po/zh_CN.po index 7ad7da0..973f507 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 19:05+0200\n" +"POT-Creation-Date: 2014-10-01 00:43+0200\n" "PO-Revision-Date: 2014-09-11 21:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Chinese (simplified)\n" @@ -18,17 +18,17 @@ msgstr "" "X-Launchpad-Export-Date: 2014-09-21 08:56+0000\n" "X-Generator: Launchpad (build 17196)\n" -#: src/cfg.c:510 +#: src/cfg.c:509 #, fuzzy, c-format msgid "Failed to create the directory %s: %s" msgstr "无法创建网络服务器。" -#: src/cfg.c:557 +#: src/cfg.c:556 #, fuzzy, c-format msgid "Failed to load configuration file %s: %s" msgstr "无法激活监测器日志。" -#: src/cfg.c:580 +#: src/cfg.c:579 #, fuzzy, c-format msgid "Failed to save configuration file %s." msgstr "无法激活监测器日志。" @@ -578,7 +578,7 @@ msgstr "监测器日志文件未打开。" msgid "Sensor log not open, cannot close." msgstr "监测器日志未打开，故无法关闭。" -#: src/main.c:63 src/server/server.c:87 +#: src/main.c:61 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:74 src/server/server.c:97 +#: src/main.c:72 src/server/server.c:97 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [选项]...\n" -#: src/main.c:76 +#: src/main.c:74 msgid "" "Psensor is a GTK+ application for monitoring hardware sensors, including " "temperatures and fan speeds." msgstr "Psensor 是一款 GTK+ 应用程序，可监测硬件传感器，包括温度与风扇转速。" -#: src/main.c:80 +#: src/main.c:78 msgid "Options:" msgstr "选项：" -#: src/main.c:81 +#: src/main.c:79 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:87 +#: src/main.c:85 msgid "" " -u, --url=URL the URL of the psensor-server,\n" " example: http://hostname:3131" @@ -624,55 +624,46 @@ msgstr "" " -u, --url=URL psensor 服务器 URL\n" " 例如：http://hostname:3131" -#: src/main.c:90 +#: src/main.c:88 msgid " -n, --new-instance force the creation of a new Psensor application" msgstr " -n, --new-instance 强制创建一个新的 Psensor 例程" -#: src/main.c:93 +#: src/main.c:91 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d，--debug=LEVEL 设置调试等级，等级为 0 到 3 之间的整数" -#: src/main.c:98 src/server/server.c:120 +#: src/main.c:96 src/server/server.c:120 #, c-format msgid "Report bugs to: %s\n" msgstr "报告问题至：%s\n" -#: src/main.c:100 src/server/server.c:122 +#: src/main.c:98 src/server/server.c:122 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 主页：<%s>\n" -#: src/main.c:425 +#: src/main.c:423 msgid "Psensor has not been compiled with remote sensor support." msgstr "Psensor 不支持远程传感器。" -#: src/main.c:496 +#: src/main.c:494 msgid "Enables debug mode." msgstr "启用调试模式。" -#: src/main.c:508 src/server/server.c:386 +#: src/main.c:506 src/server/server.c:386 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "试用‘%s --help’来获得更多信息。\n" -#: src/main.c:521 +#: src/main.c:519 msgid "A Psensor instance already exists." msgstr "已存在一个 Psensor 例程。" -#: src/main.c:563 +#: src/main.c:561 #, fuzzy msgid "Failed to create thread for monitoring sensors" msgstr "无法创建网络服务器。" -#: src/main.c:584 src/ui.c:97 -msgid "translator-credits" -msgstr "" -"Launchpad Contributions:\n" -" Jean-Philippe Orsini https://launchpad.net/~jfi\n" -" Wang Dianjin https://launchpad.net/~tuhaihe\n" -" tmpplus https://launchpad.net/~tmpplus.7328-deactivatedaccount\n" -" 大宝 https://launchpad.net/~linux-dabao" - #: src/rsensor.c:115 #, fuzzy, c-format msgid "%s: Fail to connect to: %s" @@ -786,6 +777,15 @@ msgstr "" msgid "About Psensor" msgstr "关于 Psensor" +#: src/ui.c:97 +msgid "translator-credits" +msgstr "" +"Launchpad Contributions:\n" +" Jean-Philippe Orsini https://launchpad.net/~jfi\n" +" Wang Dianjin https://launchpad.net/~tuhaihe\n" +" tmpplus https://launchpad.net/~tmpplus.7328-deactivatedaccount\n" +" 大宝 https://launchpad.net/~linux-dabao" + #: src/ui.c:100 msgid "Psensor Homepage" msgstr "Psensor 主页" diff --git a/src/cfg.c b/src/cfg.c index 3edc4df..c493a9e 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -652,38 +652,79 @@ void config_set_sensor_name(const char *sid, const char *name) sensor_set_str(sid, ATT_SENSOR_NAME, name); } -void config_set_sensor_color(const char *sid, const struct color *color) -{ - char *scolor; - - scolor = color_to_str(color); +void config_set_sensor_color(const char *sid, const GdkRGBA *color) +{ + gchar *str; + + str = gdk_rgba_to_string(color); + + sensor_set_str(sid, ATT_SENSOR_COLOR, str); + + g_free(str); +} + +static char *next_default_color(void) +{ + /* copied from the default colors of the gtk color color + * chooser. */ + const char *default_colors[27] = { + "#ef2929", /* Scarlet Red */ + "#fcaf3e", /* Orange */ + "#fce94f", /* Butter */ + "#8ae234", /* Chameleon */ + "#729fcf", /* Sky Blue */ + "#ad7fa8", /* Plum */ + "#e9b96e", /* Chocolate */ + "#888a85", /* Aluminum 1 */ + "#eeeeec", /* Aluminum 2 */ + "#cc0000", + "#f57900", + "#edd400", + "#73d216", + "#3465a4", + "#75507b", + "#c17d11", + "#555753", + "#d3d7cf", + "#a40000", + "#ce5c00", + "#c4a000", + "#4e9a06", + "#204a87", + "#5c3566", + "#8f5902", + "#2e3436", + "#babdb6" + }; + static int next_idx; + char *c; + + c = default_colors[next_idx % 27]; + + next_idx++; - sensor_set_str(sid, ATT_SENSOR_COLOR, scolor); - - free(scolor); + return c; } -struct color * -config_get_sensor_color(const char *sid, const struct color *dft) +GdkRGBA *config_get_sensor_color(const char *sid) { - char *scolor; - struct color *color; - - scolor = sensor_get_str(sid, ATT_SENSOR_COLOR); + GdkRGBA rgba; + char *str; + gboolean ret; - if (scolor) - color = str_to_color(scolor); - else - color = NULL; + str = sensor_get_str(sid, ATT_SENSOR_COLOR); - if (!color) { - color = color_new(dft->red, dft->green, dft->blue); - config_set_sensor_color(sid, color); + if (str) { + ret = gdk_rgba_parse(&rgba, str); + free(str); } - free(scolor); + if (!str || !ret) { + gdk_rgba_parse(&rgba, next_default_color()); + config_set_sensor_color(sid, &rgba); + } - return color; + return gdk_rgba_copy(&rgba); } bool config_is_sensor_graph_enabled(const char *sid) diff --git a/src/cfg.h b/src/cfg.h index c7d764b..36d9613 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -19,7 +19,7 @@ #ifndef _PSENSOR_CONFIG_H_ #define _PSENSOR_CONFIG_H_ -#include +#include #include #include @@ -84,8 +84,8 @@ void config_save(const struct config *); void config_cleanup(void); -struct color *config_get_sensor_color(const char *sid, const struct color *); -void config_set_sensor_color(const char *sid, const struct color *); +GdkRGBA *config_get_sensor_color(const char *); +void config_set_sensor_color(const char *, const GdkRGBA *); int config_get_sensor_alarm_high_threshold(const char *); void config_set_sensor_alarm_high_threshold(const char *, int); diff --git a/src/graph.c b/src/graph.c index 9f87eda..0ac3143 100644 --- a/src/graph.c +++ b/src/graph.c @@ -297,6 +297,7 @@ static void draw_sensor_smooth_curve(struct psensor *s, int i, dt, vdt, j, k, found; double x[4], y[4], v; time_t t, t0, *stimes; + GdkRGBA *color; if (!times) times = g_hash_table_new_full(g_str_hash, @@ -306,10 +307,13 @@ static void draw_sensor_smooth_curve(struct psensor *s, stimes = g_hash_table_lookup(times, s->id); + color = config_get_sensor_color(s->id); + cairo_set_source_rgb(cr, - s->color->red, - s->color->green, - s->color->blue); + color->red, + color->green, + color->blue); + gdk_rgba_free(color); /* search the index of the first measure used as a start point * of a Bezier curve. The start and end points of the Bezier @@ -399,11 +403,14 @@ static void draw_sensor_curve(struct psensor *s, { int first, i, t, dt, vdt; double v, x, y; + GdkRGBA *color; + color = config_get_sensor_color(s->id); cairo_set_source_rgb(cr, - s->color->red, - s->color->green, - s->color->blue); + color->red, + color->green, + color->blue); + gdk_rgba_free(color); dt = et - bt; first = 1; diff --git a/src/lib/psensor.c b/src/lib/psensor.c index d019886..9073d12 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -57,8 +57,6 @@ struct psensor *psensor_create(char *id, psensor->cb_alarm_raised_data = NULL; psensor->alarm_raised = 0; - psensor->color = NULL; - psensor->provider_data = NULL; psensor->provider_data_free_fct = &free; @@ -101,9 +99,6 @@ void psensor_free(struct psensor *s) if (s->chip) free(s->chip); - if (s->color) - free(s->color); - measures_free(s->measures); if (s->provider_data && s->provider_data_free_fct) diff --git a/src/lib/psensor.h b/src/lib/psensor.h index d08b58d..56b349f 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -78,9 +77,6 @@ struct psensor { * oldest measure. */ struct measure *measures; - /* Color of the sensor used for the graph */ - struct color *color; - /* see psensor_type */ unsigned int type; diff --git a/src/main.c b/src/main.c index ad964dc..1eea594 100644 --- a/src/main.c +++ b/src/main.c @@ -224,54 +224,6 @@ static void cb_alarm_raised(struct psensor *sensor, void *data) } } -static void associate_colors(struct psensor **sensors) -{ - GdkRGBA rgba; - /* copied from the default colors of the gtk color color - * chooser. */ - const char *default_colors[27] = { - "#ef2929", /* Scarlet Red */ - "#fcaf3e", /* Orange */ - "#fce94f", /* Butter */ - "#8ae234", /* Chameleon */ - "#729fcf", /* Sky Blue */ - "#ad7fa8", /* Plum */ - "#e9b96e", /* Chocolate */ - "#888a85", /* Aluminum 1 */ - "#eeeeec", /* Aluminum 2 */ - "#cc0000", - "#f57900", - "#edd400", - "#73d216", - "#3465a4", - "#75507b", - "#c17d11", - "#555753", - "#d3d7cf", - "#a40000", - "#ce5c00", - "#c4a000", - "#4e9a06", - "#204a87", - "#5c3566", - "#8f5902", - "#2e3436", - "#babdb6" - }; - int i; - struct psensor **cur; - struct color c; - - for (cur = sensors, i = 0; *cur; cur++, i++) { - gdk_rgba_parse(&rgba, default_colors[i % 27]); - c.red = rgba.red; - c.green = rgba.green; - c.blue = rgba.blue; - - (*cur)->color = config_get_sensor_color((*cur)->id, &c); - } -} - static void associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui) { @@ -451,7 +403,6 @@ static struct psensor **create_sensors_list(const char *url) } associate_preferences(sensors); - associate_colors(sensors); return sensors; } diff --git a/src/ui_color.c b/src/ui_color.c index 85277ff..3f91aa9 100644 --- a/src/ui_color.c +++ b/src/ui_color.c @@ -18,53 +18,29 @@ */ #include -#include "ui_color.h" +#include -int ui_change_color(const char *title, struct color *col, GtkWindow *win) +/* + * UI to change a given color. + * + * Returns 1 if the color has been modified. + */ +bool ui_change_color(const char *title, GdkRGBA *color, GtkWindow *win) { - GdkRGBA color; int res; GtkColorChooserDialog *colordlg; - double r, g, b; - - color.red = col->red; - color.green = col->green; - color.blue = col->blue; - color.alpha = 1; colordlg = GTK_COLOR_CHOOSER_DIALOG (gtk_color_chooser_dialog_new(title, win)); gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(colordlg), 0); - gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(colordlg), &color); + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(colordlg), color); res = gtk_dialog_run(GTK_DIALOG(colordlg)); - if (res == GTK_RESPONSE_OK) { - gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(colordlg), &color); - - /* GdkRGBA defines rgb as double 0..1 but chooser returns - * values > 1 when selecting a custom undefined color. - * Not sure whether that's a gtk/gdk bug. */ - - if (color.red > 1) - r = 1; - else - r = color.red; - - if (color.green > 1) - g = 1; - else - g = color.green; - - if (color.blue > 1) - b = 1; - else - b = color.blue; - - color_set(col, r, g, b); - } + if (res == GTK_RESPONSE_OK) + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(colordlg), color); gtk_widget_destroy(GTK_WIDGET(colordlg)); diff --git a/src/ui_color.h b/src/ui_color.h index 8d957f1..122db01 100644 --- a/src/ui_color.h +++ b/src/ui_color.h @@ -19,13 +19,8 @@ #ifndef _PSENSOR_UI_COLOR_H_ #define _PSENSOR_UI_COLOR_H_ -#include "color.h" +#include -/* - * UI to change a given color. - * - * Returns 1 if the color has been modified. - */ -int ui_change_color(const char *title, struct color *col, GtkWindow *win); +bool ui_change_color(const char *, GdkRGBA *, GtkWindow *); #endif diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c index 53c7336..52df001 100644 --- a/src/ui_sensorlist.c +++ b/src/ui_sensorlist.c @@ -58,7 +58,7 @@ static void populate(struct ui_psensor *ui) { GtkTreeIter iter; GtkListStore *store; - GdkRGBA color; + GdkRGBA *color; char *scolor; struct psensor **ordered_sensors, **s_cur, *s; unsigned int enabled; @@ -73,15 +73,11 @@ static void populate(struct ui_psensor *ui) gtk_list_store_append(store, &iter); - color.red = s->color->red; - color.green = s->color->green; - color.blue = s->color->blue; - color.alpha = 1.0; + color = config_get_sensor_color(s->id); - scolor = gdk_rgba_to_string(&color); + scolor = gdk_rgba_to_string(color); enabled = config_is_sensor_enabled(s->id); - gtk_list_store_set(store, &iter, COL_NAME, s->name, COL_COLOR_STR, scolor, @@ -91,6 +87,7 @@ static void populate(struct ui_psensor *ui) COL_DISPLAY_ENABLED, enabled, -1); free(scolor); + gdk_rgba_free(color); } free(ordered_sensors); } @@ -284,6 +281,7 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data) GtkTreeView *view; struct psensor *s; int coli; + GdkRGBA *color; ui = (struct ui_psensor *)data; view = ui->sensors_tree; @@ -294,13 +292,15 @@ static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data) coli = col_index_to_col(get_col_index_at_pos(view, event->x)); if (coli == COL_COLOR) { + color = config_get_sensor_color(s->id); if (ui_change_color(_("Select sensor color"), - s->color, + color, GTK_WINDOW(ui->main_window))) { + config_set_sensor_color(s->id, color); ui_sensorlist_update(ui, 1); - config_set_sensor_color(s->id, s->color); config_sync(); } + gdk_rgba_free(color); return TRUE; } else if (coli >= 0 && coli != COL_GRAPH_ENABLED) { menu = create_sensor_popup(ui, s); diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index 78fb551..91f24e3 100644 --- a/src/ui_sensorpref.c +++ b/src/ui_sensorpref.c @@ -28,7 +28,6 @@ #include #include - enum { COL_NAME = 0, COL_SENSOR_PREF @@ -38,7 +37,7 @@ struct sensor_pref { struct psensor *sensor; char *name; int graph_enabled; - struct color *color; + GdkRGBA *color; int alarm_enabled; int alarm_high_threshold; int alarm_low_threshold; @@ -63,7 +62,7 @@ sensor_pref_new(struct psensor *s, struct config *cfg) p->name = strdup(s->name); p->graph_enabled = config_is_sensor_graph_enabled(s->id); p->alarm_enabled = config_get_sensor_alarm_enabled(s->id); - p->color = color_dup(s->color); + p->color = config_get_sensor_color(s->id); p->display_enabled = config_is_sensor_enabled(s->id); if (cfg->temperature_unit == CELSIUS) { @@ -89,7 +88,7 @@ static void sensor_pref_free(struct sensor_pref *p) return; free(p->name); - free(p->color); + gdk_rgba_free(p->color); free(p); } @@ -181,14 +180,11 @@ ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data) void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data) { struct sensor_pref *p; - GdkRGBA color; p = get_selected_sensor_pref(GTK_TREE_VIEW(data)); - if (p) { - gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color); - color_set(p->color, color.red, color.green, color.blue); - } + if (p) + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), p->color); } void @@ -223,7 +219,6 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder) *w_appindicator_label_enabled, *w_display; GtkColorButton *w_color; GtkSpinButton *w_high_threshold, *w_low_threshold; - GdkRGBA color; struct psensor *s; int use_celsius; @@ -253,10 +248,9 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder) "sensor_enable_checkbox")); gtk_toggle_button_set_active(w_display, p->display_enabled); - color = color_to_GdkRGBA(p->color); w_color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, "sensor_color")); - gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_color), &color); + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_color), p->color); w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "sensor_alarm")); @@ -383,11 +377,7 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg) config_set_sensor_alarm_enabled(s->id, p->alarm_enabled); - color_set(s->color, - p->color->red, - p->color->green, - p->color->blue); - config_set_sensor_color(s->id, s->color); + config_set_sensor_color(s->id, p->color); config_set_appindicator_enabled(s->id, p->appindicator_enabled); -- 2.7.4