From: Jean-Philippe Orsini Date: Mon, 19 May 2014 16:59:35 +0000 (+0200) Subject: fixed typo (celcius/celsius) X-Git-Tag: v1.0.1~15 X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=0e52be5c9e4d3bfe732f90abe7ca3cbfa32ad59c fixed typo (celcius/celsius) --- diff --git a/NEWS b/NEWS index f3bc190..c2f88a4 100644 --- a/NEWS +++ b/NEWS @@ -170,7 +170,7 @@ v0.7.0.1 * psensor: used the foreground color defined by the theme for the font of the graph legend. * psensor: used tab layout for psensor preferences. -* psensor: temperature unit choice (celcius/fahrenheit). +* psensor: temperature unit choice (celsius/fahrenheit). * +psensor-server+: fixed --wdir option. * +psensor-server+: added log level to -d option. * +psensor-server+: added --log-file option. @@ -211,7 +211,7 @@ v0.6.2.19 v0.6.2.18 --------- -* added degree sign for celcius (Closes LP: #1021900). +* added degree sign for celsius (Closes LP: #1021900). * added russian, brazilian, hungarian, serbian, slovenian, italian, ukrainian and german translation files. * merged translations from LP. diff --git a/NEWS.html b/NEWS.html index d63e551..45c8085 100644 --- a/NEWS.html +++ b/NEWS.html @@ -381,7 +381,7 @@ asciidoc.install();
-

v0.9.0.0

+

v1.0.1

  • @@ -422,6 +422,17 @@ fixed minor GUI bugs (widget alignments, padding, layout policy, fixed missing translatable strings.

    • +
  • +

    +fixed FTBFS due to deprecation of json_object_object_get. (Closes: + #746145). +

    +
    • +
  • +

    +fixed typo (Celcius/Celsius). +

    +
@@ -948,7 +959,7 @@ psensor: used tab layout for psensor preferences.

  • -psensor: temperature unit choice (celcius/fahrenheit). +psensor: temperature unit choice (celsius/fahrenheit).

  • @@ -1087,7 +1098,7 @@ psensor: fixed size of the icon hicolor/48x48/psensor_hot.png.

    • -added degree sign for celcius (Closes LP: #1021900). +added degree sign for celsius (Closes LP: #1021900).

    • @@ -2545,7 +2556,7 @@ Fixed BR1: crash when no temperature sensor is available
      diff --git a/po/Makefile.in b/po/Makefile.in index 60fcb4d..233edd8 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -21,7 +21,7 @@ srcdir = . top_srcdir = .. -prefix = /tmp +prefix = /usr/local 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/psensor/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work/psensor/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/psensor/install-sh -d -install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/psensor/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work/psensor/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/po/de.po b/po/de.po index 68704a0..214f520 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2014-04-30 16:48+0100\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: German\n" @@ -272,28 +272,28 @@ msgstr "" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: ADL-Bibliothek konnte nicht gefunden werden." -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: API der ADL-Bibliothek fehlt." -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: ADL-Bibliothek konnte nicht initialisiert werden." -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: Anzahl der Adapter konnte nicht ermittelt werden." -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "Anzahl der AMD/ATI-Adapter: %d" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "Anzahl der aktiven AMD/ATI-Adapter: %d" @@ -359,22 +359,22 @@ msgstr "lmsensor: Initialisierung gescheitert: %s." msgid "Cannot open log file: %s" msgstr "Protokolldatei kann nicht geöffnet werden: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" "Entweder wird kein proprietärer NVIDIA-Treiber verwendet oder die NVIDIA-GPU-" "Temperatur kann nicht ermittelt werden." -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Verbindung zum X11-Server konnte nicht hergestellt werden." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "Ermittlung der NVIDIA-Informationen gescheitert." diff --git a/po/es.po b/po/es.po index 74e4c64..02190af 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2013-05-12 22:16+0000\n" "Last-Translator: Javier \n" "Language-Team: Spanish \n" @@ -277,28 +277,28 @@ msgstr "Mostrar sensor en el menú de aplicaciones" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: no se ha encontrado la librería ADL" -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: ADL's API perdidos" -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: error al iniciar ADL" -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: imposible listar el número de adaptadores" -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "Numero de adaptadores AMD/ATI: %d" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "Numero de adaptadores AMD/ATI: %d" @@ -364,22 +364,22 @@ msgstr "lmsensor: Fallo de inicialización:%s." msgid "Cannot open log file: %s" msgstr "Imposible abrir el archivo de registro: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" "Controlador propietario de NVIDIA no activado ó incapaz de obtener la " "temperatura de la GPU" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Imposible establecer conexión con el servidor X11." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "Error al obtener la información de NVIDIA" diff --git a/po/fr.po b/po/fr.po index 39189be..1f0f5a6 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2013-06-29 15:14+0000\n" "Last-Translator: londumas \n" "Language-Team: French <>\n" @@ -272,28 +272,28 @@ msgstr "" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD : impossible de trouver la bibliothèque ADL." -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD : L'interface de programmation ADL est manquante." -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD : échec de l'initialisation d'ADL." -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD : impossible de récupérer le nombre d'adaptateurs." -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -361,20 +361,20 @@ msgstr "lmsensor : échec de l'initialisation: %s." msgid "Cannot open log file: %s" msgstr "Impossible d'ouvrir le journal: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "Échec de la récupération des températures NVIDIA." -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "Processeur graphique NVidia" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Impossible d'ouvrir la connexion au serveur X11." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "Échec de la récupération des information NVIDIA." diff --git a/po/hu.po b/po/hu.po index bb32b9b..0eda500 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2012-10-29 09:41+0000\n" "Last-Translator: Bence Lukács \n" "Language-Team: Hungarian \n" @@ -277,28 +277,28 @@ msgstr "Érzékelők megjelenítése az alkalmazásmenüben" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: Nem sikerült betölteni az ADL programkönyvtárat." -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: hiányzó ADL API." -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: az ADL előkészítése meghiúsult." -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: adapterek számainak lekérése meghiúsult" -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -364,20 +364,20 @@ msgstr "lmsensor: előkészítési hiba: %s." msgid "Cannot open log file: %s" msgstr "A naplófájl megnyitása sikertelen: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Nem lehet létrehozni a kapcsolatot az X11 kiszolgálóval." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "NVIDIA információinak lekérése meghiúsult." diff --git a/po/it.po b/po/it.po index e4e81f1..98babe3 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2013-04-14 16:06+0000\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian\n" @@ -276,28 +276,28 @@ msgstr "Mostra sensore nel menu indicatore Applicazione" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: impossibile trovare la libreria ADL" -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: impossibile trovare l'API di ADL" -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: impossibile inizializzare ADL" -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: impossibile rilevare il numero di adattatori." -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -363,22 +363,22 @@ msgstr "lmsensor: inizializzazione fallita: %s" msgid "Cannot open log file: %s" msgstr "Impossibile aprire il file di log: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" "Driver proprietario NVIDIA non usato o impossibile rilevare la temperatura " "della GPU NVIDIA." -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Impossibile connettersi al server X11." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "Impossibile recuperare informazioni da NVIDIA" diff --git a/po/lv.po b/po/lv.po index abddda7..0368d33 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2013-10-24 12:32+0000\n" "Last-Translator: tuxmaniack \n" "Language-Team: Latvian \n" @@ -277,28 +277,28 @@ msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: nevar atrast ADL bibliotēku." -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: trūkst ADL programmatūras saskarne." -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: neizdevās inicializēt ADL." -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: nevar saņemt adapteru skaitu." -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -364,20 +364,20 @@ msgstr "lmsensor: inicializācijas kļūda: %s." msgid "Cannot open log file: %s" msgstr "Nevar atvērt žurnāla failu: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Nevar atvērt savienojumu ar X11 server." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "Neizdevās saņemt NVIDIA informāciju." diff --git a/po/nl.po b/po/nl.po index f2b6f9e..723c235 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2014-04-07 08:50+0000\n" "Last-Translator: Pjotr12345 \n" "Language-Team: Dutch \n" @@ -277,28 +277,28 @@ msgstr "Sensor tonen in het menu van de Toepassingsindicator" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: kan ADL-bibliotheekbestand niet vinden" -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: ontbrekende ADL's API." -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: kon ADL niet initialiseren." -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: kan het aantal videokaarten niet bepalen." -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "Aantal AMD/ATI-videokaarten: %d" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "Aantal actieve AMD/ATI-videokaarten: %d" @@ -364,22 +364,22 @@ msgstr "lmsensor: opstartfout: %s." msgid "Cannot open log file: %s" msgstr "Kan logboekbestand niet openen: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" "Het niet-vrije Nvidia-stuurprogramma wordt niet gebruikt of het kan de " "temperatuur van de grafische Nvidia-chip niet bepalen." -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Kan verbinding met X11-server niet openen." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "Kon Nvidia-informatie niet ophalen." diff --git a/po/psensor.pot b/po/psensor.pot index f107c89..fc1725e 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -271,28 +271,28 @@ msgstr "" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "" -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "" -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "" -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "" -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -358,20 +358,20 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "" -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index ae2631f..55d2218 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2013-09-01 18:54+0000\n" "Last-Translator: Celio Alves \n" "Language-Team: Brazilian Portuguese\n" @@ -273,28 +273,28 @@ msgstr "" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: não foi possível encontrar a biblioteca ADL." -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: está faltando a API da ADL." -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: falha ao iniciar ADL." -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: não foi possível obter número de adaptadores." -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "Número de adaptadores AMD/ATI: %d" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "Número de adaptadores AMD/ATI ativos: %d" @@ -360,20 +360,20 @@ msgstr "lmsensor: falha na inicialização: %s." msgid "Cannot open log file: %s" msgstr "Não é possível abrir arquivo de log: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Não é possível abrir conexão com o servidor X11." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "Falha ao recuperar informações de NVIDIA." diff --git a/po/ru.po b/po/ru.po index 50fb269..d6fb61c 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: 2014-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2014-01-27 16:37+0000\n" "Last-Translator: Dmitry \n" "Language-Team: Russian\n" @@ -276,28 +276,28 @@ msgstr "Показать датчик в индикаторе меню прил msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: библиотека ADL не найдена." -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: отсутствует API ADL." -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: не удалось инициализировать ADL." -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: ошибка определения количества адаптеров." -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -363,20 +363,20 @@ msgstr "lmsensor: ошибка инициализации: %s." msgid "Cannot open log file: %s" msgstr "Ошибка открытия файла журнала: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Ошибка открытия соединения к серверу X11." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "Не удалось получить информацию NVIDIA." diff --git a/po/sl.po b/po/sl.po index 33961eb..00deaeb 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2012-04-14 21:02+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Slovenian \n" @@ -272,28 +272,28 @@ msgstr "" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "" -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "" -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "" -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "" -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -359,20 +359,20 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "" -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "" diff --git a/po/sr.po b/po/sr.po index 4b055bd..c805ece 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2012-05-03 02:31+0000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -272,28 +272,28 @@ msgstr "" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "" -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "" -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "" -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "" -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -359,20 +359,20 @@ msgstr "" msgid "Cannot open log file: %s" msgstr "" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "" -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "" diff --git a/po/tr.po b/po/tr.po index ddbe77c..41d835e 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2013-11-24 08:42+0000\n" "Last-Translator: İbrahim Çelik \n" "Language-Team: Turkish \n" @@ -277,28 +277,28 @@ msgstr "Algılayıcıyı Uygulama Göstergesi menüsünde göster" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: ADL kütüphanesi bulunamadı." -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: ADL'nin API'sı kayıp." -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: ADL başlatılamadı." -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: bağdaştırıcıların sayısı alınamadı." -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "AMD/ATI bağdaştırıcı sayısı: %d" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "Etkin AMD/ATI bağdaştırıcı sayısı: %d" @@ -364,22 +364,22 @@ msgstr "lmsensor: başlatma hatası: %s." msgid "Cannot open log file: %s" msgstr "Günlükleme dosyası açılamadı: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" "NVIDIA kapalı kaynak sürücüsü kullanılmıyor veya NVIDIA ekran kartı " "sıcaklığı alınamıyor." -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "X11 sunucusu bağlantısı açılamıyor." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "NVIDIA bilgisi alınamıyor." diff --git a/po/uk.po b/po/uk.po index f5cada2..aca43ba 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2012-10-13 16:24+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Ukrainian \n" @@ -272,28 +272,28 @@ msgstr "" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD: не вдалося знайти бібліотеку ADL." -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD: відсутнє API ADL." -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD: не вдалося ініціалізувати ADL." -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD: не вдалося отримати кількість адаптерів." -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -359,20 +359,20 @@ msgstr "lmsensor: помилка ініціалізації: %s." msgid "Cannot open log file: %s" msgstr "Не вдалося відкрити лог-файл: %s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "Не вдалося встановити з'єднання до сервера X11." -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "Не вдалося отримати інформацію NVIDIA." diff --git a/po/zh_CN.po b/po/zh_CN.po index ce3084e..85c9348 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-05-19 08:15+0200\n" +"POT-Creation-Date: 2014-05-19 08:55+0200\n" "PO-Revision-Date: 2013-01-15 12:24+0000\n" "Last-Translator: Wang Dianjin \n" "Language-Team: Chinese (simplified)\n" @@ -272,28 +272,28 @@ msgstr "" msgid "-1" msgstr "" -#: src/lib/amd.c:170 +#: src/lib/amd.c:168 msgid "AMD: cannot found ADL library." msgstr "AMD：未找到 ADL 库。" -#: src/lib/amd.c:197 +#: src/lib/amd.c:195 msgid "AMD: missing ADL's API." msgstr "AMD：ADL 的 API 丢失。" -#: src/lib/amd.c:207 +#: src/lib/amd.c:205 msgid "AMD: failed to initialize ADL." msgstr "AMD：ADL 初始化出错。" -#: src/lib/amd.c:213 +#: src/lib/amd.c:211 msgid "AMD: cannot get the number of adapters." msgstr "AMD：无法获取适配器数目。" -#: src/lib/amd.c:252 +#: src/lib/amd.c:250 #, c-format msgid "Number of AMD/ATI adapters: %d" msgstr "" -#: src/lib/amd.c:253 +#: src/lib/amd.c:251 #, c-format msgid "Number of active AMD/ATI adapters: %d" msgstr "" @@ -359,20 +359,20 @@ msgstr "lmsensor：初始化失败：%s。" msgid "Cannot open log file: %s" msgstr "无法打开日志文件：%s" -#: src/lib/nvidia.c:54 +#: src/lib/nvidia.c:52 msgid "" "NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature." msgstr "" -#: src/lib/nvidia.c:75 +#: src/lib/nvidia.c:73 msgid "NVidia GPU" msgstr "" -#: src/lib/nvidia.c:97 +#: src/lib/nvidia.c:95 msgid "Cannot open connection to X11 server." msgstr "无法打开到 X11 服务器的连接。" -#: src/lib/nvidia.c:105 +#: src/lib/nvidia.c:103 msgid "Failed to retrieve NVIDIA information." msgstr "无法获取 NVIDIA 信息。" diff --git a/src/cfg.h b/src/cfg.h index 728ed51..a63bcb0 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -25,7 +25,7 @@ #include "color.h" enum temperature_unit { - CELCIUS, + CELSIUS, FAHRENHEIT }; diff --git a/src/graph.c b/src/graph.c index dec0a94..7205e63 100644 --- a/src/graph.c +++ b/src/graph.c @@ -266,12 +266,12 @@ graph_update(struct psensor **sensors, mint = get_min_temp(enabled_sensors); strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, mint, - config->temperature_unit == CELCIUS); + config->temperature_unit == CELSIUS); maxt = get_max_temp(enabled_sensors); strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, maxt, - config->temperature_unit == CELCIUS); + config->temperature_unit == CELSIUS); str_btime = time_to_str(get_graph_begin_time_s(config)); str_etime = time_to_str(get_graph_end_time_s()); diff --git a/src/lib/amd.c b/src/lib/amd.c index 0cc2b35..e83f5f1 100644 --- a/src/lib/amd.c +++ b/src/lib/amd.c @@ -69,9 +69,7 @@ static void *getprocaddress(void *plibrary, const char *name) return dlsym(plibrary, name); } -/* - Returns the temperature (Celcius) of an AMD/ATI GPU. -*/ +/* Returns the temperature (Celsius) of an AMD/ATI GPU. */ static double get_temp(struct psensor *sensor) { ADLTemperature v; diff --git a/src/lib/nvidia.c b/src/lib/nvidia.c index 44d64d1..5feb36f 100644 --- a/src/lib/nvidia.c +++ b/src/lib/nvidia.c @@ -33,9 +33,7 @@ Display *display; -/* - Returns the temperature (Celcius) of a NVidia GPU. -*/ +/* Returns the temperature (Celsius) of a NVidia GPU. */ static int get_temp(struct psensor *sensor) { int temp; diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 8b92c01..61ef19d 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -209,18 +209,18 @@ int is_fan_type(unsigned int type) return type & SENSOR_TYPE_FAN; } -double celcius_to_fahrenheit(double c) +double celsius_to_fahrenheit(double c) { return c * (9.0/5.0) + 32; } -double fahrenheit_to_celcius(double f) +double fahrenheit_to_celsius(double f) { return (f - 32) * (5.0/9.0); } char * -psensor_value_to_str(unsigned int type, double value, int use_celcius) +psensor_value_to_str(unsigned int type, double value, int use_celsius) { char *str; const char *unit; @@ -231,10 +231,10 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius) */ str = malloc(20); - unit = psensor_type_to_unit_str(type, use_celcius); + unit = psensor_type_to_unit_str(type, use_celsius); - if (is_temp_type(type) && !use_celcius) - value = celcius_to_fahrenheit(value); + if (is_temp_type(type) && !use_celsius) + value = celsius_to_fahrenheit(value); sprintf(str, "%.0f%s", value, unit); @@ -244,9 +244,9 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius) char * psensor_measure_to_str(const struct measure *m, unsigned int type, - unsigned int use_celcius) + unsigned int use_celsius) { - return psensor_value_to_str(type, m->value, use_celcius); + return psensor_value_to_str(type, m->value, use_celsius); } void psensor_set_current_value(struct psensor *sensor, double value) @@ -471,10 +471,10 @@ const char *psensor_type_to_str(unsigned int type) } -const char *psensor_type_to_unit_str(unsigned int type, int use_celcius) +const char *psensor_type_to_unit_str(unsigned int type, int use_celsius) { if (is_temp_type(type)) { - if (use_celcius) + if (use_celsius) return "\302\260C"; else return "\302\260F"; @@ -541,11 +541,11 @@ struct psensor **psensor_list_copy(struct psensor **sensors) } char * -psensor_current_value_to_str(const struct psensor *s, unsigned int celcius) +psensor_current_value_to_str(const struct psensor *s, unsigned int use_celsius) { return psensor_value_to_str(s->type, psensor_get_current_value(s), - celcius); + use_celsius); } struct psensor **psensor_list_filter_graph_enabled(struct psensor **sensors) diff --git a/src/lib/psensor.h b/src/lib/psensor.h index 9509c0d..cb30cb9 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -169,11 +169,11 @@ psensor_get_max_current_value(struct psensor **sensors, unsigned int type); */ char *psensor_value_to_str(unsigned int type, double value, - int use_celcius); + int use_celsius); char *psensor_measure_to_str(const struct measure *m, unsigned int type, - unsigned int use_celcius); + unsigned int use_celsius); struct psensor **get_all_sensors(int use_libatasmart, int values_max_length); @@ -195,7 +195,7 @@ struct measure *psensor_get_current_measure(struct psensor *sensor); */ const char *psensor_type_to_str(unsigned int type); -const char *psensor_type_to_unit_str(unsigned int type, int use_celcius); +const char *psensor_type_to_unit_str(unsigned int type, int use_celsius); void psensor_list_update_measures(struct psensor **sensors); @@ -205,8 +205,8 @@ void psensor_cleanup(); double get_max_value(struct psensor **sensors, int type); -double celcius_to_fahrenheit(double c); -double fahrenheit_to_celcius(double c); +double celsius_to_fahrenheit(double c); +double fahrenheit_to_celsius(double c); char *psensor_current_value_to_str(const struct psensor *, unsigned int); diff --git a/src/main.c b/src/main.c index 89a2177..3d93fd0 100644 --- a/src/main.c +++ b/src/main.c @@ -219,7 +219,7 @@ gboolean ui_refresh_thread(gpointer data) #ifdef HAVE_UNITY ui_unity_launcher_entry_update(ui->sensors, !cfg->unity_launcher_count_disabled, - cfg->temperature_unit == CELCIUS); + cfg->temperature_unit == CELSIUS); #endif if (ui->graph_update_interval != cfg->graph_update_interval) { diff --git a/src/psensor.schemas b/src/psensor.schemas index fac4391..70c81fc 100644 --- a/src/psensor.schemas +++ b/src/psensor.schemas @@ -175,7 +175,7 @@ 0 The displayed temperature unit - The displayed temperature unit, '0' for Celcius, '1' for Fahenrenheit. + The displayed temperature unit, '0' for Celsius, '1' for Fahenrenheit. diff --git a/src/server/description.txt b/src/server/description.txt index 744dc8c..a0b2cd8 100644 --- a/src/server/description.txt +++ b/src/server/description.txt @@ -79,7 +79,7 @@ log. sensors. The ordering is the same than the list of sensor identifiers. The value is expressed as a float with one digit precision. Temperatures -are using Celcius unit. +are using Celsius unit. The value is written only if it has changed. diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c index 7aa099d..c8887c2 100644 --- a/src/ui_appindicator.c +++ b/src/ui_appindicator.c @@ -75,12 +75,12 @@ void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data) } static void -update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius) +update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celsius) { gchar *str; char *v; - v = psensor_current_value_to_str(s, use_celcius); + v = psensor_current_value_to_str(s, use_celsius); str = g_strdup_printf("%s: %s", s->name, v); @@ -90,7 +90,7 @@ update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius) g_free(str); } -static void update_menu_items(int use_celcius) +static void update_menu_items(int use_celsius) { struct psensor **s; GtkMenuItem **m; @@ -99,20 +99,19 @@ static void update_menu_items(int use_celcius) return ; for (s = sensors, m = menu_items; *s; s++, m++) - update_menu_item(*m, *s, use_celcius); + update_menu_item(*m, *s, use_celsius); } static void -build_sensor_menu_items(const struct ui_psensor *ui, - GtkMenu *menu) +build_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu) { - int i, j, n, celcius; + int i, j, n, celsius; const char *name; struct psensor **sorted_sensors; free(menu_items); - celcius = ui->config->temperature_unit == CELCIUS; + celsius = ui->config->temperature_unit == CELSIUS; sorted_sensors = ui_get_sensors_ordered_by_position(ui); n = psensor_list_size(sorted_sensors); @@ -130,7 +129,7 @@ build_sensor_menu_items(const struct ui_psensor *ui, GTK_WIDGET(menu_items[j]), j+2); - update_menu_item(menu_items[j], sensors[j], celcius); + update_menu_item(menu_items[j], sensors[j], celsius); j++; } @@ -183,7 +182,7 @@ static void update_label(struct ui_psensor *ui) while (*p) { if (config_is_appindicator_label_enabled((*p)->id)) { str = psensor_current_value_to_str - (*p, ui->config->temperature_unit == CELCIUS); + (*p, ui->config->temperature_unit == CELSIUS); if (label == NULL) { label = str; @@ -243,7 +242,7 @@ void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention) app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ATTENTION); - update_menu_items(ui->config->temperature_unit == CELCIUS); + update_menu_items(ui->config->temperature_unit == CELSIUS); } static GtkStatusIcon *unity_fallback(AppIndicator *indicator) diff --git a/src/ui_notify.c b/src/ui_notify.c index 7e7217d..6361f06 100644 --- a/src/ui_notify.c +++ b/src/ui_notify.c @@ -40,7 +40,7 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui) char *body, *svalue; const char *summary; NotifyNotification *notif; - unsigned int use_celcius; + unsigned int use_celsius; log_debug("last_notification %d", last_notification_tv.tv_sec); @@ -59,15 +59,15 @@ void ui_notify(struct psensor *sensor, struct ui_psensor *ui) notify_init("psensor"); if (notify_is_initted() == TRUE) { - if (ui->config->temperature_unit == CELCIUS) - use_celcius = 1; + if (ui->config->temperature_unit == CELSIUS) + use_celsius = 1; else - use_celcius = 0; + use_celsius = 0; svalue = psensor_measure_to_str (psensor_get_current_measure(sensor), sensor->type, - use_celcius); + use_celsius); body = malloc(strlen(sensor->name) + 3 + strlen(svalue) + 1); sprintf(body, "%s : %s", sensor->name, svalue); diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c index 1a0aa83..f7200c1 100644 --- a/src/ui_sensorlist.c +++ b/src/ui_sensorlist.c @@ -95,7 +95,7 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete) GtkTreeIter iter; GtkTreeModel *model; gboolean valid; - int use_celcius; + int use_celsius; GtkListStore *store; if (complete) @@ -104,7 +104,7 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete) model = gtk_tree_view_get_model(ui->sensors_tree); store = ui->sensors_store; - use_celcius = ui->config->temperature_unit == CELCIUS; + use_celsius = ui->config->temperature_unit == CELSIUS; valid = gtk_tree_model_get_iter_first(model, &iter); while (valid) { @@ -112,9 +112,9 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete) value = psensor_value_to_str(s->type, psensor_get_current_value(s), - use_celcius); - min = psensor_value_to_str(s->type, s->min, use_celcius); - max = psensor_value_to_str(s->type, s->max, use_celcius); + use_celsius); + min = psensor_value_to_str(s->type, s->min, use_celsius); + max = psensor_value_to_str(s->type, s->max, use_celsius); gtk_list_store_set(store, &iter, COL_TEMP, value, diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index f073c04..463deda 100644 --- a/src/ui_sensorpref.c +++ b/src/ui_sensorpref.c @@ -65,14 +65,14 @@ sensor_pref_new(struct psensor *s, struct config *cfg) p->alarm_enabled = s->alarm_enabled; p->color = color_dup(s->color); - if (cfg->temperature_unit == CELCIUS) { + if (cfg->temperature_unit == CELSIUS) { p->alarm_high_threshold = s->alarm_high_threshold; p->alarm_low_threshold = s->alarm_low_threshold; } else { p->alarm_high_threshold - = celcius_to_fahrenheit(s->alarm_high_threshold); + = celsius_to_fahrenheit(s->alarm_high_threshold); p->alarm_low_threshold - = celcius_to_fahrenheit(s->alarm_low_threshold); + = celsius_to_fahrenheit(s->alarm_low_threshold); } p->appindicator_enabled = s->appindicator_enabled; @@ -214,7 +214,7 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder) GtkSpinButton *w_high_threshold, *w_low_threshold; GdkColor *color; struct psensor *s; - int use_celcius; + int use_celsius; s = p->sensor; @@ -258,13 +258,13 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder) (builder, "sensor_alarm_low_threshold_unit")); - use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0; + use_celsius = cfg->temperature_unit == CELSIUS ? 1 : 0; gtk_label_set_text(w_high_threshold_unit, psensor_type_to_unit_str(s->type, - use_celcius)); + use_celsius)); gtk_label_set_text(w_low_threshold_unit, psensor_type_to_unit_str(s->type, - use_celcius)); + use_celsius)); w_appindicator_enabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "indicator_checkbox")); @@ -351,9 +351,9 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg) if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) { s->alarm_high_threshold - = fahrenheit_to_celcius(p->alarm_high_threshold); + = fahrenheit_to_celsius(p->alarm_high_threshold); s->alarm_low_threshold - = fahrenheit_to_celcius(p->alarm_low_threshold); + = fahrenheit_to_celsius(p->alarm_low_threshold); } else { s->alarm_high_threshold = p->alarm_high_threshold; s->alarm_low_threshold = p->alarm_low_threshold; diff --git a/src/ui_unity.c b/src/ui_unity.c index 046fa6c..17ee29d 100644 --- a/src/ui_unity.c +++ b/src/ui_unity.c @@ -26,7 +26,7 @@ static unsigned int last_visible = -1; void ui_unity_launcher_entry_update(struct psensor **sensors, unsigned int show, - int use_celcius) + int use_celsius) { double v; @@ -51,8 +51,8 @@ void ui_unity_launcher_entry_update(struct psensor **sensors, if (sensors && *sensors) { v = psensor_get_max_current_value(sensors, SENSOR_TYPE_TEMP); - if (!use_celcius) - v = celcius_to_fahrenheit(v); + if (!use_celsius) + v = celsius_to_fahrenheit(v); unity_launcher_entry_set_count(psensor_entry, v); } diff --git a/src/ui_unity.h b/src/ui_unity.h index 2fb7c90..d4c79a5 100644 --- a/src/ui_unity.h +++ b/src/ui_unity.h @@ -23,6 +23,6 @@ void ui_unity_launcher_entry_update(struct psensor **sensors, unsigned int show, - int use_celcius); + int use_celsius); #endif diff --git a/tests/test_psensor_type_to_unit_str.c b/tests/test_psensor_type_to_unit_str.c index ddd2abe..981e90d 100644 --- a/tests/test_psensor_type_to_unit_str.c +++ b/tests/test_psensor_type_to_unit_str.c @@ -29,11 +29,11 @@ #include "../src/lib/psensor.h" static int -test_fct(unsigned int type, int use_celcius, const char *ref) +test_fct(unsigned int type, int use_celsius, const char *ref) { const char *u; - u = psensor_type_to_unit_str(type, use_celcius); + u = psensor_type_to_unit_str(type, use_celsius); if (strcmp(ref, u)) { fprintf(stderr, "returns: %s expected: %s\n", u, ref); return 0; diff --git a/tests/test_psensor_value_to_str.c b/tests/test_psensor_value_to_str.c index 780c815..5d08867 100644 --- a/tests/test_psensor_value_to_str.c +++ b/tests/test_psensor_value_to_str.c @@ -24,18 +24,18 @@ #include "../src/lib/psensor.h" -#define CELCIUS "\302\260C" +#define CELSIUS "\302\260C" #define FAHRENHEIT "\302\260F" static int test_psensor_value_to_str(unsigned int type, double value, - int celcius, + int celsius, const char *ref) { char *str; - str = psensor_value_to_str(type, value, celcius); + str = psensor_value_to_str(type, value, celsius); if (strcmp(ref, str)) { fprintf(stderr, "returns: %s expected: %s\n", str, ref); return 1; @@ -49,13 +49,13 @@ int main(int argc, char **argv) int errs; errs = test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13, 1, - "13"CELCIUS); + "13"CELSIUS); errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13, 0, "55"FAHRENHEIT); errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13.4, 1, - "13"CELCIUS); + "13"CELSIUS); errs += test_psensor_value_to_str(SENSOR_TYPE_TEMP, 13.5, 1, - "14"CELCIUS); + "14"CELSIUS); if (errs) exit(EXIT_FAILURE);