icon names constants

diff --git a/po/fr.po b/po/fr.po
index 99c9249..1aec4bf 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.9\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.9\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2011-11-08 12:36+0100\n"
+"POT-Creation-Date: 2011-11-13 16:33+0100\n"

 "PO-Revision-Date: 2011-02-07 21:18+0100\n"
 "Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
 "Language-Team: Oriya\n"
 "PO-Revision-Date: 2011-02-07 21:18+0100\n"
 "Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
 "Language-Team: Oriya\n"


@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/main.c:79 src/server/server.c:77
+#: src/main.c:77 src/server/server.c:77

 #, fuzzy, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
 #, fuzzy, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"


@@ -33,12 +33,12 @@ msgstr ""
 "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n"
 "autorisees par la loi applicable.\n"
 
 "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n"
 "autorisees par la loi applicable.\n"
 

-#: src/main.c:89 src/server/server.c:87
+#: src/main.c:87 src/server/server.c:87

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation: %s [OPTION]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation: %s [OPTION]...\n"
 

-#: src/main.c:91
+#: src/main.c:89

 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."


@@ -46,11 +46,11 @@ msgstr ""
 "psensor est une application GTK pour surveiller les sondes matérielles "
 "thermiques et les ventilateurs."
 
 "psensor est une application GTK pour surveiller les sondes matérielles "
 "thermiques et les ventilateurs."
 

-#: src/main.c:95
+#: src/main.c:93

 msgid "Options:"
 msgstr "Options:"
 
 msgid "Options:"
 msgstr "Options:"
 

-#: src/main.c:96 src/server/server.c:94
+#: src/main.c:94

 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"


@@ -58,169 +58,168 @@ msgstr ""
 "  -h, --help          afficher cette aide et quitter\n"
 "  -v, --version       afficher les informations de version et quitter"
 
 "  -h, --help          afficher cette aide et quitter\n"
 "  -v, --version       afficher les informations de version et quitter"
 

-#: src/main.c:102
+#: src/main.c:100

 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 "  -u, --url=URL       l'URL de psensor-server, example: http://hostname:3131"
 
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 "  -u, --url=URL       l'URL de psensor-server, example: http://hostname:3131"
 

-#: src/main.c:108 src/server/server.c:107
+#: src/main.c:106 src/server/server.c:107

 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Signaler les bugs à: %s\n"
 
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Signaler les bugs à: %s\n"
 

-#: src/main.c:110 src/server/server.c:109
+#: src/main.c:108 src/server/server.c:109

 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s page d'acceuil: <%s>\n"
 
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s page d'acceuil: <%s>\n"
 

-#: src/main.c:363
+#: src/main.c:407

 #, c-format
 msgid "Enables debug mode.\n"
 msgstr ""
 
 #, c-format
 msgid "Enables debug mode.\n"
 msgstr ""
 

-#: src/main.c:373 src/server/server.c:353
+#: src/main.c:417 src/server/server.c:353

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Essayez `%s --help' pour plus d'informations.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Essayez `%s --help' pour plus d'informations.\n"
 

-#: src/main.c:404
+#: src/main.c:444

 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 "ERREUR: Psensor n'a pas ete compilé avec le support de surveillance à "
 "distance.\n"
 
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 "ERREUR: Psensor n'a pas ete compilé avec le support de surveillance à "
 "distance.\n"
 

-#: src/ui.c:90
+#: src/ui.c:80

 #, fuzzy
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr ""
 "psensor est une application GTK pour surveiller les sondes matérielles "
 "thermiques et les ventilateurs."
 
 #, fuzzy
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr ""
 "psensor est une application GTK pour surveiller les sondes matérielles "
 "thermiques et les ventilateurs."
 

-#: src/ui.c:93
+#: src/ui.c:83

 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 
 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 

-#: src/ui.c:96
+#: src/ui.c:86

 msgid "About Psensor"
 msgstr ""
 
 msgid "About Psensor"
 msgstr ""
 

-#: src/ui.c:99
+#: src/ui.c:89

 msgid "Psensor Homepage"
 msgstr ""
 
 msgid "Psensor Homepage"
 msgstr ""
 

-#: src/ui.c:154
+#: src/ui.c:144

 #, fuzzy
 msgid "_Preferences"
 msgstr "Configuration"
 
 #, fuzzy
 msgid "_Preferences"
 msgstr "Configuration"
 

-#: src/ui.c:155 src/ui_sensorlist.c:202
+#: src/ui.c:145 src/ui_sensorlist.c:200

 msgid "Preferences"
 msgstr "Configuration"
 
 msgid "Preferences"
 msgstr "Configuration"
 

-#: src/ui.c:159
+#: src/ui.c:149

 #, fuzzy
 msgid "_Sensor Preferences"
 msgstr "Editer La Configuration Des Sondes"
 
 #, fuzzy
 msgid "_Sensor Preferences"
 msgstr "Editer La Configuration Des Sondes"
 

-#: src/ui.c:160
+#: src/ui.c:150

 #, fuzzy
 msgid "Sensor Preferences"
 msgstr "Editer La Configuration Des Sondes"
 
 #, fuzzy
 msgid "Sensor Preferences"
 msgstr "Editer La Configuration Des Sondes"
 

-#: src/ui.c:164
+#: src/ui.c:154

 #, fuzzy
 msgid "_Quit"
 msgstr "Quitter"
 
 #, fuzzy
 msgid "_Quit"
 msgstr "Quitter"
 

-#: src/ui.c:164
+#: src/ui.c:154

 msgid "Quit"
 msgstr "Quitter"
 
 msgid "Quit"
 msgstr "Quitter"
 

-#: src/ui.c:169
+#: src/ui.c:159

 msgid "_About"
 msgstr ""
 
 msgid "_About"
 msgstr ""
 

-#: src/ui.c:170
+#: src/ui.c:160

 msgid "About"
 msgstr ""
 
 msgid "About"
 msgstr ""
 

-#: src/ui.c:192 src/ui_appindicator.c:176
+#: src/ui.c:182 src/ui_appindicator.c:173

 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 

-#: src/ui.c:240
+#: src/ui.c:230

 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - Surveillance Des Temperatures"
 
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - Surveillance Des Temperatures"
 

-#: src/ui.c:258
+#: src/ui.c:247

 #, fuzzy, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n"
 
 #, fuzzy, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n"
 

-#: src/ui_sensorlist.c:233
+#: src/ui_sensorlist.c:231

 msgid "Select foreground color"
 msgstr "Selectionner la couleur d'avant-plan"
 
 msgid "Select foreground color"
 msgstr "Selectionner la couleur d'avant-plan"
 

-#: src/ui_sensorlist.c:310 src/glade/psensor-pref.glade:241
+#: src/ui_sensorlist.c:308 src/glade/psensor-pref.glade:241

 msgid "Sensor"
 msgstr "Sonde"
 
 msgid "Sensor"
 msgstr "Sonde"
 

-#: src/ui_sensorlist.c:316
+#: src/ui_sensorlist.c:314

 msgid "Value"
 msgstr "Valeur"
 
 msgid "Value"
 msgstr "Valeur"
 

-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:320

 msgid "Min"
 msgstr "Min"
 
 msgid "Min"
 msgstr "Min"
 

-#: src/ui_sensorlist.c:328
+#: src/ui_sensorlist.c:326

 msgid "Max"
 msgstr "Max"
 
 msgid "Max"
 msgstr "Max"
 

-#: src/ui_sensorlist.c:335
+#: src/ui_sensorlist.c:333

 msgid "Color"
 msgstr "Couleur"
 
 msgid "Color"
 msgstr "Couleur"
 

-#: src/ui_sensorlist.c:347
+#: src/ui_sensorlist.c:345

 msgid "Enabled"
 msgstr "Activée"
 
 msgid "Enabled"
 msgstr "Activée"
 

-#: src/ui_sensorlist.c:376 src/ui_sensorlist.c:377 src/ui_sensorlist.c:378
+#: src/ui_sensorlist.c:374 src/ui_sensorlist.c:375 src/ui_sensorlist.c:376

 #: src/glade/sensor-edit.glade:87 src/glade/sensor-edit.glade:153
 msgid "N/A"
 msgstr "N/A"
 
 #: src/glade/sensor-edit.glade:87 src/glade/sensor-edit.glade:153
 msgid "N/A"
 msgstr "N/A"
 

-#: src/ui_notify.c:40
-#, c-format
-msgid "ERROR: failed gettimeofday\n"
-msgstr "ERREUR: échec gettimeofday\n"
+#: src/ui_notify.c:45
+msgid "gettimeofday failed"
+msgstr ""

 
 

-#: src/ui_notify.c:73 src/ui_notify.c:77
+#: src/ui_notify.c:67 src/ui_notify.c:69

 msgid "Temperature alert"
 msgstr "Alerte thermique"
 
 msgid "Temperature alert"
 msgstr "Alerte thermique"
 

-#: src/ui_sensorpref.c:398
+#: src/ui_sensorpref.c:397

 #, fuzzy
 msgid "Sensor Name"
 msgstr "Sonde"
 
 #, fuzzy
 msgid "Sensor Name"
 msgstr "Sonde"
 

-#: src/rsensor.c:135
+#: src/rsensor.c:107

 #, fuzzy, c-format
 msgid "Fail to connect to: %s"
 msgstr "ERREUR: Echer de la connectio à: %s\n"
 
 #, fuzzy, c-format
 msgid "Fail to connect to: %s"
 msgstr "ERREUR: Echer de la connectio à: %s\n"
 

-#: src/rsensor.c:172
+#: src/rsensor.c:144

 #, fuzzy, c-format
 msgid "Invalid content: %s"
 msgstr "ERREUR: Contenu invalide: %s\n"
 
 #, fuzzy, c-format
 msgid "Invalid content: %s"
 msgstr "ERREUR: Contenu invalide: %s\n"
 

-#: src/rsensor.c:212
+#: src/rsensor.c:184

 #, fuzzy, c-format
 msgid "Invalid JSON: %s"
 msgstr "ERREUR: Invalide JSON: %s\n"
 #, fuzzy, c-format
 msgid "Invalid JSON: %s"
 msgstr "ERREUR: Invalide JSON: %s\n"


@@ -237,12 +236,21 @@ msgstr ""
 "psensor-server est un serveur HTTP pour surveiller à distance les sondes "
 "matérielles."
 
 "psensor-server est un serveur HTTP pour surveiller à distance les sondes "
 "matérielles."
 

+#: src/server/server.c:94
+#, fuzzy
+msgid ""
+"  -h, --help\t\tdisplay this help and exit\n"
+"  -v, --version\t\tdisplay version information and exit"
+msgstr ""
+"  -h, --help          afficher cette aide et quitter\n"
+"  -v, --version       afficher les informations de version et quitter"
+

 #: src/server/server.c:100
 #, fuzzy
 msgid ""
 #: src/server/server.c:100
 #, fuzzy
 msgid ""

-"  -d,--debug     run in debug mode\n"
-"  -p,--port=PORT webserver port\n"
-"  -w,--wdir=DIR  directory containing webserver pages"
+"  -d,--debug\t\trun in debug mode\n"
+"  -p,--port=PORT\twebserver port\n"
+"  -w,--wdir=DIR\t\tdirectory containing webserver pages"

 msgstr ""
 "  -p,--port=PORT port du serveur Web\n"
 "  -w,--wdir=DIR  répertoire contenant les pages du serveur Web"
 msgstr ""
 "  -p,--port=PORT port du serveur Web\n"
 "  -w,--wdir=DIR  répertoire contenant les pages du serveur Web"


@@ -302,71 +310,71 @@ msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 "ERREUR: Impossible de récuperer la valeur de la sous-fonctionnalité %s: %s\n"
 
 msgstr ""
 "ERREUR: Impossible de récuperer la valeur de la sous-fonctionnalité %s: %s\n"
 

-#: src/lib/hdd.c:59
+#: src/lib/hdd.c:58

 #, fuzzy, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
 msgstr "ERREUR: hdd_fetch, écher d'ouverture de la socket\n"
 
 #, fuzzy, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
 msgstr "ERREUR: hdd_fetch, écher d'ouverture de la socket\n"
 

-#: src/lib/hdd.c:73
+#: src/lib/hdd.c:72

 #, fuzzy, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
 msgstr "ERREUR: hdd_fetch, écher de l'ouverture de la connection\n"
 
 #, fuzzy, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
 msgstr "ERREUR: hdd_fetch, écher de l'ouverture de la connection\n"
 

-#: src/lib/hdd.c:183
+#: src/lib/hdd.c:182

 #, c-format
 msgid "ERROR: wrong hdd string: %s"
 msgstr "ERREUR: mauvaise chaine hdd: %s"
 
 #, c-format
 msgid "ERROR: wrong hdd string: %s"
 msgstr "ERREUR: mauvaise chaine hdd: %s"
 

-#: src/lib/hdd.c:253
+#: src/lib/hdd.c:252

 #, c-format
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr "ERREUR: mauvaise chaine hdd: %s\n"
 
 #, c-format
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr "ERREUR: mauvaise chaine hdd: %s\n"
 

-#: src/lib/log.c:40
+#: src/lib/log.c:37

 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 

-#: src/lib/nvidia.c:55
+#: src/lib/nvidia.c:54

 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr "ERREUR: échec de la récupération des températures nvidia\n"
 
 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr "ERREUR: échec de la récupération des températures nvidia\n"
 

-#: src/lib/nvidia.c:92
+#: src/lib/nvidia.c:91

 #, fuzzy, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
 msgstr "ERREUR: Echer de la connectio à: %s\n"
 
 #, fuzzy, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
 msgstr "ERREUR: Echer de la connectio à: %s\n"
 

-#: src/lib/nvidia.c:100
+#: src/lib/nvidia.c:99

 #, fuzzy, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr "ERREUR: échec de la récupération des températures nvidia\n"
 
 #, fuzzy, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr "ERREUR: échec de la récupération des températures nvidia\n"
 

-#: src/lib/lmsensor.c:44
+#: src/lib/lmsensor.c:43

 #, c-format
 msgid "ERROR: Can't get value of subfeature %s: %s\n"
 msgstr ""
 "ERREUR: Impossible de récuperer la valeur de la sous-fonctionnalité %s: %s\n"
 
 #, c-format
 msgid "ERROR: Can't get value of subfeature %s: %s\n"
 msgstr ""
 "ERREUR: Impossible de récuperer la valeur de la sous-fonctionnalité %s: %s\n"
 

-#: src/lib/lmsensor.c:126
+#: src/lib/lmsensor.c:125

 #, c-format
 msgid "ERROR: create_sensor, wrong feature type\n"
 msgstr "ERREUR: create_sensor, mauvais type de fonctionnalité\n"
 
 #, c-format
 msgid "ERROR: create_sensor, wrong feature type\n"
 msgstr "ERREUR: create_sensor, mauvais type de fonctionnalité\n"
 

-#: src/lib/lmsensor.c:209
+#: src/lib/lmsensor.c:208

 #, c-format
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr "ERREUR: échec de l'initialisation de lm-sensors: %s\n"
 
 #, c-format
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr "ERREUR: échec de l'initialisation de lm-sensors: %s\n"
 

-#: src/lib/psensor.c:431
+#: src/lib/psensor.c:430

 msgid "C"
 msgstr ""
 
 msgid "C"
 msgstr ""
 

-#: src/lib/psensor.c:434
+#: src/lib/psensor.c:433

 msgid "RPM"
 msgstr ""
 
 msgid "RPM"
 msgstr ""
 

-#: src/lib/psensor.c:437
+#: src/lib/psensor.c:436

 msgid "%"
 msgstr ""
 
 msgid "%"
 msgstr ""
 


@@ -503,6 +511,9 @@ msgstr "Dessiner la courbe de la sonde"
 msgid "°C"
 msgstr "°C"
 
 msgid "°C"
 msgstr "°C"
 

+#~ msgid "ERROR: failed gettimeofday\n"
+#~ msgstr "ERREUR: échec gettimeofday\n"
+

 #~ msgid "Current"
 #~ msgstr "Actuelle"
 
 #~ msgid "Current"
 #~ msgstr "Actuelle"
 

diff --git a/po/psensor.pot b/po/psensor.pot
index 6a04f0b..a1fa88f 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2011-11-08 12:36+0100\n"
+"POT-Creation-Date: 2011-11-13 16:33+0100\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: src/main.c:79 src/server/server.c:77
+#: src/main.c:77 src/server/server.c:77

 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"


@@ -27,179 +27,178 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 

-#: src/main.c:89 src/server/server.c:87
+#: src/main.c:87 src/server/server.c:87

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr ""
 

-#: src/main.c:91
+#: src/main.c:89

 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 
 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 

-#: src/main.c:95
+#: src/main.c:93

 msgid "Options:"
 msgstr ""
 
 msgid "Options:"
 msgstr ""
 

-#: src/main.c:96 src/server/server.c:94
+#: src/main.c:94

 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 

-#: src/main.c:102
+#: src/main.c:100

 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 

-#: src/main.c:108 src/server/server.c:107
+#: src/main.c:106 src/server/server.c:107

 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 

-#: src/main.c:110 src/server/server.c:109
+#: src/main.c:108 src/server/server.c:109

 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 

-#: src/main.c:363
+#: src/main.c:407

 #, c-format
 msgid "Enables debug mode.\n"
 msgstr ""
 
 #, c-format
 msgid "Enables debug mode.\n"
 msgstr ""
 

-#: src/main.c:373 src/server/server.c:353
+#: src/main.c:417 src/server/server.c:353

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 

-#: src/main.c:404
+#: src/main.c:444

 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 

-#: src/ui.c:90
+#: src/ui.c:80

 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr ""
 
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr ""
 

-#: src/ui.c:93
+#: src/ui.c:83

 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 
 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 

-#: src/ui.c:96
+#: src/ui.c:86

 msgid "About Psensor"
 msgstr ""
 
 msgid "About Psensor"
 msgstr ""
 

-#: src/ui.c:99
+#: src/ui.c:89

 msgid "Psensor Homepage"
 msgstr ""
 
 msgid "Psensor Homepage"
 msgstr ""
 

-#: src/ui.c:154
+#: src/ui.c:144

 msgid "_Preferences"
 msgstr ""
 
 msgid "_Preferences"
 msgstr ""
 

-#: src/ui.c:155 src/ui_sensorlist.c:202
+#: src/ui.c:145 src/ui_sensorlist.c:200

 msgid "Preferences"
 msgstr ""
 
 msgid "Preferences"
 msgstr ""
 

-#: src/ui.c:159
+#: src/ui.c:149

 msgid "_Sensor Preferences"
 msgstr ""
 
 msgid "_Sensor Preferences"
 msgstr ""
 

-#: src/ui.c:160
+#: src/ui.c:150

 msgid "Sensor Preferences"
 msgstr ""
 
 msgid "Sensor Preferences"
 msgstr ""
 

-#: src/ui.c:164
+#: src/ui.c:154

 msgid "_Quit"
 msgstr ""
 
 msgid "_Quit"
 msgstr ""
 

-#: src/ui.c:164
+#: src/ui.c:154

 msgid "Quit"
 msgstr ""
 
 msgid "Quit"
 msgstr ""
 

-#: src/ui.c:169
+#: src/ui.c:159

 msgid "_About"
 msgstr ""
 
 msgid "_About"
 msgstr ""
 

-#: src/ui.c:170
+#: src/ui.c:160

 msgid "About"
 msgstr ""
 
 msgid "About"
 msgstr ""
 

-#: src/ui.c:192 src/ui_appindicator.c:176
+#: src/ui.c:182 src/ui_appindicator.c:173

 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 

-#: src/ui.c:240
+#: src/ui.c:230

 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 

-#: src/ui.c:258
+#: src/ui.c:247

 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr ""
 

-#: src/ui_sensorlist.c:233
+#: src/ui_sensorlist.c:231

 msgid "Select foreground color"
 msgstr ""
 
 msgid "Select foreground color"
 msgstr ""
 

-#: src/ui_sensorlist.c:310 src/glade/psensor-pref.glade:241
+#: src/ui_sensorlist.c:308 src/glade/psensor-pref.glade:241

 msgid "Sensor"
 msgstr ""
 
 msgid "Sensor"
 msgstr ""
 

-#: src/ui_sensorlist.c:316
+#: src/ui_sensorlist.c:314

 msgid "Value"
 msgstr ""
 
 msgid "Value"
 msgstr ""
 

-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:320

 msgid "Min"
 msgstr ""
 
 msgid "Min"
 msgstr ""
 

-#: src/ui_sensorlist.c:328
+#: src/ui_sensorlist.c:326

 msgid "Max"
 msgstr ""
 
 msgid "Max"
 msgstr ""
 

-#: src/ui_sensorlist.c:335
+#: src/ui_sensorlist.c:333

 msgid "Color"
 msgstr ""
 
 msgid "Color"
 msgstr ""
 

-#: src/ui_sensorlist.c:347
+#: src/ui_sensorlist.c:345

 msgid "Enabled"
 msgstr ""
 
 msgid "Enabled"
 msgstr ""
 

-#: src/ui_sensorlist.c:376 src/ui_sensorlist.c:377 src/ui_sensorlist.c:378
+#: src/ui_sensorlist.c:374 src/ui_sensorlist.c:375 src/ui_sensorlist.c:376

 #: src/glade/sensor-edit.glade:87 src/glade/sensor-edit.glade:153
 msgid "N/A"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:87 src/glade/sensor-edit.glade:153
 msgid "N/A"
 msgstr ""
 

-#: src/ui_notify.c:40
-#, c-format
-msgid "ERROR: failed gettimeofday\n"
+#: src/ui_notify.c:45
+msgid "gettimeofday failed"

 msgstr ""
 
 msgstr ""
 

-#: src/ui_notify.c:73 src/ui_notify.c:77
+#: src/ui_notify.c:67 src/ui_notify.c:69

 msgid "Temperature alert"
 msgstr ""
 
 msgid "Temperature alert"
 msgstr ""
 

-#: src/ui_sensorpref.c:398
+#: src/ui_sensorpref.c:397

 msgid "Sensor Name"
 msgstr ""
 
 msgid "Sensor Name"
 msgstr ""
 

-#: src/rsensor.c:135
+#: src/rsensor.c:107

 #, c-format
 msgid "Fail to connect to: %s"
 msgstr ""
 
 #, c-format
 msgid "Fail to connect to: %s"
 msgstr ""
 

-#: src/rsensor.c:172
+#: src/rsensor.c:144

 #, c-format
 msgid "Invalid content: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid content: %s"
 msgstr ""
 

-#: src/rsensor.c:212
+#: src/rsensor.c:184

 #, c-format
 msgid "Invalid JSON: %s"
 msgstr ""
 #, c-format
 msgid "Invalid JSON: %s"
 msgstr ""


@@ -214,11 +213,17 @@ msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
 msgstr ""
 
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
 msgstr ""
 

+#: src/server/server.c:94
+msgid ""
+"  -h, --help\t\tdisplay this help and exit\n"
+"  -v, --version\t\tdisplay version information and exit"
+msgstr ""
+

 #: src/server/server.c:100
 msgid ""
 #: src/server/server.c:100
 msgid ""

-"  -d,--debug     run in debug mode\n"
-"  -p,--port=PORT webserver port\n"
-"  -w,--wdir=DIR  directory containing webserver pages"
+"  -d,--debug\t\trun in debug mode\n"
+"  -p,--port=PORT\twebserver port\n"
+"  -w,--wdir=DIR\t\tdirectory containing webserver pages"

 msgstr ""
 
 #: src/server/server.c:181
 msgstr ""
 
 #: src/server/server.c:181


@@ -275,70 +280,70 @@ msgstr ""
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 

-#: src/lib/hdd.c:59
+#: src/lib/hdd.c:58

 #, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
 msgstr ""
 

-#: src/lib/hdd.c:73
+#: src/lib/hdd.c:72

 #, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
 msgstr ""
 

-#: src/lib/hdd.c:183
+#: src/lib/hdd.c:182

 #, c-format
 msgid "ERROR: wrong hdd string: %s"
 msgstr ""
 
 #, c-format
 msgid "ERROR: wrong hdd string: %s"
 msgstr ""
 

-#: src/lib/hdd.c:253
+#: src/lib/hdd.c:252

 #, c-format
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr ""
 

-#: src/lib/log.c:40
+#: src/lib/log.c:37

 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 

-#: src/lib/nvidia.c:55
+#: src/lib/nvidia.c:54

 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr ""
 

-#: src/lib/nvidia.c:92
+#: src/lib/nvidia.c:91

 #, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
 msgstr ""
 

-#: src/lib/nvidia.c:100
+#: src/lib/nvidia.c:99

 #, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr ""
 

-#: src/lib/lmsensor.c:44
+#: src/lib/lmsensor.c:43

 #, c-format
 msgid "ERROR: Can't get value of subfeature %s: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Can't get value of subfeature %s: %s\n"
 msgstr ""
 

-#: src/lib/lmsensor.c:126
+#: src/lib/lmsensor.c:125

 #, c-format
 msgid "ERROR: create_sensor, wrong feature type\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: create_sensor, wrong feature type\n"
 msgstr ""
 

-#: src/lib/lmsensor.c:209
+#: src/lib/lmsensor.c:208

 #, c-format
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 

-#: src/lib/psensor.c:431
+#: src/lib/psensor.c:430

 msgid "C"
 msgstr ""
 
 msgid "C"
 msgstr ""
 

-#: src/lib/psensor.c:434
+#: src/lib/psensor.c:433

 msgid "RPM"
 msgstr ""
 
 msgid "RPM"
 msgstr ""
 

-#: src/lib/psensor.c:437
+#: src/lib/psensor.c:436

 msgid "%"
 msgstr ""
 
 msgid "%"
 msgstr ""
 

diff --git a/po/tr.po b/po/tr.po
index 0db5a6c..dc7292d 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2011-11-08 12:36+0100\n"
+"POT-Creation-Date: 2011-11-13 16:33+0100\n"

 "PO-Revision-Date: 2011-04-10 13:11+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "PO-Revision-Date: 2011-04-10 13:11+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"


@@ -18,7 +18,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-04-11 05:41+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 "X-Launchpad-Export-Date: 2011-04-11 05:41+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 

-#: src/main.c:79 src/server/server.c:77
+#: src/main.c:77 src/server/server.c:77

 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"


@@ -28,183 +28,182 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 

-#: src/main.c:89 src/server/server.c:87
+#: src/main.c:87 src/server/server.c:87

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEK]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEK]...\n"
 

-#: src/main.c:91
+#: src/main.c:89

 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 
 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr ""
 

-#: src/main.c:95
+#: src/main.c:93

 msgid "Options:"
 msgstr ""
 
 msgid "Options:"
 msgstr ""
 

-#: src/main.c:96 src/server/server.c:94
+#: src/main.c:94

 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
 

-#: src/main.c:102
+#: src/main.c:100

 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr ""
 

-#: src/main.c:108 src/server/server.c:107
+#: src/main.c:106 src/server/server.c:107

 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Hataları rapor et:%s\n"
 
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr "Hataları rapor et:%s\n"
 

-#: src/main.c:110 src/server/server.c:109
+#: src/main.c:108 src/server/server.c:109

 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s ana sayfa: <%s>\n"
 
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s ana sayfa: <%s>\n"
 

-#: src/main.c:363
+#: src/main.c:407

 #, c-format
 msgid "Enables debug mode.\n"
 msgstr ""
 
 #, c-format
 msgid "Enables debug mode.\n"
 msgstr ""
 

-#: src/main.c:373 src/server/server.c:353
+#: src/main.c:417 src/server/server.c:353

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
 

-#: src/main.c:404
+#: src/main.c:444

 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 

-#: src/ui.c:90
+#: src/ui.c:80

 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr ""
 
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr ""
 

-#: src/ui.c:93
+#: src/ui.c:83

 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 
 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 

-#: src/ui.c:96
+#: src/ui.c:86

 msgid "About Psensor"
 msgstr ""
 
 msgid "About Psensor"
 msgstr ""
 

-#: src/ui.c:99
+#: src/ui.c:89

 msgid "Psensor Homepage"
 msgstr ""
 
 msgid "Psensor Homepage"
 msgstr ""
 

-#: src/ui.c:154
+#: src/ui.c:144

 #, fuzzy
 msgid "_Preferences"
 msgstr "Tercihler"
 
 #, fuzzy
 msgid "_Preferences"
 msgstr "Tercihler"
 

-#: src/ui.c:155 src/ui_sensorlist.c:202
+#: src/ui.c:145 src/ui_sensorlist.c:200

 msgid "Preferences"
 msgstr "Tercihler"
 
 msgid "Preferences"
 msgstr "Tercihler"
 

-#: src/ui.c:159
+#: src/ui.c:149

 #, fuzzy
 msgid "_Sensor Preferences"
 msgstr "Tercihleri düzenle"
 
 #, fuzzy
 msgid "_Sensor Preferences"
 msgstr "Tercihleri düzenle"
 

-#: src/ui.c:160
+#: src/ui.c:150

 #, fuzzy
 msgid "Sensor Preferences"
 msgstr "Tercihleri düzenle"
 
 #, fuzzy
 msgid "Sensor Preferences"
 msgstr "Tercihleri düzenle"
 

-#: src/ui.c:164
+#: src/ui.c:154

 msgid "_Quit"
 msgstr ""
 
 msgid "_Quit"
 msgstr ""
 

-#: src/ui.c:164
+#: src/ui.c:154

 msgid "Quit"
 msgstr ""
 
 msgid "Quit"
 msgstr ""
 

-#: src/ui.c:169
+#: src/ui.c:159

 msgid "_About"
 msgstr ""
 
 msgid "_About"
 msgstr ""
 

-#: src/ui.c:170
+#: src/ui.c:160

 msgid "About"
 msgstr ""
 
 msgid "About"
 msgstr ""
 

-#: src/ui.c:192 src/ui_appindicator.c:176
+#: src/ui.c:182 src/ui_appindicator.c:173

 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 

-#: src/ui.c:240
+#: src/ui.c:230

 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 

-#: src/ui.c:258
+#: src/ui.c:247

 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr ""
 

-#: src/ui_sensorlist.c:233
+#: src/ui_sensorlist.c:231

 msgid "Select foreground color"
 msgstr ""
 
 msgid "Select foreground color"
 msgstr ""
 

-#: src/ui_sensorlist.c:310 src/glade/psensor-pref.glade:241
+#: src/ui_sensorlist.c:308 src/glade/psensor-pref.glade:241

 msgid "Sensor"
 msgstr "Algılayıcı"
 
 msgid "Sensor"
 msgstr "Algılayıcı"
 

-#: src/ui_sensorlist.c:316
+#: src/ui_sensorlist.c:314

 msgid "Value"
 msgstr ""
 
 msgid "Value"
 msgstr ""
 

-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:320

 msgid "Min"
 msgstr ""
 
 msgid "Min"
 msgstr ""
 

-#: src/ui_sensorlist.c:328
+#: src/ui_sensorlist.c:326

 msgid "Max"
 msgstr ""
 
 msgid "Max"
 msgstr ""
 

-#: src/ui_sensorlist.c:335
+#: src/ui_sensorlist.c:333

 msgid "Color"
 msgstr "Renk"
 
 msgid "Color"
 msgstr "Renk"
 

-#: src/ui_sensorlist.c:347
+#: src/ui_sensorlist.c:345

 msgid "Enabled"
 msgstr ""
 
 msgid "Enabled"
 msgstr ""
 

-#: src/ui_sensorlist.c:376 src/ui_sensorlist.c:377 src/ui_sensorlist.c:378
+#: src/ui_sensorlist.c:374 src/ui_sensorlist.c:375 src/ui_sensorlist.c:376

 #: src/glade/sensor-edit.glade:87 src/glade/sensor-edit.glade:153
 msgid "N/A"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:87 src/glade/sensor-edit.glade:153
 msgid "N/A"
 msgstr ""
 

-#: src/ui_notify.c:40
-#, c-format
-msgid "ERROR: failed gettimeofday\n"
+#: src/ui_notify.c:45
+msgid "gettimeofday failed"

 msgstr ""
 
 msgstr ""
 

-#: src/ui_notify.c:73 src/ui_notify.c:77
+#: src/ui_notify.c:67 src/ui_notify.c:69

 msgid "Temperature alert"
 msgstr ""
 
 msgid "Temperature alert"
 msgstr ""
 

-#: src/ui_sensorpref.c:398
+#: src/ui_sensorpref.c:397

 #, fuzzy
 msgid "Sensor Name"
 msgstr "Algılayıcı"
 
 #, fuzzy
 msgid "Sensor Name"
 msgstr "Algılayıcı"
 

-#: src/rsensor.c:135
+#: src/rsensor.c:107

 #, c-format
 msgid "Fail to connect to: %s"
 msgstr ""
 
 #, c-format
 msgid "Fail to connect to: %s"
 msgstr ""
 

-#: src/rsensor.c:172
+#: src/rsensor.c:144

 #, c-format
 msgid "Invalid content: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid content: %s"
 msgstr ""
 

-#: src/rsensor.c:212
+#: src/rsensor.c:184

 #, c-format
 msgid "Invalid JSON: %s"
 msgstr ""
 #, c-format
 msgid "Invalid JSON: %s"
 msgstr ""


@@ -219,11 +218,17 @@ msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
 msgstr ""
 
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
 msgstr ""
 

+#: src/server/server.c:94
+msgid ""
+"  -h, --help\t\tdisplay this help and exit\n"
+"  -v, --version\t\tdisplay version information and exit"
+msgstr ""
+

 #: src/server/server.c:100
 msgid ""
 #: src/server/server.c:100
 msgid ""

-"  -d,--debug     run in debug mode\n"
-"  -p,--port=PORT webserver port\n"
-"  -w,--wdir=DIR  directory containing webserver pages"
+"  -d,--debug\t\trun in debug mode\n"
+"  -p,--port=PORT\twebserver port\n"
+"  -w,--wdir=DIR\t\tdirectory containing webserver pages"

 msgstr ""
 
 #: src/server/server.c:181
 msgstr ""
 
 #: src/server/server.c:181


@@ -280,70 +285,70 @@ msgstr ""
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 

-#: src/lib/hdd.c:59
+#: src/lib/hdd.c:58

 #, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
 msgstr ""
 

-#: src/lib/hdd.c:73
+#: src/lib/hdd.c:72

 #, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
 msgstr ""
 

-#: src/lib/hdd.c:183
+#: src/lib/hdd.c:182

 #, c-format
 msgid "ERROR: wrong hdd string: %s"
 msgstr ""
 
 #, c-format
 msgid "ERROR: wrong hdd string: %s"
 msgstr ""
 

-#: src/lib/hdd.c:253
+#: src/lib/hdd.c:252

 #, c-format
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr ""
 

-#: src/lib/log.c:40
+#: src/lib/log.c:37

 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 

-#: src/lib/nvidia.c:55
+#: src/lib/nvidia.c:54

 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr ""
 

-#: src/lib/nvidia.c:92
+#: src/lib/nvidia.c:91

 #, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
 msgstr ""
 

-#: src/lib/nvidia.c:100
+#: src/lib/nvidia.c:99

 #, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr ""
 

-#: src/lib/lmsensor.c:44
+#: src/lib/lmsensor.c:43

 #, c-format
 msgid "ERROR: Can't get value of subfeature %s: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Can't get value of subfeature %s: %s\n"
 msgstr ""
 

-#: src/lib/lmsensor.c:126
+#: src/lib/lmsensor.c:125

 #, c-format
 msgid "ERROR: create_sensor, wrong feature type\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: create_sensor, wrong feature type\n"
 msgstr ""
 

-#: src/lib/lmsensor.c:209
+#: src/lib/lmsensor.c:208

 #, c-format
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 

-#: src/lib/psensor.c:431
+#: src/lib/psensor.c:430

 msgid "C"
 msgstr ""
 
 msgid "C"
 msgstr ""
 

-#: src/lib/psensor.c:434
+#: src/lib/psensor.c:433

 msgid "RPM"
 msgstr ""
 
 msgid "RPM"
 msgstr ""
 

-#: src/lib/psensor.c:437
+#: src/lib/psensor.c:436

 msgid "%"
 msgstr ""
 
 msgid "%"
 msgstr ""
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1811c91..d72f7dc 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.10\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.10\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2011-11-08 12:36+0100\n"
+"POT-Creation-Date: 2011-11-13 16:33+0100\n"

 "PO-Revision-Date: 2011-06-06 08:57+0000\n"
 "Last-Translator: royclark <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
 "PO-Revision-Date: 2011-06-06 08:57+0000\n"
 "Last-Translator: royclark <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"


@@ -18,7 +18,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-06-06 09:00+0000\n"
 "X-Generator: Launchpad (build 13144)\n"
 
 "X-Launchpad-Export-Date: 2011-06-06 09:00+0000\n"
 "X-Generator: Launchpad (build 13144)\n"
 

-#: src/main.c:79 src/server/server.c:77
+#: src/main.c:77 src/server/server.c:77

 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"
 #, c-format
 msgid ""
 "Copyright (C) %s jeanfi@gmail.com\n"


@@ -28,22 +28,22 @@ msgid ""
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 

-#: src/main.c:89 src/server/server.c:87
+#: src/main.c:87 src/server/server.c:87

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [选项]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [选项]...\n"
 

-#: src/main.c:91
+#: src/main.c:89

 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温度和风扇转速。"
 
 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
 msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温度和风扇转速。"
 

-#: src/main.c:95
+#: src/main.c:93

 msgid "Options:"
 msgstr ""
 
 msgid "Options:"
 msgstr ""
 

-#: src/main.c:96 src/server/server.c:94
+#: src/main.c:94

 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"


@@ -51,159 +51,158 @@ msgstr ""
 "  -h, --help 显示这个帮助并退出\n"
 "  -v, --version 显示版本信息并退出"
 
 "  -h, --help 显示这个帮助并退出\n"
 "  -v, --version 显示版本信息并退出"
 

-#: src/main.c:102
+#: src/main.c:100

 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr "  -u, --url=URL psensor服务器的 URL ，比如：http://hostname:3131"
 
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
 msgstr "  -u, --url=URL psensor服务器的 URL ，比如：http://hostname:3131"
 

-#: src/main.c:108 src/server/server.c:107
+#: src/main.c:106 src/server/server.c:107

 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Report bugs to: %s\n"
 msgstr ""
 

-#: src/main.c:110 src/server/server.c:109
+#: src/main.c:108 src/server/server.c:109

 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr ""
 

-#: src/main.c:363
+#: src/main.c:407

 #, c-format
 msgid "Enables debug mode.\n"
 msgstr ""
 
 #, c-format
 msgid "Enables debug mode.\n"
 msgstr ""
 

-#: src/main.c:373 src/server/server.c:353
+#: src/main.c:417 src/server/server.c:353

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 

-#: src/main.c:404
+#: src/main.c:444

 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 

-#: src/ui.c:90
+#: src/ui.c:80

 #, fuzzy
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温度和风扇转速。"
 
 #, fuzzy
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温度和风扇转速。"
 

-#: src/ui.c:93
+#: src/ui.c:83

 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 
 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 

-#: src/ui.c:96
+#: src/ui.c:86

 msgid "About Psensor"
 msgstr ""
 
 msgid "About Psensor"
 msgstr ""
 

-#: src/ui.c:99
+#: src/ui.c:89

 msgid "Psensor Homepage"
 msgstr ""
 
 msgid "Psensor Homepage"
 msgstr ""
 

-#: src/ui.c:154
+#: src/ui.c:144

 msgid "_Preferences"
 msgstr ""
 
 msgid "_Preferences"
 msgstr ""
 

-#: src/ui.c:155 src/ui_sensorlist.c:202
+#: src/ui.c:145 src/ui_sensorlist.c:200

 msgid "Preferences"
 msgstr "选项"
 
 msgid "Preferences"
 msgstr "选项"
 

-#: src/ui.c:159
+#: src/ui.c:149

 msgid "_Sensor Preferences"
 msgstr ""
 
 msgid "_Sensor Preferences"
 msgstr ""
 

-#: src/ui.c:160
+#: src/ui.c:150

 msgid "Sensor Preferences"
 msgstr ""
 
 msgid "Sensor Preferences"
 msgstr ""
 

-#: src/ui.c:164
+#: src/ui.c:154

 msgid "_Quit"
 msgstr ""
 
 msgid "_Quit"
 msgstr ""
 

-#: src/ui.c:164
+#: src/ui.c:154

 msgid "Quit"
 msgstr "退出"
 
 msgid "Quit"
 msgstr "退出"
 

-#: src/ui.c:169
+#: src/ui.c:159

 msgid "_About"
 msgstr ""
 
 msgid "_About"
 msgstr ""
 

-#: src/ui.c:170
+#: src/ui.c:160

 msgid "About"
 msgstr ""
 
 msgid "About"
 msgstr ""
 

-#: src/ui.c:192 src/ui_appindicator.c:176
+#: src/ui.c:182 src/ui_appindicator.c:173

 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 

-#: src/ui.c:240
+#: src/ui.c:230

 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 

-#: src/ui.c:258
+#: src/ui.c:247

 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr ""
 

-#: src/ui_sensorlist.c:233
+#: src/ui_sensorlist.c:231

 msgid "Select foreground color"
 msgstr "选择前景色"
 
 msgid "Select foreground color"
 msgstr "选择前景色"
 

-#: src/ui_sensorlist.c:310 src/glade/psensor-pref.glade:241
+#: src/ui_sensorlist.c:308 src/glade/psensor-pref.glade:241

 msgid "Sensor"
 msgstr "监视设备"
 
 msgid "Sensor"
 msgstr "监视设备"
 

-#: src/ui_sensorlist.c:316
+#: src/ui_sensorlist.c:314

 msgid "Value"
 msgstr ""
 
 msgid "Value"
 msgstr ""
 

-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:320

 msgid "Min"
 msgstr "最小值"
 
 msgid "Min"
 msgstr "最小值"
 

-#: src/ui_sensorlist.c:328
+#: src/ui_sensorlist.c:326

 msgid "Max"
 msgstr "最大值"
 
 msgid "Max"
 msgstr "最大值"
 

-#: src/ui_sensorlist.c:335
+#: src/ui_sensorlist.c:333

 msgid "Color"
 msgstr "颜色"
 
 msgid "Color"
 msgstr "颜色"
 

-#: src/ui_sensorlist.c:347
+#: src/ui_sensorlist.c:345

 msgid "Enabled"
 msgstr "激活"
 
 msgid "Enabled"
 msgstr "激活"
 

-#: src/ui_sensorlist.c:376 src/ui_sensorlist.c:377 src/ui_sensorlist.c:378
+#: src/ui_sensorlist.c:374 src/ui_sensorlist.c:375 src/ui_sensorlist.c:376

 #: src/glade/sensor-edit.glade:87 src/glade/sensor-edit.glade:153
 msgid "N/A"
 msgstr ""
 
 #: src/glade/sensor-edit.glade:87 src/glade/sensor-edit.glade:153
 msgid "N/A"
 msgstr ""
 

-#: src/ui_notify.c:40
-#, c-format
-msgid "ERROR: failed gettimeofday\n"
+#: src/ui_notify.c:45
+msgid "gettimeofday failed"

 msgstr ""
 
 msgstr ""
 

-#: src/ui_notify.c:73 src/ui_notify.c:77
+#: src/ui_notify.c:67 src/ui_notify.c:69

 msgid "Temperature alert"
 msgstr "温度报警"
 
 msgid "Temperature alert"
 msgstr "温度报警"
 

-#: src/ui_sensorpref.c:398
+#: src/ui_sensorpref.c:397

 msgid "Sensor Name"
 msgstr ""
 
 msgid "Sensor Name"
 msgstr ""
 

-#: src/rsensor.c:135
+#: src/rsensor.c:107

 #, c-format
 msgid "Fail to connect to: %s"
 msgstr ""
 
 #, c-format
 msgid "Fail to connect to: %s"
 msgstr ""
 

-#: src/rsensor.c:172
+#: src/rsensor.c:144

 #, c-format
 msgid "Invalid content: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid content: %s"
 msgstr ""
 

-#: src/rsensor.c:212
+#: src/rsensor.c:184

 #, c-format
 msgid "Invalid JSON: %s"
 msgstr ""
 #, c-format
 msgid "Invalid JSON: %s"
 msgstr ""


@@ -218,11 +217,20 @@ msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
 msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。"
 
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
 msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。"
 

+#: src/server/server.c:94
+#, fuzzy
+msgid ""
+"  -h, --help\t\tdisplay this help and exit\n"
+"  -v, --version\t\tdisplay version information and exit"
+msgstr ""
+"  -h, --help 显示这个帮助并退出\n"
+"  -v, --version 显示版本信息并退出"
+

 #: src/server/server.c:100
 msgid ""
 #: src/server/server.c:100
 msgid ""

-"  -d,--debug     run in debug mode\n"
-"  -p,--port=PORT webserver port\n"
-"  -w,--wdir=DIR  directory containing webserver pages"
+"  -d,--debug\t\trun in debug mode\n"
+"  -p,--port=PORT\twebserver port\n"
+"  -w,--wdir=DIR\t\tdirectory containing webserver pages"

 msgstr ""
 
 #: src/server/server.c:181
 msgstr ""
 
 #: src/server/server.c:181


@@ -279,70 +287,70 @@ msgstr ""
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
 

-#: src/lib/hdd.c:59
+#: src/lib/hdd.c:58

 #, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
 msgstr ""
 

-#: src/lib/hdd.c:73
+#: src/lib/hdd.c:72

 #, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
 msgstr ""
 

-#: src/lib/hdd.c:183
+#: src/lib/hdd.c:182

 #, c-format
 msgid "ERROR: wrong hdd string: %s"
 msgstr ""
 
 #, c-format
 msgid "ERROR: wrong hdd string: %s"
 msgstr ""
 

-#: src/lib/hdd.c:253
+#: src/lib/hdd.c:252

 #, c-format
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr ""
 

-#: src/lib/log.c:40
+#: src/lib/log.c:37

 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 
 #, c-format
 msgid "Cannot open log file: %s"
 msgstr ""
 

-#: src/lib/nvidia.c:55
+#: src/lib/nvidia.c:54

 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr ""
 

-#: src/lib/nvidia.c:92
+#: src/lib/nvidia.c:91

 #, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
 msgstr ""
 

-#: src/lib/nvidia.c:100
+#: src/lib/nvidia.c:99

 #, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr ""
 

-#: src/lib/lmsensor.c:44
+#: src/lib/lmsensor.c:43

 #, c-format
 msgid "ERROR: Can't get value of subfeature %s: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: Can't get value of subfeature %s: %s\n"
 msgstr ""
 

-#: src/lib/lmsensor.c:126
+#: src/lib/lmsensor.c:125

 #, c-format
 msgid "ERROR: create_sensor, wrong feature type\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: create_sensor, wrong feature type\n"
 msgstr ""
 

-#: src/lib/lmsensor.c:209
+#: src/lib/lmsensor.c:208

 #, c-format
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 
 #, c-format
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 

-#: src/lib/psensor.c:431
+#: src/lib/psensor.c:430

 msgid "C"
 msgstr ""
 
 msgid "C"
 msgstr ""
 

-#: src/lib/psensor.c:434
+#: src/lib/psensor.c:433

 msgid "RPM"
 msgstr ""
 
 msgid "RPM"
 msgstr ""
 

-#: src/lib/psensor.c:437
+#: src/lib/psensor.c:436

 msgid "%"
 msgstr ""
 
 msgid "%"
 msgstr ""
 

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 2c42f70..c2bbada 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -30,6 +30,9 @@
 #include "ui_status.h"
 #include "ui_pref.h"
 
 #include "ui_status.h"
 #include "ui_pref.h"
 

+static const char *ICON = "psensor_normal";
+static const char *ATTENTION_ICON = "psensor_hot";
+

 static GtkMenuItem **sensor_menu_items;
 static GtkWidget *main_window;
 static int appindicator_supported = 1;
 static GtkMenuItem **sensor_menu_items;
 static GtkWidget *main_window;
 static int appindicator_supported = 1;


@@ -238,8 +241,8 @@ void ui_appindicator_init(struct ui_psensor *ui)
        main_window = ui->main_window;
 
        indicator = app_indicator_new
        main_window = ui->main_window;
 
        indicator = app_indicator_new

-               ("psensor",
-                "psensor_normal",
+               (ICON,
+                ATTENTION_ICON,

                 APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
        APP_INDICATOR_GET_CLASS(indicator)->fallback = unity_fallback;
                 APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
        APP_INDICATOR_GET_CLASS(indicator)->fallback = unity_fallback;

diff --git a/src/ui_status.c b/src/ui_status.c
index 06dbbe0..4f7f25b 100644 (file)
--- a/src/ui_status.c
+++ b/src/ui_status.c
@@ -19,6 +19,9 @@
 #include "log.h"
 #include "ui_status.h"
 
 #include "log.h"
 #include "ui_status.h"
 

+static const char *ICON = "psensor_normal";
+static const char *ATTENTION_ICON = "psensor_hot";
+

 static GtkStatusIcon *status;
 static unsigned status_attention;
 
 static GtkStatusIcon *status;
 static unsigned status_attention;
 


@@ -46,7 +49,7 @@ void ui_status_init(struct ui_psensor *ui)
        log_debug("ui_status_create()");
 
        status = gtk_status_icon_new();
        log_debug("ui_status_create()");
 
        status = gtk_status_icon_new();

-       gtk_status_icon_set_from_icon_name(status, "psensor_normal");
+       gtk_status_icon_set_from_icon_name(status, ICON);

        gtk_status_icon_set_visible(status, TRUE);
 
        g_signal_connect(G_OBJECT(status),
        gtk_status_icon_set_visible(status, TRUE);
 
        g_signal_connect(G_OBJECT(status),


@@ -80,9 +83,9 @@ void ui_status_update(struct ui_psensor *ui, unsigned int attention)
        log_debug("ui_status_update()");
 
        if (status_attention && !attention)
        log_debug("ui_status_update()");
 
        if (status_attention && !attention)

-               gtk_status_icon_set_from_icon_name(status, "psensor_normal");
+               gtk_status_icon_set_from_icon_name(status, ICON);

        else if (!status_attention && attention)
        else if (!status_attention && attention)

-               gtk_status_icon_set_from_icon_name(status, "psensor_hot");
+               gtk_status_icon_set_from_icon_name(status, ATTENTION_ICON);

 
        status_attention = attention;
 }
 
        status_attention = attention;
 }