From fb3b77c1b0f2a1d461b18580497c1ab4a6d6616c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 24 Aug 2012 09:59:52 +0000 Subject: [PATCH] adding logging of sensors --- NEWS | 1 + po/Makefile.in | 8 ++--- po/POTFILES.in | 1 + po/de.po | 64 ++++++++++++++++++++++------------ po/es.po | 67 ++++++++++++++++++++++++------------ po/fr.po | 67 ++++++++++++++++++++++++------------ po/hu.po | 67 ++++++++++++++++++++++++------------ po/it.po | 67 ++++++++++++++++++++++++------------ po/lv.po | 64 ++++++++++++++++++++++------------ po/psensor.pot | 63 ++++++++++++++++++++++------------ po/pt_BR.po | 64 ++++++++++++++++++++++------------ po/ru.po | 66 +++++++++++++++++++++++------------ po/sl.po | 63 ++++++++++++++++++++++------------ po/sr.po | 64 ++++++++++++++++++++++------------ po/tr.po | 63 ++++++++++++++++++++++------------ po/uk.po | 65 +++++++++++++++++++++++------------ po/zh_CN.po | 67 ++++++++++++++++++++++++------------ src/lib/Makefile.am | 1 + src/lib/Makefile.in | 17 +++++----- src/lib/slog.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ src/lib/slog.h | 28 +++++++++++++++ src/server/description.txt | 27 +++++++++++++++ src/server/server.c | 19 +++++++++-- 23 files changed, 790 insertions(+), 308 deletions(-) create mode 100644 src/lib/slog.c create mode 100644 src/lib/slog.h diff --git a/NEWS b/NEWS index cd31512..3d7bed0 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ ** added Spanish translation from LP (Javier buik8roadmaster@hotmail.com). +** psensor-server: added sensors log file (--sensor-log-file). * v0.7.0.3 diff --git a/po/Makefile.in b/po/Makefile.in index 01ca424..e5e2145 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -21,7 +21,7 @@ srcdir = . top_srcdir = .. -prefix = /usr/local +prefix = /tmp exec_prefix = ${prefix} datarootdir = ${prefix}/share datadir = ${datarootdir} @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh -d -install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/psensor/trunk/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/po/POTFILES.in b/po/POTFILES.in index 4ae944a..33f31ec 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,6 +8,7 @@ src/lib/lmsensor.c src/lib/log.c src/lib/nvidia.c src/lib/psensor.c +src/lib/slog.c src/main.c src/rsensor.c src/server/server.c diff --git a/po/de.po b/po/de.po index 7449107..c73dfa5 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-06-09 17:45+0000\n" "Last-Translator: Daniel Winzen \n" "Language-Team: German\n" @@ -110,7 +110,12 @@ msgstr "Graph" msgid "Measure update interval:" msgstr "Messintervall:" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "Menü aktivieren" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Sensoren" @@ -246,6 +251,19 @@ msgstr "U/min" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, fuzzy, c-format +msgid "Cannot open sensor log file: %s" +msgstr "Protokolldatei kann nicht geöffnet werden: %s" + +#: src/lib/slog.c:43 +msgid "slog_init: gettimeofday failed." +msgstr "" + +#: src/lib/slog.c:67 +msgid "slog_write_sensors: gettimeofday failed." +msgstr "" + #: src/main.c:77 #, c-format msgid "" @@ -262,7 +280,7 @@ msgstr "" "weiterverbreiten.\n" "Sie wird OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Aufruf: %s [OPTION] …\n" @@ -307,12 +325,12 @@ msgstr "" " -d, --debug=STUFE Fehlerdiagnosestufe festlegen, Ganzzahl zwischen 0 und " "3" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Programmfehler melden an: %s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s-Website: <%s>\n" @@ -325,7 +343,7 @@ msgstr "" msgid "Enables debug mode." msgstr "Fehlerdiagnosemodus wird aktiviert." -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n" @@ -349,18 +367,18 @@ msgstr "Ungültiger Inhalt: %s" msgid "Invalid JSON: %s" msgstr "Ungültiges JSON: %s" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "

Anhalten des Servers angefordert

" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Seite nicht gefunden – Gehen Sie zurück zur Startseite

" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -376,13 +394,13 @@ msgstr "" "weiterverbreiten.\n" "Sie wird OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server ist ein HTTP-Server zur Fernüberwachung von Hardware-Sensoren." -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -390,49 +408,53 @@ msgstr "" " -h, --help\t\tDiese Hilfe anzeigen und beenden\n" " -v, --version\t\tVersionsinformationen anzeigen und beenden" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:294 +#: src/server/server.c:110 +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr "" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "HTTP Abfrage: %s" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "Keine Sensoren erkannt." -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "Web-Server wurde gestartet auf Port: %d" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "WWW-Ordner: %s" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "Adresse: http://localhost:%d" diff --git a/po/es.po b/po/es.po index aa2c3a2..0a61a7e 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-08-19 01:12+0000\n" "Last-Translator: Javier \n" "Language-Team: Spanish \n" @@ -110,7 +110,12 @@ msgstr "Gráfica" msgid "Measure update interval:" msgstr "Medir sensores cada:" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "Activar menú" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Sensores" @@ -246,6 +251,21 @@ msgstr "RPM" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, fuzzy, c-format +msgid "Cannot open sensor log file: %s" +msgstr "Imposible abrir el archivo de registro: %s" + +#: src/lib/slog.c:43 +#, fuzzy +msgid "slog_init: gettimeofday failed." +msgstr "Error en la adquisición del horario." + +#: src/lib/slog.c:67 +#, fuzzy +msgid "slog_write_sensors: gettimeofday failed." +msgstr "Error en la adquisición del horario." + #: src/main.c:77 #, c-format msgid "" @@ -262,7 +282,7 @@ msgstr "" "y apoyada por su autor.\n" "No existe NINGUNA GARANTÍA hasta donde la ley lo permita.\n" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPTION]...\n" @@ -314,12 +334,12 @@ msgstr "" " -d, --depurar=NIVEL Establece el nivel de depuración con un valor entre " "0 y 3" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Comunicar fallos: %s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s Página Oficial: <%s>\n" @@ -332,7 +352,7 @@ msgstr "Psensor ha sido compilado sin respaldo para sensores remotos." msgid "Enables debug mode." msgstr "Activa el modo de depuración" -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Introducir `%s --ayuda' para obtener más información\n" @@ -356,18 +376,18 @@ msgstr "Contenido no válido:%s" msgid "Invalid JSON: %s" msgstr "JSON no válido:%s" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "

El servidor solicitó detenerse

" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Página no encontrada- Ir a Main page

" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -383,14 +403,14 @@ msgstr "" "apoyada por el autor. \n" "No existe NINGUNA GARANTÍA hasta donde la ley lo permita.\n" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server es un servidor HTTP para obtener información de los sensores " "de forma remota." -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -398,7 +418,7 @@ msgstr "" " -h, --ayuda\t\tMuestra esta ayuda.\n" " -v, --versión\t\tMuestra la versión." -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -406,45 +426,50 @@ msgstr "" " -p,--port=PORT\tPuerto del servidor web. \n" " -w,--wdir=DIR\t\tDirectorio de servidores web." -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" " -d, --depurar=NIVEL Establece el nivel de depuración con un número de " "0 a 3" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH establece el archivo de registro en PATH" -#: src/server/server.c:294 +#: src/server/server.c:110 +#, fuzzy +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr " -l, --log-file=PATH establece el archivo de registro en PATH" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "Petición HTTP:%s" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "Activa el modo de depuración:%d" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "No se han detectado sensores." -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "Fallo al crear el servidor Web" -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "Servidor web iniciado en el puerto:%d" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "directorio WWW:%s" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" diff --git a/po/fr.po b/po/fr.po index 78b5313..37cd2b5 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-05-13 18:15+0000\n" "Last-Translator: jeanfi \n" "Language-Team: French <>\n" @@ -110,7 +110,12 @@ msgstr "Graphe" msgid "Measure update interval:" msgstr "Intervalle de mise à jour des mesures:" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "Activer le menu" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Sondes" @@ -248,6 +253,21 @@ msgstr "RPM" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, fuzzy, c-format +msgid "Cannot open sensor log file: %s" +msgstr "Impossible d'ouvrir le journal: %s" + +#: src/lib/slog.c:43 +#, fuzzy +msgid "slog_init: gettimeofday failed." +msgstr "Échec de gettimeofday." + +#: src/lib/slog.c:67 +#, fuzzy +msgid "slog_write_sensors: gettimeofday failed." +msgstr "Échec de gettimeofday." + #: src/main.c:77 #, c-format msgid "" @@ -265,7 +285,7 @@ msgstr "" "Ce logiciel n'est accompagné d’ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" "autorisées par la loi applicable.\n" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Utilisation: %s [OPTION]...\n" @@ -317,12 +337,12 @@ msgstr "" " -d, --debug=LEVEL assigner le niveau de débogage, nombre entier entre 0 " "et 3" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Signaler les bugs à: %s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s page d’accueil: <%s>\n" @@ -336,7 +356,7 @@ msgstr "" msgid "Enables debug mode." msgstr "Active le mode de débogage." -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez `%s --help' pour plus d'informations.\n" @@ -360,18 +380,18 @@ msgstr "Contenu invalide: %s" msgid "Invalid JSON: %s" msgstr "JSON incorrect: %s" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "

L’arrêt du serveur a été demandé

" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Page non trouvée - Allez à Main page

" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -388,14 +408,14 @@ msgstr "" "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n" "autorisées par la loi applicable.\n" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server est un serveur HTTP pour surveiller à distance les sondes " "matérielles." -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -403,7 +423,7 @@ msgstr "" " -h, --help\t\tafficher cette aide et quitter\n" " -v, --version\t\tafficher les informations de version et quitter" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -411,45 +431,50 @@ msgstr "" " -p,--port=PORT\tport du serveur Web\n" " -w,--wdir=DIR\t\trépertoire contenant les pages du serveur Web" -#: src/server/server.c:105 +#: src/server/server.c:107 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/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH assigner le chemin d’accès au journal" -#: src/server/server.c:294 +#: src/server/server.c:110 +#, fuzzy +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr " -l, --log-file=PATH assigner le chemin d’accès au journal" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "Requête HTTP: %s" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "Activation du mode de débogage: %d" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "Aucune sonde détectée." -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "Échec de la création du serveur Web." -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "Le serveur Web a été démarre sur le port: %d" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "WWW répertoire: %s" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" diff --git a/po/hu.po b/po/hu.po index 2d33467..c53bb5d 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-07-09 17:56+0000\n" "Last-Translator: Richard Somlói \n" "Language-Team: Hungarian \n" @@ -111,7 +111,12 @@ msgstr "Grafikon" msgid "Measure update interval:" msgstr "Mérések frissítési időköze:" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "Menü engedélyezése" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Érzékelők" @@ -247,6 +252,21 @@ msgstr "RPM" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, fuzzy, c-format +msgid "Cannot open sensor log file: %s" +msgstr "A naplófájl megnyitása sikertelen: %s" + +#: src/lib/slog.c:43 +#, fuzzy +msgid "slog_init: gettimeofday failed." +msgstr "gettimeofday meghiúsult." + +#: src/lib/slog.c:67 +#, fuzzy +msgid "slog_write_sensors: gettimeofday failed." +msgstr "gettimeofday meghiúsult." + #: src/main.c:77 #, c-format msgid "" @@ -262,7 +282,7 @@ 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:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Használat: %s [KAPCSOLÓK]...\n" @@ -313,12 +333,12 @@ 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:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "A talált hibákat itt jelentse be: %s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s honlap: <%s>\n" @@ -331,7 +351,7 @@ msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva." msgid "Enables debug mode." msgstr "Hibakeresési mód engedélyezése." -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "További információkért adja ki a „%s --help” parancsot.\n" @@ -355,18 +375,18 @@ msgstr "Érvénytelen tartalom: %s" msgid "Invalid JSON: %s" msgstr "Érvénytelen JSON: %s" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "

A kiszolgáló leállítást kért

" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Az oldal nem található - Ugrás a Főoldalra" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -381,14 +401,14 @@ 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/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "A psensor-server egy HTTP kiszolgáló a hardver érzékelőinek figyelésére " "távolról." -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -396,7 +416,7 @@ msgstr "" " -h, --help\t\tezen súgó megjelenítése, majd kilépés\n" " -v, --version\t\tverzióinformáció megjelenítése, majd kilépés" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -404,44 +424,49 @@ msgstr "" " -p,--port=PORT\twebkiszolgáló portja\n" " -w,--wdir=DIR\t\ta webkiszolgáló oldalait tartalmazó mappa" -#: src/server/server.c:105 +#: src/server/server.c:107 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/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=ÚTVONAL a naplófájl ÚTVONALÁNAK beállítása" -#: src/server/server.c:294 +#: src/server/server.c:110 +#, fuzzy +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr " -l, --log-file=ÚTVONAL a naplófájl ÚTVONALÁNAK beállítása" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "HTTP-kérés: %s" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "Hibakeresési mód engedélyezése: %d" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "Nem találhatók érzékelők." -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "Nem sikerült létrehozni a webkiszolgálót." -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "A webkiszolgáló elindult ezen a porton: %d" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "WWW könyvtár: %s" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" diff --git a/po/it.po b/po/it.po index 81abb39..389e9cf 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-08-13 08:20+0000\n" "Last-Translator: Andrea Bernini \n" "Language-Team: Italian\n" @@ -110,7 +110,12 @@ msgstr "Grafico" msgid "Measure update interval:" msgstr "Intervallo di aggiornamento delle misure" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "Abilita il menù" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Sensori" @@ -246,6 +251,21 @@ msgstr "RPM" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, fuzzy, c-format +msgid "Cannot open sensor log file: %s" +msgstr "Impossibile aprire il file di log: %s" + +#: src/lib/slog.c:43 +#, fuzzy +msgid "slog_init: gettimeofday failed." +msgstr "gettimeofday fallito." + +#: src/lib/slog.c:67 +#, fuzzy +msgid "slog_write_sensors: gettimeofday failed." +msgstr "gettimeofday fallito." + #: src/main.c:77 #, c-format msgid "" @@ -256,7 +276,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPZIONE]...\n" @@ -308,12 +328,12 @@ 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:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Segnalare i bug a: %s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s home page: <%s>\n" @@ -326,7 +346,7 @@ msgstr "Psensor è stato compilato senza il supporto per sensori remoti." msgid "Enables debug mode." msgstr "Abilita la modalità debug." -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Usare '%s --help' per maggiori informazioni.\n" @@ -350,18 +370,18 @@ msgstr "Conenuto non valido: %s" msgid "Invalid JSON: %s" msgstr "JSON non valido: %s" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "

Arresto del server richiesto

" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Pagina non trovata - Vai a Pagina principale" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -371,14 +391,14 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server è un server HTTP per il monitoraggio remoto di sensori " "hardware." -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -386,7 +406,7 @@ msgstr "" " -h, --help\t\tmostra questo help ed esce\n" " -v, --version\t\tmostra le informazioni sulla versione ed esce" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -394,44 +414,49 @@ msgstr "" " -p,--port=PORT\tporta del server web\n" " -w,--wdir=DIR\t\tdirectory che contiene le pagine web" -#: src/server/server.c:105 +#: src/server/server.c:107 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/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH imposta il file di log su PATH" -#: src/server/server.c:294 +#: src/server/server.c:110 +#, fuzzy +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr " -l, --log-file=PATH imposta il file di log su PATH" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "HTTP Request: %s" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "Abilita modalità di debug: %d" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "Nessun sensore rilevato." -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "Impossibile creare il Web server." -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "Web server inizializzato sulla porta: %d" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "WWW directory: %s" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" diff --git a/po/lv.po b/po/lv.po index 206675d..ad634b7 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-07-15 16:16+0000\n" "Last-Translator: tuxmaniack \n" "Language-Team: Latvian \n" @@ -110,7 +110,12 @@ msgstr "Grafiks" msgid "Measure update interval:" msgstr "Mērījumu atjaunināšanas intervāls:" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "Aktivizēt izvēlni" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Sensori" @@ -246,6 +251,19 @@ msgstr "" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, c-format +msgid "Cannot open sensor log file: %s" +msgstr "" + +#: src/lib/slog.c:43 +msgid "slog_init: gettimeofday failed." +msgstr "" + +#: src/lib/slog.c:67 +msgid "slog_write_sensors: gettimeofday failed." +msgstr "" + #: src/main.c:77 #, c-format msgid "" @@ -256,7 +274,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" @@ -297,12 +315,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Ziņojiet kļūdas uz: %s.\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s mājas lapa: <%s>\n" @@ -315,7 +333,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -339,16 +357,16 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -358,60 +376,64 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:294 +#: src/server/server.c:110 +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr "" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "" -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/po/psensor.pot b/po/psensor.pot index 6efebed..8898c0c 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -109,7 +109,11 @@ msgstr "" msgid "Measure update interval:" msgstr "" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +msgid "Enable log of measures" +msgstr "" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "" @@ -245,6 +249,19 @@ msgstr "" msgid "%" msgstr "" +#: src/lib/slog.c:38 +#, c-format +msgid "Cannot open sensor log file: %s" +msgstr "" + +#: src/lib/slog.c:43 +msgid "slog_init: gettimeofday failed." +msgstr "" + +#: src/lib/slog.c:67 +msgid "slog_write_sensors: gettimeofday failed." +msgstr "" + #: src/main.c:77 #, c-format msgid "" @@ -255,7 +272,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" @@ -296,12 +313,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -314,7 +331,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -338,16 +355,16 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -357,60 +374,64 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:294 +#: src/server/server.c:110 +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr "" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "" -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index de30e8a..7e0715e 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-06-25 13:26+0000\n" "Last-Translator: Rafael Neri \n" "Language-Team: Brazilian Portuguese\n" @@ -110,7 +110,12 @@ msgstr "Grafo" msgid "Measure update interval:" msgstr "" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "Habilitar menu" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Sensores" @@ -246,6 +251,19 @@ msgstr "RPM" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, c-format +msgid "Cannot open sensor log file: %s" +msgstr "" + +#: src/lib/slog.c:43 +msgid "slog_init: gettimeofday failed." +msgstr "" + +#: src/lib/slog.c:67 +msgid "slog_write_sensors: gettimeofday failed." +msgstr "" + #: src/main.c:77 #, c-format msgid "" @@ -261,7 +279,7 @@ msgstr "" "Este é um software livre: você é livre para modificar e redistribuir.\n" "Não há NENHUMA GARANTIA, na medida do permitido por lei.\n" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Uso: %s [OPÇÃO]...\n" @@ -302,12 +320,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Relatar falhas para: %s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "Página inicial de %s: <%s>\n" @@ -320,7 +338,7 @@ msgstr "" msgid "Enables debug mode." msgstr "Ativar o modo de depuração" -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Utilize `%s --help' para mais informações.\n" @@ -344,18 +362,18 @@ msgstr "Conteúdo inválido: %s" msgid "Invalid JSON: %s" msgstr "JSON inválido: %s" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Página não encontrada - Ir para a página inicial

" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -365,60 +383,64 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:294 +#: src/server/server.c:110 +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr "" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "Nenhum sensor detectado" -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "Falhou ao criar servidor web." -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "Servidor web iniciado na porta: %d" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "Diretório WWW: %s" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" diff --git a/po/ru.po b/po/ru.po index 2c3bc01..8fb1cfb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-07-17 14:16+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Russian\n" @@ -110,7 +110,12 @@ msgstr "Диаграмма" msgid "Measure update interval:" msgstr "Интервал обновления замеров:" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "Включить меню" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Датчики" @@ -246,6 +251,21 @@ msgstr "об/мин" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, fuzzy, c-format +msgid "Cannot open sensor log file: %s" +msgstr "Ошибка открытия файла журнала: %s" + +#: src/lib/slog.c:43 +#, fuzzy +msgid "slog_init: gettimeofday failed." +msgstr "ошибка gettimeofday." + +#: src/lib/slog.c:67 +#, fuzzy +msgid "slog_write_sensors: gettimeofday failed." +msgstr "ошибка gettimeofday." + #: src/main.c:77 #, c-format msgid "" @@ -256,7 +276,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Использование: %s [КЛЮЧ]...\n" @@ -304,12 +324,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=УРОВЕНЬ установить уровень отладки, целое между 0 и 3" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Сообщайте об ошибках на: %s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашняя страница: <%s>\n" @@ -322,7 +342,7 @@ msgstr "" msgid "Enables debug mode." msgstr "Включает режим отладки." -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Попробуйте `%s --help' для дополнительной информации.↵\n" @@ -346,18 +366,18 @@ msgstr "Неправильное содержимое: %s" msgid "Invalid JSON: %s" msgstr "Неправильный JSON: %s" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "

Запрошена остановка сервера

" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Страница не найдена - Перейти к Главной странице

" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -367,14 +387,14 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server ‌— это HTTP-сервер для удалённого мониторинга аппаратных " "датчиков." -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -382,7 +402,7 @@ msgstr "" " -h, --help\t\tпоказать эту справку и выйти\n" " -v, --version\t\tпоказать версию и выйти" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -390,43 +410,47 @@ msgstr "" " -p,--port=PORT\tпорт веб-сервера\n" " -w,--wdir=DIR\t\tдиректория для страниц веб-сервера" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=LEVEL установить уровень отладки, целое между 0 и 3" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:294 +#: src/server/server.c:110 +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr "" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "HTTP запрос: %s" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "Датчики не обнаружены." -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "Ошибка создания веб-сервера." -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "Веб-сервер запущен на порту: %d" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "WWW-каталог: %s" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" diff --git a/po/sl.po b/po/sl.po index 2b13665..a1e6df7 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-04-14 21:02+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Slovenian \n" @@ -110,7 +110,11 @@ msgstr "" msgid "Measure update interval:" msgstr "" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +msgid "Enable log of measures" +msgstr "" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "" @@ -246,6 +250,19 @@ msgstr "" msgid "%" msgstr "" +#: src/lib/slog.c:38 +#, c-format +msgid "Cannot open sensor log file: %s" +msgstr "" + +#: src/lib/slog.c:43 +msgid "slog_init: gettimeofday failed." +msgstr "" + +#: src/lib/slog.c:67 +msgid "slog_write_sensors: gettimeofday failed." +msgstr "" + #: src/main.c:77 #, c-format msgid "" @@ -256,7 +273,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "" @@ -297,12 +314,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -315,7 +332,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -339,16 +356,16 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -358,60 +375,64 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:294 +#: src/server/server.c:110 +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr "" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "" -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/po/sr.po b/po/sr.po index f7eaf6e..2273adb 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-05-03 02:31+0000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -110,7 +110,12 @@ msgstr "" msgid "Measure update interval:" msgstr "" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "Укључено" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Сензор" @@ -246,6 +251,19 @@ msgstr "" msgid "%" msgstr "" +#: src/lib/slog.c:38 +#, c-format +msgid "Cannot open sensor log file: %s" +msgstr "" + +#: src/lib/slog.c:43 +msgid "slog_init: gettimeofday failed." +msgstr "" + +#: src/lib/slog.c:67 +msgid "slog_write_sensors: gettimeofday failed." +msgstr "" + #: src/main.c:77 #, c-format msgid "" @@ -256,7 +274,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Употреба: %s [ОПЦИЈА]...\n" @@ -297,12 +315,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Пријавите грешку на: %s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s матична страна: <%s>\n" @@ -315,7 +333,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Покушајте„%s --help“ за више информација.\n" @@ -339,16 +357,16 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -358,60 +376,64 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:294 +#: src/server/server.c:110 +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr "" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "" -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/po/tr.po b/po/tr.po index 39682fd..5eaeb1b 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-04-28 11:24+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -110,7 +110,11 @@ msgstr "Grafik" msgid "Measure update interval:" msgstr "" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +msgid "Enable log of measures" +msgstr "" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Algılayıcı" @@ -246,6 +250,19 @@ msgstr "" msgid "%" msgstr "" +#: src/lib/slog.c:38 +#, c-format +msgid "Cannot open sensor log file: %s" +msgstr "" + +#: src/lib/slog.c:43 +msgid "slog_init: gettimeofday failed." +msgstr "" + +#: src/lib/slog.c:67 +msgid "slog_write_sensors: gettimeofday failed." +msgstr "" + #: src/main.c:77 #, c-format msgid "" @@ -256,7 +273,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Kullanım: %s [SEÇENEK]...\n" @@ -297,12 +314,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Hataları rapor et:%s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s ana sayfa: <%s>\n" @@ -315,7 +332,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" @@ -339,16 +356,16 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -358,60 +375,64 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" msgstr "" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" msgstr "" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:294 +#: src/server/server.c:110 +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr "" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "" -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "" -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "" diff --git a/po/uk.po b/po/uk.po index b649c6f..8199583 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-05-13 18:15+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Ukrainian \n" @@ -110,7 +110,11 @@ msgstr "Діаграма" msgid "Measure update interval:" msgstr "" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +msgid "Enable log of measures" +msgstr "" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "Датчики" @@ -246,6 +250,21 @@ msgstr "об/хв" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, fuzzy, c-format +msgid "Cannot open sensor log file: %s" +msgstr "Не вдалося відкрити лог-файл: %s" + +#: src/lib/slog.c:43 +#, fuzzy +msgid "slog_init: gettimeofday failed." +msgstr "помилка gettimeofday." + +#: src/lib/slog.c:67 +#, fuzzy +msgid "slog_write_sensors: gettimeofday failed." +msgstr "помилка gettimeofday." + #: src/main.c:77 #, c-format msgid "" @@ -256,7 +275,7 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "Використання: %s [КЛЮЧ]...\n" @@ -302,12 +321,12 @@ msgstr "" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=РІВЕНЬ встановити рівень налагодження, ціле між 0 та 3" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "Звітуйте про помилки до: %s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s домашня сторінка: <%s>\n" @@ -320,7 +339,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Спробуйте `%s --help' щоб отримати більше інформації.\n" @@ -344,18 +363,18 @@ msgstr "" msgid "Invalid JSON: %s" msgstr "Неправильний JSON: %s" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "" "

Сторінка не знайдена - Перейти до Головної " "сторінки

" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -365,14 +384,14 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" msgstr "" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "" "psensor-server ‌— це HTTP-сервер для віддаленого моніторингу апаратних " "датчиків." -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -380,7 +399,7 @@ msgstr "" " -h, --help\t\tпоказати цю довідку і вийти\n" " -v, --version\t\tпоказати версію і вийти" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -388,43 +407,47 @@ msgstr "" " -p,--port=PORT\tпорт веб-сервера\n" " -w,--wdir=DIR\t\tдиректорія для сторінок веб-сервера" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr "" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr "" -#: src/server/server.c:294 +#: src/server/server.c:110 +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr "" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "HTTP запит: %s" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "Датчики не знайдені." -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "Помилка створення веб-сервера." -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "WWW-директорія: %s" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5f261c8..0f163ea 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: 2012-08-11 09:38+0200\n" +"POT-Creation-Date: 2012-08-23 09:50+0200\n" "PO-Revision-Date: 2012-08-10 09:26+0000\n" "Last-Translator: Wang Dianjin \n" "Language-Team: Chinese (simplified)\n" @@ -110,7 +110,12 @@ msgstr "图表" msgid "Measure update interval:" msgstr "测量更新间隔：" -#: src/glade/psensor-pref.glade:667 +#: src/glade/psensor-pref.glade:659 +#, fuzzy +msgid "Enable log of measures" +msgstr "启用菜单" + +#: src/glade/psensor-pref.glade:689 msgid "Sensors" msgstr "传感器" @@ -246,6 +251,21 @@ msgstr "转速" msgid "%" msgstr "%" +#: src/lib/slog.c:38 +#, fuzzy, c-format +msgid "Cannot open sensor log file: %s" +msgstr "无法打开日志文件：%s" + +#: src/lib/slog.c:43 +#, fuzzy +msgid "slog_init: gettimeofday failed." +msgstr "获取时间失败。" + +#: src/lib/slog.c:67 +#, fuzzy +msgid "slog_write_sensors: gettimeofday failed." +msgstr "获取时间失败。" + #: src/main.c:77 #, c-format msgid "" @@ -261,7 +281,7 @@ msgstr "" "该软件为自由软件：您可以自由修改并分发。\n" "There is NO WARRANTY, to the extent permitted by law。\n" -#: src/main.c:88 src/server/server.c:90 +#: src/main.c:88 src/server/server.c:92 #, c-format msgid "Usage: %s [OPTION]...\n" msgstr "用法：%s [选项]...\n" @@ -308,12 +328,12 @@ msgstr " -n, --new-instance 强制创建一个新的 Psensor 例程" msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d，--debug=LEVEL 设置调试等级，等级为 0 到 3 之间的整数" -#: src/main.c:115 src/server/server.c:110 +#: src/main.c:115 src/server/server.c:113 #, c-format msgid "Report bugs to: %s\n" msgstr "报告问题至：%s\n" -#: src/main.c:117 src/server/server.c:112 +#: src/main.c:117 src/server/server.c:115 #, c-format msgid "%s home page: <%s>\n" msgstr "%s 主页：<%s>\n" @@ -326,7 +346,7 @@ msgstr "Psensor 不支持远程传感器。" msgid "Enables debug mode." msgstr "启用调试模式。" -#: src/main.c:532 src/server/server.c:371 +#: src/main.c:532 src/server/server.c:377 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "试用‘%s --help’来获得更多信息。\n" @@ -350,16 +370,16 @@ msgstr "无效内容：%s" msgid "Invalid JSON: %s" msgstr "无效 JSON：%s" -#: src/server/server.c:52 +#: src/server/server.c:53 msgid "

Server stop requested

" msgstr "

服务器停止请求

" -#: src/server/server.c:58 +#: src/server/server.c:59 msgid "" "

Page not found - Go to Main page

" msgstr "

未找到页面 - 请访问主页

" -#: src/server/server.c:80 +#: src/server/server.c:82 #, c-format msgid "" "Copyright (C) %s jeanfi@gmail.com\n" @@ -374,12 +394,12 @@ msgstr "" "本软件为自由软件：您可以自由修改并分发。\n" "There is NO WARRANTY, to the extent permitted by law。\n" -#: src/server/server.c:92 +#: src/server/server.c:94 msgid "" "psensor-server is an HTTP server for monitoring hardware sensors remotely." msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。" -#: src/server/server.c:97 +#: src/server/server.c:99 msgid "" " -h, --help\t\tdisplay this help and exit\n" " -v, --version\t\tdisplay version information and exit" @@ -387,7 +407,7 @@ msgstr "" " -h, --help\t\t 显示本帮助并退出\n" " -v, --version\t\t 显示版本信息并退出" -#: src/server/server.c:101 +#: src/server/server.c:103 msgid "" " -p,--port=PORT\twebserver port\n" " -w,--wdir=DIR\t\tdirectory containing webserver pages" @@ -395,43 +415,48 @@ msgstr "" " -p,--port=PORT\t 网络服务器端口\n" " -w,--wdir=DIR\t\t 包括网络服务器页面的目录" -#: src/server/server.c:105 +#: src/server/server.c:107 msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3" msgstr " -d, --debug=LEVEL 设置调试级别，0～3 之间的整数" -#: src/server/server.c:107 +#: src/server/server.c:109 msgid " -l, --log-file=PATH set the log file to PATH" msgstr " -l, --log-file=PATH 将日志文件设为 PATH" -#: src/server/server.c:294 +#: src/server/server.c:110 +#, fuzzy +msgid " -s, --sensor-log-file=PATH set the sensor log file to PATH" +msgstr " -l, --log-file=PATH 将日志文件设为 PATH" + +#: src/server/server.c:297 #, c-format msgid "HTTP Request: %s" msgstr "HTTP 请求：%s" -#: src/server/server.c:351 +#: src/server/server.c:354 #, c-format msgid "Enables debug mode: %d" msgstr "启用调试模式：%d" -#: src/server/server.c:387 +#: src/server/server.c:393 msgid "No sensors detected." msgstr "未检测到传感器。" -#: src/server/server.c:394 +#: src/server/server.c:400 msgid "Failed to create Web server." msgstr "无法创建网络服务器。" -#: src/server/server.c:398 +#: src/server/server.c:404 #, c-format msgid "Web server started on port: %d" msgstr "网络服务器启动端口：%d" -#: src/server/server.c:399 +#: src/server/server.c:405 #, c-format msgid "WWW directory: %s" msgstr "WWW 目录：%s" -#: src/server/server.c:400 +#: src/server/server.c:406 #, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d" diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 5cfa0e7..cd55b3c 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -11,6 +11,7 @@ libpsensor_a_SOURCES = \ nvidia.h \ psensor.h psensor.c\ pio.h pio.c \ + slog.c \ url.c url.h AM_CPPFLAGS = -Wall -Werror diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index bf5a7f9..1c5d84a 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -64,8 +64,8 @@ libpsensor_a_AR = $(AR) $(ARFLAGS) libpsensor_a_LIBADD = am__libpsensor_a_SOURCES_DIST = amd.h color.h color.c cpu.h hdd.h \ hdd_hddtemp.c lmsensor.h lmsensor.c log.h log.c measure.h \ - measure.c nvidia.h psensor.h psensor.c pio.h pio.c url.c url.h \ - hdd_atasmart.c nvidia.c amd.c cpu.c psensor_json.h \ + measure.c nvidia.h psensor.h psensor.c pio.h pio.c slog.c \ + url.c url.h hdd_atasmart.c nvidia.c amd.c cpu.c psensor_json.h \ psensor_json.c @ATASMART_TRUE@am__objects_1 = hdd_atasmart.$(OBJEXT) @NVIDIA_TRUE@am__objects_2 = nvidia.$(OBJEXT) @@ -74,9 +74,9 @@ am__libpsensor_a_SOURCES_DIST = amd.h color.h color.c cpu.h hdd.h \ @JSON_TRUE@am__objects_5 = psensor_json.$(OBJEXT) am_libpsensor_a_OBJECTS = color.$(OBJEXT) hdd_hddtemp.$(OBJEXT) \ lmsensor.$(OBJEXT) log.$(OBJEXT) measure.$(OBJEXT) \ - psensor.$(OBJEXT) pio.$(OBJEXT) url.$(OBJEXT) $(am__objects_1) \ - $(am__objects_2) $(am__objects_3) $(am__objects_4) \ - $(am__objects_5) + psensor.$(OBJEXT) pio.$(OBJEXT) slog.$(OBJEXT) url.$(OBJEXT) \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + $(am__objects_4) $(am__objects_5) libpsensor_a_OBJECTS = $(am_libpsensor_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -244,9 +244,9 @@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libpsensor.a libpsensor_a_SOURCES = amd.h color.h color.c cpu.h hdd.h hdd_hddtemp.c \ lmsensor.h lmsensor.c log.h log.c measure.h measure.c nvidia.h \ - psensor.h psensor.c pio.h pio.c url.c url.h $(am__append_1) \ - $(am__append_4) $(am__append_7) $(am__append_8) \ - $(am__append_11) + psensor.h psensor.c pio.h pio.c slog.c url.c url.h \ + $(am__append_1) $(am__append_4) $(am__append_7) \ + $(am__append_8) $(am__append_11) AM_CPPFLAGS = -Wall -Werror $(am__append_3) $(am__append_6) \ $(am__append_10) $(am__append_13) EXTRA_DIST = $(libpsensor_a_SOURCES) \ @@ -314,6 +314,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor_json.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@ .c.o: diff --git a/src/lib/slog.c b/src/lib/slog.c new file mode 100644 index 0000000..f1b2f5b --- /dev/null +++ b/src/lib/slog.c @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2010-2012 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#include +#include +#define _(str) gettext(str) + +#include +#include + +#include "config.h" +#include "log.h" +#include "slog.h" + +static FILE *file; +static struct timeval stv; + +int slog_init(const char *path, struct psensor **sensors) +{ + file = fopen(path, "a"); + + if (!file) { + log_err(_("Cannot open sensor log file: %s"), path); + return 0; + } + + if (gettimeofday(&stv, NULL)) { + log_err(_("slog_init: gettimeofday failed.")); + return 0; + } + + fprintf(file, "I,%ld,%s\n", stv.tv_sec, VERSION); + + while (*sensors) { + fprintf(file, "S,%s\n", (*sensors)->id); + sensors++; + } + + fflush(file); + + return 1; +} + +void slog_write_sensors(struct psensor **sensors) +{ + struct timeval tv; + + if (!file) + return ; + + if (gettimeofday(&tv, NULL)) { + log_err(_("slog_write_sensors: gettimeofday failed.")); + return ; + } + + fprintf(file, "M,%ld", tv.tv_sec - stv.tv_sec); + while (*sensors) { + fprintf(file, ",%.1f", psensor_get_current_value(*sensors)); + sensors++; + } + fputc('\n', file); + + fflush(file); +} + +void slog_close() +{ + if (file) + fclose(file); +} diff --git a/src/lib/slog.h b/src/lib/slog.h new file mode 100644 index 0000000..5d5b1e8 --- /dev/null +++ b/src/lib/slog.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2010-2012 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#ifndef _PSENSOR_SLOG_H_ +#define _PSENSOR_SLOG_H_ + +#include "psensor.h" + +int slog_init(const char *, struct psensor **); +void slog_write_sensors(struct psensor **); +void slog_close(); + +#endif diff --git a/src/server/description.txt b/src/server/description.txt index 8c71a1c..9d1696b 100644 --- a/src/server/description.txt +++ b/src/server/description.txt @@ -50,6 +50,33 @@ containing all JSON objects of type 'sensor'. psensor\-server can be stopped by sending an HTTP request with the URL 'http://hostname:port/api/1.0/server/stop'. +[SENSOR LOG FILE] + +Sensors can be logged using the \-\-sensor-log-file option. + +It is using a text format, each line is terminated with a NEWLINE +char. + +The first line is: I,%D,%V + +%D is the starting time of the log expressed as the number of seconds +since EPOC. + +%V is the version of psensor-server. + +Following lines gives the ordered list of sensors: S,%I + +%I is the uniq identifier of the sensor. + +Then, the values of all sensors are written: M,%D,%V... + +%D is the number of seconds elapsed since the starting time of the +log. + +%V... is the list separated by a comma of the current value of all +sensors. The ordering is the same than the list of sensor identifiers. +The value is expressed as a float. + [WARNING] psensor\-server does not provide any way to restrict the connection to diff --git a/src/server/server.c b/src/server/server.c index 505d511..510082e 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -45,6 +45,7 @@ #include "psensor_json.h" #include "url.h" #include "server.h" +#include "slog.h" static const char *DEFAULT_LOG_FILE = "/var/log/psensor-server.log"; @@ -65,6 +66,7 @@ static struct option long_options[] = { {"wdir", required_argument, 0, 'w'}, {"debug", required_argument, 0, 'd'}, {"log-file", required_argument, 0, 'l'}, + {"sensor-log-file", required_argument, 0, 's'}, {0, 0, 0, 0} }; @@ -105,6 +107,7 @@ void print_help() puts(_(" -d, --debug=LEVEL " "set the debug level, integer between 0 and 3")); puts(_(" -l, --log-file=PATH set the log file to PATH")); + puts(_(" -s, --sensor-log-file=PATH set the sensor log file to PATH")); puts(""); printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT); @@ -313,7 +316,7 @@ int main(int argc, char *argv[]) int port = DEFAULT_PORT; int optc; int cmdok = 1; - char *log_file; + char *log_file, *slog_file; program_name = argv[0]; @@ -327,9 +330,10 @@ int main(int argc, char *argv[]) server_data.www_dir = NULL; server_data.psysinfo.interfaces = NULL; log_file = NULL; + slog_file = NULL; while ((optc = getopt_long(argc, argv, - "vhp:w:d:l:", long_options, NULL)) != -1) { + "vhp:w:d:l:s:", long_options, NULL)) != -1) { switch (optc) { case 'w': if (optarg) @@ -353,6 +357,10 @@ int main(int argc, char *argv[]) if (optarg) log_file = strdup(optarg); break; + case 's': + if (optarg) + slog_file = strdup(optarg); + break; default: cmdok = 0; break; @@ -397,6 +405,9 @@ int main(int argc, char *argv[]) log_info(_("WWW directory: %s"), server_data.www_dir); log_info(_("URL: http://localhost:%d"), port); + if (slog_file) + slog_init(slog_file, server_data.sensors); + while (!server_stop_requested) { pthread_mutex_lock(&mutex); @@ -408,10 +419,14 @@ int main(int argc, char *argv[]) psensor_log_measures(server_data.sensors); + slog_write_sensors(server_data.sensors); + pthread_mutex_unlock(&mutex); sleep(5); } + slog_close(); + MHD_stop_daemon(d); /* sanity cleanup for valgrind */ -- 2.7.4