diff -Nru gnome-power-manager-3.3.3/aclocal.m4 gnome-power-manager-3.3.92/aclocal.m4
--- gnome-power-manager-3.3.3/aclocal.m4	2011-12-19 10:55:36.000000000 +0000
+++ gnome-power-manager-3.3.92/aclocal.m4	2012-03-18 19:54:00.000000000 +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.
@@ -873,12 +874,15 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# 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
@@ -888,7 +892,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
 ])
 
@@ -904,19 +908,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/../..'.
@@ -998,14 +1004,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,
@@ -1045,6 +1051,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.
@@ -1109,7 +1116,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.
@@ -1174,10 +1181,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 -*-
@@ -1399,12 +1409,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.
@@ -1571,12 +1584,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'.
@@ -1599,13 +1615,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)
 # -----------------------
@@ -1613,13 +1630,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)])])
@@ -1630,12 +1647,14 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# 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_RUN_LOG(COMMAND)
 # -------------------
 # Run COMMAND, save the exit status in ac_status, and log it.
@@ -1712,13 +1731,13 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 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
+# serial 2
 
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
@@ -1733,18 +1752,50 @@
 no)  AM_DEFAULT_VERBOSITY=1;;
 *)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# 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
@@ -1767,13 +1818,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)
 # ---------------------------
@@ -1782,13 +1833,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,
@@ -1810,10 +1861,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])
diff -Nru gnome-power-manager-3.3.3/compile gnome-power-manager-3.3.92/compile
--- gnome-power-manager-3.3.3/compile	2011-09-09 07:37:28.000000000 +0000
+++ gnome-power-manager-3.3.92/compile	2012-02-22 15:19:45.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2012-01-04.17; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -29,21 +29,186 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l*)
+	  lib=${1#-l}
+	  found=no
+	  save_IFS=$IFS
+	  IFS=';'
+	  for dir in $lib_path $LIB
+	  do
+	    IFS=$save_IFS
+	    if $shared && test -f "$dir/$lib.dll.lib"; then
+	      found=yes
+	      set x "$@" "$dir/$lib.dll.lib"
+	      break
+	    fi
+	    if test -f "$dir/$lib.lib"; then
+	      found=yes
+	      set x "$@" "$dir/$lib.lib"
+	      break
+	    fi
+	  done
+	  IFS=$save_IFS
+
+	  test "$found" != yes && set x "$@" "$lib.lib"
+	  shift
+	  ;;
+	-L*)
+	  func_file_conv "${1#-L}"
+	  if test -z "$lib_path"; then
+	    lib_path=$file
+	  else
+	    lib_path="$lib_path;$file"
+	  fi
+	  linker_opts="$linker_opts -LIBPATH:$file"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
+right script to run: please start by reading the file 'INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
@@ -53,11 +218,13 @@
     echo "compile $scriptversion"
     exit $?
     ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
 esac
 
 ofile=
 cfile=
-eat=
 
 for arg
 do
@@ -66,8 +233,8 @@
   else
     case $1 in
       -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
@@ -94,10 +261,10 @@
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
+  # If no '-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
+  # '.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
@@ -106,7 +273,7 @@
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
diff -Nru gnome-power-manager-3.3.3/config.guess gnome-power-manager-3.3.92/config.guess
--- gnome-power-manager-3.3.3/config.guess	2011-09-09 07:37:28.000000000 +0000
+++ gnome-power-manager-3.3.92/config.guess	2012-02-22 15:19:45.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,9 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +145,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +181,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -223,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +270,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -394,23 +398,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +498,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +555,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -594,52 +598,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +734,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -769,14 +773,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,13 +792,12 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -803,15 +806,18 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -866,7 +872,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -878,20 +884,29 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -933,7 +948,7 @@
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -959,7 +974,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -967,14 +982,17 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +1001,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1019,7 +1037,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1047,13 +1065,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1088,8 +1106,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1132,10 +1150,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1179,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1230,6 +1248,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1275,13 +1296,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1321,11 +1342,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff -Nru gnome-power-manager-3.3.3/config.sub gnome-power-manager-3.3.92/config.sub
--- gnome-power-manager-3.3.3/config.sub	2011-09-09 07:37:28.000000000 +0000
+++ gnome-power-manager-3.3.92/config.sub	2012-02-22 15:19:45.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-01-01'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -75,8 +75,9 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,8 +124,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -156,8 +158,8 @@
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -173,10 +175,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -249,13 +251,17 @@
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -281,29 +287,39 @@
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -313,6 +329,18 @@
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -332,16 +360,19 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -367,25 +398,29 @@
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -410,7 +445,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -480,11 +515,20 @@
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -516,7 +560,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -674,7 +718,6 @@
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -732,7 +775,7 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -771,10 +814,18 @@
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -839,6 +890,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -921,9 +978,10 @@
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1017,6 +1075,9 @@
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1073,20 +1134,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1156,6 +1205,9 @@
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1253,11 +1305,11 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1293,8 +1345,9 @@
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1394,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1390,7 +1443,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1435,6 +1488,8 @@
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1457,10 +1512,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1472,8 +1527,17 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1493,14 +1557,11 @@
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1527,7 +1588,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff -Nru gnome-power-manager-3.3.3/configure gnome-power-manager-3.3.92/configure
--- gnome-power-manager-3.3.3/configure	2011-12-19 10:55:38.000000000 +0000
+++ gnome-power-manager-3.3.92/configure	2012-03-18 19:54:02.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gnome-power-manager 3.3.3.
+# Generated by GNU Autoconf 2.68 for gnome-power-manager 3.3.92.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@
 # Identity of this package.
 PACKAGE_NAME='gnome-power-manager'
 PACKAGE_TARNAME='gnome-power-manager'
-PACKAGE_VERSION='3.3.3'
-PACKAGE_STRING='gnome-power-manager 3.3.3'
+PACKAGE_VERSION='3.3.92'
+PACKAGE_STRING='gnome-power-manager 3.3.92'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -709,6 +709,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -724,6 +725,8 @@
 CC
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -1364,7 +1367,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 gnome-power-manager 3.3.3 to adapt to many kinds of systems.
+\`configure' configures gnome-power-manager 3.3.92 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1435,7 +1438,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-power-manager 3.3.3:";;
+     short | recursive ) echo "Configuration of gnome-power-manager 3.3.92:";;
    esac
   cat <<\_ACEOF
 
@@ -1464,7 +1467,7 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1559,7 +1562,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-power-manager configure 3.3.3
+gnome-power-manager configure 3.3.92
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1924,7 +1927,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gnome-power-manager $as_me 3.3.3, which was
+It was created by gnome-power-manager $as_me 3.3.92, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2740,7 +2743,7 @@
 
 # Define the identity of the package.
  PACKAGE=gnome-power-manager
- VERSION=3.3.3
+ VERSION=3.3.92
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2770,11 +2773,11 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# 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}'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -2802,7 +2805,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-power-manager'
- VERSION='3.3.3'
+ VERSION='3.3.92'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2832,9 +2835,9 @@
 
 # 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"}
+# 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}'
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
@@ -2938,6 +2941,33 @@
 no)  AM_DEFAULT_VERBOSITY=1;;
 *)   AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 
@@ -3782,6 +3812,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=
@@ -3806,6 +3837,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.
@@ -3865,7 +3897,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.
@@ -3933,6 +3965,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.
@@ -3992,7 +4025,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.
@@ -4183,8 +4216,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -5029,6 +5062,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5068,7 +5106,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -5497,7 +5535,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -6138,13 +6176,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -6291,6 +6329,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -6679,7 +6718,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -6690,7 +6729,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -7330,7 +7382,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -7341,6 +7399,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -7373,6 +7432,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -7394,7 +7454,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -7799,7 +7861,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -7877,6 +7954,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8336,7 +8417,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -8427,18 +8510,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -8800,7 +8898,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9050,8 +9147,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9430,6 +9526,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -9475,6 +9572,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -9503,10 +9601,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -9519,7 +9613,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -9558,7 +9652,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -10182,11 +10275,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -10276,7 +10364,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10285,7 +10373,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10350,7 +10438,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -10489,7 +10577,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10497,10 +10585,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10508,7 +10592,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10526,7 +10610,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10546,17 +10630,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -10617,7 +10702,7 @@
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10633,7 +10718,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -10670,9 +10755,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10758,7 +10843,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -10827,7 +10912,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10852,7 +10937,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -10876,7 +10961,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -10907,7 +10992,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10917,7 +11002,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11699,6 +11784,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -11880,7 +11967,7 @@
 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@'
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -12206,7 +12293,7 @@
 if test $? -ne 0; then
    as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
@@ -13419,12 +13506,12 @@
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -13435,12 +13522,12 @@
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -13460,14 +13547,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9" 2>&1`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9) were not met:
+	as_fn_error $? "Package requirements (glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -14358,7 +14445,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnome-power-manager $as_me 3.3.3, which was
+This file was extended by gnome-power-manager $as_me 3.3.92, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14424,7 +14511,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnome-power-manager config.status 3.3.3
+gnome-power-manager config.status 3.3.92
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -14561,6 +14648,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -14643,7 +14731,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -14699,6 +14786,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -14749,7 +14837,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -15572,8 +15659,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -15627,6 +15714,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -15928,10 +16018,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
diff -Nru gnome-power-manager-3.3.3/configure.ac gnome-power-manager-3.3.92/configure.ac
--- gnome-power-manager-3.3.3/configure.ac	2011-12-19 10:53:12.000000000 +0000
+++ gnome-power-manager-3.3.92/configure.ac	2012-03-18 19:53:24.000000000 +0000
@@ -1,6 +1,6 @@
 AC_PREREQ(2.63)
 
-AC_INIT([gnome-power-manager],[3.3.3])
+AC_INIT([gnome-power-manager],[3.3.92])
 AC_CONFIG_SRCDIR(src)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
@@ -89,7 +89,7 @@
 dnl ---------------------------------------------------------------------------
 dnl - Check library dependencies
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.13.0 gobject-2.0 gio-2.0 >= 2.25.9)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.31.10 gobject-2.0 gio-2.0 >= 2.25.9)
 
 PKG_CHECK_MODULES(GNOME, [
  gtk+-3.0 >= 2.91.0
diff -Nru gnome-power-manager-3.3.3/data/gnome-power-statistics.desktop.in gnome-power-manager-3.3.92/data/gnome-power-statistics.desktop.in
--- gnome-power-manager-3.3.3/data/gnome-power-statistics.desktop.in	2011-12-19 10:55:43.000000000 +0000
+++ gnome-power-manager-3.3.92/data/gnome-power-statistics.desktop.in	2012-03-18 19:54:08.000000000 +0000
@@ -11,5 +11,5 @@
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-power-manager
 X-GNOME-Bugzilla-Component=gnome-power-statistics
-X-GNOME-Bugzilla-Version=3.3.3
+X-GNOME-Bugzilla-Version=3.3.92
 X-Desktop-File-Install-Version=0.10
diff -Nru gnome-power-manager-3.3.3/data/icons/16x16/apps/Makefile.in gnome-power-manager-3.3.92/data/icons/16x16/apps/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/16x16/apps/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/16x16/apps/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -300,9 +306,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -357,10 +361,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/16x16/Makefile.in gnome-power-manager-3.3.92/data/icons/16x16/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/16x16/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/16x16/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -46,11 +46,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -497,10 +497,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/16x16/status/Makefile.in gnome-power-manager-3.3.92/data/icons/16x16/status/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/16x16/status/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/16x16/status/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -340,9 +346,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -397,10 +401,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/22x22/apps/Makefile.in gnome-power-manager-3.3.92/data/icons/22x22/apps/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/22x22/apps/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/22x22/apps/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -300,9 +306,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -357,10 +361,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/22x22/Makefile.in gnome-power-manager-3.3.92/data/icons/22x22/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/22x22/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/22x22/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -46,11 +46,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -497,10 +497,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/22x22/status/Makefile.in gnome-power-manager-3.3.92/data/icons/22x22/status/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/22x22/status/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/22x22/status/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -340,9 +346,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -397,10 +401,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/24x24/apps/Makefile.in gnome-power-manager-3.3.92/data/icons/24x24/apps/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/24x24/apps/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/24x24/apps/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -300,9 +306,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -357,10 +361,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/24x24/Makefile.in gnome-power-manager-3.3.92/data/icons/24x24/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/24x24/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/24x24/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -46,11 +46,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -497,10 +497,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/24x24/status/Makefile.in gnome-power-manager-3.3.92/data/icons/24x24/status/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/24x24/status/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/24x24/status/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -340,9 +346,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -397,10 +401,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/32x32/apps/Makefile.in gnome-power-manager-3.3.92/data/icons/32x32/apps/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/32x32/apps/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/32x32/apps/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -300,9 +306,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -357,10 +361,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/32x32/Makefile.in gnome-power-manager-3.3.92/data/icons/32x32/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/32x32/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/32x32/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -46,11 +46,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -497,10 +497,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/32x32/status/Makefile.in gnome-power-manager-3.3.92/data/icons/32x32/status/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/32x32/status/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/32x32/status/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -340,9 +346,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -397,10 +401,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/48x48/apps/Makefile.in gnome-power-manager-3.3.92/data/icons/48x48/apps/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/48x48/apps/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/48x48/apps/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -300,9 +306,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -357,10 +361,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/48x48/Makefile.in gnome-power-manager-3.3.92/data/icons/48x48/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/48x48/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/48x48/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -46,11 +46,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -497,10 +497,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/48x48/status/Makefile.in gnome-power-manager-3.3.92/data/icons/48x48/status/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/48x48/status/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/48x48/status/Makefile.in	2012-03-18 19:54:02.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -341,9 +347,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -398,10 +402,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/Makefile.in gnome-power-manager-3.3.92/data/icons/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/Makefile.in	2012-03-18 19:54:02.000000000 +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.
@@ -46,11 +46,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -498,10 +498,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/scalable/apps/Makefile.in gnome-power-manager-3.3.92/data/icons/scalable/apps/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/scalable/apps/Makefile.in	2011-12-19 10:55:38.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/scalable/apps/Makefile.in	2012-03-18 19:54:02.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -300,9 +306,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -357,10 +361,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/scalable/Makefile.in gnome-power-manager-3.3.92/data/icons/scalable/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/scalable/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/scalable/Makefile.in	2012-03-18 19:54:02.000000000 +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.
@@ -46,11 +46,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -497,10 +497,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:
diff -Nru gnome-power-manager-3.3.3/data/icons/scalable/status/Makefile.in gnome-power-manager-3.3.92/data/icons/scalable/status/Makefile.in
--- gnome-power-manager-3.3.3/data/icons/scalable/status/Makefile.in	2011-12-19 10:55:38.000000000 +0000
+++ gnome-power-manager-3.3.92/data/icons/scalable/status/Makefile.in	2012-03-18 19:54:02.000000000 +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.
@@ -47,11 +47,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -76,6 +76,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)$(iconsdir)"
 DATA = $(icons_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -332,9 +338,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -389,10 +393,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:
diff -Nru gnome-power-manager-3.3.3/data/Makefile.am gnome-power-manager-3.3.92/data/Makefile.am
--- gnome-power-manager-3.3.3/data/Makefile.am	2011-08-05 09:48:32.000000000 +0000
+++ gnome-power-manager-3.3.92/data/Makefile.am	2012-02-09 14:57:00.000000000 +0000
@@ -10,14 +10,14 @@
 gsettings_schemas_in_files = org.gnome.power-manager.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
 
-pkgdata_DATA =						\
+UI_FILES =						\
 	gpm-statistics.ui
 
 EXTRA_DIST =						\
 	$(gsettings_SCHEMAS)				\
 	$(desktop_in_files)				\
 	$(gsettings_schemas_in_files)			\
-	$(pkgdata_DATA)
+	$(UI_FILES)
 
 clean-local :
 	rm -f *~
diff -Nru gnome-power-manager-3.3.3/data/Makefile.in gnome-power-manager-3.3.92/data/Makefile.in
--- gnome-power-manager-3.3.3/data/Makefile.in	2011-12-19 10:55:37.000000000 +0000
+++ gnome-power-manager-3.3.92/data/Makefile.in	2012-03-18 19:54:01.000000000 +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.
@@ -48,11 +48,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gnome-power-statistics.desktop.in
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -84,8 +84,14 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgdatadir)"
-DATA = $(desktop_DATA) $(pkgdata_DATA)
+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)$(desktopdir)"
+DATA = $(desktop_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -279,14 +285,14 @@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 gsettings_schemas_in_files = org.gnome.power-manager.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
-pkgdata_DATA = \
+UI_FILES = \
 	gpm-statistics.ui
 
 EXTRA_DIST = \
 	$(gsettings_SCHEMAS)				\
 	$(desktop_in_files)				\
 	$(gsettings_schemas_in_files)			\
-	$(pkgdata_DATA)
+	$(UI_FILES)
 
 DISTCLEANFILES = \
 	gnome-power-statistics.desktop			\
@@ -350,29 +356,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
-install-pkgdataDATA: $(pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-	done
-
-uninstall-pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+	dir='$(DESTDIR)$(desktopdir)'; $(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.
@@ -572,7 +556,7 @@
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgdatadir)"; do \
+	for dir in "$(DESTDIR)$(desktopdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -585,10 +569,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:
@@ -621,7 +610,7 @@
 
 info-am:
 
-install-data-am: install-desktopDATA install-pkgdataDATA
+install-data-am: install-desktopDATA
 
 install-dvi: install-dvi-recursive
 
@@ -665,7 +654,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-desktopDATA uninstall-pkgdataDATA
+uninstall-am: uninstall-desktopDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 	install-am install-strip tags-recursive
@@ -678,12 +667,12 @@
 	install-data-am install-desktopDATA 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-pkgdataDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-desktopDATA uninstall-pkgdataDATA
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-desktopDATA
 
 
 @INTLTOOL_DESKTOP_RULE@
diff -Nru gnome-power-manager-3.3.3/debian/changelog gnome-power-manager-3.3.92/debian/changelog
--- gnome-power-manager-3.3.3/debian/changelog	2012-02-22 07:17:40.000000000 +0000
+++ gnome-power-manager-3.3.92/debian/changelog	2012-03-21 07:17:06.000000000 +0000
@@ -1,3 +1,14 @@
+gnome-power-manager (3.3.92-0ubuntu1) precise; urgency=low
+
+  * New upstream release
+    - Compile the GtkBuilder file as a GResource to speed up startup
+    - updated translations
+  * debian/control:
+    - build-dep on libglib2.0-dev (>= 2.31.10)
+    - bump Standards-Version
+
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 21 Mar 2012 08:17:06 +0100
+
 gnome-power-manager (3.3.3-0ubuntu1) precise; urgency=low
 
   * New upstream release.
diff -Nru gnome-power-manager-3.3.3/debian/control gnome-power-manager-3.3.92/debian/control
--- gnome-power-manager-3.3.3/debian/control	2012-02-22 07:17:43.000000000 +0000
+++ gnome-power-manager-3.3.92/debian/control	2012-03-21 07:17:12.000000000 +0000
@@ -8,13 +8,13 @@
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu@debian.org>, Frederic Peters <fpeters@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Frederic Peters <fpeters@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs,
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
                libdbus-glib-1-dev (>= 0.70),
-               libglib2.0-dev (>= 2.25.9),
+               libglib2.0-dev (>= 2.31.10),
                libgtk-3-dev (>= 3.0.0),
                libcairo2-dev (>= 1.0.0),
                libupower-glib-dev (>= 0.9.1),
@@ -23,7 +23,7 @@
                docbook-utils,
                gnome-doc-utils,
                pkg-config
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gnome-power-manager/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/
 Homepage: http://www.gnome.org/projects/gnome-power-manager/
diff -Nru gnome-power-manager-3.3.3/debian/control.in gnome-power-manager-3.3.92/debian/control.in
--- gnome-power-manager-3.3.3/debian/control.in	2012-02-22 07:16:48.000000000 +0000
+++ gnome-power-manager-3.3.92/debian/control.in	2012-03-21 07:13:24.000000000 +0000
@@ -9,7 +9,7 @@
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
                libdbus-glib-1-dev (>= 0.70),
-               libglib2.0-dev (>= 2.25.9),
+               libglib2.0-dev (>= 2.31.10),
                libgtk-3-dev (>= 3.0.0),
                libcairo2-dev (>= 1.0.0),
                libupower-glib-dev (>= 0.9.1),
@@ -18,7 +18,7 @@
                docbook-utils,
                gnome-doc-utils,
                pkg-config
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/gnome-power-manager/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-power-manager/
 Homepage: http://www.gnome.org/projects/gnome-power-manager/
diff -Nru gnome-power-manager-3.3.3/depcomp gnome-power-manager-3.3.92/depcomp
--- gnome-power-manager-3.3.3/depcomp	2011-09-09 07:37:29.000000000 +0000
+++ gnome-power-manager-3.3.92/depcomp	2012-02-22 15:19:46.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-12-04.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011 Free Software Foundation, Inc.
 
 # 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
@@ -44,7 +44,7 @@
   object      Object file output by `PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -90,10 +90,18 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -158,10 +166,12 @@
 ' < "$tmpdepfile" |
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -405,6 +415,52 @@
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/	\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/	/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -503,7 +559,9 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
   sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
diff -Nru gnome-power-manager-3.3.3/INSTALL gnome-power-manager-3.3.92/INSTALL
--- gnome-power-manager-3.3.3/INSTALL	2011-06-13 08:22:03.000000000 +0000
+++ gnome-power-manager-3.3.92/INSTALL	2012-02-09 15:04:36.000000000 +0000
@@ -1,237 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff -Nru gnome-power-manager-3.3.3/install-sh gnome-power-manager-3.3.92/install-sh
--- gnome-power-manager-3.3.3/install-sh	2011-09-09 07:37:28.000000000 +0000
+++ gnome-power-manager-3.3.92/install-sh	2012-02-22 15:19:45.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff -Nru gnome-power-manager-3.3.3/ltmain.sh gnome-power-manager-3.3.92/ltmain.sh
--- gnome-power-manager-3.3.3/ltmain.sh	2011-09-09 07:37:21.000000000 +0000
+++ gnome-power-manager-3.3.92/ltmain.sh	2012-02-22 15:19:39.000000000 +0000
@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -41,6 +41,7 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
+#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4
+#         $progname:	(GNU libtool) 2.4.2
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4
+VERSION=2.4.2
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			opt_silent=false
 func_append preserve_args " $opt"
 			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
       --no-verbose)
 			opt_verbose=false
 func_append preserve_args " $opt"
@@ -2059,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/\([\\"]\)/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6147,7 +6160,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6831,7 +6845,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7316,6 +7330,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7432,7 +7447,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8020,6 +8035,11 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8050,7 +8070,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8058,11 +8078,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9152,6 +9168,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9261,7 +9279,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
diff -Nru gnome-power-manager-3.3.3/m4/intltool.m4 gnome-power-manager-3.3.92/m4/intltool.m4
--- gnome-power-manager-3.3.3/m4/intltool.m4	2011-09-09 07:37:23.000000000 +0000
+++ gnome-power-manager-3.3.92/m4/intltool.m4	2012-02-22 15:19:40.000000000 +0000
@@ -66,7 +66,7 @@
 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
        INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
       INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@' 
       INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
       INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
     INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
@@ -119,7 +119,7 @@
 if test $? -ne 0; then
    AC_MSG_ERROR([perl 5.8.1 is required for intltool])
 else
-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
    AC_MSG_RESULT([$IT_PERL_VERSION])
 fi
 if test "x$2" != "xno-xml"; then
diff -Nru gnome-power-manager-3.3.3/m4/libtool.m4 gnome-power-manager-3.3.92/m4/libtool.m4
--- gnome-power-manager-3.3.3/m4/libtool.m4	2011-09-09 07:37:22.000000000 +0000
+++ gnome-power-manager-3.3.92/m4/libtool.m4	2012-02-22 15:19:39.000000000 +0000
@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -637,7 +639,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -822,6 +825,31 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -852,6 +880,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
     AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
       [lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1047,6 +1089,8 @@
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
   else
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
   fi
@@ -1330,14 +1374,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1600,6 +1657,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
@@ -2185,7 +2247,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2194,7 +2256,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2398,7 +2460,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2406,10 +2468,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2417,7 +2475,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2435,7 +2493,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2455,17 +2513,18 @@
   ;;
 
 gnu*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 haiku*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
@@ -2526,7 +2585,7 @@
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2542,7 +2601,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2579,9 +2638,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2648,7 +2707,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2717,7 +2776,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2742,7 +2801,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2766,7 +2825,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2797,7 +2856,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2807,7 +2866,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3229,7 +3288,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3649,6 +3708,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4233,7 +4293,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4325,18 +4387,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4496,7 +4573,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4521,7 +4600,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4772,8 +4850,7 @@
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5068,6 +5145,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5114,10 +5192,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5130,7 +5204,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5169,7 +5243,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5611,9 +5684,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5771,7 +5841,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6141,7 +6210,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6902,12 +6971,18 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7104,7 +7179,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7237,7 +7311,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7424,6 +7497,77 @@
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7493,6 +7637,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
diff -Nru gnome-power-manager-3.3.3/m4/ltoptions.m4 gnome-power-manager-3.3.92/m4/ltoptions.m4
--- gnome-power-manager-3.3.3/m4/ltoptions.m4	2011-09-09 07:37:22.000000000 +0000
+++ gnome-power-manager-3.3.92/m4/ltoptions.m4	2012-02-22 15:19:39.000000000 +0000
@@ -326,9 +326,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff -Nru gnome-power-manager-3.3.3/m4/ltversion.m4 gnome-power-manager-3.3.92/m4/ltversion.m4
--- gnome-power-manager-3.3.3/m4/ltversion.m4	2011-09-09 07:37:22.000000000 +0000
+++ gnome-power-manager-3.3.92/m4/ltversion.m4	2012-02-22 15:19:40.000000000 +0000
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru gnome-power-manager-3.3.3/Makefile.in gnome-power-manager-3.3.92/Makefile.in
--- gnome-power-manager-3.3.3/Makefile.in	2011-12-19 10:55:38.000000000 +0000
+++ gnome-power-manager-3.3.92/Makefile.in	2012-03-18 19:54:02.000000000 +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.
@@ -52,11 +52,11 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -79,9 +79,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,'; \
@@ -110,6 +112,8 @@
 GZIP_ENV = --best
 DIST_ARCHIVES = $(distdir).tar.xz
 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@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -305,7 +309,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 \
@@ -341,10 +345,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
@@ -573,14 +575,18 @@
 	$(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
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(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
@@ -597,7 +603,7 @@
 	$(am__remove_distdir)
 
 dist dist-all: 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)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -611,6 +617,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*) \
@@ -630,6 +638,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 \
@@ -658,8 +667,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)"; \
@@ -690,10 +707,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:
@@ -783,8 +805,8 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool 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 \
+	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
 	distclean-libtool distclean-local distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-data \
diff -Nru gnome-power-manager-3.3.3/man/Makefile.in gnome-power-manager-3.3.92/man/Makefile.in
--- gnome-power-manager-3.3.3/man/Makefile.in	2011-12-19 10:55:38.000000000 +0000
+++ gnome-power-manager-3.3.92/man/Makefile.in	2012-03-18 19:54:02.000000000 +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.
@@ -46,11 +46,11 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
@@ -75,6 +75,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
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
@@ -314,9 +320,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)
 tags: TAGS
 TAGS:
 
@@ -384,10 +388,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:
diff -Nru gnome-power-manager-3.3.3/missing gnome-power-manager-3.3.92/missing
--- gnome-power-manager-3.3.3/missing	2011-09-09 07:37:28.000000000 +0000
+++ gnome-power-manager-3.3.92/missing	2012-02-22 15:19:45.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
diff -Nru gnome-power-manager-3.3.3/NEWS gnome-power-manager-3.3.92/NEWS
--- gnome-power-manager-3.3.3/NEWS	2011-12-19 10:55:26.000000000 +0000
+++ gnome-power-manager-3.3.92/NEWS	2012-03-18 19:52:49.000000000 +0000
@@ -1,3 +1,17 @@
+Version 3.3.92
+~~~~~~~~~~~~~~
+Released: 2012-03-18
+
+* Translations
+ - Updated Esperanto translation (Kristjan SCHMIDT)
+ - Updated Finnish translation (Timo Jyrinki)
+ - Updated Macedonian translation (Jovan Naumovski)
+ - Updated Norwegian bokmål translation (Kjartan Maraas)
+ - Updated Persian Translation (Arash Mousavi)
+
+* New Features:
+ - Compile the GtkBuilder file as a GResource to speed up startup (Richard Hughes)
+
 Version 3.3.3
 ~~~~~~~~~~~~~
 Released: 2011-12-19
diff -Nru gnome-power-manager-3.3.3/po/eo.po gnome-power-manager-3.3.92/po/eo.po
--- gnome-power-manager-3.3.3/po/eo.po	2011-08-05 09:23:30.000000000 +0000
+++ gnome-power-manager-3.3.92/po/eo.po	2012-01-02 11:37:55.000000000 +0000
@@ -1,110 +1,111 @@
-# Esperanto translation for gnome-power-manager
+# Esperanto translation for gnome-power-manager.
 # Copyright (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the gnome-power-manager package.
 # Jopp EGGEN <joop_eggen@yahoo.de>, 2006.
 # Aisano < >, 2008.
 # Oliver WEB < >, 2008.
 # Kim RIBEIRO < >, 2009.
+# Baptiste DARTHENAY <bapdarth@yahoo·fr>, 2011.
 # Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-power-manager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 10:10+0100\n"
-"PO-Revision-Date: 2011-04-07 19:52+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"power-manager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-19 11:41+0000\n"
+"PO-Revision-Date: 2011-12-29 23:38+0100\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
-"Language: eo\n"
+"Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
+"Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Launchpad-Export-Date: 2011-04-06 17:12+0000\n"
 "X-Generator: Launchpad (build 12735)\n"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:1
 msgid "The ID of the last device selected"
-msgstr ""
+msgstr "La identigo de la lasta aparato elektita"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:2
 msgid "The default graph type to show for history"
-msgstr ""
+msgstr "La defaŭlta grafeotipo por montri historion"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:3
 msgid "The default graph type to show for stats"
-msgstr ""
+msgstr "La defaŭlta grafeotipo por montri statistikon"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:4
 msgid "The default graph type to show in the history window."
-msgstr ""
+msgstr "La defaŭlta grafeotipo por montri en la historia fenestro."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:5
 msgid "The default graph type to show in the stats window."
-msgstr ""
+msgstr "La defaŭlta grafeotipo por montri en la statistika fenestro."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:6
 msgid ""
 "The identifier of the last device which is used to return focus to the "
 "correct device."
 msgstr ""
+"La identigilo de la lasta aparato kiu estas uzita por revenigi fokuson al la "
+"ĝusta aparato."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:7
 msgid "The index of the page number to show by default"
-msgstr ""
+msgstr "La indekso de la paĝa numero por montri defaŭlte"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:8
 msgid ""
 "The index of the page number to show by default which is used to return "
 "focus to the correct page."
 msgstr ""
+"La indekso de la paĝa numero por montri defaŭlte kiu estas uzita por reveni "
+"fokuson al la ĝusta paĝo."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:9
 msgid ""
 "The maximum duration of time displayed on the x-axis of the history graph."
-msgstr "La maksimuma daŭro montrata sur la x-akso de la historia grafeo."
+msgstr "La maksimuma tempodaŭro montrata sur la X-akso de la historia grafeo."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:10
 msgid "The maximum time displayed for history"
-msgstr "La maksimuma tempo montrata por historio"
+msgstr "La maksimuma tempodaŭro montrata por historio"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:11
 msgid "Whether we should show the history data points"
-msgstr ""
+msgstr "Ĉu montri la historiajn datumajn punktojn?"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:12
-#, fuzzy
 msgid ""
 "Whether we should show the history data points in the statistics window."
-msgstr "Ĉu montri historiaj  en la statistika fenestro?"
+msgstr "Ĉu montri la historiajn datumajn punktojn en la statistika fenestro?"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:13
 msgid "Whether we should show the stats data points"
-msgstr ""
+msgstr "Ĉu montri la statistikajn datumajn punktojn?"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:14
-#, fuzzy
 msgid "Whether we should show the stats data points in the statistics window."
-msgstr "Ĉu montri eventojn en la statistika fenestro?"
+msgstr "Ĉu montri la statistikajn datumajn punktojn en la statistika fenestro?"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:15
 msgid "Whether we should smooth the history data"
-msgstr ""
+msgstr "Ĉu glatigi la historian datumon?"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:16
-#, fuzzy
 msgid "Whether we should smooth the history data in the graph."
-msgstr "Ĉu glatigi la datenojn en la grafikaĵo?"
+msgstr "Ĉu glatigi la historian datumon en la grafeo?"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:17
-#, fuzzy
 msgid "Whether we should smooth the stats data"
-msgstr "Ĉu glatigi la datenojn en la grafikaĵo?"
+msgstr "Ĉu glatigi la statistikan datumon?"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:18
-#, fuzzy
 msgid "Whether we should smooth the stats data in the graph."
-msgstr "Ĉu glatigi la datenojn en la grafikaĵo?"
+msgstr "Ĉu glatigi la statistikian datumon en la grafeo?"
 
 #: ../data/gnome-power-statistics.desktop.in.in.h:1
 msgid "Observe power management"
@@ -124,7 +125,7 @@
 
 #: ../data/gpm-statistics.ui.h:2
 msgid "Data length:"
-msgstr ""
+msgstr "Datuma longo:"
 
 #: ../data/gpm-statistics.ui.h:3 ../src/gpm-statistics.c:509
 msgid "Details"
@@ -140,11 +141,11 @@
 
 #: ../data/gpm-statistics.ui.h:7
 msgid "Processor wakeups per second:"
-msgstr ""
+msgstr "Procesora vekoj por sekundo:"
 
 #: ../data/gpm-statistics.ui.h:8
 msgid "Show data points"
-msgstr ""
+msgstr "Montri datumajn punktojn"
 
 #: ../data/gpm-statistics.ui.h:9
 msgid "Statistics"
@@ -152,72 +153,72 @@
 
 #: ../data/gpm-statistics.ui.h:10
 msgid "There is no data to display."
-msgstr ""
+msgstr "Estas neniu datumo por montri."
 
 #: ../data/gpm-statistics.ui.h:11
 msgid "Use smoothed line"
-msgstr ""
+msgstr "Uzi glatigitan lineon"
 
 #: ../data/gpm-statistics.ui.h:12 ../src/gpm-statistics.c:495
 msgid "Wakeups"
-msgstr ""
+msgstr "Vekoj"
 
 #. Translators: This is %i days
-#: ../src/gpm-graph-widget.c:430
+#: ../src/gpm-graph-widget.c:426
 #, c-format
 msgid "%id"
-msgstr "%i d"
+msgstr "%id"
 
 #. Translators: This is %i days %02i hours
-#: ../src/gpm-graph-widget.c:433
+#: ../src/gpm-graph-widget.c:429
 #, c-format
 msgid "%id%02ih"
-msgstr "%i d %02i h"
+msgstr "%i d %02i h"
 
 #. Translators: This is %i hours
-#: ../src/gpm-graph-widget.c:438
+#: ../src/gpm-graph-widget.c:434
 #, c-format
 msgid "%ih"
-msgstr "%i h"
+msgstr "%i h"
 
 #. Translators: This is %i hours %02i minutes
-#: ../src/gpm-graph-widget.c:441
+#: ../src/gpm-graph-widget.c:437
 #, c-format
 msgid "%ih%02im"
 msgstr "%i h %02i min"
 
 #. Translators: This is %2i minutes
-#: ../src/gpm-graph-widget.c:446
+#: ../src/gpm-graph-widget.c:442
 #, c-format
 msgid "%2im"
 msgstr "%2i min"
 
 #. Translators: This is %2i minutes %02i seconds
-#: ../src/gpm-graph-widget.c:449
+#: ../src/gpm-graph-widget.c:445
 #, c-format
 msgid "%2im%02i"
 msgstr "%02i min %02i"
 
 #. Translators: This is %2i seconds
-#: ../src/gpm-graph-widget.c:453
+#: ../src/gpm-graph-widget.c:449
 #, c-format
 msgid "%2is"
 msgstr "%2i sek"
 
 #. Translators: This is %i Percentage
-#: ../src/gpm-graph-widget.c:457
+#: ../src/gpm-graph-widget.c:453
 #, c-format
 msgid "%i%%"
 msgstr "%i %%"
 
 #. Translators: This is %.1f Watts
-#: ../src/gpm-graph-widget.c:460
+#: ../src/gpm-graph-widget.c:456
 #, c-format
 msgid "%.1fW"
 msgstr "%.1f W"
 
 #. Translators: This is %.1f Volts
-#: ../src/gpm-graph-widget.c:465
+#: ../src/gpm-graph-widget.c:461
 #, c-format
 msgid "%.1fV"
 msgstr "%.1f V"
@@ -281,15 +282,15 @@
 #: ../src/gpm-statistics.c:288
 msgid "AC adapter"
 msgid_plural "AC adapters"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "AK transformilo"
+msgstr[1] "AK transformiloj"
 
 #. TRANSLATORS: laptop primary battery
 #: ../src/gpm-statistics.c:292
 msgid "Laptop battery"
 msgid_plural "Laptop batteries"
 msgstr[0] "Tekkomputila akumulatoro"
-msgstr[1] "Tekkomputilaj baterioj"
+msgstr[1] "Tekkomputilaj akumulatoroj"
 
 #. TRANSLATORS: battery-backed AC power source
 #: ../src/gpm-statistics.c:296
@@ -337,15 +338,15 @@
 #: ../src/gpm-statistics.c:321
 msgid "Media player"
 msgid_plural "Media players"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Aŭdvidaĵa ludilo"
+msgstr[1] "Aŭdvidaĵa ludiloj"
 
 #. TRANSLATORS: tablet device
 #: ../src/gpm-statistics.c:325
 msgid "Tablet"
 msgid_plural "Tablets"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tabulkomputilo"
+msgstr[1] "Tabulkomputiloj"
 
 #. TRANSLATORS: tablet device
 #: ../src/gpm-statistics.c:329
@@ -367,12 +368,12 @@
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:357
 msgid "Lithium Iron Phosphate"
-msgstr "Litia-fera-fosfata"
+msgstr "Litia-fera-fosfata (LiFePO4)"
 
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:361
 msgid "Lead acid"
-msgstr "Plumba-acida"
+msgstr "Plumba-acida (Bp)"
 
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:365
@@ -561,7 +562,7 @@
 
 #: ../src/gpm-statistics.c:760
 msgid "Energy (design)"
-msgstr ""
+msgstr "Energio (fasonado)"
 
 #: ../src/gpm-statistics.c:774
 msgid "Voltage"
@@ -597,17 +598,17 @@
 #. TRANSLATORS: kernel module, usually a device driver
 #: ../src/gpm-statistics.c:1147 ../src/gpm-statistics.c:1152
 msgid "Kernel module"
-msgstr ""
+msgstr "Kerna modulo"
 
 #. TRANSLATORS: kernel housekeeping
 #: ../src/gpm-statistics.c:1157
 msgid "Kernel core"
-msgstr ""
+msgstr "Kerna kerno"
 
 #. TRANSLATORS: interrupt between processors
 #: ../src/gpm-statistics.c:1162
 msgid "Interprocessor interrupt"
-msgstr ""
+msgstr "Interprocessora interrompo"
 
 #. TRANSLATORS: unknown interrupt
 #: ../src/gpm-statistics.c:1167
@@ -617,7 +618,7 @@
 #. TRANSLATORS: the keyboard and mouse device event
 #: ../src/gpm-statistics.c:1214
 msgid "PS/2 keyboard/mouse/touchpad"
-msgstr ""
+msgstr "PS/2-a klavaro/muso/tuŝplato"
 
 #. TRANSLATORS: ACPI, the Intel power standard on laptops and desktops
 #: ../src/gpm-statistics.c:1217
@@ -632,12 +633,12 @@
 #. TRANSLATORS: this is the old-style ATA interface
 #: ../src/gpm-statistics.c:1223
 msgid "ATA host controller"
-msgstr ""
+msgstr "ATAa gastiga regilo"
 
 #. TRANSLATORS: 802.11 wireless adaptor
 #: ../src/gpm-statistics.c:1226
 msgid "Intel wireless adaptor"
-msgstr ""
+msgstr "Intel senkabla adaptilo"
 
 #. TRANSLATORS: a timer is something that fires periodically.
 #. * The parameter is a process name, e.g. "firefox-bin".
@@ -647,7 +648,7 @@
 #: ../src/gpm-statistics.c:1253
 #, c-format
 msgid "Timer %s"
-msgstr ""
+msgstr "Minutatoro %s"
 
 #. TRANSLATORS: the parameter is the name of task that's woken up from sleeping.
 #. * This is shown when the task wakes up.
@@ -674,35 +675,35 @@
 #: ../src/gpm-statistics.c:1268 ../src/gpm-statistics.c:1272
 #, c-format
 msgid "Work queue %s"
-msgstr ""
+msgstr "Labora atendovico %s"
 
 #. TRANSLATORS: this is when the networking subsystem clears out old entries
 #: ../src/gpm-statistics.c:1275
 #, c-format
 msgid "Network route flush %s"
-msgstr ""
+msgstr "Reta vojo elbufrigo %s"
 
 #. TRANSLATORS: this is the name of an activity on the USB bus
 #: ../src/gpm-statistics.c:1278
 #, c-format
 msgid "USB activity %s"
-msgstr ""
+msgstr "USBa aktiveco %s"
 
 #. TRANSLATORS: we've timed out of an aligned timer, with the name
 #: ../src/gpm-statistics.c:1281
 #, c-format
 msgid "Wakeup %s"
-msgstr ""
+msgstr "Veko %s"
 
 #. TRANSLATORS: interupts on the system required for basic operation
 #: ../src/gpm-statistics.c:1284
 msgid "Local interrupts"
-msgstr ""
+msgstr "Lokaj interrompoj"
 
 #. TRANSLATORS: interrupts when a task gets moved from one core to another
 #: ../src/gpm-statistics.c:1287
 msgid "Rescheduling interrupts"
-msgstr ""
+msgstr "Interrompoj de replanigo"
 
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1396
@@ -712,7 +713,7 @@
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1398
 msgid "Device History"
-msgstr ""
+msgstr "Aparathistorio"
 
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1400
@@ -722,13 +723,13 @@
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1402
 msgid "Processor Wakeups"
-msgstr ""
+msgstr "Procesora vekoj"
 
 #. TRANSLATORS: this is the X axis on the graph
 #: ../src/gpm-statistics.c:1598 ../src/gpm-statistics.c:1604
 #: ../src/gpm-statistics.c:1610 ../src/gpm-statistics.c:1616
 msgid "Time elapsed"
-msgstr ""
+msgstr "Tempo pasita"
 
 #. TRANSLATORS: this is the Y axis on the graph
 #: ../src/gpm-statistics.c:1600
@@ -741,22 +742,22 @@
 #: ../src/gpm-statistics.c:1655 ../src/gpm-statistics.c:1661
 #: ../src/gpm-statistics.c:1667
 msgid "Cell charge"
-msgstr ""
+msgstr "Energiĉela ŝargo"
 
 #. TRANSLATORS: this is the Y axis on the graph
 #: ../src/gpm-statistics.c:1612 ../src/gpm-statistics.c:1618
 msgid "Predicted time"
-msgstr ""
+msgstr "Prognozita tempo"
 
 #. TRANSLATORS: this is the Y axis on the graph
 #: ../src/gpm-statistics.c:1651 ../src/gpm-statistics.c:1663
 msgid "Correction factor"
-msgstr ""
+msgstr "Ĝustiga faktoro"
 
 #. TRANSLATORS: this is the Y axis on the graph
 #: ../src/gpm-statistics.c:1657 ../src/gpm-statistics.c:1669
 msgid "Prediction accuracy"
-msgstr ""
+msgstr "Prognoza precizo"
 
 #. TRANSLATORS: show verbose debugging
 #: ../src/gpm-statistics.c:1848
@@ -766,7 +767,7 @@
 #. TRANSLATORS: show a device by default
 #: ../src/gpm-statistics.c:1851
 msgid "Select this device at startup"
-msgstr ""
+msgstr "Elekti ĉi-tiun aparaton ĉe startigo"
 
 #. TRANSLATORS: the icon for the CPU
 #: ../src/gpm-statistics.c:2111
diff -Nru gnome-power-manager-3.3.3/po/fa.po gnome-power-manager-3.3.92/po/fa.po
--- gnome-power-manager-3.3.3/po/fa.po	2011-08-05 09:23:31.000000000 +0000
+++ gnome-power-manager-3.3.92/po/fa.po	2012-03-10 15:18:44.000000000 +0000
@@ -5,102 +5,97 @@
 # Meelad Zakaria <meelad@farsiweb.info>, 2006.
 # Elnaz Sarbar <elnaz@farsiweb.info>, 2006.
 # Farzaneh Sarafraz <farzaneh@farsiweb.info>, 2006.
-# Arash Mousavi <mousavi.arash@gmil.com>, 2010.
 # Mahyar Moghimi <mahyar.moqimi@gmail.com>, 2011.
+# Arash Mousavi <mousavi.arash@gmil.com>, 2010, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-power-manager VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 10:10+0100\n"
-"PO-Revision-Date: 2011-02-13 14:58+0330\n"
-"Last-Translator: Mahyar Moghimi <mahyar.moqimi@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-power-manager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-19 11:00+0000\n"
+"PO-Revision-Date: 2012-03-10 15:35+0330\n"
+"Last-Translator: Arash Mousavi <mousavi.arash@gmail.com>\n"
 "Language-Team: Persian\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Persian\n"
+"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:1
 msgid "The ID of the last device selected"
-msgstr ""
+msgstr "شناسه آخرین دستگاه انتخاب شده"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:2
 msgid "The default graph type to show for history"
-msgstr ""
+msgstr "نوع گراف پیش‌فرض جهت نمایش برای تاریخچه"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:3
 msgid "The default graph type to show for stats"
-msgstr ""
+msgstr "نوع گراف پیش‌فرض جهت نمایش آمارها"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:4
 msgid "The default graph type to show in the history window."
-msgstr ""
+msgstr "نوع گراف پیش‌فرض جهت نمایش در پنجره تاریخچه."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:5
 msgid "The default graph type to show in the stats window."
-msgstr ""
+msgstr "نوع گراف پیش‌فرض جهت نمایش در پنجره‌ی آمارها."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:6
-msgid ""
-"The identifier of the last device which is used to return focus to the "
-"correct device."
-msgstr ""
+msgid "The identifier of the last device which is used to return focus to the correct device."
+msgstr "شناساگر آخرین دستگاهی که جهت برگرداندن توجه به دستگاه صحیح از آن استفاده شده بود."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:7
 msgid "The index of the page number to show by default"
-msgstr ""
+msgstr "اندیس شماره صفحه جهت نمایش به‌طور پیش‌فرض"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:8
-msgid ""
-"The index of the page number to show by default which is used to return "
-"focus to the correct page."
-msgstr ""
+msgid "The index of the page number to show by default which is used to return focus to the correct page."
+msgstr "اندیس شماره صفحه جهت نمایش به‌طور پیش‌فرض که جهت برگرداندن توجه به صفحه صحیح از آن استفاده شده."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:9
-#, fuzzy
-msgid ""
-"The maximum duration of time displayed on the x-axis of the history graph."
-msgstr "حداکثر مدت زمان نمایش داده شده در محور x نمودار."
+msgid "The maximum duration of time displayed on the x-axis of the history graph."
+msgstr "حداکثر مدت زمان نمایش داده شده در محور x نمودار از گراف تاریخچه."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:10
-#, fuzzy
 msgid "The maximum time displayed for history"
-msgstr "حداکثر زمان نمایش داده شده در نمودار"
+msgstr "حداکثر زمان نمایش داده شده برای تاریخچه"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:11
 msgid "Whether we should show the history data points"
-msgstr ""
+msgstr "اینکه آیا باید اطلاعات نقطه‌ای تاریخچه نمایش داده شود یا خیر"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:12
-msgid ""
-"Whether we should show the history data points in the statistics window."
-msgstr ""
+msgid "Whether we should show the history data points in the statistics window."
+msgstr "اینکه آیا باید اطلاعات نقطه‌ای تاریخچه در پنجره‌ی آمارها نمایش داده شود یا خیر."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:13
 msgid "Whether we should show the stats data points"
-msgstr ""
+msgstr "اینکه آیا باید اطلاعات نقطه‌ای آمار نمایش داده شود یا خیر"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:14
 msgid "Whether we should show the stats data points in the statistics window."
-msgstr ""
+msgstr "اینکه آیا باید اطلاعات نقطه‌ای آمار در پنجره‌ی آمارها نمایش داده شود یا خیر"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:15
 msgid "Whether we should smooth the history data"
-msgstr ""
+msgstr "اینکه آیا باید اطلاعات تاریخچه را در گراف روان‌تر کنیم یا خیر."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:16
 msgid "Whether we should smooth the history data in the graph."
-msgstr ""
+msgstr "اینکه آیا باید اطلاعات تاریخچه را در گراف روان‌تر کنیم یا خیر."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:17
 msgid "Whether we should smooth the stats data"
-msgstr ""
+msgstr "اینکه آیا باید اطلاعات آمارها را روان‌تر کنیم یا خیر"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:18
 msgid "Whether we should smooth the stats data in the graph."
-msgstr ""
+msgstr "اینکه آیا باید اطلاعات آمارها در گراف روان‌تر شوند یا خیر."
 
 #: ../data/gnome-power-statistics.desktop.in.in.h:1
 msgid "Observe power management"
@@ -109,7 +104,8 @@
 #. TRANSLATORS: shown on the titlebar
 #. TRANSLATORS: the program name
 #: ../data/gnome-power-statistics.desktop.in.in.h:2
-#: ../data/gpm-statistics.ui.h:6 ../src/gpm-statistics.c:1406
+#: ../data/gpm-statistics.ui.h:6
+#: ../src/gpm-statistics.c:1406
 #: ../src/gpm-statistics.c:1860
 msgid "Power Statistics"
 msgstr "آمار و ارقام انرژی"
@@ -122,7 +118,8 @@
 msgid "Data length:"
 msgstr "طول داده‌ها:"
 
-#: ../data/gpm-statistics.ui.h:3 ../src/gpm-statistics.c:509
+#: ../data/gpm-statistics.ui.h:3
+#: ../src/gpm-statistics.c:509
 msgid "Details"
 msgstr "جزئیات"
 
@@ -154,72 +151,74 @@
 msgid "Use smoothed line"
 msgstr "استفاده از سطر روان"
 
-#: ../data/gpm-statistics.ui.h:12 ../src/gpm-statistics.c:495
+#: ../data/gpm-statistics.ui.h:12
+#: ../src/gpm-statistics.c:495
 msgid "Wakeups"
 msgstr "بیدارشدنی‌ها"
 
 #. Translators: This is %i days
-#: ../src/gpm-graph-widget.c:430
+#: ../src/gpm-graph-widget.c:426
 #, c-format
 msgid "%id"
 msgstr "%Ii روز"
 
 #. Translators: This is %i days %02i hours
-#: ../src/gpm-graph-widget.c:433
+#: ../src/gpm-graph-widget.c:429
 #, c-format
 msgid "%id%02ih"
 msgstr "%Iiروز%I02iساعت"
 
 #. Translators: This is %i hours
-#: ../src/gpm-graph-widget.c:438
+#: ../src/gpm-graph-widget.c:434
 #, c-format
 msgid "%ih"
 msgstr "%Ii ساعت"
 
 #. Translators: This is %i hours %02i minutes
-#: ../src/gpm-graph-widget.c:441
+#: ../src/gpm-graph-widget.c:437
 #, c-format
 msgid "%ih%02im"
 msgstr "%Iiساعت%I02iدقیقه"
 
 #. Translators: This is %2i minutes
-#: ../src/gpm-graph-widget.c:446
+#: ../src/gpm-graph-widget.c:442
 #, c-format
 msgid "%2im"
 msgstr "%I2i دقیقه"
 
 #. Translators: This is %2i minutes %02i seconds
-#: ../src/gpm-graph-widget.c:449
+#: ../src/gpm-graph-widget.c:445
 #, c-format
 msgid "%2im%02i"
 msgstr "%I2iدقیقه%I02iثانیه"
 
 #. Translators: This is %2i seconds
-#: ../src/gpm-graph-widget.c:453
+#: ../src/gpm-graph-widget.c:449
 #, c-format
 msgid "%2is"
 msgstr "%I2iثانیه"
 
 #. Translators: This is %i Percentage
-#: ../src/gpm-graph-widget.c:457
+#: ../src/gpm-graph-widget.c:453
 #, c-format
 msgid "%i%%"
 msgstr "%i%%"
 
 #. Translators: This is %.1f Watts
-#: ../src/gpm-graph-widget.c:460
+#: ../src/gpm-graph-widget.c:456
 #, c-format
 msgid "%.1fW"
 msgstr "%I.1f وات"
 
 #. Translators: This is %.1f Volts
-#: ../src/gpm-graph-widget.c:465
+#: ../src/gpm-graph-widget.c:461
 #, c-format
 msgid "%.1fV"
 msgstr "%I.1f ولت"
 
 #. TRANSLATORS: the rate of discharge for the device
-#: ../src/gpm-statistics.c:80 ../src/gpm-statistics.c:767
+#: ../src/gpm-statistics.c:80
+#: ../src/gpm-statistics.c:767
 msgid "Rate"
 msgstr "سرعت"
 
@@ -227,11 +226,13 @@
 msgid "Charge"
 msgstr "پرشدن"
 
-#: ../src/gpm-statistics.c:82 ../src/gpm-statistics.c:781
+#: ../src/gpm-statistics.c:82
+#: ../src/gpm-statistics.c:781
 msgid "Time to full"
 msgstr "زمان باقی‌مانده تا  پر شدن"
 
-#: ../src/gpm-statistics.c:83 ../src/gpm-statistics.c:786
+#: ../src/gpm-statistics.c:83
+#: ../src/gpm-statistics.c:786
 msgid "Time to empty"
 msgstr "زمان باقی‌مانده تا خالی شدن"
 
@@ -420,7 +421,8 @@
 msgid "Description"
 msgstr "توضیح"
 
-#: ../src/gpm-statistics.c:482 ../src/gpm-statistics.c:706
+#: ../src/gpm-statistics.c:482
+#: ../src/gpm-statistics.c:706
 msgid "Type"
 msgstr "نوع"
 
@@ -575,7 +577,8 @@
 msgstr "بدون داده"
 
 #. TRANSLATORS: kernel module, usually a device driver
-#: ../src/gpm-statistics.c:1147 ../src/gpm-statistics.c:1152
+#: ../src/gpm-statistics.c:1147
+#: ../src/gpm-statistics.c:1152
 msgid "Kernel module"
 msgstr "ماژول کرنل"
 
@@ -622,8 +625,10 @@
 #. TRANSLATORS: a timer is something that fires periodically.
 #. * The parameter is a process name, e.g. "firefox-bin".
 #. * This is shown when the timer wakes up.
-#: ../src/gpm-statistics.c:1233 ../src/gpm-statistics.c:1238
-#: ../src/gpm-statistics.c:1243 ../src/gpm-statistics.c:1248
+#: ../src/gpm-statistics.c:1233
+#: ../src/gpm-statistics.c:1238
+#: ../src/gpm-statistics.c:1243
+#: ../src/gpm-statistics.c:1248
 #: ../src/gpm-statistics.c:1253
 #, c-format
 msgid "Timer %s"
@@ -651,7 +656,8 @@
 
 #. TRANSLATORS: this is the name of a work queue.
 #. * A work queue is a list of work that has to be done.
-#: ../src/gpm-statistics.c:1268 ../src/gpm-statistics.c:1272
+#: ../src/gpm-statistics.c:1268
+#: ../src/gpm-statistics.c:1272
 #, c-format
 msgid "Work queue %s"
 msgstr "صف کار %s"
@@ -705,8 +711,10 @@
 msgstr "بیدارشدن‌های پردازنده"
 
 #. TRANSLATORS: this is the X axis on the graph
-#: ../src/gpm-statistics.c:1598 ../src/gpm-statistics.c:1604
-#: ../src/gpm-statistics.c:1610 ../src/gpm-statistics.c:1616
+#: ../src/gpm-statistics.c:1598
+#: ../src/gpm-statistics.c:1604
+#: ../src/gpm-statistics.c:1610
+#: ../src/gpm-statistics.c:1616
 msgid "Time elapsed"
 msgstr "زمان سپری شده"
 
@@ -717,24 +725,29 @@
 
 #. TRANSLATORS: this is the Y axis on the graph for the whole battery device
 #. TRANSLATORS: this is the X axis on the graph for the whole battery device
-#: ../src/gpm-statistics.c:1606 ../src/gpm-statistics.c:1649
-#: ../src/gpm-statistics.c:1655 ../src/gpm-statistics.c:1661
+#: ../src/gpm-statistics.c:1606
+#: ../src/gpm-statistics.c:1649
+#: ../src/gpm-statistics.c:1655
+#: ../src/gpm-statistics.c:1661
 #: ../src/gpm-statistics.c:1667
 msgid "Cell charge"
 msgstr "پرشدن سلول"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1612 ../src/gpm-statistics.c:1618
+#: ../src/gpm-statistics.c:1612
+#: ../src/gpm-statistics.c:1618
 msgid "Predicted time"
 msgstr "زمان پیش‌بینی شده"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1651 ../src/gpm-statistics.c:1663
+#: ../src/gpm-statistics.c:1651
+#: ../src/gpm-statistics.c:1663
 msgid "Correction factor"
 msgstr "ضریب اصلاحی"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1657 ../src/gpm-statistics.c:1669
+#: ../src/gpm-statistics.c:1657
+#: ../src/gpm-statistics.c:1669
 msgid "Prediction accuracy"
 msgstr "دقت پیش‌گویی"
 
@@ -752,3 +765,4 @@
 #: ../src/gpm-statistics.c:2111
 msgid "Processor"
 msgstr "پردازنده"
+
diff -Nru gnome-power-manager-3.3.3/po/fi.po gnome-power-manager-3.3.92/po/fi.po
--- gnome-power-manager-3.3.3/po/fi.po	2011-08-05 09:23:31.000000000 +0000
+++ gnome-power-manager-3.3.92/po/fi.po	2012-03-12 17:18:43.000000000 +0000
@@ -10,226 +10,212 @@
 # hibernate = lepotila
 # sleep = virransäästötila (kattotermi kahdelle edelliselle)
 #
+# Gnome 2012-03 Finnish translation sprint participants:
+# Elias Aarnio
+# Jl
+# Niklas Laxström
 msgid ""
 msgstr ""
+""
 "Project-Id-Version: gnome-power-manager\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 10:10+0100\n"
-"PO-Revision-Date: 2010-09-13 09:14+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-power-manager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-19 11:00+0000\n"
+"PO-Revision-Date: 2012-03-12 08:37:05+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@gmail.com>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2010-09-13 15:09+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"X-Generator: MediaWiki 1.20alpha (r113129); Translate 2012-03-02\n"
+"X-POT-Import-Date: 2012-02-19 15:16:15+0000\n"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:1
-msgid "The ID of the last device selected"
-msgstr ""
+msgid "Whether we should show the history data points"
+msgstr "Näytetäänkö menneitä mittauspisteitä"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:2
-#, fuzzy
-msgid "The default graph type to show for history"
-msgstr "Tilastoikkunassa näytettävän käyrän oletustyyppi"
+msgid "Whether we should show the history data points in the statistics window."
+msgstr "Näytetäänkö menneitä mittauspisteitä tilastoikkunassa."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:3
-#, fuzzy
-msgid "The default graph type to show for stats"
-msgstr "Tilastoikkunassa näytettävän käyrän oletustyyppi"
+msgid "Whether we should smooth the history data"
+msgstr "Pehmennetäänkö menneiden mittaustulosten käyrä"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:4
-#, fuzzy
-msgid "The default graph type to show in the history window."
-msgstr "Tilastoikkunassa näytettävän käyrän oletustyyppi."
+msgid "Whether we should smooth the history data in the graph."
+msgstr "Pehmennetäänkö menneiden mittaustulosten käyrä kuvaajissa."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:5
-#, fuzzy
-msgid "The default graph type to show in the stats window."
-msgstr "Tilastoikkunassa näytettävän käyrän oletustyyppi."
+msgid "The default graph type to show for history"
+msgstr "Menneiden mittausten kuvaajan oletustyyppi"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:6
-msgid ""
-"The identifier of the last device which is used to return focus to the "
-"correct device."
-msgstr ""
+msgid "The default graph type to show in the history window."
+msgstr "Historiaikkunassa näytettävän kuvaajan oletustyyppi."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:7
-msgid "The index of the page number to show by default"
-msgstr ""
+msgid "The maximum time displayed for history"
+msgstr "Historian enimmäispituus"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:8
-msgid ""
-"The index of the page number to show by default which is used to return "
-"focus to the correct page."
-msgstr ""
+msgid "The maximum duration of time displayed on the x-axis of the history graph."
+msgstr "Kuinka pitkältä ajalta tuloksia näytetään enintään historiakuvaajien x-akselilla."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:9
-#, fuzzy
-msgid ""
-"The maximum duration of time displayed on the x-axis of the history graph."
-msgstr "Käyrän x-akselilla näytettävän ajan enimmäisaika."
+msgid "Whether we should show the stats data points"
+msgstr "Näytetäänkö tilastomittauspisteet"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:10
-#, fuzzy
-msgid "The maximum time displayed for history"
-msgstr "Käyrällä näytetyn ajan enimmäisaika"
+msgid "Whether we should show the stats data points in the statistics window."
+msgstr "Näytetäänkö tilastomittauspisteitä tilastoikkunassa."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:11
-#, fuzzy
-msgid "Whether we should show the history data points"
-msgstr "Pehmennetäänkö käyrässä näytettävä tieto"
+msgid "Whether we should smooth the stats data"
+msgstr "Pehmennetäänkö tilastomittaustulosten käyrä"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:12
-#, fuzzy
-msgid ""
-"Whether we should show the history data points in the statistics window."
-msgstr "Näytetäänkö tapahtumat tilastoikkunassa."
+msgid "Whether we should smooth the stats data in the graph."
+msgstr "Pehmennetäänkö tilastomittaustulosten käyrä kuvaajissa."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:13
-#, fuzzy
-msgid "Whether we should show the stats data points"
-msgstr "Pehmennetäänkö käyrässä näytettävä tieto"
+msgid "The default graph type to show for stats"
+msgstr "Tilastomittausten kuvaajan oletustyyppi"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:14
-#, fuzzy
-msgid "Whether we should show the stats data points in the statistics window."
-msgstr "Näytetäänkö tapahtumat tilastoikkunassa."
+msgid "The default graph type to show in the stats window."
+msgstr "Minkälaista kuvaajaa käytetään oletuksena tilastoikkunassa."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:15
-#, fuzzy
-msgid "Whether we should smooth the history data"
-msgstr "Pehmennetäänkö käyrässä näytettävä tieto"
+msgid "The index of the page number to show by default"
+msgstr "Viimeksi avoinna olleen sivun numero"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:16
-#, fuzzy
-msgid "Whether we should smooth the history data in the graph."
-msgstr "Pehmennetäänkö käyrässä näytettävä tieto."
+msgid "The index of the page number to show by default which is used to return focus to the correct page."
+msgstr "Viimeksi avoinna olleen sivun numero, jota käytetään palauttamaan edellinen tila."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:17
-#, fuzzy
-msgid "Whether we should smooth the stats data"
-msgstr "Pehmennetäänkö käyrässä näytettävä tieto"
+msgid "The ID of the last device selected"
+msgstr "Viimeksi valitun laitteen tunnus"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:18
-#, fuzzy
-msgid "Whether we should smooth the stats data in the graph."
-msgstr "Pehmennetäänkö käyrässä näytettävä tieto."
-
-#: ../data/gnome-power-statistics.desktop.in.in.h:1
-msgid "Observe power management"
-msgstr "Tarkkaile virrankäytön hallintaa"
+msgid "The identifier of the last device which is used to return focus to the correct device."
+msgstr "Viimeksi valitun laitteen tunnus, jota käytetään palauttamaan edellinen tila."
 
 #. TRANSLATORS: shown on the titlebar
 #. TRANSLATORS: the program name
-#: ../data/gnome-power-statistics.desktop.in.in.h:2
-#: ../data/gpm-statistics.ui.h:6 ../src/gpm-statistics.c:1406
+#: ../data/gnome-power-statistics.desktop.in.in.h:1
+#: ../data/gpm-statistics.ui.h:1 ../src/gpm-statistics.c:1406
 #: ../src/gpm-statistics.c:1860
 msgid "Power Statistics"
 msgstr "Virrankäytön tilastot"
 
-#: ../data/gpm-statistics.ui.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/gpm-statistics.ui.h:2
-msgid "Data length:"
-msgstr "Datan pituus:"
+#: ../data/gnome-power-statistics.desktop.in.in.h:2
+msgid "Observe power management"
+msgstr "Tarkkaile virrankäyttöä"
 
-#: ../data/gpm-statistics.ui.h:3 ../src/gpm-statistics.c:509
+#: ../data/gpm-statistics.ui.h:2 ../src/gpm-statistics.c:509
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: ../data/gpm-statistics.ui.h:4
+#: ../data/gpm-statistics.ui.h:3
 msgid "Graph type:"
-msgstr "Käyrän tyyppi:"
+msgstr "Kuvaajan tyyppi:"
+
+#: ../data/gpm-statistics.ui.h:4
+msgid "Data length:"
+msgstr "Datan pituus:"
 
 #: ../data/gpm-statistics.ui.h:5
-msgid "History"
-msgstr "Historia"
+msgid "There is no data to display."
+msgstr "Ei mitään näytettävää."
 
-#: ../data/gpm-statistics.ui.h:7
-msgid "Processor wakeups per second:"
-msgstr "Prosessorin herätyskerrat sekunnissa:"
+#: ../data/gpm-statistics.ui.h:6
+msgid "Use smoothed line"
+msgstr "Pehmennetty viiva"
 
-#: ../data/gpm-statistics.ui.h:8
+#: ../data/gpm-statistics.ui.h:7
 msgid "Show data points"
 msgstr "Näytä datapisteet"
 
+#: ../data/gpm-statistics.ui.h:8
+msgid "History"
+msgstr "Historia"
+
 #: ../data/gpm-statistics.ui.h:9
 msgid "Statistics"
 msgstr "Tilastot"
 
 #: ../data/gpm-statistics.ui.h:10
-msgid "There is no data to display."
-msgstr "Mitään näytettävää tietoa ei ole."
+msgid "Processor wakeups per second:"
+msgstr "Suorittimen heräämisiä sekunnissa:"
 
 #: ../data/gpm-statistics.ui.h:11
-msgid "Use smoothed line"
-msgstr "Käytä pehmennettyä viivaa"
+msgid "0"
+msgstr "0"
 
 #: ../data/gpm-statistics.ui.h:12 ../src/gpm-statistics.c:495
 msgid "Wakeups"
-msgstr "Herätykset"
+msgstr "Heräämiset"
 
 #. Translators: This is %i days
-#: ../src/gpm-graph-widget.c:430
+#: ../src/gpm-graph-widget.c:426
 #, c-format
 msgid "%id"
-msgstr "%i d"
+msgstr "%i pv"
 
 #. Translators: This is %i days %02i hours
-#: ../src/gpm-graph-widget.c:433
+#: ../src/gpm-graph-widget.c:429
 #, c-format
 msgid "%id%02ih"
-msgstr "%i d %02i h"
+msgstr "%i pv %02i h"
 
 #. Translators: This is %i hours
-#: ../src/gpm-graph-widget.c:438
+#: ../src/gpm-graph-widget.c:434
 #, c-format
 msgid "%ih"
 msgstr "%i h"
 
 #. Translators: This is %i hours %02i minutes
-#: ../src/gpm-graph-widget.c:441
+#: ../src/gpm-graph-widget.c:437
 #, c-format
 msgid "%ih%02im"
 msgstr "%i h %02i min"
 
 #. Translators: This is %2i minutes
-#: ../src/gpm-graph-widget.c:446
+#: ../src/gpm-graph-widget.c:442
 #, c-format
 msgid "%2im"
 msgstr "%2i min"
 
 #. Translators: This is %2i minutes %02i seconds
-#: ../src/gpm-graph-widget.c:449
+#: ../src/gpm-graph-widget.c:445
 #, c-format
 msgid "%2im%02i"
 msgstr "%2i min %02i s"
 
 #. Translators: This is %2i seconds
-#: ../src/gpm-graph-widget.c:453
+#: ../src/gpm-graph-widget.c:449
 #, c-format
 msgid "%2is"
 msgstr "%2i s"
 
 #. Translators: This is %i Percentage
-#: ../src/gpm-graph-widget.c:457
+#: ../src/gpm-graph-widget.c:453
 #, c-format
 msgid "%i%%"
 msgstr "%i %%"
 
 #. Translators: This is %.1f Watts
-#: ../src/gpm-graph-widget.c:460
+#: ../src/gpm-graph-widget.c:456
 #, c-format
 msgid "%.1fW"
 msgstr "%.1f W"
 
 #. Translators: This is %.1f Volts
-#: ../src/gpm-graph-widget.c:465
+#: ../src/gpm-graph-widget.c:461
 #, c-format
 msgid "%.1fV"
 msgstr "%.1f V"
@@ -237,11 +223,11 @@
 #. TRANSLATORS: the rate of discharge for the device
 #: ../src/gpm-statistics.c:80 ../src/gpm-statistics.c:767
 msgid "Rate"
-msgstr "Nopeus"
+msgstr "Kulutusnopeus"
 
 #: ../src/gpm-statistics.c:81
 msgid "Charge"
-msgstr "Latausaika"
+msgstr "Lataus"
 
 #: ../src/gpm-statistics.c:82 ../src/gpm-statistics.c:781
 msgid "Time to full"
@@ -336,7 +322,7 @@
 msgid "PDA"
 msgid_plural "PDAs"
 msgstr[0] "PDA"
-msgstr[1] "PDAt"
+msgstr[1] "PDA:t"
 
 #. TRANSLATORS: cell phone (mobile...)
 #: ../src/gpm-statistics.c:316
@@ -356,8 +342,8 @@
 #: ../src/gpm-statistics.c:325
 msgid "Tablet"
 msgid_plural "Tablets"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Taulutietokone"
+msgstr[1] "Taulutietokoneet"
 
 #. TRANSLATORS: tablet device
 #: ../src/gpm-statistics.c:329
@@ -384,7 +370,7 @@
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:361
 msgid "Lead acid"
-msgstr "Lyijyhappo"
+msgstr "Lyijyakku"
 
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:365
@@ -424,12 +410,12 @@
 #. TRANSLATORS: battery state
 #: ../src/gpm-statistics.c:409
 msgid "Waiting to charge"
-msgstr ""
+msgstr "Odotetaan latautumista"
 
 #. TRANSLATORS: battery state
 #: ../src/gpm-statistics.c:413
 msgid "Waiting to discharge"
-msgstr ""
+msgstr "Odotetaan purkautumista"
 
 #: ../src/gpm-statistics.c:433
 msgid "Attribute"
@@ -462,7 +448,7 @@
 #. TRANSLATORS: this is when the stats time is not known
 #: ../src/gpm-statistics.c:587
 msgid "Unknown"
-msgstr "Tuntematon aika"
+msgstr "Tuntematon"
 
 #. TRANSLATORS: this is a time value, usually to show on a graph
 #: ../src/gpm-statistics.c:591
@@ -552,7 +538,7 @@
 #. * batteries rather than alkaline ones
 #: ../src/gpm-statistics.c:741
 msgid "Rechargeable"
-msgstr "Uudelleenladattavissa"
+msgstr "Ladattava"
 
 #. TRANSLATORS: The state of the device, e.g. "Changing" or "Fully charged"
 #: ../src/gpm-statistics.c:747
@@ -582,7 +568,7 @@
 #. TRANSLATORS: the amount of charge the cell contains
 #: ../src/gpm-statistics.c:796
 msgid "Percentage"
-msgstr "Prosenttia"
+msgstr "Latausaste"
 
 #. TRANSLATORS: the capacity of the device, which is basically a measure
 #. * of how full it can get, relative to the design capacity
@@ -614,12 +600,12 @@
 #. TRANSLATORS: kernel housekeeping
 #: ../src/gpm-statistics.c:1157
 msgid "Kernel core"
-msgstr "Ytimen core"
+msgstr "Ydin itse"
 
 #. TRANSLATORS: interrupt between processors
 #: ../src/gpm-statistics.c:1162
 msgid "Interprocessor interrupt"
-msgstr "Prosessorien välinen keskeytys"
+msgstr "Suorittimien välinen keskeytys"
 
 #. TRANSLATORS: unknown interrupt
 #: ../src/gpm-statistics.c:1167
@@ -629,7 +615,7 @@
 #. TRANSLATORS: the keyboard and mouse device event
 #: ../src/gpm-statistics.c:1214
 msgid "PS/2 keyboard/mouse/touchpad"
-msgstr "PS/2-näppäimistö, -hiiri tai -sormio"
+msgstr "PS/2-näppäimistö, -hiiri tai -kosketusalusta"
 
 #. TRANSLATORS: ACPI, the Intel power standard on laptops and desktops
 #: ../src/gpm-statistics.c:1217
@@ -639,17 +625,17 @@
 #. TRANSLATORS: serial ATA is a new style of hard disk interface
 #: ../src/gpm-statistics.c:1220
 msgid "Serial ATA"
-msgstr "Serial-ATA"
+msgstr "Sarja-ATA (SATA)"
 
 #. TRANSLATORS: this is the old-style ATA interface
 #: ../src/gpm-statistics.c:1223
 msgid "ATA host controller"
-msgstr "ATA-ohjain"
+msgstr "ATA-isäntäohjain"
 
 #. TRANSLATORS: 802.11 wireless adaptor
 #: ../src/gpm-statistics.c:1226
 msgid "Intel wireless adaptor"
-msgstr "Intel langaton sovitin"
+msgstr "Intelin langaton sovitin"
 
 #. TRANSLATORS: a timer is something that fires periodically.
 #. * The parameter is a process name, e.g. "firefox-bin".
@@ -679,7 +665,7 @@
 #: ../src/gpm-statistics.c:1264
 #, c-format
 msgid "Wait %s"
-msgstr "Odota %s"
+msgstr "Odotus %s"
 
 #. TRANSLATORS: this is the name of a work queue.
 #. * A work queue is a list of work that has to be done.
@@ -714,7 +700,7 @@
 #. TRANSLATORS: interrupts when a task gets moved from one core to another
 #: ../src/gpm-statistics.c:1287
 msgid "Rescheduling interrupts"
-msgstr "Uudelleenjärjestetään keskeytyksiä"
+msgstr "Keskeytysten uudelleenjärjestely"
 
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1396
@@ -734,7 +720,7 @@
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1402
 msgid "Processor Wakeups"
-msgstr "Prosessorin herätykset"
+msgstr "Suorittimen heräämiset"
 
 #. TRANSLATORS: this is the X axis on the graph
 #: ../src/gpm-statistics.c:1598 ../src/gpm-statistics.c:1604
@@ -758,7 +744,7 @@
 #. TRANSLATORS: this is the Y axis on the graph
 #: ../src/gpm-statistics.c:1612 ../src/gpm-statistics.c:1618
 msgid "Predicted time"
-msgstr "Arvioitu aika"
+msgstr "Aikaennuste"
 
 #. TRANSLATORS: this is the Y axis on the graph
 #: ../src/gpm-statistics.c:1651 ../src/gpm-statistics.c:1663
@@ -768,12 +754,12 @@
 #. TRANSLATORS: this is the Y axis on the graph
 #: ../src/gpm-statistics.c:1657 ../src/gpm-statistics.c:1669
 msgid "Prediction accuracy"
-msgstr "Ennustukseen tarkkuus"
+msgstr "Ennustuksen tarkkuus"
 
 #. TRANSLATORS: show verbose debugging
 #: ../src/gpm-statistics.c:1848
 msgid "Show extra debugging information"
-msgstr "Näytä ylimääräisiä virheenjäljitystietoja"
+msgstr "Näytä ylimääräiset virheenjäljitystiedot"
 
 #. TRANSLATORS: show a device by default
 #: ../src/gpm-statistics.c:1851
@@ -781,6 +767,7 @@
 msgstr "Valitse tämä laite käynnistettäessä"
 
 #. TRANSLATORS: the icon for the CPU
-#: ../src/gpm-statistics.c:2111
+#: ../src/gpm-statistics.c:2113
 msgid "Processor"
-msgstr "Prosessori"
+msgstr "Suoritin"
+
diff -Nru gnome-power-manager-3.3.3/po/Makefile.in.in gnome-power-manager-3.3.92/po/Makefile.in.in
--- gnome-power-manager-3.3.3/po/Makefile.in.in	2011-09-09 07:37:23.000000000 +0000
+++ gnome-power-manager-3.3.92/po/Makefile.in.in	2012-02-22 15:19:40.000000000 +0000
@@ -49,8 +49,8 @@
 XGETTEXT = @XGETTEXT@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
 
 ALL_LINGUAS = @ALL_LINGUAS@
 
diff -Nru gnome-power-manager-3.3.3/po/mk.po gnome-power-manager-3.3.92/po/mk.po
--- gnome-power-manager-3.3.3/po/mk.po	2011-08-05 09:23:32.000000000 +0000
+++ gnome-power-manager-3.3.92/po/mk.po	2012-01-09 09:16:51.000000000 +0000
@@ -9,113 +9,89 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 10:10+0100\n"
-"PO-Revision-Date: 2008-02-24 00:16+0100\n"
-"Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-power-manager&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-19 11:00+0000\n"
+"PO-Revision-Date: 2012-01-08 18:37+0100\n"
+"Last-Translator: Jovan N\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
-"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:1
 msgid "The ID of the last device selected"
-msgstr ""
+msgstr "ID на последно избраниот уред"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:2
-#, fuzzy
 msgid "The default graph type to show for history"
-msgstr ""
-"Стандардниот тип на графикон за прикажување во прозорецот за статистики"
+msgstr "Стандардниот тип на графикон за прикажување на историјата"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:3
-#, fuzzy
 msgid "The default graph type to show for stats"
-msgstr ""
-"Стандардниот тип на графикон за прикажување во прозорецот за статистики"
+msgstr "Стандардниот тип на графикон за прикажување во прозорецот за статистики"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:4
-#, fuzzy
 msgid "The default graph type to show in the history window."
-msgstr ""
-"Стандардниот тип на графикон за прикажување во прозорецот за статистика."
+msgstr "Стандардниот тип на графикон за прикажување во прозорецот за историја."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:5
-#, fuzzy
 msgid "The default graph type to show in the stats window."
-msgstr ""
-"Стандардниот тип на графикон за прикажување во прозорецот за статистика."
+msgstr "Стандардниот тип на графикон за прикажување во прозорецот за статистика."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:6
-msgid ""
-"The identifier of the last device which is used to return focus to the "
-"correct device."
-msgstr ""
+msgid "The identifier of the last device which is used to return focus to the correct device."
+msgstr "Идентификатор на последниот уред кој се користеше за враќање на фокусот на точниот уред."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:7
 msgid "The index of the page number to show by default"
-msgstr ""
+msgstr "Индексот на бројот на страница кој ќе се прикажува стандардно"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:8
-msgid ""
-"The index of the page number to show by default which is used to return "
-"focus to the correct page."
-msgstr ""
+msgid "The index of the page number to show by default which is used to return focus to the correct page."
+msgstr "Индексот на бројот на страница кој ќе се прикажува стандардно кој се користи за фокусирање на точната страница при враќање."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:9
-#, fuzzy
-msgid ""
-"The maximum duration of time displayed on the x-axis of the history graph."
-msgstr "Максимално времетраење прикажано на x-оската на графиконот."
+msgid "The maximum duration of time displayed on the x-axis of the history graph."
+msgstr "Максимално времетраење прикажано на x-оската на графиконот на историјата."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:10
-#, fuzzy
 msgid "The maximum time displayed for history"
-msgstr "Максимално време прикажано на графиконот."
+msgstr "Максимално време прикажано на графиконот на историјата"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:11
-#, fuzzy
 msgid "Whether we should show the history data points"
-msgstr "Дали да се заматуваат податоците во графиконот"
+msgstr "Дали да се прикажуваат точките од податоците во историјата"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:12
-#, fuzzy
-msgid ""
-"Whether we should show the history data points in the statistics window."
-msgstr "Дали да ги прикажуваме настаните во прозорецот за статистики."
+msgid "Whether we should show the history data points in the statistics window."
+msgstr "Дали да се прикажуваат точките од податоците во историјата во прозорецот за статистики."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:13
-#, fuzzy
 msgid "Whether we should show the stats data points"
-msgstr "Дали да се заматуваат податоците во графиконот"
+msgstr "Дали да се прикажуваат точките од податоците во статистиката"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:14
-#, fuzzy
 msgid "Whether we should show the stats data points in the statistics window."
-msgstr "Дали да ги прикажуваме настаните во прозорецот за статистики."
+msgstr "Дали да се прикажуваат точките од податоците во статистиката во прозорецот за статистика."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:15
-#, fuzzy
 msgid "Whether we should smooth the history data"
-msgstr "Дали да се заматуваат податоците во графиконот"
+msgstr "Дали да се заматуваат податоците од историјата"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:16
-#, fuzzy
 msgid "Whether we should smooth the history data in the graph."
-msgstr "Дали да се заматуваат податоците во графиконот."
+msgstr "Дали да се заматуваат податоците од историјата во графиконот."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:17
-#, fuzzy
 msgid "Whether we should smooth the stats data"
-msgstr "Дали да се заматуваат податоците во графиконот"
+msgstr "Дали да се заматуваат податоците од статистиките"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:18
-#, fuzzy
 msgid "Whether we should smooth the stats data in the graph."
-msgstr "Дали да се заматуваат податоците во графиконот."
+msgstr "Дали да се заматуваат податоците од статистиките во графиконот."
 
 #: ../data/gnome-power-statistics.desktop.in.in.h:1
 msgid "Observe power management"
@@ -124,291 +100,267 @@
 #. TRANSLATORS: shown on the titlebar
 #. TRANSLATORS: the program name
 #: ../data/gnome-power-statistics.desktop.in.in.h:2
-#: ../data/gpm-statistics.ui.h:6 ../src/gpm-statistics.c:1406
+#: ../data/gpm-statistics.ui.h:6
+#: ../src/gpm-statistics.c:1406
 #: ../src/gpm-statistics.c:1860
 msgid "Power Statistics"
 msgstr "Статистики за енергијата"
 
 #: ../data/gpm-statistics.ui.h:1
 msgid "0"
-msgstr ""
+msgstr "0"
 
 #: ../data/gpm-statistics.ui.h:2
 msgid "Data length:"
-msgstr ""
+msgstr "Должина на податоци:"
 
-#: ../data/gpm-statistics.ui.h:3 ../src/gpm-statistics.c:509
+#: ../data/gpm-statistics.ui.h:3
+#: ../src/gpm-statistics.c:509
 msgid "Details"
-msgstr ""
+msgstr "Детали"
 
 #: ../data/gpm-statistics.ui.h:4
 msgid "Graph type:"
 msgstr "Тип на графикон:"
 
 #: ../data/gpm-statistics.ui.h:5
-#, fuzzy
 msgid "History"
-msgstr "Историја на напојување"
+msgstr "Историја"
 
 #: ../data/gpm-statistics.ui.h:7
 msgid "Processor wakeups per second:"
-msgstr ""
+msgstr "Разбудувања на процесорот во секунда:"
 
 #: ../data/gpm-statistics.ui.h:8
-#, fuzzy
 msgid "Show data points"
-msgstr "Почетна точка"
+msgstr "Покажи точки за податоците"
 
 #: ../data/gpm-statistics.ui.h:9
-#, fuzzy
 msgid "Statistics"
-msgstr "Статистики за енергијата"
+msgstr "Статистика"
 
 #: ../data/gpm-statistics.ui.h:10
 msgid "There is no data to display."
-msgstr ""
+msgstr "Нема податоци за прикажување."
 
 #: ../data/gpm-statistics.ui.h:11
 msgid "Use smoothed line"
-msgstr ""
+msgstr "Користи мазна линија"
 
-#: ../data/gpm-statistics.ui.h:12 ../src/gpm-statistics.c:495
+#: ../data/gpm-statistics.ui.h:12
+#: ../src/gpm-statistics.c:495
 msgid "Wakeups"
-msgstr ""
+msgstr "Разбудувања"
 
 #. Translators: This is %i days
-#: ../src/gpm-graph-widget.c:430
-#, fuzzy, c-format
+#: ../src/gpm-graph-widget.c:426
+#, c-format
 msgid "%id"
-msgstr "%ih"
+msgstr "%iд"
 
 #. Translators: This is %i days %02i hours
-#: ../src/gpm-graph-widget.c:433
-#, fuzzy, c-format
+#: ../src/gpm-graph-widget.c:429
+#, c-format
 msgid "%id%02ih"
-msgstr "%ih%02i"
+msgstr "%iд%02iч"
 
 #. Translators: This is %i hours
-#: ../src/gpm-graph-widget.c:438
+#: ../src/gpm-graph-widget.c:434
 #, c-format
 msgid "%ih"
 msgstr "%ih"
 
 #. Translators: This is %i hours %02i minutes
-#: ../src/gpm-graph-widget.c:441
-#, fuzzy, c-format
+#: ../src/gpm-graph-widget.c:437
+#, c-format
 msgid "%ih%02im"
-msgstr "%ih%02i"
+msgstr "%iч%02iм"
 
 #. Translators: This is %2i minutes
-#: ../src/gpm-graph-widget.c:446
+#: ../src/gpm-graph-widget.c:442
 #, c-format
 msgid "%2im"
 msgstr "%2im"
 
 #. Translators: This is %2i minutes %02i seconds
-#: ../src/gpm-graph-widget.c:449
+#: ../src/gpm-graph-widget.c:445
 #, c-format
 msgid "%2im%02i"
 msgstr "%2im%02i"
 
 #. Translators: This is %2i seconds
-#: ../src/gpm-graph-widget.c:453
+#: ../src/gpm-graph-widget.c:449
 #, c-format
 msgid "%2is"
 msgstr "%2is"
 
 #. Translators: This is %i Percentage
-#: ../src/gpm-graph-widget.c:457
+#: ../src/gpm-graph-widget.c:453
 #, c-format
 msgid "%i%%"
 msgstr "%i%%"
 
 #. Translators: This is %.1f Watts
-#: ../src/gpm-graph-widget.c:460
+#: ../src/gpm-graph-widget.c:456
 #, c-format
 msgid "%.1fW"
 msgstr "%.1fW"
 
 #. Translators: This is %.1f Volts
-#: ../src/gpm-graph-widget.c:465
+#: ../src/gpm-graph-widget.c:461
 #, c-format
 msgid "%.1fV"
 msgstr "%.1fV"
 
 #. TRANSLATORS: the rate of discharge for the device
-#: ../src/gpm-statistics.c:80 ../src/gpm-statistics.c:767
+#: ../src/gpm-statistics.c:80
+#: ../src/gpm-statistics.c:767
 msgid "Rate"
-msgstr ""
+msgstr "рата"
 
 #: ../src/gpm-statistics.c:81
-#, fuzzy
 msgid "Charge"
-msgstr "Време на полнење:"
+msgstr "Полнење"
 
-#: ../src/gpm-statistics.c:82 ../src/gpm-statistics.c:781
+#: ../src/gpm-statistics.c:82
+#: ../src/gpm-statistics.c:781
 msgid "Time to full"
-msgstr ""
+msgstr "Време за да се наполни"
 
-#: ../src/gpm-statistics.c:83 ../src/gpm-statistics.c:786
+#: ../src/gpm-statistics.c:83
+#: ../src/gpm-statistics.c:786
 msgid "Time to empty"
-msgstr ""
+msgstr "Време за да се испразни"
 
 #: ../src/gpm-statistics.c:90
-#, fuzzy
 msgid "10 minutes"
-msgstr "1 минута"
+msgstr "10 минути"
 
 #: ../src/gpm-statistics.c:91
-#, fuzzy
 msgid "2 hours"
-msgstr "еден час"
+msgstr "2 часа"
 
 #: ../src/gpm-statistics.c:92
-#, fuzzy
 msgid "6 hours"
-msgstr "еден час"
+msgstr "6 часа"
 
 #: ../src/gpm-statistics.c:93
 msgid "1 day"
-msgstr ""
+msgstr "1 ден"
 
 #: ../src/gpm-statistics.c:94
 msgid "1 week"
-msgstr ""
+msgstr "1 недела"
 
 #. TRANSLATORS: what we've observed about the device
 #: ../src/gpm-statistics.c:103
-#, fuzzy
 msgid "Charge profile"
-msgstr "Профил за времето за полнење"
+msgstr "Профил за полнење"
 
 #: ../src/gpm-statistics.c:104
-#, fuzzy
 msgid "Discharge profile"
-msgstr "Профил за времето за празнење"
+msgstr "Профил за празнење"
 
 #. TRANSLATORS: how accurately we can predict the time remaining of the battery
 #: ../src/gpm-statistics.c:106
-#, fuzzy
 msgid "Charge accuracy"
-msgstr "Профил за точност на времето за полнење"
+msgstr "Точност на полнењето"
 
 #: ../src/gpm-statistics.c:107
-#, fuzzy
 msgid "Discharge accuracy"
-msgstr "Профил за точност на времето за празнење"
+msgstr "Точност на празнењето"
 
 #. TRANSLATORS: system power cord
 #: ../src/gpm-statistics.c:288
-#, fuzzy
 msgid "AC adapter"
 msgid_plural "AC adapters"
-msgstr[0] "Адаптерот е отстранет"
-msgstr[1] "Адаптерот е отстранет"
-msgstr[2] "Адаптерот е отстранет"
+msgstr[0] "Адаптер"
+msgstr[1] "Адаптери"
 
 #. TRANSLATORS: laptop primary battery
 #: ../src/gpm-statistics.c:292
-#, fuzzy
 msgid "Laptop battery"
 msgid_plural "Laptop batteries"
-msgstr[0] "Батерија на лаптоп"
-msgstr[1] "Батерија на лаптоп"
-msgstr[2] "Батерија на лаптоп"
+msgstr[0] "Батерија за лаптоп"
+msgstr[1] "Батерии за лаптоп"
 
 #. TRANSLATORS: battery-backed AC power source
 #: ../src/gpm-statistics.c:296
-#, fuzzy
 msgid "UPS"
 msgid_plural "UPSs"
 msgstr[0] "UPS"
-msgstr[1] "UPS"
-msgstr[2] "UPS"
+msgstr[1] "UPS-и"
 
 #. TRANSLATORS: a monitor is a device to measure voltage and current
 #: ../src/gpm-statistics.c:300
 msgid "Monitor"
 msgid_plural "Monitors"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Монитор"
+msgstr[1] "Монитори"
 
 #. TRANSLATORS: wireless mice with internal batteries
 #: ../src/gpm-statistics.c:304
 msgid "Mouse"
 msgid_plural "Mice"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Глушец"
+msgstr[1] "Глувци"
 
 #. TRANSLATORS: wireless keyboard with internal battery
 #: ../src/gpm-statistics.c:308
 msgid "Keyboard"
 msgid_plural "Keyboards"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Тастатура"
+msgstr[1] "Тастатури"
 
 #. TRANSLATORS: portable device
 #: ../src/gpm-statistics.c:312
-#, fuzzy
 msgid "PDA"
 msgid_plural "PDAs"
 msgstr[0] "PDA"
-msgstr[1] "PDA"
-msgstr[2] "PDA"
+msgstr[1] "PDA уреди"
 
 #. TRANSLATORS: cell phone (mobile...)
 #: ../src/gpm-statistics.c:316
-#, fuzzy
 msgid "Cell phone"
 msgid_plural "Cell phones"
 msgstr[0] "Мобилен телефон"
-msgstr[1] "Мобилен телефон"
-msgstr[2] "Мобилен телефон"
+msgstr[1] "Мобилни телефони"
 
 #. TRANSLATORS: media player, mp3 etc
 #: ../src/gpm-statistics.c:321
 msgid "Media player"
 msgid_plural "Media players"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Пуштач на музика"
+msgstr[1] "Пуштачи на музика"
 
 #. TRANSLATORS: tablet device
 #: ../src/gpm-statistics.c:325
 msgid "Tablet"
 msgid_plural "Tablets"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Таблет"
+msgstr[1] "Таблети"
 
 #. TRANSLATORS: tablet device
 #: ../src/gpm-statistics.c:329
 msgid "Computer"
 msgid_plural "Computers"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Компјутер"
+msgstr[1] "Компјутери"
 
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:349
-#, fuzzy
 msgid "Lithium Ion"
 msgstr "Литиум-јонска"
 
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:353
-#, fuzzy
 msgid "Lithium Polymer"
-msgstr "Литиум-полимерска"
+msgstr "Литиум-полимерна"
 
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:357
-#, fuzzy
 msgid "Lithium Iron Phosphate"
-msgstr "Литиум-јонска"
+msgstr "Литиум-железо-фосфатна"
 
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:361
@@ -418,7 +370,7 @@
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:365
 msgid "Nickel Cadmium"
-msgstr ""
+msgstr "Никел-кадмиум"
 
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:369
@@ -427,72 +379,67 @@
 
 #. TRANSLATORS: battery technology
 #: ../src/gpm-statistics.c:373
-#, fuzzy
 msgid "Unknown technology"
-msgstr "Непознато време"
+msgstr "Непозната технолгија"
 
 #. TRANSLATORS: battery state
 #: ../src/gpm-statistics.c:393
-#, fuzzy
 msgid "Charging"
-msgstr "Непрекинатото напојување се празни"
+msgstr "Се полни"
 
 #. TRANSLATORS: battery state
 #: ../src/gpm-statistics.c:397
-#, fuzzy
 msgid "Discharging"
-msgstr "Непрекинатото напојување се празни"
+msgstr "Се празни"
 
 #. TRANSLATORS: battery state
 #: ../src/gpm-statistics.c:401
 msgid "Empty"
-msgstr ""
+msgstr "Празна"
 
 #. TRANSLATORS: battery state
 #: ../src/gpm-statistics.c:405
-#, fuzzy
 msgid "Charged"
-msgstr "Батеријата е наполнета"
+msgstr "Наполнета"
 
 #. TRANSLATORS: battery state
 #: ../src/gpm-statistics.c:409
-#, fuzzy
 msgid "Waiting to charge"
-msgstr "%s %s додека да се наполни (%i%%)\n"
+msgstr "Чека да се наполни"
 
 #. TRANSLATORS: battery state
 #: ../src/gpm-statistics.c:413
-#, fuzzy
 msgid "Waiting to discharge"
-msgstr "%s се празни (%i%%)\n"
+msgstr "Чека да се испразни"
 
 #: ../src/gpm-statistics.c:433
 msgid "Attribute"
-msgstr ""
+msgstr "Атрибут"
 
 #: ../src/gpm-statistics.c:440
 msgid "Value"
-msgstr ""
+msgstr "Вредност"
 
 #: ../src/gpm-statistics.c:457
 msgid "Image"
-msgstr ""
+msgstr "Слика"
 
 #: ../src/gpm-statistics.c:463
 msgid "Description"
-msgstr ""
+msgstr "Опис"
 
-#: ../src/gpm-statistics.c:482 ../src/gpm-statistics.c:706
+#: ../src/gpm-statistics.c:482
+#: ../src/gpm-statistics.c:706
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #: ../src/gpm-statistics.c:488
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: ../src/gpm-statistics.c:502
 msgid "Command"
-msgstr ""
+msgstr "Команда"
 
 #. TRANSLATORS: this is when the stats time is not known
 #: ../src/gpm-statistics.c:587
@@ -504,119 +451,111 @@
 #, c-format
 msgid "%.0f second"
 msgid_plural "%.0f seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%.0f секунда"
+msgstr[1] "%.0f секунди"
 
 #. TRANSLATORS: this is a time value, usually to show on a graph
 #: ../src/gpm-statistics.c:596
-#, fuzzy, c-format
+#, c-format
 msgid "%.1f minute"
 msgid_plural "%.1f minutes"
-msgstr[0] "%i минута"
-msgstr[1] "%i минути"
-msgstr[2] "%i минути"
+msgstr[0] "%.1f минута"
+msgstr[1] "%.1f минути"
 
 #. TRANSLATORS: this is a time value, usually to show on a graph
 #: ../src/gpm-statistics.c:601
-#, fuzzy, c-format
+#, c-format
 msgid "%.1f hour"
 msgid_plural "%.1f hours"
-msgstr[0] "%i час"
-msgstr[1] "%i часови"
-msgstr[2] "%i часови"
+msgstr[0] "%.1f час"
+msgstr[1] "%.1f часа"
 
 #. TRANSLATORS: this is a time value, usually to show on a graph
 #: ../src/gpm-statistics.c:605
-#, fuzzy, c-format
+#, c-format
 msgid "%.1f day"
 msgid_plural "%.1f days"
-msgstr[0] "%.1fW"
-msgstr[1] "%.1fW"
-msgstr[2] "%.1fW"
+msgstr[0] "%.1f ден"
+msgstr[1] "%.1f дена"
 
 #: ../src/gpm-statistics.c:614
 msgid "Yes"
-msgstr ""
+msgstr "Да"
 
 #: ../src/gpm-statistics.c:614
 msgid "No"
-msgstr ""
+msgstr "Не"
 
 #. TRANSLATORS: the device ID of the current device, e.g. "battery0"
 #: ../src/gpm-statistics.c:703
 msgid "Device"
-msgstr ""
+msgstr "Уред"
 
 #: ../src/gpm-statistics.c:708
-#, fuzzy
 msgid "Vendor"
-msgstr "Произведувач:"
+msgstr "Произведувач"
 
 #: ../src/gpm-statistics.c:710
-#, fuzzy
 msgid "Model"
-msgstr "Модел:"
+msgstr "Модел"
 
 #: ../src/gpm-statistics.c:712
-#, fuzzy
 msgid "Serial number"
-msgstr "Сериски број:"
+msgstr "Сериски број"
 
 #. TRANSLATORS: a boolean attribute that means if the device is supplying the
 #. * main power for the computer. For instance, an AC adapter or laptop battery
 #. * would be TRUE,  but a mobile phone or mouse taking power is FALSE
 #: ../src/gpm-statistics.c:717
 msgid "Supply"
-msgstr ""
+msgstr "Напојување"
 
 #: ../src/gpm-statistics.c:720
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунди"
 
 #. TRANSLATORS: when the device was last updated with new data. It's
 #. * usually a few seconds when a device is discharging or charging.
 #: ../src/gpm-statistics.c:724
 msgid "Refreshed"
-msgstr ""
+msgstr "Освежено"
 
 #. TRANSLATORS: Present is whether the device is currently attached
 #. * to the computer, as some devices (e.g. laptop batteries) can
 #. * be removed, but still observed as devices on the system
 #: ../src/gpm-statistics.c:734
 msgid "Present"
-msgstr ""
+msgstr "Прикачен"
 
 #. TRANSLATORS: If the device can be recharged, e.g. lithium
 #. * batteries rather than alkaline ones
 #: ../src/gpm-statistics.c:741
 msgid "Rechargeable"
-msgstr ""
+msgstr "Може да се полни"
 
 #. TRANSLATORS: The state of the device, e.g. "Changing" or "Fully charged"
 #: ../src/gpm-statistics.c:747
 msgid "State"
-msgstr ""
+msgstr "Состојба"
 
 #: ../src/gpm-statistics.c:751
 msgid "Energy"
-msgstr ""
+msgstr "Енергија"
 
 #: ../src/gpm-statistics.c:754
 msgid "Energy when empty"
-msgstr ""
+msgstr "Енергија кога е празен"
 
 #: ../src/gpm-statistics.c:757
 msgid "Energy when full"
-msgstr ""
+msgstr "Енергија кога е полн"
 
 #: ../src/gpm-statistics.c:760
 msgid "Energy (design)"
-msgstr ""
+msgstr "Енергија (дизајниран капацитет)"
 
 #: ../src/gpm-statistics.c:774
 msgid "Voltage"
@@ -630,21 +569,19 @@
 #. TRANSLATORS: the capacity of the device, which is basically a measure
 #. * of how full it can get, relative to the design capacity
 #: ../src/gpm-statistics.c:803
-#, fuzzy
 msgid "Capacity"
-msgstr "Капацитет:"
+msgstr "Капацитет"
 
 #. TRANSLATORS: the type of battery, e.g. lithium or nikel metal hydroxide
 #: ../src/gpm-statistics.c:808
-#, fuzzy
 msgid "Technology"
-msgstr "Технологија:"
+msgstr "Технологија"
 
 #. TRANSLATORS: this is when the device is plugged in, typically
 #. * only shown for the ac adaptor device
 #: ../src/gpm-statistics.c:813
 msgid "Online"
-msgstr ""
+msgstr "Онлајн"
 
 #. TRANSLATORS: the command line was not provided
 #: ../src/gpm-statistics.c:1140
@@ -652,144 +589,146 @@
 msgstr "Нема податоци"
 
 #. TRANSLATORS: kernel module, usually a device driver
-#: ../src/gpm-statistics.c:1147 ../src/gpm-statistics.c:1152
+#: ../src/gpm-statistics.c:1147
+#: ../src/gpm-statistics.c:1152
 msgid "Kernel module"
-msgstr ""
+msgstr "Модул на кернелот"
 
 #. TRANSLATORS: kernel housekeeping
 #: ../src/gpm-statistics.c:1157
 msgid "Kernel core"
-msgstr ""
+msgstr "Јадро од кернелот"
 
 #. TRANSLATORS: interrupt between processors
 #: ../src/gpm-statistics.c:1162
 msgid "Interprocessor interrupt"
-msgstr ""
+msgstr "Интерпроцесорски прекини"
 
 #. TRANSLATORS: unknown interrupt
 #: ../src/gpm-statistics.c:1167
 msgid "Interrupt"
-msgstr ""
+msgstr "Прекин"
 
 #. TRANSLATORS: the keyboard and mouse device event
 #: ../src/gpm-statistics.c:1214
 msgid "PS/2 keyboard/mouse/touchpad"
-msgstr ""
+msgstr "PS/2 тастатура/глушец/тачпад"
 
 #. TRANSLATORS: ACPI, the Intel power standard on laptops and desktops
 #: ../src/gpm-statistics.c:1217
 msgid "ACPI"
-msgstr ""
+msgstr "ACPI"
 
 #. TRANSLATORS: serial ATA is a new style of hard disk interface
 #: ../src/gpm-statistics.c:1220
 msgid "Serial ATA"
-msgstr ""
+msgstr "Serial ATA"
 
 #. TRANSLATORS: this is the old-style ATA interface
 #: ../src/gpm-statistics.c:1223
 msgid "ATA host controller"
-msgstr ""
+msgstr "ATA хост контролер"
 
 #. TRANSLATORS: 802.11 wireless adaptor
 #: ../src/gpm-statistics.c:1226
 msgid "Intel wireless adaptor"
-msgstr ""
+msgstr "Intel безжичен адаптер"
 
 #. TRANSLATORS: a timer is something that fires periodically.
 #. * The parameter is a process name, e.g. "firefox-bin".
 #. * This is shown when the timer wakes up.
-#: ../src/gpm-statistics.c:1233 ../src/gpm-statistics.c:1238
-#: ../src/gpm-statistics.c:1243 ../src/gpm-statistics.c:1248
+#: ../src/gpm-statistics.c:1233
+#: ../src/gpm-statistics.c:1238
+#: ../src/gpm-statistics.c:1243
+#: ../src/gpm-statistics.c:1248
 #: ../src/gpm-statistics.c:1253
-#, fuzzy, c-format
+#, c-format
 msgid "Timer %s"
-msgstr "Време"
+msgstr "Тајмер за %s"
 
 #. TRANSLATORS: the parameter is the name of task that's woken up from sleeping.
 #. * This is shown when the task wakes up.
 #: ../src/gpm-statistics.c:1257
 #, c-format
 msgid "Sleep %s"
-msgstr ""
+msgstr "Заспиј го %s"
 
 #. TRANSLATORS: this is the name of a new realtime task.
 #: ../src/gpm-statistics.c:1260
 #, c-format
 msgid "New task %s"
-msgstr ""
+msgstr "Нова задача %s"
 
 #. TRANSLATORS: this is the name of a task that's woken to check state.
 #. * This is shown when the task wakes up.
 #: ../src/gpm-statistics.c:1264
 #, c-format
 msgid "Wait %s"
-msgstr ""
+msgstr "Почекај го %s"
 
 #. TRANSLATORS: this is the name of a work queue.
 #. * A work queue is a list of work that has to be done.
-#: ../src/gpm-statistics.c:1268 ../src/gpm-statistics.c:1272
+#: ../src/gpm-statistics.c:1268
+#: ../src/gpm-statistics.c:1272
 #, c-format
 msgid "Work queue %s"
-msgstr ""
+msgstr "Ред за работа %s"
 
 #. TRANSLATORS: this is when the networking subsystem clears out old entries
 #: ../src/gpm-statistics.c:1275
 #, c-format
 msgid "Network route flush %s"
-msgstr ""
+msgstr "Празнење на мрежна рута %s"
 
 #. TRANSLATORS: this is the name of an activity on the USB bus
 #: ../src/gpm-statistics.c:1278
 #, c-format
 msgid "USB activity %s"
-msgstr ""
+msgstr "USB активност  %s"
 
 #. TRANSLATORS: we've timed out of an aligned timer, with the name
 #: ../src/gpm-statistics.c:1281
 #, c-format
 msgid "Wakeup %s"
-msgstr ""
+msgstr "Разбуди го %s"
 
 #. TRANSLATORS: interupts on the system required for basic operation
 #: ../src/gpm-statistics.c:1284
 msgid "Local interrupts"
-msgstr ""
+msgstr "Локални прекини"
 
 #. TRANSLATORS: interrupts when a task gets moved from one core to another
 #: ../src/gpm-statistics.c:1287
 msgid "Rescheduling interrupts"
-msgstr ""
+msgstr "Презакажани прекини"
 
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1396
-#, fuzzy
 msgid "Device Information"
 msgstr "Информации за уредот"
 
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1398
-#, fuzzy
 msgid "Device History"
-msgstr "Историја на напојување"
+msgstr "Историја на уредот"
 
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1400
-#, fuzzy
 msgid "Device Profile"
-msgstr "Профил за времето за празнење"
+msgstr "Профил на уредот"
 
 #. TRANSLATORS: shown on the titlebar
 #: ../src/gpm-statistics.c:1402
 msgid "Processor Wakeups"
-msgstr ""
+msgstr "Разбудувања на процесорот"
 
 #. TRANSLATORS: this is the X axis on the graph
-#: ../src/gpm-statistics.c:1598 ../src/gpm-statistics.c:1604
-#: ../src/gpm-statistics.c:1610 ../src/gpm-statistics.c:1616
-#, fuzzy
+#: ../src/gpm-statistics.c:1598
+#: ../src/gpm-statistics.c:1604
+#: ../src/gpm-statistics.c:1610
+#: ../src/gpm-statistics.c:1616
 msgid "Time elapsed"
-msgstr "Просечно изминато време"
+msgstr "Изминато време"
 
 #. TRANSLATORS: this is the Y axis on the graph
 #: ../src/gpm-statistics.c:1600
@@ -798,28 +737,31 @@
 
 #. TRANSLATORS: this is the Y axis on the graph for the whole battery device
 #. TRANSLATORS: this is the X axis on the graph for the whole battery device
-#: ../src/gpm-statistics.c:1606 ../src/gpm-statistics.c:1649
-#: ../src/gpm-statistics.c:1655 ../src/gpm-statistics.c:1661
+#: ../src/gpm-statistics.c:1606
+#: ../src/gpm-statistics.c:1649
+#: ../src/gpm-statistics.c:1655
+#: ../src/gpm-statistics.c:1661
 #: ../src/gpm-statistics.c:1667
-#, fuzzy
 msgid "Cell charge"
-msgstr "Волтажа на ќелијата"
+msgstr "Полнење на ќелијата"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1612 ../src/gpm-statistics.c:1618
-#, fuzzy
+#: ../src/gpm-statistics.c:1612
+#: ../src/gpm-statistics.c:1618
 msgid "Predicted time"
-msgstr "Преостанато време"
+msgstr "Предвидено време"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1651 ../src/gpm-statistics.c:1663
+#: ../src/gpm-statistics.c:1651
+#: ../src/gpm-statistics.c:1663
 msgid "Correction factor"
-msgstr ""
+msgstr "Фактор на поправка"
 
 #. TRANSLATORS: this is the Y axis on the graph
-#: ../src/gpm-statistics.c:1657 ../src/gpm-statistics.c:1669
+#: ../src/gpm-statistics.c:1657
+#: ../src/gpm-statistics.c:1669
 msgid "Prediction accuracy"
-msgstr ""
+msgstr "Точност на предвидување"
 
 #. TRANSLATORS: show verbose debugging
 #: ../src/gpm-statistics.c:1848
@@ -829,10 +771,10 @@
 #. TRANSLATORS: show a device by default
 #: ../src/gpm-statistics.c:1851
 msgid "Select this device at startup"
-msgstr ""
+msgstr "Избери го овој уред при стартување"
 
 #. TRANSLATORS: the icon for the CPU
 #: ../src/gpm-statistics.c:2111
-#, fuzzy
 msgid "Processor"
-msgstr "Лошо"
+msgstr "Процесор"
+
diff -Nru gnome-power-manager-3.3.3/po/nb.po gnome-power-manager-3.3.92/po/nb.po
--- gnome-power-manager-3.3.3/po/nb.po	2011-11-14 09:59:17.000000000 +0000
+++ gnome-power-manager-3.3.92/po/nb.po	2012-01-26 07:46:36.000000000 +0000
@@ -1,18 +1,18 @@
-# Translation of gnome-power-manager to Norwegian Bokmål
+# Norwegian bokmål translation of gnome-power-manager.
 # This file is distributed under the same license as the gnome-power-manager package.
 # Copyright (C) Free Software Foundation, Inc, 2005.
 # Terance Edward Sola <terance@lyse.net>, 2005.
-# Kjartan Maraas  <kmaraas@gnome.org>, 2005-2010.
+# Kjartan Maraas  <kmaraas@gnome.org>, 2005-2012.
 # Øivind Hoel <oivind.hoel@gmail.com>, 2006
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-power-manager 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-13 11:01+0100\n"
-"PO-Revision-Date: 2011-11-13 11:01+0100\n"
+"POT-Creation-Date: 2012-01-25 15:00+0100\n"
+"PO-Revision-Date: 2012-01-25 15:03+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
+"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,134 +20,134 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:1
-msgid "The ID of the last device selected"
-msgstr "ID for sist valgte enhet"
+msgid "Whether we should show the history data points"
+msgstr "Hvorvidt historiske datapunkter skal vises"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:2
-msgid "The default graph type to show for history"
-msgstr "Forvalgt type graf som skal vises for historikk"
+msgid ""
+"Whether we should show the history data points in the statistics window."
+msgstr "Hvorvidt historiske datapunkter skal vises i statistikkvinduet."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:3
-msgid "The default graph type to show for stats"
-msgstr "Forvalgt type graf som skal vises for statistikk"
+msgid "Whether we should smooth the history data"
+msgstr "Hvorvidt historikkdata skal jevnes ut."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:4
-msgid "The default graph type to show in the history window."
-msgstr "Forvalgt type graf som skal vises i historikkvinduet."
+msgid "Whether we should smooth the history data in the graph."
+msgstr "Hvorvidt historiske data skal jevnes ut i grafen."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:5
-msgid "The default graph type to show in the stats window."
-msgstr "Forvalgt type graf som skal vises for statistikkvinduet."
+msgid "The default graph type to show for history"
+msgstr "Forvalgt type graf som skal vises for historikk"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:6
-msgid ""
-"The identifier of the last device which is used to return focus to the "
-"correct device."
-msgstr ""
+msgid "The default graph type to show in the history window."
+msgstr "Forvalgt type graf som skal vises i historikkvinduet."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:7
-msgid "The index of the page number to show by default"
-msgstr ""
+msgid "The maximum time displayed for history"
+msgstr "Maksimal tid som vises for historikk."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:8
 msgid ""
-"The index of the page number to show by default which is used to return "
-"focus to the correct page."
-msgstr ""
+"The maximum duration of time displayed on the x-axis of the history graph."
+msgstr "Maksimal varighet av tid som vises på x-aksen i historikkgrafen."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:9
-msgid ""
-"The maximum duration of time displayed on the x-axis of the history graph."
-msgstr ""
+msgid "Whether we should show the stats data points"
+msgstr "Hvorvidt statistiske datapunkter skal vises"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:10
-msgid "The maximum time displayed for history"
-msgstr ""
+msgid "Whether we should show the stats data points in the statistics window."
+msgstr "Hvorvidt statistiske datapunkter skal vises i statistikkvinduet."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:11
-msgid "Whether we should show the history data points"
-msgstr ""
+msgid "Whether we should smooth the stats data"
+msgstr "Hvorvidt statistiske data skal jevnes ut"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:12
-msgid ""
-"Whether we should show the history data points in the statistics window."
-msgstr ""
+msgid "Whether we should smooth the stats data in the graph."
+msgstr "Hvorvidt statistiske data skal jevnes ut i grafen."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:13
-msgid "Whether we should show the stats data points"
-msgstr ""
+msgid "The default graph type to show for stats"
+msgstr "Forvalgt type graf som skal vises for statistikk"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:14
-msgid "Whether we should show the stats data points in the statistics window."
-msgstr ""
+msgid "The default graph type to show in the stats window."
+msgstr "Forvalgt type graf som skal vises for statistikkvinduet."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:15
-msgid "Whether we should smooth the history data"
-msgstr ""
+msgid "The index of the page number to show by default"
+msgstr "Indeks for sidenummer som skal vises som forvalg"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:16
-msgid "Whether we should smooth the history data in the graph."
-msgstr ""
+msgid ""
+"The index of the page number to show by default which is used to return "
+"focus to the correct page."
+msgstr "Indeks av sidenummer som skal vises som forvalg for å gi fokus til korrekt side."
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:17
-msgid "Whether we should smooth the stats data"
-msgstr ""
+msgid "The ID of the last device selected"
+msgstr "ID for sist valgte enhet"
 
 #: ../data/org.gnome.power-manager.gschema.xml.in.h:18
-msgid "Whether we should smooth the stats data in the graph."
-msgstr ""
-
-#: ../data/gnome-power-statistics.desktop.in.in.h:1
-msgid "Observe power management"
-msgstr "Overvåk strømstyring"
+msgid ""
+"The identifier of the last device which is used to return focus to the "
+"correct device."
+msgstr "Identifikator for siste enhet som brukes til å gi fokus til rett enhet."
 
 #. TRANSLATORS: shown on the titlebar
 #. TRANSLATORS: the program name
-#: ../data/gnome-power-statistics.desktop.in.in.h:2
-#: ../data/gpm-statistics.ui.h:6 ../src/gpm-statistics.c:1406
+#: ../data/gnome-power-statistics.desktop.in.in.h:1
+#: ../data/gpm-statistics.ui.h:1 ../src/gpm-statistics.c:1406
 #: ../src/gpm-statistics.c:1860
 msgid "Power Statistics"
 msgstr "Strømstatistikk"
 
-#: ../data/gpm-statistics.ui.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/gpm-statistics.ui.h:2
-msgid "Data length:"
-msgstr "Datalengde:"
+#: ../data/gnome-power-statistics.desktop.in.in.h:2
+msgid "Observe power management"
+msgstr "Overvåk strømstyring"
 
-#: ../data/gpm-statistics.ui.h:3 ../src/gpm-statistics.c:509
+#: ../data/gpm-statistics.ui.h:2 ../src/gpm-statistics.c:509
 msgid "Details"
 msgstr "Detaljer"
 
-#: ../data/gpm-statistics.ui.h:4
+#: ../data/gpm-statistics.ui.h:3
 msgid "Graph type:"
 msgstr "Type graf:"
 
+#: ../data/gpm-statistics.ui.h:4
+msgid "Data length:"
+msgstr "Datalengde:"
+
 #: ../data/gpm-statistics.ui.h:5
-msgid "History"
-msgstr "Historikk"
+msgid "There is no data to display."
+msgstr "Ingen data å vise"
 
-#: ../data/gpm-statistics.ui.h:7
-msgid "Processor wakeups per second:"
-msgstr "Antall ganger prosessoren våkner opp per sekund:"
+#: ../data/gpm-statistics.ui.h:6
+msgid "Use smoothed line"
+msgstr "Bruk utjevnet linje"
 
-#: ../data/gpm-statistics.ui.h:8
+#: ../data/gpm-statistics.ui.h:7
 msgid "Show data points"
 msgstr "Vis datapunkter"
 
+#: ../data/gpm-statistics.ui.h:8
+msgid "History"
+msgstr "Historikk"
+
 #: ../data/gpm-statistics.ui.h:9
 msgid "Statistics"
 msgstr "Statistikk"
 
 #: ../data/gpm-statistics.ui.h:10
-msgid "There is no data to display."
-msgstr "Ingen data å vise"
+msgid "Processor wakeups per second:"
+msgstr "Antall ganger prosessoren våkner opp per sekund:"
 
 #: ../data/gpm-statistics.ui.h:11
-msgid "Use smoothed line"
-msgstr "Bruk utjevnet linje"
+msgid "0"
+msgstr "0"
 
 #: ../data/gpm-statistics.ui.h:12 ../src/gpm-statistics.c:495
 msgid "Wakeups"
diff -Nru gnome-power-manager-3.3.3/src/gnome-power-manager.gresource.xml gnome-power-manager-3.3.92/src/gnome-power-manager.gresource.xml
--- gnome-power-manager-3.3.3/src/gnome-power-manager.gresource.xml	1970-01-01 00:00:00.000000000 +0000
+++ gnome-power-manager-3.3.92/src/gnome-power-manager.gresource.xml	2012-02-09 16:17:43.000000000 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/power-manager">
+ <file compressed="true">gpm-statistics.ui</file>
+ </gresource>
+</gresources>
diff -Nru gnome-power-manager-3.3.3/src/gpm-resources.c gnome-power-manager-3.3.92/src/gpm-resources.c
--- gnome-power-manager-3.3.3/src/gpm-resources.c	1970-01-01 00:00:00.000000000 +0000
+++ gnome-power-manager-3.3.92/src/gpm-resources.c	2012-03-18 19:54:10.000000000 +0000
@@ -0,0 +1,421 @@
+#include <gio/gio.h>
+
+#if defined (__ELF__) && ( __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
+# define SECTION __attribute__ ((section (".gresource.gpm"), aligned (8)))
+#else
+# define SECTION
+#endif
+
+static const SECTION union { const guint8 data[2303]; const double alignment; void * const ptr;}  gpm_resource_data = { {
+  0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x28, 0x05, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
+  0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+  0x05, 0x00, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 
+  0xff, 0xff, 0xff, 0xff, 0xac, 0x00, 0x00, 0x00, 
+  0x01, 0x00, 0x4c, 0x00, 0xb0, 0x00, 0x00, 0x00, 
+  0xb4, 0x00, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, 
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 
+  0x04, 0x00, 0x4c, 0x00, 0xb8, 0x00, 0x00, 0x00, 
+  0xbc, 0x00, 0x00, 0x00, 0x34, 0xc8, 0xd0, 0xb5, 
+  0x03, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 
+  0x0e, 0x00, 0x4c, 0x00, 0xcc, 0x00, 0x00, 0x00, 
+  0xd0, 0x00, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, 
+  0x01, 0x00, 0x00, 0x00, 0xd0, 0x00, 0x00, 0x00, 
+  0x06, 0x00, 0x4c, 0x00, 0xd8, 0x00, 0x00, 0x00, 
+  0xdc, 0x00, 0x00, 0x00, 0x1c, 0xa2, 0xa6, 0x0c, 
+  0x02, 0x00, 0x00, 0x00, 0xdc, 0x00, 0x00, 0x00, 
+  0x11, 0x00, 0x76, 0x00, 0xf0, 0x00, 0x00, 0x00, 
+  0xff, 0x08, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 
+  0x01, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 
+  0x03, 0x00, 0x00, 0x00, 0x70, 0x6f, 0x77, 0x65, 
+  0x72, 0x2d, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 
+  0x72, 0x2f, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 
+  0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 
+  0x02, 0x00, 0x00, 0x00, 0x67, 0x70, 0x6d, 0x2d, 
+  0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 
+  0x63, 0x73, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 
+  0xdd, 0x75, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
+  0x78, 0xda, 0xed, 0x5d, 0x4d, 0x6f, 0xdb, 0x38, 
+  0x10, 0xbd, 0xf7, 0x57, 0x08, 0xbc, 0x2e, 0x1c, 
+  0x47, 0x76, 0x92, 0x6d, 0x0a, 0xdb, 0x05, 0xb6, 
+  0x41, 0xdb, 0xc3, 0x62, 0x51, 0x20, 0x69, 0x7b, 
+  0x14, 0x68, 0x6a, 0x62, 0x71, 0x43, 0x93, 0x5a, 
+  0x91, 0x8e, 0xed, 0x7f, 0xbf, 0x94, 0xe4, 0x38, 
+  0x51, 0xac, 0x6f, 0x29, 0x89, 0xe4, 0xf0, 0x94, 
+  0x58, 0x16, 0x29, 0xce, 0x23, 0xe7, 0xcd, 0x0c, 
+  0xf5, 0x2c, 0x4d, 0x3e, 0x6f, 0x96, 0xcc, 0xba, 
+  0x87, 0x40, 0x52, 0xc1, 0xa7, 0xc8, 0x3e, 0x39, 
+  0x45, 0x16, 0x70, 0x22, 0x5c, 0xca, 0x17, 0x53, 
+  0xf4, 0xf3, 0xe6, 0xeb, 0xe0, 0x23, 0xfa, 0x3c, 
+  0xfb, 0x30, 0xa1, 0x5c, 0x41, 0x70, 0x8b, 0x09, 
+  0xcc, 0x3e, 0x58, 0xd6, 0x24, 0x80, 0xff, 0x56, 
+  0x34, 0x00, 0x69, 0x31, 0x3a, 0x9f, 0xa2, 0x85, 
+  0xba, 0xfb, 0x03, 0x3d, 0xf6, 0x31, 0x3a, 0xb1, 
+  0x2f, 0xd0, 0x30, 0x3a, 0x4f, 0xcc, 0xff, 0x05, 
+  0xa2, 0x2c, 0xc2, 0xb0, 0x94, 0x53, 0xf4, 0x4d, 
+  0xdd, 0x5d, 0x51, 0xcc, 0xc4, 0x02, 0x59, 0xd4, 
+  0x9d, 0x22, 0x37, 0xfa, 0xdf, 0x91, 0x0a, 0x2b, 
+  0x89, 0xc2, 0xd3, 0x75, 0x03, 0x3f, 0x10, 0x3e, 
+  0x04, 0x6a, 0x6b, 0x71, 0xbc, 0x84, 0x29, 0x22, 
+  0x98, 0x3b, 0xb7, 0x82, 0xac, 0xf4, 0xf7, 0x5f, 
+  0x31, 0x93, 0x30, 0x19, 0x3e, 0x9c, 0x90, 0x7e, 
+  0xfe, 0x5c, 0x04, 0x2e, 0x04, 0xce, 0x9a, 0xba, 
+  0xca, 0x43, 0xb3, 0x8b, 0xa2, 0xd3, 0x15, 0x55, 
+  0x0c, 0x90, 0xa5, 0x02, 0xcc, 0x25, 0xc3, 0x0a, 
+  0xcf, 0x99, 0x3e, 0xb8, 0x05, 0x7d, 0xb5, 0x1f, 
+  0x62, 0x0d, 0x81, 0x75, 0xad, 0x87, 0x46, 0xa5, 
+  0xa2, 0x44, 0x16, 0xf5, 0xb4, 0xa6, 0xdc, 0x15, 
+  0x6b, 0xc7, 0x17, 0x92, 0x2a, 0x0d, 0x02, 0x9a, 
+  0x11, 0x08, 0x01, 0x1b, 0x08, 0x3e, 0xf0, 0x71, 
+  0xa0, 0xff, 0x2f, 0x1c, 0xca, 0xd6, 0x07, 0xc7, 
+  0xd3, 0x28, 0xa3, 0x59, 0x8c, 0xcb, 0x41, 0x03, 
+  0xe2, 0x51, 0xe6, 0x5a, 0xd1, 0x3c, 0x70, 0xcc, 
+  0x06, 0xd1, 0xc7, 0x29, 0xba, 0x9f, 0x8b, 0xcd, 
+  0x0e, 0xbc, 0x34, 0xbc, 0xff, 0xd2, 0xdf, 0x3e, 
+  0x01, 0x7b, 0x10, 0x9e, 0x6e, 0xef, 0xcf, 0x3f, 
+  0x1c, 0xc6, 0x3d, 0x95, 0x54, 0xa3, 0x80, 0x66, 
+  0x37, 0xc1, 0xea, 0x00, 0xed, 0x3a, 0x33, 0x94, 
+  0xd6, 0x46, 0x04, 0x54, 0x23, 0x82, 0x63, 0xa0, 
+  0xf4, 0xb2, 0xd1, 0x00, 0x63, 0x56, 0xa6, 0xa1, 
+  0xf4, 0x31, 0xd1, 0xeb, 0x12, 0xcd, 0x46, 0xa9, 
+  0x67, 0xa7, 0x23, 0x84, 0x49, 0x78, 0x21, 0x47, 
+  0xcf, 0x02, 0x7e, 0x62, 0x78, 0x2a, 0x58, 0x2b, 
+  0xa5, 0x04, 0x7f, 0x0e, 0xd9, 0x93, 0xf6, 0x76, 
+  0xa2, 0x83, 0x1a, 0xe8, 0xd5, 0x45, 0x30, 0xad, 
+  0x1d, 0xc3, 0x5b, 0xb1, 0x52, 0xda, 0x7d, 0xb6, 
+  0xe1, 0x15, 0x81, 0xbb, 0x99, 0x0d, 0x23, 0x20, 
+  0x92, 0xc7, 0xb2, 0xcd, 0x8f, 0x6d, 0x9f, 0x47, 
+  0xff, 0x3b, 0x84, 0x09, 0x09, 0xe8, 0x79, 0xd3, 
+  0xb4, 0xb1, 0xcc, 0x81, 0xa1, 0x99, 0x26, 0x82, 
+  0x41, 0xd4, 0x24, 0x6b, 0x28, 0xb5, 0x41, 0x2b, 
+  0x00, 0xae, 0x4e, 0x53, 0x17, 0x6e, 0xf1, 0x8a, 
+  0xa9, 0xea, 0x8d, 0x03, 0x20, 0x40, 0xef, 0x41, 
+  0x3e, 0xf6, 0x90, 0x3b, 0x6f, 0x69, 0x5d, 0xac, 
+  0x24, 0x38, 0x0f, 0xeb, 0xca, 0xf7, 0x01, 0x6b, 
+  0x02, 0x22, 0x50, 0xb3, 0x1f, 0xa9, 0x04, 0xb9, 
+  0x2b, 0xb2, 0x62, 0x32, 0x8c, 0xa7, 0xfb, 0xe0, 
+  0xb8, 0xf6, 0xa8, 0x3b, 0xed, 0x52, 0xc5, 0x97, 
+  0x82, 0x8d, 0x8f, 0xb9, 0x5b, 0x63, 0x8c, 0xb7, 
+  0x94, 0xb1, 0x1a, 0xcd, 0x1e, 0xa9, 0xd4, 0xce, 
+  0x33, 0x2b, 0x75, 0xfc, 0x93, 0xe1, 0xc1, 0x92, 
+  0x3f, 0x04, 0xe0, 0xe0, 0xa4, 0x43, 0x3f, 0x39, 
+  0xf4, 0x91, 0xef, 0x7b, 0x76, 0xf0, 0x9e, 0x31, 
+  0xe9, 0x9b, 0xf3, 0x41, 0x41, 0xec, 0x2b, 0xe4, 
+  0xd4, 0x8b, 0xa6, 0xfc, 0x71, 0x4d, 0x02, 0xc1, 
+  0x18, 0xb8, 0xbf, 0xa3, 0x58, 0x18, 0xa3, 0x24, 
+  0x77, 0xc7, 0xe2, 0xf8, 0x38, 0x42, 0xdd, 0xa4, 
+  0x03, 0x2f, 0x1e, 0xe6, 0x1c, 0x07, 0x3a, 0x82, 
+  0x33, 0x4a, 0xb6, 0x68, 0xc6, 0x41, 0x07, 0xa6, 
+  0x2a, 0x7d, 0x48, 0x0f, 0x87, 0x19, 0x40, 0x18, 
+  0xc7, 0xd1, 0x8c, 0xf2, 0xdc, 0xa6, 0xa9, 0x80, 
+  0xa6, 0x83, 0x7a, 0x13, 0x00, 0xfc, 0xa2, 0xb0, 
+  0x83, 0x53, 0xe9, 0x4f, 0xf7, 0xfa, 0x93, 0xa6, 
+  0x9e, 0x7b, 0x4a, 0x40, 0xa2, 0xb4, 0x4e, 0x1a, 
+  0x60, 0xda, 0x10, 0xd7, 0x54, 0x6c, 0x01, 0xeb, 
+  0x65, 0x29, 0x9d, 0xfd, 0x18, 0x0a, 0x99, 0x20, 
+  0x27, 0x96, 0x4b, 0x60, 0x40, 0x62, 0x56, 0x48, 
+  0x6d, 0x96, 0x85, 0xe0, 0xf5, 0xbe, 0x5d, 0x02, 
+  0xc6, 0xc1, 0xbe, 0x3f, 0x3b, 0x4e, 0x58, 0x53, 
+  0xfa, 0x1b, 0x66, 0x4f, 0x56, 0x06, 0xa7, 0x66, 
+  0x36, 0x7a, 0x73, 0x12, 0xae, 0xea, 0x17, 0x8f, 
+  0x1c, 0x7c, 0xda, 0x06, 0x07, 0x97, 0xa7, 0x92, 
+  0x7f, 0x84, 0x82, 0xb9, 0x10, 0x77, 0xf1, 0x74, 
+  0xf1, 0xdd, 0x27, 0xbb, 0x2b, 0xf4, 0x51, 0xc1, 
+  0x7f, 0x8b, 0x49, 0xd1, 0xee, 0x81, 0x13, 0x27, 
+  0x63, 0xcb, 0x65, 0xd5, 0xe6, 0x15, 0xb8, 0x31, 
+  0x1f, 0xdf, 0x4a, 0x1c, 0x49, 0xf9, 0xad, 0xc8, 
+  0xe4, 0x89, 0x86, 0xf8, 0xb6, 0x80, 0x71, 0x23, 
+  0x9a, 0x6b, 0x40, 0x75, 0xa3, 0x2c, 0xaa, 0x2b, 
+  0xa0, 0xbb, 0x7c, 0xca, 0x6b, 0x9b, 0x2b, 0xf7, 
+  0xd8, 0x84, 0x8b, 0x46, 0x9b, 0x81, 0xe7, 0xa8, 
+  0x9c, 0xc3, 0xfd, 0x1d, 0x95, 0x22, 0x91, 0xed, 
+  0x51, 0x55, 0xf2, 0xda, 0xee, 0x55, 0x2e, 0xbc, 
+  0xa5, 0xd6, 0x4f, 0x69, 0x1b, 0x11, 0x57, 0xa0, 
+  0x30, 0x65, 0x32, 0xbf, 0xc3, 0xbc, 0x69, 0xc9, 
+  0x0e, 0x2e, 0xa9, 0xdb, 0x10, 0x78, 0xee, 0x94, 
+  0x4c, 0xd8, 0x33, 0x99, 0xbf, 0xc4, 0xac, 0x96, 
+  0x9b, 0xca, 0x5f, 0xfb, 0x64, 0x3b, 0xdc, 0xb6, 
+  0x38, 0xeb, 0xc3, 0x44, 0x36, 0x25, 0xca, 0x87, 
+  0x64, 0xfc, 0xb2, 0x6d, 0x8e, 0x4c, 0x16, 0x2e, 
+  0x67, 0x6f, 0xc4, 0x8b, 0xa5, 0x30, 0xcd, 0x05, 
+  0xc6, 0x1e, 0x95, 0xe7, 0xd5, 0x6a, 0xe4, 0x99, 
+  0x44, 0x68, 0x94, 0x4b, 0xbd, 0x2d, 0xa0, 0xd4, 
+  0x16, 0x52, 0xf5, 0x6a, 0xba, 0xea, 0x80, 0x95, 
+  0x63, 0xdb, 0x73, 0x54, 0xd4, 0x47, 0x4b, 0xd0, 
+  0xb5, 0x09, 0x5f, 0x35, 0x46, 0xfe, 0x16, 0x60, 
+  0xdf, 0x8b, 0xc2, 0xd2, 0xa7, 0xf2, 0x17, 0xc8, 
+  0x0f, 0x9c, 0x65, 0xd9, 0xba, 0x95, 0xd2, 0xa0, 
+  0x9d, 0x52, 0xa1, 0x95, 0xd2, 0xa1, 0x42, 0x40, 
+  0xa9, 0x90, 0xa4, 0x34, 0x5b, 0xd1, 0x5f, 0xc4, 
+  0x72, 0x2e, 0x34, 0x15, 0xdc, 0xc0, 0x46, 0xc5, 
+  0x0b, 0x9b, 0x84, 0x47, 0x34, 0x25, 0x38, 0x1e, 
+  0x95, 0x4a, 0x04, 0xdb, 0x5d, 0x1e, 0x7b, 0x1c, 
+  0xeb, 0x1c, 0xb8, 0x0a, 0x2d, 0xd2, 0xc6, 0x3a, 
+  0x44, 0xb0, 0xd5, 0xb2, 0xea, 0x84, 0xbd, 0xd6, 
+  0xb2, 0x6e, 0x8a, 0x59, 0xdb, 0xab, 0xda, 0x7e, 
+  0x8b, 0x55, 0x5d, 0x06, 0xee, 0x72, 0x50, 0xb7, 
+  0x01, 0x73, 0x73, 0x88, 0x1b, 0x93, 0x46, 0x09, 
+  0x68, 0x0b, 0x61, 0x6d, 0x9e, 0x2b, 0x9c, 0x9b, 
+  0x5c, 0xa1, 0x4e, 0xae, 0x70, 0x76, 0xfc, 0xb9, 
+  0xc2, 0x95, 0xfe, 0x64, 0x31, 0xe0, 0x0b, 0xe5, 
+  0x99, 0x64, 0xe1, 0x9d, 0x26, 0x0b, 0x74, 0x69, 
+  0x92, 0x05, 0x93, 0x2c, 0x98, 0x64, 0xe1, 0xe5, 
+  0x92, 0x05, 0xfb, 0xb5, 0x92, 0x85, 0x22, 0x48, 
+  0x8b, 0xe1, 0x6c, 0x4c, 0xc4, 0xcd, 0x70, 0x6c, 
+  0x44, 0xbc, 0x05, 0xf8, 0xe5, 0x62, 0x57, 0x75, 
+  0xbb, 0x2a, 0xb9, 0xf5, 0x37, 0xee, 0xfc, 0x76, 
+  0x55, 0xe3, 0x1c, 0xf2, 0x21, 0x5e, 0x98, 0x54, 
+  0xb2, 0x4e, 0x2a, 0xe9, 0xe0, 0x0d, 0x95, 0xfb, 
+  0x90, 0xbb, 0x3d, 0xae, 0xc4, 0x72, 0xb6, 0x1d, 
+  0x84, 0xe6, 0x35, 0xe9, 0x08, 0xf3, 0x45, 0x68, 
+  0xdb, 0xe5, 0xa9, 0x49, 0x42, 0x8f, 0x2f, 0x09, 
+  0x3d, 0x70, 0x86, 0x07, 0x3f, 0xe0, 0xc2, 0xd5, 
+  0xf5, 0xc7, 0xf1, 0x57, 0x59, 0x37, 0x1e, 0x04, 
+  0x60, 0x51, 0x69, 0x71, 0x61, 0x85, 0x16, 0x5b, 
+  0x4a, 0xff, 0xa5, 0xd2, 0x67, 0x78, 0x7b, 0x62, 
+  0xd2, 0x53, 0x93, 0x9e, 0x9a, 0xbd, 0xac, 0xfa, 
+  0xb1, 0x74, 0xd3, 0xe7, 0x84, 0x64, 0x17, 0x3f, 
+  0x37, 0x15, 0xe2, 0xe7, 0xcb, 0x2f, 0xcb, 0x46, 
+  0x16, 0x99, 0xb2, 0xa9, 0x96, 0x8b, 0xbf, 0x54, 
+  0xd5, 0x64, 0x77, 0xab, 0x6a, 0x4a, 0x96, 0x14, 
+  0x97, 0xbd, 0xbd, 0xc9, 0x7f, 0x51, 0xa7, 0xb5, 
+  0x27, 0x96, 0x62, 0x01, 0x1c, 0x44, 0x75, 0x01, 
+  0x56, 0x35, 0xc2, 0xfc, 0xe2, 0x01, 0x49, 0xfc, 
+  0x58, 0x82, 0x84, 0x07, 0x76, 0xbf, 0x98, 0x90, 
+  0x4b, 0x21, 0x94, 0x57, 0xb3, 0x9a, 0xcb, 0x4e, 
+  0x71, 0x7e, 0x4a, 0xb0, 0xe2, 0xae, 0xc1, 0xb5, 
+  0x18, 0xe5, 0xb5, 0xdd, 0xbf, 0x6d, 0x7e, 0x6e, 
+  0xd2, 0x4d, 0x8d, 0x1f, 0x52, 0xe4, 0x75, 0x57, 
+  0xf7, 0x47, 0x15, 0x79, 0x7d, 0xba, 0x01, 0x0e, 
+  0x85, 0x84, 0x2e, 0x25, 0x58, 0xcf, 0x67, 0x15, 
+  0x73, 0xdf, 0x51, 0x20, 0xe9, 0x78, 0x82, 0x93, 
+  0xeb, 0xaf, 0xbe, 0xa0, 0x5c, 0xc9, 0xd6, 0xfd, 
+  0xf5, 0xda, 0x13, 0xeb, 0xb8, 0x16, 0x89, 0x2f, 
+  0x60, 0xdc, 0xd5, 0xb8, 0xab, 0xc9, 0xfb, 0x8e, 
+  0x67, 0xbb, 0x7c, 0xf4, 0x92, 0x89, 0x5f, 0x7b, 
+  0x72, 0xde, 0xd2, 0x93, 0x5e, 0x5f, 0xca, 0xdb, 
+  0x58, 0xa0, 0x3d, 0xea, 0xb7, 0x40, 0xfb, 0x7b, 
+  0x1c, 0x39, 0x5e, 0x4b, 0xa0, 0x5d, 0xc1, 0x8d, 
+  0x7b, 0xa4, 0xed, 0x1e, 0x19, 0x6d, 0x77, 0x6b, 
+  0x65, 0xdf, 0xc5, 0x91, 0x97, 0x7d, 0x2d, 0x6c, 
+  0x71, 0x5d, 0xf4, 0x7f, 0x53, 0xab, 0x15, 0x65, 
+  0xb2, 0xa9, 0x51, 0x3a, 0x53, 0xa3, 0x64, 0x0b, 
+  0x89, 0xa2, 0xe7, 0xa3, 0x94, 0xd1, 0x1c, 0x77, 
+  0x7a, 0xd5, 0xd6, 0x97, 0x0e, 0x19, 0x1d, 0x8b, 
+  0x49, 0xcc, 0x8f, 0x44, 0xc7, 0x72, 0xfe, 0x0e, 
+  0x74, 0x2c, 0x72, 0xff, 0xcc, 0x24, 0x23, 0x65, 
+  0xa9, 0x7f, 0xfb, 0x2d, 0x26, 0x7d, 0x23, 0x64, 
+  0x31, 0x42, 0x96, 0xf7, 0x2c, 0x64, 0x89, 0xbd, 
+  0xc0, 0xc8, 0x58, 0x8c, 0x8c, 0xc5, 0xc8, 0x58, 
+  0x4c, 0x05, 0x55, 0x3f, 0x8e, 0x1a, 0x11, 0x8b, 
+  0xb9, 0x99, 0x61, 0x44, 0x2c, 0xcf, 0x20, 0xc4, 
+  0xae, 0x1b, 0x65, 0xb8, 0xe3, 0x23, 0x96, 0xc0, 
+  0xd8, 0xa7, 0x46, 0x03, 0xf3, 0x66, 0x1a, 0x98, 
+  0xa7, 0x0f, 0xf6, 0x35, 0x0a, 0x18, 0x73, 0x4b, 
+  0xdd, 0xec, 0x2e, 0x77, 0x59, 0x01, 0xd3, 0xae, 
+  0xb7, 0x1a, 0xfd, 0x8b, 0x71, 0x56, 0x93, 0x32, 
+  0x1a, 0xfd, 0x4b, 0x67, 0xf4, 0x2f, 0xa3, 0xce, 
+  0xea, 0x5f, 0xc6, 0xfd, 0xd6, 0xbf, 0x64, 0xbf, 
+  0x23, 0xe1, 0xcd, 0x27, 0xb5, 0x57, 0x12, 0x18, 
+  0xdb, 0x48, 0x60, 0x5a, 0x2b, 0xfb, 0xc6, 0xbd, 
+  0xad, 0xfa, 0xc6, 0xaf, 0x25, 0x81, 0xf9, 0x78, 
+  0x9c, 0x12, 0x98, 0x1f, 0x81, 0x20, 0x20, 0xa5, 
+  0x08, 0xac, 0x35, 0xbe, 0x83, 0x95, 0x2f, 0x2d, 
+  0xdd, 0xce, 0x92, 0x40, 0x04, 0x77, 0x8d, 0x28, 
+  0xa6, 0xef, 0x5b, 0xba, 0x4a, 0x28, 0xcc, 0x9c, 
+  0xdd, 0xcc, 0x1e, 0xe7, 0x02, 0x3e, 0x35, 0x8b, 
+  0xd4, 0xa4, 0xeb, 0xc7, 0xae, 0x8a, 0x29, 0x7e, 
+  0x28, 0xfe, 0xb8, 0xeb, 0x0f, 0x6e, 0x6f, 0xf6, 
+  0x84, 0xfb, 0xba, 0x8c, 0x98, 0xf1, 0xa4, 0xfb, 
+  0x6e, 0x30, 0x62, 0xa5, 0x6e, 0x9a, 0x3c, 0xf8, 
+  0x3e, 0x1b, 0x9b, 0xc2, 0x87, 0xdf, 0x8f, 0xf3, 
+  0x1e, 0x7e, 0xdf, 0xda, 0x2d, 0x5f, 0xf3, 0x7b, 
+  0xe8, 0xbe, 0x6c, 0x0b, 0x8c, 0x3b, 0xbb, 0x2d, 
+  0xf0, 0x67, 0xbf, 0xb7, 0x05, 0x7e, 0xc7, 0x94, 
+  0xf4, 0xfa, 0x7b, 0x02, 0xe3, 0x8e, 0xed, 0x09, 
+  0xb4, 0xf7, 0xd2, 0x9f, 0xaa, 0x6f, 0xb4, 0x69, 
+  0xfa, 0xce, 0x9f, 0x17, 0x7a, 0xef, 0x5a, 0x96, 
+  0xe9, 0x75, 0xcc, 0xae, 0x6e, 0x72, 0x65, 0x73, 
+  0x53, 0x4c, 0x7d, 0x66, 0x66, 0xd2, 0xc4, 0xc4, 
+  0x97, 0x93, 0x78, 0x83, 0x7f, 0xb0, 0xa6, 0xee, 
+  0x02, 0x94, 0xdc, 0xb7, 0x48, 0x1c, 0xb6, 0x02, 
+  0x90, 0xbe, 0xe0, 0x52, 0x8f, 0xe6, 0x14, 0xcd, 
+  0x9e, 0xbe, 0x79, 0x71, 0x32, 0x4c, 0x9c, 0xf8, 
+  0x70, 0x81, 0xc3, 0x4e, 0x1f, 0x87, 0x30, 0x19, 
+  0x3e, 0x79, 0x53, 0xeb, 0xff, 0x51, 0x82, 0x20, 
+  0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29
+} };
+
+static GStaticResource static_resource = { gpm_resource_data.data, sizeof (gpm_resource_data.data) };
+extern GResource *gpm_get_resource (void);
+GResource *gpm_get_resource (void)
+{
+  return g_static_resource_get_resource (&static_resource);
+}
+/*
+  If G_HAS_CONSTRUCTORS is true then the compiler support *both* constructors and
+  destructors, in a sane way, including e.g. on library unload. If not you're on
+  your own.
+
+  Some compilers need #pragma to handle this, which does not work with macros,
+  so the way you need to use this is (for constructors):
+
+  #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+  #pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(my_constructor)
+  #endif
+  G_DEFINE_CONSTRUCTOR(my_constructor)
+  static void my_constructor(void) {
+   ...
+  }
+
+*/
+
+#if  __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR(_func) static void __attribute__((constructor)) _func (void);
+#define G_DEFINE_DESTRUCTOR(_func) static void __attribute__((destructor)) _func (void);
+
+#elif defined (_MSC_VER) && (_MSC_VER >= 1500)
+/* Visual studio 2008 and later has _Pragma */
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _wrapper(void) { _func(); return 0; } \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _wrapper;
+
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _constructor(void) { atexit (_func); return 0; } \
+  __pragma(section(".CRT$XCU",read)) \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined (_MSC_VER)
+
+#define G_HAS_CONSTRUCTORS 1
+
+/* Pre Visual studio 2008 must use #pragma section */
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _wrapper(void) { _func(); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (*p)(void) = _func ## _wrapper;
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  section(".CRT$XCU",read)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void); \
+  static int _func ## _constructor(void) { atexit (_func); return 0; } \
+  __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor;
+
+#elif defined(__SUNPRO_C)
+
+/* This is not tested, but i believe it should work, based on:
+ * http://opensource.apple.com/source/OpenSSL098/OpenSSL098-35/src/fips/fips_premain.c
+ */
+
+#define G_HAS_CONSTRUCTORS 1
+
+#define G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA 1
+#define G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA 1
+
+#define G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(_func) \
+  init(_func)
+#define G_DEFINE_CONSTRUCTOR(_func) \
+  static void _func(void);
+
+#define G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(_func) \
+  fini(_func)
+#define G_DEFINE_DESTRUCTOR(_func) \
+  static void _func(void);
+
+#else
+
+/* constructors not supported for this compiler */
+
+#endif
+
+
+#ifdef G_HAS_CONSTRUCTORS
+
+#ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(resource_constructor)
+#endif
+G_DEFINE_CONSTRUCTOR(resource_constructor)
+#ifdef G_DEFINE_DESTRUCTOR_NEEDS_PRAGMA
+#pragma G_DEFINE_DESTRUCTOR_PRAGMA_ARGS(resource_destructor)
+#endif
+G_DEFINE_DESTRUCTOR(resource_destructor)
+
+#else
+#warning "Constructor not supported on this compiler, linking in resources will not work"
+#endif
+
+static void resource_constructor (void)
+{
+  g_static_resource_init (&static_resource);
+}
+
+static void resource_destructor (void)
+{
+  g_static_resource_fini (&static_resource);
+}
diff -Nru gnome-power-manager-3.3.3/src/gpm-resources.h gnome-power-manager-3.3.92/src/gpm-resources.h
--- gnome-power-manager-3.3.3/src/gpm-resources.h	1970-01-01 00:00:00.000000000 +0000
+++ gnome-power-manager-3.3.92/src/gpm-resources.h	2012-03-18 19:54:10.000000000 +0000
@@ -0,0 +1,7 @@
+#ifndef __RESOURCE_gpm_H__
+#define __RESOURCE_gpm_H__
+
+#include <gio/gio.h>
+
+extern GResource *gpm_get_resource (void);
+#endif
diff -Nru gnome-power-manager-3.3.3/src/gpm-statistics.c gnome-power-manager-3.3.92/src/gpm-statistics.c
--- gnome-power-manager-3.3.3/src/gpm-statistics.c	2011-10-17 10:02:18.000000000 +0000
+++ gnome-power-manager-3.3.92/src/gpm-statistics.c	2012-02-09 16:18:25.000000000 +0000
@@ -1908,7 +1908,9 @@
 
 	/* get UI */
 	builder = gtk_builder_new ();
-	retval = gtk_builder_add_from_file (builder, GPM_DATA "/gpm-statistics.ui", &error);
+	retval = gtk_builder_add_from_resource (builder,
+						"/org/gnome/power-manager/gpm-statistics.ui",
+						&error);
 	if (retval == 0) {
 		g_warning ("failed to load ui: %s", error->message);
 		g_error_free (error);
diff -Nru gnome-power-manager-3.3.3/src/Makefile.am gnome-power-manager-3.3.92/src/Makefile.am
--- gnome-power-manager-3.3.3/src/Makefile.am	2011-08-05 09:50:08.000000000 +0000
+++ gnome-power-manager-3.3.92/src/Makefile.am	2012-02-09 17:25:08.000000000 +0000
@@ -32,6 +32,8 @@
 	gpm-array-float.c				\
 	gpm-array-float.h				\
 	gpm-statistics.c				\
+	gpm-resources.c					\
+	gpm-resources.h					\
 	gpm-point-obj.c					\
 	gpm-point-obj.h					\
 	gpm-graph-widget.h				\
@@ -65,6 +67,19 @@
 
 gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS)
 
+gpm-resources.c: gnome-power-manager.gresource.xml ../data/gpm-statistics.ui
+	glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-source --c-name gpm $(srcdir)/gnome-power-manager.gresource.xml
+gpm-resources.h: gnome-power-manager.gresource.xml
+	glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-header --c-name gpm $(srcdir)/gnome-power-manager.gresource.xml
+
+BUILT_SOURCES =						\
+	gpm-resources.c					\
+	gpm-resources.h					\
+	$(NULL)
+
+EXTRA_DIST =						\
+	gnome-power-manager.gresource.xml
+
 clean-local:
 	rm -f *~
 
diff -Nru gnome-power-manager-3.3.3/src/Makefile.in gnome-power-manager-3.3.92/src/Makefile.in
--- gnome-power-manager-3.3.3/src/Makefile.in	2011-12-19 10:55:38.000000000 +0000
+++ gnome-power-manager-3.3.92/src/Makefile.in	2012-03-18 19:54:02.000000000 +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.
@@ -59,8 +59,8 @@
 am__DEPENDENCIES_1 =
 gnome_power_self_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 gnome_power_self_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -69,6 +69,7 @@
 am_gnome_power_statistics_OBJECTS =  \
 	gnome_power_statistics-gpm-array-float.$(OBJEXT) \
 	gnome_power_statistics-gpm-statistics.$(OBJEXT) \
+	gnome_power_statistics-gpm-resources.$(OBJEXT) \
 	gnome_power_statistics-gpm-point-obj.$(OBJEXT) \
 	gnome_power_statistics-gpm-graph-widget.$(OBJEXT)
 gnome_power_statistics_OBJECTS = $(am_gnome_power_statistics_OBJECTS)
@@ -88,21 +89,21 @@
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(gnome_power_self_test_SOURCES) \
 	$(gnome_power_statistics_SOURCES)
@@ -292,6 +293,8 @@
 	gpm-array-float.c				\
 	gpm-array-float.h				\
 	gpm-statistics.c				\
+	gpm-resources.c					\
+	gpm-resources.h					\
 	gpm-point-obj.c					\
 	gpm-point-obj.h					\
 	gpm-graph-widget.h				\
@@ -324,12 +327,21 @@
 	-lm
 
 gnome_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS)
+BUILT_SOURCES = \
+	gpm-resources.c					\
+	gpm-resources.h					\
+	$(NULL)
+
+EXTRA_DIST = \
+	gnome-power-manager.gresource.xml
+
 CLEANFILES = $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = \
 	*~			      			\
 	Makefile.in
 
-all: all-am
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -415,10 +427,10 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-gnome-power-self-test$(EXEEXT): $(gnome_power_self_test_OBJECTS) $(gnome_power_self_test_DEPENDENCIES) 
+gnome-power-self-test$(EXEEXT): $(gnome_power_self_test_OBJECTS) $(gnome_power_self_test_DEPENDENCIES) $(EXTRA_gnome_power_self_test_DEPENDENCIES) 
 	@rm -f gnome-power-self-test$(EXEEXT)
 	$(AM_V_CCLD)$(gnome_power_self_test_LINK) $(gnome_power_self_test_OBJECTS) $(gnome_power_self_test_LDADD) $(LIBS)
-gnome-power-statistics$(EXEEXT): $(gnome_power_statistics_OBJECTS) $(gnome_power_statistics_DEPENDENCIES) 
+gnome-power-statistics$(EXEEXT): $(gnome_power_statistics_OBJECTS) $(gnome_power_statistics_DEPENDENCIES) $(EXTRA_gnome_power_statistics_DEPENDENCIES) 
 	@rm -f gnome-power-statistics$(EXEEXT)
 	$(AM_V_CCLD)$(gnome_power_statistics_LINK) $(gnome_power_statistics_OBJECTS) $(gnome_power_statistics_LDADD) $(LIBS)
 
@@ -433,127 +445,127 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_statistics-gpm-array-float.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_statistics-gpm-graph-widget.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_statistics-gpm-point-obj.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_statistics-gpm-resources.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_power_statistics-gpm-statistics.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 gnome_power_self_test-gpm-array-float.o: gpm-array-float.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -MT gnome_power_self_test-gpm-array-float.o -MD -MP -MF $(DEPDIR)/gnome_power_self_test-gpm-array-float.Tpo -c -o gnome_power_self_test-gpm-array-float.o `test -f 'gpm-array-float.c' || echo '$(srcdir)/'`gpm-array-float.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_self_test-gpm-array-float.Tpo $(DEPDIR)/gnome_power_self_test-gpm-array-float.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-array-float.c' object='gnome_power_self_test-gpm-array-float.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-array-float.c' object='gnome_power_self_test-gpm-array-float.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -c -o gnome_power_self_test-gpm-array-float.o `test -f 'gpm-array-float.c' || echo '$(srcdir)/'`gpm-array-float.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -c -o gnome_power_self_test-gpm-array-float.o `test -f 'gpm-array-float.c' || echo '$(srcdir)/'`gpm-array-float.c
 
 gnome_power_self_test-gpm-array-float.obj: gpm-array-float.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -MT gnome_power_self_test-gpm-array-float.obj -MD -MP -MF $(DEPDIR)/gnome_power_self_test-gpm-array-float.Tpo -c -o gnome_power_self_test-gpm-array-float.obj `if test -f 'gpm-array-float.c'; then $(CYGPATH_W) 'gpm-array-float.c'; else $(CYGPATH_W) '$(srcdir)/gpm-array-float.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_self_test-gpm-array-float.Tpo $(DEPDIR)/gnome_power_self_test-gpm-array-float.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-array-float.c' object='gnome_power_self_test-gpm-array-float.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-array-float.c' object='gnome_power_self_test-gpm-array-float.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -c -o gnome_power_self_test-gpm-array-float.obj `if test -f 'gpm-array-float.c'; then $(CYGPATH_W) 'gpm-array-float.c'; else $(CYGPATH_W) '$(srcdir)/gpm-array-float.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -c -o gnome_power_self_test-gpm-array-float.obj `if test -f 'gpm-array-float.c'; then $(CYGPATH_W) 'gpm-array-float.c'; else $(CYGPATH_W) '$(srcdir)/gpm-array-float.c'; fi`
 
 gnome_power_self_test-gpm-self-test.o: gpm-self-test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -MT gnome_power_self_test-gpm-self-test.o -MD -MP -MF $(DEPDIR)/gnome_power_self_test-gpm-self-test.Tpo -c -o gnome_power_self_test-gpm-self-test.o `test -f 'gpm-self-test.c' || echo '$(srcdir)/'`gpm-self-test.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_self_test-gpm-self-test.Tpo $(DEPDIR)/gnome_power_self_test-gpm-self-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-self-test.c' object='gnome_power_self_test-gpm-self-test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-self-test.c' object='gnome_power_self_test-gpm-self-test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -c -o gnome_power_self_test-gpm-self-test.o `test -f 'gpm-self-test.c' || echo '$(srcdir)/'`gpm-self-test.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -c -o gnome_power_self_test-gpm-self-test.o `test -f 'gpm-self-test.c' || echo '$(srcdir)/'`gpm-self-test.c
 
 gnome_power_self_test-gpm-self-test.obj: gpm-self-test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -MT gnome_power_self_test-gpm-self-test.obj -MD -MP -MF $(DEPDIR)/gnome_power_self_test-gpm-self-test.Tpo -c -o gnome_power_self_test-gpm-self-test.obj `if test -f 'gpm-self-test.c'; then $(CYGPATH_W) 'gpm-self-test.c'; else $(CYGPATH_W) '$(srcdir)/gpm-self-test.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_self_test-gpm-self-test.Tpo $(DEPDIR)/gnome_power_self_test-gpm-self-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-self-test.c' object='gnome_power_self_test-gpm-self-test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-self-test.c' object='gnome_power_self_test-gpm-self-test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -c -o gnome_power_self_test-gpm-self-test.obj `if test -f 'gpm-self-test.c'; then $(CYGPATH_W) 'gpm-self-test.c'; else $(CYGPATH_W) '$(srcdir)/gpm-self-test.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_self_test_CFLAGS) $(CFLAGS) -c -o gnome_power_self_test-gpm-self-test.obj `if test -f 'gpm-self-test.c'; then $(CYGPATH_W) 'gpm-self-test.c'; else $(CYGPATH_W) '$(srcdir)/gpm-self-test.c'; fi`
 
 gnome_power_statistics-gpm-array-float.o: gpm-array-float.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-array-float.o -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-array-float.Tpo -c -o gnome_power_statistics-gpm-array-float.o `test -f 'gpm-array-float.c' || echo '$(srcdir)/'`gpm-array-float.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-array-float.Tpo $(DEPDIR)/gnome_power_statistics-gpm-array-float.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-array-float.c' object='gnome_power_statistics-gpm-array-float.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-array-float.c' object='gnome_power_statistics-gpm-array-float.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-array-float.o `test -f 'gpm-array-float.c' || echo '$(srcdir)/'`gpm-array-float.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-array-float.o `test -f 'gpm-array-float.c' || echo '$(srcdir)/'`gpm-array-float.c
 
 gnome_power_statistics-gpm-array-float.obj: gpm-array-float.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-array-float.obj -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-array-float.Tpo -c -o gnome_power_statistics-gpm-array-float.obj `if test -f 'gpm-array-float.c'; then $(CYGPATH_W) 'gpm-array-float.c'; else $(CYGPATH_W) '$(srcdir)/gpm-array-float.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-array-float.Tpo $(DEPDIR)/gnome_power_statistics-gpm-array-float.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-array-float.c' object='gnome_power_statistics-gpm-array-float.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-array-float.c' object='gnome_power_statistics-gpm-array-float.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-array-float.obj `if test -f 'gpm-array-float.c'; then $(CYGPATH_W) 'gpm-array-float.c'; else $(CYGPATH_W) '$(srcdir)/gpm-array-float.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-array-float.obj `if test -f 'gpm-array-float.c'; then $(CYGPATH_W) 'gpm-array-float.c'; else $(CYGPATH_W) '$(srcdir)/gpm-array-float.c'; fi`
 
 gnome_power_statistics-gpm-statistics.o: gpm-statistics.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-statistics.o -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-statistics.Tpo -c -o gnome_power_statistics-gpm-statistics.o `test -f 'gpm-statistics.c' || echo '$(srcdir)/'`gpm-statistics.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-statistics.Tpo $(DEPDIR)/gnome_power_statistics-gpm-statistics.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-statistics.c' object='gnome_power_statistics-gpm-statistics.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-statistics.c' object='gnome_power_statistics-gpm-statistics.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-statistics.o `test -f 'gpm-statistics.c' || echo '$(srcdir)/'`gpm-statistics.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-statistics.o `test -f 'gpm-statistics.c' || echo '$(srcdir)/'`gpm-statistics.c
 
 gnome_power_statistics-gpm-statistics.obj: gpm-statistics.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-statistics.obj -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-statistics.Tpo -c -o gnome_power_statistics-gpm-statistics.obj `if test -f 'gpm-statistics.c'; then $(CYGPATH_W) 'gpm-statistics.c'; else $(CYGPATH_W) '$(srcdir)/gpm-statistics.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-statistics.Tpo $(DEPDIR)/gnome_power_statistics-gpm-statistics.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-statistics.c' object='gnome_power_statistics-gpm-statistics.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-statistics.c' object='gnome_power_statistics-gpm-statistics.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-statistics.obj `if test -f 'gpm-statistics.c'; then $(CYGPATH_W) 'gpm-statistics.c'; else $(CYGPATH_W) '$(srcdir)/gpm-statistics.c'; fi`
+
+gnome_power_statistics-gpm-resources.o: gpm-resources.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-resources.o -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-resources.Tpo -c -o gnome_power_statistics-gpm-resources.o `test -f 'gpm-resources.c' || echo '$(srcdir)/'`gpm-resources.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-resources.Tpo $(DEPDIR)/gnome_power_statistics-gpm-resources.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-resources.c' object='gnome_power_statistics-gpm-resources.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-statistics.obj `if test -f 'gpm-statistics.c'; then $(CYGPATH_W) 'gpm-statistics.c'; else $(CYGPATH_W) '$(srcdir)/gpm-statistics.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-resources.o `test -f 'gpm-resources.c' || echo '$(srcdir)/'`gpm-resources.c
+
+gnome_power_statistics-gpm-resources.obj: gpm-resources.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-resources.obj -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-resources.Tpo -c -o gnome_power_statistics-gpm-resources.obj `if test -f 'gpm-resources.c'; then $(CYGPATH_W) 'gpm-resources.c'; else $(CYGPATH_W) '$(srcdir)/gpm-resources.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-resources.Tpo $(DEPDIR)/gnome_power_statistics-gpm-resources.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-resources.c' object='gnome_power_statistics-gpm-resources.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-resources.obj `if test -f 'gpm-resources.c'; then $(CYGPATH_W) 'gpm-resources.c'; else $(CYGPATH_W) '$(srcdir)/gpm-resources.c'; fi`
 
 gnome_power_statistics-gpm-point-obj.o: gpm-point-obj.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-point-obj.o -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-point-obj.Tpo -c -o gnome_power_statistics-gpm-point-obj.o `test -f 'gpm-point-obj.c' || echo '$(srcdir)/'`gpm-point-obj.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-point-obj.Tpo $(DEPDIR)/gnome_power_statistics-gpm-point-obj.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-point-obj.c' object='gnome_power_statistics-gpm-point-obj.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-point-obj.c' object='gnome_power_statistics-gpm-point-obj.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-point-obj.o `test -f 'gpm-point-obj.c' || echo '$(srcdir)/'`gpm-point-obj.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-point-obj.o `test -f 'gpm-point-obj.c' || echo '$(srcdir)/'`gpm-point-obj.c
 
 gnome_power_statistics-gpm-point-obj.obj: gpm-point-obj.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-point-obj.obj -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-point-obj.Tpo -c -o gnome_power_statistics-gpm-point-obj.obj `if test -f 'gpm-point-obj.c'; then $(CYGPATH_W) 'gpm-point-obj.c'; else $(CYGPATH_W) '$(srcdir)/gpm-point-obj.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-point-obj.Tpo $(DEPDIR)/gnome_power_statistics-gpm-point-obj.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-point-obj.c' object='gnome_power_statistics-gpm-point-obj.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-point-obj.c' object='gnome_power_statistics-gpm-point-obj.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-point-obj.obj `if test -f 'gpm-point-obj.c'; then $(CYGPATH_W) 'gpm-point-obj.c'; else $(CYGPATH_W) '$(srcdir)/gpm-point-obj.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-point-obj.obj `if test -f 'gpm-point-obj.c'; then $(CYGPATH_W) 'gpm-point-obj.c'; else $(CYGPATH_W) '$(srcdir)/gpm-point-obj.c'; fi`
 
 gnome_power_statistics-gpm-graph-widget.o: gpm-graph-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-graph-widget.o -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-graph-widget.Tpo -c -o gnome_power_statistics-gpm-graph-widget.o `test -f 'gpm-graph-widget.c' || echo '$(srcdir)/'`gpm-graph-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-graph-widget.Tpo $(DEPDIR)/gnome_power_statistics-gpm-graph-widget.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-graph-widget.c' object='gnome_power_statistics-gpm-graph-widget.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-graph-widget.c' object='gnome_power_statistics-gpm-graph-widget.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-graph-widget.o `test -f 'gpm-graph-widget.c' || echo '$(srcdir)/'`gpm-graph-widget.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-graph-widget.o `test -f 'gpm-graph-widget.c' || echo '$(srcdir)/'`gpm-graph-widget.c
 
 gnome_power_statistics-gpm-graph-widget.obj: gpm-graph-widget.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -MT gnome_power_statistics-gpm-graph-widget.obj -MD -MP -MF $(DEPDIR)/gnome_power_statistics-gpm-graph-widget.Tpo -c -o gnome_power_statistics-gpm-graph-widget.obj `if test -f 'gpm-graph-widget.c'; then $(CYGPATH_W) 'gpm-graph-widget.c'; else $(CYGPATH_W) '$(srcdir)/gpm-graph-widget.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gnome_power_statistics-gpm-graph-widget.Tpo $(DEPDIR)/gnome_power_statistics-gpm-graph-widget.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gpm-graph-widget.c' object='gnome_power_statistics-gpm-graph-widget.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gpm-graph-widget.c' object='gnome_power_statistics-gpm-graph-widget.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-graph-widget.obj `if test -f 'gpm-graph-widget.c'; then $(CYGPATH_W) 'gpm-graph-widget.c'; else $(CYGPATH_W) '$(srcdir)/gpm-graph-widget.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gnome_power_statistics_CFLAGS) $(CFLAGS) -c -o gnome_power_statistics-gpm-graph-widget.obj `if test -f 'gpm-graph-widget.c'; then $(CYGPATH_W) 'gpm-graph-widget.c'; else $(CYGPATH_W) '$(srcdir)/gpm-graph-widget.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -694,14 +706,15 @@
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
+	    col="$$grn"; \
 	  else \
-	    echo "$$red$$dashes"; \
+	    col="$$red"; \
 	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -738,13 +751,15 @@
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -754,10 +769,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:
@@ -770,6 +790,7 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
@@ -842,7 +863,7 @@
 
 uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: check-am install-am install-strip
+.MAKE: all check check-am install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
@@ -860,6 +881,11 @@
 	uninstall-binPROGRAMS
 
 
+gpm-resources.c: gnome-power-manager.gresource.xml ../data/gpm-statistics.ui
+	glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-source --c-name gpm $(srcdir)/gnome-power-manager.gresource.xml
+gpm-resources.h: gnome-power-manager.gresource.xml
+	glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-header --c-name gpm $(srcdir)/gnome-power-manager.gresource.xml
+
 clean-local:
 	rm -f *~