merged from trunk

diff --git a/po/fr.po b/po/fr.po
index 15ac0a0..d3ad435 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"
-"POT-Creation-Date: 2011-06-06 10:51+0200\n"
+"POT-Creation-Date: 2011-06-26 17:39+0200\n"
 "PO-Revision-Date: 2011-02-07 21:18+0100\n"
 "Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
 "Language-Team: Oriya\n"
@@ -92,73 +92,73 @@ msgstr ""
 "ERREUR: Psensor n'a pas ete compilé avec le support de surveillance à "
 "distance.\n"
 
-#: src/ui.c:44
+#: src/ui.c:49
 #, 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:47
+#: src/ui.c:52
 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 
-#: src/ui.c:50
+#: src/ui.c:55
 msgid "About Psensor"
 msgstr ""
 
-#: src/ui.c:53
+#: src/ui.c:58
 msgid "Psensor Homepage"
 msgstr ""
 
-#: src/ui.c:104
+#: src/ui.c:110
 #, fuzzy
 msgid "_Preferences"
 msgstr "Configuration"
 
-#: src/ui.c:105 src/ui_sensorlist.c:201
+#: src/ui.c:111 src/ui_sensorlist.c:201
 msgid "Preferences"
 msgstr "Configuration"
 
-#: src/ui.c:109
+#: src/ui.c:115
 #, fuzzy
 msgid "_Sensor Preferences"
 msgstr "Editer La Configuration Des Sondes"
 
-#: src/ui.c:110
+#: src/ui.c:116
 #, fuzzy
 msgid "Sensor Preferences"
 msgstr "Editer La Configuration Des Sondes"
 
-#: src/ui.c:114
+#: src/ui.c:120
 #, fuzzy
 msgid "_Quit"
 msgstr "Quitter"
 
-#: src/ui.c:114
+#: src/ui.c:120
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/ui.c:119
+#: src/ui.c:125
 msgid "_About"
 msgstr ""
 
-#: src/ui.c:120
+#: src/ui.c:126
 msgid "About"
 msgstr ""
 
-#: src/ui.c:142 src/ui_appindicator.c:174
+#: src/ui.c:148 src/ui_appindicator.c:176
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 
-#: src/ui.c:180
+#: src/ui.c:186
 msgid "Psensor - Temperature Monitor"
 msgstr "Psensor - Surveillance Des Temperatures"
 
-#: src/ui.c:198
+#: src/ui.c:204
 #, fuzzy, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n"
@@ -336,25 +336,20 @@ msgstr "ERREUR: mauvaise chaine hdd: %s"
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr "ERREUR: mauvaise chaine hdd: %s\n"
 
-#: src/lib/nvidia.c:53
+#: src/lib/nvidia.c:55
 #, 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:85
-#, c-format
-msgid "ERROR: nvidia initialization failure\n"
-msgstr "ERREUR: échec de l'initialisation nvidia\n"
-
 #: src/lib/nvidia.c:99
-#, c-format
-msgid "ERROR: nvidia initialization failure: %d\n"
-msgstr "ERREUR: échec de l'initialisation nvidia: %d\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:132
-#, c-format
-msgid "ERROR: no nvidia chips or initialization failure\n"
-msgstr "ERREUR: aucunes puces nvidia ou échec de l'initialisation\n"
+#: src/lib/nvidia.c:107
+#, 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:43
 #, c-format
@@ -509,6 +504,15 @@ msgstr "Dessiner la courbe de la sonde"
 msgid "°C"
 msgstr "°C"
 
+#~ msgid "ERROR: nvidia initialization failure\n"
+#~ msgstr "ERREUR: échec de l'initialisation nvidia\n"
+
+#~ msgid "ERROR: nvidia initialization failure: %d\n"
+#~ msgstr "ERREUR: échec de l'initialisation nvidia: %d\n"
+
+#~ msgid "ERROR: no nvidia chips or initialization failure\n"
+#~ msgstr "ERREUR: aucunes puces nvidia ou échec de l'initialisation\n"
+
 #~ msgid "Show"
 #~ msgstr "Montrer"
 

diff --git a/po/psensor.pot b/po/psensor.pot
index 8dc5891..1b6ac3e 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"
-"POT-Creation-Date: 2011-06-06 10:51+0200\n"
+"POT-Creation-Date: 2011-06-26 17:39+0200\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"
@@ -79,66 +79,66 @@ msgstr ""
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 
-#: src/ui.c:44
+#: src/ui.c:49
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr ""
 
-#: src/ui.c:47
+#: src/ui.c:52
 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 
-#: src/ui.c:50
+#: src/ui.c:55
 msgid "About Psensor"
 msgstr ""
 
-#: src/ui.c:53
+#: src/ui.c:58
 msgid "Psensor Homepage"
 msgstr ""
 
-#: src/ui.c:104
+#: src/ui.c:110
 msgid "_Preferences"
 msgstr ""
 
-#: src/ui.c:105 src/ui_sensorlist.c:201
+#: src/ui.c:111 src/ui_sensorlist.c:201
 msgid "Preferences"
 msgstr ""
 
-#: src/ui.c:109
+#: src/ui.c:115
 msgid "_Sensor Preferences"
 msgstr ""
 
-#: src/ui.c:110
+#: src/ui.c:116
 msgid "Sensor Preferences"
 msgstr ""
 
-#: src/ui.c:114
+#: src/ui.c:120
 msgid "_Quit"
 msgstr ""
 
-#: src/ui.c:114
+#: src/ui.c:120
 msgid "Quit"
 msgstr ""
 
-#: src/ui.c:119
+#: src/ui.c:125
 msgid "_About"
 msgstr ""
 
-#: src/ui.c:120
+#: src/ui.c:126
 msgid "About"
 msgstr ""
 
-#: src/ui.c:142 src/ui_appindicator.c:174
+#: src/ui.c:148 src/ui_appindicator.c:176
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 
-#: src/ui.c:180
+#: src/ui.c:186
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
-#: src/ui.c:198
+#: src/ui.c:204
 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr ""
@@ -310,24 +310,19 @@ msgstr ""
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr ""
 
-#: src/lib/nvidia.c:53
+#: src/lib/nvidia.c:55
 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr ""
 
-#: src/lib/nvidia.c:85
-#, c-format
-msgid "ERROR: nvidia initialization failure\n"
-msgstr ""
-
 #: src/lib/nvidia.c:99
 #, c-format
-msgid "ERROR: nvidia initialization failure: %d\n"
+msgid "ERROR: Cannot open connection to X Server\n"
 msgstr ""
 
-#: src/lib/nvidia.c:132
+#: src/lib/nvidia.c:107
 #, c-format
-msgid "ERROR: no nvidia chips or initialization failure\n"
+msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr ""
 
 #: src/lib/lmsensor.c:43

diff --git a/po/tr.po b/po/tr.po
index acbd4ce..53c2732 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"
-"POT-Creation-Date: 2011-06-06 10:51+0200\n"
+"POT-Creation-Date: 2011-06-26 17:39+0200\n"
 "PO-Revision-Date: 2011-04-10 13:11+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -80,69 +80,69 @@ msgstr ""
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 
-#: src/ui.c:44
+#: src/ui.c:49
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr ""
 
-#: src/ui.c:47
+#: src/ui.c:52
 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 
-#: src/ui.c:50
+#: src/ui.c:55
 msgid "About Psensor"
 msgstr ""
 
-#: src/ui.c:53
+#: src/ui.c:58
 msgid "Psensor Homepage"
 msgstr ""
 
-#: src/ui.c:104
+#: src/ui.c:110
 #, fuzzy
 msgid "_Preferences"
 msgstr "Tercihler"
 
-#: src/ui.c:105 src/ui_sensorlist.c:201
+#: src/ui.c:111 src/ui_sensorlist.c:201
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: src/ui.c:109
+#: src/ui.c:115
 #, fuzzy
 msgid "_Sensor Preferences"
 msgstr "Tercihleri düzenle"
 
-#: src/ui.c:110
+#: src/ui.c:116
 #, fuzzy
 msgid "Sensor Preferences"
 msgstr "Tercihleri düzenle"
 
-#: src/ui.c:114
+#: src/ui.c:120
 msgid "_Quit"
 msgstr ""
 
-#: src/ui.c:114
+#: src/ui.c:120
 msgid "Quit"
 msgstr ""
 
-#: src/ui.c:119
+#: src/ui.c:125
 msgid "_About"
 msgstr ""
 
-#: src/ui.c:120
+#: src/ui.c:126
 msgid "About"
 msgstr ""
 
-#: src/ui.c:142 src/ui_appindicator.c:174
+#: src/ui.c:148 src/ui_appindicator.c:176
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 
-#: src/ui.c:180
+#: src/ui.c:186
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
-#: src/ui.c:198
+#: src/ui.c:204
 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr ""
@@ -315,24 +315,19 @@ msgstr ""
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr ""
 
-#: src/lib/nvidia.c:53
+#: src/lib/nvidia.c:55
 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr ""
 
-#: src/lib/nvidia.c:85
-#, c-format
-msgid "ERROR: nvidia initialization failure\n"
-msgstr ""
-
 #: src/lib/nvidia.c:99
 #, c-format
-msgid "ERROR: nvidia initialization failure: %d\n"
+msgid "ERROR: Cannot open connection to X Server\n"
 msgstr ""
 
-#: src/lib/nvidia.c:132
+#: src/lib/nvidia.c:107
 #, c-format
-msgid "ERROR: no nvidia chips or initialization failure\n"
+msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr ""
 
 #: src/lib/lmsensor.c:43

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6b7f4cc..cb4cb11 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"
-"POT-Creation-Date: 2011-06-06 10:51+0200\n"
+"POT-Creation-Date: 2011-06-26 17:39+0200\n"
 "PO-Revision-Date: 2011-06-06 08:57+0000\n"
 "Last-Translator: royclark <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -82,67 +82,67 @@ msgstr ""
 msgid "ERROR: Not compiled with remote sensor support.\n"
 msgstr ""
 
-#: src/ui.c:44
+#: src/ui.c:49
 #, fuzzy
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
 msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温度和风扇转速。"
 
-#: src/ui.c:47
+#: src/ui.c:52
 msgid ""
 "Copyright(c) 2010-2011\n"
 "jeanfi@gmail.com"
 msgstr ""
 
-#: src/ui.c:50
+#: src/ui.c:55
 msgid "About Psensor"
 msgstr ""
 
-#: src/ui.c:53
+#: src/ui.c:58
 msgid "Psensor Homepage"
 msgstr ""
 
-#: src/ui.c:104
+#: src/ui.c:110
 msgid "_Preferences"
 msgstr ""
 
-#: src/ui.c:105 src/ui_sensorlist.c:201
+#: src/ui.c:111 src/ui_sensorlist.c:201
 msgid "Preferences"
 msgstr "选项"
 
-#: src/ui.c:109
+#: src/ui.c:115
 msgid "_Sensor Preferences"
 msgstr ""
 
-#: src/ui.c:110
+#: src/ui.c:116
 msgid "Sensor Preferences"
 msgstr ""
 
-#: src/ui.c:114
+#: src/ui.c:120
 msgid "_Quit"
 msgstr ""
 
-#: src/ui.c:114
+#: src/ui.c:120
 msgid "Quit"
 msgstr "退出"
 
-#: src/ui.c:119
+#: src/ui.c:125
 msgid "_About"
 msgstr ""
 
-#: src/ui.c:120
+#: src/ui.c:126
 msgid "About"
 msgstr ""
 
-#: src/ui.c:142 src/ui_appindicator.c:174
+#: src/ui.c:148 src/ui_appindicator.c:176
 #, c-format
 msgid "building menus failed: %s"
 msgstr ""
 
-#: src/ui.c:180
+#: src/ui.c:186
 msgid "Psensor - Temperature Monitor"
 msgstr ""
 
-#: src/ui.c:198
+#: src/ui.c:204
 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
 msgstr ""
@@ -314,24 +314,19 @@ msgstr ""
 msgid "ERROR: wrong hdd string: %s\n"
 msgstr ""
 
-#: src/lib/nvidia.c:53
+#: src/lib/nvidia.c:55
 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
 msgstr ""
 
-#: src/lib/nvidia.c:85
-#, c-format
-msgid "ERROR: nvidia initialization failure\n"
-msgstr ""
-
 #: src/lib/nvidia.c:99
 #, c-format
-msgid "ERROR: nvidia initialization failure: %d\n"
+msgid "ERROR: Cannot open connection to X Server\n"
 msgstr ""
 
-#: src/lib/nvidia.c:132
+#: src/lib/nvidia.c:107
 #, c-format
-msgid "ERROR: no nvidia chips or initialization failure\n"
+msgid "ERROR: Cannot retrieve NVidia information\n"
 msgstr ""
 
 #: src/lib/lmsensor.c:43

diff --git a/src/ui.c b/src/ui.c
index 5a00a93..23afe1a 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -31,9 +31,9 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
        struct ui_psensor *ui = data;
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-       if (is_appindicator_supported()) 
+       if (is_appindicator_supported())
                gtk_widget_hide(ui->main_window);
-       else 
+       else
                ui_psensor_quit(ui);
 #else
        ui_psensor_quit(ui);

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index d2c864e..c89c7a8 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -230,7 +230,7 @@ void ui_appindicator_update(struct ui_psensor *ui)
        update_sensor_menu_items(ui->sensors);
 }
 
-static GtkStatusIcon* unity_fallback(AppIndicator *indicator)
+static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
 {
        gtk_widget_show_all(main_window);