From: Jean-Philippe Orsini Date: Mon, 29 Sep 2014 17:05:44 +0000 (+0200) Subject: normalized logging X-Git-Tag: v1.2.0~92 X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=67612795804807748a995550dc92bce549b9f84b normalized logging --- diff --git a/po/de.po b/po/de.po index 594ce07..14bbcaa 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: German\n" @@ -681,19 +681,19 @@ msgstr "" " Michael Egger https://launchpad.net/~michael-egger\n" " Veit https://launchpad.net/~shoutbox" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Herstellen der Verbindung gescheitert: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Ungültiger Inhalt: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "Ungültiges JSON: %s" #: src/server/server.c:57 diff --git a/po/es.po b/po/es.po index efeaf9e..db8ef24 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Spanish \n" @@ -679,19 +679,19 @@ msgstr "" " Javier https://launchpad.net/~buik8roadmaster\n" " Jean-Philippe Orsini https://launchpad.net/~jfi" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Error al conectar a:%s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Contenido no válido:%s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "JSON no válido:%s" #: src/server/server.c:57 diff --git a/po/fr.po b/po/fr.po index 2cd0dfc..cda058c 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-21 09:39+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: French <>\n" @@ -685,19 +685,19 @@ msgstr "" " Ubuntu-QC-1 https://launchpad.net/~aobreyss\n" " londumas https://launchpad.net/~helion331990" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Échec de la connexion à : %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Contenu invalide : %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "JSON invalide : %s" #: src/server/server.c:57 diff --git a/po/hr.po b/po/hr.po index e6f0f0c..f8e1795 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-21 06:25+0000\n" "Last-Translator: gogo \n" "Language-Team: Croatian \n" @@ -673,19 +673,19 @@ msgstr "" " Jean-Philippe Orsini https://launchpad.net/~jfi\n" " gogo https://launchpad.net/~trebelnik-stefina" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Neuspjelo povezivanje s: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Nevaljan sadržaj: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "Nevaljan JSON: %s" #: src/server/server.c:57 diff --git a/po/hu.po b/po/hu.po index 0c2a481..c062a60 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Hungarian \n" @@ -676,19 +676,19 @@ msgstr "" " Jean-Philippe Orsini https://launchpad.net/~jfi\n" " Richard Somlói https://launchpad.net/~ricsipontaz" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Nem sikerül kapcsolódni a következőhöz: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Érvénytelen tartalom: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "Érvénytelen JSON: %s" #: src/server/server.c:57 diff --git a/po/it.po b/po/it.po index 3dae409..53f2131 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-20 11:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Italian\n" @@ -677,19 +677,19 @@ msgstr "" " Gabriele https://launchpad.net/~deepdown23\n" " Jean-Philippe Orsini https://launchpad.net/~jfi" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Impossibile connettersi a: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Conenuto non valido: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "JSON non valido: %s" #: src/server/server.c:57 diff --git a/po/lv.po b/po/lv.po index b8cf45e..2ada3b0 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Latvian \n" @@ -669,19 +669,19 @@ msgstr "" " Jean-Philippe Orsini https://launchpad.net/~jfi\n" " tuxmaniack https://launchpad.net/~tuxmaniack" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Neizdevās savienoties ar: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Nederīgs saturs: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "Nederīgs JSON: %s" #: src/server/server.c:57 diff --git a/po/nl.po b/po/nl.po index 68f88a7..efbc6bf 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-20 11:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Dutch \n" @@ -685,19 +685,19 @@ msgstr "" " Jean-Philippe Orsini https://launchpad.net/~jfi\n" " Pjotr12345 https://launchpad.net/~computertip" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Kon niet verbinden met: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Ongeldige inhoud: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "Ongeldige JSON: %s" #: src/server/server.c:57 diff --git a/po/psensor.pot b/po/psensor.pot index 78aef07..d69e82c 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -649,19 +649,19 @@ msgstr "" msgid "translator-credits" msgstr "" -#: src/rsensor.c:112 +#: src/rsensor.c:115 #, c-format -msgid "Fail to connect to: %s" +msgid "%s: Fail to connect to: %s" msgstr "" -#: src/rsensor.c:149 +#: src/rsensor.c:152 #, c-format -msgid "Invalid content: %s" +msgid "%s: Invalid content: %s" msgstr "" -#: src/rsensor.c:189 +#: src/rsensor.c:192 #, c-format -msgid "Invalid JSON: %s" +msgid "%s: Invalid JSON: %s" msgstr "" #: src/server/server.c:57 diff --git a/po/pt_BR.po b/po/pt_BR.po index c7780a2..8748341 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Brazilian Portuguese\n" @@ -663,19 +663,19 @@ msgstr "" " MestreLion https://launchpad.net/~mestrelion\n" " Rafael Neri https://launchpad.net/~rafepel" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Falha ao conectar: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Conteúdo inválido: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "JSON inválido: %s" #: src/server/server.c:57 diff --git a/po/ru.po b/po/ru.po index 74dd277..51d3bda 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Russian\n" @@ -671,19 +671,19 @@ msgstr "" " Ilya Volchanetskiy https://launchpad.net/~volchanetskiy\n" " Jean-Philippe Orsini https://launchpad.net/~jfi" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Ошибка подключения к: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Неправильное содержимое: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "Неправильный JSON: %s" #: src/server/server.c:57 diff --git a/po/sl.po b/po/sl.po index 493f334..9459855 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-11 21:22+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Slovenian \n" @@ -653,19 +653,19 @@ msgstr "" " Jean-Philippe Orsini https://launchpad.net/~jfi\n" " Sasa Batistic https://launchpad.net/~sasa-batistic" -#: src/rsensor.c:112 +#: src/rsensor.c:115 #, c-format -msgid "Fail to connect to: %s" +msgid "%s: Fail to connect to: %s" msgstr "" -#: src/rsensor.c:149 +#: src/rsensor.c:152 #, c-format -msgid "Invalid content: %s" +msgid "%s: Invalid content: %s" msgstr "" -#: src/rsensor.c:189 +#: src/rsensor.c:192 #, c-format -msgid "Invalid JSON: %s" +msgid "%s: Invalid JSON: %s" msgstr "" #: src/server/server.c:57 diff --git a/po/sr.po b/po/sr.po index e2182d4..8efe44a 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-11 21:25+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Serbian \n" @@ -653,19 +653,19 @@ msgstr "" " Jean-Philippe Orsini https://launchpad.net/~jfi\n" " Мирослав Николић https://launchpad.net/~lipek" -#: src/rsensor.c:112 +#: src/rsensor.c:115 #, c-format -msgid "Fail to connect to: %s" +msgid "%s: Fail to connect to: %s" msgstr "" -#: src/rsensor.c:149 +#: src/rsensor.c:152 #, c-format -msgid "Invalid content: %s" +msgid "%s: Invalid content: %s" msgstr "" -#: src/rsensor.c:189 +#: src/rsensor.c:192 #, c-format -msgid "Invalid JSON: %s" +msgid "%s: Invalid JSON: %s" msgstr "" #: src/server/server.c:57 diff --git a/po/sv.po b/po/sv.po index 483c223..67d705f 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-20 11:26+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Swedish\n" @@ -677,19 +677,19 @@ msgstr "" " Jean-Philippe Orsini https://launchpad.net/~jfi\n" " Josef Andersson https://launchpad.net/~northar" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Misslyckades med att ansluta till: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Ogiltigt innehåll: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "Ogiltig JSON: %s" #: src/server/server.c:57 diff --git a/po/tr.po b/po/tr.po index 18285c7..9fe8dc9 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-20 11:27+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Turkish \n" @@ -677,19 +677,19 @@ msgstr "" " zeugma https://launchpad.net/~sunder67\n" " İbrahim Çelik https://launchpad.net/~ibrahimcelik89" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Şuna bağlanamadı: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "Geçersiz içerik: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "Geçersiz JSON: %s" #: src/server/server.c:57 diff --git a/po/uk.po b/po/uk.po index 3ffb9b3..d5995b4 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-11 21:23+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Ukrainian \n" @@ -665,19 +665,19 @@ msgstr "" " Jean-Philippe Orsini https://launchpad.net/~jfi\n" " VPIP https://launchpad.net/~tymbood" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "Не вдалося підключитися до: %s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" -msgstr "" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" +msgstr "Неправильний JSON: %s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "Неправильний JSON: %s" #: src/server/server.c:57 diff --git a/po/zh_CN.po b/po/zh_CN.po index 58766d7..7ad7da0 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:02+0200\n" +"POT-Creation-Date: 2014-09-29 19:05+0200\n" "PO-Revision-Date: 2014-09-11 21:24+0000\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Chinese (simplified)\n" @@ -673,19 +673,19 @@ msgstr "" " tmpplus https://launchpad.net/~tmpplus.7328-deactivatedaccount\n" " 大宝 https://launchpad.net/~linux-dabao" -#: src/rsensor.c:112 -#, c-format -msgid "Fail to connect to: %s" +#: src/rsensor.c:115 +#, fuzzy, c-format +msgid "%s: Fail to connect to: %s" msgstr "无法连接到：%s" -#: src/rsensor.c:149 -#, c-format -msgid "Invalid content: %s" +#: src/rsensor.c:152 +#, fuzzy, c-format +msgid "%s: Invalid content: %s" msgstr "无效内容：%s" -#: src/rsensor.c:189 -#, c-format -msgid "Invalid JSON: %s" +#: src/rsensor.c:192 +#, fuzzy, c-format +msgid "%s: Invalid JSON: %s" msgstr "无效 JSON：%s" #: src/server/server.c:57 diff --git a/src/rsensor.c b/src/rsensor.c index 96b3346..ad52ac4 100644 --- a/src/rsensor.c +++ b/src/rsensor.c @@ -38,6 +38,8 @@ struct ucontent { static CURL *curl; +static const char *PROVIDER_NAME = "rsensor"; + static const char *get_url(struct psensor *s) { return (char *)s->provider_data; @@ -105,11 +107,12 @@ static json_object *get_json_object(const char *url) curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cbk_curl); curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk); - log_debug("HTTP request %s", url); + log_fct("%s: HTTP request %s", PROVIDER_NAME, url); + if (curl_easy_perform(curl) == CURLE_OK) obj = json_tokener_parse(chunk.data); else - log_printf(LOG_ERR, _("Fail to connect to: %s"), url); + log_err(_("%s: Fail to connect to: %s"), PROVIDER_NAME, url); free(chunk.data); @@ -146,7 +149,7 @@ struct psensor **get_remote_sensors(const char *server_url, json_object_put(obj); } else { - log_printf(LOG_ERR, _("Invalid content: %s"), url); + log_err(_("%s: Invalid content: %s"), PROVIDER_NAME, url); } free(url); @@ -186,7 +189,7 @@ static void remote_psensor_update(struct psensor *s) json_object_put(obj); } else { - log_printf(LOG_ERR, _("Invalid JSON: %s"), get_url(s)); + log_err(_("%s: Invalid JSON: %s"), PROVIDER_NAME, get_url(s)); } }