<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,13 +1,23 @@
-SUBDIRS = src glade desktop themes pixmaps man
+SUBDIRS = src glade desktop themes pixmaps man po
 
-EXTRA_DIST =	\
-	    AUTHORS	\
-	    BUGS	\
-	    COPYING	\
-	    INSTALL	\
-	    NEWS	\
-	    README	\
-	    TODO	\
-	    autogen.sh  \
-	    configure.ac
+EXTRA_DIST = \
+	AUTHORS \
+	BUGS \
+	COPYING \
+	INSTALL \
+	NEWS \
+	README \
+	TODO \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in \
+	intltool-extract \
+	intltool-merge \
+	intltool-update
 
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update \
+	po/stamp-it \
+	po/.intltool-merge-cache</diff>
      <filename>Makefile.am</filename>
    </modified>
    <modified>
      <diff>@@ -11,6 +11,645 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper &lt;drepper@cygnus.com&gt;, 1995, 1996
+#
+# Modified to never use included libintl. 
+# Owen Taylor &lt;otaylor@redhat.com&gt;, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor &lt;otaylor@redhat.com&gt;, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version 
+# written by Bruno Haible, Owen Taylor &lt;otaylor.redhat.com&gt; 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen &lt;mclasen@redhat.com&gt; 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
+
+dnl
+dnl We go to great lengths to make sure that aclocal won't 
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
+
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+  [AC_CHECK_HEADERS([locale.h])
+    if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include &lt;locale.h&gt;], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your &lt;locale.h&gt; file defines LC_MESSAGES.])
+    fi
+  fi])
+
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of &quot;$2&quot;, so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case &quot;[$]$1&quot; in
+  /*)
+  ac_cv_path_$1=&quot;[$]$1&quot; # Let the user override the test with a path.
+  ;;
+  *)
+  IFS=&quot;${IFS= 	}&quot;; ac_save_ifs=&quot;$IFS&quot;; IFS=&quot;${IFS}:&quot;
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z &quot;$ac_dir&quot; &amp;&amp; ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1=&quot;$ac_dir/$ac_word&quot;
+	break
+      fi
+    fi
+  done
+  IFS=&quot;$ac_save_ifs&quot;
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z &quot;[$]ac_cv_path_$1&quot; &amp;&amp; ac_cv_path_$1=&quot;$4&quot;
+])dnl
+  ;;
+esac])dnl
+$1=&quot;$ac_cv_path_$1&quot;
+if test ifelse([$4], , [-n &quot;[$]$1&quot;], [&quot;[$]$1&quot; != &quot;$4&quot;]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+  dnl NLS is obligatory
+  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+    USE_NLS=yes
+    AC_SUBST(USE_NLS)
+
+    gt_cv_have_gettext=no
+
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
+
+    AC_CHECK_HEADER(libintl.h,
+     [gt_cv_func_dgettext_libintl=&quot;no&quot;
+      libintl_extra_libs=&quot;&quot;
+
+      #
+      # First check in libc
+      #
+      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+        [AC_TRY_LINK([
+#include &lt;libintl.h&gt;
+],
+         [return !ngettext (&quot;&quot;,&quot;&quot;, 1)],
+	  gt_cv_func_ngettext_libc=yes,
+          gt_cv_func_ngettext_libc=no)
+        ])
+  
+      if test &quot;$gt_cv_func_ngettext_libc&quot; = &quot;yes&quot; ; then
+	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+        	[AC_TRY_LINK([
+#include &lt;libintl.h&gt;
+],
+	          [return !dgettext (&quot;&quot;,&quot;&quot;)],
+		  gt_cv_func_dgettext_libc=yes,
+	          gt_cv_func_dgettext_libc=no)
+        	])
+      fi
+  
+      if test &quot;$gt_cv_func_ngettext_libc&quot; = &quot;yes&quot; ; then
+        AC_CHECK_FUNCS(bind_textdomain_codeset)
+      fi
+
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test &quot;$gt_cv_func_dgettext_libc&quot; != &quot;yes&quot; \
+	 || test &quot;$gt_cv_func_ngettext_libc&quot; != &quot;yes&quot; \
+         || test &quot;$ac_cv_func_bind_textdomain_codeset&quot; != &quot;yes&quot; ; then
+        
+        AC_CHECK_LIB(intl, bindtextdomain,
+	    [AC_CHECK_LIB(intl, ngettext,
+		    [AC_CHECK_LIB(intl, dgettext,
+			          gt_cv_func_dgettext_libintl=yes)])])
+
+	if test &quot;$gt_cv_func_dgettext_libintl&quot; != &quot;yes&quot; ; then
+	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
+	  AC_MSG_RESULT([])
+  	  AC_CHECK_LIB(intl, ngettext,
+          	[AC_CHECK_LIB(intl, dcgettext,
+		       [gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv],
+			:,-liconv)],
+		:,-liconv)
+        fi
+
+        #
+        # If we found libintl, then check in it for bind_textdomain_codeset();
+        # we'll prefer libc if neither have bind_textdomain_codeset(),
+        # and both have dgettext and ngettext
+        #
+        if test &quot;$gt_cv_func_dgettext_libintl&quot; = &quot;yes&quot; ; then
+          glib_save_LIBS=&quot;$LIBS&quot;
+          LIBS=&quot;$LIBS -lintl $libintl_extra_libs&quot;
+          unset ac_cv_func_bind_textdomain_codeset
+          AC_CHECK_FUNCS(bind_textdomain_codeset)
+          LIBS=&quot;$glib_save_LIBS&quot;
+
+          if test &quot;$ac_cv_func_bind_textdomain_codeset&quot; = &quot;yes&quot; ; then
+            gt_cv_func_dgettext_libc=no
+          else
+            if test &quot;$gt_cv_func_dgettext_libc&quot; = &quot;yes&quot; \
+		&amp;&amp; test &quot;$gt_cv_func_ngettext_libc&quot; = &quot;yes&quot;; then
+              gt_cv_func_dgettext_libintl=no
+            fi
+          fi
+        fi
+      fi
+
+      if test &quot;$gt_cv_func_dgettext_libc&quot; = &quot;yes&quot; \
+	|| test &quot;$gt_cv_func_dgettext_libintl&quot; = &quot;yes&quot;; then
+        gt_cv_have_gettext=yes
+      fi
+  
+      if test &quot;$gt_cv_func_dgettext_libintl&quot; = &quot;yes&quot;; then
+        INTLLIBS=&quot;-lintl $libintl_extra_libs&quot;
+      fi
+  
+      if test &quot;$gt_cv_have_gettext&quot; = &quot;yes&quot;; then
+	AC_DEFINE(HAVE_GETTEXT,1,
+	  [Define if the GNU gettext() function is already present or preinstalled.])
+	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [test -z &quot;`$ac_dir/$ac_word -h 2&gt;&amp;1 | grep 'dv '`&quot;], no)dnl
+	if test &quot;$MSGFMT&quot; != &quot;no&quot;; then
+          glib_save_LIBS=&quot;$LIBS&quot;
+          LIBS=&quot;$LIBS $INTLLIBS&quot;
+	  AC_CHECK_FUNCS(dcgettext)
+	  MSGFMT_OPTS=
+	  AC_MSG_CHECKING([if msgfmt accepts -c])
+	  GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
+msgid &quot;&quot;
+msgstr &quot;&quot;
+&quot;Content-Type: text/plain; charset=UTF-8\n&quot;
+&quot;Project-Id-Version: test 1.0\n&quot;
+&quot;PO-Revision-Date: 2007-02-15 12:01+0100\n&quot;
+&quot;Last-Translator: test &lt;foo@bar.xx&gt;\n&quot;
+&quot;Language-Team: C &lt;LL@li.org&gt;\n&quot;
+&quot;MIME-Version: 1.0\n&quot;
+&quot;Content-Transfer-Encoding: 8bit\n&quot;
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+	  AC_SUBST(MSGFMT_OPTS)
+	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	    [test -z &quot;`$ac_dir/$ac_word -h 2&gt;&amp;1 | grep '(HELP)'`&quot;], :)
+	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr],
+	    [CATOBJEXT=.gmo 
+             DATADIRNAME=share],
+	    [case $host in
+	    *-*-solaris*)
+	    dnl On Solaris, if bind_textdomain_codeset is in libc,
+	    dnl GNU format message catalog is always supported,
+            dnl since both are added to the libc all together.
+	    dnl Hence, we'd like to go with DATADIRNAME=share and
+	    dnl and CATOBJEXT=.gmo in this case.
+            AC_CHECK_FUNC(bind_textdomain_codeset,
+	      [CATOBJEXT=.gmo 
+               DATADIRNAME=share],
+	      [CATOBJEXT=.mo
+               DATADIRNAME=lib])
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac])
+          LIBS=&quot;$glib_save_LIBS&quot;
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+    ])
+
+    if test &quot;$gt_cv_have_gettext&quot; = &quot;yes&quot; ; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [always defined to indicate that i18n is enabled])
+    fi
+
+    dnl Test whether we really found GNU xgettext.
+    if test &quot;$XGETTEXT&quot; != &quot;:&quot;; then
+      dnl If it is not GNU xgettext we define it as : so that the
+      dnl Makefiles still can work.
+      if $XGETTEXT --omit-header /dev/null 2&gt; /dev/null; then
+        : ;
+      else
+        AC_MSG_RESULT(
+	  [found xgettext program is not GNU xgettext; ignore it])
+        XGETTEXT=&quot;:&quot;
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    AC_OUTPUT_COMMANDS(
+      [case &quot;$CONFIG_FILES&quot; in *po/Makefile.in*)
+        sed -e &quot;/POTFILES =/r po/POTFILES&quot; po/Makefile.in &gt; po/Makefile
+      esac])
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES=&quot;$GMOFILES $lang.gmo&quot;
+      POFILES=&quot;$POFILES $lang.po&quot;
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(PO_IN_DATADIR_TRUE)
+    AC_SUBST(PO_IN_DATADIR_FALSE)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation 
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to &quot;yes&quot;.) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by 
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   
+   GLIB_LC_MESSAGES
+   GLIB_WITH_NLS
+
+   if test &quot;$gt_cv_have_gettext&quot; = &quot;yes&quot;; then
+     if test &quot;x$ALL_LINGUAS&quot; = &quot;x&quot;; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test &quot;%UNSET%&quot; != &quot;${LINGUAS-%UNSET%}&quot;; then
+           desiredlanguages=&quot;$LINGUAS&quot;
+         else
+           desiredlanguages=&quot;$ALL_LINGUAS&quot;
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case &quot;$desiredlang&quot; in
+             &quot;$presentlang&quot;*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS=&quot;$NEW_LINGUAS $presentlang&quot;
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n &quot;$LINGUAS&quot;; then
+       for lang in $LINGUAS; do CATALOGS=&quot;$CATALOGS $lang$CATOBJEXT&quot;; done
+     fi
+   fi
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n &quot;$ac_aux_dir&quot;; then
+     MKINSTALLDIRS=&quot;$ac_aux_dir/mkinstalldirs&quot;
+   fi
+   if test -z &quot;$MKINSTALLDIRS&quot;; then
+     MKINSTALLDIRS=&quot;\$(top_srcdir)/mkinstalldirs&quot;
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test &quot;x$srcdir&quot; != &quot;x.&quot;; then
+     if test &quot;x`echo $srcdir | sed 's@/.*@@'`&quot; = &quot;x&quot;; then
+       posrcprefix=&quot;$srcdir/&quot;
+     else
+       posrcprefix=&quot;../$srcdir/&quot;
+     fi
+   else
+     posrcprefix=&quot;../&quot;
+   fi
+   rm -f po/POTFILES
+   sed -e &quot;/^#/d&quot; -e &quot;/^\$/d&quot; -e &quot;s,.*,	$posrcprefix&amp; \\\\,&quot; -e &quot;\$s/\(.*\) \\\\/\1/&quot; \
+	&lt; $srcdir/po/POTFILES.in &gt; po/POTFILES
+  ])
+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix=&quot;$prefix&quot;
+glib_save_exec_prefix=&quot;$exec_prefix&quot;
+glib_save_datarootdir=&quot;$datarootdir&quot;
+test &quot;x$prefix&quot; = xNONE &amp;&amp; prefix=$ac_default_prefix
+test &quot;x$exec_prefix&quot; = xNONE &amp;&amp; exec_prefix=$prefix
+datarootdir=`eval echo &quot;${datarootdir}&quot;`
+if test &quot;x$CATOBJEXT&quot; = &quot;x.mo&quot; ; then
+  localedir=`eval echo &quot;${libdir}/locale&quot;`
+else
+  localedir=`eval echo &quot;${datadir}/locale&quot;`
+fi
+prefix=&quot;$glib_save_prefix&quot;
+exec_prefix=&quot;$glib_save_exec_prefix&quot;
+datarootdir=&quot;$glib_save_datarootdir&quot;
+AC_DEFINE_UNQUOTED($1, &quot;$localedir&quot;,
+  [Define the location where the catalogs will be installed])
+])
+
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_in,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+# 
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat &gt;conftest.foo &lt;&lt;_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+  m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo &quot;$as_me: failed input was:&quot; &gt;&amp;AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo &gt;&amp;AS_MESSAGE_LOG_FD
+fi])
+
+
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 35 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL],
+[AC_PREREQ([2.50])dnl
+
+case &quot;$am__api_version&quot; in
+    1.[01234])
+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
+
+if test -n &quot;$1&quot;; then
+    AC_MSG_CHECKING(for intltool &gt;= $1)
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`awk -F\&quot; '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+    [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\&quot; '/\\$VERSION / { split($ 2, VERSION, &quot;.&quot;); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+    ]
+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+    test &quot;$INTLTOOL_APPLIED_VERSION_AS_INT&quot; -ge &quot;$INTLTOOL_REQUIRED_VERSION_AS_INT&quot; ||
+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
+fi
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.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 $&lt; [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.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 $&lt; [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $&lt; [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.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 $&lt; [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $&lt; [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.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 $&lt; [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $&lt; [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.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 $&lt; [$]@' 
+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 $&lt; [$]@' 
+       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 $&lt; [$]@' 
+      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 $&lt; [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $&lt; [$]@' 
+      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 $&lt; [$]@' 
+      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 $&lt; [$]@' 
+    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 $&lt; [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $&lt; [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.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 $&lt; [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.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 $&lt; [$]@'
+
+AC_SUBST(INTLTOOL_DESKTOP_RULE)
+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+AC_SUBST(INTLTOOL_KEYS_RULE)
+AC_SUBST(INTLTOOL_PROP_RULE)
+AC_SUBST(INTLTOOL_OAF_RULE)
+AC_SUBST(INTLTOOL_PONG_RULE)
+AC_SUBST(INTLTOOL_SERVER_RULE)
+AC_SUBST(INTLTOOL_SHEET_RULE)
+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+AC_SUBST(INTLTOOL_UI_RULE)
+AC_SUBST(INTLTOOL_XAM_RULE)
+AC_SUBST(INTLTOOL_KBD_RULE)
+AC_SUBST(INTLTOOL_XML_RULE)
+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+AC_SUBST(INTLTOOL_CAVES_RULE)
+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+AC_SUBST(INTLTOOL_THEME_RULE)
+AC_SUBST(INTLTOOL_SERVICE_RULE)
+
+# Use the tools built into the package, not the ones that are installed.
+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z &quot;$INTLTOOL_PERL&quot;; then
+   AC_MSG_ERROR([perl not found; required for intltool])
+fi
+if test -z &quot;`$INTLTOOL_PERL -v | fgrep '5.' 2&gt; /dev/null`&quot;; then
+   AC_MSG_ERROR([perl 5.x required for intltool])
+fi
+if test &quot;x$2&quot; != &quot;xno-xml&quot;; then
+   AC_MSG_CHECKING([for XML::Parser])
+   if `$INTLTOOL_PERL -e &quot;require XML::Parser&quot; 2&gt;/dev/null`; then
+       AC_MSG_RESULT([ok])
+   else
+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+   fi
+fi
+
+AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
+AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
+AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
+AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z &quot;$DATADIRNAME&quot;; then
+  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+                 return _nl_msg_cat_cntr],
+    [DATADIRNAME=share],
+    [case $host in
+    *-*-solaris*)
+    dnl On Solaris, if bind_textdomain_codeset is in libc,
+    dnl GNU format message catalog is always supported,
+    dnl since both are added to the libc all together.
+    dnl Hence, we'd like to go with DATADIRNAME=share
+    dnl in this case.
+    AC_CHECK_FUNC(bind_textdomain_codeset,
+      [DATADIRNAME=share], [DATADIRNAME=lib])
+    ;;
+    *)
+    [DATADIRNAME=lib]
+    ;;
+    esac])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+dnl The following is very similar to
+dnl
+dnl	AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
+dnl
+dnl with the following slight differences:
+dnl  - the *.in files are in ac_aux_dir,
+dnl  - if the file haven't changed upon reconfigure, it's not touched,
+dnl  - the evaluation of the third parameter enables a hack which computes
+dnl    the actual value of $libdir,
+dnl  - the user sees &quot;executing intltool commands&quot;, instead of
+dnl    &quot;creating intltool-extract&quot; and such.
+dnl
+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
+dnl a reason for it.
+
+AC_CONFIG_COMMANDS([intltool], [
+
+for file in intltool-extract intltool-merge intltool-update; do
+  sed -e &quot;s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g&quot; \
+      -e &quot;s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g&quot; \
+      -e &quot;s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g&quot; \
+      -e &quot;s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g&quot; \
+      -e &quot;s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g&quot; \
+      -e &quot;s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g&quot; \
+      -e &quot;s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g&quot; \
+	&lt; ${ac_aux_dir}/${file}.in &gt; ${file}.out
+  if cmp -s ${file} ${file}.out 2&gt;/dev/null; then
+    rm -f ${file}.out
+  else
+    mv -f ${file}.out ${file}
+  fi
+  chmod ugo+x ${file}
+  chmod u+w ${file}
+done
+
+],
+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+prefix=&quot;$prefix&quot; exec_prefix=&quot;$exec_prefix&quot; INTLTOOL_LIBDIR=&quot;$libdir&quot; 
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
+INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
+INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir &quot;po&quot; is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    rm -f &quot;$1/stamp-it&quot; &quot;$1/stamp-it.tmp&quot; &quot;$1/POTFILES&quot; &quot;$1/Makefile.tmp&quot;
+    &gt;&quot;$1/stamp-it.tmp&quot;
+    [sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'&quot;s|^|	$ac_top_srcdir/|&quot; \
+      &quot;$srcdir/$1/POTFILES.in&quot; | sed '$!s/$/ \\/' &gt;&quot;$1/POTFILES&quot;
+    ]
+    if test ! -f &quot;$1/Makefile&quot;; then
+      AC_MSG_ERROR([$1/Makefile is not ready.])
+    fi
+    mv &quot;$1/Makefile&quot; &quot;$1/Makefile.tmp&quot;
+    [sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' &quot;$1/Makefile.tmp&quot; &gt;&quot;$1/Makefile&quot;]
+    rm -f &quot;$1/Makefile.tmp&quot;
+    mv &quot;$1/stamp-it.tmp&quot; &quot;$1/stamp-it&quot;
+  ])
+])dnl
+])
+
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake &lt;= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
 # serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
@@ -7016,6 +7655,35 @@ fi
 rmdir .tst 2&gt;/dev/null
 AC_SUBST([am__leading_dot])])
 
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# 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
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
 # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
@@ -7375,4 +8043,3 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([m4/isc-posix.m4])</diff>
      <filename>aclocal.m4</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e71f3693d578154a18a042108aca8660696c48e4</id>
    </parent>
  </parents>
  <author>
    <name>Mirco M&#252;ller</name>
    <email>macslow@bangang.de</email>
  </author>
  <url>http://github.com/stephane/cairo-clock/commit/91da1b65bc2ea2541b3381cd4c66b8f212ba1494</url>
  <id>91da1b65bc2ea2541b3381cd4c66b8f212ba1494</id>
  <committed-date>2007-08-16T22:51:02-07:00</committed-date>
  <authored-date>2007-08-16T22:51:02-07:00</authored-date>
  <message>further changes for localization</message>
  <tree>af618beb257ea30d90c77d9e8ddf6cddd1dba4b9</tree>
  <committer>
    <name>macslow</name>
    <email>mirco@vaio.(none)</email>
  </committer>
</commit>
