gconf optionnal

diff --git a/config.h.in b/config.h.in
index 32c3bfd..a422e98 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -32,7 +32,7 @@
 #undef HAVE_DCGETTEXT
 
 /* Use gconf2 */
 #undef HAVE_DCGETTEXT
 
 /* Use gconf2 */

-#undef HAVE_GCON2
+#undef HAVE_GCONF2

 
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT

diff --git a/configure b/configure
index 9b1dc4e..f1112a1 100755 (executable)
--- a/configure
+++ b/configure
@@ -7663,7 +7663,7 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 

-$as_echo "#define HAVE_GCON2 1" >>confdefs.h
+$as_echo "#define HAVE_GCONF2 1" >>confdefs.h

 
 fi
  if test -n "$GCONF_LIBS"; then
 
 fi
  if test -n "$GCONF_LIBS"; then

diff --git a/configure.ac b/configure.ac
index 994ac01..213ff7c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ AC_SUBST(GTK_LIBS)
 
 # Check GCONF
 PKG_CHECK_MODULES(GCONF, gconf-2.0,
 
 # Check GCONF
 PKG_CHECK_MODULES(GCONF, gconf-2.0,

-                 [AC_DEFINE([HAVE_GCON2],[1],[Use gconf2])],
+                 [AC_DEFINE([HAVE_GCONF2],[1],[Use gconf2])],

                  [AC_MSG_WARN("gconf2 not present")])
 AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS")
 AC_SUBST(GCONF_CFLAGS)
                  [AC_MSG_WARN("gconf2 not present")])
 AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS")
 AC_SUBST(GCONF_CFLAGS)

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

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2013-03-30 13:52+0000\n"
 "Last-Translator: Dennis Baudys <Unknown>\n"
 "Language-Team: German\n"
 "PO-Revision-Date: 2013-03-30 13:52+0000\n"
 "Last-Translator: Dennis Baudys <Unknown>\n"
 "Language-Team: German\n"


@@ -169,7 +169,7 @@ msgstr "Typ:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "N/V"
 
 msgid "N/A"
 msgstr "N/V"
 


@@ -303,11 +303,11 @@ msgstr "Verbindung zum X11-Server konnte nicht hergestellt werden."
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Ermittlung der NVIDIA-Informationen gescheitert."
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Ermittlung der NVIDIA-Informationen gescheitert."
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

 msgid "RPM"
 msgstr "U/min"
 
 msgid "RPM"
 msgstr "U/min"
 

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

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

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2013-04-01 09:00+0000\n"
 "Last-Translator: Javier <buik8roadmaster@hotmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "PO-Revision-Date: 2013-04-01 09:00+0000\n"
 "Last-Translator: Javier <buik8roadmaster@hotmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"


@@ -169,7 +169,7 @@ msgstr "Tipo:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "No disponible"
 
 msgid "N/A"
 msgstr "No disponible"
 


@@ -303,11 +303,11 @@ msgstr "Imposible establecer conexión con el servidor X11."
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Error al obtener la información de NVIDIA"
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Error al obtener la información de NVIDIA"
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

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

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

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

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2013-03-02 03:05+0000\n"
 "Last-Translator: Hélion du Mas des Bourboux <helion331990@gmail.com>\n"
 "Language-Team: French <>\n"
 "PO-Revision-Date: 2013-03-02 03:05+0000\n"
 "Last-Translator: Hélion du Mas des Bourboux <helion331990@gmail.com>\n"
 "Language-Team: French <>\n"


@@ -170,7 +170,7 @@ msgstr "Type:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "N/A"
 
 msgid "N/A"
 msgstr "N/A"
 


@@ -303,11 +303,11 @@ msgstr "Impossible d'ouvrir la connexion au serveur X11."
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Échec de la récupération des information NVIDIA."
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Échec de la récupération des information NVIDIA."
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

 msgid "RPM"
 msgstr "Tr/min"
 
 msgid "RPM"
 msgstr "Tr/min"
 

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

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

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2012-10-29 09:41+0000\n"
 "Last-Translator: Bence Lukács <Unknown>\n"
 "Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"
 "PO-Revision-Date: 2012-10-29 09:41+0000\n"
 "Last-Translator: Bence Lukács <Unknown>\n"
 "Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"


@@ -170,7 +170,7 @@ msgstr "Típus:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "---"
 
 msgid "N/A"
 msgstr "---"
 


@@ -302,11 +302,11 @@ msgstr "Nem lehet létrehozni a kapcsolatot az X11 kiszolgálóval."
 msgid "Failed to retrieve NVIDIA information."
 msgstr "NVIDIA információinak lekérése meghiúsult."
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "NVIDIA információinak lekérése meghiúsult."
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

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

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

diff --git a/po/it.po b/po/it.po
index 238ef54..87f923b 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2013-04-14 16:06+0000\n"
 "Last-Translator: Diego Pierotto <Unknown>\n"
 "Language-Team: Italian\n"
 "PO-Revision-Date: 2013-04-14 16:06+0000\n"
 "Last-Translator: Diego Pierotto <Unknown>\n"
 "Language-Team: Italian\n"


@@ -169,7 +169,7 @@ msgstr "Tipo:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "N/A"
 
 msgid "N/A"
 msgstr "N/A"
 


@@ -303,11 +303,11 @@ msgstr "Impossibile connettersi al server X11."
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Impossibile recuperare informazioni da NVIDIA"
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Impossibile recuperare informazioni da NVIDIA"
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

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

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

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

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2012-11-11 10:38+0000\n"
 "Last-Translator: tuxmaniack <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "PO-Revision-Date: 2012-11-11 10:38+0000\n"
 "Last-Translator: tuxmaniack <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"


@@ -169,7 +169,7 @@ msgstr "Tips:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "N/P"
 
 msgid "N/A"
 msgstr "N/P"
 


@@ -301,11 +301,11 @@ msgstr "Nevar atvērt savienojumu ar X11 server."
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Neizdevās saņemt NVIDIA informāciju."
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Neizdevās saņemt NVIDIA informāciju."
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

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

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

diff --git a/po/psensor.pot b/po/psensor.pot
index 89376f2..42516b6 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: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -168,7 +168,7 @@ msgstr ""
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr ""
 
 msgid "N/A"
 msgstr ""
 


@@ -300,11 +300,11 @@ msgstr ""
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

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

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6205d20..f3219c4 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2013-03-12 16:07+0000\n"
 "Last-Translator: MestreLion <launchpad@rodrigosilva.com>\n"
 "Language-Team: Brazilian Portuguese\n"
 "PO-Revision-Date: 2013-03-12 16:07+0000\n"
 "Last-Translator: MestreLion <launchpad@rodrigosilva.com>\n"
 "Language-Team: Brazilian Portuguese\n"


@@ -170,7 +170,7 @@ msgstr "Tipo:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "N/D"
 
 msgid "N/A"
 msgstr "N/D"
 


@@ -302,11 +302,11 @@ msgstr "Não é possível abrir conexão com o servidor X11."
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Falha ao recuperar informações de NVIDIA."
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Falha ao recuperar informações de NVIDIA."
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

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

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

diff --git a/po/ru.po b/po/ru.po
index 85dd80f..d647c2a 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: psensor 0.7.0.x\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2012-12-25 06:05+0000\n"
 "Last-Translator: Ilya Volchanetskiy <Unknown>\n"
 "Language-Team: Russian\n"
 "PO-Revision-Date: 2012-12-25 06:05+0000\n"
 "Last-Translator: Ilya Volchanetskiy <Unknown>\n"
 "Language-Team: Russian\n"


@@ -169,7 +169,7 @@ msgstr "Тип:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "Н/Д"
 
 msgid "N/A"
 msgstr "Н/Д"
 


@@ -301,11 +301,11 @@ msgstr "Ошибка открытия соединения к серверу X11
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Не удалось получить информацию NVIDIA."
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Не удалось получить информацию NVIDIA."
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

 msgid "RPM"
 msgstr "об/мин"
 
 msgid "RPM"
 msgstr "об/мин"
 

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

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

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2012-04-14 21:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "PO-Revision-Date: 2012-04-14 21:02+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Slovenian <sl@li.org>\n"


@@ -169,7 +169,7 @@ msgstr ""
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr ""
 
 msgid "N/A"
 msgstr ""
 


@@ -301,11 +301,11 @@ msgstr ""
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

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

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

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

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2012-05-03 02:31+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "PO-Revision-Date: 2012-05-03 02:31+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"


@@ -169,7 +169,7 @@ msgstr ""
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "Недоступно"
 
 msgid "N/A"
 msgstr "Недоступно"
 


@@ -301,11 +301,11 @@ msgstr ""
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

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

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

diff --git a/po/tr.po b/po/tr.po
index 348a865..8a91f79 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: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

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


@@ -169,7 +169,7 @@ msgstr "Tür:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr ""
 
 msgid "N/A"
 msgstr ""
 


@@ -301,11 +301,11 @@ msgstr ""
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr ""
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

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

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

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

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2012-10-13 16:24+0000\n"
 "Last-Translator: Ilya Volchanetskiy <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "PO-Revision-Date: 2012-10-13 16:24+0000\n"
 "Last-Translator: Ilya Volchanetskiy <Unknown>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"


@@ -169,7 +169,7 @@ msgstr "Тип:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "Н/Д"
 
 msgid "N/A"
 msgstr "Н/Д"
 


@@ -301,11 +301,11 @@ msgstr "Не вдалося встановити з'єднання до серв
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Не вдалося отримати інформацію NVIDIA."
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "Не вдалося отримати інформацію NVIDIA."
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

 msgid "RPM"
 msgstr "об/хв"
 
 msgid "RPM"
 msgstr "об/хв"
 

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

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

-"POT-Creation-Date: 2013-05-11 12:05+0200\n"
+"POT-Creation-Date: 2013-05-19 10:32+0200\n"

 "PO-Revision-Date: 2013-01-15 12:24+0000\n"
 "Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
 "PO-Revision-Date: 2013-01-15 12:24+0000\n"
 "Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"


@@ -169,7 +169,7 @@ msgstr "类型:"
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459
 
 #: src/glade/sensor-edit.glade:153 src/glade/sensor-edit.glade:294
 #: src/glade/sensor-edit.glade:388 src/glade/sensor-edit.glade:459

-#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:485 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:508 src/lib/psensor.c:486 src/ui_notify.c:81

 msgid "N/A"
 msgstr "不可用"
 
 msgid "N/A"
 msgstr "不可用"
 


@@ -301,11 +301,11 @@ msgstr "无法打开到 X11 服务器的连接。"
 msgid "Failed to retrieve NVIDIA information."
 msgstr "无法获取 NVIDIA 信息。"
 
 msgid "Failed to retrieve NVIDIA information."
 msgstr "无法获取 NVIDIA 信息。"
 

-#: src/lib/psensor.c:481 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:482 tests/test_psensor_type_to_unit_str.c:62

 msgid "RPM"
 msgstr "转速"
 
 msgid "RPM"
 msgstr "转速"
 

-#: src/lib/psensor.c:483
+#: src/lib/psensor.c:484

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

diff --git a/src/Makefile.am b/src/Makefile.am
index c89c8a3..8233207 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,7 +90,7 @@ dist_man_MANS = psensor.1
 EXTRA_DIST = description.txt psensor.schemas
 
 
 EXTRA_DIST = description.txt psensor.schemas
 
 

-if GCONF_SCHEMAS_INSTALL
+if GCONF

 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = psensor.schemas
 
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 schema_DATA = psensor.schemas
 

diff --git a/src/Makefile.in b/src/Makefile.in
index cf78eef..77c19b1 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -367,8 +367,8 @@ psensor_SOURCES = cfg.h cfg.c graph.h graph.c main.c ui.h ui.c \
        $(am__append_19)
 dist_man_MANS = psensor.1
 EXTRA_DIST = description.txt psensor.schemas
        $(am__append_19)
 dist_man_MANS = psensor.1
 EXTRA_DIST = description.txt psensor.schemas

-@GCONF_SCHEMAS_INSTALL_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR)
-@GCONF_SCHEMAS_INSTALL_TRUE@schema_DATA = psensor.schemas
+@GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR)
+@GCONF_TRUE@schema_DATA = psensor.schemas

 all: all-recursive
 
 .SUFFIXES:
 all: all-recursive
 
 .SUFFIXES:


@@ -787,7 +787,7 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."

-@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
+@GCONF_FALSE@install-data-local:

 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am


@@ -880,8 +880,8 @@ uninstall-man: uninstall-man1
        uninstall-schemaDATA
 
 
        uninstall-schemaDATA
 
 

-@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
-@GCONF_SCHEMAS_INSTALL_TRUE@   GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
+@GCONF_TRUE@install-data-local:
+@GCONF_TRUE@   GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)

 
 psensor.1: main.c $(top_srcdir)/configure.ac
        $(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)
 
 psensor.1: main.c $(top_srcdir)/configure.ac
        $(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)