Merge lp:~jfi/ubuntu/quantal/psensor/new-upstream-0-6-2-19 into lp:ubuntu/quantal/psensor

[Jean-Philippe Orsini]

* New upstream release
   + fixed hide window on startup for gnome-shell. (Closes: #676361)
   + fixed size of the icon hicolor/48x48/psensor_hot.png. (LP: #1029065)
* Removed LP1021900.patch: fixed upstream since 0.6.2.18.
* Remaining changes:
  + Modifed build-dep to add NVidia and Application Indicator support
  + Only add an nvidia-settings build-dep on i386 and amd6

I am submitting this merge following discussion from a previous request: https://code.launchpad.net/~jfi/ubuntu/quantal/psensor/fix-LP1029065/+merge/117028

This branch is upgrading to Psensor version 0.6.2.19.

The mainstream diff between 0.6.2.17 and 0.6.2.19:
 - fix https://bugs.launchpad.net/ubuntu/+source/psensor/+bug/1029065
 - fix https://bugs.launchpad.net/ubuntu/+source/psensor/+bug/1021900
 - fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676361
 - added and merged (from LP) several translations files (only .po, no code modification)

LP1021900.patch is removed because it has been fixed upstream since 0.6.2.18.

[lp:~jfi/ubuntu/quantal/psensor/new-upstream-0-6-2-19]

16. By Jean-Philippe Orsini on 2012-08-31

fixed bullet indentation

[Iain Lane (laney)]

Looks good to me, thanks — uploading! I just changed the version number to ...-0ubuntu1 as this isn't a merge.

review: Approve

=== removed directory '.pc/LP1021900.patch'
=== removed directory '.pc/LP1021900.patch/src'
=== removed directory '.pc/LP1021900.patch/src/lib'
=== removed file '.pc/LP1021900.patch/src/lib/psensor.c'
--- .pc/LP1021900.patch/src/lib/psensor.c	2012-07-07 00:47:44 +0000
+++ .pc/LP1021900.patch/src/lib/psensor.c	1970-01-01 00:00:00 +0000
@@ -1,461 +0,0 @@
-/*
- * Copyright (C) 2010-2012 [e-mail]
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-#include <stdlib.h>
-#include <string.h>
-
-#include <locale.h>
-#include <libintl.h>
-#define _(str) gettext(str)
-
-#include "hdd.h"
-#include "psensor.h"
-#include "lmsensor.h"
-
-#ifdef HAVE_GTOP
-#include "cpu.h"
-#endif
-
-
-struct psensor *psensor_create(char *id, char *name,
-			       unsigned int type, int values_max_length)
-{
-	struct psensor *psensor
-	    = (struct psensor *)malloc(sizeof(struct psensor));
-
-	psensor->id = id;
-	psensor->name = name;
-	psensor->enabled = 1;
-	psensor->min = UNKNOWN_DBL_VALUE;
-	psensor->max = UNKNOWN_DBL_VALUE;
-
-	psensor->type = type;
-
-	psensor->values_max_length = values_max_length;
-	psensor->measures = measures_dbl_create(values_max_length);
-
-	psensor->alarm_limit = 0;
-
-	psensor->cb_alarm_raised = NULL;
-	psensor->cb_alarm_raised_data = NULL;
-	psensor->alarm_raised = 0;
-
-	psensor->alarm_enabled = 0;
-
-	psensor->url = NULL;
-
-	psensor->color = NULL;
-
-	return psensor;
-}
-
-void psensor_values_resize(struct psensor *s, int new_size)
-{
-	struct measure *new_ms, *cur_ms;
-	int cur_size;
-
-	cur_size = s->values_max_length;
-	cur_ms = s->measures;
-	new_ms = measures_dbl_create(new_size);
-
-	if (cur_ms) {
-		int i;
-		for (i = 0; i < new_size - 1 && i < cur_size - 1; i++)
-			measure_copy(&cur_ms[cur_size - i - 1],
-				     &new_ms[new_size - i - 1]);
-
-		measures_free(s->measures);
-	}
-
-	s->values_max_length = new_size;
-	s->measures = new_ms;
-}
-
-void psensor_free(struct psensor *sensor)
-{
-	if (sensor) {
-		free(sensor->name);
-		free(sensor->id);
-
-		if (sensor->color)
-			free(sensor->color);
-
-		measures_free(sensor->measures);
-
-		free(sensor->url);
-
-		free(sensor);
-	}
-}
-
-void psensor_list_free(struct psensor **sensors)
-{
-	struct psensor **sensor_cur;
-
-	if (sensors) {
-		sensor_cur = sensors;
-
-		while (*sensor_cur) {
-			psensor_free(*sensor_cur);
-
-			sensor_cur++;
-		}
-
-		free(sensors);
-
-		sensors = NULL;
-	}
-}
-
-int psensor_list_size(struct psensor **sensors)
-{
-	int size;
-	struct psensor **sensor_cur;
-
-	if (!sensors)
-		return 0;
-
-	size = 0;
-	sensor_cur = sensors;
-
-	while (*sensor_cur) {
-		size++;
-		sensor_cur++;
-	}
-	return size;
-}
-
-int psensor_list_contains_type(struct psensor **sensors, unsigned int type)
-{
-	struct psensor **s;
-
-	if (!sensors)
-		return 0;
-
-	s = sensors;
-	while (*s) {
-		if ((*s)->type == type)
-			return 1;
-		s++;
-	}
-
-	return 0;
-}
-
-struct psensor **psensor_list_add(struct psensor **sensors,
-				  struct psensor *sensor)
-{
-	int size = psensor_list_size(sensors);
-
-	struct psensor **result
-	    = malloc((size + 1 + 1) * sizeof(struct psensor *));
-
-	if (sensors)
-		memcpy(result, sensors, size * sizeof(struct psensor *));
-
-	result[size] = sensor;
-	result[size + 1] = NULL;
-
-	return result;
-}
-
-struct psensor *psensor_list_get_by_id(struct psensor **sensors, const char *id)
-{
-	struct psensor **sensors_cur = sensors;
-
-	while (*sensors_cur) {
-		if (!strcmp((*sensors_cur)->id, id))
-			return *sensors_cur;
-
-		sensors_cur++;
-	}
-
-	return NULL;
-}
-
-int is_temp_type(unsigned int type)
-{
-	return type & SENSOR_TYPE_TEMP;
-}
-
-int is_fan_type(unsigned int type)
-{
-	return type & SENSOR_TYPE_FAN;
-}
-
-char *psensor_value_to_string(unsigned int type, double value)
-{
-	/* should not be possible to exceed 20 characters with temp or
-	   rpm values the .x part is never displayed */
-	char *str = malloc(20);
-
-	char *unit;
-
-	if (is_temp_type(type))
-		unit = "C";
-	else if (type & SENSOR_TYPE_CPU_USAGE)
-		unit = "%";
-	else
-		unit = "";
-
-	sprintf(str, "%.0f%s", value, unit);
-
-	return str;
-}
-
-void psensor_set_current_value(struct psensor *sensor, double value)
-{
-	struct timeval tv;
-
-	if (gettimeofday(&tv, NULL) != 0)
-		timerclear(&tv);
-
-	psensor_set_current_measure(sensor, value, tv);
-}
-
-void
-psensor_set_current_measure(struct psensor *s,
-			    double v, struct timeval tv)
-{
-	memmove(s->measures,
-		&s->measures[1],
-		(s->values_max_length - 1) * sizeof(struct measure));
-
-	s->measures[s->values_max_length - 1].value.d_num = v;
-	s->measures[s->values_max_length - 1].time = tv;
-
-	if (s->min == UNKNOWN_DBL_VALUE || v < s->min)
-		s->min = v;
-
-	if (s->max == UNKNOWN_DBL_VALUE || v > s->max)
-		s->max = v;
-
-	if (s->alarm_limit && s->alarm_enabled) {
-		if (v > s->alarm_limit) {
-			if (!s->alarm_raised && s->cb_alarm_raised)
-				s->cb_alarm_raised(s,
-						   s->cb_alarm_raised_data);
-
-			s->alarm_raised = 1;
-		} else {
-			s->alarm_raised = 0;
-		}
-	}
-}
-
-double psensor_get_current_value(struct psensor *sensor)
-{
-	return sensor->measures[sensor->values_max_length - 1].value.d_num;
-}
-
-struct measure *psensor_get_current_measure(struct psensor *sensor)
-{
-	return &sensor->measures[sensor->values_max_length - 1];
-}
-
-/*
-  Returns the minimal value of a given 'type' (SENSOR_TYPE_TEMP or
-  SENSOR_TYPE_FAN)
- */
-double get_min_value(struct psensor **sensors, int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s = sensors;
-
-	while (*s) {
-		struct psensor *sensor = *s;
-
-		if (sensor->enabled && (sensor->type & type)) {
-			int i;
-			double t;
-
-			for (i = 0; i < sensor->values_max_length; i++) {
-				t = sensor->measures[i].value.d_num;
-
-				if (t == UNKNOWN_DBL_VALUE)
-					continue;
-
-				if (m == UNKNOWN_DBL_VALUE || t < m)
-					m = t;
-			}
-		}
-		s++;
-	}
-
-	return m;
-}
-
-/*
-  Returns the maximal value of a given 'type' (SENSOR_TYPE_TEMP or
-  SENSOR_TYPE_FAN)
- */
-double get_max_value(struct psensor **sensors, int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s = sensors;
-
-	while (*s) {
-		struct psensor *sensor = *s;
-
-		if (sensor->enabled && (sensor->type & type)) {
-			int i;
-			double t;
-			for (i = 0; i < sensor->values_max_length; i++) {
-				t = sensor->measures[i].value.d_num;
-
-				if (t == UNKNOWN_DBL_VALUE)
-					continue;
-
-				if (m == UNKNOWN_DBL_VALUE || t > m)
-					m = t;
-			}
-		}
-		s++;
-	}
-
-	return m;
-}
-
-double
-psensor_get_max_current_value(struct psensor **sensors, unsigned int type)
-{
-	double m = UNKNOWN_DBL_VALUE;
-	struct psensor **s_cur = sensors;
-
-	while (*s_cur) {
-		struct psensor *s = *s_cur;
-
-		if (s->enabled && (s->type & type)) {
-			double v = psensor_get_current_value(s);
-
-			if (m == UNKNOWN_DBL_VALUE || v > m)
-				m = v;
-		}
-
-		s_cur++;
-	}
-
-	return m;
-}
-
-double get_min_temp(struct psensor **sensors)
-{
-	return get_min_value(sensors, SENSOR_TYPE_TEMP);
-}
-
-double get_min_rpm(struct psensor **sensors)
-{
-	return get_min_value(sensors, SENSOR_TYPE_FAN);
-}
-
-double get_max_rpm(struct psensor **sensors)
-{
-	return get_max_value(sensors, SENSOR_TYPE_FAN);
-}
-
-double get_max_temp(struct psensor **sensors)
-{
-	return get_max_value(sensors, SENSOR_TYPE_TEMP);
-}
-
-struct psensor **get_all_sensors(int values_max_length)
-{
-	struct psensor **psensors = NULL;
-	struct psensor **tmp_psensors;
-
-	psensors = lmsensor_psensor_list_add(NULL, values_max_length);
-
-	tmp_psensors = hdd_psensor_list_add(psensors, values_max_length);
-	if (tmp_psensors != psensors) {
-		free(psensors);
-		psensors = tmp_psensors;
-	}
-
-	if (!psensors) {	/* there is no detected sensors */
-		psensors = malloc(sizeof(struct psensor *));
-		*psensors = NULL;
-	}
-
-	return psensors;
-}
-
-const char *psensor_type_to_str(unsigned int type)
-{
-	if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP)
-		return "NVidia GPU Temperature";
-
-	if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP)
-		return "AMD GPU Temperature";
-
-	if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN)
-		return "AMD GPU Fan Speed";
-
-	if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP)
-		return "HDD Temperature";
-
-	if (type & SENSOR_TYPE_CPU_USAGE)
-		return "CPU Usage";
-
-	if (type & SENSOR_TYPE_TEMP)
-		return "Temperature";
-
-	if (type & SENSOR_TYPE_FAN)
-		return "Fan";
-
-	if (type & SENSOR_TYPE_REMOTE)
-		return "Remote";
-
-	return "N/A";		/* should not be possible */
-}
-
-
-const char *psensor_type_to_unit_str(unsigned int type)
-{
-	if (type & SENSOR_TYPE_TEMP)
-		return _("C");
-
-	if (type & SENSOR_TYPE_FAN)
-		return _("RPM");
-
-	if (type & SENSOR_TYPE_CPU_USAGE)
-		return _("%");
-
-	return "N/A";
-}
-
-void psensor_list_update_measures(struct psensor **sensors)
-{
-	lmsensor_psensor_list_update(sensors);
-
-#ifdef HAVE_GTOP
-	cpu_psensor_list_update(sensors);
-#endif
-
-	if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDD_TEMP))
-		hdd_psensor_list_update(sensors);
-}
-
-void psensor_init()
-{
-	lmsensor_init();
-}
-
-void psensor_cleanup()
-{
-	lmsensor_cleanup();
-}
 
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-07-13 02:22:18 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-LP1021900.patch
 
=== modified file 'Makefile.in'
--- Makefile.in	2011-11-25 02:56:22 +0000
+++ Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -80,6 +80,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(autostartdir)" \
 	"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"
 DATA = $(autostart_DATA) $(desktop_DATA) $(dist_doc_DATA)
@@ -95,9 +101,11 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -126,6 +134,8 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -297,7 +307,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -333,10 +343,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -365,9 +373,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(autostart_DATA)'; test -n "$(autostartdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(autostartdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(autostartdir)" && rm -f $$files
+	dir='$(DESTDIR)$(autostartdir)'; $(am__uninstall_files_from_dir)
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@@ -385,9 +391,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopdir)" && rm -f $$files
+	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
 install-dist_docDATA: $(dist_doc_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
@@ -405,9 +409,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(docdir)" && rm -f $$files
+	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -616,7 +618,11 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -624,7 +630,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -655,6 +661,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -674,6 +682,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -702,8 +711,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -737,10 +754,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -829,20 +851,20 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-autostartDATA \
-	install-data install-data-am install-desktopDATA \
-	install-dist_docDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-autostartDATA uninstall-desktopDATA \
-	uninstall-dist_docDATA
+	dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-autostartDATA install-data install-data-am \
+	install-desktopDATA install-dist_docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am uninstall-autostartDATA \
+	uninstall-desktopDATA uninstall-dist_docDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 
=== modified file 'NEWS'
--- NEWS	2012-04-09 12:15:54 +0000
+++ NEWS	2012-08-31 10:30:30 +0000
@@ -1,6 +1,21 @@
+* v0.6.2.19
+
+** psensor: fixed size of the icon hicolor/48x48/psensor_hot.png.
+   (LP: #1029065)
+
+* v0.6.2.18
+
+** added degree sign for celcius (Closes LP: #1021900).
+** added russian, brazilian, hungarian, serbian, slovenian,
+   italian, ukrainian and german translation files.
+** merged translations from LP.
+** psensor: fixed hide window on startup for gnome-shell (Closes:
+   #676361).
+
 * v0.6.2.17
 
-** psensor: fixed sensor type displayed in sensor preferences dialog.
+** psensor: fixed sensor type displayed in sensor preferences
+   dialog. (Closes LP: #968912)
 ** psensor: fixed compilation error on 64bits with ATI/AMD GPU support.
 ** psensor: not calling g_thread_init when compiled with glib >= 2.31.
 ** changed copyright dates to 2012.
 
=== modified file 'aclocal.m4'
--- aclocal.m4	2011-11-25 02:56:22 +0000
+++ aclocal.m4	2012-08-31 10:30:30 +0000
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -2517,12 +2518,15 @@
 AC_SUBST([$1])dnl
 ])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -2532,7 +2536,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.3], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -2548,19 +2552,21 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.3])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -2642,14 +2648,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -2689,6 +2695,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -2753,7 +2760,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -2818,10 +2825,13 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -3043,12 +3053,15 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -3215,12 +3228,15 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -3243,13 +3259,14 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -3257,13 +3274,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -3339,12 +3356,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -3367,13 +3386,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -3382,13 +3401,13 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -3410,10 +3429,11 @@
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
 
=== modified file 'configure'
--- configure	2012-04-09 12:15:54 +0000
+++ configure	2012-08-31 10:30:30 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for psensor 0.6.2.17.
+# Generated by GNU Autoconf 2.68 for psensor 0.6.2.19.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='psensor'
 PACKAGE_TARNAME='psensor'
-PACKAGE_VERSION='0.6.2.17'
-PACKAGE_STRING='psensor 0.6.2.17'
+PACKAGE_VERSION='0.6.2.19'
+PACKAGE_STRING='psensor 0.6.2.19'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL='http://wpitchoune.net/psensor'
 
@@ -691,6 +691,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -1355,7 +1356,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures psensor 0.6.2.17 to adapt to many kinds of systems.
+\`configure' configures psensor 0.6.2.19 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1429,7 +1430,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of psensor 0.6.2.17:";;
+     short | recursive ) echo "Configuration of psensor 0.6.2.19:";;
    esac
   cat <<\_ACEOF
 
@@ -1567,7 +1568,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-psensor configure 0.6.2.17
+psensor configure 0.6.2.19
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1990,7 +1991,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by psensor $as_me 0.6.2.17, which was
+It was created by psensor $as_me 0.6.2.19, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2807,7 +2808,7 @@
 
 # Define the identity of the package.
  PACKAGE='psensor'
- VERSION='0.6.2.17'
+ VERSION='0.6.2.19'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2837,11 +2838,11 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -3694,6 +3695,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3718,6 +3720,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3777,7 +3780,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -9176,7 +9179,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by psensor $as_me 0.6.2.17, which was
+This file was extended by psensor $as_me 0.6.2.19, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9243,7 +9246,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-psensor config.status 0.6.2.17
+psensor config.status 0.6.2.19
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2012-04-09 12:15:54 +0000
+++ configure.ac	2012-08-31 10:30:30 +0000
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT([psensor], [0.6.2.17],[[e-mail]],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [0.6.2.19],[[e-mail]],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall -Werror gnu])
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-07-13 02:22:18 +0000
+++ debian/changelog	2012-08-31 10:30:30 +0000
@@ -1,3 +1,15 @@
+psensor (0.6.2.19-1ubuntu1) quantal; urgency=low
+
+  * New upstream release
+    + fixed hide window on startup for gnome-shell. (Closes: #676361)
+    + fixed size of the icon hicolor/48x48/psensor_hot.png. (LP: #1029065)
+  * Removed LP1021900.patch: fixed upstream since 0.6.2.18.
+  * Remaining changes:
+    + Modifed build-dep to add NVidia and Application Indicator support
+    + Only add an nvidia-settings build-dep on i386 and amd6
+
+ -- Jean-Philippe Orsini <[e-mail]>  Tue, 21 Aug 2012 11:19:33 +0200
+
 psensor (0.6.2.17-2ubuntu1) quantal; urgency=low
 
   * Merge from Debian testing.  Remaining changes:
 
=== removed file 'debian/patches/LP1021900.patch'
--- debian/patches/LP1021900.patch	2012-07-07 00:47:44 +0000
+++ debian/patches/LP1021900.patch	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-Description: added degree Celcius symbol
-Author: Jean-Philippe Orsini <[e-mail]>
-Origin: Upstream
-Ubuntu-bug: https://bugs.launchpad.net/ubuntu/+source/psensor/+bug/1021900
-Index: psensor-0.6.2.16/src/lib/psensor.c
-===================================================================
---- psensor-0.6.2.16.orig/src/lib/psensor.c	2012-07-07 00:40:33.000000000 +0200
-+++ psensor-0.6.2.16/src/lib/psensor.c	2012-07-07 00:47:36.258308297 +0200
-@@ -207,7 +207,7 @@
- 	char *unit;
- 
- 	if (is_temp_type(type))
--		unit = "C";
-+		unit = "°C";
- 	else if (type & SENSOR_TYPE_CPU_USAGE)
- 		unit = "%";
- 	else
-@@ -427,7 +427,7 @@
- const char *psensor_type_to_unit_str(unsigned int type)
- {
- 	if (type & SENSOR_TYPE_TEMP)
--		return _("C");
-+		return "\302\260C";
- 
- 	if (type & SENSOR_TYPE_FAN)
- 		return _("RPM");
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-07-13 02:22:18 +0000
+++ debian/patches/series	2012-08-31 10:30:30 +0000
@@ -1,1 +0,0 @@
-LP1021900.patch
 
=== modified file 'icons/hicolor/14x14/Makefile.in'
--- icons/hicolor/14x14/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/hicolor/14x14/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/hicolor/16x16/Makefile.in'
--- icons/hicolor/16x16/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/hicolor/16x16/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/hicolor/22x22/Makefile.in'
--- icons/hicolor/22x22/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/hicolor/22x22/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/hicolor/24x24/Makefile.in'
--- icons/hicolor/24x24/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/hicolor/24x24/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/hicolor/32x32/Makefile.in'
--- icons/hicolor/32x32/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/hicolor/32x32/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/hicolor/48x48/Makefile.in'
--- icons/hicolor/48x48/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/hicolor/48x48/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/hicolor/48x48/psensor_hot.png'
 Binary files icons/hicolor/48x48/psensor_hot.png	2011-11-25 02:56:22 +0000 and icons/hicolor/48x48/psensor_hot.png	2012-08-31 10:30:30 +0000 differ
=== modified file 'icons/hicolor/64x64/Makefile.in'
--- icons/hicolor/64x64/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/hicolor/64x64/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/hicolor/scalable/Makefile.in'
--- icons/hicolor/scalable/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/hicolor/scalable/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/ubuntu-mono-dark/apps/22/Makefile.in'
--- icons/ubuntu-mono-dark/apps/22/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/ubuntu-mono-dark/apps/22/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/ubuntu-mono-dark/status/22/Makefile.in'
--- icons/ubuntu-mono-dark/status/22/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/ubuntu-mono-dark/status/22/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'icons/ubuntu-mono-light/status/22/Makefile.in'
--- icons/ubuntu-mono-light/status/22/Makefile.in	2011-11-25 02:56:22 +0000
+++ icons/ubuntu-mono-light/status/22/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
 DATA = $(psensordistpix_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(psensordistpixdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(psensordistpixdir)" && rm -f $$files
+	dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'po/LINGUAS'
--- po/LINGUAS	2011-04-21 15:19:35 +0000
+++ po/LINGUAS	2012-08-31 10:30:30 +0000
@@ -6,6 +6,14 @@
 #  Copying and distribution of this file, with or without modification,
 #  are permitted in any medium without royalty provided the copyright
 #  notice and this notice are preserved.
+de
 fr
+hu
+it
+pt_BR
+ru
+sl
+sr
+tr
+uk
 zh_CN
-tr
 
=== modified file 'po/fr.gmo'
 Binary files po/fr.gmo	2012-04-09 12:15:54 +0000 and po/fr.gmo	2012-08-31 10:30:30 +0000 differ
=== modified file 'po/fr.po'
--- po/fr.po	2012-04-09 12:15:54 +0000
+++ po/fr.po	2012-08-31 10:30:30 +0000
@@ -5,19 +5,21 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: psensor 0.6.0.9\n"
+"Project-Id-Version: psensor 0.6.2.x\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-03-26 10:30+0200\n"
-"PO-Revision-Date: 2011-02-07 21:18+0100\n"
-"Last-Translator: Jean-Philippe Orsini <[e-mail]>\n"
+"POT-Creation-Date: 2012-07-07 00:37+0200\n"
+"PO-Revision-Date: 2012-06-13 15:38+0000\n"
+"Last-Translator: Vincent Lhote <Unknown>\n"
 "Language-Team: Oriya\n"
-"Language: or\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-07-09 21:00+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #: src/main.c:77
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Copyright (C) %s [e-mail]\n"
 "License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
@@ -26,12 +28,12 @@
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
 "Copyright (C) %s [e-mail]\n"
-"License GPLv2: GNU GPL version 3 ou ultérieure<http://www.gnu.org/licenses/"
+"Licence GPLv2: GNU GPL version 3 ou ultérieure<http://www.gnu.org/licenses/"
 "old-licenses/gpl-2.0.html>\n"
 "Ceci est un logiciel libre, vous êtes libre de le modifier et de le \n"
 "redistribuer.\n"
-"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"
+"autorisées par la loi applicable.\n"
 
 #: src/main.c:88 src/server/server.c:86
 #, c-format
@@ -68,6 +70,8 @@
 #: src/main.c:105
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
 msgstr ""
+"  -d, --debug=LEVEL   assigner le niveau de débogage, nombre entier entre 0 "
+"et 3"
 
 #: src/main.c:110 src/server/server.c:104
 #, c-format
@@ -77,12 +81,11 @@
 #: src/main.c:112 src/server/server.c:106
 #, c-format
 msgid "%s home page: <%s>\n"
-msgstr "%s page d'acceuil: <%s>\n"
+msgstr "%s page d’accueil: <%s>\n"
 
 #: src/main.c:425
-#, fuzzy
 msgid "Enables debug mode."
-msgstr "Activée"
+msgstr "Active le mode de débogage."
 
 #: src/main.c:434 src/server/server.c:352
 #, c-format
@@ -97,10 +100,9 @@
 "distance.\n"
 
 #: 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 "
+"Psensor est une application GTK+ pour surveiller les sondes matérielles "
 "thermiques et les ventilateurs."
 
 #: src/ui.c:83
@@ -108,36 +110,34 @@
 "Copyright(c) 2010-2012\n"
 "[e-mail]"
 msgstr ""
+"Copyright(c) 2010-2012\n"
+"[e-mail]"
 
 #: src/ui.c:86
 msgid "About Psensor"
-msgstr ""
+msgstr "A propos de Psensor"
 
 #: src/ui.c:89
 msgid "Psensor Homepage"
-msgstr ""
+msgstr "Site internet de Psensor"
 
 #: src/ui.c:144
-#, fuzzy
 msgid "_Preferences"
-msgstr "Configuration"
+msgstr "_Configuration"
 
 #: src/ui.c:145 src/ui_sensorlist.c:200
 msgid "Preferences"
 msgstr "Configuration"
 
 #: src/ui.c:149
-#, fuzzy
 msgid "_Sensor Preferences"
-msgstr "Editer La Configuration Des Sondes"
+msgstr "Configuration Des Sondes"
 
 #: src/ui.c:150
-#, fuzzy
 msgid "Sensor Preferences"
-msgstr "Editer La Configuration Des Sondes"
+msgstr "Configuration Des Sondes"
 
 #: src/ui.c:154
-#, fuzzy
 msgid "_Quit"
 msgstr "Quitter"
 
@@ -147,29 +147,29 @@
 
 #: src/ui.c:160
 msgid "_About"
-msgstr ""
+msgstr "À propos"
 
 #: src/ui.c:161
 msgid "About"
-msgstr ""
+msgstr "A propos"
 
 #: src/ui.c:183 src/ui_appindicator.c:176
 #, c-format
 msgid "building menus failed: %s"
-msgstr ""
+msgstr "La construction des menus a échouée: %s"
 
 #: src/ui.c:231
 msgid "Psensor - Temperature Monitor"
-msgstr "Psensor - Surveillance Des Temperatures"
+msgstr "Psensor - Surveillance Des Températures"
 
 #: src/ui.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
-msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n"
+msgstr "ERREUR: Échec du chargement de l’icône de Psensor\n"
 
 #: src/ui_sensorlist.c:231
 msgid "Select foreground color"
-msgstr "Selectionner la couleur d'avant-plan"
+msgstr "Sélectionner la couleur d'avant-plan"
 
 #: src/ui_sensorlist.c:308 src/glade/psensor-pref.glade:241
 msgid "Sensor"
@@ -209,32 +209,33 @@
 msgstr "Alerte thermique"
 
 #: src/ui_sensorpref.c:397
-#, fuzzy
 msgid "Sensor Name"
-msgstr "Sonde"
+msgstr "Nom De La Sonde"
 
 #: src/rsensor.c:107
-#, fuzzy, c-format
+#, c-format
 msgid "Fail to connect to: %s"
-msgstr "ERREUR: Echer de la connectio à: %s\n"
+msgstr "Échec de la connexion à: %s"
 
 #: src/rsensor.c:144
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid content: %s"
-msgstr "ERREUR: Contenu invalide: %s\n"
+msgstr "Contenu invalide: %s"
 
 #: src/rsensor.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid JSON: %s"
-msgstr "ERREUR: Invalide JSON: %s\n"
+msgstr "JSON incorrect: %s"
 
 #: src/server/server.c:53
 msgid ""
 "<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
 msgstr ""
+"<html><body><p>Page non trouvée - Allez à <a href='/'>Main page</a></p></"
+"body>"
 
 #: src/server/server.c:76
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Copyright (C) %s [e-mail]\n"
 "License GPLv2: GNU GPL version 2 or later <http://www.gnu.org/licenses/old-"
@@ -248,7 +249,7 @@
 "Ceci est un logiciel libre, vous êtes libre de le modifier et de le \n"
 "redistribuer.\n"
 "Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n"
-"autorisees par la loi applicable.\n"
+"autorisées par la loi applicable.\n"
 
 #: src/server/server.c:88
 msgid ""
@@ -258,27 +259,26 @@
 "matérielles."
 
 #: src/server/server.c:93
-#, 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"
+"  -h, --help\t\tafficher cette aide et quitter\n"
+"  -v, --version\t\tafficher les informations de version et quitter"
 
 #: src/server/server.c:98
-#, fuzzy
 msgid ""
 "  -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"
+"  -d,--debug\t\trun in debug mode\n"
+"  -p,--port=PORT\tport du serveur Web\n"
+"  -w,--wdir=DIR\t\trépertoire contenant les pages du serveur Web"
 
 #: src/server/server.c:175
 msgid "<html><body><p>Server stop requested</p></body></html>"
-msgstr ""
+msgstr "<html><body><p>L’arrêt du serveur a été demandé</p></body></html>"
 
 #: src/server/server.c:290
 #, c-format
@@ -296,19 +296,19 @@
 msgstr "ERREUR: Echec de la creation du serveur Web\n"
 
 #: src/server/server.c:377
-#, fuzzy, c-format
+#, c-format
 msgid "Web server started on port: %d"
-msgstr "Server Web demarre sur le port: %d\n"
+msgstr "Le serveur Web a été démarre sur le port: %d"
 
 #: src/server/server.c:378
-#, fuzzy, c-format
+#, c-format
 msgid "WWW directory: %s"
-msgstr "WWW repertoire: %s\n"
+msgstr "WWW répertoire: %s"
 
 #: src/server/server.c:379
-#, fuzzy, c-format
+#, c-format
 msgid "URL: http://localhost:%d"
-msgstr "URL: http://localhost:%d\n"
+msgstr "URL: http://localhost:%d"
 
 #: src/lib/amd.c:151
 #, c-format
@@ -321,25 +321,24 @@
 msgstr ""
 
 #: src/lib/amd.c:185
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: ADL Initialization Error!\n"
-msgstr "ERREUR: échec de l'initialisation nvidia\n"
+msgstr "ERREUR: échec de l'initialisation ADL\n"
 
 #: src/lib/amd.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: Cannot get the number of adapters!\n"
 msgstr ""
-"ERREUR: Impossible de récuperer la valeur de la sous-fonctionnalité %s: %s\n"
 
 #: src/lib/hdd.c:58
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
-msgstr "ERREUR: hdd_fetch, écher d'ouverture de la socket\n"
+msgstr "ERREUR: hdd_fetch, échec d'ouverture de la socket\n"
 
 #: src/lib/hdd.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
-msgstr "ERREUR: hdd_fetch, écher de l'ouverture de la connection\n"
+msgstr "ERREUR: hdd_fetch, échec de l'ouverture de la connection\n"
 
 #: src/lib/hdd.c:182
 #, c-format
@@ -354,7 +353,7 @@
 #: src/lib/log.c:37
 #, c-format
 msgid "Cannot open log file: %s"
-msgstr ""
+msgstr "Impossible d'ouvrir le journal: %s"
 
 #: src/lib/nvidia.c:54
 #, c-format
@@ -362,14 +361,14 @@
 msgstr "ERREUR: échec de la récupération des températures nvidia\n"
 
 #: src/lib/nvidia.c:91
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
-msgstr "ERREUR: Echer de la connectio à: %s\n"
+msgstr "ERREUR: Echec de la connection au serveur X11\n"
 
 #: src/lib/nvidia.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
-msgstr "ERREUR: échec de la récupération des températures nvidia\n"
+msgstr "ERREUR: échec de la récupération des informations NVidia\n"
 
 #: src/lib/lmsensor.c:43
 #, c-format
@@ -387,21 +386,17 @@
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr "ERREUR: échec de l'initialisation de lm-sensors: %s\n"
 
-#: src/lib/psensor.c:430
-msgid "C"
-msgstr ""
-
 #: src/lib/psensor.c:433
 msgid "RPM"
-msgstr ""
+msgstr "RPM"
 
 #: src/lib/psensor.c:436
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
-msgstr "Editer la configuration"
+msgstr "Éditer la configuration"
 
 #: src/glade/psensor-pref.glade:70
 msgid "Graph Colors"
@@ -413,7 +408,7 @@
 
 #: src/glade/psensor-pref.glade:100
 msgid "Background:"
-msgstr "Arrière-plan :"
+msgstr "Arrière-plan:"
 
 #: src/glade/psensor-pref.glade:114
 msgid "Background opacity:"
@@ -424,14 +419,12 @@
 msgstr "Graphe"
 
 #: src/glade/psensor-pref.glade:183
-#, fuzzy
 msgid "Update interval:"
-msgstr "Interval de mise à jour du graphe:"
+msgstr "Intervalle de mise à jour:"
 
 #: src/glade/psensor-pref.glade:197
-#, fuzzy
 msgid "Monitoring duration:"
-msgstr "Durée de surveillance du graphe:"
+msgstr "Durée de surveillance:"
 
 #: src/glade/psensor-pref.glade:210 src/glade/psensor-pref.glade:272
 msgid "second(s)"
@@ -443,7 +436,7 @@
 
 #: src/glade/psensor-pref.glade:259
 msgid "Measure update interval:"
-msgstr "Interval de mise à jour des mesures:"
+msgstr "Intervalle de mise à jour des mesures:"
 
 #: src/glade/psensor-pref.glade:288
 msgid "Interface"
@@ -470,26 +463,24 @@
 msgstr "<i>Max</i>"
 
 #: src/glade/psensor-pref.glade:483
-#, fuzzy
 msgid "Enable menu"
-msgstr "Activée"
+msgstr "Activer le menu"
 
 #: src/glade/psensor-pref.glade:500
 msgid "Enable Unity Launcher counter"
 msgstr "Activer le compteur du lanceur de Unity"
 
 #: src/glade/psensor-pref.glade:518
-#, fuzzy
 msgid "Hide window on startup"
-msgstr "Cacher les décorations de la fenêtre"
+msgstr "Cacher la fenêtre au lancement"
 
 #: src/glade/psensor-pref.glade:535
 msgid "Restore window position and size"
-msgstr ""
+msgstr "Restaurer la position et la taille de la fenêtre"
 
 #: src/glade/sensor-edit.glade:8
 msgid "Edit Sensor Preferences"
-msgstr "Editer La Configuration Des Sondes"
+msgstr "Éditer La Configuration Des Sondes"
 
 #: src/glade/sensor-edit.glade:104
 msgid "Name:"
@@ -504,7 +495,6 @@
 msgstr "Id:"
 
 #: src/glade/sensor-edit.glade:202
-#, fuzzy
 msgid "Color:"
 msgstr "Couleur:"
 
@@ -522,7 +512,7 @@
 
 #: src/glade/sensor-edit.glade:266
 msgid "Sensor Information"
-msgstr "Information sonde"
+msgstr "Information de la sonde"
 
 #: src/glade/sensor-edit.glade:279
 msgid "Draw sensor curve"
@@ -531,58 +521,3 @@
 #: src/glade/sensor-edit.glade:327
 msgid "°C"
 msgstr "°C"
-
-#~ msgid "ERROR: failed gettimeofday\n"
-#~ msgstr "ERREUR: échec gettimeofday\n"
-
-#~ msgid "Current"
-#~ msgstr "Actuelle"
-
-#~ msgid "ERROR: failed to init lm-sensors\n"
-#~ msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n"
-
-#, fuzzy
-#~ msgid "ERROR: lmsensor init failure: %s\n"
-#~ msgstr "ERREUR: Echec de l'initialisation de 'lm-sensors'\n"
-
-#~ msgid "LUATPL Error: failed to load Lua script: %s.\n"
-#~ msgstr "LUATPL Erreur: échec du chargement du script LUA: %s.\n"
-
-#~ msgid "LUATPL Error: failed to call init function: %s.\n"
-#~ msgstr "LUATPL Erreur: échec du lancement de la fonction init: %s.\n"
-
-#~ msgid "LUATPL Error:failed to execute Lua script (%s): %s.\n"
-#~ msgstr "LUATP Erreur: échec de l'exécution du script Lua (%s): %s.\n"
-
-#~ msgid "LUATPL Error:lua script (%s) returned a wrong type.\n"
-#~ msgstr "LUATPL Errur: le script Lua (%s) a retourné le mauvais type.\n"
-
-#~ msgid "LUATPL Error:failed to open lua state.\n"
-#~ msgstr "LUATPL Errur: écher de creation du Lua state.\n"
-
-#~ msgid "LUATPL Error: code: %d.\n"
-#~ msgstr "LUATPL Erreur: code: %d.\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"
-
-#~ msgid "Right"
-#~ msgstr "Droite"
-
-#~ msgid "Left"
-#~ msgstr "Gauche"
-
-#~ msgid "Top"
-#~ msgstr "Haut"
-
-#~ msgid "Bottom"
-#~ msgstr "Bas"
-
-#~ msgid "ERROR: Lua support not enabled\n"
-#~ msgstr "ERREUR: Le support de Lua n'est pas activé\n"
 
=== modified file 'po/psensor.pot'
--- po/psensor.pot	2012-04-09 12:15:54 +0000
+++ po/psensor.pot	2012-08-31 10:30:30 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-03-26 10:30+0200\n"
+"POT-Creation-Date: 2012-07-07 00:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -348,10 +348,6 @@
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 
-#: src/lib/psensor.c:430
-msgid "C"
-msgstr ""
-
 #: src/lib/psensor.c:433
 msgid "RPM"
 msgstr ""
 
=== modified file 'po/tr.gmo'
 Binary files po/tr.gmo	2012-04-09 12:15:54 +0000 and po/tr.gmo	2012-08-31 10:30:30 +0000 differ
=== modified file 'po/tr.po'
--- po/tr.po	2012-04-09 12:15:54 +0000
+++ po/tr.po	2012-08-31 10:30:30 +0000
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: psensor\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-03-26 10:30+0200\n"
-"PO-Revision-Date: 2011-04-10 13:11+0000\n"
+"POT-Creation-Date: 2012-07-07 00:37+0200\n"
+"PO-Revision-Date: 2012-03-28 11:40+0000\n"
 "Last-Translator: zeugma <Unknown>\n"
 "Language-Team: Turkish <[e-mail]>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-11 05:41+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2012-07-09 21:00+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #: src/main.c:77
 #, c-format
@@ -102,7 +102,6 @@
 msgstr ""
 
 #: src/ui.c:144
-#, fuzzy
 msgid "_Preferences"
 msgstr "Tercihler"
 
@@ -111,12 +110,10 @@
 msgstr "Tercihler"
 
 #: src/ui.c:149
-#, fuzzy
 msgid "_Sensor Preferences"
 msgstr "Tercihleri düzenle"
 
 #: src/ui.c:150
-#, fuzzy
 msgid "Sensor Preferences"
 msgstr "Tercihleri düzenle"
 
@@ -192,7 +189,6 @@
 msgstr ""
 
 #: src/ui_sensorpref.c:397
-#, fuzzy
 msgid "Sensor Name"
 msgstr "Algılayıcı"
 
@@ -353,10 +349,6 @@
 msgid "ERROR: lm-sensors initialization failure: %s\n"
 msgstr ""
 
-#: src/lib/psensor.c:430
-msgid "C"
-msgstr ""
-
 #: src/lib/psensor.c:433
 msgid "RPM"
 msgstr ""
@@ -374,9 +366,8 @@
 msgstr "Grafik Renkleri"
 
 #: src/glade/psensor-pref.glade:86
-#, fuzzy
 msgid "Foreground:"
-msgstr "Arkaplan:"
+msgstr ""
 
 #: src/glade/psensor-pref.glade:100
 msgid "Background:"
@@ -451,7 +442,6 @@
 msgstr ""
 
 #: src/glade/sensor-edit.glade:8
-#, fuzzy
 msgid "Edit Sensor Preferences"
 msgstr "Tercihleri düzenle"
 
@@ -494,12 +484,3 @@
 #: src/glade/sensor-edit.glade:327
 msgid "°C"
 msgstr ""
-
-#~ msgid "Right"
-#~ msgstr "Sağ"
-
-#~ msgid "Left"
-#~ msgstr "Sol"
-
-#~ msgid "Top"
-#~ msgstr "Üstte"
 
=== modified file 'po/zh_CN.gmo'
 Binary files po/zh_CN.gmo	2012-04-09 12:15:54 +0000 and po/zh_CN.gmo	2012-08-31 10:30:30 +0000 differ
=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2012-04-09 12:15:54 +0000
+++ po/zh_CN.po	2012-08-31 10:30:30 +0000
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.10\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2012-03-26 10:30+0200\n"
-"PO-Revision-Date: 2011-06-06 08:57+0000\n"
-"Last-Translator: royclark <Unknown>\n"
+"POT-Creation-Date: 2012-07-07 00:37+0200\n"
+"PO-Revision-Date: 2012-05-09 02:21+0000\n"
+"Last-Translator: Wang Dianjin <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-06 09:00+0000\n"
-"X-Generator: Launchpad (build 13144)\n"
+"X-Launchpad-Export-Date: 2012-07-09 21:00+0000\n"
+"X-Generator: Launchpad (build 15558)\n"
 
 #: src/main.c:77
 #, c-format
@@ -27,6 +27,11 @@
 "This is free software: you are free to change and  redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"版权所有(C) %s [e-mail]\n"
+"协议 GPLv2：GNU GPL 第 2 版或以后的 <http://www.gnu.org/licenses/old-"
+"licenses/gpl-2.0.html>\n"
+"该软件为自由软件：您可以自由修改并分发。\n"
+"There is NO WARRANTY, to the extent permitted by law。\n"
 
 #: src/main.c:88 src/server/server.c:86
 #, c-format
@@ -41,7 +46,7 @@
 
 #: src/main.c:94
 msgid "Options:"
-msgstr ""
+msgstr "选项："
 
 #: src/main.c:95
 msgid ""
@@ -59,70 +64,71 @@
 
 #: src/main.c:105
 msgid "  -d, --debug=LEVEL   set the debug level, integer between 0 and 3"
-msgstr ""
+msgstr "  -d，--debug=LEVEL 设置调试等级，等级为 0 到 3 之间的整数"
 
 #: src/main.c:110 src/server/server.c:104
 #, c-format
 msgid "Report bugs to: %s\n"
-msgstr ""
+msgstr "报告问题至：%s\n"
 
 #: src/main.c:112 src/server/server.c:106
 #, c-format
 msgid "%s home page: <%s>\n"
-msgstr ""
+msgstr "%s 主页：<%s>\n"
 
 #: src/main.c:425
 msgid "Enables debug mode."
-msgstr ""
+msgstr "启用调试模式。"
 
 #: src/main.c:434 src/server/server.c:352
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "试用‘%s --help’来获得更多信息。\n"
 
 #: src/main.c:469
 #, c-format
 msgid "ERROR: Not compiled with remote sensor support.\n"
-msgstr ""
+msgstr "错误：无法支持编译远程监测器。\n"
 
 #: src/ui.c:80
-#, fuzzy
 msgid "Psensor is a GTK+ application for monitoring hardware sensors"
-msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温度和风扇转速。"
+msgstr "Psensor 是一款 GTK+ 硬件监测传感应用程序"
 
 #: src/ui.c:83
 msgid ""
 "Copyright(c) 2010-2012\n"
 "[e-mail]"
 msgstr ""
+"版权所有(c) 2010-2012\n"
+"[e-mail]"
 
 #: src/ui.c:86
 msgid "About Psensor"
-msgstr ""
+msgstr "关于 Psensor"
 
 #: src/ui.c:89
 msgid "Psensor Homepage"
-msgstr ""
+msgstr "Psensor 主页"
 
 #: src/ui.c:144
 msgid "_Preferences"
-msgstr ""
+msgstr "首选项(_P)"
 
 #: src/ui.c:145 src/ui_sensorlist.c:200
 msgid "Preferences"
-msgstr "选项"
+msgstr "首选项"
 
 #: src/ui.c:149
 msgid "_Sensor Preferences"
-msgstr ""
+msgstr "传感器首选项(_S)"
 
 #: src/ui.c:150
 msgid "Sensor Preferences"
-msgstr ""
+msgstr "传感器首选项"
 
 #: src/ui.c:154
 msgid "_Quit"
-msgstr ""
+msgstr "退出(_Q)"
 
 #: src/ui.c:154
 msgid "Quit"
@@ -130,25 +136,25 @@
 
 #: src/ui.c:160
 msgid "_About"
-msgstr ""
+msgstr "关于(_A)"
 
 #: src/ui.c:161
 msgid "About"
-msgstr ""
+msgstr "关于"
 
 #: src/ui.c:183 src/ui_appindicator.c:176
 #, c-format
 msgid "building menus failed: %s"
-msgstr ""
+msgstr "创建菜单失败：%s"
 
 #: src/ui.c:231
 msgid "Psensor - Temperature Monitor"
-msgstr ""
+msgstr "Psensor - 温度监视器"
 
 #: src/ui.c:248
 #, c-format
 msgid "ERROR: Failed to load psensor icon.\n"
-msgstr ""
+msgstr "错误：无法加载 psensor 图标。\n"
 
 #: src/ui_sensorlist.c:231
 msgid "Select foreground color"
@@ -160,7 +166,7 @@
 
 #: src/ui_sensorlist.c:314
 msgid "Value"
-msgstr ""
+msgstr "值"
 
 #: src/ui_sensorlist.c:320
 msgid "Min"
@@ -181,11 +187,11 @@
 #: 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 ""
+msgstr "不可用"
 
 #: src/ui_notify.c:45
 msgid "gettimeofday failed"
-msgstr ""
+msgstr "获取时间失败"
 
 #: src/ui_notify.c:67 src/ui_notify.c:69
 msgid "Temperature alert"
@@ -193,27 +199,27 @@
 
 #: src/ui_sensorpref.c:397
 msgid "Sensor Name"
-msgstr ""
+msgstr "传感器名称"
 
 #: src/rsensor.c:107
 #, c-format
 msgid "Fail to connect to: %s"
-msgstr ""
+msgstr "无法连接到：%s"
 
 #: src/rsensor.c:144
 #, c-format
 msgid "Invalid content: %s"
-msgstr ""
+msgstr "无效内容：%s"
 
 #: src/rsensor.c:184
 #, c-format
 msgid "Invalid JSON: %s"
-msgstr ""
+msgstr "无效 JSON：%s"
 
 #: src/server/server.c:53
 msgid ""
 "<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
-msgstr ""
+msgstr "<html><body><p>未找到页面 - 请访问<a href='/'>主页</a></p></body>"
 
 #: src/server/server.c:76
 #, c-format
@@ -224,6 +230,11 @@
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
+"版权所有(C) %s [e-mail]\n"
+"协议 GPLv2：GNU GPL 第 2 版或更新的<http://www.gnu.org/licenses/old-licenses/"
+"gpl-2.0.html>\n"
+"本软件为自由软件：您可以自由修改并分发。\n"
+"There is NO WARRANTY, to the extent permitted by law。\n"
 
 #: src/server/server.c:88
 msgid ""
@@ -231,13 +242,12 @@
 msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。"
 
 #: src/server/server.c:93
-#, 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 显示版本信息并退出"
+"  -h, --help\t\t 显示本帮助并退出\n"
+"  -v, --version\t\t 显示版本信息并退出"
 
 #: src/server/server.c:98
 msgid ""
@@ -245,131 +255,130 @@
 "  -p,--port=PORT\twebserver port\n"
 "  -w,--wdir=DIR\t\tdirectory containing webserver pages"
 msgstr ""
+"  -d,--debug\t\t 以调试模式运行\n"
+"  -p,--port=PORT\t 网络服务器端口\n"
+"  -w,--wdir=DIR\t\t 包括网络服务器页面的目录"
 
 #: src/server/server.c:175
 msgid "<html><body><p>Server stop requested</p></body></html>"
-msgstr ""
+msgstr "<html><body><p>服务器停止请求</p></body></html>"
 
 #: src/server/server.c:290
 #, c-format
 msgid "HTTP Request: %s\n"
-msgstr ""
+msgstr "HTTP 请求：%s\n"
 
 #: src/server/server.c:366
 #, c-format
 msgid "ERROR: no sensors detected\n"
-msgstr ""
+msgstr "错误：未检测到传感器\n"
 
 #: src/server/server.c:373
 #, c-format
 msgid "ERROR: Fail to create web server\n"
-msgstr ""
+msgstr "错误：无法创建网络服务器\n"
 
 #: src/server/server.c:377
 #, c-format
 msgid "Web server started on port: %d"
-msgstr ""
+msgstr "网络服务器启动端口：%d"
 
 #: src/server/server.c:378
 #, c-format
 msgid "WWW directory: %s"
-msgstr ""
+msgstr "WWW 目录：%s"
 
 #: src/server/server.c:379
 #, c-format
 msgid "URL: http://localhost:%d"
-msgstr ""
+msgstr "URL: http://localhost:%d"
 
 #: src/lib/amd.c:151
 #, c-format
 msgid "ERROR: ADL library not found!\n"
-msgstr ""
+msgstr "错误：未找到 ADL 库\n"
 
 #: src/lib/amd.c:176
 #, c-format
 msgid "ERROR: ADL's API is missing!\n"
-msgstr ""
+msgstr "错误：ADL 的 API 丢失！\n"
 
 #: src/lib/amd.c:185
 #, c-format
 msgid "ERROR: ADL Initialization Error!\n"
-msgstr ""
+msgstr "错误：ADL 初始化出错！\n"
 
 #: src/lib/amd.c:193
 #, c-format
 msgid "ERROR: Cannot get the number of adapters!\n"
-msgstr ""
+msgstr "错误：无法获取适配器数目！\n"
 
 #: src/lib/hdd.c:58
 #, c-format
 msgid "ERROR: hdd fetch, failed to open socket\n"
-msgstr ""
+msgstr "错误：硬盘读取时，无法打开 socket\n"
 
 #: src/lib/hdd.c:72
 #, c-format
 msgid "ERROR: hdd fetch, failed to open connection\n"
-msgstr ""
+msgstr "错误：硬盘读取时，无法打开连接\n"
 
 #: src/lib/hdd.c:182
 #, c-format
 msgid "ERROR: wrong hdd string: %s"
-msgstr ""
+msgstr "错误：不正确的硬盘字符串：%s"
 
 #: src/lib/hdd.c:252
 #, c-format
 msgid "ERROR: wrong hdd string: %s\n"
-msgstr ""
+msgstr "错误：不正确的硬盘字符串：%s\n"
 
 #: src/lib/log.c:37
 #, c-format
 msgid "Cannot open log file: %s"
-msgstr ""
+msgstr "无法打开日志文件：%s"
 
 #: src/lib/nvidia.c:54
 #, c-format
 msgid "ERROR: failed to retrieve nvidia temperature\n"
-msgstr ""
+msgstr "错误：无法获取 nvidia 温度\n"
 
 #: src/lib/nvidia.c:91
 #, c-format
 msgid "ERROR: Cannot open connection to X Server\n"
-msgstr ""
+msgstr "错误：无法打开到 X Server 的连接\n"
 
 #: src/lib/nvidia.c:99
 #, c-format
 msgid "ERROR: Cannot retrieve NVidia information\n"
-msgstr ""
+msgstr "错误：无法获取 NVidia 信息\n"
 
 #: src/lib/lmsensor.c:43
 #, c-format
 msgid "ERROR: Can't get value of subfeature %s: %s\n"
-msgstr ""
+msgstr "错误：无法获取子功能的值：%s: %s\n"
 
 #: src/lib/lmsensor.c:125
 #, c-format
 msgid "ERROR: create_sensor, wrong feature type\n"
-msgstr ""
+msgstr "错误：创建传感器时，不正确的特征类型\n"
 
 #: src/lib/lmsensor.c:208
 #, c-format
 msgid "ERROR: lm-sensors initialization failure: %s\n"
-msgstr ""
-
-#: src/lib/psensor.c:430
-msgid "C"
-msgstr ""
+msgstr "错误：lm-sensors 初始化失败：%s\n"
 
 #: src/lib/psensor.c:433
 msgid "RPM"
-msgstr ""
+msgstr "转速"
 
 #: src/lib/psensor.c:436
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
-msgstr ""
+msgstr "编辑首选项"
 
 #: src/glade/psensor-pref.glade:70
 msgid "Graph Colors"
@@ -377,7 +386,7 @@
 
 #: src/glade/psensor-pref.glade:86
 msgid "Foreground:"
-msgstr "坐标栏:"
+msgstr "前景："
 
 #: src/glade/psensor-pref.glade:100
 msgid "Background:"
@@ -385,7 +394,7 @@
 
 #: src/glade/psensor-pref.glade:114
 msgid "Background opacity:"
-msgstr "背景亮度:"
+msgstr "背景透明："
 
 #: src/glade/psensor-pref.glade:165 src/glade/sensor-edit.glade:184
 msgid "Graph"
@@ -393,23 +402,23 @@
 
 #: src/glade/psensor-pref.glade:183
 msgid "Update interval:"
-msgstr ""
+msgstr "更新间隔："
 
 #: src/glade/psensor-pref.glade:197
 msgid "Monitoring duration:"
-msgstr ""
+msgstr "监视持续时长："
 
 #: src/glade/psensor-pref.glade:210 src/glade/psensor-pref.glade:272
 msgid "second(s)"
-msgstr ""
+msgstr "秒"
 
 #: src/glade/psensor-pref.glade:225
 msgid "minute(s)"
-msgstr ""
+msgstr "分钟"
 
 #: src/glade/psensor-pref.glade:259
 msgid "Measure update interval:"
-msgstr ""
+msgstr "测量更新间隔："
 
 #: src/glade/psensor-pref.glade:288
 msgid "Interface"
@@ -437,24 +446,23 @@
 
 #: src/glade/psensor-pref.glade:483
 msgid "Enable menu"
-msgstr ""
+msgstr "启用菜单"
 
 #: src/glade/psensor-pref.glade:500
 msgid "Enable Unity Launcher counter"
-msgstr ""
+msgstr "启用 Unity 启动器计数器"
 
 #: src/glade/psensor-pref.glade:518
-#, fuzzy
 msgid "Hide window on startup"
-msgstr "隐藏窗口标题栏"
+msgstr "启动时隐藏窗口"
 
 #: src/glade/psensor-pref.glade:535
 msgid "Restore window position and size"
-msgstr ""
+msgstr "恢复窗口位置和大小"
 
 #: src/glade/sensor-edit.glade:8
 msgid "Edit Sensor Preferences"
-msgstr "监视设备选项"
+msgstr "编辑传感器首选项"
 
 #: src/glade/sensor-edit.glade:104
 msgid "Name:"
@@ -470,11 +478,11 @@
 
 #: src/glade/sensor-edit.glade:202
 msgid "Color:"
-msgstr ""
+msgstr "颜色："
 
 #: src/glade/sensor-edit.glade:216
 msgid "Alarm"
-msgstr "警告信息"
+msgstr "警告"
 
 #: src/glade/sensor-edit.glade:231
 msgid "Activate desktop notifications"
@@ -486,7 +494,7 @@
 
 #: src/glade/sensor-edit.glade:266
 msgid "Sensor Information"
-msgstr "设备信息"
+msgstr "传感器信息"
 
 #: src/glade/sensor-edit.glade:279
 msgid "Draw sensor curve"
@@ -494,28 +502,4 @@
 
 #: src/glade/sensor-edit.glade:327
 msgid "°C"
-msgstr ""
-
-#~ msgid "Current"
-#~ msgstr "当前"
-
-#~ msgid "Right"
-#~ msgstr "右侧"
-
-#~ msgid "Left"
-#~ msgstr "左侧"
-
-#~ msgid "Top"
-#~ msgstr "顶部"
-
-#~ msgid "Bottom"
-#~ msgstr "底部"
-
-#~ msgid "Show"
-#~ msgstr "显示主窗口"
-
-#~ msgid "Graph update interval:"
-#~ msgstr "图表更新间隔："
-
-#~ msgid "Graph monitoring duration:"
-#~ msgstr "图表监视持续时间："
+msgstr "°C"
 
=== modified file 'src/Makefile.in'
--- src/Makefile.in	2011-12-22 21:11:44 +0000
+++ src/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -122,6 +122,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man_MANS)
@@ -394,7 +400,7 @@
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-psensor$(EXEEXT): $(psensor_OBJECTS) $(psensor_DEPENDENCIES) 
+psensor$(EXEEXT): $(psensor_OBJECTS) $(psensor_DEPENDENCIES) $(EXTRA_psensor_DEPENDENCIES) 
 	@rm -f psensor$(EXEEXT)
 	$(LINK) $(psensor_OBJECTS) $(psensor_LDADD) $(LIBS)
 
@@ -467,9 +473,7 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -695,10 +699,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'src/glade/Makefile.in'
--- src/glade/Makefile.in	2011-11-25 02:56:22 +0000
+++ src/glade/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(gladedir)"
 DATA = $(glade_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -270,9 +276,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(gladedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(gladedir)" && rm -f $$files
+	dir='$(DESTDIR)$(gladedir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -327,10 +331,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'src/lib/Makefile.in'
--- src/lib/Makefile.in	2011-12-22 21:11:44 +0000
+++ src/lib/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -280,7 +280,7 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libpsensor.a: $(libpsensor_a_OBJECTS) $(libpsensor_a_DEPENDENCIES) 
+libpsensor.a: $(libpsensor_a_OBJECTS) $(libpsensor_a_DEPENDENCIES) $(EXTRA_libpsensor_a_DEPENDENCIES) 
 	-rm -f libpsensor.a
 	$(libpsensor_a_AR) libpsensor.a $(libpsensor_a_OBJECTS) $(libpsensor_a_LIBADD)
 	$(RANLIB) libpsensor.a
@@ -414,10 +414,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'src/lib/psensor.c'
--- src/lib/psensor.c	2012-07-13 02:22:18 +0000
+++ src/lib/psensor.c	2012-08-31 10:30:30 +0000
@@ -207,7 +207,7 @@
 	char *unit;
 
 	if (is_temp_type(type))
-		unit = "°C";
+		unit = "C";
 	else if (type & SENSOR_TYPE_CPU_USAGE)
 		unit = "%";
 	else
@@ -427,7 +427,7 @@
 const char *psensor_type_to_unit_str(unsigned int type)
 {
 	if (type & SENSOR_TYPE_TEMP)
-		return "\302\260C";
+		return _("C");
 
 	if (type & SENSOR_TYPE_FAN)
 		return _("RPM");
 
=== modified file 'src/main.c'
--- src/main.c	2012-07-13 02:22:18 +0000
+++ src/main.c	2012-08-31 10:30:30 +0000
@@ -514,16 +514,16 @@
 	ui_appindicator_init(&ui);
 #endif
 
-	/*
-	 * show the window as soon as all gtk events have been processed
-	 * in order to ensure that the status icon is attempted to be
-	 * drawn before. If not, there is no way to detect that it is
-	 * visible.
-	*/
-	g_idle_add((GSourceFunc)initial_window_show, &ui);
-
 	gdk_notify_startup_complete();
 
+	/*
+	 * hack, did not find a cleaner solution.
+	 * wait 2s to ensure that the status icon is attempted to be
+	 * drawn before determining whether the main window must be
+	 * show.
+	 */
+	g_timeout_add(2000, (GSourceFunc)initial_window_show, &ui);
+
 	/* main loop */
 	gtk_main();
 
 
=== modified file 'src/psensor.1'
--- src/psensor.1	2012-04-09 12:15:54 +0000
+++ src/psensor.1	2012-08-31 10:30:30 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH PSENSOR "1" "March 2012" "psensor 0.6.2.17" "User Commands"
+.TH PSENSOR "1" "August 2012" "psensor 0.6.2.19" "User Commands"
 .SH NAME
 psensor \- Temperature monitoring application
 .SH SYNOPSIS
 
=== modified file 'src/server/Makefile.in'
--- src/server/Makefile.in	2011-12-22 21:11:44 +0000
+++ src/server/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -88,6 +88,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man_MANS)
@@ -317,7 +323,7 @@
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-psensor-server$(EXEEXT): $(psensor_server_OBJECTS) $(psensor_server_DEPENDENCIES) 
+psensor-server$(EXEEXT): $(psensor_server_OBJECTS) $(psensor_server_DEPENDENCIES) $(EXTRA_psensor_server_DEPENDENCIES) 
 	@rm -f psensor-server$(EXEEXT)
 	$(LINK) $(psensor_server_OBJECTS) $(psensor_server_LDADD) $(LIBS)
 
@@ -378,9 +384,7 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -494,10 +498,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'src/server/psensor-server.1'
--- src/server/psensor-server.1	2012-04-09 12:15:54 +0000
+++ src/server/psensor-server.1	2012-08-31 10:30:30 +0000
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.40.4.
-.TH PSENSOR-SERVER "1" "March 2012" "psensor-server 0.6.2.17" "User Commands"
+.TH PSENSOR-SERVER "1" "August 2012" "psensor-server 0.6.2.19" "User Commands"
 .SH NAME
 psensor-server \- Temperature and system monitoring Web server
 .SH SYNOPSIS
 
=== modified file 'tests/Makefile.in'
--- tests/Makefile.in	2011-11-25 02:56:22 +0000
+++ tests/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -276,10 +276,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
 
=== modified file 'www/Makefile.in'
--- www/Makefile.in	2011-11-25 02:56:22 +0000
+++ www/Makefile.in	2012-08-31 10:30:30 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(defaultwwwdir)"
 DATA = $(defaultwww_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -279,9 +285,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(defaultwww_DATA)'; test -n "$(defaultwwwdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(defaultwwwdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(defaultwwwdir)" && rm -f $$files
+	dir='$(DESTDIR)$(defaultwwwdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -336,10 +340,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic: